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

r2141 - in trunk: . src topia-persistence/src/test/java/org/nuiton/topiatest/persistence topia-persistence/src/test/resources topia-persistence/src/test/xmi topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings topia-service-migration/src/test/resources topia-service-replication/src/site/resources topia-service-replication/src/test/resources topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization topia
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 17:14:47 +0100 (Thu, 18 Nov 2010) New Revision: 2141 Url: http://nuiton.org/repositories/revision/topia/2141 Log: Evolution #1069: Use new maven-license-plugin mecanism to update file headers Removed: trunk/src/license/ Modified: trunk/pom.xml trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties trunk/topia-persistence/src/test/resources/log4j.properties trunk/topia-persistence/src/test/xmi/topiatest.properties trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml trunk/topia-service-migration/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml trunk/topia-service-replication/src/site/resources/dependencies.html trunk/topia-service-replication/src/site/resources/dependency-management.html trunk/topia-service-replication/src/test/resources/log4j.properties trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml trunk/topia-service-security/src/main/xmi/TopiaSecurity.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/pom.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -392,6 +392,23 @@ </dependencies> </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <configuration> +  + <excludes> + <exclude>**/i18n/*.properties</exclude> + <exclude>**/THIRD-PARTY.properties</exclude> + </excludes> + <extraExtensions> + <objectmodel>xml</objectmodel> + <xsl>xml</xsl> + <xsd>xml</xsd> + </extraExtensions> + </configuration> + </plugin> + </plugins> </pluginManagement> Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/persistence/Entity1Impl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topiatest"> <class name="org.nuiton.topiatest.persistence.Entity1Impl" table="entity1" node="org.nuiton.topiatest.persistence.Entity1Impl" abstract="false" proxy="org.nuiton.topiatest.persistence.Entity1" > Modified: trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties =================================================================== --- trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-persistence/src/test/resources/TopiaContextImpl.properties 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,3 +1,27 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 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% +### # Proprietes par defaut pour une base de donnees de type H2 hibernate.hbm2ddl.auto=update hibernate.show_sql=false Modified: trunk/topia-persistence/src/test/resources/log4j.properties =================================================================== --- trunk/topia-persistence/src/test/resources/log4j.properties 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-persistence/src/test/resources/log4j.properties 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,3 +1,27 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 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% +### #\u00a0This log is used to display trace in generation # Global logging configuration Modified: trunk/topia-persistence/src/test/xmi/topiatest.properties =================================================================== --- trunk/topia-persistence/src/test/xmi/topiatest.properties 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-persistence/src/test/xmi/topiatest.properties 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,3 +1,27 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 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% +### model.tagvalue.i18n=topia.test.common. model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.useLegacyDAO=true Modified: trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml =================================================================== --- trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-migration/src/main/resources/org/nuiton/topia/migration/mappings/TMSVersion.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping> <class name="org.nuiton.topia.migration.mappings.TMSVersion" table="tms_version"> Modified: trunk/topia-service-migration/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml =================================================================== --- trunk/topia-service-migration/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-migration/src/test/resources/ConfigurationAdapterTest-hibernate.cfg.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version='1.0' encoding='utf-8'?> + + <!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> Modified: trunk/topia-service-replication/src/site/resources/dependencies.html =================================================================== --- trunk/topia-service-replication/src/site/resources/dependencies.html 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-replication/src/site/resources/dependencies.html 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,3 +1,27 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> Modified: trunk/topia-service-replication/src/site/resources/dependency-management.html =================================================================== --- trunk/topia-service-replication/src/site/resources/dependency-management.html 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-replication/src/site/resources/dependency-management.html 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,3 +1,27 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> Modified: trunk/topia-service-replication/src/test/resources/log4j.properties =================================================================== --- trunk/topia-service-replication/src/test/resources/log4j.properties 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-replication/src/test/resources/log4j.properties 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,3 +1,27 @@ +### +# #%L +# ToPIA :: Service Replication +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 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% +### #\u00A0This log is used to display trace in generation # Global logging configuration Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.authorization"> <union-subclass name="org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" extends="org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAssociationAuthorization" node="org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" abstract="false" proxy="org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.authorization"> <class name="org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAuthorization" node="org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl" abstract="true" proxy="org.codelutin.topia.security.entities.authorization.TopiaAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.authorization"> <union-subclass name="org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" extends="org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaEntityAuthorization" node="org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" abstract="false" proxy="org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.authorization"> <class name="org.codelutin.topia.security.entities.authorization.TopiaExpressionLinkImpl" table="topiaExpressionLink" node="org.codelutin.topia.security.entities.authorization.TopiaExpressionLinkImpl" abstract="false" proxy="org.codelutin.topia.security.entities.authorization.TopiaExpressionLink" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.user"> <class name="org.codelutin.topia.security.entities.user.TopiaGroupImpl" table="topiaGroup" node="org.codelutin.topia.security.entities.user.TopiaGroupImpl" abstract="false" proxy="org.codelutin.topia.security.entities.user.TopiaGroup" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.user"> <class name="org.codelutin.topia.security.entities.user.TopiaUserImpl" table="topiaUser" node="org.codelutin.topia.security.entities.user.TopiaUserImpl" abstract="false" proxy="org.codelutin.topia.security.entities.user.TopiaUser" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.taas.entities"> <class name="org.codelutin.topia.taas.entities.TaasAuthorizationImpl" table="taasAuthorization" node="org.codelutin.topia.taas.entities.TaasAuthorizationImpl" abstract="false" proxy="org.codelutin.topia.taas.entities.TaasAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.taas.entities"> <class name="org.codelutin.topia.taas.entities.TaasPrincipalImpl" table="taasPrincipal" node="org.codelutin.topia.taas.entities.TaasPrincipalImpl" abstract="false" proxy="org.codelutin.topia.taas.entities.TaasPrincipal" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.taas.entities"> <class name="org.codelutin.topia.taas.entities.TaasUserImpl" table="taasUser" node="org.codelutin.topia.taas.entities.TaasUserImpl" abstract="false" proxy="org.codelutin.topia.taas.entities.TaasUser" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> <union-subclass name="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" extends="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAssociationAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> <class name="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" abstract="true" proxy="org.nuiton.topia.security.entities.authorization.TopiaAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> <union-subclass name="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" extends="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaEntityAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> <class name="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" table="topiaExpressionLink" node="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaExpressionLink" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.user"> <class name="org.nuiton.topia.security.entities.user.TopiaGroupImpl" table="topiaGroup" node="org.nuiton.topia.security.entities.user.TopiaGroupImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaGroup" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.user"> <class name="org.nuiton.topia.security.entities.user.TopiaUserImpl" table="topiaUser" node="org.nuiton.topia.security.entities.user.TopiaUserImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaUser" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> <class name="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" table="taasAuthorization" node="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> <class name="org.nuiton.topia.taas.entities.TaasPrincipalImpl" table="taasPrincipal" node="org.nuiton.topia.taas.entities.TaasPrincipalImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasPrincipal" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> <class name="org.nuiton.topia.taas.entities.TaasUserImpl" table="taasUser" node="org.nuiton.topia.taas.entities.TaasUserImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasUser" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> <union-subclass name="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" extends="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAssociationAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaAssociationAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> <class name="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" abstract="true" proxy="org.nuiton.topia.security.entities.authorization.TopiaAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> <union-subclass name="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" extends="org.nuiton.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaEntityAuthorization" node="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaEntityAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.authorization"> <class name="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" table="topiaExpressionLink" node="org.nuiton.topia.security.entities.authorization.TopiaExpressionLinkImpl" abstract="false" proxy="org.nuiton.topia.security.entities.authorization.TopiaExpressionLink" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.user"> <class name="org.nuiton.topia.security.entities.user.TopiaGroupImpl" table="topiaGroup" node="org.nuiton.topia.security.entities.user.TopiaGroupImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaGroup" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/security/entities/user/TopiaUserImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.security.entities.user"> <class name="org.nuiton.topia.security.entities.user.TopiaUserImpl" table="topiaUser" node="org.nuiton.topia.security.entities.user.TopiaUserImpl" abstract="false" proxy="org.nuiton.topia.security.entities.user.TopiaUser" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> <class name="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" table="taasAuthorization" node="org.nuiton.topia.taas.entities.TaasAuthorizationImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasAuthorization" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> <class name="org.nuiton.topia.taas.entities.TaasPrincipalImpl" table="taasPrincipal" node="org.nuiton.topia.taas.entities.TaasPrincipalImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasPrincipal" > Modified: trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml =================================================================== --- trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/resources/oldmappings/TopiaSecurity/1.1/org/nuiton/topia/taas/entities/TaasUserImpl.hbm.xml 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.taas.entities"> <class name="org.nuiton.topia.taas.entities.TaasUserImpl" table="taasUser" node="org.nuiton.topia.taas.entities.TaasUserImpl" abstract="false" proxy="org.nuiton.topia.taas.entities.TaasUser" > Modified: trunk/topia-service-security/src/main/xmi/TopiaSecurity.properties =================================================================== --- trunk/topia-service-security/src/main/xmi/TopiaSecurity.properties 2010-11-18 16:08:09 UTC (rev 2140) +++ trunk/topia-service-security/src/main/xmi/TopiaSecurity.properties 2010-11-18 16:14:47 UTC (rev 2141) @@ -1,2 +1,26 @@ +### +# #%L +# ToPIA :: Service Security +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2010 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% +### model.tagvalue.java.lang.String=text model.tagvalue.java.util.Set=serializable

1 0

r2140 - in trunk: . topia-persistence topia-persistence/src/main/resources/i18n topia-service-migration topia-service-migration/src/main/resources/i18n topia-service-replication topia-service-replication/src/main/resources/i18n topia-service-security
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

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>org.hibernate</groupId> @@ -112,6 +111,12 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> +  <dependency> <groupId>org.slf4j</groupId> @@ -128,12 +133,12 @@ <scope>test</scope> </dependency> - <dependency> +   <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"> -  -  -  + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>topia</artifactId> - <version>2.4.4-SNAPSHOT</version> - </parent> +  +  +  - <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> -  - <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> -  -  -  + <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> -  -  -  + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> - <packaging>jar</packaging> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> - <build> +  + <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> +  +  +  - </testResources> + <name>ToPIA :: Persistence</name> + <description>Hibernate based persistence module</description> - <plugins> +  +  +  - <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> -  -  - <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> -  - <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> -  - <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> +  +  + <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> -  -  -  - <profiles> +  + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <executions> + <execution> + <goals> + <goal>generate-metadata</goal> + </goals> + </execution> + </executions> + </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> -  - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-test-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> -  - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-test-javadoc</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> +  - <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> -  - </pomIncludes> - <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> - <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> -  - </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> +  +  +  + <profiles> +  + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + +  + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-test-sources</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <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> + +  + <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> +  + </pomIncludes> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${basedir}/target/local-repo + </localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> +  + </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"> -  -  -  + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>topia</artifactId> - <version>2.4.4-SNAPSHOT</version> - </parent> +  +  +  - <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> -  - <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> +  + <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> -  - <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> -  -  -  + <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> -  -  -  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <packaging>jar</packaging> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> - <build> +  + <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.src.dir}/main/resources</directory> - <includes> - <include>**/*.hbm.xml</include> - <include>**/*.properties</include> - </includes> - </resource> +  +  +  - </resources> + <name>ToPIA :: Service Migration</name> + <description>Hibernate based migration service</description> - <plugins> +  +  +  -  + <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.src.dir}/main/resources</directory> + <includes> + <include>**/*.hbm.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + + </resources> + + <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> + + </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"> -  -  -  + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>topia</artifactId> - <version>2.4.4-SNAPSHOT</version> - </parent> +  +  +  - <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> -  - <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> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> -  - <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> -  -  -  + <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> -  -  -  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <packaging>jar</packaging> +  + <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> -  - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + </dependencies> -  -  -  - <profiles> -  - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> +  +  +  - <build> - <plugins> + <name>ToPIA :: Service Replication</name> + <description>Hibernate based replication service</description> -  - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-test-sources</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> +  +  +  -  - <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> -  - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <plugin> +  + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +  +  +  + <profiles> +  + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + +  + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-test-sources</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <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> + +  + <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> -  -  -  +  +  +  - <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> -  - <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> + </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> -  - <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> -  -  -  + <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> + +  + <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> - <packaging>jar</packaging> +  +  +  - <build> + <name>ToPIA :: Service Security</name> + <description>Hibernate based security service</description> - <resources> +  +  +  - <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> - -  -  -  - <overwrite>true</overwrite> - </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> + <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> + +  +  +  + <overwrite>true</overwrite> + </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> + + </plugins> + </build> + </project>

1 0

r2139 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 15:31:50 +0100 (Thu, 18 Nov 2010) New Revision: 2139 Url: http://nuiton.org/repositories/revision/topia/2139 Log: Evolution #1064: Use Eugene api to generate i18n Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java 2010-11-18 14:31:34 UTC (rev 2138) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractTransformer.java 2010-11-18 14:31:50 UTC (rev 2139) @@ -30,6 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.*; import org.nuiton.topia.TopiaException; @@ -178,9 +179,7 @@ // type = TopiaGeneratorUtil.getSimpleName(attr.getType()); } else { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - //TODO THIMEL : Je pense que les - // GeneratorUtil.toLowerCaseFirstLetter sont inutiles - // ici, ou alors il faudrait le faire partout + //TODO THIMEL : Je pense que les GeneratorUtil.toLowerCaseFirstLetter sont inutiles ici, ou alors il faudrait le faire partout name = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); type = attr.getAssociationClass().getQualifiedName(); // type = TopiaGeneratorUtil.getSimpleName(attr.getAssociationClass().getQualifiedName()); @@ -222,7 +221,7 @@ if (attr.hasTagValue(TAG_ANNOTATION)) { String annotation = attr.getTagValue(TAG_ANNOTATION); //FIXME Make annotation works... - //TODO tchemit 20100513 Test it still works + //TODO tchemit 20100513 Test if it still works addAnnotation(result, attr2, annotation); } } @@ -295,10 +294,10 @@ generateToStringMethod(result, clazz); } - String i18nPrefix = TopiaGeneratorUtil.getI18nPrefix(clazz, model); + String i18nPrefix = JavaGeneratorUtil.getI18nPrefix(clazz, model); if (!StringUtils.isEmpty(i18nPrefix)) { // generate i18n prefix - generateI18n(result, i18nPrefix, clazz); + generateI18nBlock(clazz, result, i18nPrefix); } } @@ -1233,7 +1232,13 @@ } } - private void generateI18n(ObjectModelClass result, String i18nPrefix, + /** + * + * @deprecated since 2.4.4, use the metohd {@link ObjectModelTransformerToJava#generateI18nBlock(ObjectModelClassifier, ObjectModelClassifier, String)} + */ + @Deprecated + private void enerateI18n(ObjectModelClass result, + String i18nPrefix, ObjectModelClass clazz) { StringBuilder buffer = new StringBuilder(300); @@ -1250,7 +1255,12 @@ setOperationBody(op, buffer.toString()); } - private void addI18n(StringBuilder buffer, String i18nPrefix, + /** + * + * @deprecated since 2.4.4, use the metohd {@link ObjectModelTransformerToJava#addI18n(StringBuilder, String, String)} + */ + @Deprecated + protected void addI18n(StringBuilder buffer, String i18nPrefix, String suffix) { buffer.append("\n org.nuiton.i18n.I18n.n_(\""); buffer.append(i18nPrefix); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-11-18 14:31:34 UTC (rev 2138) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-11-18 14:31:50 UTC (rev 2139) @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -45,7 +46,6 @@ import org.nuiton.topia.persistence.TopiaEntityAbstract; import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import java.beans.Introspector; import java.net.URL; import java.util.ArrayList; import java.util.Collection; @@ -134,9 +134,9 @@ createEntityAbstractClass(input); // Generate i18n block - String i18nPrefix = TopiaGeneratorUtil.getI18nPrefix(input, model); + String i18nPrefix = JavaGeneratorUtil.getI18nPrefix(input, model); if (!StringUtils.isEmpty(i18nPrefix)) { - generateI18nBlock(input, i18nPrefix); + generateI18nBlock(input, outputAbstract, i18nPrefix); } // Create accept operation, will be updated during property generation @@ -1362,28 +1362,40 @@ setOperationBody(operation, body.length() == 0 ? " " : body.toString()); } + /** + * + * @deprecated since 2.4.4, use the + * {@link ObjectModelTransformerToJava#generateI18nBlock(ObjectModelClassifier, ObjectModelClassifier, String)} + */ + @Deprecated protected void generateI18nBlock(ObjectModelClass input, String i18nPrefix) { - - ObjectModelOperation block = - addBlock(outputAbstract, ObjectModelModifier.STATIC); - - StringBuilder buffer = new StringBuilder(300); - addI18n(buffer, i18nPrefix, Introspector.decapitalize(input.getName())); - for (ObjectModelAttribute attr : input.getAttributes()) { - //TC-20100225 only treate navigable relations - if (attr.isNavigable()) { - addI18n(buffer, i18nPrefix, Introspector.decapitalize(attr.getName())); - } - } - setOperationBody(block, buffer.toString()); + generateI18nBlock(input,outputAbstract,i18nPrefix); +// ObjectModelOperation block = +// addBlock(outputAbstract, ObjectModelModifier.STATIC); +// +// StringBuilder buffer = new StringBuilder(300); +// addI18n(buffer, i18nPrefix, Introspector.decapitalize(input.getName())); +// for (ObjectModelAttribute attr : input.getAttributes()) { +// //TC-20100225 only treate navigable relations +// if (attr.isNavigable()) { +// addI18n(buffer, i18nPrefix, Introspector.decapitalize(attr.getName())); +// } +// } +// setOperationBody(block, buffer.toString()); } + /** + * + * @deprecated since 2.4.4, use the {@link ObjectModelTransformerToJava#addI18n(StringBuilder, String, String)} + */ + @Deprecated protected void addI18n(StringBuilder buffer, String i18nPrefix, String suffix) { - buffer.append("\n org.nuiton.i18n.I18n.n_(\""); - buffer.append(i18nPrefix); - buffer.append(suffix); - buffer.append("\");"); + super.addI18n(buffer,i18nPrefix,suffix); +// buffer.append("\n org.nuiton.i18n.I18n.n_(\""); +// buffer.append(i18nPrefix); +// buffer.append(suffix); +// buffer.append("\");"); } // ------------------------------------------------------------------------- Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-11-18 14:31:34 UTC (rev 2138) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-11-18 14:31:50 UTC (rev 2139) @@ -390,10 +390,13 @@ * @param element l'élément à tester * @param model le modele utilisé * @return le prefix i18n ou <code>null</code> si non spécifié + * @deprecated since 2.4.4, prefer use the {@link JavaGeneratorUtil#getI18nPrefix(ObjectModelElement, ObjectModel)} */ + @Deprecated public static String getI18nPrefix(ObjectModelElement element, ObjectModel model) { - return GeneratorUtil.findTagValue(TAG_I18N_PREFIX, element, model); + return JavaGeneratorUtil.getI18nPrefix(element, model); +// return GeneratorUtil.findTagValue(TAG_I18N_PREFIX, element, model); } /**

1 0

r2138 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 18 Nov '10

18 Nov '10

Author: tchemit Date: 2010-11-18 15:31:34 +0100 (Thu, 18 Nov 2010) New Revision: 2138 Url: http://nuiton.org/repositories/revision/topia/2138 Log: remove unecessary this. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-11-17 10:39:54 UTC (rev 2137) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-11-18 14:31:34 UTC (rev 2138) @@ -872,7 +872,7 @@ // on se desenregistre du context pere et on ferme les connexions si // on est pas le root context - if (!this.equals(getRootContext())) { + if (!equals(getRootContext())) { closed = true; hibernate.close(); getParentContext().removeChildContext(this);

1 0

r2137 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 17 Nov '10

17 Nov '10

Author: tchemit Date: 2010-11-17 11:39:54 +0100 (Wed, 17 Nov 2010) New Revision: 2137 Url: http://nuiton.org/repositories/revision/topia/2137 Log: use human variable names, please avoid abbreviate stuffs only understable from 85 guys... Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-17 07:01:36 UTC (rev 2136) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-17 10:39:54 UTC (rev 2137) @@ -440,7 +440,7 @@ String opName = StringUtils.capitalize(source.getName()); // Abstract operation to execute method content - ObjectModelOperation abstOp = + ObjectModelOperation executeOperation = addOperation(serviceAbstract, "execute" + opName, source.getReturnType(), ObjectModelModifier.ABSTRACT, @@ -448,23 +448,22 @@ // Throw all exception from abstract method // They will be catched by interface method to use treateError - addException(abstOp, Exception.class); + addException(executeOperation, Exception.class); if (needTransaction && isTransactionNeeded(source)) { - addParameter(abstOp, TopiaContext.class, "transaction"); + addParameter(executeOperation, TopiaContext.class, "transaction"); } if (isErrorArgsNeeded(source)) { // Add errorArgs to abstract operation - addParameter(abstOp, - "java.util.List<Object>", "errorArgs"); + addParameter(executeOperation, "java.util.List<Object>", "errorArgs"); } // Copy other operation parameters for (ObjectModelParameter param : source.getParameters()) { - addParameter(abstOp, param.getType(), param.getName()); + addParameter(executeOperation, param.getType(), param.getName()); } - return abstOp; + return executeOperation; } /**

1 0

r2136 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 17 Nov '10

17 Nov '10

Author: tchemit Date: 2010-11-17 08:01:36 +0100 (Wed, 17 Nov 2010) New Revision: 2136 Url: http://nuiton.org/repositories/revision/topia/2136 Log: Evolution #1052: Improve ServiceTransformer code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-16 15:38:19 UTC (rev 2135) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-17 07:01:36 UTC (rev 2136) @@ -27,7 +27,10 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; +import java.util.TreeMap; + import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; @@ -266,46 +269,33 @@ return serviceContract; } - /** - * Create the service abstract for {@code serviceContract} - * using {@code source} interface defined - * in model. - * - * @param source interface from model - * @param serviceContract to implement - * @param needTransaction flag to know if service globally use transaction - */ - protected void createServiceAbstract(ObjectModelInterface source, + protected void createBeginTransactionMethod(ObjectModelInterface source, ObjectModelInterface serviceContract, - boolean needTransaction) { - - ObjectModelClass serviceAbstract = createAbstractClass( - getServiceAbstractClassName(serviceContract.getName()), - serviceContract.getPackageName()); - - // Implements contract interface - addInterface(serviceAbstract, serviceContract.getQualifiedName()); - - // Add Logger attribute - addAttribute(serviceAbstract, "log", - Log.class, - "LogFactory.getLog(" + source.getName() + ".class)", - ObjectModelModifier.PRIVATE, - ObjectModelModifier.STATIC, - ObjectModelModifier.FINAL); - - addImport(serviceAbstract, Log.class); - addImport(serviceAbstract, LogFactory.class); - - // Create abstract methods - if (needTransaction) { - ObjectModelOperation beginTransaction = + ObjectModelClass serviceAbstract) { + ObjectModelOperation beginTransaction = addOperation(serviceAbstract, OP_NAME_BEGIN_TRANSACTION, TopiaContext.class, ObjectModelModifier.ABSTRACT, ObjectModelModifier.PROTECTED); addException(beginTransaction, TopiaException.class); - } + } + + protected void createCloseTransactionMethod(ObjectModelInterface source, + ObjectModelInterface serviceContract, + ObjectModelClass serviceAbstract) { + ObjectModelOperation closeTransaction = + addOperation(serviceAbstract, OP_NAME_CLOSE_TRANSACTION, "void", + ObjectModelModifier.ABSTRACT, + ObjectModelModifier.PROTECTED); + addParameter(closeTransaction, TopiaContext.class, "transaction"); + addException(closeTransaction, TopiaException.class); + } + + protected void createTreateErrorMethod(ObjectModelInterface source, + ObjectModelInterface serviceContract, + ObjectModelClass serviceAbstract, + boolean needTransaction) { + ObjectModelOperation treateError1 = addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", ObjectModelModifier.ABSTRACT, @@ -321,29 +311,6 @@ } if (needTransaction) { - ObjectModelOperation closeTransaction = - addOperation(serviceAbstract, OP_NAME_CLOSE_TRANSACTION, "void", - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.PROTECTED); - addParameter(closeTransaction, TopiaContext.class, "transaction"); - addException(closeTransaction, TopiaException.class); - } - // Create abstract execute methods - Map<String, ObjectModelOperation> abstOps = - new HashMap<String, ObjectModelOperation>(); - - // Use source interfacez to have tagvalues from model - for (ObjectModelOperation op : source.getOperations()) { - ObjectModelOperation abstOp = createOperationExecuteAbstract( - serviceAbstract, - op, - needTransaction - ); - // Keep abstract methods to use them in operationImplementation - // generation - abstOps.put(getAbstractOperationKeyMap(op), abstOp); - } - if (needTransaction) { ObjectModelOperation treateError2 = addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", ObjectModelModifier.PROTECTED); @@ -360,6 +327,24 @@ }*/ ); } + } + /** + * Create the service abstract for {@code serviceContract} + * using {@code source} interface defined + * in model. + * + * @param source interface from model + * @param serviceContract to implement + * @param needTransaction flag to know if service globally use transaction + */ + protected void createServiceAbstract(ObjectModelInterface source, + ObjectModelInterface serviceContract, + boolean needTransaction) { + + ObjectModelClass serviceAbstract = createAbstractClass( + getServiceAbstractClassName(serviceContract.getName()), + serviceContract.getPackageName()); + // Imports for implementations if (needTransaction) { addImport(serviceAbstract, TopiaContext.class); @@ -367,13 +352,66 @@ addImport(serviceAbstract, I18n.class); addImport(serviceAbstract, ArrayList.class); addImport(serviceAbstract, DurationFormatUtils.class); + + // Implements contract interface + addInterface(serviceAbstract, serviceContract.getQualifiedName()); - // Create abstract execute methods - for (ObjectModelOperation op : source.getOperations()) { + // Add Logger attribute + addAttribute(serviceAbstract, "log", + Log.class, + "LogFactory.getLog(" + source.getName() + ".class)", + ObjectModelModifier.PRIVATE, + ObjectModelModifier.STATIC, + ObjectModelModifier.FINAL); + + addImport(serviceAbstract, Log.class); + addImport(serviceAbstract, LogFactory.class); + + // Create abstract methods + + if (needTransaction) { + createBeginTransactionMethod(source, + serviceContract, + serviceAbstract); + + createCloseTransactionMethod(source, + serviceContract, + serviceAbstract); + } + + createTreateErrorMethod(source, + serviceContract, + serviceAbstract, + needTransaction + ); + + // keep execute methods (we want to generate them at the top of the + // class since they are all abstract) + // Note: using a LinkedHashMap permits to keep incoming order + Map<ObjectModelOperation, ObjectModelOperation> abstractExecuteMethods = + new LinkedHashMap<ObjectModelOperation, ObjectModelOperation>(); + + // first generate the abstract execute methods + for (ObjectModelOperation operation : source.getOperations()) { + + ObjectModelOperation executeOp = createOperationExecuteAbstract( + serviceAbstract, + operation, + needTransaction + ); + + abstractExecuteMethods.put(operation , executeOp); + } + + // Then generates the real operation which boxes the execute methods + for (Map.Entry<ObjectModelOperation, ObjectModelOperation> entry : + abstractExecuteMethods.entrySet()) { + ObjectModelOperation operation = entry.getKey(); + ObjectModelOperation executeOperation = entry.getValue(); createOperationImplementation( serviceAbstract, - abstOps.get(getAbstractOperationKeyMap(op)), - op, + executeOperation, + operation, source.getName(), needTransaction ); @@ -381,19 +419,6 @@ } /** - * Create a key for the abstractOperations map from {@code op}. Concat - * opName + params as String. - * - * @param op used as reference to construct the keyMap - * @return the keyMap - */ - protected String getAbstractOperationKeyMap(ObjectModelOperation op) { - String key = op.getName() + - GeneratorUtil.getOperationParametersListName(op); - return key; - } - - /** * Create an operation abstract to execute in contract implementation. * You can use tagvalues "errorArgs" (default = false) and "transaction" * (default = true) to generate appropriate parameters. This abstract

1 0

r2135 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 16 Nov '10

16 Nov '10

Author: tchemit Date: 2010-11-16 16:38:19 +0100 (Tue, 16 Nov 2010) New Revision: 2135 Url: http://nuiton.org/repositories/revision/topia/2135 Log: Evolution #1042: In ServiceTransformer, closetransaction should throw like the beginTransaction method a TopiaException Evolution #1043: In service transformer, add the transaction tag value also to the all service when the service is not connected to any database Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-11 23:26:25 UTC (rev 2134) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-11-16 15:38:19 UTC (rev 2135) @@ -36,6 +36,7 @@ import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; @@ -214,15 +215,18 @@ } @Override - public void transformFromInterface(ObjectModelInterface interfacez) { - if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_SERVICE)) { + public void transformFromInterface(ObjectModelInterface input) { + if (!input.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_SERVICE)) { return; } - ObjectModelInterface serviceContract = - createServiceContract(interfacez); + // global transaction needed (if set to false then never use transaction) + boolean needTransaction = isTransactionNeeded(input); - createServiceAbstract(interfacez, serviceContract); + ObjectModelInterface serviceContract = + createServiceContract(input); + + createServiceAbstract(input, serviceContract, needTransaction); } /** @@ -236,8 +240,7 @@ ObjectModelInterface source) { ObjectModelInterface serviceContract = - createInterface(source.getName(), - source.getPackageName()); + createInterface(source.getName(), source.getPackageName()); setDocumentation(serviceContract, source.getDocumentation()); for (ObjectModelOperation op : source.getOperations()) { @@ -270,9 +273,11 @@ * * @param source interface from model * @param serviceContract to implement + * @param needTransaction flag to know if service globally use transaction */ protected void createServiceAbstract(ObjectModelInterface source, - ObjectModelInterface serviceContract) { + ObjectModelInterface serviceContract, + boolean needTransaction) { ObjectModelClass serviceAbstract = createAbstractClass( getServiceAbstractClassName(serviceContract.getName()), @@ -293,18 +298,21 @@ addImport(serviceAbstract, LogFactory.class); // Create abstract methods - ObjectModelOperation beginTransaction = - addOperation(serviceAbstract, OP_NAME_BEGIN_TRANSACTION, - TopiaContext.class, - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.PROTECTED); - addException(beginTransaction, TopiaException.class); - + if (needTransaction) { + ObjectModelOperation beginTransaction = + addOperation(serviceAbstract, OP_NAME_BEGIN_TRANSACTION, + TopiaContext.class, + ObjectModelModifier.ABSTRACT, + ObjectModelModifier.PROTECTED); + addException(beginTransaction, TopiaException.class); + } ObjectModelOperation treateError1 = addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", ObjectModelModifier.ABSTRACT, ObjectModelModifier.PROTECTED); - addParameter(treateError1, TopiaContext.class, "transaction"); + if (needTransaction) { + addParameter(treateError1, TopiaContext.class, "transaction"); + } addParameter(treateError1, Exception.class, "eee"); addParameter(treateError1, String.class, "message"); addParameter(treateError1, "Object...", "args"); @@ -312,43 +320,50 @@ addException(treateError1, exceptionName); } - ObjectModelOperation closeTransaction = - addOperation(serviceAbstract, OP_NAME_CLOSE_TRANSACTION, "void", - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.PROTECTED); - addParameter(closeTransaction, TopiaContext.class, "transaction"); + if (needTransaction) { + ObjectModelOperation closeTransaction = + addOperation(serviceAbstract, OP_NAME_CLOSE_TRANSACTION, "void", + ObjectModelModifier.ABSTRACT, + ObjectModelModifier.PROTECTED); + addParameter(closeTransaction, TopiaContext.class, "transaction"); + addException(closeTransaction, TopiaException.class); + } + // Create abstract execute methods + Map<String, ObjectModelOperation> abstOps = + new HashMap<String, ObjectModelOperation>(); - // Create abstract execute methods - Map<String, ObjectModelOperation> abstOps = - new HashMap<String, ObjectModelOperation>(); + // Use source interfacez to have tagvalues from model + for (ObjectModelOperation op : source.getOperations()) { + ObjectModelOperation abstOp = createOperationExecuteAbstract( + serviceAbstract, + op, + needTransaction + ); + // Keep abstract methods to use them in operationImplementation + // generation + abstOps.put(getAbstractOperationKeyMap(op), abstOp); + } + if (needTransaction) { + ObjectModelOperation treateError2 = + addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", + ObjectModelModifier.PROTECTED); + addParameter(treateError2, Exception.class, "eee"); + addParameter(treateError2, String.class, "message"); + addParameter(treateError2, "Object...", "args"); + if (exceptionName != null) { + addException(treateError2, exceptionName); + } - // Use source interfacez to have tagvalues from model - for (ObjectModelOperation op : source.getOperations()) { - ObjectModelOperation abstOp = - createOperationExecuteAbstract(serviceAbstract, op); - // Keep abstract methods to use them in operationImplementation - // generation - abstOps.put(getAbstractOperationKeyMap(op), abstOp); + setOperationBody(treateError2, "" + /*{ + treateError(null, eee, message, args); + }*/ + ); } - - ObjectModelOperation treateError2 = - addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", - ObjectModelModifier.PROTECTED); - addParameter(treateError2, Exception.class, "eee"); - addParameter(treateError2, String.class, "message"); - addParameter(treateError2, "Object...", "args"); - if (exceptionName != null) { - addException(treateError2, exceptionName); + // Imports for implementations + if (needTransaction) { + addImport(serviceAbstract, TopiaContext.class); } - - setOperationBody(treateError2, "" - /*{ - treateError(null, eee, message, args); - }*/ - ); - - // Imports for implementations - addImport(serviceAbstract, TopiaContext.class); addImport(serviceAbstract, I18n.class); addImport(serviceAbstract, ArrayList.class); addImport(serviceAbstract, DurationFormatUtils.class); @@ -359,7 +374,9 @@ serviceAbstract, abstOps.get(getAbstractOperationKeyMap(op)), op, - source.getName()); + source.getName(), + needTransaction + ); } } @@ -386,12 +403,15 @@ * * @param serviceAbstract where the operation will be created * @param source ObjectModelOperation from model + * @param needTransaction flag to know if service globally use transaction * @return the abstract operation created * @see #isErrorArgsNeeded(ObjectModelOperation) - * @see #isTransactionNeeded(ObjectModelOperation) + * @see #isTransactionNeeded(ObjectModelElement) */ protected ObjectModelOperation createOperationExecuteAbstract( - ObjectModelClass serviceAbstract, ObjectModelOperation source) { + ObjectModelClass serviceAbstract, + ObjectModelOperation source, + boolean needTransaction) { String opName = StringUtils.capitalize(source.getName()); // Abstract operation to execute method content @@ -405,7 +425,7 @@ // They will be catched by interface method to use treateError addException(abstOp, Exception.class); - if (isTransactionNeeded(source)) { + if (needTransaction && isTransactionNeeded(source)) { addParameter(abstOp, TopiaContext.class, "transaction"); } @@ -434,19 +454,21 @@ * @param abstOp to execute into the implementation body * @param source ObjectModelOperation from model * @param serviceContractName where the signature method is defined + * @param needTransaction flag to know if service globally use transaction * @see #isErrorArgsNeeded(ObjectModelOperation) - * @see #isTransactionNeeded(ObjectModelOperation) + * @see #isTransactionNeeded(ObjectModelElement) */ protected void createOperationImplementation( ObjectModelClass serviceAbstract, ObjectModelOperation abstOp, ObjectModelOperation source, - String serviceContractName) { + String serviceContractName, + boolean needTransaction) { // boolean to specify if the method need a transaction or not // Default set to true but can be override by a tagvalue on the // method - boolean needTransaction = isTransactionNeeded(source); + needTransaction &= isTransactionNeeded(source); // boolean to specify if the method need error arguments or not // Default set to true but can be override by a tagvalue on the @@ -518,6 +540,7 @@ TopiaContext transaction = null; try { transaction = beginTransaction(); + try { }*/ ); // Add transaction in treateError parameters @@ -557,6 +580,17 @@ } <%=abstReturn%> }*/); + if (needTransaction) { + // Finally block to close transaction + buffer.append("" + /*{ + } finally { + closeTransaction(transaction); + } + }*/ + ); + + } // Copy exceptions for (String ex : source.getExceptions()) { addException(implOp, ex); @@ -576,13 +610,6 @@ } catch (Exception eee) { treateError(<%=treateErrorParams%>); }*/); - if (needTransaction) { - // Finally block to close transaction - buffer.append("" - /*{ - } finally { - closeTransaction(transaction); }*/); - } buffer.append("" /*{ @@ -602,7 +629,7 @@ * @param op where the tagvalue is set * @return true if transaction is needed */ - protected boolean isTransactionNeeded(ObjectModelOperation op) { + protected boolean isTransactionNeeded(ObjectModelElement op) { boolean needTransaction = true; String transactionTag =

1 0

r2134 - trunk
by tchemit＠users.nuiton.org 11 Nov '10

11 Nov '10

Author: tchemit Date: 2010-11-12 00:26:25 +0100 (Fri, 12 Nov 2010) New Revision: 2134 Url: http://nuiton.org/repositories/revision/topia/2134 Log: do NOT use mavenpom shared versions since it does not work on Windows os + use processor 1.0.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-07 17:21:22 UTC (rev 2133) +++ trunk/pom.xml 2010-11-11 23:26:25 UTC (rev 2134) @@ -79,15 +79,17 @@ </dependency> -  + <version>2.5</version> + </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -126,11 +128,12 @@ <scope>test</scope> </dependency> -  + </dependency>  <eugeneVersion>2.2.1-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> - <processorPluginVersion>1.0.3</processorPluginVersion> + <processorPluginVersion>1.0.4</processorPluginVersion> <nuitonI18nVersion>1.2.2</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>3.3.2.GA</hibernateVersion>

1 0

r2133 - in trunk: . topia-persistence/src/main/java/org/nuiton/topia/generator topia-service-security/src/test/java/org/nuiton/topia/security
by tchemit＠users.nuiton.org 07 Nov '10

07 Nov '10

Author: tchemit Date: 2010-11-07 18:21:22 +0100 (Sun, 07 Nov 2010) New Revision: 2133 Url: http://nuiton.org/repositories/revision/topia/2133 Log: Evolution #891: Update Eugene to 2.2.1 box log invocations by if log.isXXX() Modified: trunk/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-29 08:29:42 UTC (rev 2132) +++ trunk/pom.xml 2010-11-07 17:21:22 UTC (rev 2133) @@ -322,7 +322,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.2</eugeneVersion> + <eugeneVersion>2.2.1-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> <processorPluginVersion>1.0.3</processorPluginVersion> <nuitonI18nVersion>1.2.2</nuitonI18nVersion> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java 2010-10-29 08:29:42 UTC (rev 2132) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java 2010-11-07 17:21:22 UTC (rev 2133) @@ -95,7 +95,9 @@ for (ObjectModelValidator validator : validators) { if (!validator.validate()) { for (String error : validator.getErrors()) { - log.info("[VALIDATION] " + error); + if (log.isInfoEnabled()) { + log.info("[VALIDATION] " + error); + } } } } @@ -105,7 +107,10 @@ if (classes.isEmpty()) { // no entity to generate, can stop safely - log.warn("No entity to generate, " + getClass().getName() + " is skipped"); + if (log.isWarnEnabled()) { + log.warn("No entity to generate, " + getClass().getName() + + " is skipped"); + } return false; } //FIXME-TC20091220 seems we still generate if there is some validation errors ? not very normal Modified: trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java =================================================================== --- trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2010-10-29 08:29:42 UTC (rev 2132) +++ trunk/topia-service-security/src/test/java/org/nuiton/topia/security/TopiaSecurityTest.java 2010-11-07 17:21:22 UTC (rev 2133) @@ -25,6 +25,8 @@ package org.nuiton.topia.security; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -76,7 +78,9 @@ * @author ruchaud */ public class TopiaSecurityTest { + private static final Log log = LogFactory.getLog(TopiaSecurityTest.class); + protected static TopiaContext context; protected static TopiaSecurityService securityManager; @@ -103,7 +107,9 @@ @Ignore protected Properties getProperties() { Properties config = new Properties(); - config.setProperty("hibernate.show_sql", "true"); + if (log.isDebugEnabled()) { + config.setProperty("hibernate.show_sql", "true"); + } config.setProperty("topia.persistence.classes", entitiesList);

1 0

r2132 - trunk
by tchemit＠users.nuiton.org 29 Oct '10

29 Oct '10

Author: tchemit Date: 2010-10-29 10:29:42 +0200 (Fri, 29 Oct 2010) New Revision: 2132 Url: http://nuiton.org/repositories/revision/topia/2132 Log: Update mavenpom4redmineAndCentral to 2.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 12:58:49 UTC (rev 2131) +++ trunk/pom.xml 2010-10-29 08:29:42 UTC (rev 2132) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <artifactId>topia</artifactId>

1 0