Author: tchemit Date: 2009-11-25 00:45:04 +0100 (Wed, 25 Nov 2009) New Revision: 41 Added: trunk/src/site/resources/__index.html trunk/src/site/rst/ Removed: trunk/src/site/fr/ trunk/src/site/resources/index.html Modified: trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Log: use default maven site directory layout, improve pom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-24 23:22:07 UTC (rev 40) +++ trunk/pom.xml 2009-11-24 23:45:04 UTC (rev 41) @@ -1,239 +1,248 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <groupId>org.nuiton</groupId> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> - <artifactId>scmwebeditor</artifactId> - <version>0.0.1-SNAPSHOT</version> + <groupId>org.nuiton</groupId> + <artifactId>scmwebeditor</artifactId> + <version>0.0.1-SNAPSHOT</version> - <dependencies> + <dependencies> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.6</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.6</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.tmatesoft.svnkit</groupId> - <artifactId>svnkit</artifactId> - <version>1.2.3.5521</version> - </dependency> + <dependency> + <groupId>org.tmatesoft.svnkit</groupId> + <artifactId>svnkit</artifactId> + <version>1.2.3.5521</version> + </dependency> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>jrst</artifactId> - <version>1.0.1-SNAPSHOT</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + <version>${jrst.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>net.sourceforge.cpdetector</groupId> - <artifactId>cpdetector</artifactId> - <version>1.0.7</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> - </dependency> + <dependency> + <groupId>net.sourceforge.cpdetector</groupId> + <artifactId>cpdetector</artifactId> + <version>1.0.7</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.1</version> + </dependency> - </dependencies> + </dependencies> - <repositories> - <repository> - <id>codelutin-repository</id> - <name>CodeLutinRepository</name> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - <repository> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>Nuiton-ScmWebEditor</name> - <description>ScmWebEditor is a web based sources editor.</description> - <inceptionYear>2009</inceptionYear> - <url>http://maven-site.nuiton.org/${project.artifactId}/</url> + <name>Nuiton-ScmWebEditor</name> + <description>ScmWebEditor is a web based sources editor.</description> + <inceptionYear>2009</inceptionYear> + <url>http://maven-site.nuiton.org/${project.artifactId}/</url> - <licenses> - <license> - <name>Lesser General Public License (LGPL)</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> + <licenses> + <license> + <name>Lesser General Public License (LGPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> - <developers> - <developer> - <name>Geoffroy Lorieux</name> - <id>glorieux</id> - <email>glorieux@codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> + <developers> + <developer> + <name>Geoffroy Lorieux</name> + <id>glorieux</id> + <email>glorieux@codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <organization> + <name>CodeLutin</name> + <url>http://www.codelutin.com/</url> + </organization> - <packaging>war</packaging> - <properties> - <!-- redmine configuration --> - <platform>nuiton.org</platform> - <projectId>${project.artifactId}</projectId> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!--Multilanguage maven-site --> - <maven.site.locales>fr,en</maven.site.locales> + <packaging>war</packaging> - <!-- format des fichier source du site du projet --> - <sourcesType>rst</sourcesType> + <properties> + <!-- redmine configuration --> + <platform>nuiton.org</platform> + <projectId>${project.artifactId}</projectId> - <skin.version>1.0.1-SNAPSHOT</skin.version> - </properties> + <!--Multilanguage maven-site --> + <maven.site.locales>fr,en</maven.site.locales> - <build> - <defaultGoal>install</defaultGoal> + <skin.version>1.0.1-SNAPSHOT</skin.version> + </properties> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> + <build> + <defaultGoal>install</defaultGoal> - </build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrst.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> - <!-- Source control management. --> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/scmwebeditor/trunk</url> - </scm> + </build> - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> + <!-- Source control management. --> + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/scmwebeditor/trunk</url> + </scm> - <plugins> + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> - <!-- launch in a release the assembly automaticly --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> + <plugins> - </plugins> - </build> - </profile> - </profiles> + <!-- launch in a release the assembly automaticly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> Copied: trunk/src/site/resources/__index.html (from rev 39, trunk/src/site/resources/index.html) =================================================================== --- trunk/src/site/resources/__index.html (rev 0) +++ trunk/src/site/resources/__index.html 2009-11-24 23:45:04 UTC (rev 41) @@ -0,0 +1,9 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<meta http-equiv="Refresh" content="0; url=fr/index.html"> +</head> +</html> Deleted: trunk/src/site/resources/index.html =================================================================== --- trunk/src/site/resources/index.html 2009-11-24 23:22:07 UTC (rev 40) +++ trunk/src/site/resources/index.html 2009-11-24 23:45:04 UTC (rev 41) @@ -1,9 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<meta http-equiv="Refresh" content="0; url=fr/index.html"> -</head> -</html> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2009-11-24 23:22:07 UTC (rev 40) +++ trunk/src/site/site_en.xml 2009-11-24 23:45:04 UTC (rev 41) @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> + <!--publishDate format="dd/MM/yyyy"/> <skin> <groupId>org.nuiton</groupId> <artifactId>maven-nuiton-skin</artifactId> <version>${skin.version}</version> - </skin> + </skin--> <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> - <bannerRight> + <!--bannerRight> <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> <href>http://www.codelutin.com</href> - </bannerRight> + </bannerRight--> <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/scmwebeditor/images/logos/maven-feather.png"/> @@ -33,7 +33,7 @@ <links> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> - <item name="[fr" href="../fr/index.html" /> + <item name="[fr" href="../index.html" /> <item name="en]" href="index.html" /> </links> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2009-11-24 23:22:07 UTC (rev 40) +++ trunk/src/site/site_fr.xml 2009-11-24 23:45:04 UTC (rev 41) @@ -33,8 +33,8 @@ <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="[fr" href="${project.url}/index.html" /> + <item name="en]" href="/en/index.html" /> </links>