Author: fdesbois Date: 2009-05-14 14:12:37 +0000 (Thu, 14 May 2009) New Revision: 1456 Added: topia/trunk/topia-persistence/src/main/java/org/nuiton/ topia/trunk/topia-persistence/src/test/java/org/nuiton/ topia/trunk/topia-soa/src/main/java/org/nuiton/ topia/trunk/topia-soa/src/test/java/org/nuiton/ topia/trunk/topia-ui/src/main/java/org/nuiton/ topia/trunk/topia-ui/src/test/java/org/nuiton/ Removed: topia/trunk/topia-persistence/src/main/java/org/codelutin/ topia/trunk/topia-persistence/src/test/java/org/codelutin/ topia/trunk/topia-soa/src/main/java/org/codelutin/ topia/trunk/topia-soa/src/test/java/org/codelutin/ topia/trunk/topia-ui/src/main/java/org/codelutin/ topia/trunk/topia-ui/src/test/java/org/codelutin/ Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNotFoundException.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextEvent.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesEvent.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesVetoable.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityEvent.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityListener.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityVetoable.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionListener.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionVetoable.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaService.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaRelationValidator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/package.html topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/SearchFields.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOAbstract.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAODelegator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/hibernate/FlatFilePersister.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/hibernate/TopiaDAOHibernate.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Creator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Deletor.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Loador.java topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java topia/trunk/topia-persistence/src/main/resources/log4j.properties topia/trunk/topia-persistence/src/site/rst/Devel.rst topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst topia/trunk/topia-persistence/src/site/rst/howto.rst topia/trunk/topia-persistence/src/site/rst/security.rst topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/EntityStateTest.java topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaGeneratorUtilTest.java topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/ExportXMLVisitor.java topia/trunk/topia-persistence/src/test/xmi/topiatest.zargo topia/trunk/topia-soa/pom.xml topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/Protocol.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaApplicationService.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaApplicationServiceAbstract.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaApplicationServiceFactory.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaProxy.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaServiceProvider.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaServiceServer.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaServiceServerAbstract.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/clients/RMIProxy.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/clients/SOAPProxy.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/clients/XMLRPCProxy.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/RMIServer.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/RemoteClassLoader.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/SOAPServer.java topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/XMLRPCServer.java topia/trunk/topia-soa/src/site/rst/ApplicationServiceGeneration.rst topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleService.java topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleServiceImpl.java topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleServiceServer.java topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleServiceTest.java topia/trunk/topia-soa/src/test/log4j.properties topia/trunk/topia-soa/src/test/resources/TopiaApplicationServices.properties topia/trunk/topia-soa/src/test/xmi/soaTest.zargo topia/trunk/topia-ui/pom.xml topia/trunk/topia-ui/src/main/java/org/nuiton/topia/generator/TapestryWebGenerator.java topia/trunk/topia-ui/src/site/rst/UseCase.rst topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/Contact.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/ContactDAO.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/Society.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/SocietyDAO.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/utils/HibernateUtils.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/base/BasePage.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/base/SessionBean.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/components/ContextLink.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/components/Layout.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/LoginForm.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/ContactForm.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/ContactList.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/ContactView.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/SocietyForm.java topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/SocietyView.java topia/trunk/topia-ui/src/test/resources/log4j.properties topia/trunk/topia-ui/src/test/xmi/contact.zargo Log: migration vers nuiton : changement parent (mavenpom), changement lutinutil en eugene, renommage packages et groupId en org.nuiton Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/pom.xml 2009-05-14 14:12:37 UTC (rev 1456) @@ -7,11 +7,12 @@ <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.5.4</version> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> <version>2.2.0-SNAPSHOT</version> @@ -25,8 +26,8 @@ <dependencies> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> <version>${generator.version}</version> <scope>provided</scope> </dependency> @@ -136,6 +137,13 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> + <!-- branch 5.1 : ne fonctionne pas en 6+ --> <dependency> <groupId>jetty</groupId> @@ -168,7 +176,7 @@ <labs.project>topia</labs.project> <!-- libs version --> - <generator.version>0.64</generator.version> + <generator.version>1.0.0-SNAPSHOT</generator.version> <processor.version>0.18</processor.version> <lutinutil.version>1.0.6</lutinutil.version> @@ -211,8 +219,8 @@ </plugin> <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>maven-eugene-plugin</artifactId> <version>${generator.version}</version> <inherited>true</inherited> <configuration> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/pom.xml 2009-05-14 14:12:37 UTC (rev 1456) @@ -8,12 +8,12 @@ <!-- ************************************************************* --> <parent> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> <version>2.2.0-SNAPSHOT</version> </parent> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <dependencies> @@ -24,8 +24,8 @@ </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> </dependency> <dependency> @@ -57,6 +57,11 @@ <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> </dependencies> <!-- ************************************************************* --> @@ -100,8 +105,8 @@ </plugin> <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>maven-eugene-plugin</artifactId> <executions> <execution> <id>Test Generator</id> @@ -109,10 +114,10 @@ <configuration> <testPhase>true</testPhase> <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <fullPackagePath>org.codelutin.topia</fullPackagePath> - <extractedPackages>org.codelutin.topia</extractedPackages> - <defaultPackage>org.codelutin.topia</defaultPackage> + <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <extractedPackages>org.nuiton.topia</extractedPackages> + <defaultPackage>org.nuiton.topia</defaultPackage> <extraClassPathDirectory>target/classes</extraClassPathDirectory> </configuration> <goals> Copied: topia/trunk/topia-persistence/src/main/java/org/nuiton (from rev 1455, topia/trunk/topia-persistence/src/main/java/org/codelutin) Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/ContextUtil.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia; +package org.nuiton.topia; import java.io.IOException; import java.net.URISyntaxException; @@ -159,7 +159,7 @@ /** * Initialisation de la base de données à redéfinir - * @throws org.codelutin.topia.TopiaException + * @throws org.nuiton.topia.TopiaException */ protected void initDB() throws TopiaException { @@ -224,7 +224,7 @@ /** * Récupération transaction courante (ou création) * @return - * @throws org.codelutin.topia.TopiaException + * @throws org.nuiton.topia.TopiaException */ public TopiaContext transaction() throws TopiaException { if (!this.init) { @@ -238,7 +238,7 @@ /** * Commit de la transaction courante - * @throws org.codelutin.topia.TopiaException + * @throws org.nuiton.topia.TopiaException */ public void commit() throws TopiaException { this.transaction().commitTransaction(); @@ -250,7 +250,7 @@ /** * Fermeture de la transaction courante - * @throws org.codelutin.topia.TopiaException + * @throws org.nuiton.topia.TopiaException */ public void close() throws TopiaException { if (this.init && this.currTransaction != null) { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/TopiaContext.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,16 +27,16 @@ * by : $Author$ */ -package org.codelutin.topia; +package org.nuiton.topia; -import org.codelutin.topia.event.TopiaContextListener; -import org.codelutin.topia.event.TopiaEntitiesVetoable; -import org.codelutin.topia.event.TopiaEntityListener; -import org.codelutin.topia.event.TopiaEntityVetoable; -import org.codelutin.topia.event.TopiaTransactionListener; -import org.codelutin.topia.event.TopiaTransactionVetoable; -import org.codelutin.topia.framework.TopiaService; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.event.TopiaContextListener; +import org.nuiton.topia.event.TopiaEntitiesVetoable; +import org.nuiton.topia.event.TopiaEntityListener; +import org.nuiton.topia.event.TopiaEntityVetoable; +import org.nuiton.topia.event.TopiaTransactionListener; +import org.nuiton.topia.event.TopiaTransactionVetoable; +import org.nuiton.topia.framework.TopiaService; +import org.nuiton.topia.persistence.TopiaEntity; import java.beans.PropertyChangeListener; import java.io.File; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/TopiaContextFactory.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * by : $Author$ */ -package org.codelutin.topia; +package org.nuiton.topia; import java.util.ArrayList; import java.util.List; @@ -37,8 +37,8 @@ import org.apache.commons.collections.map.AbstractReferenceMap; import org.apache.commons.collections.map.ReferenceMap; -import org.codelutin.topia.framework.TopiaContextImpl; -import org.codelutin.topia.framework.TopiaUtil; +import org.nuiton.topia.framework.TopiaContextImpl; +import org.nuiton.topia.framework.TopiaUtil; /** * @author poussin Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/TopiaException.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * by : $Author$ */ -package org.codelutin.topia; +package org.nuiton.topia; /** * @author poussin Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNotFoundException.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/TopiaNotFoundException.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaNotFoundException.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * by : $Author$ */ -package org.codelutin.topia; +package org.nuiton.topia; /** * @author poussin Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/TopiaRuntimeException.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia; +package org.nuiton.topia; /** * TopiaRuntimeException Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/TopiaVetoException.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * by : $Author$ */ -package org.codelutin.topia; +package org.nuiton.topia; /** * @author poussin Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextEvent.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaContextEvent.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextEvent.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,11 +15,11 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.event; +package org.nuiton.topia.event; import java.util.EventObject; -import org.codelutin.topia.TopiaContext; +import org.nuiton.topia.TopiaContext; /** * TopiaContextEvent Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaContextListener.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.event; +package org.nuiton.topia.event; import java.util.EventListener; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesEvent.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaEntitiesEvent.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesEvent.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,13 +15,13 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.event; +package org.nuiton.topia.event; import java.util.EventObject; import java.util.List; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; public class TopiaEntitiesEvent<E extends TopiaEntity> extends EventObject { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesVetoable.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaEntitiesVetoable.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesVetoable.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,12 +15,12 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.event; +package org.nuiton.topia.event; import java.util.EventListener; import java.util.List; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntity; /** * Permet de lancer des événements liés au récupération des données Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityEvent.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaEntityEvent.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityEvent.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,12 +15,12 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.event; +package org.nuiton.topia.event; import java.util.EventObject; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; public class TopiaEntityEvent extends EventObject { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityListener.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaEntityListener.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityListener.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.event; +package org.nuiton.topia.event; import java.util.EventListener; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityVetoable.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaEntityVetoable.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityVetoable.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.event; +package org.nuiton.topia.event; import java.util.EventListener; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaTransactionEvent.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,16 +15,16 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.event; +package org.nuiton.topia.event; import java.util.EventObject; import java.util.Map; import java.util.Set; import org.apache.commons.collections.map.IdentityMap; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.framework.EntityState; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.framework.EntityState; +import org.nuiton.topia.persistence.TopiaEntity; public class TopiaTransactionEvent extends EventObject { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionListener.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaTransactionListener.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionListener.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.event; +package org.nuiton.topia.event; import java.util.EventListener; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionVetoable.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/event/TopiaTransactionVetoable.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionVetoable.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.event; +package org.nuiton.topia.event; import java.util.EventListener; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/EntityState.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * by : $Author$ */ -package org.codelutin.topia.framework; +package org.nuiton.topia.framework; /** * Used to know the state of entity during transaction Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,25 +27,25 @@ * Last update: $Date$ by : $Author$ */ -package org.codelutin.topia.framework; +package org.nuiton.topia.framework; import org.apache.commons.collections.set.MapBackedSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; -import org.codelutin.topia.event.TopiaContextListener; -import org.codelutin.topia.event.TopiaEntitiesVetoable; -import org.codelutin.topia.event.TopiaEntityListener; -import org.codelutin.topia.event.TopiaEntityVetoable; -import org.codelutin.topia.event.TopiaTransactionListener; -import org.codelutin.topia.event.TopiaTransactionVetoable; -import org.codelutin.topia.persistence.TopiaDAO; -import org.codelutin.topia.persistence.TopiaDAODelegator; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.topia.persistence.TopiaId; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.event.TopiaContextListener; +import org.nuiton.topia.event.TopiaEntitiesVetoable; +import org.nuiton.topia.event.TopiaEntityListener; +import org.nuiton.topia.event.TopiaEntityVetoable; +import org.nuiton.topia.event.TopiaTransactionListener; +import org.nuiton.topia.event.TopiaTransactionVetoable; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaDAODelegator; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaId; import org.codelutin.util.ArrayUtil; import org.dom4j.Document; import org.dom4j.DocumentException; @@ -322,7 +322,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.framework.TopiaContextImplementor#getAllServices() + * @see org.nuiton.topia.framework.TopiaContextImplementor#getAllServices() */ @Override public Collection<TopiaService> getAllServices() { @@ -362,7 +362,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.framework.TopiaContextImplementor#getParentContext() + * @see org.nuiton.topia.framework.TopiaContextImplementor#getParentContext() */ @Override public TopiaContextImplementor getParentContext() { @@ -372,7 +372,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.framework.TopiaContextImplementor#getRootContext() + * @see org.nuiton.topia.framework.TopiaContextImplementor#getRootContext() */ @Override public TopiaContextImplementor getRootContext() { @@ -386,7 +386,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.framework.TopiaContextImplementor#getConfig() + * @see org.nuiton.topia.framework.TopiaContextImplementor#getConfig() */ @Override public Properties getConfig() { @@ -397,7 +397,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaContext#createSchema() + * @see org.nuiton.topia.TopiaContext#createSchema() */ @Override public void createSchema() throws TopiaException { @@ -416,7 +416,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaContext#createSchema() + * @see org.nuiton.topia.TopiaContext#createSchema() */ @Override public void updateSchema() throws TopiaException { @@ -437,7 +437,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.framework.TopiaContextImplementor#getHibernate() + * @see org.nuiton.topia.framework.TopiaContextImplementor#getHibernate() */ @Override public Session getHibernate() throws TopiaException { @@ -451,7 +451,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.framework.TopiaContextImplementor#getHibernateFactory() + * @see org.nuiton.topia.framework.TopiaContextImplementor#getHibernateFactory() */ @Override public SessionFactory getHibernateFactory() throws TopiaNotFoundException { @@ -589,7 +589,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.framework.TopiaContextImplementor#getDAO(java.lang.Class) + * @see org.nuiton.topia.framework.TopiaContextImplementor#getDAO(java.lang.Class) */ @SuppressWarnings("unchecked") @Override @@ -626,9 +626,9 @@ "topia.dao." + entityClass.getName(), defaultDAOClassname); if ("hibernate".equals(daoClassname)) { // FIXME nom en dur ? - daoClassname = "org.codelutin.topia.persistence.hibernate.TopiaDAOHibernate"; + daoClassname = "org.nuiton.topia.persistence.hibernate.TopiaDAOHibernate"; } else if ("flatfile".equals(daoClassname)) { - daoClassname = "org.codelutin.topia.persistence.flatfile.TopiaDAOFlatFile"; + daoClassname = "org.nuiton.topia.persistence.flatfile.TopiaDAOFlatFile"; } try { @@ -668,7 +668,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.TopiaContext#beginTransaction() + * @see org.nuiton.topia.TopiaContext#beginTransaction() */ @Override public TopiaContext beginTransaction() throws TopiaException { @@ -703,7 +703,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.TopiaContext#commitTransaction() + * @see org.nuiton.topia.TopiaContext#commitTransaction() */ @Override public void commitTransaction() throws TopiaException { @@ -740,7 +740,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.TopiaContext#rollbackTransaction() + * @see org.nuiton.topia.TopiaContext#rollbackTransaction() */ @Override public void rollbackTransaction() throws TopiaException { @@ -842,7 +842,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaContext#findByTopiaId(java.lang.String) + * @see org.nuiton.topia.TopiaContext#findByTopiaId(java.lang.String) */ @Override public TopiaEntity findByTopiaId(String topiaId) throws TopiaException { @@ -857,7 +857,7 @@ /* * (non-Javadoc) - * @see org.codelutin.topia.TopiaContext#find(java.lang.String, java.lang.Object[]) + * @see org.nuiton.topia.TopiaContext#find(java.lang.String, java.lang.Object[]) */ @Override public List find(String hql, Object... args) throws TopiaException { @@ -932,7 +932,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaContext#add(org.codelutin.topia.persistence.TopiaEntity) + * @see org.nuiton.topia.TopiaContext#add(org.nuiton.topia.persistence.TopiaEntity) */ @Override public void add(TopiaEntity e) throws TopiaException { @@ -1160,7 +1160,7 @@ * * Only work for h2 database * - * @see org.codelutin.topia.TopiaContext#restore(java.io.File) + * @see org.nuiton.topia.TopiaContext#restore(java.io.File) */ @Override public void restore(File file) throws TopiaException { @@ -1250,7 +1250,7 @@ /** * Only h2 supported for now - * @see org.codelutin.topia.TopiaContext#clear(boolean) + * @see org.nuiton.topia.TopiaContext#clear(boolean) */ @Override public void clear(boolean dropDatabase) throws TopiaException { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImplementor.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * by : $Author$ */ -package org.codelutin.topia.framework; +package org.nuiton.topia.framework; import java.util.Collection; import java.util.List; @@ -35,11 +35,11 @@ import java.util.Properties; import java.util.Set; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; -import org.codelutin.topia.persistence.TopiaDAO; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaFiresSupport.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.framework; +package org.nuiton.topia.framework; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -30,21 +30,21 @@ import org.apache.commons.collections.map.IdentityMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaVetoException; -import org.codelutin.topia.event.TopiaContextEvent; -import org.codelutin.topia.event.TopiaContextListener; -import org.codelutin.topia.event.TopiaEntitiesEvent; -import org.codelutin.topia.event.TopiaEntitiesVetoable; -import org.codelutin.topia.event.TopiaEntityEvent; -import org.codelutin.topia.event.TopiaEntityListener; -import org.codelutin.topia.event.TopiaEntityVetoable; -import org.codelutin.topia.event.TopiaTransactionEvent; -import org.codelutin.topia.event.TopiaTransactionListener; -import org.codelutin.topia.event.TopiaTransactionVetoable; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.topia.persistence.TopiaEntityAbstract; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaVetoException; +import org.nuiton.topia.event.TopiaContextEvent; +import org.nuiton.topia.event.TopiaContextListener; +import org.nuiton.topia.event.TopiaEntitiesEvent; +import org.nuiton.topia.event.TopiaEntitiesVetoable; +import org.nuiton.topia.event.TopiaEntityEvent; +import org.nuiton.topia.event.TopiaEntityListener; +import org.nuiton.topia.event.TopiaEntityVetoable; +import org.nuiton.topia.event.TopiaTransactionEvent; +import org.nuiton.topia.event.TopiaTransactionListener; +import org.nuiton.topia.event.TopiaTransactionVetoable; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityAbstract; import org.codelutin.util.CategorisedListenerSet; import org.codelutin.util.ListenerSet; import org.hibernate.Session; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaService.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaService.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaService.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * by : $Author$ */ -package org.codelutin.topia.framework; +package org.nuiton.topia.framework; /** * Permet d'implanter un service Topia. Il faut absolument créer une interface Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaUtil.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,12 +27,12 @@ * Last update: $Date$ by : $Author$ */ -package org.codelutin.topia.framework; +package org.nuiton.topia.framework; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaNotFoundException; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.persistence.TopiaEntity; import org.codelutin.util.RecursiveProperties; import org.codelutin.util.Resource; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/BeanGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,9 +27,9 @@ * par : $Author: chemit $ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.TAG_ANNOTATION; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.TAG_ANNOTATION; import java.io.File; import java.io.IOException; @@ -43,15 +43,15 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelParameter; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.topia.persistence.TopiaEntity; /** * DTO generator Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOAbstractGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import java.io.File; import java.io.IOException; @@ -36,13 +36,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.codelutin.generator.Generator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.codelutin.util.StringUtil; /** @@ -83,8 +83,8 @@ import java.util.List; import java.util.Arrays; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; }*/ boolean enableSecurity = ( clazz.hasTagValue(TopiaGeneratorUtil.TAG_SECURITY_CREATE) || @@ -97,13 +97,13 @@ /*{ import java.util.ArrayList; import java.security.Permission; -import org.codelutin.topia.taas.entities.TaasAuthorizationImpl; -import org.codelutin.topia.taas.jaas.TaasPermission; -import org.codelutin.topia.persistence.TopiaDAO; -import static org.codelutin.topia.taas.TaasUtil.CREATE; -import static org.codelutin.topia.taas.TaasUtil.DELETE; -import static org.codelutin.topia.taas.TaasUtil.LOAD; -import static org.codelutin.topia.taas.TaasUtil.UPDATE; +import org.nuiton.topia.taas.entities.TaasAuthorizationImpl; +import org.nuiton.topia.taas.jaas.TaasPermission; +import org.nuiton.topia.persistence.TopiaDAO; +import static org.nuiton.topia.taas.TaasUtil.CREATE; +import static org.nuiton.topia.taas.TaasUtil.DELETE; +import static org.nuiton.topia.taas.TaasUtil.LOAD; +import static org.nuiton.topia.taas.TaasUtil.UPDATE; }*/ } String clazzName = clazz.getName(); @@ -127,10 +127,10 @@ } } if (extendClass.length() == 0) { - extendClass += "org.codelutin.topia.persistence.TopiaDAODelegator<E>"; + extendClass += "org.nuiton.topia.persistence.TopiaDAODelegator<E>"; } - /*{<%=extendClass%> implements org.codelutin.topia.persistence.TopiaDAO<E> { + /*{<%=extendClass%> implements org.nuiton.topia.persistence.TopiaDAO<E> { public Class<E> getEntityClass() { return (Class<E>)<%=clazzName%>.class; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,15 +27,15 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import java.io.File; import java.io.IOException; import java.io.Writer; -import org.codelutin.generator.Generator; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModelClass; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModelClass; public class DAOGenerator extends ObjectModelGenerator { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * Mise a jour: $Date$ par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import java.io.File; import java.io.IOException; @@ -37,11 +37,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.Generator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelClass; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelClass; /** * Ce generateur permet d'avoir une classe permettant de recuperer les DAO @@ -285,11 +285,11 @@ java.util.Set<String> imports = new java.util.HashSet<String>(java.util.Arrays.asList( java.lang.reflect.Array.class.getName(), java.util.Arrays.class.getName(), - org.codelutin.topia.TopiaContext.class.getName(), - org.codelutin.topia.TopiaException.class.getName(), - org.codelutin.topia.framework.TopiaContextImplementor.class.getName(), - org.codelutin.topia.persistence.TopiaDAO.class.getName(), - org.codelutin.topia.persistence.TopiaEntity.class.getName())); + org.nuiton.topia.TopiaContext.class.getName(), + org.nuiton.topia.TopiaException.class.getName(), + org.nuiton.topia.framework.TopiaContextImplementor.class.getName(), + org.nuiton.topia.persistence.TopiaDAO.class.getName(), + org.nuiton.topia.persistence.TopiaEntity.class.getName())); for (ObjectModelClass clazz : classes) { String clazzFQN = clazz.getQualifiedName(); Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOImplGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,15 +27,15 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import java.io.File; import java.io.IOException; import java.io.Writer; -import org.codelutin.generator.Generator; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModelClass; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModelClass; public class DAOImplGenerator extends ObjectModelGenerator { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DTOGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,9 +27,9 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.TAG_ANNOTATION; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.TAG_ANNOTATION; import java.io.File; import java.io.IOException; @@ -38,13 +38,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelInterface; /** * DTO generator @@ -410,7 +410,7 @@ } } else { //NMultiplicity if (!attr.hasAssociationClass()) { //Méthodes remplacées par des accesseurs sur les classes d'assoc - String reverseAttrName = reverse.getName(); + String nMultType; if (attr.isOrdered()) { nMultType = "List<" + attrTypeDTO + ">"; @@ -429,7 +429,8 @@ /*{ public <%=attrTypeDTO%> addChild(<%=attrTypeDTO%> <%=attrName%>) { this.<%=attrName%>.add(<%=attrName%>); }*/ - if (reverse.isNavigable()) { + if (reverse != null && reverse.isNavigable()) { + String reverseAttrName = reverse.getName(); /*{ <%=attrName%>.set<%=GeneratorUtil.capitalize(reverseAttrName)%>(this); }*/ } @@ -441,7 +442,8 @@ /*{ public void removeChild(<%=attrTypeDTO%> <%=attrName%>) { this.<%=attrName%>.remove(<%=attrName%>); }*/ - if (reverse.isNavigable()) { + if (reverse != null && reverse.isNavigable()) { + String reverseAttrName = reverse.getName(); /*{ <%=attrName%>.set<%=GeneratorUtil.capitalize(reverseAttrName)%>(null); }*/ } Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,19 +27,19 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.Generator; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.shouldBeAbstract; -import org.codelutin.topia.persistence.TopiaEntityAbstract; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.shouldBeAbstract; +import org.nuiton.topia.persistence.TopiaEntityAbstract; import java.io.File; import java.io.IOException; @@ -95,11 +95,11 @@ }*/ List<String> imports = TopiaGeneratorUtil.getImports(clazz, org.apache.commons.lang.builder.ToStringBuilder.class.getName(), - org.codelutin.topia.TopiaException.class.getName(), - org.codelutin.topia.framework.TopiaContextImplementor.class.getName(), - org.codelutin.topia.persistence.TopiaEntity.class.getName(), + org.nuiton.topia.TopiaException.class.getName(), + org.nuiton.topia.framework.TopiaContextImplementor.class.getName(), + org.nuiton.topia.persistence.TopiaEntity.class.getName(), TopiaEntityAbstract.class.getName(), - org.codelutin.topia.persistence.EntityVisitor.class.getName(), + org.nuiton.topia.persistence.EntityVisitor.class.getName(), java.util.List.class.getName(), java.util.ArrayList.class.getName(), java.io.Serializable.class.getName() @@ -538,7 +538,7 @@ *) @Override public <%=attrType%> get<%=GeneratorUtil.capitalize(attrName)%>ByTopiaId(String topiaId) { - return org.codelutin.topia.persistence.util.TopiaEntityHelper.getEntityByTopiaId(<%=attrName%>, topiaId); + return org.nuiton.topia.persistence.util.TopiaEntityHelper.getEntityByTopiaId(<%=attrName%>, topiaId); } /* (non-Javadoc) @@ -635,7 +635,7 @@ *) @Override public <%=assocClassFQN%> get<%=GeneratorUtil.capitalize(assocAttrName)%>ByTopiaId(String topiaId) { - return org.codelutin.topia.persistence.util.TopiaEntityHelper.getEntityByTopiaId(<%=assocAttrName%>, topiaId); + return org.nuiton.topia.persistence.util.TopiaEntityHelper.getEntityByTopiaId(<%=assocAttrName%>, topiaId); } /* (non-Javadoc) Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityDTOGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,10 +27,10 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.TAG_ANNOTATION; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.TAG_ANNOTATION; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; import java.io.File; import java.io.IOException; @@ -39,12 +39,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; /** * Generateur d'entites abstraites. Il s'agit de l'implatation par defaut d'une Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -29,20 +29,20 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.Generator; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.PERSISTENCE_TYPE_HIBERNATE; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.STEREOTYPE_ENTITY; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.TAG_ACCESS; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.PERSISTENCE_TYPE_HIBERNATE; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.STEREOTYPE_ENTITY; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.TAG_ACCESS; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; import java.io.File; import java.io.IOException; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityImplGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,17 +27,17 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import java.io.File; import java.io.IOException; import java.io.Writer; import java.util.Collection; -import org.codelutin.generator.Generator; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelOperation; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelOperation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityInterfaceGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,25 +27,25 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.Generator; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelParameter; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.isBooleanType; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.isDateType; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.isNumericType; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.isTextType; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.isBooleanType; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.isDateType; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.isNumericType; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.isTextType; import java.io.File; import java.io.IOException; @@ -81,7 +81,7 @@ } /* (non-Javadoc) - * @see org.codelutin.generator.ObjectModelGenerator#generateFromInterface(java.io.Writer, org.codelutin.generator.models.object.ObjectModelInterface) + * @see org.nuiton.eugene.ObjectModelGenerator#generateFromInterface(java.io.Writer, org.nuiton.eugene.models.object.ObjectModelInterface) */ @Override public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException { @@ -181,8 +181,8 @@ } /*{package <%=classifier.getPackageName()%>; -import org.codelutin.topia.persistence.SearchFields; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.SearchFields; +import org.nuiton.topia.persistence.TopiaEntity; }*/ if (TopiaGeneratorUtil.hasDocumentation(classifier)) { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/InterfaceGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,17 +27,17 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.Generator; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelParameter; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; import java.io.File; import java.io.IOException; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaGeneratorUtil.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * Mise a jour: $Date: 2009-01-15 00:01:45 +0100 (jeu 15 jan 2009) $ par : $Author: tchemit $ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import java.util.ArrayList; import java.util.Arrays; @@ -39,17 +39,17 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; -import org.codelutin.generator.Generator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.models.Model; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelElement; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelParameter; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.Model; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; /** Classe regroupant divers méthodes utiles pour la génération des entités */ public class TopiaGeneratorUtil extends GeneratorUtil { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaJavaValidator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,15 +16,15 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import java.util.ArrayList; import java.util.List; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.validator.ObjectModelValidator; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.validator.ObjectModelValidator; /** * Validateur qui valide : @@ -50,7 +50,7 @@ } /* - * @see org.codelutin.generator.models.object.validator.ObjectModelValidator#validateAttribute(org.codelutin.generator.models.object.ObjectModelAttribute) + * @see org.nuiton.eugene.models.object.validator.ObjectModelValidator#validateAttribute(org.nuiton.eugene.models.object.ObjectModelAttribute) */ @Override protected boolean validateAttribute(ObjectModelAttribute attr) { @@ -79,7 +79,7 @@ } /* - * @see org.codelutin.generator.models.object.validator.ObjectModelValidator#validateClass(org.codelutin.generator.models.object.ObjectModelClass) + * @see org.nuiton.eugene.models.object.validator.ObjectModelValidator#validateClass(org.nuiton.eugene.models.object.ObjectModelClass) */ @Override protected boolean validateClass(ObjectModelClass clazz) { @@ -104,7 +104,7 @@ } /* - * @see org.codelutin.generator.models.object.validator.ObjectModelValidator#validateModel(org.codelutin.generator.models.object.ObjectModel) + * @see org.nuiton.eugene.models.object.validator.ObjectModelValidator#validateModel(org.nuiton.eugene.models.object.ObjectModel) */ @Override protected boolean validateModel(ObjectModel model) { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaMetaGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -28,22 +28,22 @@ * Mise a jour: $Date$ par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.validator.AttributeNamesValidator; -import org.codelutin.generator.models.object.validator.ClassNamesValidator; -import org.codelutin.generator.models.object.validator.ObjectModelValidator; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.validator.AttributeNamesValidator; +import org.nuiton.eugene.models.object.validator.ClassNamesValidator; +import org.nuiton.eugene.models.object.validator.ObjectModelValidator; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.codelutin.generator.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClass; /** * Cette classe est un Generateur qui constitue le point d'entree dans ToPIA. Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaRelationValidator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/TopiaRelationValidator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaRelationValidator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,11 +27,11 @@ * par : $Author$ */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; -import org.codelutin.generator.models.object.ObjectModel; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.validator.ObjectModelValidator; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.validator.ObjectModelValidator; /** * Validateur pour les relations du modèle. @@ -55,7 +55,7 @@ } /* (non-Javadoc) - * @see org.codelutin.generator.models.object.validator.ObjectModelValidator#validateAttribute(org.codelutin.generator.models.object.ObjectModelAttribute) + * @see org.nuiton.eugene.models.object.validator.ObjectModelValidator#validateAttribute(org.nuiton.eugene.models.object.ObjectModelAttribute) */ @Override protected boolean validateAttribute(ObjectModelAttribute attr) { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/package.html =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/package.html 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/package.html 2009-05-14 14:12:37 UTC (rev 1456) @@ -99,7 +99,7 @@ <p>à la place flatfile il est possible de mettre le FQN du DAO utilisé par exemple - org.codelutin.topia.persistence.flatfile.TopiaDAOFlatFile</p> + org.nuiton.topia.persistence.flatfile.TopiaDAOFlatFile</p> <p>Si directory est absent alors "." est utilisé</p> Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,14 +16,14 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; import java.util.ArrayList; import java.util.Collection; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; /** * Parcourt du graphes d'entité en profondeur. @@ -53,7 +53,7 @@ } /* - * @see org.codelutin.topia.persistence.EntityVisitor#start(org.codelutin.topia.persistence.TopiaEntity) + * @see org.nuiton.topia.persistence.EntityVisitor#start(org.nuiton.topia.persistence.TopiaEntity) */ @Override public void start(TopiaEntity e) { @@ -62,7 +62,7 @@ } /* - * @see org.codelutin.topia.persistence.EntityVisitor#visit(org.codelutin.topia.persistence.TopiaEntity, java.lang.Class, java.lang.Object) + * @see org.nuiton.topia.persistence.EntityVisitor#visit(org.nuiton.topia.persistence.TopiaEntity, java.lang.Class, java.lang.Object) */ @Override public void visit(TopiaEntity e, String name, Class type, Object value) { @@ -85,7 +85,7 @@ } /* - * @see org.codelutin.topia.persistence.EntityVisitor#visit(org.codelutin.topia.persistence.TopiaEntity, java.lang.Class, java.lang.Class, java.lang.Object) + * @see org.nuiton.topia.persistence.EntityVisitor#visit(org.nuiton.topia.persistence.TopiaEntity, java.lang.Class, java.lang.Class, java.lang.Object) */ @Override public void visit(TopiaEntity e, String name, Class collectionType, Class type, @@ -120,7 +120,7 @@ } } /* - * @see org.codelutin.topia.persistence.EntityVisitor#end(org.codelutin.topia.persistence.TopiaEntity) + * @see org.nuiton.topia.persistence.EntityVisitor#end(org.nuiton.topia.persistence.TopiaEntity) */ @Override public void end(TopiaEntity e) { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/EntityVisitor.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; /** * Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/SearchFields.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/SearchFields.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/SearchFields.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * par : $Author$ */ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static java.lang.annotation.ElementType.TYPE; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaDAO.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,17 +27,17 @@ * by : $Author$ */ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; import java.security.Permission; import java.util.Collection; import java.util.List; import java.util.Map; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.event.TopiaEntityListener; -import org.codelutin.topia.event.TopiaEntityVetoable; -import org.codelutin.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.event.TopiaEntityListener; +import org.nuiton.topia.event.TopiaEntityVetoable; +import org.nuiton.topia.framework.TopiaContextImplementor; /** * @author poussin Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOAbstract.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaDAOAbstract.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOAbstract.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * by : $Author$ */ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; @@ -42,10 +42,10 @@ import org.apache.commons.lang.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.event.TopiaEntityListener; -import org.codelutin.topia.event.TopiaEntityVetoable; -import org.codelutin.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.event.TopiaEntityListener; +import org.nuiton.topia.event.TopiaEntityVetoable; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.hibernate.HibernateException; import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Restrictions; @@ -140,7 +140,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#getContext() + * @see org.nuiton.topia.TopiaDAO#getContext() */ public TopiaContextImplementor getContext() { return context; @@ -229,7 +229,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#create(java.lang.String, java.lang.Object, java.lang.Object) + * @see org.nuiton.topia.TopiaDAO#create(java.lang.String, java.lang.Object, java.lang.Object) */ public Entity create(Object... properties) throws TopiaException { Map<String, Object> map = new HashMap<String, Object>(); @@ -296,7 +296,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#size() + * @see org.nuiton.topia.TopiaDAO#size() */ public int size() throws TopiaException { int result = findAll().size(); @@ -304,7 +304,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByPrimaryKey(java.util.Map) + * @see org.nuiton.topia.TopiaDAO#findByPrimaryKey(java.util.Map) */ public Entity findByPrimaryKey(Map<String, Object> keys) throws TopiaException { @@ -342,7 +342,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByPrimaryKey(java.lang.Object) + * @see org.nuiton.topia.TopiaDAO#findByPrimaryKey(java.lang.Object) */ public Entity findByPrimaryKey(Object... k) throws TopiaException { // TODO pour une meilleur gestion des problemes a la compilation @@ -371,7 +371,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByProperties(java.lang.String, java.lang.Object, java.lang.Object) + * @see org.nuiton.topia.TopiaDAO#findByProperties(java.lang.String, java.lang.Object, java.lang.Object) */ public Entity findByProperties(String propertyName, Object value, Object... others) throws TopiaException { @@ -402,7 +402,7 @@ * Recherche une entity contenant certain propriété. Pour l'instant on * charche toute les entités existantes pour faire la recherche * - * @see org.codelutin.topia.persistence.TopiaDAO#findAllByProperties(java.util.Map) + * @see org.nuiton.topia.persistence.TopiaDAO#findAllByProperties(java.util.Map) */ public List<Entity> findAllByProperties(Map<String, Object> properties) throws TopiaException { @@ -450,7 +450,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findAllByProperties(java.lang.String, java.lang.Object, java.lang.Object) + * @see org.nuiton.topia.TopiaDAO#findAllByProperties(java.lang.String, java.lang.Object, java.lang.Object) */ public List<Entity> findAllByProperties(String propertyName, Object value, Object... others) throws TopiaException { @@ -478,7 +478,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#findContainsProperties(java.util.Map) + * @see org.nuiton.topia.persistence.TopiaDAO#findContainsProperties(java.util.Map) */ public Entity findContainsProperties(Map<String, Collection> properties) throws TopiaException { @@ -491,7 +491,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#findContainsProperties(java.lang.String, java.util.Collection, java.lang.Object[]) + * @see org.nuiton.topia.persistence.TopiaDAO#findContainsProperties(java.lang.String, java.util.Collection, java.lang.Object[]) */ public Entity findContainsProperties(String propertyName, Collection values, Object... others) throws TopiaException { @@ -519,7 +519,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#findAllContainsProperties(java.util.Map) + * @see org.nuiton.topia.persistence.TopiaDAO#findAllContainsProperties(java.util.Map) */ public List<Entity> findAllContainsProperties( Map<String, Collection> properties) throws TopiaException { @@ -567,7 +567,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#findAllContainsProperties(java.lang.String, java.util.Collection, java.lang.Object[]) + * @see org.nuiton.topia.persistence.TopiaDAO#findAllContainsProperties(java.lang.String, java.util.Collection, java.lang.Object[]) */ public List<Entity> findAllContainsProperties(String propertyName, Collection values, Object... others) throws TopiaException { @@ -595,7 +595,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByTopiaId() + * @see org.nuiton.topia.TopiaDAO#findByTopiaId() */ public Entity findByTopiaId(String k) throws TopiaException { Entity result = findByProperty("topiaId", k); @@ -603,7 +603,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findAll() + * @see org.nuiton.topia.TopiaDAO#findAll() */ public List<Entity> findAll() throws TopiaException { Map<String, Object> properties = new HashMap<String, Object>(); @@ -612,7 +612,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#findAllByProperty(java.lang.String, java.lang.Object) + * @see org.nuiton.topia.persistence.TopiaDAO#findAllByProperty(java.lang.String, java.lang.Object) */ public List<Entity> findAllByProperty(String propertyName, Object value) throws TopiaException { @@ -623,7 +623,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByProperty(java.lang.String, java.lang.Object) + * @see org.nuiton.topia.TopiaDAO#findByProperty(java.lang.String, java.lang.Object) */ public Entity findByProperty(String propertyName, Object value) throws TopiaException { @@ -634,7 +634,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByProperties(java.util.Map) + * @see org.nuiton.topia.TopiaDAO#findByProperties(java.util.Map) */ public Entity findByProperties(Map<String, Object> properties) throws TopiaException { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAODelegator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaDAODelegator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAODelegator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,17 +27,17 @@ * by : $Author$ */ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; import java.security.Permission; import java.util.Collection; import java.util.List; import java.util.Map; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.event.TopiaEntityListener; -import org.codelutin.topia.event.TopiaEntityVetoable; -import org.codelutin.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.event.TopiaEntityListener; +import org.nuiton.topia.event.TopiaEntityVetoable; +import org.nuiton.topia.framework.TopiaContextImplementor; /** * Cette classe est utilisé par les DAO générés pour encapsuler un véritable @@ -75,7 +75,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#init(org.codelutin.topia.TopiaContextImpl, java.lang.Class) + * @see org.nuiton.topia.TopiaDAO#init(org.nuiton.topia.TopiaContextImpl, java.lang.Class) */ public void init(TopiaContextImplementor context, Class entityClass) throws TopiaException { @@ -83,14 +83,14 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#getEntityClass() + * @see org.nuiton.topia.persistence.TopiaDAO#getEntityClass() */ public Class<Entity> getEntityClass() { return getParentDAO().getEntityClass(); } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#getContext() + * @see org.nuiton.topia.TopiaDAO#getContext() */ public TopiaContextImplementor getContext() { return getParentDAO().getContext(); @@ -105,42 +105,42 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#create(java.lang.String, java.lang.Object, java.lang.Object...) + * @see org.nuiton.topia.TopiaDAO#create(java.lang.String, java.lang.Object, java.lang.Object...) */ public Entity create(Object... properties) throws TopiaException { return getParentDAO().create(properties); } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#create(java.util.Map) + * @see org.nuiton.topia.persistence.TopiaDAO#create(java.util.Map) */ public Entity create(Map<String, Object> properties) throws TopiaException { return getParentDAO().create(properties); } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#update(Entity) + * @see org.nuiton.topia.TopiaDAO#update(Entity) */ public Entity update(Entity e) throws TopiaException { return getParentDAO().update(e); } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#delete(Entity) + * @see org.nuiton.topia.TopiaDAO#delete(Entity) */ public void delete(Entity e) throws TopiaException { getParentDAO().delete(e); } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByTopiaId(java.lang.Object) + * @see org.nuiton.topia.TopiaDAO#findByTopiaId(java.lang.Object) */ public Entity findByTopiaId(String k) throws TopiaException { return getParentDAO().findByTopiaId(k); } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findAll() + * @see org.nuiton.topia.TopiaDAO#findAll() */ public List<Entity> findAll() throws TopiaException { return getParentDAO().findAll(); @@ -152,14 +152,14 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#size() + * @see org.nuiton.topia.TopiaDAO#size() */ public int size() throws TopiaException { return getParentDAO().size(); } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByPrimaryKey(java.util.Map) + * @see org.nuiton.topia.TopiaDAO#findByPrimaryKey(java.util.Map) */ public Entity findByPrimaryKey(Map<String, Object> keys) throws TopiaException { @@ -167,14 +167,14 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByPrimaryKey(java.lang.Object...) + * @see org.nuiton.topia.TopiaDAO#findByPrimaryKey(java.lang.Object...) */ public Entity findByPrimaryKey(Object... k) throws TopiaException { return getParentDAO().findByPrimaryKey(k); } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByProperty(java.lang.String, java.lang.Object) + * @see org.nuiton.topia.TopiaDAO#findByProperty(java.lang.String, java.lang.Object) */ public Entity findByProperty(String propertyName, Object value) throws TopiaException { @@ -182,7 +182,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByProperties(java.lang.String, java.lang.Object, java.lang.Object...) + * @see org.nuiton.topia.TopiaDAO#findByProperties(java.lang.String, java.lang.Object, java.lang.Object...) */ public Entity findByProperties(String propertyName, Object value, Object... others) throws TopiaException { @@ -190,7 +190,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByProperties(java.util.Map) + * @see org.nuiton.topia.TopiaDAO#findByProperties(java.util.Map) */ public Entity findByProperties(Map<String, Object> properties) throws TopiaException { @@ -198,7 +198,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findAllByProperty(java.lang.String, java.lang.Object) + * @see org.nuiton.topia.TopiaDAO#findAllByProperty(java.lang.String, java.lang.Object) */ public List<Entity> findAllByProperty(String propertyName, Object value) throws TopiaException { @@ -206,7 +206,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findAllByProperties(java.lang.String, java.lang.Object, java.lang.Object...) + * @see org.nuiton.topia.TopiaDAO#findAllByProperties(java.lang.String, java.lang.Object, java.lang.Object...) */ public List<Entity> findAllByProperties(String propertyName, Object value, Object... others) throws TopiaException { @@ -214,7 +214,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findAllByProperties(java.util.Map) + * @see org.nuiton.topia.TopiaDAO#findAllByProperties(java.util.Map) */ public List<Entity> findAllByProperties(Map<String, Object> properties) throws TopiaException { @@ -222,7 +222,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#findContainsProperties(java.util.Map) + * @see org.nuiton.topia.persistence.TopiaDAO#findContainsProperties(java.util.Map) */ public Entity findContainsProperties(Map<String, Collection> properties) throws TopiaException { @@ -230,7 +230,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#findContainsProperties(java.lang.String, java.util.Collection, java.lang.Object[]) + * @see org.nuiton.topia.persistence.TopiaDAO#findContainsProperties(java.lang.String, java.util.Collection, java.lang.Object[]) */ public Entity findContainsProperties(String propertyName, Collection values, Object... others) throws TopiaException { @@ -239,7 +239,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#findAllContainsProperties(java.util.Map) + * @see org.nuiton.topia.persistence.TopiaDAO#findAllContainsProperties(java.util.Map) */ public List<Entity> findAllContainsProperties( Map<String, Collection> properties) throws TopiaException { @@ -247,7 +247,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#findAllContainsProperties(java.lang.String, java.util.Collection, java.lang.Object[]) + * @see org.nuiton.topia.persistence.TopiaDAO#findAllContainsProperties(java.lang.String, java.util.Collection, java.lang.Object[]) */ public List<Entity> findAllContainsProperties(String propertyName, Collection values, Object... others) throws TopiaException { @@ -257,7 +257,7 @@ /* * (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#addTopiaEntityListener(org.codelutin.topia.event.TopiaEntityListener) + * @see org.nuiton.topia.persistence.TopiaDAO#addTopiaEntityListener(org.nuiton.topia.event.TopiaEntityListener) */ public void addTopiaEntityListener(TopiaEntityListener listener) { getParentDAO().addTopiaEntityListener(listener); @@ -265,7 +265,7 @@ /* * (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#addTopiaEntityVetoable(org.codelutin.topia.event.TopiaEntityVetoable) + * @see org.nuiton.topia.persistence.TopiaDAO#addTopiaEntityVetoable(org.nuiton.topia.event.TopiaEntityVetoable) */ public void addTopiaEntityVetoable(TopiaEntityVetoable vetoable) { getParentDAO().addTopiaEntityVetoable(vetoable); @@ -273,7 +273,7 @@ /* * (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#removeTopiaEntityListener(org.codelutin.topia.event.TopiaEntityListener) + * @see org.nuiton.topia.persistence.TopiaDAO#removeTopiaEntityListener(org.nuiton.topia.event.TopiaEntityListener) */ public void removeTopiaEntityListener(TopiaEntityListener listener) { getParentDAO().removeTopiaEntityListener(listener); @@ -281,7 +281,7 @@ /* * (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#removeTopiaEntityVetoable(org.codelutin.topia.event.TopiaEntityVetoable) + * @see org.nuiton.topia.persistence.TopiaDAO#removeTopiaEntityVetoable(org.nuiton.topia.event.TopiaEntityVetoable) */ public void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable) { getParentDAO().removeTopiaEntityVetoable(vetoable); @@ -289,7 +289,7 @@ /* * (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#getRequestPermission(java.lang.String, int) + * @see org.nuiton.topia.persistence.TopiaDAO#getRequestPermission(java.lang.String, int) */ public List<Permission> getRequestPermission(String topiaId, int actions) throws TopiaException { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntity.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,15 +27,15 @@ * by : $Author$ */ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; import java.beans.PropertyChangeListener; import java.beans.VetoableChangeListener; import java.util.Date; import java.util.List; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; /** * TopiaEntity. Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityAbstract.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * Last update: $Date$ by : $Author$ */ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -39,9 +39,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; /** * Classe de base de toutes les entités, cela permet de concentrer le code @@ -76,7 +76,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.persistence.TopiaEntity#getTopiaId() + * @see org.nuiton.topia.persistence.TopiaEntity#getTopiaId() */ @Override public String getTopiaId() { @@ -86,7 +86,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.persistence.TopiaEntity#setTopiaId(String) + * @see org.nuiton.topia.persistence.TopiaEntity#setTopiaId(String) */ @Override public void setTopiaId(String v) { @@ -96,7 +96,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.persistence.TopiaEntity#getTopiaVersion() + * @see org.nuiton.topia.persistence.TopiaEntity#getTopiaVersion() */ @Override public long getTopiaVersion() { @@ -106,7 +106,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.persistence.TopiaEntity#setTopiaVersion(long) + * @see org.nuiton.topia.persistence.TopiaEntity#setTopiaVersion(long) */ @Override public void setTopiaVersion(long v) { @@ -116,7 +116,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.persistence.TopiaEntity#getTopiaCreateTime() + * @see org.nuiton.topia.persistence.TopiaEntity#getTopiaCreateTime() */ @Override public Date getTopiaCreateDate() { @@ -126,7 +126,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.persistence.TopiaEntity#setTopiaCreateTime(java.util.Date) + * @see org.nuiton.topia.persistence.TopiaEntity#setTopiaCreateTime(java.util.Date) */ @Override public void setTopiaCreateDate(Date topiaCreateDate) { @@ -136,7 +136,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.persistence.TopiaEntity#getTopiaContext() + * @see org.nuiton.topia.persistence.TopiaEntity#getTopiaContext() */ @Override public TopiaContext getTopiaContext() { @@ -163,7 +163,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.persistence.TopiaEntity#update() + * @see org.nuiton.topia.persistence.TopiaEntity#update() */ @Override public void update() throws TopiaException { @@ -173,7 +173,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.persistence.TopiaEntity#delete() + * @see org.nuiton.topia.persistence.TopiaEntity#delete() */ @Override public void delete() throws TopiaException { @@ -181,7 +181,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaEntity#getComposite() + * @see org.nuiton.topia.persistence.TopiaEntity#getComposite() */ @Override public List<TopiaEntity> getComposite() throws TopiaException { @@ -189,7 +189,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaEntity#getAggregate() + * @see org.nuiton.topia.persistence.TopiaEntity#getAggregate() */ @Override public List<TopiaEntity> getAggregate() throws TopiaException { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaId.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -28,13 +28,13 @@ * par : $Author$ */ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; import java.io.Serializable; import java.util.logging.Level; import java.util.logging.Logger; -import org.codelutin.topia.TopiaNotFoundException; +import org.nuiton.topia.TopiaNotFoundException; /** * Classe representant un Id, utilisable par JDO. Cette classe contient aussi un Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/flatfile/TopiaDAOFlatFile.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/flatfile/TopiaDAOFlatFile.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * Last update: $Date$ by : $Author$ */ -package org.codelutin.topia.persistence.flatfile; +package org.nuiton.topia.persistence.flatfile; import java.io.BufferedInputStream; import java.io.BufferedReader; @@ -59,11 +59,11 @@ import org.apache.commons.lang.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.framework.TopiaContextImplementor; -import org.codelutin.topia.framework.TopiaUtil; -import org.codelutin.topia.persistence.TopiaDAOAbstract; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.topia.persistence.TopiaDAOAbstract; +import org.nuiton.topia.persistence.TopiaEntity; import org.codelutin.util.FileUtil; import org.hibernate.Criteria; import org.hibernate.FlushMode; @@ -108,7 +108,7 @@ * * <p> * à la place flatfile il est possible de mettre le FQN du DAO utilisé par - * exemple org.codelutin.topia.persistence.flatfile.TopiaDAOFlatFile + * exemple org.nuiton.topia.persistence.flatfile.TopiaDAOFlatFile * * <p> * Si directory est absent alors "." est utilisé @@ -250,7 +250,7 @@ /** * Sauve l'entity dans le fichier * - * @see org.codelutin.topia.persistence.TopiaDAO#update(org.codelutin.topia.persistence.TopiaEntity) + * @see org.nuiton.topia.persistence.TopiaDAO#update(org.nuiton.topia.persistence.TopiaEntity) */ public Entity update(Entity e) throws TopiaException { getContext().getFiresSupport().fireOnPreUpdate(getContext(), e, @@ -339,7 +339,7 @@ /** * Supprime le fichier contenant l'entity * - * @see org.codelutin.topia.persistence.TopiaDAO#delete(org.codelutin.topia.persistence.TopiaEntity) + * @see org.nuiton.topia.persistence.TopiaDAO#delete(org.nuiton.topia.persistence.TopiaEntity) */ public void delete(Entity e) throws TopiaException { getContext().getFiresSupport().fireOnPreDelete(getContext(), e, @@ -360,7 +360,7 @@ * Recherche un fichier si dans mapping key est indiqué il est utilisé a la * place du topiaId qui n'existe peut-etre pas * - * @see org.codelutin.topia.persistence.TopiaDAO#findByTopiaId(String) + * @see org.nuiton.topia.persistence.TopiaDAO#findByTopiaId(String) */ @Override public Entity findByTopiaId(String k) throws TopiaException { @@ -452,7 +452,7 @@ * Charge tous les objets présent. Si un objet est invalide, il n'est pas * lu, un message WARN est affiché mais aucune exception n'est levé. * - * @see org.codelutin.topia.persistence.TopiaDAOAbstract#findAll() + * @see org.nuiton.topia.persistence.TopiaDAOAbstract#findAll() */ @Override public List<Entity> findAll() throws TopiaException { @@ -511,7 +511,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#query(org.hibernate.criterion.Criterion) + * @see org.nuiton.topia.persistence.TopiaDAO#query(org.hibernate.criterion.Criterion) */ public Entity query(Criterion criterion) throws TopiaException { // TODO Auto-generated method stub @@ -519,7 +519,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#queryAll(org.hibernate.criterion.Criterion) + * @see org.nuiton.topia.persistence.TopiaDAO#queryAll(org.hibernate.criterion.Criterion) */ public List<Entity> queryAll(Criterion criterion) throws TopiaException { // TODO Auto-generated method stub @@ -555,7 +555,7 @@ /* * (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#getRequestPermission(java.lang.String, int) + * @see org.nuiton.topia.persistence.TopiaDAO#getRequestPermission(java.lang.String, int) */ public List<Permission> getRequestPermission(String topiaId, int actions) throws TopiaException { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/hibernate/FlatFilePersister.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/hibernate/FlatFilePersister.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -18,7 +18,7 @@ */ //$Id$ -package org.codelutin.topia.persistence.hibernate; +package org.nuiton.topia.persistence.hibernate; import java.io.Serializable; import java.util.Comparator; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/hibernate/TopiaDAOHibernate.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/hibernate/TopiaDAOHibernate.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/hibernate/TopiaDAOHibernate.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -27,7 +27,7 @@ * Last update: $Date$ by : $Author$ */ -package org.codelutin.topia.persistence.hibernate; +package org.nuiton.topia.persistence.hibernate; import java.security.Permission; import java.util.List; @@ -35,9 +35,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.persistence.TopiaDAOAbstract; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAOAbstract; +import org.nuiton.topia.persistence.TopiaEntity; import org.hibernate.Criteria; import org.hibernate.FlushMode; import org.hibernate.HibernateException; @@ -63,7 +63,7 @@ private static Log log = LogFactory.getLog(TopiaDAOHibernate.class); /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#create() + * @see org.nuiton.topia.TopiaDAO#create() */ @Override public Entity create(Map<String, Object> properties) throws TopiaException { @@ -77,7 +77,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#update(Entity) + * @see org.nuiton.topia.TopiaDAO#update(Entity) */ @Override public Entity update(Entity e) throws TopiaException { @@ -91,7 +91,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#delete(Entity) + * @see org.nuiton.topia.TopiaDAO#delete(Entity) */ @Override public void delete(Entity e) throws TopiaException { @@ -104,7 +104,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByTopiaId() + * @see org.nuiton.topia.TopiaDAO#findByTopiaId() */ @Override public Entity findByTopiaId(String k) throws TopiaException { @@ -112,7 +112,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findAll() + * @see org.nuiton.topia.TopiaDAO#findAll() */ @Override public List<Entity> findAll() throws TopiaException { @@ -148,7 +148,7 @@ * TODO implanter une facon plus rapide de recupere la size (count direct * sur la base) * (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#size() + * @see org.nuiton.topia.persistence.TopiaDAO#size() */ @Override public int size() throws TopiaException { @@ -157,7 +157,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findByProperties(java.util.Map) + * @see org.nuiton.topia.TopiaDAO#findByProperties(java.util.Map) */ @Override public Entity findByProperties(Map<String, Object> properties) @@ -166,7 +166,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.TopiaDAO#findAllByProperties(java.util.Map) + * @see org.nuiton.topia.TopiaDAO#findAllByProperties(java.util.Map) */ @Override public List<Entity> findAllByProperties(Map<String, Object> properties) @@ -175,7 +175,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#queryAll(org.hibernate.criterion.Criterion) + * @see org.nuiton.topia.persistence.TopiaDAO#queryAll(org.hibernate.criterion.Criterion) */ private List<Entity> queryAll(Criterion criterion) throws TopiaException { try { @@ -191,7 +191,7 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#query(org.hibernate.criterion.Criterion) + * @see org.nuiton.topia.persistence.TopiaDAO#query(org.hibernate.criterion.Criterion) */ private Entity query(Criterion criterion) throws TopiaException { try { @@ -224,7 +224,7 @@ //FIXME : Commenté car impossible de trouver le bon Criterion // /* (non-Javadoc) - // * @see org.codelutin.topia.persistence.TopiaDAO#findContainsProperties(java.util.Map) + // * @see org.nuiton.topia.persistence.TopiaDAO#findContainsProperties(java.util.Map) // */ // public Entity findContainsProperties(Map<String, Collection> properties) throws TopiaException { // try { @@ -247,7 +247,7 @@ // } // // /* (non-Javadoc) - // * @see org.codelutin.topia.persistence.TopiaDAO#findAllContainsProperties(java.util.Map) + // * @see org.nuiton.topia.persistence.TopiaDAO#findAllContainsProperties(java.util.Map) // */ // public List<Entity> findAllContainsProperties(Map<String, Collection> properties) throws TopiaException { // try { @@ -284,7 +284,7 @@ /* * (non-Javadoc) - * @see org.codelutin.topia.persistence.TopiaDAO#getRequestPermission(java.lang.String, int) + * @see org.nuiton.topia.persistence.TopiaDAO#getRequestPermission(java.lang.String, int) */ @Override public List<Permission> getRequestPermission(String topiaId, int actions) Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/BeanPropertyLoador.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/BeanPropertyLoador.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,4 +1,4 @@ -package org.codelutin.topia.persistence.util; +package org.nuiton.topia.persistence.util; import org.apache.commons.beanutils.MethodUtils; @@ -12,7 +12,7 @@ import java.util.Map; /** - * A implementation fo the {@link org.codelutin.topia.persistence.util.Loador} contract using + * A implementation fo the {@link org.nuiton.topia.persistence.util.Loador} contract using * {@link PropertyDescriptor}. * <p/> * Some factory methods are defined to simplify the generic cast, prefer used them Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Creator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/Creator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Creator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,6 +1,6 @@ -package org.codelutin.topia.persistence.util; +package org.nuiton.topia.persistence.util; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; /** * A simple contract to hook the creation phase of an entity associated (or not!) to Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/DBMapping.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,11 +1,11 @@ -package org.codelutin.topia.persistence.util; +package org.nuiton.topia.persistence.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.framework.TopiaContextImpl; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImpl; +import org.nuiton.topia.persistence.TopiaEntity; import org.hibernate.SQLQuery; import org.hibernate.jdbc.Work; @@ -243,7 +243,7 @@ * @param entityClass the seek entity class * @param property the name of the property to translate * @return the DB name for the given property - * @throws org.codelutin.topia.TopiaException + * @throws org.nuiton.topia.TopiaException * if any db pb */ protected String getDBProperty(Class<? extends TopiaEntity> entityClass, String property) throws TopiaException { @@ -260,7 +260,7 @@ /** * @param entityClass the seek entity class * @return the DB name for the given property - * @throws org.codelutin.topia.TopiaException + * @throws org.nuiton.topia.TopiaException * if any db pb */ protected String getDBTable(Class<? extends TopiaEntity> entityClass) throws TopiaException { Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Deletor.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/Deletor.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Deletor.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,4 +1,4 @@ -package org.codelutin.topia.persistence.util; +package org.nuiton.topia.persistence.util; /** * A simple contract to hook the deletion of an entity. Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/EntityListUpdator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,9 +1,9 @@ -package org.codelutin.topia.persistence.util; +package org.nuiton.topia.persistence.util; import org.apache.commons.beanutils.PropertyUtilsBean; import org.apache.commons.lang.StringUtils; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; import java.beans.PropertyDescriptor; import java.lang.reflect.InvocationTargetException; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/EntityLoador.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityLoador.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,6 +1,6 @@ -package org.codelutin.topia.persistence.util; +package org.nuiton.topia.persistence.util; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntity; /** * A implementation of {@link BeanPropertyLoador} for {@link TopiaEntity} Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/ListUpdator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,6 +1,6 @@ -package org.codelutin.topia.persistence.util; +package org.nuiton.topia.persistence.util; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; import java.util.Collection; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Loador.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/Loador.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Loador.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,4 +1,4 @@ -package org.codelutin.topia.persistence.util; +package org.nuiton.topia.persistence.util; import java.util.Map; Modified: topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/TopiaEntityHelper.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,11 +1,11 @@ -package org.codelutin.topia.persistence.util; +package org.nuiton.topia.persistence.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.persistence.TopiaDAO; -import org.codelutin.topia.persistence.TopiaEntity; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; import org.codelutin.util.IOUtils; import java.io.ByteArrayOutputStream; Modified: topia/trunk/topia-persistence/src/main/resources/log4j.properties =================================================================== --- topia/trunk/topia-persistence/src/main/resources/log4j.properties 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/main/resources/log4j.properties 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,4 +1,4 @@ -#�This log is used to display trace in generation +#\u00A0This log is used to display trace in generation # Global logging configuration log4j.rootLogger=WARN, stdout @@ -8,4 +8,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level log4j.logger.org.codelutin.generator=INFO -log4j.logger.org.codelutin.topia.generator=INFO +log4j.logger.org.nuiton.topia.generator=INFO Modified: topia/trunk/topia-persistence/src/site/rst/Devel.rst =================================================================== --- topia/trunk/topia-persistence/src/site/rst/Devel.rst 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/site/rst/Devel.rst 2009-05-14 14:12:37 UTC (rev 1456) @@ -46,8 +46,8 @@ Pour simplifer un peu l'écriture, deux alias de DAO on été fait: -- **hibernate** est remplacé par *org.codelutin.topia.persistence.hibernate.TopiaDAOHibernate* -- **flatfile** est remplacé par *org.codelutin.topia.persistence.flatfile.TopiaDAOFlatFile* +- **hibernate** est remplacé par *org.nuiton.topia.persistence.hibernate.TopiaDAOHibernate* +- **flatfile** est remplacé par *org.nuiton.topia.persistence.flatfile.TopiaDAOFlatFile* La plupart du temps, on ne spécifie, dans ces options, que le DAO de base (hibernate, flatfile, ...) et non pas un DAO spécifique pour l'entité qui aurait des méthodes de recherche supplémentaire. Ceci car la méthode **getDao** du *TopiaContext* encapsule automatiquement ce DAO générique par un DAO spécifique si celui-ci est trouvé. Le DAO spécifique doit avoir exactement le même nom que l'entité avec DAO à la fin. @@ -85,9 +85,9 @@ Il est possible d'indiquer les services à activer grâce aux options:: topia.service.<service name>=<class> - topia.service.security=org.codelutin.topia.security.TopiaSecurityServiceImpl - topia.service.index=org.codelutin.topia.index.LuceneIndexer - topia.service.history=org.codelutin.topia.history.TopiaHistoryServiceImpl + topia.service.security=org.nuiton.topia.security.TopiaSecurityServiceImpl + topia.service.index=org.nuiton.topia.index.LuceneIndexer + topia.service.history=org.nuiton.topia.history.TopiaHistoryServiceImpl <service name> doit correspondre au nom de service que <class> retourne, sinon il est désactivé. Modified: topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst =================================================================== --- topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/site/rst/ModelGeneration.rst 2009-05-14 14:12:37 UTC (rev 1456) @@ -45,7 +45,7 @@ <extractedPackages>org.company.package</extractedPackages> <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> <destDirGen>target/generated-sources/java</destDirGen> <defaultPackage>org.company.package</defaultPackage> </configuration> @@ -58,7 +58,7 @@ </executions> <dependencies> <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <!-- la version peut être plus récente --> <version>2.1.0</version> @@ -76,7 +76,7 @@ :: <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <!-- la version peut être plus récente --> <version>2.1.0</version> Modified: topia/trunk/topia-persistence/src/site/rst/howto.rst =================================================================== --- topia/trunk/topia-persistence/src/site/rst/howto.rst 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/site/rst/howto.rst 2009-05-14 14:12:37 UTC (rev 1456) @@ -64,7 +64,7 @@ <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>org.codelutin</defaultPackage> <extractedPackages>org.codelutin</extractedPackages> @@ -79,7 +79,7 @@ </executions> <dependencies> <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>2.1.3</version> <scope>compile</scope> @@ -98,7 +98,7 @@ :: <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> <version>2.1.3</version> <scope>compile</scope> Modified: topia/trunk/topia-persistence/src/site/rst/security.rst =================================================================== --- topia/trunk/topia-persistence/src/site/rst/security.rst 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/site/rst/security.rst 2009-05-14 14:12:37 UTC (rev 1456) @@ -18,7 +18,7 @@ package ------- -:org.codelutin.topia.security: pour tout ce qui touche a la sécurité +:org.nuiton.topia.security: pour tout ce qui touche a la sécurité (TopiaAuthenticationHelper, TopiaAuthorisationHelper, LoginModule, Filter, ...) -:org.codelutin.topia.security.entities: pour les entities utiles à la définition +:org.nuiton.topia.security.entities: pour les entities utiles à la définition de la sécurité (user, group, permission) Copied: topia/trunk/topia-persistence/src/test/java/org/nuiton (from rev 1455, topia/trunk/topia-persistence/src/test/java/org/codelutin) Modified: topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/EntityStateTest.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/EntityStateTest.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/EntityStateTest.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -17,7 +17,7 @@ -package org.codelutin.topia.framework; +package org.nuiton.topia.framework; import org.junit.Assert; import org.junit.Test; Modified: topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/framework/TopiaUtilTest.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topia.framework; +package org.nuiton.topia.framework; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -24,7 +24,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.codelutin.topiatest.Personne; +import org.nuiton.topiatest.Personne; import org.junit.Assert; import org.junit.Test; @@ -39,15 +39,15 @@ */ public class TopiaUtilTest { - protected static final String PERSON_ID = "org.codelutin.topiatest.Personne#1226701039001#0.6502325993664224"; - protected static final String PERSON_ID2 = "org.codelutin.topiatest.Personne#1226701039001#0.6502325993664999"; + protected static final String PERSON_ID = "org.nuiton.topiatest.Personne#1226701039001#0.6502325993664224"; + protected static final String PERSON_ID2 = "org.nuiton.topiatest.Personne#1226701039001#0.6502325993664999"; @Test public void testGetTopiaIdPattern() throws Exception { String expected; String actual; - expected = "org\\.codelutin\\.topiatest\\.Personne#(?:\\d+?)#(?:\\d+)\\.(?:\\d+)"; + expected = "org\\.nuiton\\.topiatest\\.Personne#(?:\\d+?)#(?:\\d+)\\.(?:\\d+)"; actual = TopiaUtil.getTopiaIdPattern(Personne.class); assertEquals(expected, actual); } @@ -57,7 +57,7 @@ String expected; Pattern pattern; - expected = "(\\d+)-(org\\.codelutin\\.topiatest\\.Personne#(?:\\d+?)#(?:\\d+)\\.(?:\\d+))-(org\\.codelutin\\.topiatest\\.Personne#(?:\\d+?)#(?:\\d+)\\.(?:\\d+))(.*)"; + expected = "(\\d+)-(org\\.nuiton\\.topiatest\\.Personne#(?:\\d+?)#(?:\\d+)\\.(?:\\d+))-(org\\.nuiton\\.topiatest\\.Personne#(?:\\d+?)#(?:\\d+)\\.(?:\\d+))(.*)"; pattern = TopiaUtil.getTopiaPattern("(\\d+)-%1$s-%1$s(.*)", Personne.class); assertEquals(expected, pattern.toString()); Modified: topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaGeneratorUtilTest.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaGeneratorUtilTest.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaGeneratorUtilTest.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -2,7 +2,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import org.junit.Test; import static org.junit.Assert.*; Modified: topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,21 +15,21 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; -import org.codelutin.topia.TopiaTestDAOHelper; -import org.codelutin.topiatest.Company; -import org.codelutin.topiatest.CompanyDAO; -import org.codelutin.topiatest.Department; -import org.codelutin.topiatest.DepartmentDAO; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topiatest.Company; +import org.nuiton.topiatest.CompanyDAO; +import org.nuiton.topiatest.Department; +import org.nuiton.topiatest.DepartmentDAO; import org.hibernate.cfg.Environment; import org.junit.AfterClass; import org.junit.Assert; Modified: topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/EntityVisitorExportXmlTest.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; import java.io.File; import java.io.IOException; @@ -24,18 +24,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaTestDAOHelper; -import org.codelutin.topiatest.Address; -import org.codelutin.topiatest.AddressDAO; -import org.codelutin.topiatest.Company; -import org.codelutin.topiatest.CompanyDAO; -import org.codelutin.topiatest.Department; -import org.codelutin.topiatest.DepartmentDAO; -import org.codelutin.topiatest.Employe; -import org.codelutin.topiatest.EmployeDAO; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaTestDAOHelper; +import org.nuiton.topiatest.Address; +import org.nuiton.topiatest.AddressDAO; +import org.nuiton.topiatest.Company; +import org.nuiton.topiatest.CompanyDAO; +import org.nuiton.topiatest.Department; +import org.nuiton.topiatest.DepartmentDAO; +import org.nuiton.topiatest.Employe; +import org.nuiton.topiatest.EmployeDAO; import org.codelutin.util.FileUtil; import org.hibernate.cfg.Environment; import org.junit.After; Modified: topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/ExportXMLVisitor.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/ExportXMLVisitor.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/ExportXMLVisitor.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topia.persistence; +package org.nuiton.topia.persistence; import java.util.Collection; import java.util.Iterator; Modified: topia/trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ) Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/pom.xml 2009-05-14 14:12:37 UTC (rev 1456) @@ -8,12 +8,12 @@ <!-- ************************************************************* --> <parent> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> <version>2.2.0-SNAPSHOT</version> </parent> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-soa</artifactId> <dependencies> @@ -34,8 +34,8 @@ </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> </dependency> <!-- Dependencies for services --> @@ -65,6 +65,11 @@ <artifactId>jetty</artifactId> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <!-- Dependencies for class generation --> <dependency> <groupId>asm</groupId> @@ -96,8 +101,8 @@ </plugin> <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>maven-eugene-plugin</artifactId> <executions> <execution> <id>generate-objectmodel</id> @@ -108,7 +113,7 @@ <extractedPackages>org.codelutin.soatest</extractedPackages> <defaultPackage>org.codelutin.soatest</defaultPackage> <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaApplicationServiceMetaGenerator</templates> + <templates>org.nuiton.topia.generator.TopiaApplicationServiceMetaGenerator</templates> <extraClassPathDirectory>target/classes</extraClassPathDirectory> </configuration> <goals> Copied: topia/trunk/topia-soa/src/main/java/org/nuiton (from rev 1455, topia/trunk/topia-soa/src/main/java/org/codelutin) Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -14,9 +14,9 @@ * 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.generator; +package org.nuiton.topia.generator; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; import java.io.File; import java.io.IOException; @@ -27,17 +27,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.Generator; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelParameter; -import org.codelutin.topia.service.TopiaApplicationServiceAbstract; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.topia.service.TopiaApplicationServiceAbstract; /** * ServiceAbstractGenerator.java @@ -115,9 +115,9 @@ import java.util.Arrays; import java.util.List; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.service.TopiaApplicationServiceAbstract; -import org.codelutin.topia.framework.TopiaContextImplementor;}*/ +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.service.TopiaApplicationServiceAbstract; +import org.nuiton.topia.framework.TopiaContextImplementor;}*/ classifier.getInterfaces(); // ajouter les imports des interfaces de DAO Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceImplGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import java.io.File; import java.io.IOException; @@ -24,12 +24,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.Generator; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.topia.service.TopiaApplicationServiceAbstract; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.topia.service.TopiaApplicationServiceAbstract; /** * ServiceImplGenerator.java Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; -import static org.codelutin.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; import java.io.File; import java.io.IOException; @@ -30,17 +30,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.Generator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModelAssociationClass; -import org.codelutin.generator.models.object.ObjectModelAttribute; -import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; -import org.codelutin.generator.models.object.ObjectModelInterface; -import org.codelutin.generator.models.object.ObjectModelOperation; -import org.codelutin.generator.models.object.ObjectModelParameter; -import org.codelutin.topia.service.TopiaApplicationService; +import org.nuiton.eugene.Generator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModelAssociationClass; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.topia.service.TopiaApplicationService; /** * ServiceInterfaceGenerator.java @@ -146,8 +146,8 @@ import java.util.List; import java.util.Collection; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.service.TopiaApplicationService; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.service.TopiaApplicationService; }*/ if (TopiaGeneratorUtil.hasDocumentation(classifier)) { Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/TopiaApplicationServiceMetaGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,12 +15,12 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.ObjectModelGenerator; -import org.codelutin.generator.models.object.ObjectModel; +import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.models.object.ObjectModel; import java.io.File; import java.io.IOException; Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/Protocol.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/Protocol.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/Protocol.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; /** * Protocole. Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaApplicationService.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationService.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaApplicationService.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,11 +15,11 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; +import org.nuiton.topia.TopiaContext; /** * TopiaApplicationService.java Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaApplicationServiceAbstract.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationServiceAbstract.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaApplicationServiceAbstract.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; -import org.codelutin.topia.TopiaContext; +import org.nuiton.topia.TopiaContext; /** * TopiaAplicationServiceAbstract.java Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaApplicationServiceFactory.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaApplicationServiceFactory.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaApplicationServiceFactory.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -18,17 +18,17 @@ /** * */ -package org.codelutin.topia.service; +package org.nuiton.topia.service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; -import org.codelutin.topia.framework.TopiaUtil; -import org.codelutin.topia.service.clients.RMIProxy; -import org.codelutin.topia.service.clients.SOAPProxy; -import org.codelutin.topia.service.clients.XMLRPCProxy; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.topia.service.clients.RMIProxy; +import org.nuiton.topia.service.clients.SOAPProxy; +import org.nuiton.topia.service.clients.XMLRPCProxy; import java.lang.reflect.Proxy; import java.net.URI; Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaProxy.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaProxy.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaProxy.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; import java.lang.reflect.InvocationHandler; import java.net.URI; Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaServiceProvider.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaServiceProvider.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaServiceProvider.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -27,9 +27,9 @@ import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.service.servers.RMIServer; -import org.codelutin.topia.service.servers.SOAPServer; -import org.codelutin.topia.service.servers.XMLRPCServer; +import org.nuiton.topia.service.servers.RMIServer; +import org.nuiton.topia.service.servers.SOAPServer; +import org.nuiton.topia.service.servers.XMLRPCServer; /** * TopiaServiceProvider.java Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaServiceServer.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaServiceServer.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaServiceServer.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; /** * TopiaServiceServer.java Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaServiceServerAbstract.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/TopiaServiceServerAbstract.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/TopiaServiceServerAbstract.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; import java.lang.reflect.Method; Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/clients/RMIProxy.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/clients/RMIProxy.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/clients/RMIProxy.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service.clients; +package org.nuiton.topia.service.clients; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -27,10 +27,10 @@ import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.service.TopiaApplicationService; -import org.codelutin.topia.service.TopiaProxy; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.service.TopiaApplicationService; +import org.nuiton.topia.service.TopiaProxy; /** * RMIProxy.java @@ -102,7 +102,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.service.clients.TopiaProxy#setURI(java.net.URI) + * @see org.nuiton.topia.service.clients.TopiaProxy#setURI(java.net.URI) */ public void setURI(URI uri) { // serviceLocation = uri.getRawSchemeSpecificPart(); @@ -112,7 +112,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.service.clients.TopiaProxy#setClass(java.lang.Class) + * @see org.nuiton.topia.service.clients.TopiaProxy#setClass(java.lang.Class) */ public void setClass(Class<? extends TopiaApplicationService> clazz) { this.clazz = clazz; Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/clients/SOAPProxy.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/clients/SOAPProxy.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/clients/SOAPProxy.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service.clients; +package org.nuiton.topia.service.clients; import java.lang.reflect.Method; import java.net.URI; @@ -24,9 +24,9 @@ import org.codehaus.xfire.client.XFireProxyFactory; import org.codehaus.xfire.service.Service; import org.codehaus.xfire.service.binding.ObjectServiceFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.service.TopiaApplicationService; -import org.codelutin.topia.service.TopiaProxy; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.service.TopiaApplicationService; +import org.nuiton.topia.service.TopiaProxy; /** * SOAPProxy.java @@ -49,7 +49,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.service.TopiaProxy#setClass(java.lang.Class) + * @see org.nuiton.topia.service.TopiaProxy#setClass(java.lang.Class) */ public void setClass(Class<? extends TopiaApplicationService> clazz) { this.clazz = clazz; @@ -58,7 +58,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.service.TopiaProxy#setURI(java.net.URI) + * @see org.nuiton.topia.service.TopiaProxy#setURI(java.net.URI) */ public void setURI(URI uri) { this.serviceLocation = "http:" + uri.getSchemeSpecificPart(); Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/clients/XMLRPCProxy.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/clients/XMLRPCProxy.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/clients/XMLRPCProxy.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service.clients; +package org.nuiton.topia.service.clients; import java.lang.reflect.Method; import java.net.URI; @@ -28,9 +28,9 @@ import org.apache.xmlrpc.client.XmlRpcClient; import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.service.TopiaApplicationService; -import org.codelutin.topia.service.TopiaProxy; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.service.TopiaApplicationService; +import org.nuiton.topia.service.TopiaProxy; /** * XMLRPCProxy.java @@ -89,14 +89,14 @@ } /* (non-Javadoc) - * @see org.codelutin.topia.service.clients.TopiaProxy#setURI(java.net.URI) + * @see org.nuiton.topia.service.clients.TopiaProxy#setURI(java.net.URI) */ public void setURI(URI uri) { serviceLocation = uri.getRawSchemeSpecificPart(); } /* (non-Javadoc) - * @see org.codelutin.topia.service.clients.TopiaProxy#setClass(java.lang.Class) + * @see org.nuiton.topia.service.clients.TopiaProxy#setClass(java.lang.Class) */ public void setClass(Class<? extends TopiaApplicationService> clazz) { this.clazz = clazz; Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/RMIServer.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/servers/RMIServer.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/RMIServer.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service.servers; +package org.nuiton.topia.service.servers; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -28,8 +28,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.service.TopiaApplicationService; -import org.codelutin.topia.service.TopiaServiceServerAbstract; +import org.nuiton.topia.service.TopiaApplicationService; +import org.nuiton.topia.service.TopiaServiceServerAbstract; import sun.rmi.server.UnicastServerRef; @@ -78,7 +78,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.service.TopiaServiceServer#addService(java.lang.Class) + * @see org.nuiton.topia.service.TopiaServiceServer#addService(java.lang.Class) */ public void addService(final Class<? extends TopiaApplicationService> clazz) { // /lDelegationInterfaces.add(clazz); @@ -169,7 +169,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.service.TopiaServiceServer#launch() + * @see org.nuiton.topia.service.TopiaServiceServer#launch() */ public void launch() { if (!alreadyLaunched) { Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/RemoteClassLoader.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/servers/RemoteClassLoader.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/RemoteClassLoader.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service.servers; +package org.nuiton.topia.service.servers; import java.io.File; import java.io.IOException; @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.service.TopiaApplicationServiceFactory; +import org.nuiton.topia.service.TopiaApplicationServiceFactory; import org.objectweb.asm.Attribute; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/SOAPServer.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/servers/SOAPServer.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/SOAPServer.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service.servers; +package org.nuiton.topia.service.servers; import java.lang.reflect.Method; @@ -27,8 +27,8 @@ import org.codehaus.xfire.service.Service; import org.codehaus.xfire.service.binding.ObjectServiceFactory; import org.codehaus.xfire.service.invoker.Invoker; -import org.codelutin.topia.service.TopiaApplicationService; -import org.codelutin.topia.service.TopiaServiceServerAbstract; +import org.nuiton.topia.service.TopiaApplicationService; +import org.nuiton.topia.service.TopiaServiceServerAbstract; /** * SOAPServer.java @@ -70,7 +70,7 @@ /* * (non-Javadoc) - * @see org.codelutin.topia.service.TopiaServiceServer#addService(java.lang.Class) + * @see org.nuiton.topia.service.TopiaServiceServer#addService(java.lang.Class) */ public void addService(Class<? extends TopiaApplicationService> clazz) { @@ -88,7 +88,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.service.TopiaServiceServer#launch() + * @see org.nuiton.topia.service.TopiaServiceServer#launch() */ public void launch() { if (!alreadyLaunched) { Modified: topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/XMLRPCServer.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/service/servers/XMLRPCServer.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/main/java/org/nuiton/topia/service/servers/XMLRPCServer.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service.servers; +package org.nuiton.topia.service.servers; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -36,9 +36,9 @@ import org.apache.xmlrpc.server.XmlRpcHandlerMapping; import org.apache.xmlrpc.server.XmlRpcServer; import org.apache.xmlrpc.webserver.WebServer; -import org.codelutin.topia.persistence.TopiaEntity; -import org.codelutin.topia.service.TopiaApplicationService; -import org.codelutin.topia.service.TopiaServiceServerAbstract; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.service.TopiaApplicationService; +import org.nuiton.topia.service.TopiaServiceServerAbstract; /** * XMLRPCServer. @@ -87,7 +87,7 @@ /* * (non-Javadoc) * - * @see org.codelutin.topia.service.TopiaServiceServer#addService(java.lang.Class) + * @see org.nuiton.topia.service.TopiaServiceServer#addService(java.lang.Class) */ public void addService(Class<? extends TopiaApplicationService> clazz) { // dans ce cas, rien Modified: topia/trunk/topia-soa/src/site/rst/ApplicationServiceGeneration.rst =================================================================== --- topia/trunk/topia-soa/src/site/rst/ApplicationServiceGeneration.rst 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/site/rst/ApplicationServiceGeneration.rst 2009-05-14 14:12:37 UTC (rev 1456) @@ -29,13 +29,13 @@ ------------------- Les templates disponibles sont: -``org.codelutin.topia.generator.ServiceInterfaceGenerator`` +``org.nuiton.topia.generator.ServiceInterfaceGenerator`` Meta générateur qui génere les interfaces. -``org.codelutin.topia.generator.ServiceAbstractGenerator`` +``org.nuiton.topia.generator.ServiceAbstractGenerator`` Meta générateur qui génere implémentation abstract. -``org.codelutin.topia.generator.ServiceImplGenerator`` +``org.nuiton.topia.generator.ServiceImplGenerator`` Meta générateur qui génere implémentation concrète. -``org.codelutin.topia.generator.TopiaApplicationServiceMetaGenerator`` +``org.nuiton.topia.generator.TopiaApplicationServiceMetaGenerator`` Meta générateur qui génere toutes les interfaces, abstract et Impl. Plugin de Génération @@ -57,7 +57,7 @@ <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaApplicationServiceMetaGenerator</templates> + <templates>org.nuiton.topia.generator.TopiaApplicationServiceMetaGenerator</templates> <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>org.codelutin.chorem</defaultPackage> </configuration> @@ -70,7 +70,7 @@ </executions> <dependencies> <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-soa</artifactId> <version>2.1.3-SNAPSHOT</version> <scope>runtime</scope> @@ -85,7 +85,7 @@ :: <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-soa</artifactId> <version>2.1.3-SNAPSHOT</version> <scope>compile</scope> Copied: topia/trunk/topia-soa/src/test/java/org/nuiton (from rev 1455, topia/trunk/topia-soa/src/test/java/org/codelutin) Modified: topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleService.java =================================================================== --- topia/trunk/topia-soa/src/test/java/org/codelutin/topia/service/ExampleService.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleService.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; -import org.codelutin.topia.TopiaException; +import org.nuiton.topia.TopiaException; /** * TestService.java Modified: topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleServiceImpl.java =================================================================== --- topia/trunk/topia-soa/src/test/java/org/codelutin/topia/service/ExampleServiceImpl.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleServiceImpl.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,9 +15,9 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; -import org.codelutin.topia.service.TopiaApplicationServiceAbstract; +import org.nuiton.topia.service.TopiaApplicationServiceAbstract; import org.junit.Ignore; /** Modified: topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleServiceServer.java =================================================================== --- topia/trunk/topia-soa/src/test/java/org/codelutin/topia/service/ExampleServiceServer.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleServiceServer.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleServiceTest.java =================================================================== --- topia/trunk/topia-soa/src/test/java/org/codelutin/topia/service/ExampleServiceTest.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/test/java/org/nuiton/topia/service/ExampleServiceTest.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,10 +15,10 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.service; +package org.nuiton.topia.service; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; import org.junit.Assert; import org.junit.Test; import org.junit.BeforeClass; Modified: topia/trunk/topia-soa/src/test/log4j.properties =================================================================== --- topia/trunk/topia-soa/src/test/log4j.properties 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/test/log4j.properties 2009-05-14 14:12:37 UTC (rev 1456) @@ -5,5 +5,5 @@ 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.topia=INFO +log4j.logger.org.nuiton.topia=INFO log4j.logger.org.hibernate=INFO Modified: topia/trunk/topia-soa/src/test/resources/TopiaApplicationServices.properties =================================================================== --- topia/trunk/topia-soa/src/test/resources/TopiaApplicationServices.properties 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-soa/src/test/resources/TopiaApplicationServices.properties 2009-05-14 14:12:37 UTC (rev 1456) @@ -1,6 +1,6 @@ # test du fichier de definition des services -#topia.application.service.org.codelutin.topia.service.TaistServicee=local://org.codelutin.topia.service.TaistServiceImpll/#new -#topia.application.service.org.codelutin.topia.service.TaistServicee=rmi://localhost:1099 -#topia.application.service.org.codelutin.topia.service.TaistServicee=xml-rpc://localhost:9090 -#topia.application.service.org.codelutin.topia.service.TaistServicee=rmi://localhost:1099 -topia.application.service.org.codelutin.topia.service.TaistService=soap://localhost:8888 \ No newline at end of file +#topia.application.service.org.nuiton.topia.service.TaistServicee=local://org.nuiton.topia.service.TaistServiceImpll/#new +#topia.application.service.org.nuiton.topia.service.TaistServicee=rmi://localhost:1099 +#topia.application.service.org.nuiton.topia.service.TaistServicee=xml-rpc://localhost:9090 +#topia.application.service.org.nuiton.topia.service.TaistServicee=rmi://localhost:1099 +topia.application.service.org.nuiton.topia.service.TaistService=soap://localhost:8888 \ No newline at end of file Modified: topia/trunk/topia-soa/src/test/xmi/soaTest.zargo =================================================================== (Binary files differ) Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/pom.xml 2009-05-14 14:12:37 UTC (rev 1456) @@ -8,12 +8,12 @@ <!-- ************************************************************* --> <parent> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> <version>2.2.0-SNAPSHOT</version> </parent> - <groupId>org.codelutin.topia</groupId> + <groupId>org.nuiton.topia</groupId> <artifactId>topia-ui</artifactId> <dependencies> @@ -24,8 +24,8 @@ </dependency> <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> </dependency> <dependency> @@ -75,8 +75,8 @@ </plugin> <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>maven-eugene-plugin</artifactId> <executions> <execution> @@ -84,10 +84,10 @@ <phase>generate-test-sources</phase> <configuration> <testPhase>true</testPhase> - <fullPackagePath>org.codelutin.topiauitest</fullPackagePath> - <extractedPackages>org.codelutin.topiauitest</extractedPackages> + <fullPackagePath>org.nuiton.topiauitest</fullPackagePath> + <extractedPackages>org.nuiton.topiauitest</extractedPackages> <includes>**/*.statemodel</includes> - <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> + <templates>org.nuiton.topia.generator.TapestryWebGenerator</templates> <extraClassPathDirectory>target/classes</extraClassPathDirectory> </configuration> <goals> Copied: topia/trunk/topia-ui/src/main/java/org/nuiton (from rev 1455, topia/trunk/topia-ui/src/main/java/org/codelutin) Modified: topia/trunk/topia-ui/src/main/java/org/nuiton/topia/generator/TapestryWebGenerator.java =================================================================== --- topia/trunk/topia-ui/src/main/java/org/codelutin/topia/generator/TapestryWebGenerator.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/main/java/org/nuiton/topia/generator/TapestryWebGenerator.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.topia.generator; +package org.nuiton.topia.generator; import java.io.File; import java.io.IOException; @@ -28,21 +28,21 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.generator.MonitorWriter; -import org.codelutin.generator.StateModelGenerator; -import org.codelutin.generator.GeneratorUtil; -import org.codelutin.generator.models.state.StateModel; -import org.codelutin.generator.models.state.StateModelComplexState; -import org.codelutin.generator.models.state.StateModelSimpleState; -import org.codelutin.generator.models.state.StateModelState; -import org.codelutin.generator.models.state.StateModelStateChart; -import org.codelutin.generator.models.state.StateModelTransition; +import org.nuiton.eugene.MonitorWriter; +import org.nuiton.eugene.StateModelGenerator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.state.StateModel; +import org.nuiton.eugene.models.state.StateModelComplexState; +import org.nuiton.eugene.models.state.StateModelSimpleState; +import org.nuiton.eugene.models.state.StateModelState; +import org.nuiton.eugene.models.state.StateModelStateChart; +import org.nuiton.eugene.models.state.StateModelTransition; /** * Genere la navigation basee sur le framework Tapestry 5 * a partir de la representation StateModel * - * @see org.codelutin.generator.StateModelGenerator + * @see org.nuiton.eugene.StateModelGenerator * @author chatellier * @version $Revision$ * Modified: topia/trunk/topia-ui/src/site/rst/UseCase.rst =================================================================== --- topia/trunk/topia-ui/src/site/rst/UseCase.rst 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/site/rst/UseCase.rst 2009-05-14 14:12:37 UTC (rev 1456) @@ -81,7 +81,7 @@ <!-- Fichiers XML StateModel utilises pour la generation --> <includes>**/*.*model</includes> <!-- templates a utiliser --> - <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> + <templates>org.nuiton.topia.generator.TapestryWebGenerator</templates> <!-- destination du code genere --> <destDirGen>target/gen/java</destDirGen> </configuration> Copied: topia/trunk/topia-ui/src/test/java/org/nuiton (from rev 1455, topia/trunk/topia-ui/src/test/java/org/codelutin) Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/Contact.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Contact.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/Contact.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.entities; +package org.nuiton.topiauitest.entities; /** * Contact.java Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/ContactDAO.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/ContactDAO.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/ContactDAO.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,11 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.entities; +package org.nuiton.topiauitest.entities; import java.util.List; -import org.codelutin.topiauitest.utils.HibernateUtils; +import org.nuiton.topiauitest.utils.HibernateUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.criterion.Restrictions; Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/Society.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/Society.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/Society.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.entities; +package org.nuiton.topiauitest.entities; /** * Society.java Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/SocietyDAO.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/entities/SocietyDAO.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/entities/SocietyDAO.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -15,11 +15,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.entities; +package org.nuiton.topiauitest.entities; import java.util.List; -import org.codelutin.topiauitest.utils.HibernateUtils; +import org.nuiton.topiauitest.utils.HibernateUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.criterion.Restrictions; Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/utils/HibernateUtils.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/utils/HibernateUtils.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/utils/HibernateUtils.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.utils; +package org.nuiton.topiauitest.utils; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/base/BasePage.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base/BasePage.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/base/BasePage.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.web.base; +package org.nuiton.topiauitest.web.base; /** Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/base/SessionBean.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/base/SessionBean.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/base/SessionBean.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.web.base; +package org.nuiton.topiauitest.web.base; import java.io.Serializable; Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/components/ContextLink.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components/ContextLink.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/components/ContextLink.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.web.components; +package org.nuiton.topiauitest.web.components; import org.apache.tapestry5.MarkupWriter; import org.apache.tapestry5.annotations.Parameter; Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/components/Layout.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/components/Layout.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/components/Layout.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.web.components; +package org.nuiton.topiauitest.web.components; import java.util.Locale; Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/LoginForm.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/LoginForm.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/LoginForm.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.web.pages; +package org.nuiton.topiauitest.web.pages; import org.apache.tapestry5.annotations.Component; import org.apache.tapestry5.annotations.Persist; -import org.codelutin.topiauitest.web.components.Layout; +import org.nuiton.topiauitest.web.components.Layout; /** * ProjectForm.java Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/ContactForm.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactForm.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/ContactForm.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.web.pages.contactManagement; +package org.nuiton.topiauitest.web.pages.contactManagement; import java.util.ArrayList; import java.util.List; @@ -28,10 +28,10 @@ import org.apache.tapestry5.ValueEncoder; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.internal.OptionModelImpl; -import org.codelutin.topiauitest.entities.Contact; -import org.codelutin.topiauitest.entities.ContactDAO; -import org.codelutin.topiauitest.entities.Society; -import org.codelutin.topiauitest.entities.SocietyDAO; +import org.nuiton.topiauitest.entities.Contact; +import org.nuiton.topiauitest.entities.ContactDAO; +import org.nuiton.topiauitest.entities.Society; +import org.nuiton.topiauitest.entities.SocietyDAO; /** Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/ContactList.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactList.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/ContactList.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.web.pages.contactManagement; +package org.nuiton.topiauitest.web.pages.contactManagement; import java.util.List; -import org.codelutin.topiauitest.entities.Contact; -import org.codelutin.topiauitest.entities.ContactDAO; +import org.nuiton.topiauitest.entities.Contact; +import org.nuiton.topiauitest.entities.ContactDAO; /** * ContactList.java Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/ContactView.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/ContactView.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/ContactView.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.web.pages.contactManagement; +package org.nuiton.topiauitest.web.pages.contactManagement; import org.apache.tapestry5.annotations.Persist; -import org.codelutin.topiauitest.entities.Contact; -import org.codelutin.topiauitest.entities.ContactDAO; +import org.nuiton.topiauitest.entities.Contact; +import org.nuiton.topiauitest.entities.ContactDAO; /** * ContactView.java Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/SocietyForm.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/SocietyForm.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/SocietyForm.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.web.pages.contactManagement; +package org.nuiton.topiauitest.web.pages.contactManagement; import org.apache.tapestry5.annotations.Persist; -import org.codelutin.topiauitest.entities.Society; -import org.codelutin.topiauitest.entities.SocietyDAO; +import org.nuiton.topiauitest.entities.Society; +import org.nuiton.topiauitest.entities.SocietyDAO; /** * SocietyForm.java Modified: topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/SocietyView.java =================================================================== --- topia/trunk/topia-ui/src/test/java/org/codelutin/topiauitest/web/pages/contactManagement/SocietyView.java 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/java/org/nuiton/topiauitest/web/pages/contactManagement/SocietyView.java 2009-05-14 14:12:37 UTC (rev 1456) @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -package org.codelutin.topiauitest.web.pages.contactManagement; +package org.nuiton.topiauitest.web.pages.contactManagement; import org.apache.tapestry5.annotations.Persist; -import org.codelutin.topiauitest.entities.Society; +import org.nuiton.topiauitest.entities.Society; /** * SocietyList.java Modified: topia/trunk/topia-ui/src/test/resources/log4j.properties =================================================================== --- topia/trunk/topia-ui/src/test/resources/log4j.properties 2009-05-11 08:44:03 UTC (rev 1455) +++ topia/trunk/topia-ui/src/test/resources/log4j.properties 2009-05-14 14:12:37 UTC (rev 1456) @@ -5,5 +5,5 @@ 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.topia=INFO +log4j.logger.org.nuiton.topia=INFO log4j.logger.org.hibernate=INFO Modified: topia/trunk/topia-ui/src/test/xmi/contact.zargo =================================================================== (Binary files differ)