r2357 - in trunk: . jaxx-compiler/src/site jaxx-demo/src/site jaxx-demo/src/site/rst jaxx-demo/src/site/rst/images jaxx-maven-plugin/src/site jaxx-runtime/src/site jaxx-swing-action/src/site jaxx-tutorial/src/site jaxx-tutorial-config/src/site jaxx-tutorial-css/src/site jaxx-tutorial-databinding/src/site jaxx-tutorial-helloworld/src/site jaxx-tutorial-helloworld2/src/site jaxx-tutorial-validation/src/site jaxx-validator/src/site jaxx-widgets/src/site jaxx-widgets/src/site/rst src/site src/sit
Author: tchemit Date: 2012-06-29 11:39:27 +0200 (Fri, 29 Jun 2012) New Revision: 2357 Url: http://nuiton.org/repositories/revision/jaxx/2357 Log: fixes #2150: Jnlp demo won't works. fixes #2149: Remove tutorial as part of release build fixes #2148: Use now fluido for generated site Added: trunk/jaxx-validator/src/site/rst/ Removed: trunk/jaxx-demo/src/site/rst/images/webstart.gif trunk/jaxx-validator/src/site/apt/ trunk/jaxx-widgets/src/site/rst/images/ trunk/src/site/resources/images/ Modified: trunk/jaxx-compiler/src/site/site_fr.xml trunk/jaxx-demo/src/site/rst/index.rst trunk/jaxx-demo/src/site/site_fr.xml trunk/jaxx-maven-plugin/src/site/site_fr.xml trunk/jaxx-runtime/src/site/site_fr.xml trunk/jaxx-swing-action/src/site/site_fr.xml trunk/jaxx-tutorial-config/src/site/site_fr.xml trunk/jaxx-tutorial-css/src/site/site_fr.xml trunk/jaxx-tutorial-databinding/src/site/site_fr.xml trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml trunk/jaxx-tutorial-validation/src/site/site_fr.xml trunk/jaxx-tutorial/src/site/site_fr.xml trunk/jaxx-validator/src/site/site_fr.xml trunk/jaxx-widgets/src/site/site_fr.xml trunk/pom.xml trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml Modified: trunk/jaxx-compiler/src/site/site_fr.xml =================================================================== --- trunk/jaxx-compiler/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-compiler/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -54,7 +54,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Deleted: trunk/jaxx-demo/src/site/rst/images/webstart.gif =================================================================== (Binary files differ) Modified: trunk/jaxx-demo/src/site/rst/index.rst =================================================================== --- trunk/jaxx-demo/src/site/rst/index.rst 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-demo/src/site/rst/index.rst 2012-06-29 09:39:27 UTC (rev 2357) @@ -42,7 +42,7 @@ Screen shot ----------- -.. image:: images/Components-screenshot.gif +.. image:: ./images/Components-screenshot.gif Set it in action ---------------- @@ -62,8 +62,10 @@ .. _Java Web Start: http://java.sun.com/products/javawebstart/ -.. |webstart| image:: images/webstart.gif +.. |webstart| image:: http://maven-site.nuiton.org/public/images/logos//webstart.gif .. _following link: ./jnlp/launch.jnlp .. _Jaxx Demo webstart: jnlp-report.html + +.. _XUL Grand Coding Challenge 2004: http://xul.sourceforge.net/challenge.html Modified: trunk/jaxx-demo/src/site/site_fr.xml =================================================================== --- trunk/jaxx-demo/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-demo/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -27,12 +27,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -62,7 +63,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/jaxx-maven-plugin/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-maven-plugin/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -68,7 +68,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-runtime/src/site/site_fr.xml =================================================================== --- trunk/jaxx-runtime/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-runtime/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -58,7 +58,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-swing-action/src/site/site_fr.xml =================================================================== --- trunk/jaxx-swing-action/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-swing-action/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -85,7 +85,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -56,7 +56,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-config/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,12 +28,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -59,7 +60,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-css/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,12 +28,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -59,7 +60,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-databinding/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,12 +28,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -59,7 +60,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,12 +28,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -59,7 +60,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,12 +28,13 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -59,7 +60,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-tutorial-validation/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,13 +28,14 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="http://maven-site.chorem.org/public/images/logos/jaxx-logos.png"/> </poweredBy> <body> @@ -60,7 +61,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-validator/src/site/site_fr.xml =================================================================== --- trunk/jaxx-validator/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-validator/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -56,7 +56,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/jaxx-widgets/src/site/site_fr.xml =================================================================== --- trunk/jaxx-widgets/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/jaxx-widgets/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -56,7 +56,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/pom.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -510,7 +510,8 @@ <gzip>true</gzip> <unsign>true</unsign> <canUnsign>false</canUnsign> - <pack200>true</pack200> + <!--Can't use pack2000 since there is some already signed jar--> + <!--<pack200>true</pack200>--> <jnlpExtensions> <!--jnlpExtension> <name>sun</name> @@ -586,7 +587,7 @@ </activation> <modules> <module>jaxx-demo</module> - <module>jaxx-tutorial</module> + <!--<module>jaxx-tutorial</module>--> </modules> </profile> Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/src/site/rst/index.rst 2012-06-29 09:39:27 UTC (rev 2357) @@ -52,6 +52,12 @@ Pour plus d'information sur comment utiliser le plugin, veuillez visiter la `page des goals`_ +Suppression des tutoriaux +_________________________ + +La maintenance des tutoriaux est compliquée, nous les désactivons dans cette version, il seront remplacés +bientôt par des articles sur notre blog. + Nouveautés de la version 2.4 ---------------------------- Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-06-29 09:35:53 UTC (rev 2356) +++ trunk/src/site/site_fr.xml 2012-06-29 09:39:27 UTC (rev 2357) @@ -34,9 +34,9 @@ <custom> <fluidoSkin> - <topBarEnabled>true</topBarEnabled> + <topBarEnabled>false</topBarEnabled> <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> + <sideBarEnabled>true</sideBarEnabled> <searchEnabled>true</searchEnabled> <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> </fluidoSkin> @@ -44,7 +44,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/jaxx.png</src> + <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src> <href>index.html</href> </bannerLeft> @@ -58,12 +58,12 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="${project.url}/images/jrst-logo.png"/> + img="http://maven-site.chorem.org/public/images/logos/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${project.url}/images/restructuredtext-logo.png"/> + img="http://maven-site.chorem.org/public/images/logos/restructuredtext-logo.png"/> </poweredBy> <body> @@ -87,6 +87,7 @@ <item name="Accueil" href="index.html"/> <item name="Présentation/Concept" href="presentation.html"/> <item name="Qu'est-ce qu'un fichier JAXX ?" href="JAXXFile.html"/> + <item name="Démonstration" href="demo.html"/> </menu> <menu name="Fonctionalités de base"> @@ -107,14 +108,14 @@ <!--item name="Widgets" href=""/--> </menu> - <menu name="Démo et Tutoriels"> + <!--menu name="Démo et Tutoriels"> <item name="Démo" href="demo.html"/> <item name="Hello World" href="tutos/helloworld.html"/> <item name="Hello World 2" href="tutos/helloworld2.html"/> <item name="Feuilles de style" href="tutos/css.html"/> <item name="Data-binding" href="tutos/data-binding.html"/> <item name="ConfigUI" href="tutos/config.html"/> - </menu> + </menu--> <menu name="Ancienne documentation"> <item name="Migration JAXX 2.0" href="migration.html"/> @@ -133,7 +134,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'
participants (1)
-
tchemit＠users.nuiton.org