Author: glorieux Date: 2009-09-09 17:19:30 +0200 (Wed, 09 Sep 2009) New Revision: 31 Added: nuiton-rstedit/ nuiton-rstedit/LICENSE.txt nuiton-rstedit/README.txt nuiton-rstedit/changelog.txt nuiton-rstedit/pom.xml 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/resources/ nuiton-rstedit/src/main/webapp/ nuiton-rstedit/src/main/webapp/WEB-INF/ nuiton-rstedit/src/main/webapp/WEB-INF/web.xml nuiton-rstedit/src/main/webapp/test.jsp nuiton-rstedit/src/test/ nuiton-rstedit/src/test/java/ nuiton-rstedit/src/test/test_svn.txt Log: Added: nuiton-rstedit/LICENSE.txt =================================================================== --- nuiton-rstedit/LICENSE.txt (rev 0) +++ nuiton-rstedit/LICENSE.txt 2009-09-09 15:19:30 UTC (rev 31) @@ -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-09 15:19:30 UTC (rev 31) @@ -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-09 15:19:30 UTC (rev 31) @@ -0,0 +1,144 @@ +<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> + + + </dependencies> + + <!-- ************************************************************* --> + <!-- *** 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/src/main/java/HelloServlet.java =================================================================== --- nuiton-rstedit/src/main/java/HelloServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/HelloServlet.java 2009-09-09 15:19:30 UTC (rev 31) @@ -0,0 +1,129 @@ +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +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 org.apache.commons.io.FileUtils; +import org.tmatesoft.svn.core.SVNDepth; +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.SVNCommitClient; +import org.tmatesoft.svn.core.wc.SVNRevision; +import org.tmatesoft.svn.core.wc.SVNUpdateClient; + +/** + * + * @author glorieux + */ +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 + */ + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + try { + +// First Part Svn checkout and JSP call + + PrintWriter out = response.getWriter(); + String svnpath = "http://svn.nuiton.org/svn/sandbox/test_rstedit/src/site/rst/"; + String filename = "index.rst"; + SVNURL remote_url = SVNURL.parseURIEncoded(svnpath); + +// Tempdir localisation and creation + + File dir = (File) getServletContext().getAttribute("javax.servlet.context.tempdir"); + File checkoutdir = new File(dir, "temp_rst"); + checkoutdir.mkdir(); + +// doCheckout declaration + + SVNClientManager manager = SVNClientManager.newInstance(); + DAVRepositoryFactory.setup(); + SVNUpdateClient upclient = new SVNUpdateClient(manager, null); + +// Checkout svn and file organisation + + upclient.doCheckout(remote_url, checkoutdir, SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + File file_in_dir = new File(checkoutdir, filename); + String original_text = FileUtils.readFileToString(file_in_dir); + +// JSP call + + request.setAttribute("OrigText", original_text); + RequestDispatcher disp = this.getServletContext().getRequestDispatcher("/test.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 + */ + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + try { + +// Second Part Client response and SVN commit + + PrintWriter out = response.getWriter(); + String filename = "index.rst"; + + File dir = (File) getServletContext().getAttribute("javax.servlet.context.tempdir"); + File checkoutdir = new File(dir, "temp_rst"); + SVNClientManager manager = SVNClientManager.newInstance(); + +// Data reception and organisation + + String myData = request.getParameter("Mytext"); + + File path_to_file = new File(checkoutdir, filename); + SVNCommitClient comcli = new SVNCommitClient(manager, null); + + FileUtils.writeStringToFile(path_to_file, myData); + File[] tab_file = new File[1]; + tab_file[0] = path_to_file; + +// Sending Data to SVN + + comcli.doCommit(tab_file, false, "New_rst", null, null, false, true, SVNDepth.FILES); +// End of Second part + out.close(); + } catch (SVNException ex) { + Logger.getLogger(HelloServlet.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /** + * Returns a short description of the servlet. + * @return a String containing servlet description + */ + public String getServletInfo() { + return "Short description"; + }// </editor-fold> + + +} 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-09 15:19:30 UTC (rev 31) @@ -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/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-09 15:19:30 UTC (rev 31) @@ -0,0 +1,13 @@ +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" + 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-mapping> + <servlet-name>HelloServlet</servlet-name> + <url-pattern>/hello</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Added: nuiton-rstedit/src/main/webapp/test.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/test.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/test.jsp 2009-09-09 15:19:30 UTC (rev 31) @@ -0,0 +1,15 @@ +<html> + <head> + <title>RSTedit</title> + </head> +<body> + <center><p>Welcome on RSTedit</p></center> + <pre><%=request.getAttribute("OrigText")%></pre> + <center><form method="post"> + <textarea name="Mytext" id="Mytext" rows="20" cols="100"><%=request.getAttribute("OrigText")%></textarea> + <input type="submit" value="OK" name="OK"/> + <input type="reset" value="Reset" name="Reset" /> + </form></center> + +</body> +</html> \ No newline at end of file Added: nuiton-rstedit/src/test/test_svn.txt =================================================================== --- nuiton-rstedit/src/test/test_svn.txt (rev 0) +++ nuiton-rstedit/src/test/test_svn.txt 2009-09-09 15:19:30 UTC (rev 31) @@ -0,0 +1 @@ +Et ca marche!!! \ No newline at end of file