branch develop updated (b01ca4e -> 8c72c31)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository sammoa. See http://git.codelutin.com/sammoa.git from b01ca4e add .gitignore + use codelutinpom and introduce dependencies (refs #7191) new 17e27ec migrates to codelutinpom + using last compatible topia version (refs #7191) new 8c72c31 migrates to codelutinpom (using a nicer i18n bundle + make application start) (refs #7191) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8c72c31501f4dd660df1b80ffbd16e9648277b8e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jun 5 16:51:54 2015 +0200 migrates to codelutinpom (using a nicer i18n bundle + make application start) (refs #7191) commit 17e27ecd900d947736b82af2630639b9b076167d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jun 5 16:44:31 2015 +0200 migrates to codelutinpom + using last compatible topia version (refs #7191) Summary of changes: pom.xml | 29 +-------- .../persistence/SammoaTopiaPersistenceContext.java | 10 +-- sammoa-ui-swing/pom.xml | 7 +- .../main/java/fr/ulr/sammoa/ui/swing/StartApp.java | 2 +- src/site/site.xml | 75 +++++----------------- 5 files changed, 28 insertions(+), 95 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository sammoa. See http://git.codelutin.com/sammoa.git commit 17e27ecd900d947736b82af2630639b9b076167d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jun 5 16:44:31 2015 +0200 migrates to codelutinpom + using last compatible topia version (refs #7191) --- pom.xml | 29 +-------- .../persistence/SammoaTopiaPersistenceContext.java | 10 +-- sammoa-ui-swing/pom.xml | 4 +- src/site/site.xml | 75 +++++----------------- 4 files changed, 25 insertions(+), 93 deletions(-) diff --git a/pom.xml b/pom.xml index 04d5e5b..0e2e57c 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ <nuitonI18nVersion>3.1</nuitonI18nVersion> <eugeneVersion>2.13</eugeneVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <topiaVersion>3.0-beta-15</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> @@ -520,32 +520,9 @@ <plugins> <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - <reportSets> - <reportSet> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependencies</report> - <report>dependency-convergence</report> - <report>plugin-management</report> - <report>plugins</report> - <report>dependency-management</report> - <report>summary</report> - </reports> - </reportSet> - </reportSets> - </plugin> - - <plugin> <groupId>org.nuiton</groupId> <artifactId>nuiton-maven-report-plugin</artifactId> - <version>3.0-rc-1</version> + <version>3.0</version> <reportSets> <reportSet> <reports> @@ -554,7 +531,7 @@ </reportSet> </reportSets> <configuration> - <i18nBundleName>sammoa-ui-swing</i18nBundleName> + <i18nBundleName>${projectId}-i18n</i18nBundleName> </configuration> </plugin> diff --git a/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java b/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java index dbdb462..483fa19 100644 --- a/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java +++ b/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java @@ -22,18 +22,14 @@ package fr.ulr.sammoa.persistence; * #L% */ -import org.nuiton.topia.persistence.TopiaIdFactory; -import org.nuiton.topia.persistence.internal.HibernateProvider; -import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; +import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContextConstructorParameter; import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; import org.nuiton.topia.persistence.support.TopiaJpaSupport; -import org.nuiton.topia.persistence.support.TopiaListenableSupport; public class SammoaTopiaPersistenceContext extends AbstractSammoaTopiaPersistenceContext { - public SammoaTopiaPersistenceContext(HibernateProvider hibernateProvider, TopiaFiresSupport applicationFiresSupport, - TopiaIdFactory topiaIdFactory, TopiaHibernateSessionRegistry sessionRegistry) { - super(hibernateProvider, applicationFiresSupport, topiaIdFactory, sessionRegistry); + public SammoaTopiaPersistenceContext(AbstractTopiaPersistenceContextConstructorParameter parameter) { + super(parameter); } public TopiaJpaSupport getJpaSupport() { diff --git a/sammoa-ui-swing/pom.xml b/sammoa-ui-swing/pom.xml index e546dce..ecbfb5f 100644 --- a/sammoa-ui-swing/pom.xml +++ b/sammoa-ui-swing/pom.xml @@ -287,13 +287,13 @@ <entries> <entry> <specificGoal>parserValidation</specificGoal> - <basedir>${maven.src.dir}/main/java/</basedir> + <basedir>${project.basedir}/src/main/java/</basedir> <includes> <param>**/**-validation.xml</param> </includes> </entry> <entry> - <basedir>${maven.gen.dir}/java/</basedir> + <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> diff --git a/src/site/site.xml b/src/site/site.xml index 9d449ee..bedfa94 100755 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -23,23 +23,10 @@ #L% --> -<project name="${project.name}"> - - <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> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -51,58 +38,44 @@ <href>http://www.codelutin.com</href> </bannerRight> - <publishDate position="right"/> - <version position="right"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/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="https://jrst.nuiton.org" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> + <logo href="https://jaxx.nuiton.org" name="JAXX" + img="${siteCommonResourcesUrl}/images/logos/jaxx-logo.png"/> - <logo href="http://maven-site.nuiton.org/jaxx" name="JAXX" - img="http://maven-site.nuiton.org/public/images/logos/jaxx-logo.png"/> + <logo href="https://topia.nuiton.org" name="ToPIA" + img="${mavenpomSiteCommonResourcesUrl}/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> + img="${siteCommonResourcesUrl}/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> - <links> - <item name="Forge" href="http://forge.codelutin.com"/> + <item name="Forge" href="https://forge.codelutin.com"/> <item name="Code Lutin" href="http://www.codelutin.com"/> </links> <breadcrumbs> - <item name="${project.name}" - href="${project.url}/index.html"/> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Sammoa"> <item name="Accueil" href="index.html"/> <item name="Téléchargement" - href="http://forge.codelutin.com/projects/sammoa/files"/> + href="https://forge.codelutin.com/projects/sammoa/files"/> <item name="Roadmap" - href="http://forge.codelutin.com/projects/sammoa/roadmap"/> + href="https://forge.codelutin.com/projects/sammoa/roadmap"/> <item name="Historique des versions" href="changes-report.html"/> </menu> @@ -115,19 +88,5 @@ <menu ref="reports"/> - <footer> - - <div id='projectMetas' locale='en' - 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> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository sammoa. See http://git.codelutin.com/sammoa.git commit 8c72c31501f4dd660df1b80ffbd16e9648277b8e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jun 5 16:51:54 2015 +0200 migrates to codelutinpom (using a nicer i18n bundle + make application start) (refs #7191) --- sammoa-ui-swing/pom.xml | 3 ++- sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sammoa-ui-swing/pom.xml b/sammoa-ui-swing/pom.xml index ecbfb5f..d7f6a91 100644 --- a/sammoa-ui-swing/pom.xml +++ b/sammoa-ui-swing/pom.xml @@ -32,7 +32,7 @@ <jaxx.helpsetName>sammoa</jaxx.helpsetName> <jaxx.locales>fr,en</jaxx.locales> - <i18n.bundleOutputName>sammoa-ui-swing</i18n.bundleOutputName> + <i18n.bundleOutputName>${projectId}-i18n</i18n.bundleOutputName> <!-- generate license bundled files --> <license.generateBundle>true</license.generateBundle> @@ -362,6 +362,7 @@ <useUniqueVersions>false</useUniqueVersions> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> + <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> </configuration> diff --git a/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java b/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java index 1d64a38..e07a6ed 100644 --- a/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java +++ b/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/StartApp.java @@ -84,7 +84,7 @@ public class StartApp { } // Initialize i18n - I18n.init(new DefaultI18nInitializer("sammoa-ui-swing"), Locale.UK); + I18n.init(new DefaultI18nInitializer("sammoa-i18n"), Locale.UK); // Prepare ui look&feel and load ui properties try { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm