This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia-2.x. See http://git.nuiton.org/topia-2.x.git commit 4e1f64f16a8f66b720d4840bf90207b2a5d04e34 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 2 10:28:58 2016 +0100 refs #3902: Update h2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index aa8c70d..850d569 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L ToPIA %% - Copyright (C) 2004 - 2015 CodeLutin + Copyright (C) 2004 - 2016 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -217,7 +217,7 @@ <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>5.1.0.Final</hibernateVersion> <sl4jVersion>1.7.6</sl4jVersion> - <h2Version>1.3.175</h2Version> + <h2Version>1.3.176</h2Version> <hamcrestVersion>1.3</hamcrestVersion> <!-- i18n configuration --> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia-2.x. See http://git.nuiton.org/topia-2.x.git commit 9f33ee436b8a12d7539aee8d2d0ece31205d480f Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 2 10:33:40 2016 +0100 FIx javadoc --- .../org/nuiton/topia/framework/EntityState.java | 34 +++++++--------------- .../topia/framework/TopiaConnectionProvider.java | 2 +- .../org/nuiton/topia/persistence/TopiaDAO.java | 2 +- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java index 4946a50..18f44e7 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -22,18 +22,6 @@ * #L% */ -/* * - * EntityState.java - * - * Created: 22 nov. 06 12:10:57 - * - * @author poussin <poussin@codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package org.nuiton.topia.framework; /** @@ -104,45 +92,45 @@ public class EntityState implements Comparable<EntityState>{ } /** - * Tells if the {@link #LOAD} state is on. + * Tells if the {@code #LOAD} state is on. * - * @return {@code true} if {@link #LOAD} state is on, {@code false} otherwise. + * @return {@code true} if {@code #LOAD} state is on, {@code false} otherwise. */ public boolean isLoad() { return (state & LOAD) == LOAD; } /** - * Tells if the {@link #READ} state is on. + * Tells if the {@code #READ} state is on. * - * @return {@code true} if {@link #READ} state is on, {@code false} otherwise. + * @return {@code true} if {@code #READ} state is on, {@code false} otherwise. */ public boolean isRead() { return (state & READ) == READ; } /** - * Tells if the {@link #CREATE} state is on. + * Tells if the {@code #CREATE} state is on. * - * @return {@code true} if {@link #CREATE} state is on, {@code false} otherwise. + * @return {@code true} if {@code #CREATE} state is on, {@code false} otherwise. */ public boolean isCreate() { return (state & CREATE) == CREATE; } /** - * Tells if the {@link #UPDATE} state is on. + * Tells if the {@code #UPDATE} state is on. * - * @return {@code true} if {@link #UPDATE} state is on, {@code false} otherwise. + * @return {@code true} if {@code #UPDATE} state is on, {@code false} otherwise. */ public boolean isUpdate() { return (state & UPDATE) == UPDATE; } /** - * Tells if the {@link #DELETE} state is on. + * Tells if the {@code #DELETE} state is on. * - * @return {@code true} if {@link #DELETE} state is on, {@code false} otherwise. + * @return {@code true} if {@code #DELETE} state is on, {@code false} otherwise. */ public boolean isDelete() { return (state & DELETE) == DELETE; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java index af4e0ec..41196a3 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java @@ -86,7 +86,7 @@ public class TopiaConnectionProvider implements ConnectionProvider, Configurable /** * Sql isolation level to use in connection. * <p/> - * Can be configured by hibernate property {@link Environment#ISOLATION_LEVELS}. + * Can be configured by hibernate property {@link Environment#ISOLATION}. * * @see Connection#getTransactionIsolation() */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java index afa342a..27c014e 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java @@ -591,7 +591,7 @@ public interface TopiaDAO<E extends TopiaEntity> extends TopiaDAODeprecated<E>, /** * Execute the count {@code hql} query and then synch the pager to this * result (says fill the - * {@link TopiaPagerBean#records} field and then adapt + * {@link TopiaPagerBean#getRecords()} field and then adapt * the number of pages available and the current number page). * * @param hql the count hql to execute -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia-2.x. See http://git.nuiton.org/topia-2.x.git commit 10b250d3bcb7576617f03383b9f405b0bd71bbeb Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 2 11:11:39 2016 +0100 refs #3902: Update commons-logging --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 77f1b07..71061d6 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.3</version> + <version>1.2</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia-2.x. See http://git.nuiton.org/topia-2.x.git commit 7878c1cf590c39a55ddc04abab6091e2a4e476f6 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 2 11:13:08 2016 +0100 refs #3902: Update commons-lang3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef9055f..e7edc08 100644 --- a/pom.xml +++ b/pom.xml @@ -338,7 +338,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> + <version>3.4</version> </dependency> <!-- BD H2 for testing --> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia-2.x. See http://git.nuiton.org/topia-2.x.git commit 369f650ad2424677ec6b92bbd5de614d698a9cda Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 2 11:16:54 2016 +0100 refs #3902: Update nuiton-decorator --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 02213c9..8b9c0e8 100644 --- a/pom.xml +++ b/pom.xml @@ -210,7 +210,7 @@ <!-- libs version --> <eugeneVersion>3.0-alpha-1</eugeneVersion> <nuitonCsvVersion>3.0-rc-5</nuitonCsvVersion> - <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> + <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> <processorPluginVersion>1.3</processorPluginVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia-2.x. See http://git.nuiton.org/topia-2.x.git commit 2f2f5300fc4086daaf4ba541264d51bb0dbfe64c Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 2 11:17:52 2016 +0100 refs #3902: Update eugene --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8bff4db..dee01f8 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ <projectId>topia</projectId> <!-- libs version --> - <eugeneVersion>3.0-alpha-1</eugeneVersion> + <eugeneVersion>3.0-alpha-4</eugeneVersion> <nuitonCsvVersion>3.0-rc-5</nuitonCsvVersion> <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> <nuitonUtilsVersion>3.0-rc-11</nuitonUtilsVersion> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia-2.x. See http://git.nuiton.org/topia-2.x.git commit e41289648a591588bee986ad227cd661ac1ee27e Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 2 12:26:11 2016 +0100 fix javadoc 8 --- topia-persistence/pom.xml | 5 ++ .../src/license/THIRD-PARTY.properties | 36 ++------- .../main/java/org/nuiton/topia/TopiaContext.java | 12 +-- .../java/org/nuiton/topia/TopiaContextFactory.java | 6 +- .../main/java/org/nuiton/topia/TopiaException.java | 2 +- .../org/nuiton/topia/TopiaNotFoundException.java | 2 +- .../org/nuiton/topia/TopiaRuntimeException.java | 2 +- .../java/org/nuiton/topia/TopiaVetoException.java | 2 +- .../nuiton/topia/event/TopiaContextAdapter.java | 4 +- .../org/nuiton/topia/event/TopiaContextEvent.java | 2 +- .../nuiton/topia/event/TopiaContextListener.java | 4 +- .../org/nuiton/topia/event/TopiaEntitiesEvent.java | 2 +- .../nuiton/topia/event/TopiaEntitiesVetoable.java | 2 +- .../org/nuiton/topia/event/TopiaEntityEvent.java | 2 +- .../nuiton/topia/event/TopiaEntityListener.java | 4 +- .../nuiton/topia/event/TopiaEntityVetoable.java | 4 +- .../nuiton/topia/event/TopiaTransactionEvent.java | 2 +- .../topia/event/TopiaTransactionListener.java | 10 +-- .../topia/event/TopiaTransactionVetoable.java | 4 +- .../org/nuiton/topia/framework/EntityFilter.java | 2 +- .../org/nuiton/topia/framework/EntityState.java | 12 +-- .../topia/framework/TopiaConnectionProvider.java | 20 ++--- .../nuiton/topia/framework/TopiaContextImpl.java | 20 ++--- .../topia/framework/TopiaContextImplementor.java | 2 +- .../org/nuiton/topia/framework/TopiaFilter.java | 2 +- .../nuiton/topia/framework/TopiaFiresSupport.java | 6 +- .../org/nuiton/topia/framework/TopiaQuery.java | 34 ++++---- .../org/nuiton/topia/framework/TopiaSQLQuery.java | 2 +- .../org/nuiton/topia/framework/TopiaService.java | 24 ++---- .../topia/framework/TopiaTransactionAware.java | 8 +- .../java/org/nuiton/topia/framework/TopiaUtil.java | 20 ++--- .../org/nuiton/topia/framework/package-info.java | 8 +- .../topia/generator/BinderHelperTransformer.java | 2 +- .../topia/generator/DAOAbstractTransformer.java | 31 ++++---- .../topia/generator/DAOHelperTransformer.java | 2 +- .../nuiton/topia/generator/DAOImplTransformer.java | 8 +- .../org/nuiton/topia/generator/DAOTransformer.java | 2 +- .../org/nuiton/topia/generator/DTOTransformer.java | 2 +- .../topia/generator/EntityDAOTransformer.java | 4 +- .../topia/generator/EntityDTOTransformer.java | 2 +- .../generator/EntityHibernateMappingGenerator.java | 4 +- .../nuiton/topia/generator/EntityTransformer.java | 2 +- .../topia/generator/QueryHelperTransformer.java | 2 +- .../nuiton/topia/generator/ServiceTransformer.java | 7 +- .../nuiton/topia/generator/TopiaGeneratorUtil.java | 91 +++++++++++----------- .../nuiton/topia/generator/TopiaJavaValidator.java | 2 +- .../topia/generator/TopiaMetaTransformer.java | 2 +- .../topia/generator/TopiaRelationValidator.java | 2 +- .../nuiton/topia/generator/TopiaStereoTypes.java | 2 +- .../org/nuiton/topia/generator/TopiaTagValues.java | 20 ++--- .../org/nuiton/topia/generator/package-info.java | 2 +- .../topia/persistence/DepthEntityVisitor.java | 4 +- .../nuiton/topia/persistence/EntityVisitor.java | 16 ++-- .../topia/persistence/HorizontalEntityVisitor.java | 4 +- .../org/nuiton/topia/persistence/SearchFields.java | 2 +- .../org/nuiton/topia/persistence/TopiaDAO.java | 30 +++---- .../topia/persistence/TopiaDAODeprecated.java | 4 +- .../org/nuiton/topia/persistence/TopiaDAOImpl.java | 6 +- .../nuiton/topia/persistence/TopiaDAOLegacy.java | 6 +- .../org/nuiton/topia/persistence/TopiaEntity.java | 8 +- .../topia/persistence/TopiaEntityAbstract.java | 2 +- .../nuiton/topia/persistence/TopiaEntityEnum.java | 28 +++---- .../java/org/nuiton/topia/persistence/TopiaId.java | 26 ++----- .../topia/persistence/TopiaPersistenceHelper.java | 2 +- .../topia/persistence/csv/CsvProgressModel.java | 2 +- .../topia/persistence/csv/EntityCsvModel.java | 2 +- .../topia/persistence/csv/TopiaCsvCommons.java | 10 +-- .../persistence/csv/in/AbstractImportModel.java | 2 +- .../persistence/csv/in/CsvFileImportResult.java | 2 +- .../topia/persistence/csv/in/CsvImportResult.java | 2 +- .../csv/in/EntityAssociationImportModel.java | 2 +- .../persistence/csv/in/ImportModelFactory.java | 2 +- .../topia/persistence/csv/in/ImportStrategy.java | 4 +- .../topia/persistence/csv/in/TopiaCsvImports.java | 8 +- .../topia/persistence/csv/in/package-info.java | 2 +- .../csv/out/EntityAssociationExportModel.java | 2 +- .../persistence/csv/out/ExportEntityVisitor.java | 2 +- .../persistence/csv/out/ExportModelFactory.java | 2 +- .../persistence/csv/out/PrepareDataForExport.java | 2 +- .../topia/persistence/csv/out/TopiaCsvExports.java | 6 +- .../topia/persistence/csv/out/package-info.java | 2 +- .../nuiton/topia/persistence/csv/package-info.java | 2 +- .../persistence/metadata/AssociationMeta.java | 2 +- .../topia/persistence/metadata/ColumnMeta.java | 2 +- .../nuiton/topia/persistence/metadata/DbMeta.java | 2 +- .../persistence/metadata/MetaFilenameAware.java | 2 +- .../topia/persistence/metadata/Metadatas.java | 2 +- .../topia/persistence/metadata/TableMeta.java | 2 +- .../topia/persistence/metadata/package-info.java | 6 +- .../org/nuiton/topia/persistence/package-info.java | 6 +- .../nuiton/topia/persistence/pager/FilterRule.java | 2 +- .../persistence/pager/FilterRuleGroupOperator.java | 2 +- .../persistence/pager/FilterRuleOperator.java | 2 +- .../topia/persistence/pager/TopiaPagerBean.java | 2 +- .../persistence/pager/TopiaPagerBeanBuilder.java | 2 +- .../nuiton/topia/persistence/util/Collector.java | 6 +- .../org/nuiton/topia/persistence/util/Creator.java | 8 +- .../nuiton/topia/persistence/util/DBMapping.java | 4 +- .../org/nuiton/topia/persistence/util/Deletor.java | 2 +- .../nuiton/topia/persistence/util/DiffState.java | 8 +- .../topia/persistence/util/EntityListUpdator.java | 4 +- .../topia/persistence/util/EntityOperator.java | 42 +++++----- .../persistence/util/EntityOperatorStore.java | 2 +- .../nuiton/topia/persistence/util/ListUpdator.java | 4 +- .../org/nuiton/topia/persistence/util/Loador.java | 6 +- .../topia/persistence/util/TopiaEntityBinder.java | 6 +- .../topia/persistence/util/TopiaEntityHelper.java | 12 +-- .../topia/persistence/util/TopiaEntityIdsMap.java | 2 +- .../topia/persistence/util/TopiaEntityMap.java | 4 +- .../topia/persistence/util/TopiaEntityRef.java | 4 +- .../src/test/java/org/nuiton/topia/TestHelper.java | 2 +- .../org/nuiton/topia/TopiaContextFactoryTest.java | 2 +- .../test/java/org/nuiton/topia/TopiaDatabase.java | 6 +- .../nuiton/topia/framework/EntityStateTest.java | 6 +- .../TopiaConnectionProviderHardCoded.java | 2 +- .../framework/TopiaConnectionProviderTest.java | 2 +- .../topia/framework/TopiaContextImplTest.java | 2 +- .../topia/framework/TopiaContextReplicateTest.java | 2 +- .../org/nuiton/topia/framework/TopiaUtilTest.java | 4 +- .../generator/QueryHelperTransformerTest.java | 2 +- .../topia/generator/TopiaGeneratorUtilTest.java | 2 +- .../org/nuiton/topia/generator/TopiaTestCase.java | 2 +- .../persistence/EntityVisitorExportXmlTest.java | 6 +- .../nuiton/topia/persistence/ExportXMLVisitor.java | 2 +- .../nuiton/topia/persistence/NaturalIdTest.java | 4 +- .../topia/persistence/TopiaContextFindTest.java | 2 +- .../org/nuiton/topia/persistence/TopiaDAOTest.java | 2 +- .../topia/persistence/util/CollectorTest.java | 2 +- .../topia/persistence/util/EntityOperatorTest.java | 2 +- .../persistence/util/TopiaEntityHelperTest.java | 2 +- .../persistence/util/TopiaEntityRefTester.java | 16 ++-- .../persistence/util/TopiaEntityRefTesterTest.java | 4 +- .../nuiton/topia/test/ano1991/TopiaQueryTest.java | 2 +- .../test/evo1912/EntityDTOTransformerTest.java | 4 +- .../test/java/org/nuiton/topiatest/EnumTest.java | 2 +- .../nuiton/topiatest/ExtraDAOEntityDAOImpl.java | 2 +- .../src/test/java/org/nuiton/topiatest/Title.java | 2 +- .../topiatest/deletetest/DeleteEntityTest.java | 2 +- .../org/nuiton/topiatest/persistence/Entity1.java | 2 +- .../topiatest/persistence/Entity1Abstract.java | 2 +- .../nuiton/topiatest/persistence/Entity1Impl.java | 2 +- .../org/nuiton/topiatest/service/FakeService.java | 4 +- .../org/nuiton/topiatest/service/TestService.java | 4 +- .../src/license/THIRD-PARTY.properties | 34 ++------ .../migration/AbstractTopiaMigrationCallback.java | 8 +- .../topia/migration/TopiaMigrationCallback.java | 4 +- .../migration/TopiaMigrationCallbackByClass.java | 10 +-- .../migration/TopiaMigrationCallbackByClassNG.java | 10 +-- .../migration/TopiaMigrationCallbackByMethod.java | 6 +- .../topia/migration/TopiaMigrationEngine.java | 8 +- .../topia/migration/TopiaMigrationService.java | 2 +- .../topia/migration/mappings/TMSVersion.java | 2 +- .../topia/migration/mappings/TMSVersionDAO.java | 2 +- topia-service-replication/pom.xml | 5 ++ .../src/license/THIRD-PARTY.properties | 34 ++------ .../topia/replication/TopiaReplicationContext.java | 6 +- .../replication/TopiaReplicationModelBuilder.java | 14 ++-- .../replication/TopiaReplicationOperation.java | 16 ++-- .../TopiaReplicationOperationProvider.java | 4 +- .../TopiaReplicationOperationUndoable.java | 6 +- .../topia/replication/TopiaReplicationService.java | 27 ++++--- .../replication/TopiaReplicationServiceImpl.java | 2 +- .../topia/replication/model/ReplicationLink.java | 8 +- .../topia/replication/model/ReplicationModel.java | 4 +- .../topia/replication/model/ReplicationNode.java | 4 +- .../replication/model/ReplicationOperationDef.java | 10 +-- .../model/ReplicationOperationPhase.java | 4 +- .../replication/operation/AttachAssociation.java | 14 ++-- .../topia/replication/operation/AttachLink.java | 12 +-- .../replication/operation/DettachAssociation.java | 4 +- .../topia/replication/operation/Duplicate.java | 4 +- .../topia/replication/operation/LoadLink.java | 4 +- .../AbstractTopiaReplicationServiceTest.java | 4 +- .../replication/TopiaReplicationOperationTest.java | 4 +- .../TopiaReplicationServiceImplAllTest.java | 4 +- .../TopiaReplicationServiceImplTest.java | 14 ++-- .../topia/replication/operation/FakeOperation.java | 2 +- .../operation/UncreatableOperation.java | 2 +- .../operation/UnregistredOperation.java | 2 +- topia-service-security/pom.xml | 7 +- .../src/license/THIRD-PARTY.properties | 34 ++------ .../authorization/TopiaAuthorizationImpl.java | 8 +- .../topia/security/jaas/TopiaCallbackHandler.java | 2 +- .../topia/security/jaas/TopiaConfiguration.java | 2 +- .../topia/security/jaas/TopiaLoginModule.java | 2 +- .../topia/security/jaas/TopiaPermission.java | 2 +- .../nuiton/topia/security/jaas/TopiaPolicy.java | 2 +- .../nuiton/topia/security/jaas/TopiaPrincipal.java | 2 +- .../topia/security/listener/EntityVetoable.java | 2 +- .../topia/security/listener/PropertyVetoable.java | 2 +- .../topia/security/util/TopiaSecurityUtil.java | 2 +- .../java/org/nuiton/topia/taas/TaasService.java | 4 +- .../main/java/org/nuiton/topia/taas/TaasUtil.java | 21 +---- .../topia/taas/jaas/TaasCallbackHandler.java | 2 +- .../nuiton/topia/taas/jaas/TaasConfiguration.java | 2 +- .../nuiton/topia/taas/jaas/TaasLoginModule.java | 2 +- .../org/nuiton/topia/taas/jaas/TaasPermission.java | 18 +---- .../org/nuiton/topia/taas/jaas/TaasPolicy.java | 2 +- .../topia/taas/jaas/TaasPrincipalWrapper.java | 2 +- .../nuiton/topia/taas/jaas/TaasSubjectFinder.java | 2 +- .../topia/taas/jaas/TaasSubjectFinderImpl.java | 2 +- .../src/test/java/org/nuiton/topia/TestUtils.java | 2 +- 202 files changed, 605 insertions(+), 723 deletions(-) diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index e841c95..51d68f5 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -80,6 +80,11 @@ <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> <dependency> <groupId>commons-logging</groupId> diff --git a/topia-persistence/src/license/THIRD-PARTY.properties b/topia-persistence/src/license/THIRD-PARTY.properties index f51af0f..03a8e78 100644 --- a/topia-persistence/src/license/THIRD-PARTY.properties +++ b/topia-persistence/src/license/THIRD-PARTY.properties @@ -1,34 +1,14 @@ -### -# #%L -# ToPIA :: Persistence -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 2014 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License 2.0 +# - Apache License Version 2.0 +# - Apache License, version 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - GNU Lesser General Public License, version 2.1 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License 1.0 # - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -40,14 +20,12 @@ # - New BSD License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - The SAX License -# - The W3C License # - http://jaxen.codehaus.org/license.html -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Mar 15 12:36:23 CET 2013 +#Wed Mar 02 11:20:31 CET 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javax.transaction--jta--1.1=Sun Binary Code License Agreement diff --git a/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java b/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java index e4ef10b..683f4ef 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java @@ -42,11 +42,11 @@ import java.util.List; /** * TODO-FD20100507 : Need javadoc + translate the one on methods. - * <p/> + * * Created: 3 janv. 2006 21:18:34 * - * @author poussin <poussin@codelutin.com> - * @author tchemit <tchemit@codelutin.com> + * @author poussin <poussin@codelutin.com> + * @author tchemit <tchemit@codelutin.com> * @version $Id$ */ public interface TopiaContext { @@ -227,7 +227,7 @@ public interface TopiaContext { * Allow to do some HQL query and return an unique result. If nothing if * found by the query, will return null. If more than one result is found, * will throw an exception. - * <p/> + * * WARNING : Depending on the registered service, this method may not * support something else than queries on TopiaEntity * @@ -263,10 +263,10 @@ public interface TopiaContext { /** * Permet de dupliquer de ce context vers un context d'une autre base des * données sans modification des entites. - * <p/> + * * <b>Note:</b> Si le parametre <code>entityAndCondition</code> est vide, * alors on duplique toutes les entités de la base. - * <p/> + * * <b>Note 2:</b> Il se peut que la replication simple ne soit pas * suffisante (par example si l'on veut repliquer q'une partie d'une * entité), on utilisera donc la seconde méthode {@link diff --git a/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java b/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java index b41fc73..a818816 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java @@ -40,11 +40,11 @@ import java.util.Properties; /** * TODO-FD20100507 : Need javadoc + translate the one on methods. - * <p/> + * * Created: 3 janv. 2006 21:19:37 * - * @author poussin <poussin@codelutin.com> - * @author tchemit <tchemit@codelutin.com> + * @author poussin <poussin@codelutin.com> + * @author tchemit <tchemit@codelutin.com> * @version $Id$ */ public class TopiaContextFactory { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java b/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java index dc00ebf..334c3b5 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/TopiaException.java @@ -29,7 +29,7 @@ package org.nuiton.topia; * * Created: 23 déc. 2005 23:03:36 * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Id$ */ public class TopiaException extends RuntimeException { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/TopiaNotFoundException.java b/topia-persistence/src/main/java/org/nuiton/topia/TopiaNotFoundException.java index 709a761..28409a3 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/TopiaNotFoundException.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/TopiaNotFoundException.java @@ -29,7 +29,7 @@ package org.nuiton.topia; * * Created: 23 déc. 2005 23:04:28 * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Id$ */ public class TopiaNotFoundException extends TopiaException { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java b/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java index 581a248..3faaaeb 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/TopiaRuntimeException.java @@ -27,7 +27,7 @@ package org.nuiton.topia; /** * TODO-FD20100507 : Need javadoc. * - * @author chatellier <chatellier@codelutin.com> + * @author chatellier <chatellier@codelutin.com> * @version $Id$ */ public class TopiaRuntimeException extends RuntimeException { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java b/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java index 37b1c86..2b318f1 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/TopiaVetoException.java @@ -29,7 +29,7 @@ package org.nuiton.topia; * * Created: 5 janv. 2006 00:47:51 * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Id$ */ public class TopiaVetoException extends RuntimeException { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java index 0f10d44..d922ba6 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextAdapter.java @@ -25,11 +25,11 @@ package org.nuiton.topia.event; /** * Adapter pattern of {@link TopiaContextListener}. - * <p/> + * * This implementation does nothing but permits developpers to use this adapater * without to have to implements all methods. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.3.4 */ public class TopiaContextAdapter implements TopiaContextListener { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextEvent.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextEvent.java index 42486ec..ec860be 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextEvent.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextEvent.java @@ -32,7 +32,7 @@ import java.util.EventObject; * TODO-fdesbois-20100507 : Need javadoc. * Used for Migration service. * - * @author chatellier <chatellier@codelutin.com> + * @author chatellier <chatellier@codelutin.com> * @version $Id$ */ public class TopiaContextEvent extends EventObject { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java index bf68976..3cb8f1f 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java @@ -28,7 +28,7 @@ import java.util.EventListener; /** * Listener for TopiaContext actions. - * <p/> + * * Listener are notified for action such as : * <ul> * <li>createSchema</li> @@ -36,7 +36,7 @@ import java.util.EventListener; * <li>...</li> * </ul> * - * @author chatellier <chatellier@codelutin.com> + * @author chatellier <chatellier@codelutin.com> * @version $Id$ */ public interface TopiaContextListener extends EventListener { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesEvent.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesEvent.java index 3e1aca6..554884b 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesEvent.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesEvent.java @@ -33,7 +33,7 @@ import java.util.List; /** * TODO-fdesbois-20100507 : Need javadoc. * - * @author jruchaud <jruchaud@codelutin.com> + * @author jruchaud <jruchaud@codelutin.com> * @version $Id$ */ public class TopiaEntitiesEvent<E extends TopiaEntity> extends EventObject { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesVetoable.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesVetoable.java index 4e7cb5b..082d769 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesVetoable.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntitiesVetoable.java @@ -32,7 +32,7 @@ import java.util.List; /** * Permet de lancer des événements liés au récupération des données * - * @author jruchaud <jruchaud@codelutin.com> + * @author jruchaud <jruchaud@codelutin.com> * @version $Id$ */ public interface TopiaEntitiesVetoable extends EventListener { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityEvent.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityEvent.java index a38e3c5..a6a1a16 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityEvent.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityEvent.java @@ -32,7 +32,7 @@ import java.util.EventObject; /** * TODO-fdesbois-20100507 : Need javadoc. * - * @author jruchaud <jruchaud@codelutin.com> + * @author jruchaud <jruchaud@codelutin.com> * @version $Id$ */ public class TopiaEntityEvent extends EventObject { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityListener.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityListener.java index 72ea2b5..c4fda41 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityListener.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityListener.java @@ -29,8 +29,8 @@ import java.util.EventListener; /** * TODO-fdesbois-20100507 : Need javadoc. * - * @author poussin <poussin@codelutin.com> - * @author tchemit <tchemit@codelutin.com> + * @author poussin <poussin@codelutin.com> + * @author tchemit <tchemit@codelutin.com> * @version $Id$ */ public interface TopiaEntityListener extends EventListener { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityVetoable.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityVetoable.java index 31f973f..1fa4a71 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityVetoable.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaEntityVetoable.java @@ -29,8 +29,8 @@ import java.util.EventListener; /** * TODO-fdesbois-20100507 : Need javadoc. * - * @author jruchaud <jruchaud@codelutin.com> - * @author tchemit <tchemit@codelutin.com> + * @author jruchaud <jruchaud@codelutin.com> + * @author tchemit <tchemit@codelutin.com> * @version $Id$ */ public interface TopiaEntityVetoable extends EventListener { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java index bd2dce7..d37d748 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionEvent.java @@ -36,7 +36,7 @@ import java.util.Set; /** * Event fires for {@link TopiaTransactionListener}. * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Id$ * @see TopiaTransactionListener */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionListener.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionListener.java index de4ddf4..9ca8b14 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionListener.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionListener.java @@ -32,16 +32,16 @@ import java.util.EventListener; /** * To listen transaction operations as commit and rollback. - * <p/> + * * <b>Warning:</b> Must be attached to the current transaction. - * <p/> + * * {@link TopiaContext} listens such listeners via {@code javaBeans} methods : * <ul> * <li>{@link TopiaContext#addTopiaTransactionListener(TopiaTransactionListener)}</li> * <li>{@link TopiaContext#removeTopiaTransactionListener(TopiaTransactionListener)}</li> * </ul> * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Id$ * @see TopiaContext * @see TopiaTransactionEvent @@ -52,7 +52,7 @@ public interface TopiaTransactionListener extends EventListener { /** * Fired by {@link TopiaFiresSupport#fireOnPostCommit(TopiaContextImplementor)}. - * <p/> + * * Says after a commit was performed on listened transaction. * * @param event the transaction event @@ -61,7 +61,7 @@ public interface TopiaTransactionListener extends EventListener { /** * Fired by {@link TopiaFiresSupport#fireOnPostRollback(TopiaContextImplementor)}. - * <p/> + * * Says after a rollback was performed on listened transaction. * * @param event the transaction event diff --git a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionVetoable.java b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionVetoable.java index 3e76409..23e841e 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionVetoable.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaTransactionVetoable.java @@ -29,8 +29,8 @@ import java.util.EventListener; /** * TODO-fdesbois-20100507 : Need javadoc. * - * @author jruchaud <jruchaud@codelutin.com> - * @author tchemit <tchemit@codelutin.com> + * @author jruchaud <jruchaud@codelutin.com> + * @author tchemit <tchemit@codelutin.com> * @version $Id$ */ public interface TopiaTransactionVetoable extends EventListener { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java index 1f05da2..3925625 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java @@ -28,7 +28,7 @@ import java.beans.PropertyChangeListener; /** * Created: 3 juin 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ */ public interface EntityFilter { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java index 18f44e7..bb5bbc3 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityState.java @@ -27,7 +27,7 @@ package org.nuiton.topia.framework; /** * Used to know the state of entity during transaction. * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> */ public class EntityState implements Comparable<EntityState>{ @@ -48,7 +48,7 @@ public class EntityState implements Comparable<EntityState>{ /** * Add load state. - * <p/> + * * After the invocation, method {@link #isLoad()} will always return {@code true}. */ public void addLoad() { @@ -57,7 +57,7 @@ public class EntityState implements Comparable<EntityState>{ /** * Add read state - * <p/> + * * After the invocation, method {@link #isRead()} will always return {@code true}. */ public void addRead() { @@ -66,7 +66,7 @@ public class EntityState implements Comparable<EntityState>{ /** * Add create state. - * <p/> + * * After the invocation, method {@link #isCreate()} will always return {@code true}. */ public void addCreate() { @@ -75,7 +75,7 @@ public class EntityState implements Comparable<EntityState>{ /** * Add update state. - * <p/> + * * After the invocation, method {@link #isUpdate()} will always return {@code true}. */ public void addUpdate() { @@ -84,7 +84,7 @@ public class EntityState implements Comparable<EntityState>{ /** * Add delete state. - * <p/> + * * After the invocation, method {@link #isDelete()} will always return {@code true}. */ public void addDelete() { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java index 41196a3..5929b33 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java @@ -45,23 +45,23 @@ import org.hibernate.service.spi.Stoppable; /** * Customized connection provider. - * <p/> + * * This provider fix the following bug : * http://nuiton.org/issues/show/561 - * <p/> + * * To use this connection provider, add this property to topia configuration - * <p/> + * * <pre> * config.setProperty(Environment.CONNECTION_PROVIDER, TopiaConnectionProvider.class.getName()); * </pre> - * <p/> + * * or in a properties file : - * <p/> + * * <pre> * hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider * </pre> * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5.3 */ public class TopiaConnectionProvider implements ConnectionProvider, Configurable, Stoppable { @@ -74,7 +74,7 @@ public class TopiaConnectionProvider implements ConnectionProvider, Configurable /** * JDBC url of connection. - * <p/> + * * This is a mandatory hibernate configuration vi the property * {@link Environment#URL}. */ @@ -85,7 +85,7 @@ public class TopiaConnectionProvider implements ConnectionProvider, Configurable /** * Sql isolation level to use in connection. - * <p/> + * * Can be configured by hibernate property {@link Environment#ISOLATION}. * * @see Connection#getTransactionIsolation() @@ -94,7 +94,7 @@ public class TopiaConnectionProvider implements ConnectionProvider, Configurable /** * auto commit connection state. - * <p/> + * * Can be configured by hibernate property {@link Environment#AUTOCOMMIT}. * * @see Connection#getAutoCommit() @@ -103,7 +103,7 @@ public class TopiaConnectionProvider implements ConnectionProvider, Configurable /** * Size of connection pool. - * <p/> + * * By default use {@code 20}, can be specify by using the hibernate * configuration property {@link Environment#POOL_SIZE}. */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java index 749f569..1f1d587 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java @@ -92,26 +92,26 @@ import org.nuiton.topia.persistence.TopiaId; /** * Le TopiaContextImpl est le point d'entre pour acceder aux donnees. Il est * configurer par un fichier de propriete - * <p/> + * * List des proprietes disponible <dl> <dt> topia.persistence.properties.file * <dd> le fichier de propriété a utiliser pour configurer hibernate - * <p/> + * * <dt> topia.persistence.directories <dd> la liste des repertoires contenant * les mappings hibernates (.hbm.xml) la liste de repertoire est separer par des * virgules ',' - * <p/> + * * <dt> topia.persistence.classes <dd> la liste des classes que doit géré * hibernate. On peut tres bien utiliser topia.persistence.directories pour un * ensemble d'entié du meme repertoire et topia.persistence.classes pour * d'autres classes </dl> - * <p/> + * * TopiaContextImpl.java - * <p/> + * * Created: 23 déc. 2005 16:58:50 * - * @author poussin <poussin@codelutin.com> - * @author tchemit <chemit@codelutin.com> - * @author fdesbois <desbois@codelutin.com> + * @author poussin <poussin@codelutin.com> + * @author tchemit <chemit@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * @version $Id$ */ //TODO-fdesbois-20100507 : Need translation of javadoc. @@ -1154,7 +1154,7 @@ public class TopiaContextImpl implements TopiaContextImplementor { /** * Read database from gzip compressed file - * <p/> + * * Only work for h2 database * * @see TopiaContext#restore(File) @@ -1366,7 +1366,7 @@ public class TopiaContextImpl implements TopiaContextImplementor { /** * Build the list of queries from the given parameter * <code>entityAndCondition</code>. - * <p/> + * * If no parameter is given, then build the queries for all entities is db, * with no condition. * diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java index feca9c1..715c020 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java @@ -46,7 +46,7 @@ import org.nuiton.topia.persistence.TopiaEntity; * Any implementation of the {@link TopiaContext} should also implements this * contract. * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Id$ */ //TODO-fdesbois-20100507 : Need more javadoc. diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java index af467c1..7e58c25 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java @@ -35,7 +35,7 @@ import java.beans.PropertyChangeSupport; /** * Filter - * <p/> + * * Created: 23 avr. 2010 * * @author fdesbois diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java index 5a48863..ea4a604 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java @@ -75,11 +75,11 @@ import org.nuiton.util.ListenerSet; /** * TODO-fdesbois-20100507 : Need translation of javadoc. - * <p/> + * * Contient l'ensemble de la partie listener et vetoable c'est à dire la * gestion, les fires, ... * - * @author jruchaud <jruchaud@codelutin.com> + * @author jruchaud <jruchaud@codelutin.com> * @version $Id$ */ public class TopiaFiresSupport { @@ -567,7 +567,7 @@ public class TopiaFiresSupport { /** * Object permettant de faire le lien entre les events hibernate et topia * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> */ static public class TopiaHibernateEvent implements PreInsertEventListener, PostInsertEventListener, PreLoadEventListener, diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java index fa781c6..92b2bde 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java @@ -49,9 +49,9 @@ import java.util.Map; /** * Query HQL managment to simplify usage of {@link TopiaContext#findAll(String, * Object...) }. - * <p/> + * * TODO-FD20091224 JUnit Tests - * <p/> + * * <pre> * This class is used to construct a HQL query and then execute it from a * TopiaContext. The TopiaQuery is linked to a TopiaEntity which @@ -71,12 +71,12 @@ import java.util.Map; * ----------- * * SQL : - * "SELECT * FROM PersonImpl WHERE firstName LIKE 'M%' AND year > 1980" + * "SELECT * FROM PersonImpl WHERE firstName LIKE 'M%' AND year > 1980" * * HQL using {@link TopiaContext#findAll(String, Object...) } : * TopiaContext context = rootContext.beginTransaction(); * context.find("FROM " + Person.class.getName() + " WHERE firstName LIKE - * :firstName AND year > :year", + * :firstName AND year > :year", * "firstName", "M%", year, 1980); * * TopiaQuery : @@ -95,7 +95,7 @@ import java.util.Map; * TopiaContext context = rootContext.beginTransaction(); * * String query = "FROM " + Person.class.getName(); - * List<Object> params = new ArrayList<Object>(); + * List<Object> params = new ArrayList<>(); * String separator = " WHERE "; * // company parameter can be null * if (company != null) { @@ -208,7 +208,7 @@ import java.util.Map; * on a collection of entities which must be made manually. * * For a Contact which is linked to a person (entity) and the person linked to - * company (entity) you can add to a TopiaQuery<Contact> : + * company (entity) you can add to a TopiaQuery<Contact> : * query.addLoad("person.company") * * For a list of addresses (entity) in the contact you can do : @@ -219,7 +219,7 @@ import java.util.Map; * query.addLoad("meetings.responsible") * * </pre> - * <p/> + * * Created: 21 déc. 2009 * * @author fdesbois @@ -633,10 +633,10 @@ public class TopiaQuery { * Exemples : * - "person.company" (Property TopiaEntity person linked to the result * entity in query and company linked to person) - * --> calling myEntity.getPerson().getCompany(); + * --> calling myEntity.getPerson().getCompany(); * - "partyRoles" (Property Collection partyRoles linked to the result * entity in query) - * --> calling myEntity.getPartyRoles().size(); + * --> calling myEntity.getPartyRoles().size(); * </pre> * * @param properties List of properties to load @@ -651,7 +651,7 @@ public class TopiaQuery { * Used to load properties during query execution using FETCH keyword. This * keyword is used in a JOIN, so the alias is needed to identify properties * to load. - * </p> + * * Also an empty SELECT statement will be defined to retrieve the correct * entity depends on the mainEntity type in the query. Carefull using * addFetch, hibernate doesn't support more than 3 or 4 join. In this case, @@ -778,10 +778,10 @@ public class TopiaQuery { /** * Add an element to the query. The parameter will be automatically added. * The {@code operator} is needed to determine what type of operation it is. - * Ex : add("boat", Op.EQ, boat) means -> boat = :boat. Also if the paramValue + * Ex : add("boat", Op.EQ, boat) means -> boat = :boat. Also if the paramValue * is Null, the paramName will be added to the query with the constraint * null (IS NULL). - * <p/> + * * TODO-fdesbois-2010-05-26 : maybe manage more than one paramValue with Object... Depends on operator * * @param paramName the name of the parameter in the query (attribute of @@ -847,7 +847,7 @@ public class TopiaQuery { /** * Add an element to the query. The parameter will be automatically added. * The default constrainst operation is Op.EQ for EQUALS. Ex : add("boat", - * boat) means -> boat = :boat. If you add more than one values, the + * boat) means -> boat = :boat. If you add more than one values, the * statement IN will be used. You can also have a null value in the {@code * paramValue} list (except if it's the only one value, it's ambiguous). * Note : this method do nothing if the {@code paramValue} is not defined. @@ -954,7 +954,7 @@ public class TopiaQuery { /** * Add an element to the query. The nullity is tested or a constraint is * added for that element. Ex : addNullOr("begin", Op.GT, new Date()) means - * begin IS NULL OR begin > :begin (where :begin = new Date()). + * begin IS NULL OR begin > :begin (where :begin = new Date()). * * @param paramName the name of the parameter in the query (attribute of * the entity) @@ -1279,7 +1279,7 @@ public class TopiaQuery { * necessary to use the referenceId of the {@code filter}. The filter will * be applied on the main entity in the query (using the mainAlias if * necessary). - * <p/> + * * Note : the default orderBy is the topiaCreateDate ordered desc (the most * recent in first) * @@ -1301,7 +1301,7 @@ public class TopiaQuery { * The referenceProperty need to be specifie in {@code filter} to have a * correspondance between the referenceId and it's property in the query. By * default, the {@code propertyToFilter} is the mainAlias of the query. - * <p/> + * * Note : the default orderBy is the topiaCreateDate ordered desc (the most * recent in first) * @@ -1745,7 +1745,7 @@ public class TopiaQuery { * getProperty("boat", Boat.SHIP_OWNER, ShipOwner.NAME); * // will return boat.shipOwner.name * </pre> - * <p/> + * * It's better to use constants instead of directly the string chain to * avoid problems on changing property name in model. Furthermore it's * better to use this method instead of doing : diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java index 8b14d9c..92fd8b0 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java @@ -202,7 +202,7 @@ public abstract class TopiaSQLQuery<O> { /** * From a given result set, let's count his number of row. - * <p/> + * * <strong>Note:</strong> the result set must be scrollable to go back to * before first row. * diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaService.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaService.java index 1b2ca30..9352d34 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaService.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaService.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -22,30 +22,20 @@ * #L% */ -/* * - * TopiaService.java - * - * Created: 8 oct. 06 17:15:52 - * - * @author poussin <poussin@codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package org.nuiton.topia.framework; /** * Used to implement a service for Topia. You have to provide a static property * called SERVICE_NAME that identify the service : - * <p/> - * <li>public static final String SERVICE_NAME = "monservice"; - * <p/> + * + * <ul> + * <li>public static final String SERVICE_NAME = "monservice";</li> + * </ul> + * * The value of this attribute need to be returned when using * {@link #getServiceName()} method. * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Id$ */ public interface TopiaService { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaTransactionAware.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaTransactionAware.java index 4e2143b..e828554 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaTransactionAware.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaTransactionAware.java @@ -28,20 +28,20 @@ import org.nuiton.topia.TopiaContext; /** * Use this contract on a object which use a {@code TopiaContext} as a * transaction. - * <p/> + * * The method {@link #getTransaction()} returns the internal transaction used. - * <p/> + * * the method {@link #setTransaction(TopiaContext)} put the internal * transaction. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.1 */ public interface TopiaTransactionAware { /** * Obtains the internal transaction. - * <p/> + * * If no transaction was opened, can return the {@code null} object. * * @return the current transaction (can be null or closed...). diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java index 5f6d5a3..6e4a32c 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2015 CodeLutin, Chatellier Eric + * Copyright (C) 2004 - 2016 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -65,8 +65,8 @@ import com.google.common.base.Supplier; /** * TODO-fdesbois-20100507 : Need javadoc + translations for existing methods. * - * @author bpoussin <poussin@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author bpoussin <poussin@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ */ public class TopiaUtil { @@ -132,7 +132,7 @@ public class TopiaUtil { /** * Compute a regex pattern given a format string. - * <p/> + * * A {@link String#format(String, Object...)} will be apply to * <code>format</code>, with for parameters the list of <code>klass</code> * transformed in topia pattern via method {@link #getTopiaIdPattern(Class)} @@ -358,11 +358,11 @@ public class TopiaUtil { /** * Method to extract from the given Hibernate SessionFactory a working instance of StandardServiceRegistry - * <p/> + * * IMPORTANT : As much as possible, prefer using the * {@link #getSessionFactoryServiceRegistry(org.hibernate.SessionFactory)} mthod instead of the current one because * the SessionFactoryServiceRegistry is a child of the StandardServiceRegistry - * <p/> + * * NB: This method is static to make sure it does not depend on the current instance * * @param sessionFactory the Hibernate's SessionFactory instance @@ -379,11 +379,11 @@ public class TopiaUtil { /** * Method to extract from the given Hibernate SessionFactory a working instance of SessionFactoryServiceRegistry - * <p/> + * * IMPORTANT : If possible, prefer using this method instead of * {@link #getStandardServiceRegistry(org.hibernate.SessionFactory)} because the SessionFactoryServiceRegistry is a * child of the StandardServiceRegistry - * <p/> + * * NB: This method is static to make sure it does not depend on the current instance * * @param sessionFactory the Hibernate's SessionFactory instance @@ -400,7 +400,7 @@ public class TopiaUtil { /** * Method to get an Hibernate service instance from a given Hibernate SessionFactory - * <p/> + * * NB: This method is static to make sure it does not depend on the current instance * * @param sessionFactory the Hibernate's SessionFactory instance @@ -420,7 +420,7 @@ public class TopiaUtil { } /** - * Hibernate 4.3.x compatible Supplier<ConnectionProvider>. The provider will choose the best way to find the + * Hibernate 4.3.x compatible Supplier<ConnectionProvider>. The provider will choose the best way to find the * ConnectionProvider depending on the way is has been created. */ public static class ConnectionProviderSupplier implements Supplier<ConnectionProvider>, Closeable { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/framework/package-info.java b/topia-persistence/src/main/java/org/nuiton/topia/framework/package-info.java index 813971b..486f3a1 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/framework/package-info.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/framework/package-info.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -27,13 +27,13 @@ * services. This package contains also the main implementation {@link org.nuiton.topia.framework.TopiaContextImpl} * for both {@link org.nuiton.topia.TopiaContext} for final applications and * {@link org.nuiton.topia.framework.TopiaContextImplementor} for internal. - * <p /> + * * You can also use {@link org.nuiton.topia.framework.TopiaQuery} class for query manipulation with * {@link org.nuiton.topia.persistence.TopiaDAO}. - * <p /> + * * {@link org.nuiton.topia.framework.TopiaUtil} is a helper class used for TopiaContext manipulations. * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ * @see org.nuiton.topia.TopiaContext * @see org.nuiton.topia.persistence.TopiaDAO diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java index 1f4db13..8e37e23 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java @@ -54,7 +54,7 @@ import java.util.List; /** * A template to generate a helper for {@link TopiaEntityBinder}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.BinderHelperTransformer" * @since 2.3.1 diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java index f1f9d91..031247c 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java @@ -67,7 +67,7 @@ import java.util.regex.Pattern; /** * Created: 13 déc. 2009 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id: DAOAbstractTransformer.java 1960 2010-05-13 17:18:23Z tchemit$ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOAbstractTransformer" * @since 2.3.0 @@ -99,8 +99,7 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { * Map of extra operations for DAO. The key of the map is the qualified * name of the entity relative to the DAO. */ - Map<String, Collection<ObjectModelOperation>> extraOperations = - new HashMap<String, Collection<ObjectModelOperation>>(); + Map<String, Collection<ObjectModelOperation>> extraOperations = new HashMap<>(); @Override public void transformFromModel(ObjectModel model) { @@ -128,16 +127,16 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { return; } - // Extra operations from <<dao>> interfacez + // Extra operations from <<dao>> interfacez collectExtraOperations(interfacez); } /** * EVO #636 : Manage extra operations for DAO from "dao" dependency - * between an interface with stereotype <<dao>> (dependency client) and - * a class with stereotype <<entity>> (dependency supplier). + * between an interface with stereotype <<dao>> (dependency client) and + * a class with stereotype <<entity>> (dependency supplier). * - * @param interfacez The interface with <<dao>> stereotype + * @param interfacez The interface with <<dao>> stereotype */ protected void collectExtraOperations(ObjectModelInterface interfacez) { ObjectModelDependency dependency = @@ -453,13 +452,13 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { // addInElements("A", "B." + <%=reverseAttrNameProperty%>); // // System.out.println("Query : " + query); -// List<<%=attrType%>> list = dao.findAllByQuery(query); +// List<<%=attrType%>> list = dao.findAllByQuery(query); body.append("" /*{ { - List<<%=attrType%>> list = getContext().getHibernate().createSQLQuery( + List<<%=attrType%>> list = getContext().getHibernate().createSQLQuery( "SELECT main.topiaid " + "from <%=attrClassifierDBName%> main, <%=attrJoinTableName%> secondary " + "where main.topiaid=secondary.<%=attrDBName%>" + @@ -483,7 +482,7 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { body.append("" /*{ { - List<<%=attrSimpleType%>> list = getContext() + List<<%=attrSimpleType%>> list = getContext() .getDAO(<%=attrSimpleType%>.class) .findAllByProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity); for (<%=attrSimpleType%> item : list) { @@ -546,7 +545,7 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { operation = addOperation(result, "findAllUsages", - "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", ObjectModelJavaModifier.PUBLIC); addParameter(operation, "E", "entity"); @@ -554,7 +553,7 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { addAnnotation(result, operation, "Override"); setOperationBody(operation, "" /*{ - return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(); + return new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(); }*/ ); @@ -658,7 +657,7 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { operation = addOperation(result, "findAllUsages", - "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", + "Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>", ObjectModelJavaModifier.PUBLIC); addParameter(operation, "E", "entity"); @@ -668,8 +667,8 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { buffer = new StringBuilder(300); buffer.append("" /*{ - Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> result; - result = new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); + Map<Class<? extends TopiaEntity>,List<? extends TopiaEntity>> result; + result = new HashMap<Class<? extends TopiaEntity>, List<? extends TopiaEntity>>(<%=usagesForclass.size()%>); List<? extends TopiaEntity> list; }*/ @@ -698,7 +697,7 @@ public class DAOAbstractTransformer extends ObjectModelTransformerToJava { /** * Generation of DAO operations signatures from class. These operations are - * abstract and identified by <<dao>> stereotype in the model. The + * abstract and identified by <<dao>> stereotype in the model. The * developper must defined these methods in the DAOImpl associated to this * DAOAbstract. * diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java index e3d41f8..51cb6d0 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java @@ -62,7 +62,7 @@ import java.util.List; /** * Created: 13 nov. 2009 09:05:17 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOHelperTransformer" diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java index 06265dd..c90feb4 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java @@ -39,7 +39,7 @@ import java.util.List; /** * Created: 14 déc. 2009 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOImplTransformer" @@ -66,8 +66,8 @@ public class DAOImplTransformer extends ObjectModelTransformerToJava { /** * EVO #636 : Manage extra operations for DAO from "dao" dependency - * between an interface with stereotype <<dao>> (dependency client) and - * a class with stereotype <<entity>> (dependency supplier). + * between an interface with stereotype <<dao>> (dependency client) and + * a class with stereotype <<entity>> (dependency supplier). */ ObjectModelDependency dependency = @@ -108,7 +108,7 @@ public class DAOImplTransformer extends ObjectModelTransformerToJava { } /** - * Detect if the class has DAO operations identified with <<dao>> stereotype. + * Detect if the class has DAO operations identified with <<dao>> stereotype. * * @param clazz The ObjectModelClass with operations (Corresponding to the Entity) * @return true if the class has some dao operations, false if not diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java index 3cb3a61..fbf94b2 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java @@ -33,7 +33,7 @@ import org.nuiton.eugene.models.object.ObjectModelClass; /** * Created: 13 déc. 2009 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DAOTransformer" diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java index dca8d8a..5cbeac4 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java @@ -46,7 +46,7 @@ import java.util.List; /** * Created: 20 déc. 2009 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.DTOTransformer" diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java index b1098fe..b9c301e 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java @@ -63,7 +63,7 @@ import java.util.regex.Pattern; /** * To generate all <code>DAO</code> related classes for a given entity. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5.4 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityDAOTransformer" */ @@ -75,7 +75,7 @@ public class EntityDAOTransformer extends ObjectModelTransformerToJava { /** * map of direct usages (values) for each entity (key). - * <p/> + * * This map is used to generate the findUsages methods for DAOAbstract. */ protected Map<ObjectModelClass, Set<ObjectModelClass>> usages; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java index ee55514..a76fdd8 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java @@ -51,7 +51,7 @@ import static org.nuiton.topia.generator.TopiaGeneratorUtil.shouldGenerateDTOTop /** * Created: 14 déc. 2009 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityDTOTransformer" diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java index 4c9ccb2..dab468e 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java @@ -30,7 +30,7 @@ * * Created: 12 déc. 2005 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * */ @@ -62,7 +62,7 @@ import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRel /** * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Id$ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityHibernateMappingGenerator" */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java index 3adfe76..0197af8 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java @@ -75,7 +75,7 @@ import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRel * <li>There is no already defined such class in class-path</li> * </ul> * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.3.4 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityTransformer" */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java index 183fe39..90f698b 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java @@ -48,7 +48,7 @@ import java.util.Map; /** * Created: 23 juin 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ * @since 2.4 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.QueryHelperTransformer" diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java index ff8007c..c36acfc 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -74,7 +74,7 @@ import java.util.Map; * </div> * <div> * Exemple of ServiceImpl utils method implementation. (The AppException - * is considered if defined in model tagvalue "exceptionClass") : <br /> + * is considered if defined in model tagvalue "exceptionClass") : * <pre> * public class ServiceImpl implements ServiceAbstract { * @@ -152,6 +152,7 @@ import java.util.Map; * } * } * </pre> + * </div> * <div> * <h2>TAG_TRANSACTION</h2> * <p>Default value : true</p> @@ -178,7 +179,7 @@ import java.util.Map; * * Created: 23 mars 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ * @since 2.3.1 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.ServiceTransformer" diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java index 856fed6..5840c95 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java @@ -62,13 +62,13 @@ import java.util.TreeMap; /** * Classe regroupant divers méthodes utiles pour la génération des entités - * <p/> + * * Created: 13 déc. 2005 * - * @author Arnaud Thimel <thimel@codelutin.com> - * @author tchemit <tchemit@codelutin.com> - * @author fdesbois <fdesbois@codelutin.com> - * @author chatellier <chatellier@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> + * @author tchemit <tchemit@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> + * @author chatellier <chatellier@codelutin.com> * @version $Id$ */ public class TopiaGeneratorUtil extends JavaGeneratorUtil { @@ -177,7 +177,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the reverse db name of an attribute. - * <p/> + * * Try first to get the reverse db Name from the ReverseDbname tag-vlaue, then * If attribute has a specific reverse attribute, use his db name, otherwise * suffix the db name of the attribute by {@code _id}. @@ -463,7 +463,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { * * @param attribute l'attribut à tester * @return {@code true} si l'attribut fait partie d'une clef metier, - * <code>false</cdoe> sinon. + * <code>false</code> sinon. */ public static boolean isNaturalId(ObjectModelAttribute attribute) { String value = getNaturalIdTagValue(attribute); @@ -695,7 +695,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { * - cette relation est unidirectionnelle * - le type de l'attribut représente un entité * - cette entité a des sous-classes dans le modèle - * <p/> + * * Ce cas correspond à une incompatibilité d'Hibernate qui nous oblige a * adopter un comportement particulier. * </p> @@ -729,10 +729,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Renvoie le nom unique de table pour une relation ManyToMany en fonction - * de l'attribut <code>attr</code> - * <p/> - * Plusieurs cas de figure: - * <li> + * de l'attribut <code>attr</code>. * * @param attr l'attribut servant de base au calcul du nom * @return le nom de la table @@ -861,7 +858,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Detecte si la clef metier d'une classe est mutable ou pas. - * <p/> + * * On respecte la valeur par defaut d'hibernate, à savoir que par default * une clef metier est non mutable. * @@ -1058,7 +1055,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the class to use as abstract dao. - * <p/> + * * It will look after a tag value {@link TopiaTagValues#TAG_DAO_IMPLEMENTATION} in model * and if not found will use the default value which is {@link TopiaDAOImpl}. * @@ -1356,7 +1353,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_PERSISTENCE_TYPE} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1371,7 +1368,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_DB_NAME} * tag value on the given element. - * <p/> + * * * Note that it won't and search on declaring element or anywhere else than on the given element. * See https://forge.nuiton.org/issues/2342 @@ -1389,7 +1386,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_REVERSE_DB_NAME} * tag value on the given element. - * <p/> + * * * Note that it won't and search on declaring element or anywhere else than on the given element. * See https://forge.nuiton.org/issues/2342 @@ -1407,7 +1404,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_MANY_TO_MANY_TABLE_NAME} * tag value on the given attribute. - * <p/> + * * * Note that it won't and search on declaring element or anywhere else than on the given element. * See https://forge.nuiton.org/issues/2342 @@ -1425,7 +1422,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_SCHEMA_NAME} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @param model model to seek @@ -1445,7 +1442,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_LENGTH} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1460,7 +1457,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_ANNOTATION} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1476,7 +1473,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_ACCESS} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1491,7 +1488,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_NATURAL_ID} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1506,7 +1503,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_NATURAL_ID_MUTABLE} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1521,7 +1518,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_INVERSE} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1536,7 +1533,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_LAZY} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1551,7 +1548,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_FETCH} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1566,7 +1563,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_ORDER_BY} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1581,7 +1578,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_NOT_NULL} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1596,7 +1593,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_PROXY_INTERFACE} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @param model model to seek @@ -1626,7 +1623,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_SECURITY_CREATE} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1641,7 +1638,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_SECURITY_DELETE} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1656,7 +1653,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_SECURITY_LOAD} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1671,7 +1668,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_SECURITY_UPDATE} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1686,7 +1683,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_NOT_GENERATE_TO_STRING} * tag value on the given class. - * <p/> + * * * @param clazz class to seek * @param model model to seek @@ -1702,7 +1699,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_SORT_ATTRIBUTE} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @param model model to seek @@ -1718,7 +1715,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_GENERATE_STANDALONE_ENUM_FOR_DAO_HELPER} * tag value on the given model. - * <p/> + * * * @param model model to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1732,7 +1729,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /* Obtain the value of the {@link TopiaTagValues#TAG_GENERATE_OPERATOR_FOR_DAO_HELPER} * tag value on the given model. - * <p/> + * * * @param model model to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1748,7 +1745,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_TYPE} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1763,7 +1760,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_SQL_TYPE} * tag value on the given attribute. - * <p/> + * * * @param attribute attribute to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1778,7 +1775,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_EXCEPTION_CLASS} * tag value on the given interface. - * <p/> + * * * @param model model to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1793,7 +1790,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_TRANSACTION} * tag value on the given operation. - * <p/> + * * * @param operation operation to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1808,7 +1805,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_TRANSACTION} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1823,7 +1820,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_DO_COMMIT} * tag value on the given operation. - * <p/> + * * * @param operation operation to seek * @param model model to seek @@ -1839,7 +1836,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_ERROR_ARGS} * tag value on the given operation. - * <p/> + * * * @param operation operation to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. @@ -1854,7 +1851,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtain the value of the {@link TopiaTagValues#TAG_NO_LOG_IN_SERVICE} * tag value on the given classifier. - * <p/> + * * * @param classifier classifier to seek * @param model model to seek @@ -1872,7 +1869,7 @@ public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Obtains the value of the {@link TopiaTagValues#TAG_DAO_IMPLEMENTATION} * tag value on the given model. - * <p/> + * * * @param model model to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java index b348688..2c036ad 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java @@ -42,7 +42,7 @@ import java.util.Set; * - les nom des attributs * - les duplication d'attibuts * - * @author chatellier <chatellier@codelutin.com> + * @author chatellier <chatellier@codelutin.com> * @version $Id$ */ public class TopiaJavaValidator extends ObjectModelValidator { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java index 8b6cd73..7cf93ad 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java @@ -39,7 +39,7 @@ import java.util.List; /** * Created: 20 déc. 2009 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.TopiaMetaTransformer" * @since 2.3.0 diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaRelationValidator.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaRelationValidator.java index dc27f06..c9378e7 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaRelationValidator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaRelationValidator.java @@ -28,7 +28,7 @@ * * Created: 31 mars 2006 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java index 81a7a6a..f195701 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaStereoTypes.java @@ -32,7 +32,7 @@ import org.nuiton.eugene.models.stereotype.StereotypeDefinitionProvider; /** * All extra stereotypes usable in topia generators. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5 * @plexus.component role="org.nuiton.eugene.models.stereotype.StereotypeDefinitionProvider" role-hint="topia-templates" */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java index 57569c6..ef16c6a 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java @@ -40,7 +40,7 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; /** * All extra tag values usable in topia generators. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5 * @plexus.component role="org.nuiton.eugene.models.tagvalue.TagValueDefinitionProvider" role-hint="topia-templates" */ @@ -245,11 +245,11 @@ public class TopiaTagValues extends TagValueDefinitionProvider { /** * Tag pour configurer l'interface du proxy sur autre chose que l'implementation par defaut. - * <p/> + * * Par defaut : - * null > generere le proxy sur l'interface de l'implementation + * null > generere le proxy sur l'interface de l'implementation * Autre valeur : - * "none" > laisse la configuration par defaut d'hibernate + * "none" > laisse la configuration par defaut d'hibernate * * @see TopiaGeneratorUtil#getPersistenceTypeTagValue(ObjectModelClassifier) * @since 2.5 @@ -334,7 +334,7 @@ public class TopiaTagValues extends TagValueDefinitionProvider { /** * Tag pour spécifier si on doit générer le {@link TopiaEntityEnum} en tant qu'inner classe * du dao helper ou pas. - * <p/> + * * <b>Note:</b> Par défaut, on génère en tant qu'inner classe. * * @see TopiaGeneratorUtil#getGenerateStandaloneEnumForDAOHelperTagValue(ObjectModel) @@ -379,9 +379,9 @@ public class TopiaTagValues extends TagValueDefinitionProvider { /** * To specify the abstract dao to use. - * <p/> + * * If none given, will use the {@code org.nuiton.topia.persistence.TopiaDAOImpl}. - * <p/> + * * Other value possible is {@code org.nuiton.topia.persistence.TopiaDAOLegacy} * * @see TopiaGeneratorUtil#getDaoImplementationTagValue(ObjectModel) @@ -451,7 +451,7 @@ public class TopiaTagValues extends TagValueDefinitionProvider { /** * Tag to specify if we want to add logs in any method of service * generated by {@link ServiceTransformer}. - * <p/> + * * <b>Note:</b> To have no log just use this tag on services or gloabaly * on model (for all services). * @@ -478,7 +478,7 @@ public class TopiaTagValues extends TagValueDefinitionProvider { /** * Tag to generate deterministic foreign key names in hibernate mapping files. - * <p/> + * * * @see TopiaGeneratorUtil#isGenerateForeignKeyNames(ObjectModelClassifier, ObjectModel) * @since 2.10 @@ -491,7 +491,7 @@ public class TopiaTagValues extends TagValueDefinitionProvider { /** * Tag to specify if we want to add an "id" property in DTO generated by * {@link EntityDTOTransformer}. - * <p/> + * * * @see EntityDTOTransformer * @see TopiaGeneratorUtil#shouldGenerateDTOTopiaIdTagValue(ObjectModelClassifier, ObjectModel) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/generator/package-info.java b/topia-persistence/src/main/java/org/nuiton/topia/generator/package-info.java index dce0573..99c6154 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/generator/package-info.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/generator/package-info.java @@ -111,7 +111,7 @@ * méthodes l'utilise dans les signatures de méthode lorsqu'il y a un * lien entre deux entités.</p> * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Id$ */ package org.nuiton.topia.generator; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java index f554701..b40e5f8 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java @@ -34,8 +34,8 @@ import java.util.Collection; /** * Parcourt du graphe d'entité en profondeur. * - * @author echatellier <chatellier@codelutin.com> - * @author tchemit <tchemit@codelutin.com> + * @author echatellier <chatellier@codelutin.com> + * @author tchemit <tchemit@codelutin.com> * @version $Id$ */ public class DepthEntityVisitor implements EntityVisitor { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java index 0fd5f3a..d0c8cdc 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java @@ -26,11 +26,11 @@ package org.nuiton.topia.persistence; /** * The contract of a visitor of any {@link TopiaEntity}. - * <p/> + * * Created: 28 janv. 2009 18:10:34 * - * @author bpoussin <poussin@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author bpoussin <poussin@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ */ public interface EntityVisitor { @@ -51,7 +51,7 @@ public interface EntityVisitor { /** * Visit a none indexed property for the given entity. - * <p/> + * * The property visited is defined by the other parameters. * * @param entity the visited entity @@ -64,7 +64,7 @@ public interface EntityVisitor { /** * Visit a collection property for the given entity. - * <p/> + * * The property visited is defined by the other parameters. * * @param entity the visited entity @@ -78,7 +78,7 @@ public interface EntityVisitor { /** * Visit a indexed value from a collection property for the given entity. - * <p/> + * * The property visited is defined by the other parameters. * * @param entity the visited entity @@ -93,10 +93,10 @@ public interface EntityVisitor { /** * Reset all states of the visitor. - * <p/> + * * If you use internal states inside the visitor, this method should clean * all of them. - * <p/> + * * This method should be invoked after usage of the visitor. */ void clear(); diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.java index 76b4433..c7b6890 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.java @@ -35,8 +35,8 @@ import java.util.List; /** * Parcourt en largeur du modele et délegation à un autre visiteur. * - * @author echatellier <chatellier@codelutin.com> - * @author tchemit <tchemit@codelutin.com> + * @author echatellier <chatellier@codelutin.com> + * @author tchemit <tchemit@codelutin.com> * @version $Id$ */ public class HorizontalEntityVisitor implements EntityVisitor { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/SearchFields.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/SearchFields.java index 794e5c7..7f9baf9 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/SearchFields.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/SearchFields.java @@ -27,7 +27,7 @@ * * Created: 7 juin 2006 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java index 27c014e..4f7ae58 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java @@ -27,7 +27,7 @@ * * Created: 30 déc. 2005 03:00:57 * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Revision$ * * Last update: $Date$ @@ -48,15 +48,15 @@ import java.util.Map; /** * TopiaDAO is used to manipulate entities corresponding to {@code E} type : * create, delete, update or find entities. - * <p/> + * * This interface is implemented by {@link TopiaDAOImpl} overridden by generation * from {@link EntityDAOTransformer}. - * <p/> + * * * @param <E> the entity type managed by the dao - * @author bpoussin <poussin@codelutin.com> - * @author fdesbois <fdesbois@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author bpoussin <poussin@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ */ public interface TopiaDAO<E extends TopiaEntity> extends TopiaDAODeprecated<E>, Iterable<E> { @@ -198,7 +198,7 @@ public interface TopiaDAO<E extends TopiaEntity> extends TopiaDAODeprecated<E>, /** * Execute une requête basé sur le {@code type} donné. - * <p/> + * * Permet de récupérer une entité correspondant à la requête. * * @param hql la requête hql à executer @@ -329,7 +329,7 @@ public interface TopiaDAO<E extends TopiaEntity> extends TopiaDAODeprecated<E>, /** * Gets all entities in lazy mode when executing the given select query * for the dao entity type. - * <p/> + * * <strong>Important note:</strong> * * @param hql hql query @@ -344,7 +344,7 @@ public interface TopiaDAO<E extends TopiaEntity> extends TopiaDAODeprecated<E>, /** * Gets all entities in lazy mode when executing the given select query * for the given {@code type} which may not be a entity type (int, long, map,...). - * <p/> + * * <strong>Important note:</strong> * * @param type type of data to return @@ -361,7 +361,7 @@ public interface TopiaDAO<E extends TopiaEntity> extends TopiaDAODeprecated<E>, /** * Gets all entities in lazy mode when executing the given select query * for the dao entity type. - * <p/> + * * <strong>Important note:</strong> * * @param batchSize batch size @@ -378,7 +378,7 @@ public interface TopiaDAO<E extends TopiaEntity> extends TopiaDAODeprecated<E>, /** * Gets all entities in lazy mode when executing the given select query * for the given {@code type} which may not be a entity type (int, long, map,...). - * <p/> + * * <strong>Important note:</strong> * * @param type type of data to return @@ -467,7 +467,7 @@ public interface TopiaDAO<E extends TopiaEntity> extends TopiaDAODeprecated<E>, /** * Gets all entites for the dao entity type order by given {@code propertyNames}. - * <p/> + * * You can add on each {@code property} {@code ASC} ou {@code DESC} to * fix order way (by default is {@code ASC}). * @@ -625,7 +625,7 @@ public interface TopiaDAO<E extends TopiaEntity> extends TopiaDAODeprecated<E>, /** * Obtains the batch size used to load data. - * <p/> + * * Default value if 1000. * * @return the batch size. @@ -661,9 +661,9 @@ public interface TopiaDAO<E extends TopiaEntity> extends TopiaDAODeprecated<E>, /** * Create the simple hql query for the entity managed by the dao. - * <p/> + * * A optional alias can be passed: - * <p/> + * * <pre>FROM MyEntityImpl myAlias</pre> * * @param alias optional alias to use in query diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAODeprecated.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAODeprecated.java index 41e2fea..bd684f1 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAODeprecated.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAODeprecated.java @@ -35,7 +35,7 @@ import java.util.Map; * Contains all method that are deprecated from {@link TopiaDAO} in version * {@code 2.6.12} and then will be removed in next major version ({@code 3.0}). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public interface TopiaDAODeprecated<E extends TopiaEntity> { @@ -55,7 +55,7 @@ public interface TopiaDAODeprecated<E extends TopiaEntity> { /** * Crée une requête basé sur l'entité lié au DAO et lui assigne un alias * valable dans la requête.. - * <p/> + * * Résultat attendu : "FROM E AS entityAlias" * * @param entityAlias alias permettant de manipuler l'entité dans la diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java index b12338d..578462f 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java @@ -27,7 +27,7 @@ * * Created: 31 déc. 2005 13:10:34 * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Revision$ * * Last update: $Date$ @@ -66,14 +66,14 @@ import java.util.NoSuchElementException; /** * Cette classe permet d'avoir un ensemble de méthode implantée de façon * standard et plus spécifiquement pour Hibernate. - * <p/> + * * Certains accès à Hibernate sont tout de même fait ici, car on a pris le choix * de se baser entièrement sur hibernate pour la persistence, et il est ainsi * possible d'accèder au meta information hibernate sur les classes lorque l'on * en a besoin. * * @param <E> le type de l'entite - * @author bpoussin <poussin@codelutin.com> + * @author bpoussin <poussin@codelutin.com> * @version $Id$ */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java index 0d90f88..669ee89 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java @@ -62,12 +62,12 @@ import java.util.Map; /** * Surcharge du {@link TopiaDAOImpl} pour utiliser l'api criteria au lieu du hql * pour tout ce qui est requétage. - * <p/> + * * Created: 31 déc. 2005 13:10:34 * * @param <E> le type de l'entite - * @author bpoussin <poussin@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author bpoussin <poussin@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @deprecated since 2.6.12 Using the hibernate Criteria api is not a good idea as we wants to use in ToPIA next generation (version 3.0) jpa api. */ @Deprecated diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java index 32535ea..3fd3d57 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java @@ -27,7 +27,7 @@ * * Created: 28 déc. 2005 22:48:10 * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Revision$ * * Last update: $Date$ @@ -53,12 +53,12 @@ import java.util.List; * hibernate. The manipulation on entities (create, update, delete, find) is * made by the dao associated. The corresponding dao interface is {@link * TopiaDAO}. - * <p/> + * * Setter methods have to be used only in internal. They are in the interface to * make easier their usages in internal. * - * @author poussin <poussin@codelutin.com> - * @author fdesbois <fdesbois@codelutin.com> + * @author poussin <poussin@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ * @see EntityHibernateMappingGenerator * @see EntityTransformer diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java index ea41994..382943a 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java @@ -41,7 +41,7 @@ import java.util.List; * restriction n'est faite dessus, il peut meme changer entre deux types * d'entité si cela ne pose pas d'autre probleme (heritage entre ces entités). * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Id$ */ public abstract class TopiaEntityAbstract implements TopiaEntity { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java index 65607ab..383c6cf 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -28,22 +28,22 @@ import java.io.Serializable; /** * The contract to be realised by the generated enumeration in any DAOHelper. - * <p/> + * * Example : for a model Test, we will have a * <code>TestDOAHelper.TestEntityEnum</code> enumeration generated. - * <p/> + * * The contract gives some informations about the classes for any entity dealed * by the dao helper. More precisely : - * <p/> + * * - contract class of the entity (this must be an interface class) * - the implementation fqn class of an entity (at generation time, we might * not have the implementation class) * - the implementation class (will be looked up at runtime execution, in that * way we make possible to used a different implementation at runtime. - * <p/> + * * - a method to accept any TopiaEntity class for this entity description * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.2.0 */ @@ -111,7 +111,7 @@ public interface TopiaEntityEnum extends Serializable { /** * Change the implementation class of the entity. - * <p/> + * * Note : this method should reset all states of the objet * (implementation class, operators,...). * @@ -122,16 +122,16 @@ public interface TopiaEntityEnum extends Serializable { /** * Test if a given type of entity is matching the contract of this entity. - * <p/> + * * Note : make sure to accept type only on the given contract class of this entity, * can not accept an ancestor type, since there is a specific contract for this. - * <p/> - * Example : A -> B + * + * Example : A -> B * <pre> - * EntityEnum.A.accept(Class<A>) -> true - * EntityEnum.A.accept(Class<B>) -> false - * EntityEnum.B.accept(Class<B>) -> true - * EntityEnum.B.accept(Class<A>) -> false + * EntityEnum.A.accept(Class<A>) -> true + * EntityEnum.A.accept(Class<B>) -> false + * EntityEnum.B.accept(Class<B>) -> true + * EntityEnum.B.accept(Class<A>) -> false * </pre> * * @param klass the type of an entity to test. diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java index b9dae84..5bdaa44 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -21,20 +21,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - -/* * - * TopiaId.java - * - * Created: 6 juil. 2004 - * - * @author Benjamin Poussin <poussin@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - package org.nuiton.topia.persistence; import com.google.common.base.Function; @@ -46,15 +32,15 @@ import java.util.logging.Logger; /** * TODO-fdesbois-20100508 : Need translation of javadoc. - * <p/> + * * Classe representant un Id, utilisable par JDO. Cette classe contient aussi un ensemble de methode * static utile pour la manipulation des topiaId. - * <p/> + * * TODO-tchemit-2012-08-16 Rename this class to {@code TopiaIds}. * - * @author poussin <poussing@codelutin.com> - * @author tchemit <tchemit@codelutin.com> - * @author chatellier <chatellier@codelutin.com> + * @author poussin <poussin@codelutin.com> + * @author tchemit <tchemit@codelutin.com> + * @author chatellier <chatellier@codelutin.com> * @version $Id$ */ public class TopiaId implements Serializable { // TopiaId diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceHelper.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceHelper.java index 574c68f..ddc01b2 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceHelper.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceHelper.java @@ -29,7 +29,7 @@ import org.nuiton.topia.TopiaContext; * Object which helps to wrap some static generated code * (dao helper, entityEnum). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public interface TopiaPersistenceHelper<T extends TopiaEntityEnum> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressModel.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressModel.java index 1d65c5d..5dbf10a 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressModel.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressModel.java @@ -29,7 +29,7 @@ import java.io.Serializable; /** * Csv progress model contract. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.14 */ public interface CsvProgressModel extends Serializable { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java index 1ed5ece..f228189 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java @@ -42,7 +42,7 @@ import java.util.Map; /** * A model to import / export entities into csv files. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 0.2 */ public class EntityCsvModel<T extends TopiaEntityEnum, E extends TopiaEntity> extends AbstractImportExportModel<E> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java index 5ba80fe..9c2260e 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java @@ -45,7 +45,7 @@ import java.util.Map; /** * More useful method added to {@link Common}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class TopiaCsvCommons extends Common { @@ -100,7 +100,7 @@ public class TopiaCsvCommons extends Common { } /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public static class AssociationValueParser implements ValueParser<String[]> { @@ -114,7 +114,7 @@ public class TopiaCsvCommons extends Common { /** * @param <E> - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public static class AssociationValueParserFormatter<E extends TopiaEntity> implements ValueParserFormatter<Collection<E>> { @@ -165,7 +165,7 @@ public class TopiaCsvCommons extends Common { /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public static class ForeignKeyDecoratedValue<E> implements ValueFormatter<E> { @@ -188,7 +188,7 @@ public class TopiaCsvCommons extends Common { /** * @param <E> - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public static class ForeignKeyValue<E extends TopiaEntity> implements ValueParserFormatter<E> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java index 94c83f3..30f5f7a 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java @@ -33,7 +33,7 @@ import java.util.Map; * Abstract import model which add the useful methdo about importing foreign keys. * * @param <E> type of entity to import - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public abstract class AbstractImportModel<E> extends org.nuiton.csv.ext.AbstractImportModel<E> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvFileImportResult.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvFileImportResult.java index 6e26320..ee3a184 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvFileImportResult.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvFileImportResult.java @@ -35,7 +35,7 @@ import java.util.Set; /** * To keep result of the import of a file. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class CsvFileImportResult<T extends TopiaEntityEnum> implements Serializable { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java index 7a93404..9e7284f 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java @@ -32,7 +32,7 @@ import java.io.Serializable; * A simple csv result bean just to keep the number of created or * updated entities. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 0.2 */ public class CsvImportResult<T extends TopiaEntityEnum> implements Serializable { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java index a82bf9b..91ddfce 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java @@ -34,7 +34,7 @@ import java.util.Map; /** * A model to import associations of entities from csv files. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class EntityAssociationImportModel<T extends TopiaEntityEnum> extends AbstractImportModel<Map<String, Object>> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java index 1b4cb86..e7197c8 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java @@ -34,7 +34,7 @@ import java.util.Map; /** * To produce import model. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public interface ImportModelFactory<T extends TopiaEntityEnum> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java index ad7301b..e072cf4 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java @@ -35,12 +35,12 @@ import java.io.Reader; /** * Strategy to import some stuff. - * <p/> + * * Implements it and then you can use it with helper methods * {@link TopiaCsvImports#importTable(Reader, ImportStrategy, TableMeta, CsvImportResult)}, * {@link TopiaCsvImports#importAssociation(Reader, ImportStrategy, AssociationMeta, CsvImportResult)}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public interface ImportStrategy<T extends TopiaEntityEnum> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java index 1ac9305..36b47f0 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java @@ -56,7 +56,7 @@ import java.util.zip.ZipFile; /** * Helper for csv imports. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class TopiaCsvImports { @@ -140,7 +140,7 @@ public class TopiaCsvImports { /** * To import a table (given by his {@code meta}) from a reader and a strategy. - * <p/> + * * Result of import can be stored in an optional csv result. * * @param reader where to read csv data @@ -174,7 +174,7 @@ public class TopiaCsvImports { /** * To import a table (given by his {@code meta}) from a reader and a strategy. - * <p/> + * * Result of import can be stored in an optional csv result. * * @param reader where to read csv data @@ -208,7 +208,7 @@ public class TopiaCsvImports { /** * To import a association (given by his {@code meta}) from a reader and a strategy. - * <p/> + * * Result of import can be stored in an optional csv result. * * @param reader where to read csv data diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/package-info.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/package-info.java index 9de54454..3c17d90 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/package-info.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/package-info.java @@ -1,7 +1,7 @@ /** * Package for csv import of entities. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ package org.nuiton.topia.persistence.csv.in; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java index 277707f..b8424af 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java @@ -33,7 +33,7 @@ import org.nuiton.csv.ext.AbstractExportModel; /** * A model to export associations of entities into csv files. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class EntityAssociationExportModel<T extends TopiaEntityEnum, E extends TopiaEntity> extends AbstractExportModel<E> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java index eda8cd9..f9cf657 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java @@ -43,7 +43,7 @@ import java.util.Map; /** * Entity visitor to export data to csv files. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class ExportEntityVisitor<T extends TopiaEntityEnum> implements EntityVisitor, Closeable { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java index 90ec3e6..178d0e1 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java @@ -32,7 +32,7 @@ import org.nuiton.csv.ExportModel; /** * To produce export model. * -* @author tchemit <chemit@codelutin.com> +* @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public interface ExportModelFactory<T extends TopiaEntityEnum> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java index 01d5b19..b7d5847 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java @@ -31,7 +31,7 @@ import org.nuiton.topia.persistence.metadata.TableMeta; /** * Prepare data to export. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public interface PrepareDataForExport<T extends TopiaEntityEnum> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java index 59291bd..1131dca 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java @@ -55,7 +55,7 @@ import java.util.Map; /** * Helper for csv exports. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class TopiaCsvExports { @@ -232,7 +232,7 @@ public class TopiaCsvExports { /** * to export entity as csv files. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public static class EntityExportContext<T extends TopiaEntityEnum> implements Closeable { @@ -344,7 +344,7 @@ public class TopiaCsvExports { /** * To export associations as csv files. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public static class AssociationExportContext<T extends TopiaEntityEnum> implements Closeable { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/package-info.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/package-info.java index c2c7435..7064070 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/package-info.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/package-info.java @@ -1,7 +1,7 @@ /** * Package for csv export of entities. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ package org.nuiton.topia.persistence.csv.out; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/package-info.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/package-info.java index 2c529c2..b1af865 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/package-info.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/package-info.java @@ -1,7 +1,7 @@ /** * Base package for csv import and export of entities. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ package org.nuiton.topia.persistence.csv; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java index 3b0aab0..1f26f84 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java @@ -42,7 +42,7 @@ import java.util.Collection; /** * Define the meta data of a entity association field. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class AssociationMeta<T extends TopiaEntityEnum> implements Serializable, MetaFilenameAware<T> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/ColumnMeta.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/ColumnMeta.java index 79035cb..51cdd11 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/ColumnMeta.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/ColumnMeta.java @@ -31,7 +31,7 @@ import java.util.Date; /** * Define the meta data of a entity field. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class ColumnMeta implements Serializable { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java index 87d7fdc..7d51ee6 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java @@ -37,7 +37,7 @@ import java.util.Set; /** * Define metas about a db. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class DbMeta<T extends TopiaEntityEnum> implements Iterable<TableMeta<T>> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/MetaFilenameAware.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/MetaFilenameAware.java index 0155c91..21a06b3 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/MetaFilenameAware.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/MetaFilenameAware.java @@ -31,7 +31,7 @@ import java.io.Writer; /** * Contract to import or export some metas. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public interface MetaFilenameAware<T extends TopiaEntityEnum> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java index 0f3fa35..727ce55 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java @@ -34,7 +34,7 @@ import java.util.Map; /** * Useful methods around metadatas. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class Metadatas { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java index a073f3c..65d8804 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java @@ -51,7 +51,7 @@ import java.util.Set; /** * Define metas of a given db table. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ public class TableMeta<T extends TopiaEntityEnum> implements Serializable, Iterable<ColumnMeta>, MetaFilenameAware<T> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java index 3e622f1..3260a2f 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java @@ -1,7 +1,7 @@ /** - * Package to define metadatas over {@link TopiaEntity}. + * Package to define metadatas over {@link org.nuiton.topia.persistence.TopiaEntity}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ package org.nuiton.topia.persistence.metadata; @@ -12,7 +12,7 @@ package org.nuiton.topia.persistence.metadata; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java index 03d3f08..639ec5f 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -23,10 +23,10 @@ */ /** * This package contains interfaces and abstract classes for entities and daos. - * <p /> + * * For daos : {@link org.nuiton.topia.persistence.TopiaDAO} as interface and * {@link org.nuiton.topia.persistence.TopiaDAOImpl} as implementation. - * <p /> + * * For entities : {@link org.nuiton.topia.persistence.TopiaEntity} as interface * and {@link org.nuiton.topia.persistence.TopiaEntityAbstract} * as abstract class inherited by generated entities for diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRule.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRule.java index f9335d6..27858ea 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRule.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRule.java @@ -29,7 +29,7 @@ import java.io.Serializable; /** * Rule for a filtered pager. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.14 */ public class FilterRule implements Serializable { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRuleGroupOperator.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRuleGroupOperator.java index f97180d..8c3431e 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRuleGroupOperator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRuleGroupOperator.java @@ -27,7 +27,7 @@ package org.nuiton.topia.persistence.pager; /** * Define the operator to apply between some rules. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.14 */ public enum FilterRuleGroupOperator { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRuleOperator.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRuleOperator.java index 9092fd3..8b703bc 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRuleOperator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRuleOperator.java @@ -29,7 +29,7 @@ import java.util.Map; /** * Operator used in a rule. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.14 */ public enum FilterRuleOperator { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java index c90ba12..e0c5892 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java @@ -32,7 +32,7 @@ import java.util.List; /** * Extension of a {@link PagerBean} to add filter and ordering capacities. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.14 */ public class TopiaPagerBean extends PagerBean { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBeanBuilder.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBeanBuilder.java index a4d210e..9a15b41 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBeanBuilder.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBeanBuilder.java @@ -32,7 +32,7 @@ import java.util.Map; /** * To build a {@link TopiaPagerBean} from scratch. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.14 */ public class TopiaPagerBeanBuilder { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Collector.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Collector.java index fac9951..7ba68b7 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Collector.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Collector.java @@ -38,13 +38,13 @@ import java.util.Deque; /** * Un objet qui permet de parcourir des entites (via un * {@link CollectorVisitor}) et de collecter des donnees pendant le parcours. - * <p/> + * * La classe a un type qui est le type de retour de la methode * {@link #detect(TopiaEntity...)}. - * <p/> + * * On peut donc très facilement en faire un collecteur de donnees. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @param <R> les donnes a retourner * @since 2.2.0 */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Creator.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Creator.java index bc0d61b..2d19063 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Creator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Creator.java @@ -30,9 +30,9 @@ import org.nuiton.topia.TopiaException; /** * A simple contract to hook the creation phase of an entity associated (or not!) to * a parent entity. - * <p/> + * * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @param <P> the type of the parent of the entity to create (if entity has * no parent then used the {@link Void} type). * @param <E> the type of entity to create @@ -40,10 +40,10 @@ import org.nuiton.topia.TopiaException; public interface Creator<P, E> { /** * Perform the creation of an entity. - * <p/> + * * The given <code>from</code> entity should not have already been created in * database ? it should only be here to prepare the creation of the entity. - * <p/> + * * TODO Review this explanation :) * * @param tx the current available transaction diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java index c1aae55..efb467f 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DBMapping.java @@ -50,10 +50,10 @@ import java.util.regex.Pattern; /** * Une classe qui permet d'obtenir les mapping de noms entre les entités et les objets de la base. - * <p/> + * * On retrouve aussi ici des méthodes utils pour executer du code sql sur la base (notamment la gestion des séquences). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ public abstract class DBMapping { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Deletor.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Deletor.java index 906f8e6..95f95a0 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Deletor.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Deletor.java @@ -29,7 +29,7 @@ import org.nuiton.topia.TopiaContext; /** * A simple contract to hook the deletion of an entity. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @param <P> the parent of the entity to delete (if the entity has no parent * says is not in a association) * of another entity, just used the {@link Void} type). diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java index 83b5400..8dee51f 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java @@ -33,7 +33,7 @@ import java.util.Map; * Pour qualifier l'etat d'une entite lors du calcul d'un differentiel entre * deux entites. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see TopiaEntityHelper#buildDifferentiel(List, List) * @since 2.2.0 */ @@ -41,19 +41,19 @@ public enum DiffState { /** * nouvel entite dans le storage de reference. - * <p/> + * * A ajouter dans le storage local. */ NEW, /** * entite modifie dans le storage de reference (voir topiaVersion). - * <p/> + * * A mettre a jour dans le storage local. */ MODIFIED, /** * entité supprimée dans le storage de reference. - * <p/> + * * A supprimer du storage local (apres remplacement par autre chose...) */ REMOVED; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java index c2a072f..1c8bda9 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java @@ -36,11 +36,11 @@ import java.util.Collection; /** * A implementation of {@link ListUpdator} for {@link TopiaEntity} type. - * <p/> + * * Some factory methods are defined to simplify the generic cast, prefer used them * instead of the (protected) constructor. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @param <P> type of parent of childs * @param <E> type of child */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java index 2f3b7cf..0715368 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java @@ -51,10 +51,10 @@ import java.util.TreeMap; /** * Un objet qui permet d'effecuter des operations de manipulation des donnees * dans les entites du type donne. - * <p/> + * * L'objet connait la liste des proprietes et des associations du type donne et * permet de modifier ces valeurs : - * <p/> + * * {@link #get(String, TopiaEntity)} * {@link #set(String, TopiaEntity, Object)} * {@link #copy(String, TopiaEntity, TopiaEntity)} @@ -62,18 +62,18 @@ import java.util.TreeMap; * {@link #addChild(String, TopiaEntity, Object)} * {@link #removeChild(String, TopiaEntity, Object)} * ... - * <p/> + * * D'autres methodes permettent d'effectuer des operations en lot (sur plusieurs * proprietes en meme temps) sur les proprietes : - * <p/> + * * {@link #copyProperties(TopiaEntity, TopiaEntity, boolean, String...)} * {@link #obtainProperties(TopiaEntity, String...)} * {@link #clearProperties(TopiaEntity, String...)} - * <p/> + * * Note : cet objet ne permet pas d'operation vers les bases. * * @param <B> type de l'entite - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class EntityOperator<B extends TopiaEntity> { @@ -136,7 +136,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Recupere la valeur de la propriete donnee. - * <p/> + * * Note : cela apellera la methode <code>getXXX()</code>. * * @param name le nom de la propriete @@ -151,7 +151,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Positionner la valeur donne de la propriete donnee. - * <p/> + * * Note : cela apellera la methode <code>setXXX(value)</code>. * * @param name le nom de la propriete @@ -216,7 +216,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Pour obtenir un dictionnaire des propriétés marqués not-null et la clef naturelle * du {@code bean} donne. - * <p/> + * * Cette methode est utilisée pour faire un dao.create, pour s'assurer que * tout ce qui ne doit pas pas être à null est bien fourni à la création de * l'objet, sinon on obtient des erreurs. @@ -238,7 +238,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Copie une propriete de src vers dst. - * <p/> + * * Note : cela apellera la methode <code>setXXX(value)</code>. * * @param name le nom de la propriete @@ -253,7 +253,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Positionner la valeur nulle de la propriete donnee. - * <p/> + * * Note : cela apellera la methode <code>setXXX(nullValue)</code>. * * @param name le nom de la propriete @@ -269,7 +269,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Recupere une entite d'association a partir de son id. - * <p/> + * * Note : cela apellera la methode <code>getXXXByTopiaId(topiaId)</code>. * * @param name le nom de la propriete d'association @@ -285,7 +285,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Test s'il existe des entites d'association pour la propriete donnee. - * <p/> + * * Note : cela apellera la methode <code>isXXXEmpty()</code>. * * @param name le nom de la propriete d'association @@ -300,7 +300,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Ajoute une entite d'association. - * <p/> + * * Note : cela apellera la methode <code>addXXX(child)</code>. * * @param name le nom de la propriete d'association @@ -314,7 +314,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Ajoute toutes les entites d'association. - * <p/> + * * Note : cela apellera la methode <code>addXXX(child)</code>. * * @param name le nom de la propriete d'association @@ -328,7 +328,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Retire une entite d'association. - * <p/> + * * Note : cela apellera la methode <code>removeXXX(child)</code>. * * @param name le nom de la propriete d'association @@ -342,7 +342,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Retourne le nombre d'entite d'association. - * <p/> + * * Note : cela apellera la methode <code>sizeXXX(childs)</code>. * * @param name le nom de la propriete d'association @@ -357,7 +357,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Retire toutes les entites d'association. - * <p/> + * * Note : cela apellera la methode <code>clearXXX(childs)</code>. * * @param name le nom de la propriete d'association @@ -370,7 +370,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Recopie toutes les proprietes donnes depuis src vers dst. - * <p/> + * * Note : si aucune propriete n'est donnee, on utilise toutes les proprietes * connues par l'operateur. * @@ -403,7 +403,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Obtenir dans un dictionnaire, les valeurs des proprietes donnees. - * <p/> + * * Si aucune proropiete n'est donne, alors on utilise toutes les proprietes * connu par l'operateur. * @@ -430,7 +430,7 @@ public class EntityOperator<B extends TopiaEntity> { /** * Met a null toutes les proprietes donnees. - * <p/> + * * Si aucune proropiete n'est donnee, alors on utilise toutes les proprietes * connu par l'operateur. * diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java index d3df855..d300380 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java @@ -32,7 +32,7 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; /** * Un cache d'operateurs. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see EntityOperator */ public class EntityOperatorStore { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java index d6eba7f..52cb514 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/ListUpdator.java @@ -30,11 +30,11 @@ import java.util.Collection; /** * A simple contract to allow you to update some collections of an entity. - * <p/> + * * The purpose of the contract is to make possible (via a StorageService for example) some * automatic and generic behaviour when you want to set a collection of childs into a entity. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @param <P> the type of the entity which contains the collection to update. * @param <E> the type of entities in the collection. */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Loador.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Loador.java index d1fb2de..000320f 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Loador.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/Loador.java @@ -30,7 +30,7 @@ import java.util.Map; /** * A simple contract to load an object from another one. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @param <E> type of bean to load */ public interface Loador<E> extends Serializable { @@ -45,10 +45,10 @@ public interface Loador<E> extends Serializable { /** * Obtain from an entity all data to bind to another one according the * definition of the loador. - * <p/> + * * This method is usefull when you can not directly used the * {@link #load(Object, Object, boolean, String...)} method. - * <p/> + * * For example, when an entity has a immutable business key (says with an * hibernate naturalId for example), * and that you want to create the data in a db, you must give all the diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java index 7b14f38..837b868 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java @@ -30,13 +30,13 @@ import org.nuiton.util.beans.Binder; /** * A {@link Binder} dedicated to {@link TopiaEntity} dealing with technical * values. - * <p/> + * * There is an internal sate {@link #empty} to deal with default values of * properties of an entity. - * <p/> + * * <b>Note:</b> Should remove {@link Loador} contract soon. * - * @author tchemit < chemit@codelutin.com > + * @author tchemit <chemit@codelutin.com> * @param <E> the type of entity * @since 2.3.0 */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java index ba93258..1533108 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java @@ -60,7 +60,7 @@ import static org.nuiton.i18n.I18n.t; /** * Une classe avec des méthodes utiles sur les entités. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ public class TopiaEntityHelper { @@ -91,7 +91,7 @@ public class TopiaEntityHelper { /** * Récupère une entité qui doit exister à partir de son id. - * <p/> + * * Si l'entité n'existe pas, on déclanche une exception {@link * IllegalArgumentException}. * @@ -455,7 +455,7 @@ public class TopiaEntityHelper { /** * Collecte l'ensemble des types d'entites (via un parcours en profondeur). - * <p/> + * * On retourne toujours les contrats des entites et jamais les * implantations. * @@ -507,7 +507,7 @@ public class TopiaEntityHelper { /** * Collecte l'ensemble des entites (via un parcours en profondeur) avec un * filtrage sur les types d'entites a retourner. - * <p/> + * * On retourne toujours les contrats des entites et jamais les * implantations. * @@ -569,7 +569,7 @@ public class TopiaEntityHelper { /** * Collecte l'ensemble des ids d'entites (via un parcours en profondeur) * avec un filtrage sur les types d'entites a retourner. - * <p/> + * * On retourne toujours les contrats des entites et jamais les * implantations. * @@ -1187,7 +1187,7 @@ public class TopiaEntityHelper { * Given two names (representing two types of entity), obtains the * association table name in the format {@code X_Y} where X est the table * name smaller (in natural order on {@link String}). - * <p/> + * * Example: from {@code A} and {@code B}, we get {@code A_B}. * * @param table1 the first table diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java index 7b0b2d6..395eb8e 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java @@ -32,7 +32,7 @@ import java.util.List; /** * A map of ids of entities grouped by their type. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.4.3 */ public class TopiaEntityIdsMap extends HashMap<Class<? extends TopiaEntity>, List<String>> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java index 0028257..1f320c1 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java @@ -34,7 +34,7 @@ import java.util.Map; /** * A dictionnary of {@link TopiaEntity} associated to a {@link TopiaEntityEnum}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5.3 */ public abstract class TopiaEntityMap<K extends TopiaEntityEnum, V extends TopiaEntity> extends HashMap<K, List<? extends V>> { @@ -72,7 +72,7 @@ public abstract class TopiaEntityMap<K extends TopiaEntityEnum, V extends TopiaE /** * Adds the given entity to the dictonary only if it does not exists. - * <p/> + * * Will return {@code true} if entity was added, {@code false} otherwise. * * @param entity the entity to add diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java index 3d9f488..ca7c957 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java @@ -28,10 +28,10 @@ import org.nuiton.topia.persistence.TopiaEntity; /** * Definition of a reference of an entity from a root entity. - * <p/> + * * the method {@link #getAccessorExpression()} return the jxpath to access the * ref from the root object. - * <p/> + * * TODO Javadoc... * * @since 2.2.0 diff --git a/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java b/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java index c1a0434..361f67b 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/TestHelper.java @@ -38,7 +38,7 @@ import java.util.Properties; /** * Helper for all topia tests. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5 */ @Ignore diff --git a/topia-persistence/src/test/java/org/nuiton/topia/TopiaContextFactoryTest.java b/topia-persistence/src/test/java/org/nuiton/topia/TopiaContextFactoryTest.java index a520137..43f83cf 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/TopiaContextFactoryTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/TopiaContextFactoryTest.java @@ -40,7 +40,7 @@ import java.util.Properties; /** * Created: 8 mai 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ */ public class TopiaContextFactoryTest { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/TopiaDatabase.java b/topia-persistence/src/test/java/org/nuiton/topia/TopiaDatabase.java index b28c195..3b34931 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/TopiaDatabase.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/TopiaDatabase.java @@ -34,7 +34,7 @@ import java.util.Properties; /** * Put this class as a Rule in test to obtain a new isolated db for each test. - * <p/> + * * Here is a simple example of usage : * <pre> * public class MyTest { @@ -50,11 +50,11 @@ import java.util.Properties; * } * </pre> * The db created will be unique for each test method (and for each build also). - * <p/> + * * You don't need to close any transaction, it will be done for you and the end * of each method test. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.8 */ public class TopiaDatabase extends TestWatcher { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/framework/EntityStateTest.java b/topia-persistence/src/test/java/org/nuiton/topia/framework/EntityStateTest.java index f35be71..3bca1a3 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/framework/EntityStateTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/framework/EntityStateTest.java @@ -29,12 +29,12 @@ import org.junit.Test; /** * EntityStateTest.java - * <p/> + * * Created: 22 nov. 06 12:15:11 * - * @author poussin <poussin@codelutin.com> + * @author poussin <poussin@codelutin.com> * @version $Revision$ - * <p/> + * * Last update: $Date$ * by : $Author$ */ diff --git a/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java b/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java index d2a194a..9e8027d 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderHardCoded.java @@ -46,7 +46,7 @@ import org.hibernate.service.spi.Stoppable; /** * Customized connection provider. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5.3 */ public class TopiaConnectionProviderHardCoded implements ConnectionProvider, Configurable, Stoppable { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java b/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java index 0aed561..b15f2ad 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaConnectionProviderTest.java @@ -45,7 +45,7 @@ import static org.junit.Assert.assertNotNull; * To test the {@link TopiaConnectionProvider} and make sure all connections * are done from here... * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5.3 */ public class TopiaConnectionProviderTest { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java b/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java index 042254a..57e2d20 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java @@ -53,7 +53,7 @@ import org.nuiton.topiatest.service.TestService; /** * Created: 10 mai 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ */ public class TopiaContextImplTest { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java b/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java index cf77c6a..b8c000c 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextReplicateTest.java @@ -41,7 +41,7 @@ import java.util.Properties; /** * To test replication sugin TopiaContext. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.8 */ public class TopiaContextReplicateTest { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java b/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java index 9015c68..b50fdce 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java @@ -41,9 +41,9 @@ import static org.junit.Assert.assertTrue; /** * Test pour les methodes de {@link TopiaUtil}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Revision$ - * <p/> + * * Last update: $Date$ * by : $Author$ */ diff --git a/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java b/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java index d863465..4db46fe 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/generator/QueryHelperTransformerTest.java @@ -33,7 +33,7 @@ import java.util.HashMap; /** * Created: 24 juin 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ */ public class QueryHelperTransformerTest { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaGeneratorUtilTest.java b/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaGeneratorUtilTest.java index 7898c2b..78b0e8d 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaGeneratorUtilTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaGeneratorUtilTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; -/** @author tchemit <chemit@codelutin.com> */ +/** @author tchemit <chemit@codelutin.com> */ public class TopiaGeneratorUtilTest { @Deprecated diff --git a/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java b/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java index 636f34c..4381fb5 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/generator/TopiaTestCase.java @@ -43,7 +43,7 @@ import org.nuiton.topiatest.DepartmentDAO; * * @author chatellier * @version $Revision$ - * <p/> + * * Last update : $Date$ * By : $Author$ */ diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java index 0b28e63..c7aa51c 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/EntityVisitorExportXmlTest.java @@ -47,7 +47,7 @@ import org.nuiton.topiatest.EmployeDAO; * * @author chatellier * @version $Revision$ - * <p/> + * * Last update : $Date$ * By : $Author$ */ @@ -61,7 +61,7 @@ public class EntityVisitorExportXmlTest { /** * Prepare test. - * <p/> + * * Add all tests commons data * * @throws TopiaException if could not create datas @@ -107,7 +107,7 @@ public class EntityVisitorExportXmlTest { /** * Test l'export XML via un visiteur. - * <p/> + * * Parcourt en profondeur. * * @throws TopiaException diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/ExportXMLVisitor.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/ExportXMLVisitor.java index 32a377a..c7c8919 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/ExportXMLVisitor.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/ExportXMLVisitor.java @@ -34,7 +34,7 @@ import org.junit.Ignore; * * @author chatellier * @version $Revision$ - * <p/> + * * Last update : $Date$ * By : $Author$ */ diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java index 0b7268f..4e0c39e 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java @@ -39,12 +39,12 @@ import org.nuiton.topiatest.NaturalizedEntityDAO; /** * NaturalIdTest - * <p/> + * * Created: 18 févr. 2010 * * @author fdesbois * @version $Revision$ - * <p/> + * * Mise a jour: $Date$ * par : $Author$ */ diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java index d326ac6..0e976f5 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java @@ -42,7 +42,7 @@ import java.util.List; /** * Tests the TopiaContext#find|findAll|findUnique methods * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> */ public class TopiaContextFindTest { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java index 0737ef5..953225c 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java @@ -41,7 +41,7 @@ import java.util.List; /** * Test on {@link TopiaDAO}. - * <p/> + * * Last update : $Date$ * By : $Author$ * diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java index 7096c17..54e5886 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/CollectorTest.java @@ -40,7 +40,7 @@ import org.nuiton.topiatest.Department; import org.nuiton.topiatest.DepartmentImpl; import org.nuiton.topiatest.EmployeImpl; -/** @author tchemit <chemit@codelutin.com> */ +/** @author tchemit <chemit@codelutin.com> */ public class CollectorTest { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java index 07d8c01..2b4ee0a 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/EntityOperatorTest.java @@ -47,7 +47,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -/** @author tchemit <chemit@codelutin.com> */ +/** @author tchemit <chemit@codelutin.com> */ public class EntityOperatorTest { public EntityOperatorTest() { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java index 7e4a370..941c146 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityHelperTest.java @@ -53,7 +53,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -/** @author tchemit <chemit@codelutin.com> */ +/** @author tchemit <chemit@codelutin.com> */ public class TopiaEntityHelperTest { static TopiaEntityEnum[] contracts; diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java index 8997cea..9f3cee5 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTester.java @@ -42,10 +42,10 @@ import static java.util.Map.Entry; /** * A abstract class to help testing {@link TopiaEntityRef} as detectes types, or * detects or references. - * <p/> + * * An example of use if given in the test {@link TopiaEntityRefTesterTest}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.3.1 */ public abstract class TopiaEntityRefTester<T extends TopiaEntityEnum> { @@ -104,7 +104,7 @@ public abstract class TopiaEntityRefTester<T extends TopiaEntityEnum> { /** * Obtain the reference of an association for a given entity. - * <p/> + * * Example, to obtain the Pet 'pudding' on a Person : * <pre>pet[@topiaId='pudding']</pre> * invoke @@ -120,7 +120,7 @@ public abstract class TopiaEntityRefTester<T extends TopiaEntityEnum> { /** * Obtain the reference of an association for a given id. - * <p/> + * * Example to obtain the Pet 'pudding' on a Person : * <pre>pet[@topiaId='pudding']</pre> * invoke @@ -141,7 +141,7 @@ public abstract class TopiaEntityRefTester<T extends TopiaEntityEnum> { /** * Obtain the next entry from the iterator. - * <p/> + * * As a side-effect, it will increment the state {@link #index}. */ protected void nextEntry() { @@ -155,7 +155,7 @@ public abstract class TopiaEntityRefTester<T extends TopiaEntityEnum> { /** * Detects the references from the given {@code entity} which have their * topiaId in the given list of {@code ids}. - * <p/> + * * As a side-effect, it will update the states {@code detected} and set the * iterator {@code itr} to the first position on detected entries. * @@ -175,7 +175,7 @@ public abstract class TopiaEntityRefTester<T extends TopiaEntityEnum> { /** * Detects the references from the given {@code entity} which have their * topiaId in the given list of {@code ids}. - * <p/> + * * As a side-effect, it will update the states {@code detected} and set the * iterator {@code itr} to the first position on detected entries. * @@ -316,7 +316,7 @@ public abstract class TopiaEntityRefTester<T extends TopiaEntityEnum> { /** * Asserts that the number of detected entries (store in internal state * {@code detected}) is ok. - * <p/> + * * As a side-effect, it will reset the internal state {@code itr} on the * first entry of the {@code detected} list. * diff --git a/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java b/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java index db33ac1..ea30821 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityRefTesterTest.java @@ -34,11 +34,11 @@ import org.nuiton.topia.test.entities.Race; /** * Test the {@link TopiaEntityRefTester} on - * <p/> + * * <ul> <li>{@link Pet}</li> <li>{@link Race}</li> <li>{@link Person}</li> * </ul> * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.3.1 */ public class TopiaEntityRefTesterTest extends TopiaEntityRefTester<TopiaTestEntityEnum> { diff --git a/topia-persistence/src/test/java/org/nuiton/topia/test/ano1991/TopiaQueryTest.java b/topia-persistence/src/test/java/org/nuiton/topia/test/ano1991/TopiaQueryTest.java index ba60766..5c15a95 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/test/ano1991/TopiaQueryTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/test/ano1991/TopiaQueryTest.java @@ -42,7 +42,7 @@ import java.util.List; /** * Prevent regression of http://nuiton.org/issues/1991. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.8 */ @Deprecated diff --git a/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java b/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java index ab7e4e7..c14e3ff 100644 --- a/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -27,7 +27,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.topiatest.CompanyDTO; -/** @author ymartel <martel@codelutin.com> */ +/** @author ymartel <martel@codelutin.com> */ public class EntityDTOTransformerTest { @Test diff --git a/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java b/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java index 9735ac2..5dcfddb 100644 --- a/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java @@ -43,7 +43,7 @@ public class EnumTest { /** * Create an entity having two field of type enumeration. One is stored * using ordinal, the other using the name. - * <p/> + * * The test check that values are stored, and that find methods works * * @throws TopiaException if any exception with db diff --git a/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java b/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java index f1ac535..15682cc 100644 --- a/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java +++ b/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java @@ -28,7 +28,7 @@ import org.nuiton.topia.TopiaException; /** * Created: 26 mai 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ */ public class ExtraDAOEntityDAOImpl<E extends ExtraDAOEntity> extends ExtraDAOEntityDAOAbstract<E> { diff --git a/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java b/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java index 015a075..cf5d07f 100644 --- a/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java +++ b/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java @@ -26,7 +26,7 @@ package org.nuiton.topiatest; /** * To test http://nuiton.org/issues/1732. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.6.2 */ public enum Title { diff --git a/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java b/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java index 7f6c5ec..576a351 100644 --- a/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java +++ b/topia-persistence/src/test/java/org/nuiton/topiatest/deletetest/DeleteEntityTest.java @@ -28,7 +28,7 @@ * * Created: 4 juin 2009 * - * @author Florian Desbois <fdesbois@codelutin.com> + * @author Florian Desbois <fdesbois@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1.java b/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1.java index 23e0af8..707ffd7 100644 --- a/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1.java +++ b/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1.java @@ -28,7 +28,7 @@ import org.nuiton.topia.persistence.TopiaEntity; /** * Created: 11 mai 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ */ public interface Entity1 extends TopiaEntity { diff --git a/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Abstract.java b/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Abstract.java index 9dfe501..f3e6b54 100644 --- a/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Abstract.java +++ b/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Abstract.java @@ -30,7 +30,7 @@ import org.nuiton.topia.persistence.TopiaEntityAbstract; /** * Created: 11 mai 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ */ public abstract class Entity1Abstract extends TopiaEntityAbstract diff --git a/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.java b/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.java index fef9809..91e2750 100644 --- a/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.java +++ b/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.java @@ -29,7 +29,7 @@ import org.nuiton.topia.persistence.EntityVisitor; /** * Created: 11 mai 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ */ public class Entity1Impl extends Entity1Abstract { diff --git a/topia-persistence/src/test/java/org/nuiton/topiatest/service/FakeService.java b/topia-persistence/src/test/java/org/nuiton/topiatest/service/FakeService.java index 9f87dc3..79995f1 100644 --- a/topia-persistence/src/test/java/org/nuiton/topiatest/service/FakeService.java +++ b/topia-persistence/src/test/java/org/nuiton/topiatest/service/FakeService.java @@ -33,10 +33,10 @@ import org.nuiton.topia.framework.TopiaService; * from {@link TopiaContextImplTest#testGetServices()}. This fake service * doesn't contains property SERVICE_NAME used by {@link * TopiaContextImpl#serviceEnabled(Class)}. - * <p/> + * * Created: 10 mai 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ */ public class FakeService implements TopiaService { diff --git a/topia-persistence/src/test/java/org/nuiton/topiatest/service/TestService.java b/topia-persistence/src/test/java/org/nuiton/topiatest/service/TestService.java index a6e8710..8beb131 100644 --- a/topia-persistence/src/test/java/org/nuiton/topiatest/service/TestService.java +++ b/topia-persistence/src/test/java/org/nuiton/topiatest/service/TestService.java @@ -32,10 +32,10 @@ import org.nuiton.topia.framework.TopiaService; /** * TestService which implements {@link TopiaService} to test loading from {@link * TopiaContextImplTest#testLoadServices()}. - * <p/> + * * Created: 10 mai 2010 * - * @author fdesbois <fdesbois@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ */ @Ignore diff --git a/topia-service-migration/src/license/THIRD-PARTY.properties b/topia-service-migration/src/license/THIRD-PARTY.properties index 456402d..9801206 100644 --- a/topia-service-migration/src/license/THIRD-PARTY.properties +++ b/topia-service-migration/src/license/THIRD-PARTY.properties @@ -1,34 +1,13 @@ -### -# #%L -# ToPIA :: Service Migration -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 2014 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - GNU Lesser General Public License, version 2.1 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License 1.0 # - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -37,13 +16,14 @@ # - MIT License # - MPL 1.1 # - New BSD License +# - Sun Binary Code License Agreement # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Mar 15 12:42:01 CET 2013 +#Wed Mar 02 12:16:06 CET 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javax.transaction--jta--1.1=Sun Binary Code License Agreement diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java index 6b14d7f..2c237b9 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java @@ -44,7 +44,7 @@ import static org.nuiton.i18n.I18n.t; /** * Abstract migration callback. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.5 */ @@ -79,14 +79,14 @@ public abstract class AbstractTopiaMigrationCallback { /** * Tentative de migration depuis la version de la base version la version * souhaitee. - * <p/> + * * On applique toutes les migrations de version indiquee dans le parametre * <code>version</code>. - * <p/> + * * Pour chaque version, on cherche la methode migrateTo_XXX ou XXX est la * version transforme en identifiant java via la methode * {@link Version#getValidName()} et on l'execute. - * <p/> + * * Note: pour chaque version a appliquer, on ouvre une nouvelle transaction. * * @param ctxt topia context de la transaction en cours diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallback.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallback.java index 847c5c2..c14b61f 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallback.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallback.java @@ -31,10 +31,10 @@ import java.lang.reflect.Method; /** * Default migration call back to use. - * <p/> + * * Replace deprecated implementation {@code ManualMigrationCallback}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.3.4 * @deprecated since 2.5, use now the {@link TopiaMigrationCallbackByClass} or {@link TopiaMigrationCallbackByMethod}. diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java index 52d3de2..a023671 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java @@ -35,15 +35,15 @@ import java.util.Map; /** * Migration callback which use a different class for each version to migrate. - * <p/> + * * You must fill in the constructor the mapping for each version of * {@link #getAvailableVersions()} a matching migrator for version which * extends {@link MigrationCallBackForVersion}. - * <p/> + * * Use the callback when you have a lot of version to migrate and the * {@link TopiaMigrationCallbackByMethod} begins to be messy. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.5 */ @@ -83,7 +83,7 @@ public abstract class TopiaMigrationCallbackByClass extends AbstractTopiaMigrati /** * Call back for a given version. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5 */ public abstract static class MigrationCallBackForVersion { @@ -143,7 +143,7 @@ public abstract class TopiaMigrationCallbackByClass extends AbstractTopiaMigrati /** * A simple call back resolver via a constant map. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5 */ public static class MigrationCallBackForVersionResolverByMap implements MigrationCallBackForVersionResolver { diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java index 714d5b5..21b04ee 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java @@ -38,15 +38,15 @@ import java.util.TreeMap; /** * Migration callback which use a different class for each version to migrate. - * <p/> + * * You must fill in the constructor the mapping for each version of * {@link #getAvailableVersions()} a matching migrator for version which * extends {@link MigrationCallBackForVersion}. - * <p/> + * * Use the callback when you have a lot of version to migrate and the * {@link TopiaMigrationCallbackByMethod} begins to be messy. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.9.11 */ @@ -88,7 +88,7 @@ public abstract class TopiaMigrationCallbackByClassNG extends AbstractTopiaMigra /** * Call back for a given version. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.5 */ public abstract static class MigrationCallBackForVersion { @@ -158,7 +158,7 @@ public abstract class TopiaMigrationCallbackByClassNG extends AbstractTopiaMigra /** * A simple call back resolver via a service loader. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.9.11 */ public static class MigrationCallBackForVersionResolverByServiceLoader implements MigrationCallBackForVersionResolver { diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java index beebc40..1ba59ef 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java @@ -32,14 +32,14 @@ import java.lang.reflect.Method; /** * Migration callback base on methods. - * <p/> + * * The callback defines for each version of {@link #getAvailableVersions()} * a method named {@code migrate_on_XXX} where {@code XXX} is the version with * all dots replaces by underscores. - * <p/> + * * Replace deprecated implementation {@code TopiaMigrationCallBack}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.5 */ diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java index cb607f4..ad57e12 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java @@ -58,9 +58,9 @@ import org.nuiton.util.version.Version; /** * Le moteur de migration proposé par topia. Il est basé sur un {@link AbstractTopiaMigrationCallback} * qui donne la version de l'application, les version de mises à jour disponibles. - * <p/> + * * Le call back offre aussi les commandes sql à passer pour chaque version de mise à jour. - * <p/> + * * FIXME Finir cette documentation * * @author tchemit @@ -114,7 +114,7 @@ public class TopiaMigrationEngine implements TopiaMigrationService { /** * A flag to check if version was detected in database. - * <p/> + * * This flag is set to {@code true} at the end of method {@link #detectDbVersion()}. */ protected boolean versionDetected; @@ -468,7 +468,7 @@ public class TopiaMigrationEngine implements TopiaMigrationService { /** * Recupere depuis la base les états internes du service : - * <p/> + * * <ul> * <li>{@link #dbVersion}</li> * <li>{@link #dbEmpty}</li> diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java index 24d104a..20f7ce4 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java @@ -33,7 +33,7 @@ import org.nuiton.topia.framework.TopiaService; * @author Chevallereau Benjamin * @author Eon Sébastien * @author Trève Vincent - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ */ public interface TopiaMigrationService extends TopiaService { diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java index 7a093b9..8fbbee7 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java @@ -37,7 +37,7 @@ import java.io.Serializable; * @author Chevallereau Benjamin * @author Eon Sébastien * @author Trève Vincent - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.0 */ public class TMSVersion implements Serializable { diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java index 3e78c79..0a44c7d 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java @@ -51,7 +51,7 @@ import org.nuiton.util.version.Versions; /** * TMSVersion DAO helper. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.3.4 */ public class TMSVersionDAO { diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index 7a8e77c..a7c73f9 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -66,6 +66,11 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> <dependency> <groupId>org.hibernate</groupId> diff --git a/topia-service-replication/src/license/THIRD-PARTY.properties b/topia-service-replication/src/license/THIRD-PARTY.properties index 7ca75c1..d8ac5bb 100644 --- a/topia-service-replication/src/license/THIRD-PARTY.properties +++ b/topia-service-replication/src/license/THIRD-PARTY.properties @@ -1,34 +1,13 @@ -### -# #%L -# ToPIA :: Service Replication -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 2014 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - GNU Lesser General Public License, version 2.1 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License 1.0 # - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -37,13 +16,14 @@ # - MIT License # - MPL 1.1 # - New BSD License +# - Sun Binary Code License Agreement # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Mar 15 12:41:29 CET 2013 +#Wed Mar 02 12:11:53 CET 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javax.transaction--jta--1.1=Sun Binary Code License Agreement diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java index 26437d2..82dc4ee 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java @@ -42,7 +42,7 @@ import java.util.List; /** * Defines the context used to replicate. - * <p/> + * * It contains : * <ul> * <li>the {@link #replicationModel}</li> @@ -51,7 +51,7 @@ import java.util.List; * <li>nodes that has been treated successfully {@link #treated}</li> * </ul> * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.4.3 */ public class TopiaReplicationContext { @@ -130,7 +130,7 @@ public class TopiaReplicationContext { /** * Init the replication context. - * <p/> + * * Comptute the universe to replicate and store it in {@link #data}. * * @throws TopiaException for any error when initializing the replication context diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java index 496d37b..f2e7104 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java @@ -42,7 +42,7 @@ import static org.nuiton.i18n.I18n.t; /** * Builder of {@link ReplicationModel}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.4.3 */ public class TopiaReplicationModelBuilder { @@ -64,7 +64,7 @@ public class TopiaReplicationModelBuilder { /** * Prepare le modele de replication pour les entites données dans * {@code topiaIds} et de leur couverture. - * <p/> + * * Le paramètre {@code computeOrder} détermine si on doit calculer l'ordre * de replication des données (valeur à {@code true}), sinon (valeur * à {@code false}) on utilise l'ordre induit par le paramètre @@ -93,12 +93,12 @@ public class TopiaReplicationModelBuilder { /** * Prepare le modele de replication pour toutes les entites des types * donnes. - * <p/> + * * La méthode calcule l'ordre de replication des données. - * <p/> + * * Actuellement, on n'est pas capable de calculer l'ordre si le graphe des * entités contient des cycles. - * <p/> + * * TODO : faire en sorte de pouvoir gérer les cycles. * * @param contracts les contrats des types a repliquer @@ -190,7 +190,7 @@ public class TopiaReplicationModelBuilder { /** * Instantie un nouveau modèle de réplication pour les entités données par * leur ids. - * <p/> + * * L'ordre de réplication dépend du paramètre {@code computeOrder}. Si * celui-ci vaut {@code true}, on calcule l'ordre de réplication, sinon on * utilise l'ordre induit par les {@code contracts}. @@ -249,7 +249,7 @@ public class TopiaReplicationModelBuilder { /** * Instantie un nouveau modèle de réplication pour toutes les entitées. - * <p/> + * * Ici, l'ordre est toujours calculé. * * @param contracts les types d'entités diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java index 357cb42..21d14ce 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java @@ -37,21 +37,21 @@ import java.util.ServiceLoader; /** * Le contrat d'une operation a effectuer lors de la replication. - * <p/> + * * Le module propose des operations de base dans le paquetage * {@code org.nuiton.topia.replication.operation}. - * <p/> - * <p/> + * + * * Pour definir une nouvelle implantation d'operation, il faut l'enregister * en tant que service (au sens de la classe {@link ServiceLoader}, * c'est à dire ajouter dans un fichier (du class-path) * {@code META-INF/services/org.nuiton.topia.replication.TopiaReplicationOperation} - * <p/> + * * une ligne avec le nom qualifie de votre implantation. - * <p/> + * * Lors du chargement du service, on detecte toutes les operations disponibles. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public interface TopiaReplicationOperation { @@ -59,7 +59,7 @@ public interface TopiaReplicationOperation { /** * Creer et enregister une operation utilisateur apres la creation du * modele via la methode - * <p/> + * * {@link TopiaReplicationService#prepare(TopiaEntityEnum[], boolean, String...)}. * * @param model le modele de replication @@ -82,7 +82,7 @@ public interface TopiaReplicationOperation { /** * Execute l'operation avec le parametrage donnee. - * <p/> + * * Note : le commit sur le context cible doit etre geree dans la methode. * * @param replicationContext le contexte de replication diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java index 863d456..5b9d9bc 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java @@ -35,7 +35,7 @@ import java.util.ServiceLoader; /** * Provider of {@link TopiaReplicationOperation}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.4.3 */ public class TopiaReplicationOperationProvider { @@ -53,7 +53,7 @@ public class TopiaReplicationOperationProvider { /** * Obtains all {@link TopiaReplicationOperation} available * via {@link ServiceLoader}. - * <p/> + * * If {@link #operations} is null, then load operations, otherwise just * return the already computed result. * diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java index fcd0921..88731e6 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java @@ -30,9 +30,9 @@ import org.nuiton.topia.replication.model.ReplicationOperationDef; /** * Le contrat d'une operation {@link TopiaReplicationOperation} qui peut être * rollbacker lorsque la replication a échouée. - * <p/> + * * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.4.3 */ public interface TopiaReplicationOperationUndoable extends TopiaReplicationOperation { @@ -40,7 +40,7 @@ public interface TopiaReplicationOperationUndoable extends TopiaReplicationOpera /** * Execute l'operation inverse avec le parametrage donnee * (pour annuler l'opération). - * <p/> + * * Note : le commit sur le context cible doit etre geree dans la methode. * * @param operationDef la definition de l'operation a realiser diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java index aca4e72..73e0b4f 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java @@ -31,19 +31,22 @@ import org.nuiton.topia.replication.model.ReplicationModel; /** * User visible interface for replication engin - * <p/> + * * To use replicator you must have properties defined in config file: - * <li>topia.replication.engin=[class used to indexation] <li>possible specific - * property for index engin used - * <p/> + * <ul> + * <li>topia.replication.engin=[class used to indexation]</li> + * <li>possible specific property for index engin used</li> + * </ul> + * * The replication is always done in two phases : - * <p/> - * <li> - prepare the replication model - ({@link #prepare(TopiaEntityEnum[], boolean, String...)} - ({@link #prepareForAll(TopiaEntityEnum[])} - * <p/> + * <ul> + * <li> - prepare the replication model - ({@link #prepare(TopiaEntityEnum[], boolean, String...)} - ({@link #prepareForAll(TopiaEntityEnum[])}</li> + * * <li> - lanch replication {@link #doReplicate(ReplicationModel, - * TopiaContext)} + * TopiaContext)}</li> + * </ul> * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public interface TopiaReplicationService extends TopiaService { @@ -85,12 +88,12 @@ public interface TopiaReplicationService extends TopiaService { /** * Prepare le modele de replication pour toutes les entites des types * donnes. - * <p/> + * * La méthode calcule l'ordre de replication des données. - * <p/> + * * Actuellement, on n'est pas capable de calculer l'ordre si le graphe des * entités contient des cycles. - * <p/> + * * TODO : faire en sorte de pouvoir gérer les cycles. * * @param contracts les contrats des types a repliquer diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationServiceImpl.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationServiceImpl.java index b4729bd..cd7d586 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationServiceImpl.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationServiceImpl.java @@ -41,7 +41,7 @@ import java.util.List; /** * Implantation du service de replication. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class TopiaReplicationServiceImpl implements TopiaReplicationService { diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java index 1d26336..e008cdf 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java @@ -31,7 +31,7 @@ import java.util.Set; /** * Pour definir un lien entre deux entites (deux noeuds de replication). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class ReplicationLink { @@ -44,7 +44,7 @@ public class ReplicationLink { /** * liste des noeuds requis. - * <p/> + * * TODO tchemit 2010-08-14 Expliquer à quoi ça sert vraiment... */ protected final Set<ReplicationNode> requires; @@ -90,9 +90,9 @@ public class ReplicationLink { /** * Teste si on peut reattacher le lien en connaissant l'univers des * noeuds disponibles. - * <p/> + * * On teste si toutes les pre-requis sont disponibles. - * <p/> + * * Si oui, on peut reattacher. * * @param universe l'univers des noeuds disponibles diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java index 57c4f60..4ec4c0f 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java @@ -51,7 +51,7 @@ import java.util.Set; /** * Model of replication. - * <p/> + * * the object contains the required {@link #nodes} to replicate : * <ul> * <li>all entities for the given {@code nodes} if flag {@link #replicateAll} is @@ -59,7 +59,7 @@ import java.util.Set; * <li>the entities given by the field {@link #topiaIds}</li> * </ul> * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class ReplicationModel { diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java index 94a67a4..700c8b5 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java @@ -42,11 +42,11 @@ import java.util.Set; /** * Model of a replication's node. - * <p/> + * * The invariant of a replication's node is his {@link #contract}, means the * type of entity to replicate. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class ReplicationNode { diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java index c3f991c..5d0b3ae 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java @@ -32,7 +32,7 @@ import java.util.Arrays; /** * Definition of a concrete operation to execute. - * <p/> + * * A such operation involves : * <ul> * <li>the replication node</li> @@ -40,15 +40,15 @@ import java.util.Arrays; * <li>the replication operation type</li> * <li>the replication operation arguments</li> * </ul> - * <p/> + * * This definition is detected when building replication model. - * <p/> + * * Then when starting replication, based on this definition, we can instanciate * the operation to execute. - * <p/> + * * <b>Note:</b> Such objects can be comparable via their {@link #phase}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class ReplicationOperationDef implements Comparable<ReplicationOperationDef> { diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java index de869dd..c210a5b 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java @@ -28,11 +28,11 @@ import org.nuiton.topia.replication.operation.Duplicate; /** * Une enumeration pour definir quand appliquer une operation. - * <p/> + * * L'ordre induit par cette enumeration sera utilisé pour trier les operations * a realiser sur chaque noeud de replication. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public enum ReplicationOperationPhase { diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java index 41f0265..51a3d76 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java @@ -46,7 +46,7 @@ import static org.nuiton.i18n.I18n.t; /** * Pour attacher une association. - * <p/> + * * L'opération requière 2 ou 3 paramètres : * <ul> * <li>{@code parameters[0]} : le nom de l'association à traiter</li> @@ -55,26 +55,26 @@ import static org.nuiton.i18n.I18n.t; * <li>{@code parameters[2]} : le noeud source de l'association * (uniquement utilisé si on est sur le reverse d'une association)</li> * </ul> - * <p/> + * * Deux cas peuvent se produire : - * <p/> + * * - le noeud de l'operation est la source de l'association, dans ce cas la * {@code entities} contient les entites sources de l'association et on * retrouve les entites associes a partir du type de l'association - * <p/> + * * Ce premier cas est verifie quand {@code reverse} (le second parametre) est * à {@code false}. - * <p/> + * * - le noeud de l'operation est la cible de l'association, dans ce cas la * {@code entities} contient les entities associées (cibles) de * l'assocation et on retrouve les entities a partir d'un troisieme parametre * qui donne le node source de l'association. - * <p/> + * * Note : cette operation est interne, et n'est pas creable par l'utilisateur * via la methode {@link #register(ReplicationModel, ReplicationNode, * ReplicationOperationPhase, Object...)}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 * @deprecated since 2.5.2, this operation will be removed in version 2.6 and * will not be replaced : prefer use the {@link AttachLink} instead. diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java index b9a6032..7a94bbe 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java @@ -47,25 +47,25 @@ import static org.nuiton.i18n.I18n.t; /** * Pour attacher une association. - * <p/> + * * Deux cas peuvent se produire : - * <p/> + * * - le noeud de l'operation est la source de l'association, dans ce cas la * <code>nodeEntities</code> contient les entites sources de l'association et on * retrouve les entites associes a partir du type de l'association - * <p/> + * * Ce premier cas est verifie quand reverse (le econd parametre) est a false - * <p/> + * * - le noeud de l'operation est la cible de l'association, dans ce cas la * <code>nodeEntities</code> contient les entities associes (cibles) de * l'assocation et on retrouve les entities a partir d'un troisieme parametre * qui donne le node source des entities sources. - * <p/> + * * Note : cette operation est interne, et n'est pas creable par l'utilisateur * via la methode {@link #register(ReplicationModel, ReplicationNode, * ReplicationOperationPhase, Object...)}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class AttachLink implements TopiaReplicationOperation { diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java index 181d105..69393aa 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java @@ -41,12 +41,12 @@ import java.util.List; /** * Pour dettacher une association. - * <p/> + * * Note : cette operation est interne, et n'est pas creable par * l'utilisateur via la methode * {@link #register(ReplicationModel, ReplicationNode, ReplicationOperationPhase, Object...)}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class DettachAssociation implements TopiaReplicationOperation { diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java index 45aec3f..2c0d284 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java @@ -42,12 +42,12 @@ import java.util.List; /** * L'operation de duplication d'un noeud de replication. - * <p/> + * * Note : cette operation est interne, et n'est pas creable par * l'utilisateur via la methode * {@link #register(ReplicationModel, ReplicationNode, ReplicationOperationPhase, Object...)}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class Duplicate implements TopiaReplicationOperationUndoable { diff --git a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java index 4b285f2..832b76a 100644 --- a/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java +++ b/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java @@ -44,12 +44,12 @@ import static org.nuiton.i18n.I18n.t; /** * Pour charger une association sur le noeud de l'operation. - * <p/> + * * Note : cette operation est interne, et n'est pas creable par * l'utilisateur via la methode * {@link #register(ReplicationModel, ReplicationNode, ReplicationOperationPhase, Object...)}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class LoadLink implements TopiaReplicationOperation { diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java index f4538c9..32f4043 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java @@ -53,10 +53,10 @@ import java.util.Set; /** * TopiaReplicationServiceImplTest. - * <p/> + * * Created: 07 jun. 09 17:14:22 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @version $Id$ * @since 2.2.0 */ diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java index 64f116e..16e8453 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java @@ -43,10 +43,10 @@ import java.util.Properties; /** * TopiaReplicationServiceImplTest on model TopiaTest - * <p/> + * * Created: 07 jun. 09 17:14:22 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class TopiaReplicationOperationTest extends AbstractTopiaReplicationServiceTest { diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java index 8d68747..7be245f 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java @@ -52,10 +52,10 @@ import java.util.Properties; /** * TopiaReplicationServiceImplTest on model TopiaTest - * <p/> + * * Created: 07 jun. 09 17:14:22 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class TopiaReplicationServiceImplAllTest extends AbstractTopiaReplicationServiceTest { diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java index 608e6c4..4965a26 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java @@ -59,10 +59,10 @@ import java.util.Properties; /** * TopiaReplicationServiceImplTest on model TopiaTest - * <p/> + * * Created: 07 jun. 09 17:14:22 * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class TopiaReplicationServiceImplTest extends AbstractTopiaReplicationServiceTest { @@ -253,7 +253,7 @@ public class TopiaReplicationServiceImplTest extends AbstractTopiaReplicationSer /** * Cette methode montre pourquoi la simple replication ne peut pas * fonctionne :) - * <p/> + * * Le replicateur ne deplique pas dans le bon ordre et on a donc des * violations de clef etrangeres... * @@ -285,7 +285,7 @@ public class TopiaReplicationServiceImplTest extends AbstractTopiaReplicationSer /** * Cette methode montre comment manuellement on peut effectuer la * replication (en dettachant les dependances qui forment des cycles) - * <p/> + * * La methode utilisee ici peut ne pas fonctionner : si une clef metier est * posee sur une dependance alors cela ne fonctionne pas. * @@ -332,13 +332,13 @@ public class TopiaReplicationServiceImplTest extends AbstractTopiaReplicationSer /** * Cette methode montre comment manuellement on peut effectuer la * replication (en dettachant les associations qui forment des cycles) - * <p/> + * * La methode utilisee ici fonctionne mieux que la precedante : il parrait * dificille de pose une une clef metier sur une association :). - * <p/> + * * On remarque que l'on dettache l'assocation qui forme un cycle et que l'on * est pas obligee de la reattachee car elle est bi-directionnelle. - * <p/> + * * On doit optimiser l'algorithme dans la methode {@link * ReplicationModel#adjustOperations(TopiaEntityIdsMap)}. * diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/FakeOperation.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/FakeOperation.java index 3c2498e..c621212 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/FakeOperation.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/FakeOperation.java @@ -38,7 +38,7 @@ import org.nuiton.topia.replication.model.ReplicationOperationPhase; import java.util.List; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class FakeOperation implements TopiaReplicationOperation { diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java index 0d9101e..d48b2a0 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java @@ -39,7 +39,7 @@ import java.util.List; import static org.nuiton.i18n.I18n.t; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class UncreatableOperation implements TopiaReplicationOperation { diff --git a/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UnregistredOperation.java b/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UnregistredOperation.java index 4a3c225..1046d91 100644 --- a/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UnregistredOperation.java +++ b/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UnregistredOperation.java @@ -37,7 +37,7 @@ import org.nuiton.topia.replication.model.ReplicationOperationPhase; import java.util.List; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 2.2.0 */ public class UnregistredOperation implements TopiaReplicationOperation { diff --git a/topia-service-security/pom.xml b/topia-service-security/pom.xml index f5eb051..9203923 100644 --- a/topia-service-security/pom.xml +++ b/topia-service-security/pom.xml @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 2016 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -81,6 +81,11 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> diff --git a/topia-service-security/src/license/THIRD-PARTY.properties b/topia-service-security/src/license/THIRD-PARTY.properties index c5c4bbe..e81116a 100644 --- a/topia-service-security/src/license/THIRD-PARTY.properties +++ b/topia-service-security/src/license/THIRD-PARTY.properties @@ -1,34 +1,13 @@ -### -# #%L -# ToPIA :: Service Security -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2004 - 2014 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - GNU Lesser General Public License, version 2.1 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License 1.0 # - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -37,13 +16,14 @@ # - MIT License # - MPL 1.1 # - New BSD License +# - Sun Binary Code License Agreement # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Mar 15 12:42:13 CET 2013 +#Wed Mar 02 12:16:14 CET 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javax.transaction--jta--1.1=Sun Binary Code License Agreement diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.java b/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.java index 45bd310..c92645b 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -50,7 +50,7 @@ public abstract class TopiaAuthorizationImpl extends TopiaAuthorizationAbstract /** * Comparare deux identifiants entres eux. - * thisId => thatId = ? + * thisId => thatId = ? * @param thisExpression un identifiant * @param thatExpression un autre identifiant * @return vrai si thisId implique thatId @@ -64,7 +64,7 @@ public abstract class TopiaAuthorizationImpl extends TopiaAuthorizationAbstract /** * Compare deux actions entre elles. - * thisActions => thatActions = ? + * thisActions => thatActions = ? * @param thisActions une action * @param thatActions une autre action * @return vrai si thisActions implique thatActions @@ -88,7 +88,7 @@ public abstract class TopiaAuthorizationImpl extends TopiaAuthorizationAbstract /** * Compare deux principals entre eux. - * thisPrincipals => thatPrincipals = ? + * thisPrincipals => thatPrincipals = ? * @param thisPrincipals un principal * @param thatPrincipals un autre principal * @return vrai si thisPrincipals implique thatPrincipals diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaCallbackHandler.java b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaCallbackHandler.java index 5436c17..5cde5f0 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaCallbackHandler.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaCallbackHandler.java @@ -27,7 +27,7 @@ * * Created: 20 févr. 2006 * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaConfiguration.java b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaConfiguration.java index 5df42d4..0f38a3c 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaConfiguration.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaConfiguration.java @@ -27,7 +27,7 @@ * * Created: 20 févr. 2006 * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java index a42bf4b..d6d1b28 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java @@ -27,7 +27,7 @@ * * Created: 15 févr. 2006 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPermission.java b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPermission.java index d19177d..974202e 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPermission.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPermission.java @@ -27,7 +27,7 @@ * * Created: 16 févr. 2006 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPolicy.java b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPolicy.java index c11d571..02b635e 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPolicy.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPolicy.java @@ -27,7 +27,7 @@ * * Created: 17 févr. 2006 * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPrincipal.java b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPrincipal.java index 06550f4..58d6b20 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPrincipal.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaPrincipal.java @@ -27,7 +27,7 @@ * * Created: 15 févr. 2006 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java b/topia-service-security/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java index 8f6d0fc..76dd954 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/listener/EntityVetoable.java @@ -27,7 +27,7 @@ * * Created: 10 févr. 2006 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/listener/PropertyVetoable.java b/topia-service-security/src/main/java/org/nuiton/topia/security/listener/PropertyVetoable.java index 533c6c0..aa79050 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/listener/PropertyVetoable.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/listener/PropertyVetoable.java @@ -27,7 +27,7 @@ * * Created: 10 févr. 2006 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java b/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java index e945bc0..dd442bb 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/security/util/TopiaSecurityUtil.java @@ -27,7 +27,7 @@ * * Created: 15 févr. 2006 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java b/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java index 492d7e8..7dd79a3 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasService.java @@ -27,7 +27,7 @@ * * Created: 10 févr. 2006 * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ @@ -78,7 +78,7 @@ import static org.nuiton.topia.taas.TaasUtil.getPrincipalNames; /** * Service pour la sécurité - * <p/> + * * Pour utiliser le service taas, il suffit de rajouter les lignes suivantes * dans le TopiaContext.properties :<p> topia.service.taas=org.nuiton.topia.taas.TaasService * topia.service.taas.event=org.nuiton.topia.taas.event.TaasEntityVetoable diff --git a/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java b/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java index 48a9942..7991188 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -21,19 +21,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - -/* * -* TopiaSecurityUtil.java -* -* Created: 15 févr. 2006 -* -* @author Arnaud Thimel <thimel@codelutin.com> -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ - package org.nuiton.topia.taas; import java.security.MessageDigest; @@ -49,12 +36,10 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - /** * Classe utilitaire * * @author ruchaud - * */ public class TaasUtil { @@ -196,9 +181,9 @@ public class TaasUtil { /** * Détermine si la classe implémente une interface * <p> - * interface A <---- class B <---- class C + * interface A <---- class B <---- class C * <p> - * interface D <---- class E + * interface D <---- class E * <p> * isImplement(C, A) = true * <p> diff --git a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasCallbackHandler.java b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasCallbackHandler.java index e1e4828..dced8dd 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasCallbackHandler.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasCallbackHandler.java @@ -27,7 +27,7 @@ * * Created: 20 févr. 2006 * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasConfiguration.java b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasConfiguration.java index 3dc643a..79eabee 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasConfiguration.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasConfiguration.java @@ -27,7 +27,7 @@ * * Created: 20 févr. 2006 * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java index 3bdc695..649f061 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasLoginModule.java @@ -27,7 +27,7 @@ * * Created: 15 févr. 2006 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java index d369238..4927466 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPermission.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -22,18 +22,6 @@ * #L% */ -/* * -* TopiaPermission.java -* -* Created: 16 févr. 2006 -* -* @author Arnaud Thimel <thimel@codelutin.com> -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ - package org.nuiton.topia.taas.jaas; import static org.nuiton.topia.taas.TaasUtil.CREATE; @@ -156,7 +144,7 @@ public class TaasPermission extends Permission { /** * Comparare deux identifiants entres eux. - * thisId => thatId = ? + * thisId => thatId = ? * @param thisExpression un identifiant * @param thatExpression un autre identifiant * @return vrai si thisId implique thatId @@ -178,7 +166,7 @@ public class TaasPermission extends Permission { /** * Compare deux actions entre elles. - * thisActions => thatActions = ? + * thisActions => thatActions = ? * @param thisActions une action * @param thatActions une autre action * @return vrai si thisActions implique thatActions diff --git a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java index ed6dc91..d17dddc 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPolicy.java @@ -27,7 +27,7 @@ * * Created: 17 févr. 2006 * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPrincipalWrapper.java b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPrincipalWrapper.java index 9400d4f..55ae67a 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPrincipalWrapper.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasPrincipalWrapper.java @@ -27,7 +27,7 @@ * * Created: 15 févr. 2006 * -* @author Arnaud Thimel <thimel@codelutin.com> +* @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinder.java b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinder.java index 6a3e08d..d980d2e 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinder.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinder.java @@ -27,7 +27,7 @@ * * Created: 10 févr. 2006 * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinderImpl.java b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinderImpl.java index 881150a..0cf4251 100644 --- a/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinderImpl.java +++ b/topia-service-security/src/main/java/org/nuiton/topia/taas/jaas/TaasSubjectFinderImpl.java @@ -27,7 +27,7 @@ * * Created: 10 févr. 2006 * - * @author Arnaud Thimel <thimel@codelutin.com> + * @author Arnaud Thimel <thimel@codelutin.com> * @version $Revision$ * * Mise a jour: $Date$ diff --git a/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java b/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java index 22254f2..5302eae 100644 --- a/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java +++ b/topia-service-security/src/test/java/org/nuiton/topia/TestUtils.java @@ -34,7 +34,7 @@ import java.io.IOException; * Une classe pour avoir des choses utiles pour tous les tests. * * @author Chatellier Eric - * <p/> + * * Last update : $Date$ * @deprecated since 2.5, everything usefull already exists in the class {@link TestHelper} from {@code topia-persistence module}. */ -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.