Author: tchemit Date: 2009-05-16 06:01:39 +0000 (Sat, 16 May 2009) New Revision: 337 Added: maven-jrst-plugin/trunk/src/main/java/org/nuiton/ Removed: maven-jrst-plugin/trunk/src/main/java/org/codelutin/ Modified: maven-jrst-plugin/trunk/pom.xml maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java maven-jrst-plugin/trunk/src/site/site.xml maven-jrst-plugin/trunk/src/site/site_en.xml Log: migrate to nuiton Modified: maven-jrst-plugin/trunk/pom.xml =================================================================== --- maven-jrst-plugin/trunk/pom.xml 2009-05-16 05:51:01 UTC (rev 336) +++ maven-jrst-plugin/trunk/pom.xml 2009-05-16 06:01:39 UTC (rev 337) @@ -6,25 +6,27 @@ <!-- ************************************************************* --> <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> + <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>maven-jrst-plugin</artifactId> <dependencies> <dependency> - <groupId>org.codelutin</groupId> + <groupId>org.nuiton</groupId> <artifactId>jrst</artifactId> - <version>0.8.6</version> + <version>1.0.0-SNAPSHOT</version> <scope>compile</scope> </dependency> + <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <version>${lutinpluginutil.version}</version> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>1.0.0-alpha-1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -48,7 +50,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> <name>Maven JRST Plugin</name> - <version>0.8.6</version> + <version>1.0.0-SNAPSHOT</version> <description> Maven2 plugin to generate reStructuredText file into xDoc. </description> @@ -60,18 +62,13 @@ <packaging>maven-plugin</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> - <lutinpluginutil.version>0.5</lutinpluginutil.version> - - <maven.version>2.0.10</maven.version> + <!-- 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> <build> @@ -82,7 +79,7 @@ <!-- plugin plugin --> <plugin> - <artifactId>maven-plugin-plugin</artifactId> + <artifactId>maven-plugin-plugin</artifactId> <executions> <execution> <goals> @@ -124,18 +121,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> @@ -147,39 +139,4 @@ </repository> </repositories> - <!-- Maven Environment : profiles --> - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <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> - - </plugins> - - </build> - </profile> - </profiles> - </project> Copied: maven-jrst-plugin/trunk/src/main/java/org/nuiton (from rev 335, maven-jrst-plugin/trunk/src/main/java/org/codelutin) Property changes on: maven-jrst-plugin/trunk/src/main/java/org/nuiton ___________________________________________________________________ Name: svn:mergeinfo + Modified: maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java =================================================================== --- maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/GenerationJRstException.java 2009-05-16 05:34:07 UTC (rev 335) +++ maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/GenerationJRstException.java 2009-05-16 06:01:39 UTC (rev 337) @@ -15,7 +15,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst.plugin; +package org.nuiton.jrst.plugin; /** * GenerationJRstException. Modified: maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java =================================================================== --- maven-jrst-plugin/trunk/src/main/java/org/codelutin/jrst/plugin/JRstPlugin.java 2009-05-16 05:34:07 UTC (rev 335) +++ maven-jrst-plugin/trunk/src/main/java/org/nuiton/jrst/plugin/JRstPlugin.java 2009-05-16 06:01:39 UTC (rev 337) @@ -15,14 +15,14 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ -package org.codelutin.jrst.plugin; +package org.nuiton.jrst.plugin; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.codehaus.plexus.util.DirectoryScanner; -import org.codelutin.jrst.JRST; -import org.codelutin.util.FileUtil; -import org.codelutin.util.MirroredFileUpdater; +import org.nuiton.jrst.JRST; +import org.nuiton.util.FileUtil; +import org.nuiton.util.MirroredFileUpdater; import java.io.File; import java.io.IOException; @@ -179,6 +179,7 @@ /** * Execute mojo. */ + @Override public void execute() throws MojoExecutionException { try { actionGenerate(); @@ -290,10 +291,12 @@ protected RstUpdater(File sourceDirectory, File destinationDirectory, String defaultLocale) { - super(sourceDirectory, destinationDirectory); + //FIXME should use the two paramters to transform names + super("", "", sourceDirectory, destinationDirectory); this.defaultLocale = defaultLocale; } + @Override public File getMirrorFile(File f) { String file = f.getAbsolutePath().substring(prefixSourceDirecotory); file = file.replace(".rst", ".xml").replaceFirst( @@ -317,10 +320,12 @@ protected RessourceUpdater(File sourceDirectory, File destinationDirectory, String defaultLocale) { - super(sourceDirectory, destinationDirectory); + //FIXME should use the two paramters to transform names + super("", "", sourceDirectory, destinationDirectory); this.defaultLocale = defaultLocale; } + @Override public File getMirrorFile(File f) { String file = f.getAbsolutePath().substring(prefixSourceDirecotory); file = file.replaceFirst("([/\\\\])rst([/\\\\])", "$1$2"); Modified: maven-jrst-plugin/trunk/src/site/site.xml =================================================================== --- maven-jrst-plugin/trunk/src/site/site.xml 2009-05-16 05:51:01 UTC (rev 336) +++ maven-jrst-plugin/trunk/src/site/site.xml 2009-05-16 06:01:39 UTC (rev 337) @@ -28,9 +28,10 @@ <body> <links> - <item name="jrst" href="http://jrst.labs.libre-entreprise.org/jrst/"/> - <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/doxia-module-jrst/"/> + <item name="jrst" href="http://jrst.labs.libre-entreprise.org/nuiton/jrst/"/> + <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="${project.organization.name}" href="${project.organization.url}"/> <item name="[fr" href="index.html"/> <item name="en]" href="en/index.html"/> @@ -45,11 +46,11 @@ </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)"/> </menu> Modified: maven-jrst-plugin/trunk/src/site/site_en.xml =================================================================== --- maven-jrst-plugin/trunk/src/site/site_en.xml 2009-05-16 05:51:01 UTC (rev 336) +++ maven-jrst-plugin/trunk/src/site/site_en.xml 2009-05-16 06:01:39 UTC (rev 337) @@ -26,9 +26,10 @@ <body> <links> - <item name="jrst" href="http://jrst.labs.libre-entreprise.org/jrst/en"/> - <item name="doxia-module-jrst" href="http://jrst.labs.libre-entreprise.org/doxia-module-jrst/"/> + <item name="jrst" href="http://jrst.labs.libre-entreprise.org/nuiton/jrst/en"/> + <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="${project.organization.name}" href="${project.organization.url}"/> <item name="[fr" href="../index.html"/> <item name="en]" href="index.html"/> @@ -43,11 +44,11 @@ </menu> <menu name="Download"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairy (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}.jar" + name="Library (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)"/> </menu>