branch develop updated (d720775 -> f220f88)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See http://git.codelutin.com/coser.git from d720775 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new f25864d fix textupdate documentation new b37b406 fix configuration link new f220f88 fix jnlp configuration The 3 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 f220f880ee536655e4f8f458cae858ceb028d102 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 9 09:02:55 2015 +0100 fix jnlp configuration commit b37b40691a132e0f44944bae3aa9f8d4616636d1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 9 09:02:41 2015 +0100 fix configuration link commit f25864de22b8576043235a3843dd311b394e927f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 9 09:02:25 2015 +0100 fix textupdate documentation Summary of changes: coser-ui/pom.xml | 28 +++++++++++++++++----------- coser-ui/src/site/site_en.xml | 2 +- coser-ui/src/site/site_fr.xml | 2 +- src/site/en/rst/devel/textupdate.rst | 2 ++ src/site/rst/devel/textupdate.rst | 2 ++ 5 files changed, 23 insertions(+), 13 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 coser. See http://git.codelutin.com/coser.git commit f25864de22b8576043235a3843dd311b394e927f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 9 09:02:25 2015 +0100 fix textupdate documentation --- src/site/en/rst/devel/textupdate.rst | 2 ++ src/site/rst/devel/textupdate.rst | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/site/en/rst/devel/textupdate.rst b/src/site/en/rst/devel/textupdate.rst index 9d8fd4a..0285dda 100644 --- a/src/site/en/rst/devel/textupdate.rst +++ b/src/site/en/rst/devel/textupdate.rst @@ -27,6 +27,8 @@ Website text update This documentation shows hom to update text content of website available at: http://www.ifremer.fr/SIH-indices-campagnes/. +**This documentation is not up-to-date. We have change the scm system, we are now using Git.** + Source ------ In order to modify source content, you have to be part of coser project developper diff --git a/src/site/rst/devel/textupdate.rst b/src/site/rst/devel/textupdate.rst index cb3a499..02cafc6 100644 --- a/src/site/rst/devel/textupdate.rst +++ b/src/site/rst/devel/textupdate.rst @@ -26,6 +26,8 @@ Mise à jour des textes du site Cette documentation détaille comment mettre à jour le contenu textuel du site: http://www.ifremer.fr/SIH-indices-campagnes/. +**Cette documentation n'est plus à jour. Nous avons changé de système de versioning pour passer sous Git.** + Source ------ Pour pouvoir modifier n'importe quel contenu, il faut être développeur autorisé -- 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 coser. See http://git.codelutin.com/coser.git commit b37b40691a132e0f44944bae3aa9f8d4616636d1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 9 09:02:41 2015 +0100 fix configuration link --- coser-ui/src/site/site_en.xml | 2 +- coser-ui/src/site/site_fr.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coser-ui/src/site/site_en.xml b/coser-ui/src/site/site_en.xml index ecc1987..952cf00 100644 --- a/coser-ui/src/site/site_en.xml +++ b/coser-ui/src/site/site_en.xml @@ -36,7 +36,7 @@ <menu name="Documentation"> <item name="Home" href="index.html"/> - <item name="Configuration" href="application-config-report.html"/> + <item name="Configuration" href="config-report.html"/> </menu> <menu ref="reports"/> diff --git a/coser-ui/src/site/site_fr.xml b/coser-ui/src/site/site_fr.xml index 6d50c0b..a648c0e 100644 --- a/coser-ui/src/site/site_fr.xml +++ b/coser-ui/src/site/site_fr.xml @@ -36,7 +36,7 @@ <menu name="Documentation"> <item name="Accueil" href="index.html"/> - <item name="Configuration" href="application-config-report.html"/> + <item name="Configuration" href="config-report.html"/> </menu> <menu ref="reports"/> -- 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 coser. See http://git.codelutin.com/coser.git commit f220f880ee536655e4f8f458cae858ceb028d102 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 9 09:02:55 2015 +0100 fix jnlp configuration --- coser-ui/pom.xml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 46164ab..e12f2ad 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -10,7 +10,6 @@ <groupId>fr.ifremer.coser</groupId> <artifactId>coser-ui</artifactId> - <packaging>jar</packaging> <name>Coser :: UI</name> <description>Coser ui module</description> @@ -31,6 +30,10 @@ <i18n.bundleOutputName>${coserI18nBundle}</i18n.bundleOutputName> <redmine.releaseFiles>target/coser-${project.version}-bin.zip</redmine.releaseFiles> + + <jnlpFileName>coser.jnlp</jnlpFileName> + <jnlpCodebase>https://coser.codelutin.com/v/${siteDeployClassifier}/coser-ui/jnlp</jnlpCodebase> + </properties> <dependencies> @@ -345,7 +348,7 @@ <libPath>lib</libPath> <makeArchive>false</makeArchive> <verbose>false</verbose> - <codebase>https://coser.codelutin.com/v/${siteDeployClassifier}/coser-ui/jnlp</codebase> + <codebase>${jnlpCodebase}</codebase> <jnlp> <inputTemplateResourcePath>${project.basedir}</inputTemplateResourcePath> <inputTemplate>src/main/jnlp/coser-jnlp.vm</inputTemplate> @@ -353,6 +356,7 @@ <allPermissions>true</allPermissions> <offlineAllowed>true</offlineAllowed> <j2seVersion>1.6+</j2seVersion> + <outputFile>${jnlpFileName}</outputFile> </jnlp> <updateManifestEntries> <Application-Name>Coser ${project.version}</Application-Name> @@ -393,15 +397,7 @@ </plugin> </plugins> </build> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> - </plugin> - </plugins> - </reporting> + </profile> <profile> @@ -444,6 +440,16 @@ </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> + <configuration> + <siteJnlpFile>${jnlpFileName}</siteJnlpFile> + <codebase>${jnlpCodebase}</codebase> + </configuration> + </plugin> + </plugins> </reporting> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm