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

r2719 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org April 28, 2013

April 28, 2013

Author: maven-release Date: 2013-04-28 22:24:33 +0200 (Sun, 28 Apr 2013) New Revision: 2719 Url: http://nuiton.org/projects/topia/repository/revisions/2719 Log: [maven-release-plugin] prepare release topia-2.8-rc-1 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 2013-04-28 19:48:22 UTC (rev 2718) +++ trunk/pom.xml 2013-04-28 20:24:33 UTC (rev 2719) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.8-rc-1-SNAPSHOT</version> + <version>2.8-rc-1</version> <modules> <module>topia-persistence</module> @@ -79,9 +79,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://nuiton.org/projects/topia/repository/show/branches/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.8-rc-1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.8-rc-1</developerConnection> + <url>http://nuiton.org/projects/topia/repository/show/branches/tags/topia-2.8-rc…</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-04-28 19:48:22 UTC (rev 2718) +++ trunk/topia-persistence/pom.xml 2013-04-28 20:24:33 UTC (rev 2719) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8-rc-1-SNAPSHOT</version> + <version>2.8-rc-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-04-28 19:48:22 UTC (rev 2718) +++ trunk/topia-service-migration/pom.xml 2013-04-28 20:24:33 UTC (rev 2719) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8-rc-1-SNAPSHOT</version> + <version>2.8-rc-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-04-28 19:48:22 UTC (rev 2718) +++ trunk/topia-service-replication/pom.xml 2013-04-28 20:24:33 UTC (rev 2719) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8-rc-1-SNAPSHOT</version> + <version>2.8-rc-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2013-04-28 19:48:22 UTC (rev 2718) +++ trunk/topia-service-security/pom.xml 2013-04-28 20:24:33 UTC (rev 2719) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8-rc-1-SNAPSHOT</version> + <version>2.8-rc-1</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2718 - in trunk: src/site topia-service-security
by tchemit＠users.nuiton.org April 28, 2013

April 28, 2013

Author: tchemit Date: 2013-04-28 21:48:22 +0200 (Sun, 28 Apr 2013) New Revision: 2718 Url: http://nuiton.org/projects/topia/repository/revisions/2718 Log: - fix signatures - fix site logo Modified: trunk/src/site/site_fr.xml trunk/topia-service-security/pom.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-04-28 19:40:28 UTC (rev 2717) +++ trunk/src/site/site_fr.xml 2013-04-28 19:48:22 UTC (rev 2718) @@ -27,7 +27,7 @@ <project name="ToPIA"> <bannerLeft> - <src alt="Pollen">${project.url}/logo.jpg</src> + <src alt="ToPIA">http://maven-site.nuiton.org/public/images/logos/topia-logo.png</src> <name>${project.name}</name> <href>index.html</href> </bannerLeft> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2013-04-28 19:40:28 UTC (rev 2717) +++ trunk/topia-service-security/pom.xml 2013-04-28 19:48:22 UTC (rev 2718) @@ -119,6 +119,12 @@   + <properties> + +  + <signatureArtifactId>java16-sun</signatureArtifactId> + <signatureVersion>1.10</signatureVersion> + </properties> <build> <resources> @@ -132,23 +138,6 @@ </resources> - <pluginManagement> -  - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <configuration> - <signature> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java16-sun</artifactId> - <version>1.10</version> - </signature> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> <plugin>

1 0

r2717 - trunk
by tchemit＠users.nuiton.org April 28, 2013

April 28, 2013

Author: tchemit Date: 2013-04-28 21:40:28 +0200 (Sun, 28 Apr 2013) New Revision: 2717 Url: http://nuiton.org/projects/topia/repository/revisions/2717 Log: fixes #2673: Updates mavenpom to 3.4.10 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 19:22:16 UTC (rev 2716) +++ trunk/pom.xml 2013-04-28 19:40:28 UTC (rev 2717) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.9</version> + <version>3.4.10</version> </parent> <artifactId>topia</artifactId>

1 0

r2716 - in trunk: src/site topia-persistence/src/site topia-service-migration/src/site topia-service-replication/src/site topia-service-security/src/site
by tchemit＠users.nuiton.org April 28, 2013

April 28, 2013

Author: tchemit Date: 2013-04-28 21:22:16 +0200 (Sun, 28 Apr 2013) New Revision: 2716 Url: http://nuiton.org/projects/topia/repository/revisions/2716 Log: fixes #2670: Use fluido skin Modified: trunk/src/site/site_fr.xml trunk/topia-persistence/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 Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-04-28 18:58:48 UTC (rev 2715) +++ trunk/src/site/site_fr.xml 2013-04-28 19:22:16 UTC (rev 2716) @@ -27,27 +27,62 @@ <project name="ToPIA"> <bannerLeft> + <src alt="Pollen">${project.url}/logo.jpg</src> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.3.0</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <googleSearch/> + <sideBarEnabled>true</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/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"/> + img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/argouml-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> + </poweredBy> <body> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item href="http://maven-site.nuiton.org/topia" name="${project.name}"/> </breadcrumbs> @@ -60,5 +95,19 @@ <menu ref="reports"/> + <footer> + + <div id='projectMetas' locale='fr' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/topia-persistence/src/site/site_fr.xml =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml 2013-04-28 18:58:48 UTC (rev 2715) +++ trunk/topia-persistence/src/site/site_fr.xml 2013-04-28 19:22:16 UTC (rev 2716) @@ -32,7 +32,16 @@ </bannerLeft> <body> - + + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="index.html" /> </breadcrumbs> @@ -83,5 +92,19 @@ <menu ref="reports"/> + <footer> + + <div id='projectMetas' locale='fr' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/topia-service-migration/src/site/site_fr.xml =================================================================== --- trunk/topia-service-migration/src/site/site_fr.xml 2013-04-28 18:58:48 UTC (rev 2715) +++ trunk/topia-service-migration/src/site/site_fr.xml 2013-04-28 19:22:16 UTC (rev 2716) @@ -32,7 +32,16 @@ </bannerLeft> <body> - + + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="index.html" /> </breadcrumbs> @@ -55,5 +64,19 @@ <menu ref="reports"/> + <footer> + + <div id='projectMetas' locale='fr' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/topia-service-replication/src/site/site_fr.xml =================================================================== --- trunk/topia-service-replication/src/site/site_fr.xml 2013-04-28 18:58:48 UTC (rev 2715) +++ trunk/topia-service-replication/src/site/site_fr.xml 2013-04-28 19:22:16 UTC (rev 2716) @@ -32,7 +32,16 @@ </bannerLeft> <body> - + + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="index.html" /> </breadcrumbs> @@ -52,5 +61,19 @@ <menu ref="reports"/> + <footer> + + <div id='projectMetas' locale='fr' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/topia-service-security/src/site/site_fr.xml =================================================================== --- trunk/topia-service-security/src/site/site_fr.xml 2013-04-28 18:58:48 UTC (rev 2715) +++ trunk/topia-service-security/src/site/site_fr.xml 2013-04-28 19:22:16 UTC (rev 2716) @@ -32,7 +32,16 @@ </bannerLeft> <body> - + + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> + </head> + <breadcrumbs> <item name="${project.name}" href="index.html" /> </breadcrumbs> @@ -59,5 +68,19 @@ <menu ref="reports"/> + <footer> + + <div id='projectMetas' locale='fr' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project>

1 0

r2715 - trunk
by tchemit＠users.nuiton.org April 28, 2013

April 28, 2013

Author: tchemit Date: 2013-04-28 20:58:48 +0200 (Sun, 28 Apr 2013) New Revision: 2715 Url: http://nuiton.org/projects/topia/repository/revisions/2715 Log: fix scm Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-28 18:56:19 UTC (rev 2714) +++ trunk/pom.xml 2013-04-28 18:58:48 UTC (rev 2715) @@ -74,6 +74,24 @@ </properties> +  +  +  + + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://nuiton.org/projects/topia/repository/show/branches/trunk</url> + </scm> + + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + + <dependencyManagement> <dependencies> @@ -249,7 +267,7 @@ <email>letellier at codelutin dot com</email> <organization>CodeLutin</organization> <organizationUrl>http://codelutin.com</organizationUrl> - <timezone>Europe/Parisrope/Paris</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -408,13 +426,6 @@ </configuration> </plugin> -  - </plugins> </pluginManagement> @@ -425,52 +436,4 @@ <excludeDefaults>true</excludeDefaults> </reporting> - <profiles> - -  - <profile> - <id>tutorial</id> - <modules> - <module>topia-tutorial</module> - </modules> - </profile> - -  -  - - </profiles> - -  -  -  - -  - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.6.x</developerConnection> - <url>http://nuiton.org/projects/topia/repository/show/branches/topia-2.6.x</url> - </scm> - - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - </project>

1 0

r2714 - trunk
by tchemit＠users.nuiton.org April 28, 2013

April 28, 2013

Author: tchemit Date: 2013-04-28 20:56:19 +0200 (Sun, 28 Apr 2013) New Revision: 2714 Url: http://nuiton.org/projects/topia/repository/revisions/2714 Log: refs #2652: Update to hibernate 4.2.1.Final Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-23 21:33:04 UTC (rev 2713) +++ trunk/pom.xml 2013-04-28 18:56:19 UTC (rev 2714) @@ -64,7 +64,7 @@ <processorPluginVersion>1.3</processorPluginVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>4.2.0.Final</hibernateVersion> + <hibernateVersion>4.2.1.Final</hibernateVersion> <sl4jVersion>1.7.5</sl4jVersion> <h2Version>1.3.171</h2Version> <hamcrestVersion>1.3</hamcrestVersion>

1 0

r2713 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org April 23, 2013

April 23, 2013

Author: tchemit Date: 2013-04-23 23:33:04 +0200 (Tue, 23 Apr 2013) New Revision: 2713 Url: http://nuiton.org/projects/topia/repository/revisions/2713 Log: move to 2.8-rc-1-SNAPSHOT version 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 2013-04-23 21:31:59 UTC (rev 2712) +++ trunk/pom.xml 2013-04-23 21:33:04 UTC (rev 2713) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.8.0-rc-1-SNAPSHOT</version> + <version>2.8-rc-1-SNAPSHOT</version> <modules> <module>topia-persistence</module> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-04-23 21:31:59 UTC (rev 2712) +++ trunk/topia-persistence/pom.xml 2013-04-23 21:33:04 UTC (rev 2713) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.0-rc-1-SNAPSHOT</version> + <version>2.8-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-04-23 21:31:59 UTC (rev 2712) +++ trunk/topia-service-migration/pom.xml 2013-04-23 21:33:04 UTC (rev 2713) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.0-rc-1-SNAPSHOT</version> + <version>2.8-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-04-23 21:31:59 UTC (rev 2712) +++ trunk/topia-service-replication/pom.xml 2013-04-23 21:33:04 UTC (rev 2713) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.0-rc-1-SNAPSHOT</version> + <version>2.8-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2013-04-23 21:31:59 UTC (rev 2712) +++ trunk/topia-service-security/pom.xml 2013-04-23 21:33:04 UTC (rev 2713) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.0-rc-1-SNAPSHOT</version> + <version>2.8-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2712 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org April 23, 2013

April 23, 2013

Author: tchemit Date: 2013-04-23 23:31:59 +0200 (Tue, 23 Apr 2013) New Revision: 2712 Url: http://nuiton.org/projects/topia/repository/revisions/2712 Log: move to 2.8.0-rc-1-SNAPSHOT version 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 2013-04-23 21:28:34 UTC (rev 2711) +++ trunk/pom.xml 2013-04-23 21:31:59 UTC (rev 2712) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.8.0-beta-1-SNAPSHOT</version> + <version>2.8.0-rc-1-SNAPSHOT</version> <modules> <module>topia-persistence</module> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-04-23 21:28:34 UTC (rev 2711) +++ trunk/topia-persistence/pom.xml 2013-04-23 21:31:59 UTC (rev 2712) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.0-beta-1-SNAPSHOT</version> + <version>2.8.0-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-04-23 21:28:34 UTC (rev 2711) +++ trunk/topia-service-migration/pom.xml 2013-04-23 21:31:59 UTC (rev 2712) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.0-beta-1-SNAPSHOT</version> + <version>2.8.0-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-04-23 21:28:34 UTC (rev 2711) +++ trunk/topia-service-replication/pom.xml 2013-04-23 21:31:59 UTC (rev 2712) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.0-beta-1-SNAPSHOT</version> + <version>2.8.0-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2013-04-23 21:28:34 UTC (rev 2711) +++ trunk/topia-service-security/pom.xml 2013-04-23 21:31:59 UTC (rev 2712) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8.0-beta-1-SNAPSHOT</version> + <version>2.8.0-rc-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2711 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org April 23, 2013

April 23, 2013

Author: tchemit Date: 2013-04-23 23:28:34 +0200 (Tue, 23 Apr 2013) New Revision: 2711 Url: http://nuiton.org/projects/topia/repository/revisions/2711 Log: move to 2.8.0-beta-1-SNAPSHOT version 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 2013-04-23 21:25:03 UTC (rev 2710) +++ trunk/pom.xml 2013-04-23 21:28:34 UTC (rev 2711) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8.0-beta-1-SNAPSHOT</version> <modules> <module>topia-persistence</module> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-04-23 21:25:03 UTC (rev 2710) +++ trunk/topia-persistence/pom.xml 2013-04-23 21:28:34 UTC (rev 2711) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8.0-beta-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-04-23 21:25:03 UTC (rev 2710) +++ trunk/topia-service-migration/pom.xml 2013-04-23 21:28:34 UTC (rev 2711) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8.0-beta-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-04-23 21:25:03 UTC (rev 2710) +++ trunk/topia-service-replication/pom.xml 2013-04-23 21:28:34 UTC (rev 2711) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8.0-beta-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2013-04-23 21:25:03 UTC (rev 2710) +++ trunk/topia-service-security/pom.xml 2013-04-23 21:28:34 UTC (rev 2711) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.8.0-beta-1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2710 - in trunk: . topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org April 23, 2013

April 23, 2013

Author: tchemit Date: 2013-04-23 23:25:03 +0200 (Tue, 23 Apr 2013) New Revision: 2710 Url: http://nuiton.org/projects/topia/repository/revisions/2710 Log: fix api Modified: trunk/ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - *.ipr *.iws .classpath *.iml .project target .settings .idea + *.ipr *.iws .classpath *.iml .project target .settings .idea atlassian-ide-plugin.xml Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-04-23 17:45:03 UTC (rev 2709) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2013-04-23 21:25:03 UTC (rev 2710) @@ -24,19 +24,10 @@ */ package org.nuiton.topia.framework; -import java.net.URL; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Iterator; -import java.util.Properties; -import java.util.StringTokenizer; -import java.util.regex.Pattern; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; -import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; import org.hibernate.service.ServiceRegistry; @@ -51,6 +42,14 @@ import org.nuiton.util.RecursiveProperties; import org.nuiton.util.Resource; +import java.net.URL; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Iterator; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.regex.Pattern; + /** * TODO-fdesbois-20100507 : Need javadoc + translations for existing methods. * @@ -178,7 +177,7 @@ try { TopiaContextImplementor txi = (TopiaContextImplementor) tx; - + Configuration configuration = txi.getHibernateConfiguration(); PersistentClass classMapping = configuration.getClassMapping(entityName); @@ -199,9 +198,8 @@ "could not find entity with name " + entityName); } - SessionFactoryImpl sfi = (SessionFactoryImpl)txi.getHibernateFactory(); - ServiceRegistry serviceRegistry = sfi.getServiceRegistry(); - ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class); + ConnectionProvider connectionProvider = + getConnectionProvider(configuration); Dialect dialect = Dialect.getDialect(configuration.getProperties()); @@ -267,9 +265,8 @@ "could not find entity with name " + entityName); } - ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings( - configuration.getProperties()).buildServiceRegistry(); - ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class); + ConnectionProvider connectionProvider = + getConnectionProvider(configuration); Dialect dialect = Dialect.getDialect(configuration.getProperties()); @@ -313,9 +310,8 @@ try { - ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings( - configuration.getProperties()).buildServiceRegistry(); - ConnectionProvider connectionProvider = serviceRegistry.getService(ConnectionProvider.class); + ConnectionProvider connectionProvider = + getConnectionProvider(configuration); Dialect dialect = Dialect.getDialect(configuration.getProperties()); @@ -369,6 +365,12 @@ return true; } + protected static ConnectionProvider getConnectionProvider(Configuration configuration) { + ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings( + configuration.getProperties()).buildServiceRegistry(); + return serviceRegistry.getService(ConnectionProvider.class); + } + /** * Return hibernate schema name *

1 0