Author: tchemit Date: 2010-11-18 17:08:09 +0100 (Thu, 18 Nov 2010) New Revision: 2140 Url: http://nuiton.org/repositories/revision/topia/2140 Log: reformat poms Evolution #1070: Optimize dependencies Evolution #1068: Update i18n to 2.0 Added: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_en_GB.properties trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_fr_FR.properties Removed: trunk/topia-persistence/src/main/resources/i18n/topia-persistence-en_GB.properties trunk/topia-persistence/src/main/resources/i18n/topia-persistence-fr_FR.properties trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-en_GB.properties trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-fr_FR.properties trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication-en_GB.properties trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication-fr_FR.properties Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/pom.xml 2010-11-18 16:08:09 UTC (rev 2140) @@ -58,13 +58,6 @@ <dependencies> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4jVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene</artifactId> <version>${eugeneVersion}</version> @@ -78,8 +71,14 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> + <!--dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> @@ -89,7 +88,7 @@ <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>2.5</version> - </dependency> + </dependency--> <dependency> <groupId>org.hibernate</groupId> @@ -112,6 +111,12 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + <!-- hibernate-core only include api, need core --> <dependency> <groupId>org.slf4j</groupId> @@ -128,12 +133,12 @@ <scope>test</scope> </dependency> - <dependency> + <!--dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.8.2</version> <scope>test</scope> - </dependency> + </dependency--> <!-- All theses dependancies are no more used Keep them for topia-soa and topia-service-XXX @@ -326,9 +331,9 @@ <!-- libs version --> <eugeneVersion>2.2.1-SNAPSHOT</eugeneVersion> - <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> + <nuitonUtilsVersion>1.5.2-SNAPSHOT</nuitonUtilsVersion> <processorPluginVersion>1.0.4</processorPluginVersion> - <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonI18nVersion>2.0-SNAPSHOT</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>3.3.2.GA</hibernateVersion> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/topia-persistence/pom.xml 2010-11-18 16:08:09 UTC (rev 2140) @@ -23,325 +23,360 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>topia</artifactId> - <version>2.4.4-SNAPSHOT</version> - </parent> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>topia</artifactId> + <version>2.4.4-SNAPSHOT</version> + </parent> - <dependencies> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependencies> - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> - <!-- BD H2 for testing --> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> - <name>ToPIA :: Persistence</name> - <description>Hibernate based persistence module</description> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> - <packaging>jar</packaging> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> - <build> + <!-- BD H2 for testing --> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> - <testResources> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <testResource> - <directory>${maven.gen.dir}/test-java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </testResource> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> - <testResource> - <directory>${maven.src.dir}/test/resources</directory> - <includes> - <include>**/*.properties</include> - </includes> - </testResource> + </dependencies> - <testResource> - <directory>${maven.src.dir}/test/java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </testResource> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - </testResources> + <name>ToPIA :: Persistence</name> + <description>Hibernate based persistence module</description> - <plugins> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - </plugin> + <packaging>jar</packaging> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - <!-- restrict parsing beacause this is expensive --> - <!-- if you want to parse more, add your package in includes --> - <configuration> - <treateDefaultEntry>false</treateDefaultEntry> - <entries> - <entry> - <basedir>${maven.src.dir}/main/java</basedir> - <includes> - <include>org/nuiton/topia/framework/*.java</include> - </includes> - </entry> - </entries> - </configuration> - </execution> - </executions> - </plugin> + <build> - <!-- expose new plexus components --> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-metadata</artifactId> - <executions> - <execution> - <goals> - <goal>generate-metadata</goal> - </goals> - </execution> - </executions> - </plugin> + <testResources> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <configuration> + <testResource> + <directory>${maven.gen.dir}/test-java</directory> + <includes> + <include>**/*.hbm.xml</include> + </includes> + </testResource> - </configuration> - <executions> - <execution> - <id>Test Generator</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.topia.generator.EntityDTOTransformer, - org.nuiton.topia.generator.BinderHelperTransformer, - org.nuiton.topia.generator.QueryHelperTransformer - </templates> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <defaultPackage>org.nuiton.topia</defaultPackage> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> + <testResource> + <directory>${maven.src.dir}/test/resources</directory> + <includes> + <include>**/*.properties</include> + </includes> + </testResource> - <plugin> + <testResource> + <directory>${maven.src.dir}/test/java</directory> + <includes> + <include>**/*.hbm.xml</include> + </includes> + </testResource> - <!-- on expose le classifier test pour pouvoir reutiliser la - base de test . + </testResources> - Dans le module qui veut utiliser ces tests, ecrire : + <plugins> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - --> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> + </plugin> - </plugin> - </plugins> - </build> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + <!-- restrict parsing beacause this is expensive --> + <!-- if you want to parse more, add your package in includes --> + <configuration> + <treateDefaultEntry>false</treateDefaultEntry> + <entries> + <entry> + <basedir>${maven.src.dir}/main/java</basedir> + <includes> + <include>org/nuiton/topia/framework/*.java</include> + </includes> + </entry> + </entries> + </configuration> + </execution> + </executions> + </plugin> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <profiles> + <!-- expose new plexus components --> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <executions> + <execution> + <goals> + <goal>generate-metadata</goal> + </goals> + </execution> + </executions> + </plugin> - <!-- perform only on a release stage when using the maven-release-plugin --> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <configuration> - <build> - <plugins> + </configuration> + <executions> + <execution> + <id>Test Generator</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.eugene.java.JavaInterfaceTransformer, + org.nuiton.eugene.java.JavaBeanTransformer, + org.nuiton.topia.generator.EntityDTOTransformer, + org.nuiton.topia.generator.BinderHelperTransformer, + org.nuiton.topia.generator.QueryHelperTransformer + </templates> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <defaultPackage>org.nuiton.topia</defaultPackage> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> - <!-- always compute tests source jar --> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-test-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> - <!-- always compute tests source jar --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-test-javadoc</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> + <!-- on expose le classifier test pour pouvoir reutiliser la + base de test . - </plugins> - </build> - </profile> + Dans le module qui veut utiliser ces tests, ecrire : - <!-- reporting at release time --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.8</version> - </plugin> - </plugins> - </reporting> - - </profile> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + --> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> - <profile> - <id>run-its</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <configuration> - <pomIncludes> - <pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude> - <!--<pomInclude>**/pom.xml</pomInclude>--> - </pomIncludes> - <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> - <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> - <!--<debug>true</debug>--> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - <phase>integration-test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + </plugin> + </plugins> + </build> - </profiles> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + <profiles> + <!-- perform only on a release stage when using the maven-release-plugin --> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + + <!-- always compute tests source jar --> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-test-sources</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- always compute tests source jar --> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-test-javadoc</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + <!-- reporting at release time --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <version>1.3.8</version> + </plugin> + </plugins> + </reporting> + + </profile> + + <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <pomIncludes> + <pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude> + <!--<pomInclude>**/pom.xml</pomInclude>--> + </pomIncludes> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${basedir}/target/local-repo + </localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <!--<debug>true</debug>--> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + </profiles> + </project> Deleted: trunk/topia-persistence/src/main/resources/i18n/topia-persistence-en_GB.properties =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence-en_GB.properties 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence-en_GB.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -1,32 +0,0 @@ -topia.persistence.error.class.not.found=Persistence class %1$s not found -topia.persistence.error.context.already.closed=Context was alredy closed -topia.persistence.error.context.is.closed=Context is closed, no operation is possible. -topia.persistence.error.create.schema=Schema could not be created for following reason \: %1$s -topia.persistence.error.empty.doc=Empty document -topia.persistence.error.no.hibernate.session=No hinernate session found, you must at first, open a new transaction via 'beaginTransaction' method. -topia.persistence.error.null.param=The method '%1$s' requires a non null parameter '%2$s'. -topia.persistence.error.on.backup=An error occurs while backup operation \: %1$s -topia.persistence.error.on.clear=An error occurs while clear operation \: %1$s -topia.persistence.error.on.commit=An error occurs while commit operation \: %1$s -topia.persistence.error.on.export=An error occurs while export operation \: %1$s -topia.persistence.error.on.loding.xml.doc=Could not read xml document for following reason \: %1$s -topia.persistence.error.on.query=An error occurs while query operation \: %1$s -topia.persistence.error.on.replicate=An error occurs while replicate operation \: %1$s -topia.persistence.error.on.restore=An error occurs while restore operation \: %1$s -topia.persistence.error.on.rollback=An error occurs while rollback operation \: %1$s -topia.persistence.error.replicate.entity=Could not replicate entity '%1$s' pour following reason \: %2$s -topia.persistence.error.replicate.on.same.context=Can not do a replication operation on same database. -topia.persistence.error.rootContext.access=You are on root context, you MUST open a transaction to perform any database access. -topia.persistence.error.service.not.found=The service %1$s was not found. -topia.persistence.error.service.not.retreaved=Could not retrive service %1$s for following reason \: %2$s -topia.persistence.error.service.unknown=The service %1$s of type %2$s was not found. -topia.persistence.error.unsupported.class=The following entity type %1$s is not managed by this context, you probably forgot to declare it. -topia.persistence.error.unsupported.operation.on.closed.context=This context is closed, it is not possible to release the operation '%1$s' -topia.persistence.error.unsupported.operation.on.root.context=Operation '%1$s' not possible on root context (use a sub transaction). -topia.persistence.error.update.schema=Schema could not be updated for following reason \: %1$s -topia.persistence.service.loaded=Service '%1$s' loaded (implementation %2$s) -topia.persistence.supported.classes.for.context=List of supported persistence classes \: %1$s -topia.persistence.warn.service.not.found=The service named '%1$s' could not be found for following reason \: \: %2$s -topia.persistence.warn.service.not.loaded=The service with key '%1$s' has a different name '%2$s' \! (service not activated) -topia.persistence.warn.service.not.postInit=The service named '%1$s' could not be pre-initialized (service not activated) -topia.persistence.warn.service.not.preInit=The service named '%1$s' could not be post-initialized (service not activated) Deleted: trunk/topia-persistence/src/main/resources/i18n/topia-persistence-fr_FR.properties =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence-fr_FR.properties 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence-fr_FR.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -1,32 +0,0 @@ -topia.persistence.error.class.not.found=La classe persistante %1$s n'a pas \u00E9t\u00E9 trouv\u00E9e -topia.persistence.error.context.already.closed=Ce contexte a deja ete ferme -topia.persistence.error.context.is.closed=Ce contexte a ete ferme, impossible de commencer une transaction -topia.persistence.error.create.schema=Le sch\u00E9ma n'a pas pu \u00EAtre cr\u00E9e pour la raison suivante \: %2$s -topia.persistence.error.empty.doc=Document vide -topia.persistence.error.no.hibernate.session=Aucune session hibernate trouv\u00E9e, vous devez d\u00E9marr\u00E9 une transaction avec la m\u00E9thode 'beginTransaction' -topia.persistence.error.null.param=La m\u00E9thode '%1$s' requi\u00E8re un param\u00E8tre '%2$s' non null. -topia.persistence.error.on.backup=Une erreur est apparue pendant la sauvegarde \: %1$s -topia.persistence.error.on.clear=Une erreur est apparue pendant le nettoyage \: %1$s -topia.persistence.error.on.commit=Une erreur est apparue pendant le commit \: %1$s -topia.persistence.error.on.export=Une erreur est apparue pendant l'export \: %1$s -topia.persistence.error.on.loding.xml.doc=Lecture du document impossible pour la raison suivante \: %1$s -topia.persistence.error.on.query=Une erreur est apparue pendant le recherche (requ\u00EAte %1$s) \: %2$s -topia.persistence.error.on.replicate=Une erreur est apparue pendant la replication \: %1$s -topia.persistence.error.on.restore=Une erreur est apparue pendant le restore \: %1$s -topia.persistence.error.on.rollback=Une erreur est apparue pendant le rollback \: %1$s -topia.persistence.error.replicate.entity=Echec de replication de l'entite %1$s\npour la raison suivante \: %2$s -topia.persistence.error.replicate.on.same.context=Impossible de dupliquer dans la m\u00EAme base -topia.persistence.error.rootContext.access=Vous \u00EAtes sur le root context, vous devez ouvrir une transaction pour pouvoir acc\u00E9der aux donn\u00E9es. -topia.persistence.error.service.not.found=Le service %1$s n'est pas disponible -topia.persistence.error.service.not.retreaved=La service %1$s n'a pas pu \u00EAtre r\u00E9cup\u00E9r\u00E9 pour la raison suivante \: %2$s -topia.persistence.error.service.unknown=Le service '%1$s' ayant pour classe '%2$s' n'est pas connu -topia.persistence.error.unsupported.class=La classe %1$s n'est pas support\u00E9e par ce TopiaContext, vous avez sans doute oubli\u00E9 d'ajouter son mapping -topia.persistence.error.unsupported.operation.on.closed.context=Ce contexte a \u00E9t\u00E9 ferm\u00E9, impossible de r\u00E9aliser l'op\u00E9ration %1$s -topia.persistence.error.unsupported.operation.on.root.context=Vous \u00EAtes sur le root context l'op\u00E9ration %1$s est impossible -topia.persistence.error.update.schema=Le sch\u00E9ma n'a pas pu \u00EAtre mis \u00E0 jour pour la raison suivante \: %2$s -topia.persistence.service.loaded=Service '%1$s' charg\u00E9 par '%2$s' -topia.persistence.supported.classes.for.context=Classes support\u00E9es par ce TopiaContext \: %1$s -topia.persistence.warn.service.not.found=Le nom du service '%1$s' n'a pas \u00E9t\u00E9 trouv\u00E9 pour la raison suivante \: %2$s -topia.persistence.warn.service.not.loaded=Le service de cl\u00E9 '%1$s' a un nom de service '%2$s' diff\u00E9rent \! (service d\u00E9sactiv\u00E9) -topia.persistence.warn.service.not.postInit=Le service '%1$s' n'a pas pu \u00EAtre initialis\u00E9 (service d\u00E9sactiv\u00E9) -topia.persistence.warn.service.not.preInit=Le service '%1$s' n'a pas pu \u00EAtre finalis\u00E9 (service d\u00E9sactiv\u00E9) Copied: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties (from rev 2139, trunk/topia-persistence/src/main/resources/i18n/topia-persistence-en_GB.properties) =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties (rev 0) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -0,0 +1,32 @@ +topia.persistence.error.class.not.found=Persistence class %1$s not found +topia.persistence.error.context.already.closed=Context was alredy closed +topia.persistence.error.context.is.closed=Context is closed, no operation is possible. +topia.persistence.error.create.schema=Schema could not be created for following reason \: %1$s +topia.persistence.error.empty.doc=Empty document +topia.persistence.error.no.hibernate.session=No hinernate session found, you must at first, open a new transaction via 'beaginTransaction' method. +topia.persistence.error.null.param=The method '%1$s' requires a non null parameter '%2$s'. +topia.persistence.error.on.backup=An error occurs while backup operation \: %1$s +topia.persistence.error.on.clear=An error occurs while clear operation \: %1$s +topia.persistence.error.on.commit=An error occurs while commit operation \: %1$s +topia.persistence.error.on.export=An error occurs while export operation \: %1$s +topia.persistence.error.on.loding.xml.doc=Could not read xml document for following reason \: %1$s +topia.persistence.error.on.query=An error occurs while query operation \: %1$s +topia.persistence.error.on.replicate=An error occurs while replicate operation \: %1$s +topia.persistence.error.on.restore=An error occurs while restore operation \: %1$s +topia.persistence.error.on.rollback=An error occurs while rollback operation \: %1$s +topia.persistence.error.replicate.entity=Could not replicate entity '%1$s' pour following reason \: %2$s +topia.persistence.error.replicate.on.same.context=Can not do a replication operation on same database. +topia.persistence.error.rootContext.access=You are on root context, you MUST open a transaction to perform any database access. +topia.persistence.error.service.not.found=The service %1$s was not found. +topia.persistence.error.service.not.retreaved=Could not retrive service %1$s for following reason \: %2$s +topia.persistence.error.service.unknown=The service %1$s of type %2$s was not found. +topia.persistence.error.unsupported.class=The following entity type %1$s is not managed by this context, you probably forgot to declare it. +topia.persistence.error.unsupported.operation.on.closed.context=This context is closed, it is not possible to release the operation '%1$s' +topia.persistence.error.unsupported.operation.on.root.context=Operation '%1$s' not possible on root context (use a sub transaction). +topia.persistence.error.update.schema=Schema could not be updated for following reason \: %1$s +topia.persistence.service.loaded=Service '%1$s' loaded (implementation %2$s) +topia.persistence.supported.classes.for.context=List of supported persistence classes \: %1$s +topia.persistence.warn.service.not.found=The service named '%1$s' could not be found for following reason \: \: %2$s +topia.persistence.warn.service.not.loaded=The service with key '%1$s' has a different name '%2$s' \! (service not activated) +topia.persistence.warn.service.not.postInit=The service named '%1$s' could not be pre-initialized (service not activated) +topia.persistence.warn.service.not.preInit=The service named '%1$s' could not be post-initialized (service not activated) Property changes on: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_en_GB.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Copied: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties (from rev 2139, trunk/topia-persistence/src/main/resources/i18n/topia-persistence-fr_FR.properties) =================================================================== --- trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties (rev 0) +++ trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -0,0 +1,32 @@ +topia.persistence.error.class.not.found=La classe persistante %1$s n'a pas \u00E9t\u00E9 trouv\u00E9e +topia.persistence.error.context.already.closed=Ce contexte a deja ete ferme +topia.persistence.error.context.is.closed=Ce contexte a ete ferme, impossible de commencer une transaction +topia.persistence.error.create.schema=Le sch\u00E9ma n'a pas pu \u00EAtre cr\u00E9e pour la raison suivante \: %2$s +topia.persistence.error.empty.doc=Document vide +topia.persistence.error.no.hibernate.session=Aucune session hibernate trouv\u00E9e, vous devez d\u00E9marr\u00E9 une transaction avec la m\u00E9thode 'beginTransaction' +topia.persistence.error.null.param=La m\u00E9thode '%1$s' requi\u00E8re un param\u00E8tre '%2$s' non null. +topia.persistence.error.on.backup=Une erreur est apparue pendant la sauvegarde \: %1$s +topia.persistence.error.on.clear=Une erreur est apparue pendant le nettoyage \: %1$s +topia.persistence.error.on.commit=Une erreur est apparue pendant le commit \: %1$s +topia.persistence.error.on.export=Une erreur est apparue pendant l'export \: %1$s +topia.persistence.error.on.loding.xml.doc=Lecture du document impossible pour la raison suivante \: %1$s +topia.persistence.error.on.query=Une erreur est apparue pendant le recherche (requ\u00EAte %1$s) \: %2$s +topia.persistence.error.on.replicate=Une erreur est apparue pendant la replication \: %1$s +topia.persistence.error.on.restore=Une erreur est apparue pendant le restore \: %1$s +topia.persistence.error.on.rollback=Une erreur est apparue pendant le rollback \: %1$s +topia.persistence.error.replicate.entity=Echec de replication de l'entite %1$s\npour la raison suivante \: %2$s +topia.persistence.error.replicate.on.same.context=Impossible de dupliquer dans la m\u00EAme base +topia.persistence.error.rootContext.access=Vous \u00EAtes sur le root context, vous devez ouvrir une transaction pour pouvoir acc\u00E9der aux donn\u00E9es. +topia.persistence.error.service.not.found=Le service %1$s n'est pas disponible +topia.persistence.error.service.not.retreaved=La service %1$s n'a pas pu \u00EAtre r\u00E9cup\u00E9r\u00E9 pour la raison suivante \: %2$s +topia.persistence.error.service.unknown=Le service '%1$s' ayant pour classe '%2$s' n'est pas connu +topia.persistence.error.unsupported.class=La classe %1$s n'est pas support\u00E9e par ce TopiaContext, vous avez sans doute oubli\u00E9 d'ajouter son mapping +topia.persistence.error.unsupported.operation.on.closed.context=Ce contexte a \u00E9t\u00E9 ferm\u00E9, impossible de r\u00E9aliser l'op\u00E9ration %1$s +topia.persistence.error.unsupported.operation.on.root.context=Vous \u00EAtes sur le root context l'op\u00E9ration %1$s est impossible +topia.persistence.error.update.schema=Le sch\u00E9ma n'a pas pu \u00EAtre mis \u00E0 jour pour la raison suivante \: %2$s +topia.persistence.service.loaded=Service '%1$s' charg\u00E9 par '%2$s' +topia.persistence.supported.classes.for.context=Classes support\u00E9es par ce TopiaContext \: %1$s +topia.persistence.warn.service.not.found=Le nom du service '%1$s' n'a pas \u00E9t\u00E9 trouv\u00E9 pour la raison suivante \: %2$s +topia.persistence.warn.service.not.loaded=Le service de cl\u00E9 '%1$s' a un nom de service '%2$s' diff\u00E9rent \! (service d\u00E9sactiv\u00E9) +topia.persistence.warn.service.not.postInit=Le service '%1$s' n'a pas pu \u00EAtre initialis\u00E9 (service d\u00E9sactiv\u00E9) +topia.persistence.warn.service.not.preInit=Le service '%1$s' n'a pas pu \u00EAtre finalis\u00E9 (service d\u00E9sactiv\u00E9) Property changes on: trunk/topia-persistence/src/main/resources/i18n/topia-persistence_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/topia-service-migration/pom.xml 2010-11-18 16:08:09 UTC (rev 2140) @@ -23,144 +23,161 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>topia</artifactId> - <version>2.4.4-SNAPSHOT</version> - </parent> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>topia</artifactId> + <version>2.4.4-SNAPSHOT</version> + </parent> - <dependencies> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> - <!-- Sibling dependencies --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <!-- Sibling dependencies --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> - <!-- Depencies for test--> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <name>ToPIA :: Service Migration</name> - <description>Hibernate based migration service</description> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <packaging>jar</packaging> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> - <build> + <!-- Depencies for test--> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <resources> + </dependencies> - <!--resource> - <directory>${maven.gen.dir}/java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </resource--> - - <resource> - <directory>${maven.src.dir}/main/resources</directory> - <includes> - <include>**/*.hbm.xml</include> - <include>**/*.properties</include> - </includes> - </resource> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - </resources> + <name>ToPIA :: Service Migration</name> + <description>Hibernate based migration service</description> - <plugins> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!--plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>Migration service generator</id> - <phase>generate-sources</phase> - <configuration> - <templates>org.nuiton.topia.generator.TopiaMetaTransformer</templates> - <fullPackagePath>org.nuiton.topia.migration</fullPackagePath> - <defaultPackage>org.nuiton.topia.migration</defaultPackage> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin--> + <packaging>jar</packaging> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> + <build> - </plugins> - </build> + <resources> + + <!--resource> + <directory>${maven.gen.dir}/java</directory> + <includes> + <include>**/*.hbm.xml</include> + </includes> + </resource--> + + <resource> + <directory>${maven.src.dir}/main/resources</directory> + <includes> + <include>**/*.hbm.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + + </resources> + + <plugins> + + <!--plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>Migration service generator</id> + <phase>generate-sources</phase> + <configuration> + <templates>org.nuiton.topia.generator.TopiaMetaTransformer</templates> + <fullPackagePath>org.nuiton.topia.migration</fullPackagePath> + <defaultPackage>org.nuiton.topia.migration</defaultPackage> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin--> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> </project> Deleted: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-en_GB.properties =================================================================== --- trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-en_GB.properties 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-en_GB.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -1,14 +0,0 @@ -topia.migration.available.versions=Available versions \: %1$s -topia.migration.db.not.versionned=Database version not found, so database schema is considered as V0 -topia.migration.detected.db.version=detected database version \: %1$s -topia.migration.end.sql=Request [%1$-4s/%2$-4s] executed in %3$s. -topia.migration.migrate.versions=Versions to apply \: %1$s -topia.migration.migration.incomplete=Database migration not succesfully ended \! -topia.migration.saving.db.version=Saving new database version \: %1$s -topia.migration.skip.migration.db.is.empty=Database is empty, no migration needed. -topia.migration.skip.migration.db.is.up.to.date=Database is up to date, no migration needed. -topia.migration.skip.migration.no.version.to.apply=No version to apply, no migration needed. -topia.migration.start.migrate=Start migration to version %1$s -topia.migration.start.migration=Starting Topia Migration Service - Application version \: %1$s, Database version \: %2$s -topia.migration.start.sql=Executing request [%1$-4s/%2$-4s] -topia.migration.start.sqls=Will execute %1$s requests... Deleted: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-fr_FR.properties =================================================================== --- trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-fr_FR.properties 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-fr_FR.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -1,14 +0,0 @@ -topia.migration.available.versions=Versions d\u00E9tect\u00E9es \: %1$s -topia.migration.db.not.versionned=La base de donn\u00E9es n'est pas versionn\u00E9e, elle sera consid\u00E9r\u00E9e en version 0. -topia.migration.detected.db.version=Version de base d\u00E9tect\u00E9e \: %1$s -topia.migration.end.sql=Requ\u00EAte [%1$-4s/%2$-4s] ex\u00E9cut\u00E9e en %3$s. -topia.migration.migrate.versions=Mises \u00E0 jour \u00E0 installer \: %1$s -topia.migration.migration.incomplete=La migration de la base s'est mal d\u00E9roul\u00E9e ou a \u00E9t\u00E9 annul\u00E9e\! -topia.migration.saving.db.version=Sauvegarde de la nouvelle version de la base \: %1$s -topia.migration.skip.migration.db.is.empty=La base de donn\u00E9es est vierge, aucune migration n\u00E9cessaire. -topia.migration.skip.migration.db.is.up.to.date=La base est \u00E0 jour, aucune migration n\u00E9cessaire. -topia.migration.skip.migration.no.version.to.apply=Aucune version \u00E0 appliquer, aucune migration n\u00E9cessaire. -topia.migration.start.migrate=D\u00E9marrage de la mise \u00E0 jour vers la version %1$s -topia.migration.start.migration=D\u00E9marrage du service de mise \u00E0 jour - version de l'application \: %1$s, version de la base \: %2$s -topia.migration.start.sql=Execution de la requ\u00EAte [%1$-4s/%2$-4s] -topia.migration.start.sqls=Va executer %1$s requ\u00EAte(s)... Copied: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties (from rev 2139, trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-en_GB.properties) =================================================================== --- trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties (rev 0) +++ trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -0,0 +1,14 @@ +topia.migration.available.versions=Available versions \: %1$s +topia.migration.db.not.versionned=Database version not found, so database schema is considered as V0 +topia.migration.detected.db.version=detected database version \: %1$s +topia.migration.end.sql=Request [%1$-4s/%2$-4s] executed in %3$s. +topia.migration.migrate.versions=Versions to apply \: %1$s +topia.migration.migration.incomplete=Database migration not succesfully ended \! +topia.migration.saving.db.version=Saving new database version \: %1$s +topia.migration.skip.migration.db.is.empty=Database is empty, no migration needed. +topia.migration.skip.migration.db.is.up.to.date=Database is up to date, no migration needed. +topia.migration.skip.migration.no.version.to.apply=No version to apply, no migration needed. +topia.migration.start.migrate=Start migration to version %1$s +topia.migration.start.migration=Starting Topia Migration Service - Application version \: %1$s, Database version \: %2$s +topia.migration.start.sql=Executing request [%1$-4s/%2$-4s] +topia.migration.start.sqls=Will execute %1$s requests... Property changes on: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Copied: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties (from rev 2139, trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-fr_FR.properties) =================================================================== --- trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties (rev 0) +++ trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -0,0 +1,14 @@ +topia.migration.available.versions=Versions d\u00E9tect\u00E9es \: %1$s +topia.migration.db.not.versionned=La base de donn\u00E9es n'est pas versionn\u00E9e, elle sera consid\u00E9r\u00E9e en version 0. +topia.migration.detected.db.version=Version de base d\u00E9tect\u00E9e \: %1$s +topia.migration.end.sql=Requ\u00EAte [%1$-4s/%2$-4s] ex\u00E9cut\u00E9e en %3$s. +topia.migration.migrate.versions=Mises \u00E0 jour \u00E0 installer \: %1$s +topia.migration.migration.incomplete=La migration de la base s'est mal d\u00E9roul\u00E9e ou a \u00E9t\u00E9 annul\u00E9e\! +topia.migration.saving.db.version=Sauvegarde de la nouvelle version de la base \: %1$s +topia.migration.skip.migration.db.is.empty=La base de donn\u00E9es est vierge, aucune migration n\u00E9cessaire. +topia.migration.skip.migration.db.is.up.to.date=La base est \u00E0 jour, aucune migration n\u00E9cessaire. +topia.migration.skip.migration.no.version.to.apply=Aucune version \u00E0 appliquer, aucune migration n\u00E9cessaire. +topia.migration.start.migrate=D\u00E9marrage de la mise \u00E0 jour vers la version %1$s +topia.migration.start.migration=D\u00E9marrage du service de mise \u00E0 jour - version de l'application \: %1$s, version de la base \: %2$s +topia.migration.start.sql=Execution de la requ\u00EAte [%1$-4s/%2$-4s] +topia.migration.start.sqls=Va executer %1$s requ\u00EAte(s)... Property changes on: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/topia-service-replication/pom.xml 2010-11-18 16:08:09 UTC (rev 2140) @@ -23,192 +23,206 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>topia</artifactId> - <version>2.4.4-SNAPSHOT</version> - </parent> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-replication</artifactId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>topia</artifactId> + <version>2.4.4-SNAPSHOT</version> + </parent> - <dependencies> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-replication</artifactId> - <!-- Sibling dependencies --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependencies> + <!-- Sibling dependencies --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <!-- Depencies for test--> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <name>ToPIA :: Service Replication</name> - <description>Hibernate based replication service</description> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <packaging>jar</packaging> + <!-- Depencies for test--> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> - <build> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <!-- on expose le classifier test pour pouvoir reutiliser la - base de test . + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <scope>test</scope> + </dependency> - Dans le module qui veut utiliser ces tests, ecrire : + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-service-replication</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - --> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + </dependencies> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <profiles> - <!-- perform only on a release stage when using the maven-release-plugin --> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <build> - <plugins> + <name>ToPIA :: Service Replication</name> + <description>Hibernate based replication service</description> - <!-- always compute tests source jar --> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-test-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!-- always compute tests source jar --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-test-javadoc</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> + <packaging>jar</packaging> - </plugins> - </build> - </profile> + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> - <!-- reporting at release time --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <plugin> + <!-- on expose le classifier test pour pouvoir reutiliser la + base de test . - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.2</version> - </plugin> - </plugins> - </reporting> + Dans le module qui veut utiliser ces tests, ecrire : - </profile> - </profiles> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-service-replication</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + --> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + <profiles> + <!-- perform only on a release stage when using the maven-release-plugin --> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + + <!-- always compute tests source jar --> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-test-sources</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- always compute tests source jar --> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-test-javadoc</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + <!-- reporting at release time --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.4</version> + </plugin> + </plugins> + </reporting> + + </profile> + </profiles> + </project> Deleted: trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication-en_GB.properties =================================================================== --- trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication-en_GB.properties 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication-en_GB.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -1,5 +0,0 @@ -topia.replication.attachAssociation.nothing.to.do=Nothing to attach... -topia.replication.error.operation.loadLink.illegalSource=The source node of loading association requires the node %1$s, but was %2$s. -topia.replication.error.operation.uncreatable=The operation %1$s is internal and can not be added using the api. -topia.replication.error.unkown.operation=The operation %1$s is unknown, known operations are \: %2$s -topia.replication.error.unkown.owner.node=The target node (of type %1$s) for operation %2$s is unknown, known nodes are \: %3$s Deleted: trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication-fr_FR.properties =================================================================== --- trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication-fr_FR.properties 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication-fr_FR.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -1,5 +0,0 @@ -topia.replication.attachAssociation.nothing.to.do=Rien a attacher... -topia.replication.error.operation.loadLink.illegalSource=Le noeud source de l'op\u00E9ration de chargement d'association attendait un noeud %1$s mais a trouv\u00E9 le noeud %2$s. -topia.replication.error.operation.uncreatable=L'operation %1$s est interne et ne peut pas \u00EAtre cr\u00E9\u00E9e par l'api d'ajout d'op\u00E9ration. -topia.replication.error.unkown.operation=L'op\u00E9ration %1$s est inconnue, op\u00E9rations connues \: %2$s -topia.replication.error.unkown.owner.node=Le noeud de rattachement (de type %1$s) pour l'op\u00E9ration %2$s n'a pas \u00E9t\u00E9 trouv\u00E9, noeuds connus \: %3$s Copied: trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_en_GB.properties (from rev 2139, trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication-en_GB.properties) =================================================================== --- trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_en_GB.properties (rev 0) +++ trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_en_GB.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -0,0 +1,5 @@ +topia.replication.attachAssociation.nothing.to.do=Nothing to attach... +topia.replication.error.operation.loadLink.illegalSource=The source node of loading association requires the node %1$s, but was %2$s. +topia.replication.error.operation.uncreatable=The operation %1$s is internal and can not be added using the api. +topia.replication.error.unkown.operation=The operation %1$s is unknown, known operations are \: %2$s +topia.replication.error.unkown.owner.node=The target node (of type %1$s) for operation %2$s is unknown, known nodes are \: %3$s Property changes on: trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_en_GB.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Copied: trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_fr_FR.properties (from rev 2139, trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication-fr_FR.properties) =================================================================== --- trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_fr_FR.properties (rev 0) +++ trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_fr_FR.properties 2010-11-18 16:08:09 UTC (rev 2140) @@ -0,0 +1,5 @@ +topia.replication.attachAssociation.nothing.to.do=Rien a attacher... +topia.replication.error.operation.loadLink.illegalSource=Le noeud source de l'op\u00E9ration de chargement d'association attendait un noeud %1$s mais a trouv\u00E9 le noeud %2$s. +topia.replication.error.operation.uncreatable=L'operation %1$s est interne et ne peut pas \u00EAtre cr\u00E9\u00E9e par l'api d'ajout d'op\u00E9ration. +topia.replication.error.unkown.operation=L'op\u00E9ration %1$s est inconnue, op\u00E9rations connues \: %2$s +topia.replication.error.unkown.owner.node=Le noeud de rattachement (de type %1$s) pour l'op\u00E9ration %2$s n'a pas \u00E9t\u00E9 trouv\u00E9, noeuds connus \: %3$s Property changes on: trunk/topia-service-replication/src/main/resources/i18n/topia-service-replication_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-11-18 14:31:50 UTC (rev 2139) +++ trunk/topia-service-security/pom.xml 2010-11-18 16:08:09 UTC (rev 2140) @@ -24,135 +24,146 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>topia</artifactId> - <version>2.4.4-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>topia</artifactId> + <version>2.4.4-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-security</artifactId> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-security</artifactId> - <dependencies> + <dependencies> - <!-- Sibling dependencies --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - </dependency> + <!-- Sibling dependencies --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <classifier>tests</classifier> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <!-- Depencies for test--> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <name>ToPIA :: Service Security</name> - <description>Hibernate based security service</description> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + + <!-- Depencies for test--> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + </dependencies> - <packaging>jar</packaging> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <build> + <name>ToPIA :: Service Security</name> + <description>Hibernate based security service</description> - <resources> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <resource> - <directory>${maven.gen.dir}/java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </resource> + <packaging>jar</packaging> - </resources> + <build> - <plugins> + <resources> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <configuration> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.topia.generator.EntityTransformer - </templates> - <excludeTemplates> - <excludeTemplate>org.nuiton.topia.generator.EntityAbstractTransformer</excludeTemplate> - <excludeTemplate>org.nuiton.topia.generator.EntityImplTransformer</excludeTemplate> - <excludeTemplate>org.nuiton.topia.generator.EntityInterfaceTransformer</excludeTemplate> - </excludeTemplates> - <defaultPackage>org.nuiton.topia</defaultPackage> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - - <!--<includes>**/*.objectmodel</includes>--> - <!--<copyVersionDir>${maven.src.dir}/main/resources/oldmappings/%MODELNAME%</copyVersionDir>--> - <!--<copyVersionFiles>**/*.hbm.xml</copyVersionFiles>--> - <overwrite>true</overwrite> - </configuration> - <goals> - <goal>smart-generate</goal> - <!--<goal>copyVersionFiles</goal>--> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>topia-persistence</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin> + <resource> + <directory>${maven.gen.dir}/java</directory> + <includes> + <include>**/*.hbm.xml</include> + </includes> + </resource> - </plugins> - </build> + </resources> + <plugins> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>generate-sources</id> + <phase>generate-sources</phase> + <configuration> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer + </templates> + <defaultPackage>org.nuiton.topia</defaultPackage> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + + <!--<includes>**/*.objectmodel</includes>--> + <!--<copyVersionDir>${maven.src.dir}/main/resources/oldmappings/%MODELNAME%</copyVersionDir>--> + <!--<copyVersionFiles>**/*.hbm.xml</copyVersionFiles>--> + <overwrite>true</overwrite> + </configuration> + <goals> + <goal>smart-generate</goal> + <!--<goal>copyVersionFiles</goal>--> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + + </plugins> + </build> + </project>