r333 - in jrst/trunk: . src/main/java/org/codelutin/jrst src/site src/site/resources - Jrst-commits

16 May 2009

Author: tchemit
Date: 2009-05-16 05:21:13 +0000 (Sat, 16 May 2009)
New Revision: 333

Modified:
   jrst/trunk/pom.xml
   jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java
   jrst/trunk/src/main/java/org/codelutin/jrst/JRSTInterface.java
   jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java
   jrst/trunk/src/site/resources/en-redirect.html
   jrst/trunk/src/site/resources/fr-redirect.html
   jrst/trunk/src/site/site.xml
   jrst/trunk/src/site/site_en.xml
Log:
migrate to nuiton part One

Modified: jrst/trunk/pom.xml
===================================================================

--- jrst/trunk/pom.xml	2009-05-11 06:20:23 UTC (rev 332)
+++ jrst/trunk/pom.xml	2009-05-16 05:21:13 UTC (rev 333)
@@ -8,9 +8,9 @@
     <!-- ************************************************************* -->
 
     <parent>
-        <groupId>org.codelutin</groupId>
-        <artifactId>lutinproject</artifactId>
-        <version>3.5.4</version>
+        <groupId>org.nuiton</groupId>
+        <artifactId>mavenpom</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jrst</artifactId>
@@ -24,9 +24,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.codelutin</groupId>
-            <artifactId>lutinutil</artifactId>
-            <version>${lutinutil.version}</version>
+            <groupId>org.nuiton</groupId>
+            <artifactId>nuiton-utils</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>sdoc</groupId>
             <artifactId>sdoc</artifactId>
-            <version>0.5.0-beta</version>
+            <version>0.5.0-beta-patchcl</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -76,6 +76,14 @@
             <artifactId>docbook-xsl</artifactId>
             <version>1.72.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.6</version>
+            <scope>test</scope>
+        </dependency>
+        
     </dependencies>
 
     <!-- ************************************************************* -->
@@ -92,18 +100,15 @@
     <packaging>jar</packaging>
 
     <properties>
-        <!-- id du projet du labs -->
-        <labs.id>54</labs.id>
 
-        <!-- nom du projet sur le labs -->
-        <labs.project>jrst</labs.project>
-
         <!-- Site en et fr -->
         <maven.site.locales>fr,en</maven.site.locales>
-
-        <lutinutil.version>1.0.6</lutinutil.version>
         
         <maven.jar.main.class>org.codelutin.jrst.JRST</maven.jar.main.class>
+        
+        <!-- a supprimer des qu'on pourra deployer les sites sur nuiton -->
+        <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/jrst/htdocs/nuiton</site.deploy.url>
+        
     </properties>
 
     <developers>
@@ -148,9 +153,9 @@
 
             <!-- plugin i18n -->
             <plugin>
-                <groupId>org.codelutin</groupId>
+                <groupId>org.nuiton</groupId>
                 <artifactId>maven-i18n-plugin</artifactId>
-                <version>0.12</version>
+                <version>1.0.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -159,13 +164,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.codelutin</groupId>
-                        <artifactId>lutinutil</artifactId>
-                        <version>${lutinutil.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             
             <plugin>
@@ -174,7 +172,6 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <!--mainClass>org.codelutin.jrst.JRST</mainClass-->
                             <classpathPrefix>lib/</classpathPrefix>
                         </manifest>
                     </archive>
@@ -193,29 +190,6 @@
                 </executions>
             </plugin>
 
-            <!-- Always process jrst files, but only called on pre-site phase -->
-            <!--plugin>
-                <groupId>org.codelutin</groupId>
-                <artifactId>maven-jrst-plugin</artifactId>
-                <version>0.8.4</version>
-                <configuration>
-                    <directoryIn>${maven.src.dir}/site</directoryIn>
-                    <directoryOut>${maven.site.gen.dir}</directoryOut>
-                    <defaultLocale>fr</defaultLocale>
-                    <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
-                    <outputEncoding>${project.build.sourceEncoding}</outputEncoding>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>pre-site</phase>
-                        <goals>
-                            <goal>jrst</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin-->
-
-
         </plugins>
 
         <pluginManagement>
@@ -223,12 +197,11 @@
 
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.5</version>
                     <configuration>
                         <quiet>true</quiet>
                         <links>
                             <link>http://java.sun.com/javase/6/docs/api/</link>
-                            <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link>
+                            <link>http://lutinutil.labs.libre-entreprise.org/nuiton-utils/apidocs/</link>
                         </links>
                     </configuration>
                 </plugin>
@@ -251,7 +224,7 @@
                         <dependency>
                             <groupId>org.codelutin</groupId>
                             <artifactId>doxia-module-jrst</artifactId>
-                            <version>1.0.0</version>
+                            <version>1.0.1</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -264,18 +237,13 @@
     <!-- ************************************************************* -->
     <!-- *** Build Environment  ************************************** -->
     <!-- ************************************************************* -->
-    <scm>
-        <connection>${maven.scm.connection}</connection>
-        <developerConnection>${maven.scm.developerConnection}</developerConnection>
-        <url>${maven.scm.url}</url>
-    </scm>
 
-    <!--Code Lutin Repository-->
+    <!--Nuiton Repository : pourra etre supprimer lorsqu'on sera sur central -->
     <repositories>
         <repository>
-            <id>codelutin-repository</id>
-            <name>CodeLutinRepository</name>
-            <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url>
+            <id>nuiton-repository</id>
+            <name>NuitonRepository</name>
+            <url>${repository.home.url}</url>
             <snapshots>
                 <enabled>true</enabled>
                 <checksumPolicy>warn</checksumPolicy>
@@ -300,23 +268,6 @@
             <build>
                 <plugins>
 
-
-                    <!-- always add license and third-party files to classpath -->
-                    <plugin>
-                        <groupId>org.codelutin</groupId>
-                        <artifactId>maven-license-switcher-plugin</artifactId>
-                        <version>0.8</version>
-                        <executions>
-                            <execution>
-                                <id>attach-licenses</id>
-                                <goals>
-                                    <goal>license</goal>
-                                    <goal>third-party</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
                     <!-- launch in a release the assembly automaticly -->
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>

Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java
===================================================================
--- jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java	2009-05-11 06:20:23 UTC (rev 332)
+++ jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java	2009-05-16 05:21:13 UTC (rev 333)
@@ -17,7 +17,7 @@
 
 package org.codelutin.jrst;
 
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
 
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
@@ -49,11 +49,11 @@
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.MimeConstants;
-import org.codelutin.i18n.I18n;
-import org.codelutin.util.FileCompletion;
-import org.codelutin.util.FileUtil;
-import org.codelutin.util.Resource;
-import org.codelutin.util.StringUtil;
+import org.nuiton.i18n.I18n;
+import org.nuiton.util.FileCompletion;
+import org.nuiton.util.FileUtil;
+import org.nuiton.util.Resource;
+import org.nuiton.util.StringUtil;
 import org.dom4j.Document;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;

Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTInterface.java
===================================================================
--- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTInterface.java	2009-05-11 06:20:23 UTC (rev 332)
+++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTInterface.java	2009-05-16 05:21:13 UTC (rev 333)
@@ -17,7 +17,7 @@
  */
 package org.codelutin.jrst;
 
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -45,7 +45,7 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import org.codelutin.util.Resource;
+import org.nuiton.util.Resource;
 
 /**
  * JRST main interface.

Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java
===================================================================
--- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java	2009-05-11 06:20:23 UTC (rev 332)
+++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTReader.java	2009-05-16 05:21:13 UTC (rev 333)
@@ -29,7 +29,7 @@
 
 package org.codelutin.jrst;
 
-import static org.codelutin.i18n.I18n._;
+import static org.nuiton.i18n.I18n._;
 import static org.codelutin.jrst.ReStructuredText.ADDRESS;
 import static org.codelutin.jrst.ReStructuredText.ADMONITION;
 import static org.codelutin.jrst.ReStructuredText.ATTRIBUTION;
@@ -130,7 +130,7 @@
 import org.codelutin.jrst.directive.DateDirective;
 import org.codelutin.jrst.directive.ImageDirective;
 import org.codelutin.jrst.directive.SectnumDirective;
-import org.codelutin.util.StringUtil;
+import org.nuiton.util.StringUtil;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
@@ -449,6 +449,7 @@
             result.setRootElement(root);
 
             root.accept(new VisitorSupport() {
+                @Override
                 public void visit(Element e) {
                     // remove all level attribute
                     e.addAttribute("level", null);

Modified: jrst/trunk/src/site/resources/en-redirect.html
===================================================================
--- jrst/trunk/src/site/resources/en-redirect.html	2009-05-11 06:20:23 UTC (rev 332)
+++ jrst/trunk/src/site/resources/en-redirect.html	2009-05-16 05:21:13 UTC (rev 333)
@@ -2,6 +2,6 @@
 <head>
     <title>JRst</title>
 </head>
-<body onload="window.location.href = '/jrst/en'">Veuillez patientez pendant la redirection...</body>
+<body onload="window.location.href = '/nuiton/jrst/en'">Veuillez patientez pendant la redirection...</body>
 </html>
                                              
\ No newline at end of file

Modified: jrst/trunk/src/site/resources/fr-redirect.html
===================================================================
--- jrst/trunk/src/site/resources/fr-redirect.html	2009-05-11 06:20:23 UTC (rev 332)
+++ jrst/trunk/src/site/resources/fr-redirect.html	2009-05-16 05:21:13 UTC (rev 333)
@@ -2,6 +2,6 @@
 <head>
     <title>JRst</title>
 </head>
-<body onload="window.location.href = '/jrst/';">Veuillez patientez pendant la redirection...</body>
+<body onload="window.location.href = '/nuiton/jrst/';">Veuillez patientez pendant la redirection...</body>
 </html>
                                              
\ No newline at end of file

Modified: jrst/trunk/src/site/site.xml
===================================================================
--- jrst/trunk/src/site/site.xml	2009-05-11 06:20:23 UTC (rev 332)
+++ jrst/trunk/src/site/site.xml	2009-05-16 05:21:13 UTC (rev 333)
@@ -27,12 +27,13 @@
 
     <body>
         <links>
-            <item name="Maven-jrst-plugin" href="http://jrst.labs.libre-entreprise.org/maven-jrst-plugin/"/>
-            <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/doxia-module-jrst/"/>
+            <item name="Maven-jrst-plugin" href="http://jrst.labs.libre-entreprise.org/nuiton/maven-jrst-plugin/"/>
+            <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/nuiton/doxia-module-jrst/"/>
             <item name="Labs" href="http://labs.libre-entreprise.org/"/>
+            <item name="Nuiton" href="http://www.nuiton.org"/>
             <item name="Code Lutin" href="http://www.codelutin.com/"/>
-            <item name="[fr" href="http://jrst.labs.libre-entreprise.org/jrst/fr-redirect.html"/>
-            <item name="en]" href="http://jrst.labs.libre-entreprise.org/jrst/en-redirect.html"/>
+            <item name="[fr" href="http://jrst.labs.libre-entreprise.org/nuiton/jrst/fr-redirect.html"/>
+            <item name="en]" href="http://jrst.labs.libre-entreprise.org/nuiton/jrst/en-redirect.html"/>
         </links>
 
         <menu name="Utilisateur">
@@ -51,15 +52,15 @@
         </menu>
 
         <menu name="Téléchargement">
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+            <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
                   name="Librairie (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+            <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
                   name="Javadoc (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+            <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
                   name="Sources (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip"
+            <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip"
                   name="Bundle sans sources (zip)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip"
+            <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip"
                   name="Bundle complêt (zip)"/>
         </menu>
 

Modified: jrst/trunk/src/site/site_en.xml
===================================================================
--- jrst/trunk/src/site/site_en.xml	2009-05-11 06:20:23 UTC (rev 332)
+++ jrst/trunk/src/site/site_en.xml	2009-05-16 05:21:13 UTC (rev 333)
@@ -25,12 +25,13 @@
 
     <body>
         <links>
-            <item name="Maven-jrst-plugin" href="http://jrst.labs.libre-entreprise.org/maven-jrst-plugin/"/>
-            <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/doxia-module-jrst/"/>
+            <item name="Maven-jrst-plugin" href="http://jrst.labs.libre-entreprise.org/nuiton/maven-jrst-plugin/"/>
+            <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/nuiton/doxia-module-jrst/"/>
             <item name="Labs" href="http://labs.libre-entreprise.org/"/>
+            <item name="Nuiton" href="http://www.nuiton.org"/>
             <item name="Code Lutin" href="http://www.codelutin.com/"/>
-            <item name="[fr" href="http://jrst.labs.libre-entreprise.org/jrst/fr-redirect.html"/>
-            <item name="en]" href="http://jrst.labs.libre-entreprise.org/jrst/en-redirect.html"/>
+            <item name="[fr" href="http://jrst.labs.libre-entreprise.org/jrst/nuiton/fr-redirect.html"/>
+            <item name="en]" href="http://jrst.labs.libre-entreprise.org/jrst/nuiton/en-redirect.html"/>
         </links>
 
         <menu name="User">
@@ -50,15 +51,15 @@
         </menu>
 
         <menu name="Téléchargement">
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+            <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
                   name="Librairie (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+            <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
                   name="Javadoc (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+            <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
                   name="Sources (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip"
+            <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip"
                   name="Bundle sans sources (zip)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip"
+            <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip"
                   name="Bundle complêt (zip)"/>
         </menu>

    

r333 - in jrst/trunk: . src/main/java/org/codelutin/jrst src/site src/site/resources

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)