r741 - in branches/eugene-2.0: . eugene/src/site eugene/src/site/resources eugene-test maven-eugene-plugin maven-eugene-plugin/src/site maven-eugene-plugin/src/site/fr maven-eugene-plugin/src/site/fr/rst maven-eugene-plugin/src/site/rst src/site - Eugene-commits

11 Dec 2009

Author: tchemit
Date: 2009-12-11 11:56:36 +0100 (Fri, 11 Dec 2009)
New Revision: 741

Added:
   branches/eugene-2.0/eugene/src/site/rst/
   branches/eugene-2.0/maven-eugene-plugin/src/site/fr/
   branches/eugene-2.0/maven-eugene-plugin/src/site/fr/rst/
   branches/eugene-2.0/maven-eugene-plugin/src/site/fr/rst/index.rst
   branches/eugene-2.0/maven-eugene-plugin/src/site/site_en.xml
   branches/eugene-2.0/maven-eugene-plugin/src/site/site_fr.xml
   branches/eugene-2.0/src/site/site_en.xml
   branches/eugene-2.0/src/site/site_fr.xml
Removed:
   branches/eugene-2.0/eugene-test/nbactions.xml
   branches/eugene-2.0/eugene/src/site/en/
   branches/eugene-2.0/eugene/src/site/resources/index.html
   branches/eugene-2.0/maven-eugene-plugin/src/site/site.xml
   branches/eugene-2.0/src/site/site.xml
Modified:
   branches/eugene-2.0/eugene/src/site/site_en.xml
   branches/eugene-2.0/eugene/src/site/site_fr.xml
   branches/eugene-2.0/maven-eugene-plugin/pom.xml
   branches/eugene-2.0/maven-eugene-plugin/src/site/rst/index.rst
   branches/eugene-2.0/pom.xml
Log:
- use mavenpom 1.1.2
- use normal directory layout for site
- remove ide files


Deleted: branches/eugene-2.0/eugene/src/site/resources/index.html
===================================================================

--- branches/eugene-2.0/eugene/src/site/resources/index.html	2009-12-11 09:58:30 UTC (rev 740)
+++ branches/eugene-2.0/eugene/src/site/resources/index.html	2009-12-11 10:56:36 UTC (rev 741)
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>EUGene</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta http-equiv="Refresh" content="0; url=fr/index.html">
-    </head>
-    <body />
-</html>

Modified: branches/eugene-2.0/eugene/src/site/site_en.xml
===================================================================
--- branches/eugene-2.0/eugene/src/site/site_en.xml	2009-12-11 09:58:30 UTC (rev 740)
+++ branches/eugene-2.0/eugene/src/site/site_en.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -8,7 +8,7 @@
     <body>
         
         <breadcrumbs>
-            <item name="${project.name}" href="${project.url}" />
+            <item name="${project.name}" href="index.html" />
         </breadcrumbs>
 
         <links>

Modified: branches/eugene-2.0/eugene/src/site/site_fr.xml
===================================================================
--- branches/eugene-2.0/eugene/src/site/site_fr.xml	2009-12-11 09:58:30 UTC (rev 740)
+++ branches/eugene-2.0/eugene/src/site/site_fr.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -8,13 +8,13 @@
     <body>
         
         <breadcrumbs>
-            <item name="${project.name}" href="${project.url}" />
+            <item name="${project.name}" href="index.html" />
         </breadcrumbs>
 
         <links>
             <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" />
             <item name="[fr" href="index.html" />
-            <item name="en]" href="../en/index.html" />
+            <item name="en]" href="../index.html" />
         </links>
 
         <menu ref="parent"/>

Deleted: branches/eugene-2.0/eugene-test/nbactions.xml
===================================================================
--- branches/eugene-2.0/eugene-test/nbactions.xml	2009-12-11 09:58:30 UTC (rev 740)
+++ branches/eugene-2.0/eugene-test/nbactions.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-        <action>
-            <actionName>CUSTOM-debug maven</actionName>
-            <displayName>debug maven</displayName>
-            <goals>
-                <goal>clean</goal>
-                <goal>install</goal>
-                <goal>-e</goal>
-                <goal>-Dlog4j.configuration=file:src/test/resources/log4j.properties</goal>
-            </goals>
-        </action>
-    </actions>

Modified: branches/eugene-2.0/maven-eugene-plugin/pom.xml
===================================================================
--- branches/eugene-2.0/maven-eugene-plugin/pom.xml	2009-12-11 09:58:30 UTC (rev 740)
+++ branches/eugene-2.0/maven-eugene-plugin/pom.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -91,7 +91,6 @@
                     <execution>
                         <goals>
                             <goal>generate-metadata</goal>
-                            <!--<goal>merge-metadata</goal>-->
                         </goals>
                     </execution>
                 </executions>

Copied: branches/eugene-2.0/maven-eugene-plugin/src/site/fr/rst/index.rst (from rev 739, branches/eugene-2.0/maven-eugene-plugin/src/site/rst/index.rst)
===================================================================
(Binary files differ)

Modified: branches/eugene-2.0/maven-eugene-plugin/src/site/rst/index.rst
===================================================================
(Binary files differ)

Deleted: branches/eugene-2.0/maven-eugene-plugin/src/site/site.xml
===================================================================
--- branches/eugene-2.0/maven-eugene-plugin/src/site/site.xml	2009-12-11 09:58:30 UTC (rev 740)
+++ branches/eugene-2.0/maven-eugene-plugin/src/site/site.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="${project.name}">
-
-    <bannerLeft>
-        <name>${project.name}</name>
-    </bannerLeft>
-
-    <body>
-        <links>
-            <item name="Eugene" href="../eugene"/>
-        </links>
-
-        <breadcrumbs>
-            <item name="${project.name}" href="${project.url}" />
-        </breadcrumbs>
-
-        <menu ref="parent"/>
-        
-        <menu name="Utilisateur">
-            <item href="index.html" name="Accueil"/>
-            <item name="Goals" href="plugin-info.html">
-                <item name="zargo2xmi" href="zargo2xmi-mojo.html"/>
-                <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/>
-                <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/>
-                <item name="generate" href="generate-mojo.html"/>
-                <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/>
-                <item name="help" href="help-mojo.html"/>
-            </item>
-        </menu>
-
-        <menu name="Téléchargement">
-            <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
-                  name="Librairie (jar)"/>
-            <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
-                  name="Javadoc (jar)"/>
-            <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
-                  name="Sources (jar)"/>
-        </menu>
-        
-        <menu ref="reports"/>
-
-    </body>
-</project>

Added: branches/eugene-2.0/maven-eugene-plugin/src/site/site_en.xml
===================================================================
--- branches/eugene-2.0/maven-eugene-plugin/src/site/site_en.xml	                        (rev 0)
+++ branches/eugene-2.0/maven-eugene-plugin/src/site/site_en.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="${project.name}">
+
+    <bannerLeft>
+        <name>${project.name}</name>
+    </bannerLeft>
+
+    <body>
+        <links>
+            <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" />
+            <item name="[fr" href="../fr/index.html" />
+            <item name="en]" href="index.html" />
+        </links>
+
+        <breadcrumbs>
+            <item name="${project.name}" href="index.html" />
+        </breadcrumbs>
+
+        <menu ref="parent"/>
+        
+        <menu name="User">
+            <item href="index.html" name="Index"/>
+            <item name="Goals" href="plugin-info.html">
+                <item name="zargo2xmi" href="zargo2xmi-mojo.html"/>
+                <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/>
+                <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/>
+                <item name="generate-model-files" href="generate-model-files-mojo.html"/>
+                <item name="generate" href="generate-mojo.html"/>
+                <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/>
+                <item name="help" href="help-mojo.html"/>
+            </item>
+        </menu>
+
+        <menu name="Download">
+            <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+                  name="Library (jar)"/>
+            <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+                  name="Javadoc (jar)"/>
+            <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+                  name="Sources (jar)"/>
+        </menu>
+        
+        <menu ref="reports"/>
+
+    </body>
+</project>

Copied: branches/eugene-2.0/maven-eugene-plugin/src/site/site_fr.xml (from rev 739, branches/eugene-2.0/maven-eugene-plugin/src/site/site.xml)
===================================================================
--- branches/eugene-2.0/maven-eugene-plugin/src/site/site_fr.xml	                        (rev 0)
+++ branches/eugene-2.0/maven-eugene-plugin/src/site/site_fr.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="${project.name}">
+
+    <bannerLeft>
+        <name>${project.name}</name>
+    </bannerLeft>
+
+    <body>
+        <links>
+            <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
+            <item name="[fr" href="index.html"/>
+            <item name="en]" href="../index.html"/>
+        </links>
+
+        <breadcrumbs>
+            <item name="${project.name}" href="index.html"/>
+        </breadcrumbs>
+
+        <menu ref="parent"/>
+
+        <menu name="Utilisateur">
+            <item href="index.html" name="Accueil"/>
+            <item name="Goals" href="plugin-info.html">
+                <item name="zargo2xmi" href="zargo2xmi-mojo.html"/>
+                <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/>
+                <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/>
+                <item name="generate-model-files" href="generate-model-files-mojo.html"/>
+                <item name="generate" href="generate-mojo.html"/>
+                <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/>
+                <item name="help" href="help-mojo.html"/>
+            </item>
+        </menu>
+
+        <menu name="Téléchargement">
+            <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+                  name="Librairie (jar)"/>
+            <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+                  name="Javadoc (jar)"/>
+            <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+                  name="Sources (jar)"/>
+        </menu>
+
+        <menu ref="reports"/>
+
+    </body>
+</project>


Property changes on: branches/eugene-2.0/maven-eugene-plugin/src/site/site_fr.xml
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: branches/eugene-2.0/pom.xml
===================================================================
--- branches/eugene-2.0/pom.xml	2009-12-11 09:58:30 UTC (rev 740)
+++ branches/eugene-2.0/pom.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.nuiton</groupId>
         <artifactId>mavenpom</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>eugene</artifactId>
@@ -251,12 +251,11 @@
 
         <!-- TODO TC-20090823 remove ant deps -->
         <ant.version>1.7.1</ant.version>
-        <processor.version>1.0.2</processor.version>
+        <processor.version>1.0.3-SNAPSHOT</processor.version>
         <nuiton-utils.version>1.1.0</nuiton-utils.version>
 
         <!--Multilanguage maven-site -->
         <maven.site.locales>en,fr</maven.site.locales>
-        <defaultLocale>en</defaultLocale>
     </properties>
 
     <build>

Deleted: branches/eugene-2.0/src/site/site.xml
===================================================================
--- branches/eugene-2.0/src/site/site.xml	2009-12-11 09:58:30 UTC (rev 740)
+++ branches/eugene-2.0/src/site/site.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="${project.name}">
-
-    <bannerLeft>
-        <name>${project.name}</name>
-        <href>/</href>
-    </bannerLeft>
-
-    <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"/>
-        <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/>
-    </poweredBy>
-
-    <body>
-        
-        <breadcrumbs>            
-            <item name="${project.name}" href="${project.url}" />
-        </breadcrumbs>
-
-        <menu ref="modules"/>
-
-        <menu ref="reports"/>
-    </body>
-</project>

Added: branches/eugene-2.0/src/site/site_en.xml
===================================================================
--- branches/eugene-2.0/src/site/site_en.xml	                        (rev 0)
+++ branches/eugene-2.0/src/site/site_en.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="${project.name}">
+
+    <bannerLeft>
+        <name>${project.name}</name>
+        <href>/</href>
+    </bannerLeft>
+
+    <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"/>
+        <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/>
+    </poweredBy>
+
+    <body>
+        
+        <breadcrumbs>            
+            <item name="${project.name}" href="index.html" />
+        </breadcrumbs>
+
+        <menu ref="modules"/>
+
+        <menu ref="reports"/>
+    </body>
+</project>

Copied: branches/eugene-2.0/src/site/site_fr.xml (from rev 739, branches/eugene-2.0/src/site/site.xml)
===================================================================
--- branches/eugene-2.0/src/site/site_fr.xml	                        (rev 0)
+++ branches/eugene-2.0/src/site/site_fr.xml	2009-12-11 10:56:36 UTC (rev 741)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="${project.name}">
+
+    <bannerLeft>
+        <name>${project.name}</name>
+        <href>/</href>
+    </bannerLeft>
+
+    <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"/>
+        <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/>
+    </poweredBy>
+
+    <body>
+        
+        <breadcrumbs>            
+            <item name="${project.name}" href="index.html" />
+        </breadcrumbs>
+
+        <menu ref="modules"/>
+
+        <menu ref="reports"/>
+    </body>
+</project>

    

r741 - in branches/eugene-2.0: . eugene/src/site eugene/src/site/resources eugene-test maven-eugene-plugin maven-eugene-plugin/src/site maven-eugene-plugin/src/site/fr maven-eugene-plugin/src/site/fr/rst maven-eugene-plugin/src/site/rst src/site

tchemit＠users.nuiton.org

tags

participants (1)