Author: glorieux Date: 2009-09-24 12:36:49 +0200 (Thu, 24 Sep 2009) New Revision: 233 Added: nuiton-rstedit/ nuiton-rstedit/LICENSE.txt nuiton-rstedit/README.txt nuiton-rstedit/changelog.txt nuiton-rstedit/pom.xml nuiton-rstedit/preview.html nuiton-rstedit/src/ nuiton-rstedit/src/main/ nuiton-rstedit/src/main/java/ nuiton-rstedit/src/main/java/HelloServlet.java nuiton-rstedit/src/main/java/Test.java nuiton-rstedit/src/main/java/previewservlet.java nuiton-rstedit/src/main/resources/ nuiton-rstedit/src/main/resources/log4j.properties nuiton-rstedit/src/main/webapp/ nuiton-rstedit/src/main/webapp/Error.jsp nuiton-rstedit/src/main/webapp/ModificationViewer.jsp nuiton-rstedit/src/main/webapp/Preview.js nuiton-rstedit/src/main/webapp/Redirect.jsp nuiton-rstedit/src/main/webapp/WEB-INF/ nuiton-rstedit/src/main/webapp/WEB-INF/web.xml nuiton-rstedit/src/test/ nuiton-rstedit/src/test/java/ Log: Added: nuiton-rstedit/LICENSE.txt =================================================================== --- nuiton-rstedit/LICENSE.txt (rev 0) +++ nuiton-rstedit/LICENSE.txt 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: nuiton-rstedit/README.txt =================================================================== --- nuiton-rstedit/README.txt (rev 0) +++ nuiton-rstedit/README.txt 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Added: nuiton-rstedit/pom.xml =================================================================== --- nuiton-rstedit/pom.xml (rev 0) +++ nuiton-rstedit/pom.xml 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,173 @@ +<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"> + + <modelVersion>4.0.0</modelVersion> + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.0.2</version> + </parent> + + <artifactId>nuiton-rstedit</artifactId> + <version>0.0.1-SNAPSHOT</version> + + <dependencies> + + <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>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>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>net.sourceforge.cpdetector</groupId> + <artifactId>cpdetector</artifactId> + <version>1.0.7</version> + <scope>compile</scope> + </dependency> + + </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> + </repositories> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>Nuiton-rstedit</name> + <description>. + </description> + <inceptionYear>2009</inceptionYear> + <url>http://maven-site.nuiton.org/${project.artifactId}</url> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>war</packaging> + + <properties> + + + </properties> + + <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>1.0.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + </build> + + <!-- Source control management. --> + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/nuiton-rstedit/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/mavenpom/nuiton-rstedit/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/mavenpom/nuiton-rstedit/trunk</url> + </scm> + + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + + <plugins> + + <!-- 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> \ No newline at end of file Added: nuiton-rstedit/preview.html =================================================================== --- nuiton-rstedit/preview.html (rev 0) +++ nuiton-rstedit/preview.html 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,182 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<html xmlns="http://www.w3.org/TR/xhtml1/strict"> + <head> + <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/> + <meta content="JRST http://jrst.labs.libre-entreprise.org/" name="generator"/> + <title>Parseur reStructuredText : le JRst</title> + </head> + <body> + <h1 class="mainTitle">Parseur + <a id="" href="presentationRST.html">reStructuredText</a> : le JRst + </h1> + <h2>Documentation utilisateur</h2> + <div class="topic"> + <p class="title"> + <h1 class="title">Sommaire</h1> + </p> + <ul> + <li> + <a id="id3" href="#pr-sentation">Présentation</a> + </li> + <li> + <a id="id4" href="#usage">Usage</a> + </li> + <li> + <a id="id5" href="#plugin-maven_">Plugin Maven</a> + </li> + </ul> + </div> + <a name="pr-sentation"/> + <h2 class="title"> + <a id="pr-sentation" href="#id3" class="toc-backref">Présentation</a> + </h2> + <p>Le format + <a id="" href="presentationRST.html">reStructuredText</a> est un format de description de documents. A l'image d'autres + <a id="" href="http://www.latex-project.org/">LaTeX</a> ou + <a id="" href="http://www.docbook.org/">DocBook</a> il peut être décliné en une multitude de formats. Ces formats souffrent habituellement d'une syntaxe envahissante qui, si elle est nécessaire pour des documents trés spécifiques, devient gênante quand il s'agit de créer rapidement un document pas trop complexe. + <a id="" href="#RST">RST</a> dispose quant à lui d'une syntaxe tellement simple qu'elle en devient presque invisible. + </p> + <p>JRST est un parseur + <a id="" href="#RST">RST</a> en Java permettant de créer une représentation en arbre d'un document. Il devient alors facile de générer une représentation du document vers différents formats. + </p> + <a name="usage"/> + <h2 class="title"> + <a id="usage" href="#id4" class="toc-backref">Usage</a> + </h2> + <p>Le parser JRST prend un fichier + <a id="" href="presentationRST.html">reStructuredText</a> en entré et génére un fichier XML qui pourra ensuite servir à produire divers formats de fichiers grâce à des fichiers XSL de générations. Les formats de sortie disponibles sont le html, le xhtml, le rst, le pdf, le + <a id="" href="http://www.docbook.org/">docbook</a> le odt (Open-Office), le rtf, ou encore le XML + <a name="id1" id="id1" href="#id2" class="footnote_reference"> + [1] + </a> + </p> + <pre class="literal_block">JRST myfile.rst + +</pre> <p>Cette commande aura pour effet de convertir le fichier myfile.rst en XML qui sera affiché sur la sortie standard (console). Plusieurs options sont disponibles :</p> + <table class="option_list"> + <col class="option"/> + <col class="description"/> + <tbody valign="top"> + <tr> + <td class="option-group"> + <kbd> + <span class="option">-o + <var>file, + </var> + </span> + <span class="option">-outFile= + <var>file, + </var> + </span> + </kbd> + </td> + <td> + <p>pour rediriger la sortie vers un fichier.</p> + </td> + </tr> + <tr> + <td class="option-group"> + <kbd> + <span class="option">-t + <var>format, + </var> + </span> + <span class="option">-outType + <var>format, + </var> + </span> + </kbd> + </td> + <td> + <p>pour préciser un format de sortie, donc utiliser un ou des fichiers + <a id="" href="http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst">XSL</a> de génération. Plusieurs formats sont disponibles xhtml, docbook, xml, html, xdoc, rst, pdf, odt, rtf. + </p> + </td> + </tr> + <tr> + <td class="option-group"> + <kbd> + <span class="option">-x + <var>xslFile, + </var> + </span> + <span class="option">-xslFile + <var>xslFile, + </var> + </span> + </kbd> + </td> + <td> + <p>sert à préciser le fichier xsl de génération à utiliser.</p> + </td> + </tr> + <tr> + <td class="option-group"> + <kbd> + <span class="option">--force</span> + </kbd> + </td> + <td> + <p>forcer l'écriture d'un fichier, si le fichier de sortie existe, il sera remplacé.</p> + </td> + </tr> + <tr> + <td class="option-group"> + <kbd> + <span class="option">--help</span> + </kbd> + </td> + <td> + <p>pour afficher les options disponibles :</p> + </td> + </tr> + </tbody> + </table> + <pre class="literal_block">Usage: [options] FILE + [--force] : overwrite existing out file + [--help] : display this help and exit + [--outFile -o value] : Output file + [--outType -t /xhtml|docbook|xml|html|xdoc|rst/] : Output type + [--xslFile -x value] : XSL file list to apply, comma separated + + +</pre> <p>ex :</p> + <pre class="literal_block">JRST --force -t html -o myfile.html myfile.rst + +</pre> <p>Cette commande produira un fichier html (myfile.html) à partir du fichier + <a id="" href="presentationRST.html">reStructuredText</a> (myfile.rst) même si myfile.html existe déjà. + </p> + <a name="plugin-maven_"/> + <h2 class="title"> + <a id="plugin-maven_" href="#id5" class="toc-backref">Plugin + <a id="" href="http://maven.apache.org/">Maven</a> + </a> + </h2> + <p>Un plugin + <a id="" href="http://maven.apache.org/">Maven</a> est disponible à l'adresse suivante + <a id="" href="http://jrst.labs.libre-entreprise.org/maven-jrst-plugin">http://jrst.labs.libre-entreprise.org/maven-jrst-plugin</a>. Il permet l'utilisation depuis + <a id="" href="http://maven.apache.org/">Maven</a> de JRst. + </p> + <table rules="none" id="id2" frame="void" class="footnote"> + <colgroup> + <col class="label"/> + <col/> + </colgroup> + <tbody valign="top"> + <tr> + <td class="label"> + <a name="" href="#id1" class="backref"> + [1] + </a> + </td> + <td> + <p>Seul les formats html, xhtml, + <a id="" href="http://www.docbook.org/">DocBook</a> xdoc et pdf sont disponible pour le moment. + </p> + </td> + </tr> + </tbody> + </table> + </body> +</html> Added: nuiton-rstedit/src/main/java/HelloServlet.java =================================================================== --- nuiton-rstedit/src/main/java/HelloServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/HelloServlet.java 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,322 @@ +import info.monitorenter.cpdetector.io.ASCIIDetector; +import info.monitorenter.cpdetector.io.ByteOrderMarkDetector; +import info.monitorenter.cpdetector.io.CodepageDetectorProxy; +import info.monitorenter.cpdetector.io.JChardetFacade; +import info.monitorenter.cpdetector.io.ParsingDetector; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.Writer; +import java.net.MalformedURLException; +import java.nio.charset.Charset; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.tmatesoft.svn.core.SVNAuthenticationException; +import org.tmatesoft.svn.core.SVNDepth; +import org.tmatesoft.svn.core.SVNException; +import org.tmatesoft.svn.core.SVNProperty; +import org.tmatesoft.svn.core.SVNURL; +import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; +import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; +import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions; +import org.tmatesoft.svn.core.wc.SVNClientManager; +import org.tmatesoft.svn.core.wc.SVNCommitClient; +import org.tmatesoft.svn.core.wc.SVNRevision; +import org.tmatesoft.svn.core.wc.SVNUpdateClient; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + + +/** + * @author geoffroy lorieux + */ +public class HelloServlet extends HttpServlet { + + + // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code."> + /** + * Handles the HTTP <code>GET</code> method. + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + try { + +// First Part Svn checkout and JSP call + log.debug("Connection to RSTEditor"); + System.setProperty("file.encoding", "UTF-8"); + String my_adresse = request.getParameter("adresse"); + String file_name = request.getParameter("file_name"); + String project_url = request.getParameter("project_url"); + PrintWriter out = response.getWriter(); + + Info my_inf = new Info(my_adresse, file_name, project_url, null, null); + + String charset = my_inf.svn_optn.getNativeCharset(); + Boolean is_utf = SVNProperty.isUTF8(charset); + + if (is_utf == true){ + log.debug("Je suis en utf8"); + } + else{ + log.debug("Je ne suis pas en utf8"); + } + HttpSession sess = request.getSession(true); + sess.setAttribute("my_info", my_inf); +// Tempdir creation + + log.debug("Creating temporary directory on: " + my_inf.checkoutdir); + my_inf.checkoutdir.mkdir(); + + +// doCheckout declaration + DAVRepositoryFactory.setup(); + SVNUpdateClient upclient = new SVNUpdateClient(my_inf.manager, my_inf.svn_optn); + +// Checkout svn and file organisation + log.debug("Do Checkout"); + upclient.doCheckout(my_inf.remote_url, my_inf.checkoutdir, SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + log.debug("Checkout done"); + File file_in_dir = new File(my_inf.checkoutdir, my_inf.filename); + + String original_text = FileUtils.readFileToString(file_in_dir); + +// JSP data transfert + request.setAttribute("OrigText", original_text); + RequestDispatcher disp = this.getServletContext().getRequestDispatcher("/ModificationViewer.jsp"); + +// End on first part + disp.forward(request, response); + out.close(); + } catch (SVNException ex) { + Logger.getLogger(HelloServlet.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /** + * Handles the HTTP <code>POST</code> method. + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException{ + try { + +// Second Part Client response and SVN commit + System.setProperty("file.encoding", "UTF-8"); + PrintWriter out = response.getWriter(); + HttpSession sess = request.getSession(true); + Info my_inf = (Info) sess.getAttribute("my_info"); + +// Data reception and organisation + String myData = request.getParameter("Mytext"); + String commit_message = request.getParameter("Commit_message"); + +// Resetting authentification information and manager + my_inf.login = request.getParameter("username"); + my_inf.password = request.getParameter("pw"); + my_inf.auth_manager = SVNWCUtil.createDefaultAuthenticationManager(my_inf.checkoutdir,my_inf.login, my_inf.password, false); + my_inf.manager = SVNClientManager.newInstance(my_inf.svn_optn, my_inf.auth_manager); + + File path_to_file = new File(my_inf.checkoutdir, my_inf.filename); + + SVNCommitClient comcli = new SVNCommitClient(my_inf.manager, my_inf.svn_optn); + FileUtils.writeStringToFile(path_to_file, myData); + + List<File> list = new java.util.ArrayList<File>(1); + list.add(0, path_to_file); + + list = convertToUnicode(list); + + File[] tab_file = new File[1]; + tab_file[0] = path_to_file; +// Sending Data to SVN + try + { + log.debug("Try to Commit"); + comcli.doCommit(tab_file, false, commit_message, null, null, false, true, SVNDepth.FILES); + + } + catch (SVNAuthenticationException authexep) + { + log.debug("Bad Login or Password"); + request.setAttribute("Svnpath_url", my_inf.svnpath); + request.setAttribute("Filename_url", my_inf.filename); + request.setAttribute("Redirection_url", my_inf.project_url); + RequestDispatcher disp = this.getServletContext().getRequestDispatcher("/Error.jsp"); + disp.forward(request, response); + return; + } + log.debug("Commit success"); + request.setAttribute("Redirection_url", my_inf.project_url); + RequestDispatcher disp = this.getServletContext().getRequestDispatcher("/Redirect.jsp"); +// Deleting temp directory + + log.debug("Deleting temporary directory : " + my_inf.checkoutdir); + FileUtils.deleteDirectory(my_inf.checkoutdir); + +// End of Second part + + disp.forward(request, response); + log.debug("Exit RSTEditor"); + + out.close(); + } catch (SVNException ex) { + Logger.getLogger(HelloServlet.class.getName()).log(Level.SEVERE, null, ex); + } + } + +// Information object + + protected class Info{ + + String svnpath; // svn path without filename + String filename; // filename of modif file + String project_url; // Projectname + String login; // user's login + String password; // user's password + File tmp_dir; // Temp directory path + File checkoutdir; // Temp directory for checkout + SVNURL remote_url; // url of svn path + ISVNAuthenticationManager auth_manager; // authmanager with login and password + DefaultSVNOptions svn_optn; // svn default option + SVNClientManager manager; // svn manager with default option and authentification manager + + + Info (String svnpath, String filename, String project_url, String login, String password) throws SVNException{ + this.svnpath = svnpath; + this.filename = filename; + this.project_url = project_url; + this.login = login; + this.password = password; + this.tmp_dir = (File) getServletContext().getAttribute("javax.servlet.context.tempdir"); + this.checkoutdir = new File(this.tmp_dir, "temp_rst"); + this.remote_url = SVNURL.parseURIEncoded(svnpath); + this.auth_manager = SVNWCUtil.createDefaultAuthenticationManager(this.checkoutdir, this.login, this.password, false); + this.svn_optn = SVNWCUtil.createDefaultOptions(this.checkoutdir, false); + this.svn_optn.setPropertyValue(SVNProperty.EOL_STYLE, SVNProperty.EOL_STYLE_LF); + this.manager = SVNClientManager.newInstance(this.svn_optn, this.auth_manager); + + } + } + + protected static CodepageDetectorProxy detector; + private static final Log log = LogFactory.getLog(HelloServlet.class); + + protected static CodepageDetectorProxy getCodepageDetector() { + + if (detector == null) { + detector = CodepageDetectorProxy.getInstance(); // A singleton. + + // Add the implementations of info.monitorenter.cpdetector.io.ICodepageDetector: + // This one is quick if we deal with unicode codepages: + detector.add(new ByteOrderMarkDetector()); + // The first instance delegated to tries to detect the meta charset attribut in html pages. + detector.add(new ParsingDetector(true)); // be verbose about parsing. + // This one does the tricks of exclusion and frequency detection, if first implementation is + // unsuccessful: + detector.add(JChardetFacade.getInstance()); // Another singleton. + detector.add(ASCIIDetector.getInstance()); // Fallback, see javadoc. + } + return detector; + } + + + /** + * Convert all files to UTF-8. + * + * @param files fiels to convert + * @return converted file list + */ + public static List<File> convertToUnicode(List<File> files) { + + CodepageDetectorProxy myDetector = getCodepageDetector(); + + for (File file : files) { + try { + Charset charset = myDetector.detectCodepage(file.toURI().toURL()); + + if (log.isDebugEnabled()) { + log.debug("Charset for " + file.getAbsolutePath() + " is " + charset); + } + + if (charset != null && !charset.name().equalsIgnoreCase("UTF-8")) { + + if (log.isDebugEnabled()) { + log.debug("Convert " + file.getAbsolutePath() + " to unicode"); + } + + File tmpFile = File.createTempFile(file.getName(), ".copy"); + tmpFile.deleteOnExit(); + + // direct copy + InputStream is = new FileInputStream(file); + OutputStream os = new FileOutputStream(tmpFile); + try { + IOUtils.copy(is, os); + } + finally { + is.close(); + os.close(); + } + + // copy using cp transaltion + is = new FileInputStream(tmpFile); + os = new FileOutputStream(file); + Reader ir = new InputStreamReader(is, charset); + Writer ow = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); + try { + IOUtils.copy(ir, ow); + } + finally { + ir.close(); + ow.close(); + is.close(); + os.close(); + } + + } + else { + if (log.isDebugEnabled()) { + log.debug("File " + file.getAbsolutePath() + " already in unicode : skip"); + } + } + } catch (MalformedURLException e) { + if (log.isErrorEnabled()) { + log.error("Can't convert file in unicode", e); + } + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't convert file in unicode", e); + } + } + + } + + return files; + } +} Added: nuiton-rstedit/src/main/java/Test.java =================================================================== --- nuiton-rstedit/src/main/java/Test.java (rev 0) +++ nuiton-rstedit/src/main/java/Test.java 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,44 @@ + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import org.apache.commons.io.FileUtils; +import org.tmatesoft.svn.core.SVNException; +import org.tmatesoft.svn.core.SVNURL; +import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; +import org.tmatesoft.svn.core.wc.SVNClientManager; +import org.tmatesoft.svn.core.wc.SVNRevision; +import org.tmatesoft.svn.core.wc.SVNUpdateClient; +import org.tmatesoft.svn.core.wc.SVNWCClient; + +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +/** + * + * @author glorieux + */ +public class Test { + + + public static void main(String[] args) throws SVNException, IOException { + + String svnpath = "http://svn.nuiton.org/svn/topia/trunk/src/site/rst/index.rst"; + SVNURL remote_url = SVNURL.parseURIEncoded(svnpath); + + + SVNClientManager manager = SVNClientManager.newInstance(); + SVNUpdateClient updateclient = manager.getUpdateClient(); + DAVRepositoryFactory.setup(); + SVNWCClient updateclients = manager.getWCClient(); + File fileOut = File.createTempFile("temp", ".txt"); + OutputStream out = new FileOutputStream(fileOut); + updateclients.doGetFileContents(remote_url, SVNRevision.HEAD, SVNRevision.HEAD, false, out); + String original_text = FileUtils.readFileToString(fileOut); + System.out.println(original_text); + } + +} Added: nuiton-rstedit/src/main/java/previewservlet.java =================================================================== --- nuiton-rstedit/src/main/java/previewservlet.java (rev 0) +++ nuiton-rstedit/src/main/java/previewservlet.java 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,175 @@ +import info.monitorenter.cpdetector.io.ASCIIDetector; +import info.monitorenter.cpdetector.io.ByteOrderMarkDetector; +import info.monitorenter.cpdetector.io.CodepageDetectorProxy; +import info.monitorenter.cpdetector.io.JChardetFacade; +import info.monitorenter.cpdetector.io.ParsingDetector; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.Writer; +import java.net.MalformedURLException; +import java.nio.charset.Charset; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jrst.JRST; + +/** + * + * @author glorieux + */ +public class previewservlet extends HttpServlet { + + /** + * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + log.debug("je suis dans la previewservlet"); + File tmp_dir = (File) getServletContext().getAttribute("javax.servlet.context.tempdir"); + log.debug("Le tmp dir est :" + tmp_dir); + log.debug("Le content type est : " + request.getContentType()); +// Text recuperation + String myData = request.getParameter("text"); + + String myDataWithoutcrlf = myData.replace("\r", ""); + File file_in_dir_copy = new File(tmp_dir, "copy.rst"); + File http_file = new File(tmp_dir, "preview.html"); + file_in_dir_copy.createNewFile(); + http_file.createNewFile(); + FileUtils.writeStringToFile(file_in_dir_copy, myDataWithoutcrlf); + List<File> list = new java.util.ArrayList<File>(1); + list.add(0, file_in_dir_copy); + list = convertToUnicode(list); + try { + File copy = new File(tmp_dir, "copy.rst"); + JRST.generate(JRST.TYPE_HTML, copy, http_file, JRST.Overwrite.ALLTIME); + log.debug("generate okai"); + copy.delete(); + } catch (Exception exep) { + Logger.getLogger(previewservlet.class.getName()).log(Level.SEVERE, null, exep); + } + response.setContentType("text/xml"); + PrintWriter ret = response.getWriter(); + ret.print(FileUtils.readFileToString(http_file)); + http_file.delete(); + } + + protected static CodepageDetectorProxy detector; + private static final Log log = LogFactory.getLog(previewservlet.class); + + protected static CodepageDetectorProxy getCodepageDetector() { + + if (detector == null) { + detector = CodepageDetectorProxy.getInstance(); // A singleton. + + // Add the implementations of info.monitorenter.cpdetector.io.ICodepageDetector: + // This one is quick if we deal with unicode codepages: + detector.add(new ByteOrderMarkDetector()); + // The first instance delegated to tries to detect the meta charset attribut in html pages. + detector.add(new ParsingDetector(true)); // be verbose about parsing. + // This one does the tricks of exclusion and frequency detection, if first implementation is + // unsuccessful: + detector.add(JChardetFacade.getInstance()); // Another singleton. + detector.add(ASCIIDetector.getInstance()); // Fallback, see javadoc. + } + return detector; + } + + + /** + * Convert all files to UTF-8. + * + * @param files fiels to convert + * @return converted file list + */ + public static List<File> convertToUnicode(List<File> files) { + + CodepageDetectorProxy myDetector = getCodepageDetector(); + + for (File file : files) { + try { + Charset charset = myDetector.detectCodepage(file.toURI().toURL()); + + if (log.isDebugEnabled()) { + log.debug("Charset for " + file.getAbsolutePath() + " is " + charset); + } + + if (charset != null && !charset.name().equalsIgnoreCase("UTF-8")) { + + if (log.isDebugEnabled()) { + log.debug("Convert " + file.getAbsolutePath() + " to unicode"); + } + + File tmpFile = File.createTempFile(file.getName(), ".copy"); + tmpFile.deleteOnExit(); + + // direct copy + InputStream is = new FileInputStream(file); + OutputStream os = new FileOutputStream(tmpFile); + try { + IOUtils.copy(is, os); + } + finally { + is.close(); + os.close(); + } + + // copy using cp transaltion + is = new FileInputStream(tmpFile); + os = new FileOutputStream(file); + Reader ir = new InputStreamReader(is, charset); + Writer ow = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); + try { + IOUtils.copy(ir, ow); + } + finally { + ir.close(); + ow.close(); + is.close(); + os.close(); + } + + } + else { + if (log.isDebugEnabled()) { + log.debug("File " + file.getAbsolutePath() + " already in unicode : skip"); + } + } + } catch (MalformedURLException e) { + if (log.isErrorEnabled()) { + log.error("Can't convert file in unicode", e); + } + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't convert file in unicode", e); + } + } + + } + + return files; + } +} + Added: nuiton-rstedit/src/main/resources/log4j.properties =================================================================== --- nuiton-rstedit/src/main/resources/log4j.properties (rev 0) +++ nuiton-rstedit/src/main/resources/log4j.properties 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,30 @@ +# Global logging configuration +log4j.rootLogger=DEBUG, stdout + +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n + +# File output... +#log4j.appender.fileout=org.apache.log4j.FileAppender +#log4j.appender.fileout.File=jtimer.log +#log4j.appender.fileout.Append=true +#log4j.appender.fileout.Threshold=DEBUG +#log4j.appender.fileout.layout=org.apache.log4j.PatternLayout +#log4j.appender.fileout.layout.ConversionPattern=%5p (%F:%L) %m%n + +# Rolling appender +#log4j.appender.rolling=org.apache.log4j.RollingFileAppender +#log4j.appender.rolling.File=jtimer.log +#log4j.appender.rolling.MaxFileSize=100KB +#log4j.appender.rolling.Append=true +#log4j.appender.rolling.MaxBackupIndex=30 +#log4j.appender.rolling.Threshold=INFO +#log4j.appender.rolling.layout=org.apache.log4j.PatternLayout +#log4j.appender.rolling.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n + +# package level +#log4j.logger.org.chorem.jtimer=DEBUG +#log4j.logger.org.chorem.jtimer.ws=DEBUG +#log4j.logger.org.chorem.jtimer.ui.report=DEBUG Added: nuiton-rstedit/src/main/webapp/Error.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/Error.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/Error.jsp 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,21 @@ +<%-- + Document : Error + Created on : 15 sept. 2009, 12:22:29 + Author : glorieux +--%> + +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<!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"> + <title>Error</title> + <meta http-equiv="Refresh" content="2; + url=http://localhost:8080/nuiton-rstedit/hello?adresse=<%=request.getAttribute("Svnpath_url")%>&file_name=<%=request.getAttribute("Filename_url")%>&project_url=<%=request.getAttribute("Redirection_url")%>"> + </head> + <body> + <p>Bad Login or Password. Please Wait.</p> + </body> +</html> Added: nuiton-rstedit/src/main/webapp/ModificationViewer.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/ModificationViewer.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/ModificationViewer.jsp 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,34 @@ + +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<!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"> + <title>RSTeditor</title> + </head> +<body> + <center><p>Welcome on RSTeditor</p></center> + + + <center><form method="post"> + <textarea name="Mytext" id="Mytext" rows="20" cols="150"><%=request.getAttribute("OrigText")%></textarea> + <script src="Preview.js"></script> + <p>Commit Message: <input type="text" name="Commit_message"/></p> + <p><label ACCESSKEY=U>User name: <input TYPE=text NAME=username SIZE=12></label> + <label ACCESSKEY=P>Password: <input TYPE=password NAME=pw SIZE=12></label></p> + <input type="submit" value="Save" name="Save"/> + <input type="button" value="Preview" name="Preview" onclick="javascript:preview(this.form.Mytext);"/> + <input type="reset" value="Reset" name="Reset" /> + <input type="button" value="Cancel" name="Cancel" /> + </form></center> + + + <p>Older Text Preview:</p> + <pre><%=request.getAttribute("OrigText")%></pre> + + <p>For any RestruturedText Problem visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</p> + +</body> +</html> \ No newline at end of file Added: nuiton-rstedit/src/main/webapp/Preview.js =================================================================== --- nuiton-rstedit/src/main/webapp/Preview.js (rev 0) +++ nuiton-rstedit/src/main/webapp/Preview.js 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,56 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + + + +function createRequestObject() +{ + var req; + if(window.XMLHttpRequest) + { + //For Firefox, Safari, Opera + req = new XMLHttpRequest(); + } + else if(window.ActiveXObject) + { + //For IE 5+ + req = new ActiveXObject("Microsoft.XMLHTTP"); + } + else + { + //Error for an old browser + alert('Your browser is not IE 5 or higher, or Firefox or Safari or Opera'); + } + return req; +} + +//Make the XMLHttpRequest Object +var http= createRequestObject(); + +function sendRequest(method, url, text) +{ + + http.open(method, url, true); + http.onreadystatechange = handleResponse; + http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http.send("text="+text.value); +} + +function handleResponse() +{ + if(http.readyState == 4) + { + var response = http.responseText; + + var wind = window.open("", "preview", "scrollbars=yes"); + wind.document.body.innerHTML = response; + } +} + +function preview(my_text) +{ + sendRequest("POST", "http://localhost:8080/nuiton-rstedit/previewservlet", my_text); +} + Added: nuiton-rstedit/src/main/webapp/Redirect.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/Redirect.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/Redirect.jsp 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,22 @@ +<%-- + Document : Redirect + Created on : 10 sept. 2009, 13:43:11 + Author : glorieux +--%> + +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<!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"> + <title>Redirection...</title> + <meta http-equiv="Refresh" content="2; url=<%=request.getAttribute("Redirection_url")%>"> + </head> + <body> + <p>Thank you using RSTEditor</p> + <p>You should be transferred automatically to the new page. If +not please <a href="<%=request.getAttribute("Redirection_url")%>">click this link</a>.</p> + </body> +</html> Added: nuiton-rstedit/src/main/webapp/WEB-INF/web.xml =================================================================== --- nuiton-rstedit/src/main/webapp/WEB-INF/web.xml (rev 0) +++ nuiton-rstedit/src/main/webapp/WEB-INF/web.xml 2009-09-24 10:36:49 UTC (rev 233) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http:/java.sun.com/dtd/web-app_2_3.dtd"> + <servlet> + <servlet-name>HelloServlet</servlet-name> + <servlet-class>HelloServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>previewservlet</servlet-name> + <servlet-class>previewservlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>HelloServlet</servlet-name> + <url-pattern>/hello</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>previewservlet</servlet-name> + <url-pattern>/previewservlet</url-pattern> + </servlet-mapping> + </web-app>