- Scmwebeditor-commits - mailman.cloud.codelutin.com

r49 - trunk/src/main/webapp
by tchemit＠users.nuiton.org 25 Nov '09

25 Nov '09

Author: tchemit Date: 2009-11-25 16:06:44 +0100 (Wed, 25 Nov 2009) New Revision: 49 Modified: trunk/src/main/webapp/ModificationViewer.jsp Log: must embrace attribute with "" :) Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2009-11-25 10:20:59 UTC (rev 48) +++ trunk/src/main/webapp/ModificationViewer.jsp 2009-11-25 15:06:44 UTC (rev 49) @@ -34,14 +34,14 @@ <input type="hidden" NAME=username> <input type="hidden" NAME=pw><% }%> - <input type="hidden" name="Orig_text" value=<%=request.getAttribute("OrigText")%>/> - <input type="hidden" name="scmEditorUrl" value=<%=request.getAttribute("scmEditorUrl")%>> - <input type="hidden" name="previewServletUrl" value=<%=request.getAttribute("previewServletUrl")%>> + <input type="hidden" name="Orig_text" value="<%=request.getAttribute("OrigText")%>"/> + <input type="hidden" name="scmEditorUrl" value="<%=request.getAttribute("scmEditorUrl")%>"> + <input type="hidden" name="previewServletUrl" value="<%=request.getAttribute("previewServletUrl")%>"> <input type="button" value="Save and Continue Editing" name="SaveandC" onclick="javascript:saver(this.form.Mytext, this.form.username, this.form.pw, this.form.Commit_message, this.form.Orig_text, this.form.scmEditorUrl);"/> <input type="submit" value="Save and Quit" name="Save"/> <input type="button" value="Preview" name="Preview" onclick="javascript:preview(this.form.Mytext, this.form.previewServletUrl);"/> <input type="reset" value="Reset" name="Reset" /> - <input type="hidden" value=<%=request.getAttribute("Project_url")%> name="Project_url"> + <input type="hidden" value="<%=request.getAttribute("Project_url")%>" name="Project_url"> <input type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.Orig_text, this.form.username, this.form.pw, this.form.Commit_message, this.form.Project_url, this.form.scmEditorUrl);"/> </form></center> <center><form action="/nuiton-rstedit/pictureUpload" enctype="multipart/form-data" method="post" id="form1" onsubmit="this.target = 'UploadTarget1'">

1 0

r48 - trunk
by glorieux＠users.nuiton.org 25 Nov '09

25 Nov '09

Author: glorieux Date: 2009-11-25 11:20:59 +0100 (Wed, 25 Nov 2009) New Revision: 48 Modified: trunk/pom.xml Log: new pom with defaultLocale property Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-25 10:10:36 UTC (rev 47) +++ trunk/pom.xml 2009-11-25 10:20:59 UTC (rev 48) @@ -163,7 +163,7 @@  <maven.site.locales>fr,en</maven.site.locales> - <defaultLocale>fr </defaultLocale> + <defaultLocale>fr</defaultLocale>  <sourcesType>rst</sourcesType>

1 0

r47 - trunk
by glorieux＠users.nuiton.org 25 Nov '09

25 Nov '09

Author: glorieux Date: 2009-11-25 11:10:36 +0100 (Wed, 25 Nov 2009) New Revision: 47 Removed: trunk/scmwebeditor.iml Modified: trunk/pom.xml Log: New pom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-25 09:30:31 UTC (rev 46) +++ trunk/pom.xml 2009-11-25 10:10:36 UTC (rev 47) @@ -1,248 +1,240 @@ <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> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom</artifactId> - <version>1.1.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.1.1-SNAPSHOT</version> + </parent> + <groupId>org.nuiton</groupId> - <groupId>org.nuiton</groupId> - <artifactId>scmwebeditor</artifactId> - <version>0.0.1-SNAPSHOT</version> + <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>${jrst.version}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>jrst</artifactId> + <version>1.0.1-SNAPSHOT</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> -  -  -  +  +  +  - <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(a)codelutin.com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> + <developers> + <developer> + <name>Geoffroy Lorieux</name> + <id>glorieux</id> + <email>glorieux(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> + <organization> + <name>CodeLutin</name> + <url>http://www.codelutin.com/</url> + </organization> - </developers> - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> +  +  +  + <packaging>war</packaging> -  -  -  + <properties> +  + <platform>nuiton.org</platform> + <projectId>${project.artifactId}</projectId> - <packaging>war</packaging> +  + <maven.site.locales>fr,en</maven.site.locales> + <defaultLocale>fr </defaultLocale> - <properties> -  - <platform>nuiton.org</platform> - <projectId>${project.artifactId}</projectId> +  + <sourcesType>rst</sourcesType> -  - <maven.site.locales>fr,en</maven.site.locales> + <skin.version>1.0.1-SNAPSHOT</skin.version> + </properties> - <skin.version>1.0.1-SNAPSHOT</skin.version> - </properties> + <build> + <defaultGoal>install</defaultGoal> - <build> - <defaultGoal>install</defaultGoal> + <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> - <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> - </build> +  + <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> -  - <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> + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> + <plugins> - <plugins> +  + <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> -  - <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> - </plugins> - </build> - </profile> - </profiles> - </project> Deleted: trunk/scmwebeditor.iml =================================================================== --- trunk/scmwebeditor.iml 2009-11-25 09:30:31 UTC (rev 46) +++ trunk/scmwebeditor.iml 2009-11-25 10:10:36 UTC (rev 47) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> - <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.6" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-io:commons-io:1.4" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.tmatesoft.svnkit:svnkit:1.2.3.5521" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.nuiton.jrst:jrst:1.0.1-SNAPSHOT" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-lang:commons-lang:2.4" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.nuiton:nuiton-utils:1.1.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: log4j:log4j:1.2.14" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-primitives:commons-primitives:1.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.nuiton.i18n:nuiton-i18n-api:1.0.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: dom4j:dom4j:1.6.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> - <orderEntry type="library" exported="" name="Maven: jaxen:jaxen:1.1.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: jdom:jdom:1.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: xerces:xercesImpl:2.6.2" level="project" /> - <orderEntry type="library" exported="" name="Maven: xom:xom:1.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" /> - <orderEntry type="library" exported="" name="Maven: xalan:xalan:2.7.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: com.ibm.icu:icu4j:2.6.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:fop:0.95" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:1.3.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-anim:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-dom:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: xml-apis:xml-apis-ext:1.3.04" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-xml:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-parser:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-bridge:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-gvt:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-script:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-svggen:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.xmlgraphics:batik-extension:1.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.avalon.framework:avalon-framework-api:4.3.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: uk.co.flamingpenguin.jewelcli:jewelcli:0.57" level="project" /> - <orderEntry type="library" exported="" scope="RUNTIME" name="Maven: xalan:serializer:2.7.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.docbook:docbook-xsl:1.72.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: net.sourceforge.cpdetector:cpdetector:1.0.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: antlr:antlr:2.7.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: net.sourceforge.jchardet:jchardet:1.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" /> - </component> -</module> -

1 0

r46 - in trunk/src/site: . en en/resources resources
by glorieux＠users.nuiton.org 25 Nov '09

25 Nov '09

Author: glorieux Date: 2009-11-25 10:30:31 +0100 (Wed, 25 Nov 2009) New Revision: 46 Added: trunk/src/site/en/resources/ trunk/src/site/en/resources/example.jpg trunk/src/site/resources/ trunk/src/site/resources/example.jpg Log: Added: trunk/src/site/en/resources/example.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/site/en/resources/example.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/example.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/example.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r45 - trunk/src/site
by glorieux＠users.nuiton.org 25 Nov '09

25 Nov '09

Author: glorieux Date: 2009-11-25 10:28:45 +0100 (Wed, 25 Nov 2009) New Revision: 45 Removed: trunk/src/site/resources/ Log:

1 0

r44 - in trunk/src/site: . resources
by glorieux＠users.nuiton.org 25 Nov '09

25 Nov '09

Author: glorieux Date: 2009-11-25 10:22:26 +0100 (Wed, 25 Nov 2009) New Revision: 44 Added: trunk/src/site/resources/ trunk/src/site/resources/example.jpg Log: add resources for fr site Added: trunk/src/site/resources/example.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/example.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r43 - trunk/src/site
by glorieux＠users.nuiton.org 25 Nov '09

25 Nov '09

Author: glorieux Date: 2009-11-25 10:19:11 +0100 (Wed, 25 Nov 2009) New Revision: 43 Removed: trunk/src/site/resources/ Log: New Site.

1 0

r42 - trunk/src/site/en/rst
by glorieux＠users.nuiton.org 25 Nov '09

25 Nov '09

Author: glorieux Date: 2009-11-25 10:08:00 +0100 (Wed, 25 Nov 2009) New Revision: 42 Modified: trunk/src/site/en/rst/tutoriel.rst Log: Delete resources directory for unuse with new siteplugin Modified: trunk/src/site/en/rst/tutoriel.rst =================================================================== --- trunk/src/site/en/rst/tutoriel.rst 2009-11-24 23:45:04 UTC (rev 41) +++ trunk/src/site/en/rst/tutoriel.rst 2009-11-25 09:08:00 UTC (rev 42) @@ -1,4 +1,6 @@ Tutoriel ======== -TO do.... \ No newline at end of file +.. image:: example.jpg + :alt: ScmWebEditor screenshot + \ No newline at end of file

1 0

r41 - in trunk: . src/site src/site/resources
by tchemit＠users.nuiton.org 24 Nov '09

24 Nov '09

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> -  -  -  +  +  +  - <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> -  -  -  +  +  +  - <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(a)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(a)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(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> -  -  -  + <organization> + <name>CodeLutin</name> + <url>http://www.codelutin.com/</url> + </organization> - <packaging>war</packaging> - <properties> -  - <platform>nuiton.org</platform> - <projectId>${project.artifactId}</projectId> +  +  +  -  - <maven.site.locales>fr,en</maven.site.locales> + <packaging>war</packaging> -  - <sourcesType>rst</sourcesType> + <properties> +  + <platform>nuiton.org</platform> + <projectId>${project.artifactId}</projectId> - <skin.version>1.0.1-SNAPSHOT</skin.version> - </properties> +  + <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> -  - <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> +  + <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> -  - <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> +  + <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"/> +  <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> - <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>

1 0