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

r1681 - in branches/from2.2.2-eugene2-beta: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa topia-ui
by fdesbois＠users.nuiton.org 07 Dec '09

07 Dec '09

Author: fdesbois Date: 2009-12-07 18:50:46 +0100 (Mon, 07 Dec 2009) New Revision: 1681 Modified: branches/from2.2.2-eugene2-beta/pom.xml branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml branches/from2.2.2-eugene2-beta/topia-soa/pom.xml branches/from2.2.2-eugene2-beta/topia-ui/pom.xml Log: Increment next version SNAPSHOT Modified: branches/from2.2.2-eugene2-beta/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/pom.xml 2009-12-07 17:46:28 UTC (rev 1680) +++ branches/from2.2.2-eugene2-beta/pom.xml 2009-12-07 17:50:46 UTC (rev 1681) @@ -14,7 +14,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.3.0-beta-1</version> + <version>2.3.0-beta-2-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -194,7 +194,7 @@ <projectId>topia</projectId>  - <eugene.version>2.0.0-beta-1</eugene.version> + <eugene.version>2.0.0-beta-2-SNAPSHOT</eugene.version> <lutinutil.version>1.1.1</lutinutil.version> <processor.version>1.0.2</processor.version> <i18n.version>1.0.1</i18n.version> Modified: branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-12-07 17:46:28 UTC (rev 1680) +++ branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-12-07 17:50:46 UTC (rev 1681) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-1</version> + <version>2.3.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml 2009-12-07 17:46:28 UTC (rev 1680) +++ branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml 2009-12-07 17:50:46 UTC (rev 1681) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-1</version> + <version>2.3.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml 2009-12-07 17:46:28 UTC (rev 1680) +++ branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml 2009-12-07 17:50:46 UTC (rev 1681) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-1</version> + <version>2.3.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml 2009-12-07 17:46:28 UTC (rev 1680) +++ branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml 2009-12-07 17:50:46 UTC (rev 1681) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-1</version> + <version>2.3.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml 2009-12-07 17:46:28 UTC (rev 1680) +++ branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml 2009-12-07 17:50:46 UTC (rev 1681) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-1</version> + <version>2.3.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml 2009-12-07 17:46:28 UTC (rev 1680) +++ branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml 2009-12-07 17:50:46 UTC (rev 1681) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-1</version> + <version>2.3.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-soa/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/pom.xml 2009-12-07 17:46:28 UTC (rev 1680) +++ branches/from2.2.2-eugene2-beta/topia-soa/pom.xml 2009-12-07 17:50:46 UTC (rev 1681) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-1</version> + <version>2.3.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-ui/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-ui/pom.xml 2009-12-07 17:46:28 UTC (rev 1680) +++ branches/from2.2.2-eugene2-beta/topia-ui/pom.xml 2009-12-07 17:50:46 UTC (rev 1681) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-1</version> + <version>2.3.0-beta-2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r1680 - in trunk: . src/site topia-persistence/src/site topia-service-history/src/site topia-service-index/src/site topia-service-migration/src/site topia-service-replication/src/site topia-service-security/src/site topia-soa/src/site topia-ui/src/site
by tchemit＠users.nuiton.org 07 Dec '09

07 Dec '09

Author: tchemit Date: 2009-12-07 18:46:28 +0100 (Mon, 07 Dec 2009) New Revision: 1680 Added: trunk/src/site/site_fr.xml trunk/topia-persistence/src/site/site_fr.xml trunk/topia-service-history/src/site/site_fr.xml trunk/topia-service-index/src/site/site_fr.xml trunk/topia-service-migration/src/site/site_fr.xml trunk/topia-service-replication/src/site/site_fr.xml trunk/topia-service-security/src/site/site_fr.xml trunk/topia-soa/src/site/site_fr.xml trunk/topia-ui/src/site/site_fr.xml Removed: trunk/src/site/site.xml trunk/topia-persistence/src/site/site.xml trunk/topia-service-history/src/site/site.xml trunk/topia-service-index/src/site/site.xml trunk/topia-service-migration/src/site/site.xml trunk/topia-service-replication/src/site/site.xml trunk/topia-service-security/src/site/site.xml trunk/topia-soa/src/site/site.xml trunk/topia-ui/src/site/site.xml Modified: trunk/pom.xml Log: rename site.xml to site_fr.xml + bump version of mavenpom for next release Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-07 17:31:19 UTC (rev 1679) +++ trunk/pom.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1</version> </parent> <artifactId>topia</artifactId> @@ -194,10 +194,10 @@ <projectId>topia</projectId>  - <eugene.version>1.0.1-SNAPSHOT</eugene.version> + <eugene.version>1.0.1</eugene.version> <lutinutil.version>1.1.1</lutinutil.version> <processor.version>1.0.1</processor.version> - <i18n.version>1.0.2-SNAPSHOT</i18n.version> + <i18n.version>1.0.1</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> <hibernate.version>3.3.2.GA</hibernate.version> Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-12-07 17:31:19 UTC (rev 1679) +++ trunk/src/site/site.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="ToPIA"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="../../jrst" name="JRst" img="${project.url}/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> - - <menu name="Utilisateur"> - <item href="/index.html" name="Accueil"/> - </menu> - - <menu ref="modules"/> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/src/site/site_fr.xml (from rev 1677, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_fr.xml (rev 0) +++ trunk/src/site/site_fr.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="ToPIA"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> + <logo href="../../jrst" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu name="Utilisateur"> + <item href="/index.html" name="Accueil"/> + </menu> + + <menu ref="modules"/> + + <menu ref="reports"/> + + </body> +</project> Deleted: trunk/topia-persistence/src/site/site.xml =================================================================== --- trunk/topia-persistence/src/site/site.xml 2009-12-07 17:31:19 UTC (rev 1679) +++ trunk/topia-persistence/src/site/site.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherit="top"/> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu name="Developpeur"> - <item name="Todo" href="Todo.html"/> - <item name="Mapping hibernate" href="HibernateMapping.html"/> - <item name="Gestion des evenements" href="event.html"/> - <item name="Isolation" href="Isolation.html"/> - <item name="Schema migration" href="SchemaMigration.html"/> - <item name="Securité" href="security.html"/> - <item name="How-to" href="howto.html"/> - <item name="Génération des modèles" href="ModelGeneration.html"/> - <item name="TopiaContextFactory" href="Devel.html"/> - <item name="FAQ" href="FAQ.html"/> - <item name="Projets similaires" href="project.html"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/topia-persistence/src/site/site_fr.xml (from rev 1677, trunk/topia-persistence/src/site/site.xml) =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml (rev 0) +++ trunk/topia-persistence/src/site/site_fr.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherit="top"/> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu name="Developpeur"> + <item name="Todo" href="Todo.html"/> + <item name="Mapping hibernate" href="HibernateMapping.html"/> + <item name="Gestion des evenements" href="event.html"/> + <item name="Isolation" href="Isolation.html"/> + <item name="Schema migration" href="SchemaMigration.html"/> + <item name="Securité" href="security.html"/> + <item name="How-to" href="howto.html"/> + <item name="Génération des modèles" href="ModelGeneration.html"/> + <item name="TopiaContextFactory" href="Devel.html"/> + <item name="FAQ" href="FAQ.html"/> + <item name="Projets similaires" href="project.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/topia-persistence/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/topia-service-history/src/site/site.xml =================================================================== --- trunk/topia-service-history/src/site/site.xml 2009-12-07 17:31:19 UTC (rev 1679) +++ trunk/topia-service-history/src/site/site.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherit="top"/> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/topia-service-history/src/site/site_fr.xml (from rev 1677, trunk/topia-service-history/src/site/site.xml) =================================================================== --- trunk/topia-service-history/src/site/site_fr.xml (rev 0) +++ trunk/topia-service-history/src/site/site_fr.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherit="top"/> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Deleted: trunk/topia-service-index/src/site/site.xml =================================================================== --- trunk/topia-service-index/src/site/site.xml 2009-12-07 17:31:19 UTC (rev 1679) +++ trunk/topia-service-index/src/site/site.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherit="top"/> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/topia-service-index/src/site/site_fr.xml (from rev 1677, trunk/topia-service-index/src/site/site.xml) =================================================================== --- trunk/topia-service-index/src/site/site_fr.xml (rev 0) +++ trunk/topia-service-index/src/site/site_fr.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherit="top"/> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Deleted: trunk/topia-service-migration/src/site/site.xml =================================================================== --- trunk/topia-service-migration/src/site/site.xml 2009-12-07 17:31:19 UTC (rev 1679) +++ trunk/topia-service-migration/src/site/site.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherit="top"> - <item name="migration service" href="/index.html"/> - <item name="Manual migration service" href="/manualMigration.html"/> - </menu> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/topia-service-migration/src/site/site_fr.xml (from rev 1677, trunk/topia-service-migration/src/site/site.xml) =================================================================== --- trunk/topia-service-migration/src/site/site_fr.xml (rev 0) +++ trunk/topia-service-migration/src/site/site_fr.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherit="top"> + <item name="migration service" href="/index.html"/> + <item name="Manual migration service" href="/manualMigration.html"/> + </menu> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Deleted: trunk/topia-service-replication/src/site/site.xml =================================================================== --- trunk/topia-service-replication/src/site/site.xml 2009-12-07 17:31:19 UTC (rev 1679) +++ trunk/topia-service-replication/src/site/site.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherit="top"/> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/topia-service-replication/src/site/site_fr.xml (from rev 1677, trunk/topia-service-replication/src/site/site.xml) =================================================================== --- trunk/topia-service-replication/src/site/site_fr.xml (rev 0) +++ trunk/topia-service-replication/src/site/site_fr.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherit="top"/> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Deleted: trunk/topia-service-security/src/site/site.xml =================================================================== --- trunk/topia-service-security/src/site/site.xml 2009-12-07 17:31:19 UTC (rev 1679) +++ trunk/topia-service-security/src/site/site.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherit="top"/> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu name="Developpeur"> - <item name="Historique" href="/History.html"/> - <item name="Sécurité" href="/Security.html"/> - <item name="Recherche" href="/Search.html"/> - <item name="Migration" href="/Migration.html"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/topia-service-security/src/site/site_fr.xml (from rev 1677, trunk/topia-service-security/src/site/site.xml) =================================================================== --- trunk/topia-service-security/src/site/site_fr.xml (rev 0) +++ trunk/topia-service-security/src/site/site_fr.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherit="top"/> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu name="Developpeur"> + <item name="Historique" href="/History.html"/> + <item name="Sécurité" href="/Security.html"/> + <item name="Recherche" href="/Search.html"/> + <item name="Migration" href="/Migration.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Deleted: trunk/topia-soa/src/site/site.xml =================================================================== --- trunk/topia-soa/src/site/site.xml 2009-12-07 17:31:19 UTC (rev 1679) +++ trunk/topia-soa/src/site/site.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherit="top"/> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu name="Developpeur"> - <item name="Generation" href="ApplicationServiceGeneration.html"/> - <item name="Utilisation" href="ApplicationServiceUsing.html"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/topia-soa/src/site/site_fr.xml (from rev 1677, trunk/topia-soa/src/site/site.xml) =================================================================== --- trunk/topia-soa/src/site/site_fr.xml (rev 0) +++ trunk/topia-soa/src/site/site_fr.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherit="top"/> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu name="Developpeur"> + <item name="Generation" href="ApplicationServiceGeneration.html"/> + <item name="Utilisation" href="ApplicationServiceUsing.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Deleted: trunk/topia-ui/src/site/site.xml =================================================================== --- trunk/topia-ui/src/site/site.xml 2009-12-07 17:31:19 UTC (rev 1679) +++ trunk/topia-ui/src/site/site.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherit="top"> - <item href="index.html" name="Accueil" /> - <item href="UseCase.html" name="Cas d'utilisation" /> - <item href="UseCaseProblems.html" name="Cas d'utilisation (problèmes)" /> - </menu> - - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> - - </body> -</project> Copied: trunk/topia-ui/src/site/site_fr.xml (from rev 1677, trunk/topia-ui/src/site/site.xml) =================================================================== --- trunk/topia-ui/src/site/site_fr.xml (rev 0) +++ trunk/topia-ui/src/site/site_fr.xml 2009-12-07 17:46:28 UTC (rev 1680) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherit="top"> + <item href="index.html" name="Accueil" /> + <item href="UseCase.html" name="Cas d'utilisation" /> + <item href="UseCaseProblems.html" name="Cas d'utilisation (problèmes)" /> + </menu> + + <menu name="Téléchargement"> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project>

1 0

r1679 - in tags: . topia-2.3.0-beta-1
by fdesbois＠users.nuiton.org 07 Dec '09

07 Dec '09

Author: fdesbois Date: 2009-12-07 18:31:19 +0100 (Mon, 07 Dec 2009) New Revision: 1679 Added: tags/topia-2.3.0-beta-1/ Log: Create tag to release suiviobsmer with eugene2-beta Property changes on: tags/topia-2.3.0-beta-1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo +

1 0

r1678 - in branches/from2.2.2-eugene2-beta: . topia-persistence topia-service-history topia-service-index topia-service-migration topia-service-replication topia-service-security topia-soa topia-ui
by fdesbois＠users.nuiton.org 07 Dec '09

07 Dec '09

Author: fdesbois Date: 2009-12-07 18:29:21 +0100 (Mon, 07 Dec 2009) New Revision: 1678 Modified: branches/from2.2.2-eugene2-beta/pom.xml branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml branches/from2.2.2-eugene2-beta/topia-soa/pom.xml branches/from2.2.2-eugene2-beta/topia-ui/pom.xml Log: prepare version for tag 2.3.0-beta-1 using mavenpom 1.1.1 and eugene 2.0.0-beta-1 Modified: branches/from2.2.2-eugene2-beta/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/pom.xml 2009-12-04 16:55:44 UTC (rev 1677) +++ branches/from2.2.2-eugene2-beta/pom.xml 2009-12-07 17:29:21 UTC (rev 1678) @@ -10,11 +10,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0</version> + <version>1.1.1</version> </parent> <artifactId>topia</artifactId> - <version>2.3.0-beta-SNAPSHOT</version> + <version>2.3.0-beta-1</version> <modules> <module>topia-persistence</module> @@ -194,10 +194,10 @@ <projectId>topia</projectId>  - <eugene.version>2.0.0-beta-SNAPSHOT</eugene.version> + <eugene.version>2.0.0-beta-1</eugene.version> <lutinutil.version>1.1.1</lutinutil.version> - <processor.version>1.0.2-SNAPSHOT</processor.version> - <i18n.version>1.0.2-SNAPSHOT</i18n.version> + <processor.version>1.0.2</processor.version> + <i18n.version>1.0.1</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> <hibernate.version>3.3.2.GA</hibernate.version> Modified: branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-12-04 16:55:44 UTC (rev 1677) +++ branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-12-07 17:29:21 UTC (rev 1678) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-SNAPSHOT</version> + <version>2.3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml 2009-12-04 16:55:44 UTC (rev 1677) +++ branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml 2009-12-07 17:29:21 UTC (rev 1678) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-SNAPSHOT</version> + <version>2.3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml 2009-12-04 16:55:44 UTC (rev 1677) +++ branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml 2009-12-07 17:29:21 UTC (rev 1678) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-SNAPSHOT</version> + <version>2.3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml 2009-12-04 16:55:44 UTC (rev 1677) +++ branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml 2009-12-07 17:29:21 UTC (rev 1678) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-SNAPSHOT</version> + <version>2.3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml 2009-12-04 16:55:44 UTC (rev 1677) +++ branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml 2009-12-07 17:29:21 UTC (rev 1678) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-SNAPSHOT</version> + <version>2.3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml 2009-12-04 16:55:44 UTC (rev 1677) +++ branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml 2009-12-07 17:29:21 UTC (rev 1678) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-SNAPSHOT</version> + <version>2.3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-soa/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/pom.xml 2009-12-04 16:55:44 UTC (rev 1677) +++ branches/from2.2.2-eugene2-beta/topia-soa/pom.xml 2009-12-07 17:29:21 UTC (rev 1678) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-SNAPSHOT</version> + <version>2.3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-ui/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-ui/pom.xml 2009-12-04 16:55:44 UTC (rev 1677) +++ branches/from2.2.2-eugene2-beta/topia-ui/pom.xml 2009-12-07 17:29:21 UTC (rev 1678) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.3.0-beta-SNAPSHOT</version> + <version>2.3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r1677 - branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia
by fdesbois＠users.nuiton.org 04 Dec '09

04 Dec '09

Author: fdesbois Date: 2009-12-04 17:55:44 +0100 (Fri, 04 Dec 2009) New Revision: 1677 Removed: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java Log: Evol #138 : Put all properties from a hierarchy in the current properties object to avoid hibernate loading properties problem with hierarchy Deleted: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java 2009-12-01 16:28:33 UTC (rev 1676) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/ContextUtil.java 2009-12-04 16:55:44 UTC (rev 1677) @@ -1,289 +0,0 @@ -/* *##% ToPIA - Persistence - * Copyright (C) 2004 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ - -package org.nuiton.topia; - -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.Properties; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.Resource; - -/** - * ContextUtil.java - * - * Created: 17 avril 2009 - * - * @author fdesbois <fdesbois(a)codelutin.com> - * @version $Revision: 1334 $ - * - * Outil pour la manipulation de la base de données et des contextes Topia - * Utilisation recommandé (Patron Singleton) : - * ------------------------------------------- - * - * public ContextUtilProject extends ContextUtil { - * - * private static ContextUtil instance = null; - * - * public static ContextUtil getInstance() { - * if(instance == null) { - * instance = new ContextUtilProject(); - * } - * return instance; - * } - * - * private ContextUtilProject() { - * super(ContextUtilProject.class); - * } - * - * @Override - * public void loadProperties(Properties props) throws IOException, URISyntaxException { - * loadFileProperties("TopiaContextImpl.properties",props); - * props.setProperty("topia.persistence.classes", ProjectModelDAOHelper.getImplementationClassesAsString()); - * } - * - * @Override // Initialisation/Vérification BD à chaque création du contexte global - * protected void initDB() throws TopiaException { - * - * } - * - * } - * - * Utilisation de la transaction courante : - * ---------------------------------------- - * - * // Déclaration du contexte - * ContextUtil context = ContextUtilProject.getInstance(); - * - * // Récupération du dao avec transaction courante - * ObjectDAO dao = ProjectModelDAOHelper.getObjectDAO(context.transaction()); - * - * ... // traitement avec dao - * - * context.commit(); - * - * ... // traitement avec dao - * - * context.commit(); - * - * context.close(); - * - * Possibilité de créer plusieurs transactions et de les manipuler indépendamment : - * -------------------------------------------------------------------------------- - * - * // Déclaration du contexte - * ContextUtil context = ContextUtilProject.getInstance(); - * - * // Création de deux transactions - * TopiaContext transaction1 = context.getContext().beginTransaction(); - * TopiaContext transaction2 = context.getContext().beginTransaction(); - * - * ObjectDAO dao1 = ProjectModelDAOHelper.getObjectDAO(transaction1); - * - * OtherDAO dao2 = ProjectModelDAOHelper.getOtherDAO(transaction2); - * - * try { - * ... - * transaction1.commitTransaction(); - * } catch (TopiaException ex) { - * // Si ereur sur la transaction1 annulation de la transaction2 - * transaction2.rollbackTransaction(); - * } - * ... - * - * transaction1.closeContext(); - * ... - * - * - * Utilisation dans les tests unitaires : - * ------------------------------------ - * - * @BeforeClass - * public static void setUpClass() throws Exception { - * ContextUtilProject.getInstance().init(); - * } - * - * @AfterClass - * public static void tearDownClass() throws Exception { - * ContextUtilProject.getInstance().disconnect(); - * } - */ -public abstract class ContextUtil { - - /** - * Vérifie l'initialisation - */ - private boolean init; - - private static Log log = LogFactory.getLog(ContextUtil.class); - - /** - * Contexte global - */ - private TopiaContext globalContext; - - /** - * Transaction courante - */ - private TopiaContext currTransaction; - - /** - * Constructeur avec Class correspondant à la sous-classe qui hérite de ContextUtil - * @param current - */ - protected ContextUtil(Class current) { - ContextUtil.log = LogFactory.getLog(current); - init(); - } - - protected ContextUtil() { - init(); - } - - /** - * Initialisation du TopiaContext global - * loadProperties est définit par les sous-classes pour - * charger le fichier de configuration et les classes pour Hibernate - * Une initialisation de la base de données est possible via la méthode - * initDB() à redéfinir par les sous-classes - */ - public void init() { - if (!this.init) { - if (log.isInfoEnabled()) { - log.info("Initialize of TopiaContext..."); - } - try { - Properties conf = loadProperties(); - - this.globalContext = TopiaContextFactory.getContext(conf); - this.init = true; - if (log.isInfoEnabled()) { - log.info("Context Ready !"); - } - this.initDB(); - } catch (Exception ex) { - log.error("Initialize error !!",ex); - } - } - } - - /** - * Initialisation de la base de données à redéfinir - * @throws org.nuiton.topia.TopiaException - */ - protected void initDB() throws TopiaException { - - } - - /** - * Chargement du ou des fichiers de propriétés nécessaires à Topia - * @param props - * @throws java.io.IOException - * @throws java.net.URISyntaxException - */ - protected abstract Properties loadProperties() throws IOException, URISyntaxException; - - /** - * Chargement d'un fichier de propriété - * @param filename nom du fichier - * @param props propriétés à charger - * @throws java.net.URISyntaxException - * @throws java.io.IOException - */ - protected Properties loadFileProperties(String filename) - throws URISyntaxException, IOException { - Properties props = new Properties(); - URL url = Resource.getURL(filename); - if (log.isDebugEnabled()) { - log.debug(url); - } - props.load(url.openStream()); - return props; - } - - public boolean isInit() { - return this.init; - } - - /** - * Retourne le contexte global pour créer les transactions - * @return Le contexte global - */ - public TopiaContext getContext() { - if (!this.init) { - this.init(); - } - return this.globalContext; - } - - /** - * Fermeture de la connexion à la BD - */ - public void disconnect() { - try { - if (this.init) { - this.globalContext.closeContext(); - if (log.isInfoEnabled()) { - log.info("Context closed"); - } - this.init = false; - } - } catch (TopiaException ex) { - log.error("Disconnect error !!",ex); - } - } - - /** - * Récupération transaction courante (ou création) - * @return - * @throws org.nuiton.topia.TopiaException - */ - public TopiaContext transaction() throws TopiaException { - if (!this.init) { - this.init(); - } - if (this.currTransaction == null || this.currTransaction.isClosed()) { - this.currTransaction = this.globalContext.beginTransaction(); - } - return this.currTransaction; - } - - /** - * Commit de la transaction courante - * @throws org.nuiton.topia.TopiaException - */ - public void commit() throws TopiaException { - this.transaction().commitTransaction(); - } - - public void rollback() throws TopiaException { - this.transaction().rollbackTransaction(); - } - - /** - * Fermeture de la transaction courante - * @throws org.nuiton.topia.TopiaException - */ - public void close() throws TopiaException { - if (this.init && this.currTransaction != null) { - this.currTransaction.closeContext(); - } - } -} Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2009-12-01 16:28:33 UTC (rev 1676) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2009-12-04 16:55:44 UTC (rev 1677) @@ -113,6 +113,12 @@ */ static public TopiaContext getContext(Properties config) throws TopiaNotFoundException { + // Put all properties from a hierarchy in the current properties object. + // Resolve problem with hibernate which used iterator to get properties and so only + // values from the current properties object and not all hierarchy + for (String key : config.stringPropertyNames()) { + config.setProperty(key, config.getProperty(key)); + } TopiaContextImpl result = contextCache.get(config); if (result == null || result.isClosed()) { result = new TopiaContextImpl(config);

1 0

r1676 - branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 01 Dec '09

01 Dec '09

Author: fdesbois Date: 2009-12-01 17:28:33 +0100 (Tue, 01 Dec 2009) New Revision: 1676 Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java Log: Resolve issue on processor tag Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-12-01 16:18:24 UTC (rev 1675) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-12-01 16:28:33 UTC (rev 1676) @@ -504,7 +504,7 @@ /*{<%=prefix%> <list-index column="<%=reverseAttrDBName%>_idx"/> }*/ } -/*{<%=prefix%> <many-to-many class="<%=attrType%>" column="<%=attrColumn%>" <%=orderBy=%> node="topiaId"/> +/*{<%=prefix%> <many-to-many class="<%=attrType%>" column="<%=attrColumn%>" <%=orderBy%> node="topiaId"/> <%=prefix%> </<%=collType%>> }*/ }

1 0

r1675 - branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.nuiton.org 01 Dec '09

01 Dec '09

Author: echatellier Date: 2009-12-01 17:18:24 +0100 (Tue, 01 Dec 2009) New Revision: 1675 Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java Log: Add order-by attribute on many-to-many relation Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-11-27 17:04:46 UTC (rev 1674) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-12-01 16:18:24 UTC (rev 1675) @@ -487,7 +487,8 @@ String attrType = getType(attr); String attrName = getName(attr); String attrColumn = TopiaGeneratorUtil.getDBName(attr); - String lazy = generateFromTagValue(attr, TopiaGeneratorUtil.TAG_LAZY, "lazy", "true"); + String lazy = generateFromTagValue(attr, TopiaGeneratorUtil.TAG_LAZY, "lazy", "true"); + String orderBy = generateFromTagValue(attr, TopiaGeneratorUtil.TAG_ORDER_BY, "order-by"); String collType = TopiaGeneratorUtil.getNMultiplicityHibernateType(attr); String tableName = TopiaGeneratorUtil.getManyToManyTableName(attr); String inverse = ""; @@ -503,7 +504,7 @@ /*{<%=prefix%> <list-index column="<%=reverseAttrDBName%>_idx"/> }*/ } -/*{<%=prefix%> <many-to-many class="<%=attrType%>" column="<%=attrColumn%>" node="topiaId"/> +/*{<%=prefix%> <many-to-many class="<%=attrType%>" column="<%=attrColumn%>" <%=orderBy=%> node="topiaId"/> <%=prefix%> </<%=collType%>> }*/ }

1 0