Author: tchemit Date: 2009-08-23 18:12:26 +0200 (Sun, 23 Aug 2009) New Revision: 1517 Modified: trunk/jaxx-compiler/src/main/java/jaxx/ClassMap.java trunk/jaxx-compiler/src/site/site.xml trunk/jaxx-example/pom.xml trunk/jaxx-example/src/site/site.xml trunk/jaxx-runtime-api/src/site/site.xml trunk/jaxx-runtime-swing-widget/src/site/site.xml trunk/jaxx-runtime-swing/src/site/site.xml trunk/jaxx-swing-action/src/site/site.xml trunk/maven-jaxx-plugin/pom.xml trunk/maven-jaxx-plugin/src/site/site.xml trunk/pom.xml trunk/src/site/site.xml Log: - bump versions - use jrst - clean sites Modified: trunk/jaxx-compiler/src/main/java/jaxx/ClassMap.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/ClassMap.java 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/jaxx-compiler/src/main/java/jaxx/ClassMap.java 2009-08-23 16:12:26 UTC (rev 1517) @@ -21,6 +21,7 @@ * <p/> * A <code>get</code> operation will return the value associated with the class itself, or failing * that, with its nearest ancestor for which there exists a mapping. + * @param <T> type of the class */ public class ClassMap<T> extends HashMap<ClassDescriptor, T> { /** log */ Modified: trunk/jaxx-compiler/src/site/site.xml =================================================================== --- trunk/jaxx-compiler/src/site/site.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/jaxx-compiler/src/site/site.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -1,25 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <src>${site.home.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <body> <breadcrumbs> Modified: trunk/jaxx-example/pom.xml =================================================================== --- trunk/jaxx-example/pom.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/jaxx-example/pom.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -30,12 +30,9 @@ <artifactId>jaxx-runtime-swing-widget</artifactId> <version>${project.version}</version> </dependency> - <!--dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-runtime-validator-swing</artifactId> - <version>${project.version}</version> - </dependency--> + <!-- test dependencies --> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>jaxx-runtime-api</artifactId> Modified: trunk/jaxx-example/src/site/site.xml =================================================================== --- trunk/jaxx-example/src/site/site.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/jaxx-example/src/site/site.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -1,25 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <src>${site.home.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <body> <breadcrumbs> @@ -28,7 +15,9 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"/> + <menu name="Utilisateur" inherited="top"> + <item name="Lancer la démo" href="launch-demo.jnlp"/> + </menu> <menu ref="reports"/> Modified: trunk/jaxx-runtime-api/src/site/site.xml =================================================================== --- trunk/jaxx-runtime-api/src/site/site.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/jaxx-runtime-api/src/site/site.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -1,25 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <src>${site.home.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <body> <breadcrumbs> Modified: trunk/jaxx-runtime-swing/src/site/site.xml =================================================================== --- trunk/jaxx-runtime-swing/src/site/site.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/jaxx-runtime-swing/src/site/site.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -1,25 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <src>${site.home.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <body> <breadcrumbs> Modified: trunk/jaxx-runtime-swing-widget/src/site/site.xml =================================================================== --- trunk/jaxx-runtime-swing-widget/src/site/site.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/jaxx-runtime-swing-widget/src/site/site.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -1,25 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <src>${site.home.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <body> <breadcrumbs> Modified: trunk/jaxx-swing-action/src/site/site.xml =================================================================== --- trunk/jaxx-swing-action/src/site/site.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/jaxx-swing-action/src/site/site.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -1,25 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <src>${site.home.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <body> <breadcrumbs> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/maven-jaxx-plugin/pom.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -26,20 +26,8 @@ <version>${project.version}</version> </dependency> - <!--dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-compiler-validator</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>${project.groupId}</groupId> - <artifactId>jaxx-compiler-swing</artifactId> - <version>${project.version}</version> - </dependency--> - - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>jaxx-swing-action</artifactId> <version>${project.version}</version> </dependency> Modified: trunk/maven-jaxx-plugin/src/site/site.xml =================================================================== --- trunk/maven-jaxx-plugin/src/site/site.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/maven-jaxx-plugin/src/site/site.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -1,25 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <src>${site.home.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <body> <breadcrumbs> @@ -37,9 +24,9 @@ </menu> <menu name="Téléchargement" inherit="top"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" + <item href="${labs.builder.url}/org/codelutin/jaxx/${project.artifactId}/${project.version}" name="Télécharger la dernière version"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" + <item href="${labs.builder.url}/org/codelutin/jaxx/${project.artifactId}" name="Voir toutes les versions"/> </menu> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/pom.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0-rc-5-SNAPSHOT</version> + <version>1.0.0</version> </parent> <artifactId>jaxx</artifactId> @@ -172,8 +172,8 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>jaxx</projectId> - <lutinutil.version>1.1.0-rc-9-SNAPSHOT</lutinutil.version> - <i18n.version>1.0.0-rc-5-SNAPSHOT</i18n.version> + <lutinutil.version>1.1.0</lutinutil.version> + <i18n.version>1.0.0</i18n.version> </properties> @@ -189,6 +189,17 @@ <version>${i18n.version}</version> </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> </pluginManagement> Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-20 15:09:36 UTC (rev 1516) +++ trunk/src/site/site.xml 2009-08-23 16:12:26 UTC (rev 1517) @@ -1,25 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - - <skin> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>1.0.0</version> - </skin> - <bannerLeft> <name>${project.name}</name> <src>${site.home.url}/jaxx.png</src> <href>index.html</href> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>${project.organization.url}</href> - </bannerRight> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> @@ -28,7 +15,6 @@ <body> <links> - <!--item name="maven-jaxx-plugin" href="../maven-jaxx-plugin"/--> <item name="original JAXX" href="http://buix.labs.libre-entreprise.org/original-jaxx"/> </links> @@ -44,9 +30,8 @@ <item name="A faire" href="Todo.html"/> </menu> - <menu ref="reports"/> - <menu ref="modules"/> + <menu ref="reports"/> </body> </project>