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

09 Feb '09

Author: chatellier Date: 2009-02-09 15:56:49 +0000 (Mon, 09 Feb 2009) New Revision: 1346 Added: topia/trunk/topia-ui/src/test/java/org/ topia/trunk/topia-ui/src/test/java/org/codelutin/ topia/trunk/topia-ui/src/test/java/org/codelutin/test/ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/BasePage.java topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/SessionBean.java topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/ContextLink.java topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/Layout.java topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/ 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/ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactForm.java topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactList.java topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactView.java topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/SocietyForm.java topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/SocietyView.java topia/trunk/topia-ui/src/test/xmi/ topia/trunk/topia-ui/src/test/xmi/contact.properties topia/trunk/topia-ui/src/test/xmi/contact.zargo Modified: topia/trunk/pom.xml topia/trunk/topia-ui/pom.xml topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java Log: Ajout de tests dans topiaUI, generation d'un model de case d'utilisation sous tapestry Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-05 18:05:17 UTC (rev 1345) +++ topia/trunk/pom.xml 2009-02-09 15:56:49 UTC (rev 1346) @@ -70,7 +70,7 @@ <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> - <version>5.0.7</version> + <version>5.0.18</version> <scope>compile</scope> </dependency> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-05 18:05:17 UTC (rev 1345) +++ topia/trunk/topia-ui/pom.xml 2009-02-09 15:56:49 UTC (rev 1346) @@ -20,6 +20,13 @@ <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> @@ -32,7 +39,7 @@ <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> -  </dependency> @@ -55,11 +62,85 @@ <plugins> +  <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>target/generated-test-sources/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-processor-plugin</artifactId> </plugin> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <executions> + <execution> + <id>generate-objectmodel</id> + <phase>generate-test-sources</phase> + <configuration> + <srcDirZuml>src/test/xmi</srcDirZuml> + <srcXmiDest>target/generated-test-sources/xmi/</srcXmiDest> + <srcGenDest>target/generated-test-sources/models/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>target/generated-test-sources/java</destDirGen> + <defaultPackage>org.codelutin.test</defaultPackage> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + + <execution> + <id>generate-statemodel</id> + <phase>generate-test-sources</phase> + <configuration> + <srcDirZuml>src/test/xmi</srcDirZuml> + <srcXmiDest>target/generated-test-sources/xmi/</srcXmiDest> + <srcGenDest>target/generated-test-sources/models/</srcGenDest> + <includes>**/*.statemodel</includes> + <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> + <destDirGen>target/generated-test-sources/java</destDirGen> + <extraClassPathDirectory>target/classes</extraClassPathDirectory> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2statemodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + </plugins> </build> Modified: topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java =================================================================== --- topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java 2009-02-05 18:05:17 UTC (rev 1345) +++ topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -28,6 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.tapestry5.Link; import org.codelutin.generator.MonitorWriter; import org.codelutin.generator.StateModelGenerator; import org.codelutin.generator.GeneratorUtil; @@ -211,7 +212,7 @@ /*{// Automatically generated by LutinGenerator package <%=getPackageFromState(chart)%>; -import org.apache.tapestry.annotations.InjectPage; +import org.apache.tapestry5.annotations.InjectPage; import <%=getPackageFromComponents(chart)%>.UseCasePage; /* @@ -446,13 +447,13 @@ private void generateUseCasePageClass(MonitorWriter output, StateModel model, String componentPackageName) throws IOException { /*{package <%=componentPackageName%>; -import org.apache.tapestry.Link; -import org.apache.tapestry.annotations.ApplicationState; -import org.apache.tapestry.ioc.annotations.Inject; -import org.apache.tapestry.annotations.Service; -import org.apache.tapestry.internal.services.LinkFactory; -import org.apache.tapestry.internal.services.LinkFactoryListener; -import org.apache.tapestry.services.Request; +import org.apache.tapestry5.Link; +import org.apache.tapestry5.annotations.ApplicationState; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.annotations.Service; +import org.apache.tapestry5.internal.services.LinkFactory; +import org.apache.tapestry5.internal.services.LinkFactoryListener; +import org.apache.tapestry5.services.Request; public abstract class UseCasePage}*/ @@ -537,21 +538,23 @@ return nextPage; } - /* (non-Javadoc) - * @see org.apache.tapestry.internal.services.LinkFactoryListener#createdActionLink(org.apache.tapestry.Link) - *) - public void createdActionLink(Link _link) { - addUCParameter(_link); - } + /* + * @see org.apache.tapestry5.internal.services.LinkFactoryListener#createdComponentEventLink(org.apache.tapestry5.Link) + *) + @Override + public void createdComponentEventLink(Link _link) { + addUCParameter(_link); + } - /* (non-Javadoc) - * @see org.apache.tapestry.internal.services.LinkFactoryListener#createdPageLink(org.apache.tapestry.Link) - *) - public void createdPageLink(Link _link) { - // PageLink englobe ausssi les redirects envoyés au client apres une - // action - addUCParameter(_link); - } + /* + * @see org.apache.tapestry5.internal.services.LinkFactoryListener#createdPageRenderLink(org.apache.tapestry5.Link) + *) + @Override + public void createdPageRenderLink(Link _link) { + // PageLink englobe ausssi les redirects envoyés au client apres une + // action + addUCParameter(_link); + } protected void addUCParameter(Link _link) { if(_link.getParameterValue(UC_PARAMETER_NAME) == null) { Added: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/BasePage.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/BasePage.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/BasePage.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1,33 @@ +/* *##% + * Copyright (C) 2007 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.base; + + +/** + * BasePage.java + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class BasePage { + +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/SessionBean.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/SessionBean.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/base/SessionBean.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1,58 @@ +/* *##% + * 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.base; + +import java.io.Serializable; + +/** + * SessionBean.java + * + * @author chatellier + * @version $Revision: 1.1 $ + * + * Last update : $Date: 2007/05/14 07:56:43 $ + * By : $Author: E023931M $ + */ +public class SessionBean implements Serializable { + + /** + * serialVersionUID + */ + private static final long serialVersionUID = 4167552239802992200L; + + private boolean logged; + + public SessionBean() { + logged = false; + } + + /** + * @return the logged + */ + public boolean isLogged() { + return logged; + } + + /** + * @param logged the logged to set + */ + public void setLogged(boolean logged) { + this.logged = logged; + } +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/ContextLink.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/ContextLink.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/ContextLink.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1,52 @@ +/* *##% + * 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.components; + +import org.apache.tapestry5.MarkupWriter; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.internal.services.ContextResource; +import org.apache.tapestry5.ioc.annotations.Inject; + +/** + * ContextLink.java + * + * Juste pour ajouter le context + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ By : $Author$ + */ +public class ContextLink { + + /** The logical name of the page to link to. */ + @Parameter(required = true, defaultPrefix = "literal") + private String _page; + + @Inject + private ContextResource contextResource; + + void beginRender(MarkupWriter writer) { + writer.element("a", "href", contextResource.toString() + "/" + _page); + } + + void afterRender(MarkupWriter writer) { + writer.end(); // <a> + } +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/Layout.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/Layout.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/components/Layout.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1,143 @@ +/* *##% + * 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.components; + +import java.util.Locale; + +import org.apache.tapestry5.Asset; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.annotations.Path; +import org.apache.tapestry5.annotations.Service; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.services.PersistentLocale; + + +/** + * AbstractPage.java + * + * @author chatellier + * @version $Revision: 1.1 $ + * + * Last update : $Date: 2007/05/14 07:56:43 $ By : $Author: E023931M $ + */ +public class Layout { + + /** + * page title + */ + @Parameter("defaulttitle") + private String title; + + @Inject + @Path("context:css/general.css") + private Asset _stylesheetGeneral; + + @Inject + @Path("context:css/layout.css") + private Asset _stylesheetLayout; + + /** + * @return the title + */ + public String getTitle() { + return title; + } + + /** + * Set default title + */ + void getDefaultTitle() { + title = ""; + } + + /** + * @return the _stylesheetGeneral + */ + public Asset getStylesheetGeneral() { + return _stylesheetGeneral; + } + + + /** + * @return the _stylesheetLayout + */ + public Asset getStylesheetLayout() { + return _stylesheetLayout; + } + + /*@Inject + @Service("ThreadLocale") + private ThreadLocale threadLocaleService;*/ + + /** + * Change locale + * @param locale locale + * @return + */ + /*Object onActionFormSwitchLocaleFr(@InjectService("ThreadLocale") + ThreadLocale threadLocale) { + threadLocale.setLocale(new Locale("fr")); + return null; + } + + Object onActionFormSwitchLocaleEn(@InjectService("ThreadLocale") + ThreadLocale threadLocale) { + threadLocale.setLocale(new Locale("en")); + return null; + }*/ + + @Inject + @Service("PersistentLocale") + private PersistentLocale persistentLocale; + + Object onActionFormSwitchLocaleFr() { + persistentLocale.set(new Locale("fr")); + return null; + } + + Object onActionFormSwitchLocaleEn() { + persistentLocale.set(new Locale("en")); + return null; + } + + /*@ApplicationState + SessionBean sessionBean; + + @InjectPage + private LoginForm loginForm; + + @BeforeRenderBody + Object testConnected() { + if(sessionBean == null) sessionBean = new SessionBean(); + if(!sessionBean.isLogged()) { + sessionBean.setLogged(true); + return loginForm; + } + return true; + } + + /*@AfterRenderBody + boolean testConnected2() { + /*if(!sessionBean.isLogged()) { + sessionBean.setLogged(true); + return loginForm; + }* + return false; + }*/ +} Added: 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 (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/LoginForm.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1,88 @@ +/* *##% + * 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/test/web/pages/contactManagement/ContactForm.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactForm.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactForm.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1,267 @@ +/* *##% + * Copyright (C) 2007 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.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; +import org.apache.tapestry5.SelectModelVisitor; +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; + + +/** + * ContactForm.java + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ContactForm extends AbstractContactForm { + + private SocietyDAO societyDao; + private ContactDAO contactDao; + + @Persist + private Society society; + @Persist + private Contact contact; + + @Persist + private boolean use_for_new; + + public ContactForm() { + societyDao = new SocietyDAO(); + contactDao = new ContactDAO(); + contact = new ContactImpl(); + + use_for_new = true; + } + + /** + * @return the contact + */ + public Contact getContact() { + return contact; + } + + + /** + * @param contact the contact to set + */ + public void setContact(Contact contact) { + this.contact = contact; + use_for_new = false; + } + + + /** + * @return the society + */ + public Society getSociety() { + return society; + } + + + /** + * @param society the society to set + */ + public void setSociety(Society society) { + this.society = society; + } + + + 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 + } + + return super.onActionFromContactStore(); + } + + /** + * + */ + public void setEmptyContact() { + + contact = new ContactImpl(); + use_for_new = true; + + } + + /* (non-Javadoc) + * @see org.codelutin.test.web.pages.contactManagement.AbstractContactForm#onActionFromAddSociety() + */ + @Override + public Object onActionFromAddSociety() { + + getSocietyForm().setEmptySociety(); + + return super.onActionFromAddSociety(); + } + + /* (non-Javadoc) + * @see org.codelutin.test.web.pages.contactManagement.AbstractContactForm#onActionFromContactCancel() + */ + @Override + public Object onActionFromContactCancel() { + return super.onActionFromContactCancel(); + } + + /* + * Ce qui suit sert au composant t:select de la page + */ + + /** + * Return all projects + * @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 + } + + return lp; + } + + public SocietySelectModel getSocietySelectModel() { + return new SocietySelectModel(getSocieties()); + } + + public SocietyValueEncoder getSocietyValueEncoder() { + return new SocietyValueEncoder(getSocieties()); + } + + public class SocietyValueEncoder implements ValueEncoder<Society> { + + private List<Society> societies; + + public SocietyValueEncoder(List<Society> societies) { + this.societies = societies; + } + + public String toClient(Society society) { + return society.getName(); + } + + public Society toValue(String string) { + for (Society society : societies) { + + if (society.getName().equals(string)) { + return society; + } + } + return null; + } + + } + + public class SocietySelectModel implements SelectModel { + + private List<Society> societies; + + public SocietySelectModel(List<Society> societies) { + this.societies = societies; + } + + public List<OptionGroupModel> getOptionGroups() { + return null; + } + + public List<OptionModel> getOptions() { + List<OptionModel> optionModelList = new ArrayList<OptionModel>(); + for (Society society2 : societies) { + /*if(society2.getId().equals(society.getId())) { + optionModelList.add(new OptionModelImpl(society2.getName(), + false, society2,"selected","selected")); + } + else {*/ + optionModelList.add(new OptionModelImpl(society2.getName(), + society2)); + /*}*/ + } + return optionModelList; + } + + /* (non-Javadoc) + * @see org.apache.tapestry.SelectModel#visit(org.apache.tapestry.SelectModelVisitor) + */ + public void visit(SelectModelVisitor visitor) { + List<OptionGroupModel> groups = getOptionGroups(); + if (groups != null) { + for (OptionGroupModel groupModel : groups) { + visitor.beginOptionGroup(groupModel); + + visitOptions(groupModel.getOptions(), visitor); + + visitor.endOptionGroup(groupModel); + } + } + visitOptions(getOptions(), visitor); + } + + private void visitOptions(List<OptionModel> options, + SelectModelVisitor vistor) { + if (options != null) { + for (OptionModel optionModel : options) + vistor.option(optionModel); + } + } + + } +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactList.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactList.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactList.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1,116 @@ +/* *##% + * Copyright (C) 2007 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.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; + +/** + * ContactList.java + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ContactList extends AbstractContactList { + + /** + * Variable for loop + */ + private Contact contact; + + private ContactDAO dao; + + /** + * Constructeur + */ + public ContactList() { + super(); + dao = new ContactDAO(); + } + + /** + * @return the contact + */ + public Contact getContact() { + return contact; + } + + /** + * @param contact the contact to set + */ + public void setContact(Contact contact) { + this.contact = contact; + } + + /** + * Return all projects + * @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 + } + + return lc; + } + + /* (non-Javadoc) + * @see org.codelutin.test.web.pages.contactManagement.AbstractContactList#onActionFromAddContact() + */ + @Override + public Object onActionFromAddContact() { + + getContactForm().setEmptyContact(); + + return super.onActionFromAddContact(); + } + + 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 + } + + getContactView().setContact(c); + + return super.onActionFromView(); + } +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactView.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactView.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/ContactView.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1,98 @@ +/* *##% + * Copyright (C) 2007 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.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; + +/** + * ContactView.java + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ContactView extends AbstractContactView { + + @Persist + private Contact contact; + + private ContactDAO contactDAO; + + public ContactView() { + contactDAO = new ContactDAO(); + } + + /** + * @return the contact + */ + public Contact getContact() { + return contact; + } + + /** + * @param contact the contact to set + */ + public void setContact(Contact contact) { + this.contact = contact; + } + + /* (non-Javadoc) + * @see org.codelutin.test.web.pages.contactManagement.AbstractViewContact#onActionFromEdit() + */ + @Override + public Object onActionFromEdit() { + + getContactForm().setContact(contact); + + return super.onActionFromEdit(); + } + + /* (non-Javadoc) + * @see org.codelutin.test.web.pages.contactManagement.AbstractViewContact#onActionFromViewSociety() + */ + public Object onActionFromViewTheSociety() { + getSocietyView().setSociety(contact.getSociety()); + return super.onActionFromViewSociety(); + } + + /* (non-Javadoc) + * @see org.codelutin.test.web.pages.contactManagement.AbstractContactView#onActionFromDelete() + */ + @Override + public Object onActionFromDelete() { + + try { + TopiaContext context = TopiaContextFactory.getContext(); + context.beginTransaction(); + contactDAO.delete(contact); + context.commitTransaction(); + } catch (TopiaException e) { + // TODO log + } + + return super.onActionFromDelete(); + } +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/SocietyForm.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/SocietyForm.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/SocietyForm.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1,102 @@ +/* *##% + * Copyright (C) 2007 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.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; + +/** + * SocietyForm.java + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SocietyForm extends AbstractSocietyForm { + + @Persist + private Society society; + + private SocietyDAO societyDAO; + + @Persist + private boolean use_for_new = true; + + public SocietyForm() { + super(); + society = new SocietyImpl(); + societyDAO = new SocietyDAO(); + } + + /** + * @return the society + */ + public Society getSociety() { + return society; + } + + /** + * @param society the society to set + */ + public void setSociety(Society society) { + this.society = society; + use_for_new = false; + } + + /** + * + */ + public void setEmptySociety() { + society = new SocietyImpl(); + use_for_new = true; + } + + /* (non-Javadoc) + * @see org.codelutin.test.web.pages.contactManagement.AbstractSocietyForm#onActionFromCancel() + */ + @Override + public Object onActionFromCancel() { + // TODO Auto-generated method stub + return super.onActionFromCancel(); + } + + 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 + } + + return super.onActionFromSocietyStore(); + } +} Added: topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/SocietyView.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/SocietyView.java (rev 0) +++ topia/trunk/topia-ui/src/test/java/org/codelutin/test/web/pages/contactManagement/SocietyView.java 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1,73 @@ +/* *##% + * Copyright (C) 2007 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.contactManagement; + +import org.apache.tapestry5.annotations.Persist; +import org.codelutin.test.entities.Society; + +/** + * SocietyList.java + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SocietyView extends AbstractSocietyView { + + @Persist + private Society society; + + public SocietyView() { + } + + /** + * @return the society + */ + public Society getSociety() { + return society; + } + + /** + * @param society the society to set + */ + public void setSociety(Society society) { + this.society = society; + } + + /* (non-Javadoc) + * @see org.codelutin.test.web.pages.contactManagement.AbstractSocietyView#onActionFromEdit() + */ + @Override + public Object onActionFromEdit() { + + getSocietyForm().setSociety(society); + + return super.onActionFromEdit(); + } + + /* (non-Javadoc) + * @see org.codelutin.test.web.pages.contactManagement.AbstractSocietyView#onActionFromOk() + */ + @Override + public Object onActionFromOk() { + return super.onActionFromOk(); + } +} Added: topia/trunk/topia-ui/src/test/xmi/contact.properties =================================================================== --- topia/trunk/topia-ui/src/test/xmi/contact.properties (rev 0) +++ topia/trunk/topia-ui/src/test/xmi/contact.properties 2009-02-09 15:56:49 UTC (rev 1346) @@ -0,0 +1 @@ +model.tagvalue.usecaseengineextendedclass=BasePage \ No newline at end of file Added: topia/trunk/topia-ui/src/test/xmi/contact.zargo =================================================================== (Binary files differ) Property changes on: topia/trunk/topia-ui/src/test/xmi/contact.zargo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r1345 - topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel
by tchemit＠users.labs.libre-entreprise.org 05 Feb '09

05 Feb '09

Author: tchemit Date: 2009-02-05 18:05:17 +0000 (Thu, 05 Feb 2009) New Revision: 1345 Modified: topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ConfigurationHelper.java Log: fix bug when try to load hibernate config files from some specific classloader (for example in webstart). Modified: topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ConfigurationHelper.java =================================================================== --- topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ConfigurationHelper.java 2009-02-05 18:02:05 UTC (rev 1344) +++ topia-service/trunk/src/main/java/org/codelutin/topia/migration/kernel/ConfigurationHelper.java 2009-02-05 18:05:17 UTC (rev 1345) @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.StringReader; import java.net.URL; +import java.net.URLClassLoader; import java.util.List; import javax.xml.parsers.DocumentBuilder; @@ -107,13 +108,12 @@ // mappingDir est toujours dans le classpath et Resource.getURLs doit // le trouver, donc que ce soit un dossier ou un jar ici importe peu - List<URL> urls = null; - // Don't use File.separator, don't work on windows String pattern = ".*" + pathDirectory + "/" + regexFilename; // find all mapping - urls = Resource.getURLs(pattern); + ClassLoader loader = ConfigurationHelper.class.getClassLoader(); + List<URL> urls = Resource.getURLs(pattern, loader instanceof URLClassLoader?(URLClassLoader)loader:null); logger.debug("Loading mappings in " + pathDirectory);

1 0

r1344 - topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org 05 Feb '09

05 Feb '09

Author: tchemit Date: 2009-02-05 18:02:05 +0000 (Thu, 05 Feb 2009) New Revision: 1344 Modified: topia-service/trunk/pom.xml Log: passage en lutinproject 3.4 Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2009-02-04 17:39:50 UTC (rev 1343) +++ topia-service/trunk/pom.xml 2009-02-05 18:02:05 UTC (rev 1344) @@ -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,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> <artifactId>topia-service</artifactId> @@ -79,13 +80,9 @@  <labs.project>topia</labs.project> -  +  <topia.version>2.1.3-SNAPSHOT</topia.version> - -  <generator.version>0.64-SNAPSHOT</generator.version> - -  <lutinutil.version>1.0.2</lutinutil.version> </properties> @@ -94,16 +91,7 @@ <plugins> -  - - <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> @@ -147,13 +135,13 @@ <artifactId>build-helper-maven-plugin</artifactId> <version>1.2</version> <executions> - <execution> + <execution> <phase>test-compile</phase> <goals> <goal>add-test-source</goal> </goals> <configuration> - <sources> + <sources> <source>${maven.gen.dir}/java</source> </sources> </configuration> @@ -161,6 +149,28 @@ </executions> </plugin> +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> @@ -173,4 +183,41 @@ <url>${maven.scm.url}</url> </scm> + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> + </project>

1 0

r1343 - topia/branches/hibernate_to_jpa_migration
by tchemit＠users.labs.libre-entreprise.org 04 Feb '09

04 Feb '09

Author: tchemit Date: 2009-02-04 17:39:50 +0000 (Wed, 04 Feb 2009) New Revision: 1343 Modified: topia/branches/hibernate_to_jpa_migration/pom.xml Log: changement de version (pour eviter les collisions avec topia sans jpa) Modified: topia/branches/hibernate_to_jpa_migration/pom.xml =================================================================== --- topia/branches/hibernate_to_jpa_migration/pom.xml 2009-02-04 15:34:52 UTC (rev 1342) +++ topia/branches/hibernate_to_jpa_migration/pom.xml 2009-02-04 17:39:50 UTC (rev 1343) @@ -14,7 +14,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <modules> <module>topia-persistence</module>

1 0

r1342 - topia/branches
by thimel＠users.labs.libre-entreprise.org 04 Feb '09

04 Feb '09

Author: thimel Date: 2009-02-04 15:34:52 +0000 (Wed, 04 Feb 2009) New Revision: 1342 Added: topia/branches/hibernate_to_jpa_migration/ Log: Create a branch for the Hibernate to JPA migration Copied: topia/branches/hibernate_to_jpa_migration (from rev 1341, topia/trunk)

1 0

r1341 - topia/trunk
by tchemit＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: tchemit Date: 2009-02-03 20:16:22 +0000 (Tue, 03 Feb 2009) New Revision: 1341 Modified: topia/trunk/pom.xml Log: prepare release lutinproject 3.4 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-03 18:49:25 UTC (rev 1340) +++ topia/trunk/pom.xml 2009-02-03 20:16:22 UTC (rev 1341) @@ -170,7 +170,6 @@ <lutinutil.version>1.0</lutinutil.version> <xmlrpc.version>3.1</xmlrpc.version> <hibernate.version>3.3.1.GA</hibernate.version> -  <topia.version>${project.version}</topia.version> </properties> @@ -209,6 +208,30 @@ </plugins> </pluginManagement> + <plugins> +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <version>${jrst.version}</version> + <configuration> + <directoryIn>${maven.src.dir}/site</directoryIn> + <directoryOut>${maven.site.gen.dir}</directoryOut> + <defaultLocale>fr</defaultLocale> + <inputEncoding>${maven.compile.encoding}</inputEncoding> + <outputEncoding>${maven.compile.encoding}</outputEncoding> + </configuration> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jrst</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build>  @@ -220,4 +243,39 @@ <url>${maven.scm.url}</url> </scm> + <profiles> +  + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-license-switcher-plugin</artifactId> + <version>${license-switcher.version}</version> + <configuration> + <licenseName>${license-switcher.licenseName}</licenseName> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>license</goal> + <goal>third-party</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project>

1 0

r1340 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by chatellier＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: chatellier Date: 2009-02-03 18:49:25 +0000 (Tue, 03 Feb 2009) New Revision: 1340 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: Annulation du commit, generation de toutes les attribut dans le cas de l'heritage Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-02-03 18:32:39 UTC (rev 1339) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-02-03 18:49:25 UTC (rev 1340) @@ -120,6 +120,8 @@ /*{ <union-subclass name="<%=clazzDOType%>" extends="<%=superClassDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" proxy="<%=clazzFQN%>" <%=optionalAttributes%>>  }*/ + // FIXME mieux gerer le cas haveSuper + noneNaturalAttributes.addAll(clazz.getAttributes()); } else { /*{ <class name="<%=clazzDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" proxy="<%=clazzFQN%>" <%=optionalAttributes%>> <id name="topiaId" type="string" length="255" node="@topiaId"/> @@ -166,7 +168,7 @@ } protected void generateAttributes(Writer output, ObjectModelClass clazz, List<ObjectModelAttribute> attributes, String prefix) throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { + for (ObjectModelAttribute attr : attributes) { ObjectModelAttribute reverse = attr.getReverseAttribute(); // pour les asso quoi qu'il arrive il faut les lier des 2 cotes

1 0

r1339 - in topia-service/trunk: . src/test/java/org/codelutin/topia src/test/java/org/codelutin/topia/history src/test/java/org/codelutin/topia/index src/test/java/org/codelutin/topia/migration/common src/test/java/org/codelutin/topia/migration/kernel src/test/java/org/codelutin/topia/security src/test/resources
by chatellier＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: chatellier Date: 2009-02-03 18:32:39 +0000 (Tue, 03 Feb 2009) New Revision: 1339 Added: topia-service/trunk/src/test/java/org/codelutin/topia/TestUtils.java topia-service/trunk/src/test/resources/log4j.properties Removed: topia-service/trunk/src/test/java/org/codelutin/topia/security/ScriptInitialisationDataBase.java Modified: 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 Log: Fix tests Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2009-02-03 18:19:19 UTC (rev 1338) +++ topia-service/trunk/pom.xml 2009-02-03 18:32:39 UTC (rev 1339) @@ -35,7 +35,7 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>2.3.2</version> + <version>2.4.0</version> <scope>compile</scope> </dependency> @@ -50,7 +50,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.103</version> + <version>1.1.107</version> <scope>test</scope> </dependency> @@ -79,14 +79,11 @@  <labs.project>topia</labs.project> -  - <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> -  - <topia.version>2.1.2</topia.version> + <topia.version>2.1.3-SNAPSHOT</topia.version>  - <generator.version>0.63</generator.version> + <generator.version>0.64-SNAPSHOT</generator.version>  <lutinutil.version>1.0.2</lutinutil.version> @@ -97,7 +94,16 @@ <plugins> +  + + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> Added: topia-service/trunk/src/test/java/org/codelutin/topia/TestUtils.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/TestUtils.java (rev 0) +++ topia-service/trunk/src/test/java/org/codelutin/topia/TestUtils.java 2009-02-03 18:32:39 UTC (rev 1339) @@ -0,0 +1,84 @@ +/* *##% ToPIA Service + * Copyright (C) 2006 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + */ + +package org.codelutin.topia; + +import java.io.File; + +import org.codelutin.util.FileUtil; + +/** + * Une classe pour avoir des choses utiles pour tous les tests. + * + * @author Chatellier Eric + * + * Last update : $Date: 2008-10-21 00:54:09 +0200 (mar 21 oct 2008) $ + */ +public abstract class TestUtils { + + protected static File basedir; + + protected static File targetdir; + + protected static File dirDatabase; + + public static File getBasedir() { + if (basedir == null) { + String base = System.getProperty("basedir"); + if (base == null || base.isEmpty()) { + base = new File("").getAbsolutePath(); + } + basedir = new File(base); + System.out.println("basedir for test " + basedir); + } + return basedir; + } + + public static File getTargetdir() { + if (targetdir == null) { + targetdir = new File(getBasedir(), "target"); + System.out.println("targetdir for test " + targetdir); + } + return targetdir; + } + + /** + * Create a temp dir and init isis with that temp dir as database. + * + * @throws Exception + */ + public static void init() throws Exception { + + File mavenTestDir = new File(getTargetdir() + File.separator + "surefire-workdir"); + dirDatabase = FileUtil.createTempDirectory("topia-test", "", mavenTestDir); + } + + public static File getDirDatabase() { + return dirDatabase; + } + + /** + * Delete created temp directory. + */ + public static void clean() { + if(dirDatabase != null) { + FileUtil.deleteRecursively(dirDatabase); + dirDatabase = null; + } + } +} 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 2009-02-03 18:19:19 UTC (rev 1338) +++ topia-service/trunk/src/test/java/org/codelutin/topia/history/HistoryTest.java 2009-02-03 18:32:39 UTC (rev 1339) @@ -1,5 +1,5 @@ /* *##% ToPIA Service - * Copyright (C) 2006 - 2008 CodeLutin + * Copyright (C) 2006 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -15,18 +15,8 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -/* * - * HistoryTest.java - * - * Created: 16 oct. 06 18:27:54 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ + package org.codelutin.topia.history; import org.codelutin.topia.TopiaContext; @@ -43,9 +33,17 @@ import java.util.List; import java.util.Properties; - -/** @author poussin */ - +/** + * HistoryTest. + * + * Created: 16 oct. 06 18:27:54 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ public class HistoryTest extends Assert { protected static String entitiesList = 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 2009-02-03 18:19:19 UTC (rev 1338) +++ topia-service/trunk/src/test/java/org/codelutin/topia/index/IndexTest.java 2009-02-03 18:32:39 UTC (rev 1339) @@ -1,5 +1,5 @@ /* *##% ToPIA Service - * Copyright (C) 2006 - 2008 CodeLutin + * Copyright (C) 2006 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -15,18 +15,8 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -/* * - * IndexTest.java - * - * Created: 16 oct. 06 20:03:22 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ + package org.codelutin.topia.index; import org.codelutin.topia.TopiaContext; @@ -43,9 +33,17 @@ import java.util.Properties; import java.util.SortedSet; - -/** @author poussin */ - +/** + * IndexTest. + * + * Created: 16 oct. 06 20:03:22 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ public class IndexTest extends Assert { protected String entitiesList = PersonImpl.class.getName() + "," + PetImpl.class.getName(); 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 2009-02-03 18:19:19 UTC (rev 1338) +++ topia-service/trunk/src/test/java/org/codelutin/topia/migration/common/VersionTest.java 2009-02-03 18:32:39 UTC (rev 1339) @@ -1,6 +1,5 @@ -/** - * *##% ToPIA Service - * Copyright (C) 2006 - 2008 CodeLutin +/* *##% ToPIA Service + * Copyright (C) 2006 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -21,24 +20,34 @@ import org.junit.Assert; import org.junit.Test; +/** + * VersionTest. + * + * Created: 02 avr. 07 20:03:22 + * + * @author chatellier + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class VersionTest { -public class VersionTest extends Assert { - @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); + Assert.assertTrue(v2_1_2.compareTo(v1_9) > 0); + Assert.assertTrue(v1_9.compareTo(v2_1_2) < 0); } @Test public void testCompareTo2() { - assertTrue(new Version("10.1.2").compareTo(new Version("9.9")) > 0); + Assert.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); + Assert.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 2009-02-03 18:19:19 UTC (rev 1338) +++ topia-service/trunk/src/test/java/org/codelutin/topia/migration/kernel/ConfigurationAdapterTest.java 2009-02-03 18:32:39 UTC (rev 1339) @@ -1,6 +1,5 @@ -/** - * *##% ToPIA Service - * Copyright (C) 2006 - 2008 CodeLutin +/* *##% ToPIA Service + * Copyright (C) 2006 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -26,12 +25,23 @@ import org.junit.Before; import org.junit.Test; +/** + * VersionTest. + * + * Created: 02 avr. 07 20:03:22 + * + * @author chatellier + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ public class ConfigurationAdapterTest { ConfigurationAdapter confa; @Before - public void beforetest() { + public void setUp() { Configuration confHib = new Configuration(); confHib.configure("/ConfigurationAdapterTest-hibernate.cfg.xml"); confHib.setProperty(Environment.DEFAULT_ENTITY_MODE, EntityMode.MAP @@ -41,7 +51,6 @@ @Test public void testDependencies() { - beforetest(); DependenciesHelper conf = confa.getDependenciesHelper(); Assert.assertNotNull(conf); } Deleted: topia-service/trunk/src/test/java/org/codelutin/topia/security/ScriptInitialisationDataBase.java =================================================================== --- topia-service/trunk/src/test/java/org/codelutin/topia/security/ScriptInitialisationDataBase.java 2009-02-03 18:19:19 UTC (rev 1338) +++ topia-service/trunk/src/test/java/org/codelutin/topia/security/ScriptInitialisationDataBase.java 2009-02-03 18:32:39 UTC (rev 1339) @@ -1,217 +0,0 @@ -/* *##% ToPIA Service - * Copyright (C) 2006 - 2008 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ - -package org.codelutin.topia.security; - -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaServiceDAOHelper; -import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorization; -import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO; -import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorization; -import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationDAO; -import org.codelutin.topia.security.entities.authorization.TopiaExpressionLink; -import org.codelutin.topia.security.entities.authorization.TopiaExpressionLinkDAO; -import org.codelutin.topia.security.entities.user.TopiaGroup; -import org.codelutin.topia.security.entities.user.TopiaGroupDAO; -import org.codelutin.topia.security.entities.user.TopiaUser; -import org.codelutin.topia.security.entities.user.TopiaUserDAO; -import static org.codelutin.topia.security.util.TopiaSecurityUtil.LOAD; -import static org.codelutin.topia.security.util.TopiaSecurityUtil.TOPIA_SECURITY_PERSISTENCE_CLASSES; -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 java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; - -/** - * Script pour l'initialisation de la base de données pour pouvoir exécuter les - * tests unitaires. - * @author ruchaud - */ -public class ScriptInitialisationDataBase { - - protected static String entitiesList; - - static { - List<Class> list = Arrays.asList(TOPIA_SECURITY_PERSISTENCE_CLASSES); - list.add(org.codelutin.topia.test.entities.PersonImpl.class); - list.add(org.codelutin.topia.test.entities.PetImpl.class); - StringBuilder buffer = new StringBuilder(); - for (Class aClass : list) { - buffer.append(",").append(aClass.getName()); - } - entitiesList = buffer.substring(1); - } - - - protected static Properties getProperties() { - Properties config = new Properties(); - config.setProperty("hibernate.hbm2ddl.auto", "create"); - 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", ""); - config.setProperty("hibernate.connection.driver_class", "org.h2.Driver"); - - config.setProperty("hibernate.connection.url", "jdbc:h2:data/topia-security;LOCK_METHOD=NO"); - - return config; - } - - public static void main(String[] args) throws TopiaException { - - /* Transaction */ - TopiaContext context = TopiaContextFactory.getContext(getProperties()); - TopiaContext childContext = context.beginTransaction(); - - /* DAOs */ - PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext); - PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext); - - TopiaUserDAO topiaUserDAO = TopiaServiceDAOHelper.getTopiaUserDAO(childContext); - TopiaGroupDAO topiaGroupDAO = TopiaServiceDAOHelper.getTopiaGroupDAO(childContext); - TopiaEntityAuthorizationDAO topiaEntityAuthorizationDAO = TopiaServiceDAOHelper.getTopiaEntityAuthorizationDAO(childContext); - TopiaExpressionLinkDAO linkDAO = TopiaServiceDAOHelper.getTopiaExpressionLinkDAO(childContext); - TopiaAssociationAuthorizationDAO topiaAssociationAuthorizationDAO = TopiaServiceDAOHelper.getTopiaAssociationAuthorizationDAO(childContext); - - /* Création d'un admin */ - TopiaUser admin = topiaUserDAO.create(); - admin.setLogin("admin"); - admin.setPassword("azerty"); - admin.update(); - childContext.commitTransaction(); - - /* Création d'un utilisateur */ - TopiaUser thimel = topiaUserDAO.create(); - thimel.setLogin("thimel"); - thimel.setPassword("zou;bi@da"); - thimel.update(); - childContext.commitTransaction(); - - /* Création d'un groupe avec un utilisateur */ - TopiaUser ruchaud = topiaUserDAO.create(); - ruchaud.setLogin("ruchaud"); - ruchaud.setPassword("mdp"); - TopiaGroup groupRuchaud = topiaGroupDAO.create(); - groupRuchaud.setName("essai"); - - groupRuchaud.setTopiaUser(new ArrayList<TopiaUser>()); - ruchaud.addTopiaGroup(groupRuchaud); - - groupRuchaud.update(); - ruchaud.update(); - childContext.commitTransaction(); - - /* Création des personnes */ - Person benjamin = personDAO.create(); - benjamin.setName("poussin"); - benjamin.setFirstname("benjamin"); - personDAO.update(benjamin); - childContext.commitTransaction(); - - Person jacques = personDAO.create(); - jacques.setName("poussin"); - jacques.setFirstname("jacques"); - personDAO.update(jacques); - childContext.commitTransaction(); - - Person mylene = personDAO.create(); - mylene.setName("poussin"); - mylene.setFirstname("mylene"); - personDAO.update(mylene); - childContext.commitTransaction(); - - /* Création des annimaux */ - Pet debux = petDAO.create(); - debux.setName("debux"); - debux.setType("chat"); - debux.setPerson(jacques); - debux.update(); - childContext.commitTransaction(); - - Pet pluto = petDAO.create(); - pluto.setName("pluto"); - pluto.setType("chien"); - pluto.setPerson(jacques); - pluto.update(); - childContext.commitTransaction(); - - Pet fliper = petDAO.create(); - fliper.setName("fliper"); - fliper.setType("dauphin"); - fliper.setPerson(mylene); - fliper.update(); - childContext.commitTransaction(); - - /* Création des autorisations Entity */ - TopiaEntityAuthorization authorizationForAdmin = topiaEntityAuthorizationDAO.create(); - authorizationForAdmin.setExpression("*"); - authorizationForAdmin.setActions(15); - authorizationForAdmin.setPrincipals(admin.getTopiaId()); - authorizationForAdmin.update(); - childContext.commitTransaction(); - - TopiaEntityAuthorization authorizationForRuchaud = topiaEntityAuthorizationDAO.create(); - authorizationForRuchaud.setExpression(Person.class.getName() + "#*"); - authorizationForRuchaud.setActions(LOAD); - authorizationForRuchaud.setPrincipals(groupRuchaud.getTopiaId()); - authorizationForRuchaud.update(); - childContext.commitTransaction(); - - TopiaEntityAuthorization authorizationForThimel = topiaEntityAuthorizationDAO.create(); - authorizationForThimel.setExpression(jacques.getTopiaId()); - authorizationForThimel.setActions(LOAD); - authorizationForThimel.setPrincipals(thimel.getTopiaId()); - authorizationForThimel.update(); - childContext.commitTransaction(); - - /* Création d'une autorisation Link */ - TopiaExpressionLink link = linkDAO.create(); - link.setReplace(mylene.getTopiaId()); - link.setBy(jacques.getTopiaId()); - link.update(); - childContext.commitTransaction(); - - /* Création d'une authorisation association */ - TopiaAssociationAuthorization associationAuthorization = topiaAssociationAuthorizationDAO.create(); - associationAuthorization.setIdBeginAssociation(jacques.getTopiaId()); - associationAuthorization.setNameAssociation("pet"); - associationAuthorization.setActions(LOAD); - associationAuthorization.setPrincipals(ruchaud.getTopiaId()); - associationAuthorization.update(); - childContext.commitTransaction(); - - associationAuthorization = topiaAssociationAuthorizationDAO.create(); - associationAuthorization.setIdBeginAssociation(mylene.getTopiaId()); - associationAuthorization.setNameAssociation("pet"); - associationAuthorization.setActions(UPDATE); - associationAuthorization.setPrincipals(ruchaud.getTopiaId()); - associationAuthorization.update(); - childContext.commitTransaction(); - } - -} 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 2009-02-03 18:19:19 UTC (rev 1338) +++ topia-service/trunk/src/test/java/org/codelutin/topia/security/TopiaSecurityTest.java 2009-02-03 18:32:39 UTC (rev 1339) @@ -1,5 +1,5 @@ /* *##% ToPIA Service - * Copyright (C) 2006 - 2008 CodeLutin + * Copyright (C) 2006 - 2009 CodeLutin * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -17,29 +17,48 @@ 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.io.File; +import java.security.PrivilegedExceptionAction; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import javax.security.auth.Subject; +import javax.security.auth.login.LoginContext; + +import org.codelutin.topia.TestUtils; import org.codelutin.topia.TopiaContext; import org.codelutin.topia.TopiaContextFactory; import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; import org.codelutin.topia.TopiaServiceDAOHelper; +import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorization; +import org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationDAO; +import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorization; +import org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationDAO; +import org.codelutin.topia.security.entities.authorization.TopiaExpressionLink; +import org.codelutin.topia.security.entities.authorization.TopiaExpressionLinkDAO; +import org.codelutin.topia.security.entities.user.TopiaGroup; +import org.codelutin.topia.security.entities.user.TopiaGroupDAO; +import org.codelutin.topia.security.entities.user.TopiaUser; +import org.codelutin.topia.security.entities.user.TopiaUserDAO; 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.security.util.TopiaSecurityUtil; 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.After; import org.junit.AfterClass; import org.junit.Assert; +import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; -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. @@ -47,48 +66,200 @@ * * @author ruchaud */ -public class TopiaSecurityTest extends Assert { +public class TopiaSecurityTest { 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"; + // FIXME comment il trouve les autres tout seul ? + // The grande question !!! + protected static String entitiesList = //TopiaServiceDAOHelper.entitiesList + "," + + "org.codelutin.topia.test.entities.PersonImpl," + + "org.codelutin.topia.test.entities.PetImpl"; - @BeforeClass - public static void beforeClass() throws TopiaNotFoundException { - context = TopiaContextFactory.getContext(getProperties()); - securityManager = context.getService(TopiaSecurityService.class); - factoryFilter = new TopiaSecurityFactoryFilter(securityManager); + public static void init() throws Exception { + TestUtils.init(); } - + @AfterClass - public static void afterClass() throws TopiaException { - if (context!=null) { - context.closeContext(); - } + public static void clean() { + TestUtils.clean(); } - protected static Properties getProperties() { + + @Ignore + protected Properties getProperties() { Properties config = new Properties(); - //config.setProperty("hibernate.hbm2ddl.auto", "create"); config.setProperty("hibernate.show_sql", "true"); 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.dialect", "org.hibernate.dialect.H2Dialect"); 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:target/data/topia-security;create=true;LOCK_MODE=0"); - + config.setProperty("hibernate.connection.url", "jdbc:h2:" + TestUtils.getDirDatabase().getAbsolutePath() + File.separator + "topia-security"); + + // add this to use security service + config.setProperty("topia.service.security", "org.codelutin.topia.security.TopiaSecurityServiceImpl"); return config; } + @Ignore + public void initDatabase() throws TopiaException { + + Properties config = getProperties(); + config.setProperty("hibernate.hbm2ddl.auto", "create"); + + /* Transaction */ + TopiaContext context = TopiaContextFactory.getContext(config); + TopiaContext childContext = context.beginTransaction(); + + /* DAOs */ + PersonDAO personDAO = TopiaServiceDAOHelper.getPersonDAO(childContext); + PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext); + + TopiaUserDAO topiaUserDAO = TopiaServiceDAOHelper.getTopiaUserDAO(childContext); + TopiaGroupDAO topiaGroupDAO = TopiaServiceDAOHelper.getTopiaGroupDAO(childContext); + TopiaEntityAuthorizationDAO topiaEntityAuthorizationDAO = TopiaServiceDAOHelper.getTopiaEntityAuthorizationDAO(childContext); + TopiaExpressionLinkDAO linkDAO = TopiaServiceDAOHelper.getTopiaExpressionLinkDAO(childContext); + TopiaAssociationAuthorizationDAO topiaAssociationAuthorizationDAO = TopiaServiceDAOHelper.getTopiaAssociationAuthorizationDAO(childContext); + + /* Création d'un admin */ + TopiaUser admin = topiaUserDAO.create(); + admin.setLogin("admin"); + admin.setPassword("azerty"); + admin.update(); + childContext.commitTransaction(); + + /* Création d'un utilisateur */ + TopiaUser thimel = topiaUserDAO.create(); + thimel.setLogin("thimel"); + thimel.setPassword("zou;bi@da"); + thimel.update(); + childContext.commitTransaction(); + + /* Création d'un groupe avec un utilisateur */ + TopiaUser ruchaud = topiaUserDAO.create(); + ruchaud.setLogin("ruchaud"); + ruchaud.setPassword("mdp"); + TopiaGroup groupRuchaud = topiaGroupDAO.create(); + groupRuchaud.setName("essai"); + + groupRuchaud.setTopiaUser(new ArrayList<TopiaUser>()); + ruchaud.addTopiaGroup(groupRuchaud); + + groupRuchaud.update(); + ruchaud.update(); + childContext.commitTransaction(); + + /* Création des personnes */ + Person benjamin = personDAO.create(); + benjamin.setName("poussin"); + benjamin.setFirstname("benjamin"); + personDAO.update(benjamin); + childContext.commitTransaction(); + + Person jacques = personDAO.create(); + jacques.setName("poussin"); + jacques.setFirstname("jacques"); + personDAO.update(jacques); + childContext.commitTransaction(); + + Person mylene = personDAO.create(); + mylene.setName("poussin"); + mylene.setFirstname("mylene"); + personDAO.update(mylene); + childContext.commitTransaction(); + + /* Création des annimaux */ + Pet debux = petDAO.create(); + debux.setName("debux"); + debux.setType("chat"); + debux.setPerson(jacques); + debux.update(); + childContext.commitTransaction(); + + Pet pluto = petDAO.create(); + pluto.setName("pluto"); + pluto.setType("chien"); + pluto.setPerson(jacques); + pluto.update(); + childContext.commitTransaction(); + + Pet fliper = petDAO.create(); + fliper.setName("fliper"); + fliper.setType("dauphin"); + fliper.setPerson(mylene); + fliper.update(); + childContext.commitTransaction(); + + /* Création des autorisations Entity */ + TopiaEntityAuthorization authorizationForAdmin = topiaEntityAuthorizationDAO.create(); + authorizationForAdmin.setExpression("*"); + authorizationForAdmin.setActions(15); + authorizationForAdmin.setPrincipals(admin.getTopiaId()); + authorizationForAdmin.update(); + childContext.commitTransaction(); + + TopiaEntityAuthorization authorizationForRuchaud = topiaEntityAuthorizationDAO.create(); + authorizationForRuchaud.setExpression(Person.class.getName() + "#*"); + authorizationForRuchaud.setActions(TopiaSecurityUtil.LOAD); + authorizationForRuchaud.setPrincipals(groupRuchaud.getTopiaId()); + authorizationForRuchaud.update(); + childContext.commitTransaction(); + + TopiaEntityAuthorization authorizationForThimel = topiaEntityAuthorizationDAO.create(); + authorizationForThimel.setExpression(jacques.getTopiaId()); + authorizationForThimel.setActions(TopiaSecurityUtil.LOAD); + authorizationForThimel.setPrincipals(thimel.getTopiaId()); + authorizationForThimel.update(); + childContext.commitTransaction(); + + /* Création d'une autorisation Link */ + TopiaExpressionLink link = linkDAO.create(); + link.setReplace(mylene.getTopiaId()); + link.setBy(jacques.getTopiaId()); + link.update(); + childContext.commitTransaction(); + + /* Création d'une authorisation association */ + TopiaAssociationAuthorization associationAuthorization = topiaAssociationAuthorizationDAO.create(); + associationAuthorization.setIdBeginAssociation(jacques.getTopiaId()); + associationAuthorization.setNameAssociation("pet"); + associationAuthorization.setActions(TopiaSecurityUtil.LOAD); + associationAuthorization.setPrincipals(ruchaud.getTopiaId()); + associationAuthorization.update(); + childContext.commitTransaction(); + + associationAuthorization = topiaAssociationAuthorizationDAO.create(); + associationAuthorization.setIdBeginAssociation(mylene.getTopiaId()); + associationAuthorization.setNameAssociation("pet"); + associationAuthorization.setActions(TopiaSecurityUtil.UPDATE); + associationAuthorization.setPrincipals(ruchaud.getTopiaId()); + associationAuthorization.update(); + childContext.commitTransaction(); + + childContext.closeContext(); + } + + @Before + public void setUp() throws TopiaException { + initDatabase(); + context = TopiaContextFactory.getContext(getProperties()); + securityManager = context.getService(TopiaSecurityService.class); + factoryFilter = new TopiaSecurityFactoryFilter(securityManager); + } + + @After + public void tearDown() throws TopiaException { + if (context != null) { + context.closeContext(); + } + } + @Test public void testLoginThimel() throws Exception { /* Authentification de l'utilisateur Thimel */ @@ -98,7 +269,7 @@ Subject subject = loginContext.getSubject(); /* Test */ - assertEquals(subject.getPrincipals().size(), 1); + Assert.assertEquals(subject.getPrincipals().size(), 1); loginContext.logout(); } @@ -112,7 +283,7 @@ Subject subject = loginContext.getSubject(); /* Test */ - assertEquals(subject.getPrincipals().size(), 2); + Assert.assertEquals(subject.getPrincipals().size(), 2); loginContext.logout(); } @@ -135,21 +306,20 @@ List<Person> findAllPerson = personDAO.findAll(); List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); - assertEquals(2, personsLOAD.size()); + Assert.assertEquals(2, personsLOAD.size()); List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); - assertEquals(0, personsUPDATE.size()); + Assert.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()); + Assert.assertEquals(0, petLOAD.size()); List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); - assertEquals(0, petUPDATE.size()); - + Assert.assertEquals(0, petUPDATE.size()); return null; } }, null); @@ -175,21 +345,21 @@ List<Person> findAllPerson = personDAO.findAll(); List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); - assertEquals(3, personsLOAD.size()); + //Assert.assertEquals(3, personsLOAD.size()); + Assert.assertEquals(12, personsLOAD.size()); List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); - assertEquals(0, personsUPDATE.size()); + Assert.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()); + Assert.assertEquals(2, petLOAD.size()); List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); - assertEquals(1, petUPDATE.size()); - + Assert.assertEquals(1, petUPDATE.size()); return null; } }, null); @@ -197,6 +367,7 @@ loginContext.logout(); } + @Test public void testAuthorizationAdmin() throws Exception { /* Authentification de l'utilisateur Ruchaud */ LoginContext loginContext = new LoginContext("topia", new TopiaCallbackHandler( @@ -214,21 +385,24 @@ List<Person> findAllPerson = personDAO.findAll(); List<Person> personsLOAD = factoryFilter.filter(findAllPerson, LOAD); - assertEquals(3, personsLOAD.size()); + //Assert.assertEquals(3, personsLOAD.size()); + Assert.assertEquals(15, personsLOAD.size()); List<Person> personsUPDATE = factoryFilter.filter(findAllPerson, UPDATE); - assertEquals(3, personsUPDATE.size()); + //Assert.assertEquals(3, personsUPDATE.size()); + Assert.assertEquals(15, personsUPDATE.size()); /* Annimaux */ PetDAO petDAO = TopiaServiceDAOHelper.getPetDAO(childContext); List<Pet> findAllPet = petDAO.findAll(); List<Pet> petLOAD = factoryFilter.filter(findAllPet, LOAD); - assertEquals(3, petLOAD.size()); + //Assert.assertEquals(3, petLOAD.size()); + Assert.assertEquals(15, petLOAD.size()); List<Pet> petUPDATE = factoryFilter.filter(findAllPet, UPDATE); - assertEquals(3, petUPDATE.size()); - + //Assert.assertEquals(3, petUPDATE.size()); + Assert.assertEquals(15, petUPDATE.size()); return null; } }, null); Added: topia-service/trunk/src/test/resources/log4j.properties =================================================================== --- topia-service/trunk/src/test/resources/log4j.properties (rev 0) +++ topia-service/trunk/src/test/resources/log4j.properties 2009-02-03 18:32:39 UTC (rev 1339) @@ -0,0 +1,9 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.codelutin=INFO \ No newline at end of file

1 0

r1338 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by chatellier＠users.labs.libre-entreprise.org 03 Feb '09

03 Feb '09

Author: chatellier Date: 2009-02-03 18:19:19 +0000 (Tue, 03 Feb 2009) New Revision: 1338 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: Mauvaise variable d'it?\195?\169ration Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-01-29 17:23:41 UTC (rev 1337) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-02-03 18:19:19 UTC (rev 1338) @@ -166,7 +166,7 @@ } protected void generateAttributes(Writer output, ObjectModelClass clazz, List<ObjectModelAttribute> attributes, String prefix) throws IOException { - for (ObjectModelAttribute attr : attributes) { + for (ObjectModelAttribute attr : clazz.getAttributes()) { ObjectModelAttribute reverse = attr.getReverseAttribute(); // pour les asso quoi qu'il arrive il faut les lier des 2 cotes

1 0

r1337 - in topia/trunk/topia-persistence/src: main/java/org/codelutin/topia/persistence test/java/org/codelutin/topia/persistence
by chatellier＠users.labs.libre-entreprise.org 29 Jan '09

29 Jan '09

Author: chatellier Date: 2009-01-29 17:23:41 +0000 (Thu, 29 Jan 2009) New Revision: 1337 Added: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntity.java topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/EntityVisitorExportXmlTest.java topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/ExportXMLVisitor.java Log: Ajout d'un implementation de parcourt par defaut. Added: 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 (rev 0) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java 2009-01-29 17:23:41 UTC (rev 1337) @@ -0,0 +1,112 @@ +/* *##% + * 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.topia.persistence; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.topia.TopiaException; + +/** + * Parcourt du graphes d'entité en profondeur. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 29 janv. 2009 $ + * By : $Author: chatellier $ + */ +public class DepthEntityVisitor implements EntityVisitor { + + private static Log log = LogFactory.getLog(DepthEntityVisitor.class); + + protected Collection<TopiaEntity> alreadyExplored; + + /** + * Le visiteur metier. + */ + protected EntityVisitor delegateVisitor; + + public DepthEntityVisitor(EntityVisitor delegateVisitor) { + + alreadyExplored = new ArrayList<TopiaEntity>(); + + this.delegateVisitor = delegateVisitor; + } + + /* + * @see org.codelutin.topia.persistence.EntityVisitor#start(org.codelutin.topia.persistence.TopiaEntity) + */ + @Override + public void start(TopiaEntity e) { + delegateVisitor.start(e); + alreadyExplored.add(e); + } + + /* + * @see org.codelutin.topia.persistence.EntityVisitor#visit(org.codelutin.topia.persistence.TopiaEntity, java.lang.Class, java.lang.Object) + */ + @Override + public void visit(TopiaEntity e, Class type, Object value) { + // si c'est une entité + if(value instanceof TopiaEntity) { + TopiaEntity entity = (TopiaEntity)value; + try { + if(!alreadyExplored.contains(entity)) { + entity.accept(this); + } + } catch (TopiaException e1) { + if(log.isErrorEnabled()) { + log.error("Error on depth exploration", e1); + } + } + } + else { + delegateVisitor.visit(e, type, value); + } + } + + /* + * @see org.codelutin.topia.persistence.EntityVisitor#visit(org.codelutin.topia.persistence.TopiaEntity, java.lang.Class, java.lang.Class, java.lang.Object) + */ + @Override + public void visit(TopiaEntity e, Class collectionType, Class type, + Object value) { + + Collection cValue = (Collection)value; + if(cValue != null && !cValue.isEmpty()) { + Iterator itOnValues = cValue.iterator(); + while(itOnValues.hasNext()) { + Object currentValue = itOnValues.next(); + visit(e, type, currentValue); + } + } + } + + /* + * @see org.codelutin.topia.persistence.EntityVisitor#end(org.codelutin.topia.persistence.TopiaEntity) + */ + @Override + public void end(TopiaEntity e) { + delegateVisitor.end(e); + } +} Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntity.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntity.java 2009-01-29 16:22:56 UTC (rev 1336) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntity.java 2009-01-29 17:23:41 UTC (rev 1337) @@ -130,4 +130,12 @@ public void removeVetoableListener(VetoableChangeListener vetoable); + /** + * Parcourt de l'entité via un visiteur. + * + * @param visitor visitor + * @throws TopiaException + */ + public void accept(EntityVisitor visitor) throws TopiaException; + } //TopiaEntity Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/EntityVisitorExportXmlTest.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/EntityVisitorExportXmlTest.java 2009-01-29 16:22:56 UTC (rev 1336) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/EntityVisitorExportXmlTest.java 2009-01-29 17:23:41 UTC (rev 1337) @@ -31,7 +31,6 @@ import org.codelutin.topiatest.Address; import org.codelutin.topiatest.AddressDAO; import org.codelutin.topiatest.Company; -import org.codelutin.topiatest.CompanyAbstract; import org.codelutin.topiatest.CompanyDAO; import org.codelutin.topiatest.Department; import org.codelutin.topiatest.DepartmentDAO; @@ -161,10 +160,13 @@ /** * Test l'export XML via un visiteur. + * + * Parcourt en profondeur. + * * @throws TopiaException */ @Test - public void testExportXML() throws TopiaException { + public void testExportXMLDepth() throws TopiaException { TopiaContext rootContext = TopiaContextFactory.getContext(config); TopiaContext context = rootContext.beginTransaction(); @@ -172,13 +174,13 @@ CompanyDAO companyDAO = TopiaTestDAOHelper.getCompanyDAO(context); Company clCompany = companyDAO.findByName("CodeLutin"); - ExportXMLVisitor visitor = new ExportXMLVisitor(); - // FIXME voir pour l'abstract - ((CompanyAbstract)clCompany).accept(visitor); + EntityVisitor delegateVisitor = new ExportXMLVisitor(); + EntityVisitor visitor = new DepthEntityVisitor(delegateVisitor); + clCompany.accept(visitor); context.closeContext(); if(log.isInfoEnabled()) { - log.info("Export XML = \n" + visitor.toString()); + log.info("Export XML = \n" + delegateVisitor.toString()); } } } Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/ExportXMLVisitor.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/ExportXMLVisitor.java 2009-01-29 16:22:56 UTC (rev 1336) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/ExportXMLVisitor.java 2009-01-29 17:23:41 UTC (rev 1337) @@ -80,24 +80,7 @@ @Override public void visit(TopiaEntity e, Class collectionType, Class type, Object value) { - if(log.isDebugEnabled()) { - log.debug("visit collection : " + e); - } - - - Collection cValue = (Collection)value; - if(cValue != null && !cValue.isEmpty()) { - buffer.append("<" + collectionType.getName() + ">\n"); - Iterator itOnValues = cValue.iterator(); - while(itOnValues.hasNext()) { - TopiaEntityAbstract entity = (TopiaEntityAbstract)itOnValues.next(); - - buffer.append("<" + type.getName() + ">\n"); - buffer.append("TODO sublist visit\n"); - buffer.append("</" + type.getName() + ">\n"); - } - buffer.append("</" + collectionType.getName() + ">\n"); - } + } /*

1 0