- Sandbox-commits - mailman.cloud.codelutin.com

r277 - /
by glorieux＠users.nuiton.org Oct. 9, 2009

Oct. 9, 2009

Author: glorieux Date: 2009-10-09 09:37:54 +0200 (Fri, 09 Oct 2009) New Revision: 277 Removed: nuiton-rstedit/ Log:

2 1

r278 - / nuiton-rstedit nuiton-rstedit/src nuiton-rstedit/src/main nuiton-rstedit/src/main/java nuiton-rstedit/src/main/java/org nuiton-rstedit/src/main/java/org/nuiton nuiton-rstedit/src/main/java/org/nuiton/jrst nuiton-rstedit/src/main/resources nuiton-rstedit/src/main/webapp nuiton-rstedit/src/main/webapp/WEB-INF nuiton-rstedit/src/test
by glorieux＠users.nuiton.org Oct. 9, 2009

Oct. 9, 2009

Author: glorieux Date: 2009-10-09 09:39:01 +0200 (Fri, 09 Oct 2009) New Revision: 278 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/org/ nuiton-rstedit/src/main/java/org/nuiton/ nuiton-rstedit/src/main/java/org/nuiton/jrst/ nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java nuiton-rstedit/src/main/resources/ nuiton-rstedit/src/main/resources/log4j.properties nuiton-rstedit/src/main/webapp/ nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp nuiton-rstedit/src/main/webapp/Error.jsp nuiton-rstedit/src/main/webapp/GereFormSize.js nuiton-rstedit/src/main/webapp/GereSession.js nuiton-rstedit/src/main/webapp/ModificationViewer.jsp nuiton-rstedit/src/main/webapp/OutConnection.jsp nuiton-rstedit/src/main/webapp/Preview.js nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp nuiton-rstedit/src/main/webapp/Recall.jsp nuiton-rstedit/src/main/webapp/Redirect.jsp nuiton-rstedit/src/main/webapp/Saver.js nuiton-rstedit/src/main/webapp/WEB-INF/ nuiton-rstedit/src/main/webapp/WEB-INF/web.xml nuiton-rstedit/src/main/webapp/cancelRedirect.js nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js 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-10-09 07:39:01 UTC (rev 278) @@ -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-10-09 07:39:01 UTC (rev 278) @@ -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-10-09 07:39:01 UTC (rev 278) @@ -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> + +  +  +  + + <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> + +  +  +  + + <name>Nuiton-rstedit</name> + <description>. + </description> + <inceptionYear>2009</inceptionYear> + <url>http://maven-site.nuiton.org/${project.artifactId}</url> + +  +  +  + + <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> + +  + <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> + +  + <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/org/nuiton/jrst/HelloServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,327 @@ +package org.nuiton.jrst; + +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.FileNotFoundException; +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.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; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + + +/** + * @author geoffroy lorieux + */ +public class HelloServlet extends HttpServlet { + + /** + * Handles the HTTP <code>GET</code> method. + * Do checkout on a private or not scm and call modification jsp page + * @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("--------------------------"); + log.debug("Connection to SCMWebEditor"); + log.debug("--------------------------"); + System.setProperty("file.encoding", "UTF-8"); + +// Redirect if the SCMWebEditor is not call from an other website + + if (request.getParameter("adresse") != null && request.getParameter("file_name") != null && request.getParameter("project_url") != null){ + if (request.getParameter("adresse").equals("") == true || request.getParameter("file_name").equals("") == true || request.getParameter("project_url").equals("") == true){ + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/BadFileRedirect.jsp"); + requestDispacher.forward(request, response); + return; + } + + } else { + SvnSession svnSess = (SvnSession)request.getSession(true).getAttribute("myInfo"); + if (svnSess != null){ + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + } + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/OutConnection.jsp"); + requestDispacher.forward(request, response); + return; + } + HttpSession httpSession = request.getSession(true); + +// svnSession object creation if doesn't already exist + + SvnSession svnSess = (SvnSession) httpSession.getAttribute("myInfo"); + + if (svnSess == null || (svnSess.getLogin() == null && svnSess.getPassword() == null)){ + svnSess = new SvnSession((request.getParameter("adresse").startsWith("scm:svn:") == true ? request.getParameter("adresse").replace("scm:svn:", "") : request.getParameter("adresse")), + request.getParameter("file_name"), request.getParameter("project_url"), + null, null, (File) getServletContext().getAttribute("javax.servlet.context.tempdir"),httpSession.getId()); + } else if (svnSess.getLogin() != null && svnSess.getPassword() != null){ + String tmp_log = svnSess.getLogin(); + String tmp_pass = svnSess.getPassword(); + svnSess = new SvnSession((request.getParameter("adresse").startsWith("scm:svn:") == true ? request.getParameter("adresse").replace("scm:svn:", "") : request.getParameter("adresse")), + request.getParameter("file_name"), request.getParameter("project_url"), + tmp_log, tmp_pass, (File) getServletContext().getAttribute("javax.servlet.context.tempdir"),httpSession.getId()); + } + + httpSession.setAttribute("myInfo", svnSess); +// Tempdir creation on servlet default temporary directory + + svnSess.getCheckoutdir().mkdir(); +// update client initialisation + + DAVRepositoryFactory.setup(); + SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + +// Checkout svn and file organisation + try{ + log.debug("Do Checkout"); + upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), + SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + } catch (SVNAuthenticationException authexep) { +// if svn authentication failed user is redirected on login page + log.debug("Private SCM on reading"); + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + request.setAttribute("adresse", svnSess.getSvnPath()); + request.setAttribute("file_name", svnSess.getFileName()); + request.setAttribute("project_url", svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/PrivateSvnRedirect.jsp"); + requestDispacher.forward(request, response); + return; + } + + File file_in_dir = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + try { + String original_text = FileUtils.readFileToString(file_in_dir); + request.setAttribute("OrigText", original_text); + request.setAttribute("InvalidateMaxTime", (httpSession.getMaxInactiveInterval()/60)); + request.setAttribute("Login", (svnSess.getLogin() != null && svnSess.getLogin().equalsIgnoreCase("") == false ? svnSess.getLogin() : null)); + request.setAttribute("IsLogin", (svnSess.getLogin() != null && svnSess.getPassword() != null && svnSess.getLogin().equalsIgnoreCase("") == false && svnSess.getPassword().equalsIgnoreCase("") == false ? true : false)); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/ModificationViewer.jsp"); + // End on first part + requestDispacher.forward(request, response); + + } catch (FileNotFoundException ee) { + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/BadFileRedirect.jsp"); + requestDispacher.forward(request, response); + return; + } +// JSP data transfert + + } catch (SVNException ex) { + SvnSession svnSess = (SvnSession)request.getSession(true).getAttribute("myInfo"); + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/BadFileRedirect.jsp"); + requestDispacher.forward(request, response); + return; + + } + } + + /** + * Handles the HTTP <code>POST</code> method. + * Receve the new text and commit it to scm + * @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"); + HttpSession httpSession = request.getSession(true); + SvnSession svnSess = (SvnSession) httpSession.getAttribute("myInfo"); + +// Resetting authentification information and manager + svnSess.setLogin(svnSess.getLogin() != null && svnSess.getLogin().equalsIgnoreCase("") == false ? svnSess.getLogin() : request.getParameter("username")); + svnSess.setPassword(svnSess.getPassword() != null && svnSess.getPassword().equalsIgnoreCase("") == false? svnSess.getPassword() : request.getParameter("pw")); + svnSess.setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(svnSess.getCheckoutdir(), svnSess.getLogin(), svnSess.getPassword(), false)); + svnSess.setManager(SVNClientManager.newInstance(svnSess.getSvnOption(), svnSess.getAuthManager())); + + File pathToFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + + SVNCommitClient commitClient = new SVNCommitClient(svnSess.getManager(), svnSess.getSvnOption()); + FileUtils.writeStringToFile(pathToFile, request.getParameter("Mytext")); + +// List<File> list = new java.util.ArrayList<File>(1); +// list.add(0, pathToFile); +// +// list = convertToUnicode(list); + + File[] tabFile = new File[1]; + tabFile[0] = pathToFile; +// Sending Data to SVN + + if (request.getParameter("Mytext").equals(request.getParameter("Orig_text")) == false){ + try{ + commitClient.doCommit(tabFile, false, request.getParameter("Commit_message"), null, null, false, true, SVNDepth.FILES); + } catch (SVNAuthenticationException authexep) { + // if authentication failed edition page is reload form user's relogin + response.setStatus(401); + request.setAttribute("svnPath_url", svnSess.getSvnPath()); + request.setAttribute("fileName_url", svnSess.getFileName()); + request.setAttribute("Redirection_url", svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Error.jsp"); + requestDispacher.forward(request, response); + return; + } + } +// if commit success user is redirect on the project page + request.setAttribute("Redirection_url", svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Redirect.jsp"); +// Deleting temp directory + + if (svnSess.getCheckoutdir() != null){ + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + } + +// End of Second part + + requestDispacher.forward(request, response); + log.debug("Exit RSTEditor"); + + } catch (SVNException ex) { + Logger.getLogger(HelloServlet.class.getName()).log(Level.SEVERE, null, ex); + } + } + + 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/org/nuiton/jrst/PreviewServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,180 @@ +package org.nuiton.jrst; + +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 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; + +/** + * @author geoffroy lorieux + */ +public class PreviewServlet extends HttpServlet { + + /** + * Processes requests for <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 { + log.debug("je suis dans la previewservlet"); + HttpSession httpSession = request.getSession(true); + 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"); +// Text formating and tempfile creating + String myDataWithoutcrlf = myData.replace("\r", ""); + File file_in_dir_copy = new File(tmp_dir, "copy"+httpSession.getId()+".rst"); + File http_file = new File(tmp_dir, "preview"+httpSession.getId()+".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); + + File copy = new File(tmp_dir, "copy"+httpSession.getId()+".rst"); +// Using jrst for generate html document + try{ + JRST.generate(JRST.TYPE_HTML, copy, http_file, JRST.Overwrite.ALLTIME); + log.debug("generate okai"); + } catch (Exception eee) { + log.debug("Bad RST file"); + response.setStatus(406); + return; + } + copy.delete(); +// Sending html content to pop-up preview page + response.setContentType("text/html"); + 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/java/org/nuiton/jrst/PrivateSvnServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,45 @@ +package org.nuiton.jrst; + +import java.io.IOException; +import java.io.PrintWriter; +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.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.tmatesoft.svn.core.wc.SVNClientManager; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + +/** + * @author geoffroy lorieux + */ +public class PrivateSvnServlet extends HttpServlet{ + + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + log.debug("New Log setting"); + HttpSession httpSession = request.getSession(true); + System.setProperty("file.encoding", "UTF-8"); + PrintWriter out = response.getWriter(); + SvnSession svnSess = (SvnSession) httpSession.getAttribute("myInfo"); +// Resetting User Information + svnSess.setLogin(request.getParameter("username")); + svnSess.setPassword(request.getParameter("pw")); + svnSess.setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(svnSess.getCheckoutdir(),svnSess.getLogin(), svnSess.getPassword(), false)); + svnSess.setManager(SVNClientManager.newInstance(svnSess.getSvnOption(), svnSess.getAuthManager())); + httpSession.setAttribute("myInfo", svnSess); +// Recalling helloservlet with user information stock on session + request.setAttribute("Redirect_url", + "http://localhost:8080/nuiton-rstedit/hello?adresse="+svnSess.getSvnPath()+"&"+"file_name="+svnSess.getFileName()+"&"+"project_url="+svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Recall.jsp"); + + requestDispacher.forward(request, response); + out.close(); + } + private static final Log log = LogFactory.getLog(PrivateSvnServlet.class); +} Added: nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,129 @@ +package org.nuiton.jrst; + +import java.io.File; +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.wc.DefaultSVNOptions; +import org.tmatesoft.svn.core.wc.SVNClientManager; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + +class SvnSession { + + public ISVNAuthenticationManager getAuthManager() { + return authManager; + } + + public void setAuthManager(ISVNAuthenticationManager authManager) { + this.authManager = authManager; + } + + public File getCheckoutdir() { + return checkoutdir; + } + + public void setCheckoutdir(File checkoutdir) { + this.checkoutdir = checkoutdir; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public SVNClientManager getManager() { + return manager; + } + + public void setManager(SVNClientManager manager) { + this.manager = manager; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getProjectUrl() { + return projectUrl; + } + + public void setProjectUrl(String projectUrl) { + this.projectUrl = projectUrl; + } + + public SVNURL getRemoteUrl() { + return remoteUrl; + } + + public void setRemoteUrl(SVNURL remoteUrl) { + this.remoteUrl = remoteUrl; + } + + public DefaultSVNOptions getSvnOption() { + return svnOption; + } + + public void setSvnOption(DefaultSVNOptions svnOption) { + this.svnOption = svnOption; + } + + public String getSvnPath() { + return svnPath; + } + + public void setSvnPath(String svnPath) { + this.svnPath = svnPath; + } + + public File getTmpDir() { + return tmpDir; + } + + public void setTmpDir(File tmpDir) { + this.tmpDir = tmpDir; + } + + String svnPath;// svn path without fileName + String fileName;// fileName of modif file + String projectUrl;// Projectname + String login;// user's login + String password;// user's password + File tmpDir;// Temp directory path + File checkoutdir;// Temp directory for checkout + SVNURL remoteUrl;// url of svn path + ISVNAuthenticationManager authManager;// AuthenticationManager with login and password + DefaultSVNOptions svnOption;// svn default option + SVNClientManager manager; + + SvnSession(String svnPath, String fileName, String projectUrl, String login, String password, File tmpDir, String id) throws SVNException { + super(); + this.svnPath = svnPath; + this.fileName = fileName; + this.projectUrl = projectUrl; + this.login = login; + this.password = password; + this.tmpDir = tmpDir; + this.checkoutdir = new File(this.tmpDir, "temp_rst"+id); + this.remoteUrl = SVNURL.parseURIEncoded(svnPath); + this.authManager = SVNWCUtil.createDefaultAuthenticationManager(this.checkoutdir, this.login, this.password, false); + this.svnOption = SVNWCUtil.createDefaultOptions(this.checkoutdir, false); + this.svnOption.setPropertyValue(SVNProperty.EOL_STYLE, SVNProperty.EOL_STYLE_LF); + this.manager = SVNClientManager.newInstance(this.svnOption, this.authManager); + } +} 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-10-09 07:39:01 UTC (rev 278) @@ -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/BadFileRedirect.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,23 @@ +<%-- + Document : BadFileRedirect + Created on : 6 oct. 2009, 15:33:56 + 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="3; url=http://localhost:8080/nuiton-rstedit/hello"> + </head> + <body> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <p>Bad SCM path or file name! Please correct it.</p> + <p>You should be transferred automatically to the form page. If +not please <a href="http://localhost:8080/nuiton-rstedit/hello">click this link</a>.</p> + </body> +</html> 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-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,22 @@ +<%-- + 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> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <p>Bad Login or Password. Please Wait.</p> + </body> +</html> Added: nuiton-rstedit/src/main/webapp/GereFormSize.js =================================================================== --- nuiton-rstedit/src/main/webapp/GereFormSize.js (rev 0) +++ nuiton-rstedit/src/main/webapp/GereFormSize.js 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,43 @@ +/** + * @author geoffroy lorieux + */ + + +function countLines(strtocount, cols) + { + var hard_lines = 1; + var last = 0; + while ( true ) + { + last = strtocount.indexOf("\n", last+1); + hard_lines ++; + if ( last == -1 ) + { + break; + } + } + var soft_lines = Math.round(strtocount.length / (cols-1)); + var hard = eval("hard_lines " + unescape("%3e") + "soft_lines;"); + if ( hard ) + { + soft_lines = hard_lines; + } + return soft_lines; + } +function cleanForm() + { + var the_form = document.forms[0]; + for ( var x in the_form ) + { + if ( ! the_form[x] ) + { + continue; + } + if( typeof the_form[x].rows != "number" ) + { + continue; + } + the_form[x].rows = countLines(the_form[x].value,the_form[x].cols) +1; + } + setTimeout("cleanForm();", 300); + } \ No newline at end of file Added: nuiton-rstedit/src/main/webapp/GereSession.js =================================================================== --- nuiton-rstedit/src/main/webapp/GereSession.js (rev 0) +++ nuiton-rstedit/src/main/webapp/GereSession.js 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,41 @@ +/** + * @author geoffroy lorieux + */ + +function rappelSession(minutes) +{ + var msg='Your session expire on '+minutes+' minute'; + if(minutes>1) + { + msg+='s'; + } + msg+='.\nDo you want to reload this page ?'; + + if(confirm(msg)) + { + location.reload(); + } +} + +/** + * affiche une alerte sur l'expiration de la session et redirige vers une autre page + */ +function expirationSession() +{ + alert("Your session has expire. Please relogin"); + window.history.back(-1); +} + +/** + * affiche des avertissements sur le délai d'expiration de la session : + * - un premier au bout de (expiration-rappel) minutes (par ex. : 20-3 = 17 minutes) + * - un second au bout de (expiration) minutes (par ex. : 20 minutes) + */ +function geresession(expiration, rappel) +{ + // affichage du rappel + var chronoRappel=setTimeout('rappelSession('+rappel+')', (expiration-rappel)*60*1000); + + // une fois le rappel affiché, on avertit uniquement de l'expiration + var chronoExpiration=setTimeout('expirationSession()', (expiration)*60*1000); +} 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-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,51 @@ +<%-- + Document : ModificationViewer + Created on : 10 sept. 2009, 13:43:11 + Author : glorieux +--%> +<%@page contentType="text/html" pageEncoding="UTF-8"%> + +<?xml version='1.0' encoding='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>SCMWebEditor</title> + + </head> +<body onload="cleanForm(); geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <center><h2><p>Welcome on SCMWebEditor</p></h2> + <h4><p>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</p></h4></center> + + <center><form method="post" action="/nuiton-rstedit/hello"> + <script src="GereFormSize.js"></script> + <textarea name="Mytext" id="Mytext" rows="20" cols="150"><%=request.getAttribute("OrigText")%></textarea> + <script src="Preview.js"></script> + <script src="Saver.js"></script> + <script src="GereSession.js"></script> + <script src="cancelRedirectDelete.js"></script> + <noscript><h4><p>Javascript is not activated. You can't only use Save and Quit or Reset button.</p></h4></noscript> + <noscript><h4><p> For a better use of SCMWebEditor please activate JavaScript.</p></h4></noscript> + <p>Commit Message: <input type="text" name="Commit_message"/></p> + <%if (request.getAttribute("IsLogin").equals(false) == true){ + %><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><% + } else { + %><p>You are log as: <%=request.getAttribute("Login")%></p> + <input type="hidden" NAME=username> + <input type="hidden" NAME=pw><% + }%> + <input type="hidden" name="Orig_text" value="<%=request.getAttribute("OrigText")%>"/> + <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);"/> + <input type="submit" value="Save and Quit" 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="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.Orig_text, this.form.username, this.form.pw, this.form.Commit_message);"/> + </form></center> + + <h4><p>Older Text Preview :</p></h4> + <pre><%=request.getAttribute("OrigText")%></pre> +</body> +</html> Added: nuiton-rstedit/src/main/webapp/OutConnection.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/OutConnection.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/OutConnection.jsp 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,27 @@ +<%-- + Document : OutConnection + Created on : 6 oct. 2009, 12:07:27 + 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>SCM Web Editor</title> + </head> + <body> + <script src="cancelRedirect.js"></script> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <center><h2><p>Welcome on SCMWebEditor</p></h2><h4><p>You try to access SCM Web Editor from an unknow page please complete this form for application using.</p></h4></center> + <center><form method="get" action="/nuiton-rstedit/hello"> + <p><label>SCM path: <input TYPE=text NAME=adresse SIZE=50></label></p> + <p><label>File name: <input TYPE=text NAME=file_name SIZE=20></label></p> + <input type="hidden" name="project_url" value="<%=request.getRequestURI()%>"/> + <input type="submit" value="Continue" name="Save"/> + </form></center> + </body> +</html> 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-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,56 @@ +/** + * @author geoffroy lorieux + */ + +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 && http.status != 406) + { + var response = http.responseText; + var wind = window.open("", "Preview", "scrollbars=yes,resizable=yes,status=yes"); + wind.document.body.innerHTML = response; + } + else if (http.readyState == 4 && http.status == 406) + { + alert("Bad RestructuredText file format please correct it."); + } +} + +function preview(my_text) +{ + sendRequest("POST", "http://localhost:8080/nuiton-rstedit/previewservlet", my_text); +} + Added: nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,29 @@ +<%-- + Document : PrivateSvnRedirect + Created on : 30 sept. 2009, 14:05:43 + 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>Private Scm</title> + </head> + <body><form method="post" action="/nuiton-rstedit/privatesvnservlet"> + <script src="cancelRedirect.js"></script> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <p>You try to access a Private SCM. Please login</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="Submit" name="Save"/> + <input type="button" value="Exit" name="Cancel" onclick="cancelRedirect(this.form.project_url);"/> + <input type="hidden" name="adresse" value="<%=request.getAttribute("adresse")%>"/> + <input type="hidden" name="file_name" value="<%=request.getAttribute("file_name")%>"/> + <input type="hidden" name="project_url" value="<%=request.getAttribute("project_url")%>"/> + </form> + </body> +</html> \ No newline at end of file Added: nuiton-rstedit/src/main/webapp/Recall.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/Recall.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/Recall.jsp 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,17 @@ +<%-- + Document : Recall + Created on : 30 sept. 2009, 17:05:40 + 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>Redirect...</title> + <meta http-equiv="Refresh" content="0; url=<%=request.getAttribute("Redirect_url")%>"> + </head> +</html> 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-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,23 @@ +<%-- + 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> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <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/Saver.js =================================================================== --- nuiton-rstedit/src/main/webapp/Saver.js (rev 0) +++ nuiton-rstedit/src/main/webapp/Saver.js 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,56 @@ +/** + * @author geoffroy lorieux + */ + +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 sendReq(method, url, text, login, pass, message, orig_text) +{ + http.open(method, url, true); + http.onreadystatechange = handleResp; + http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http.send("Mytext="+text.value+"&username="+login.value+"&pw="+pass.value+"&Commit_message="+message.value+"&Orig_text="+orig_text.value); +} + +function handleResp() +{ + if(http.readyState == 4 && http.status != 401){ + alert("Save Ok."); +// window.location.reload(true); + } else if (http.readyState == 4 && http.status == 401){ + alert("Bad login or password please recheck."); + } +} + +function saver(my_text, login, pass, message, orig_text) +{ + if (my_text.value != orig_text.value){ + if (confirm("Do you really want to save?")){ + sendReq("POST", "http://localhost:8080/nuiton-rstedit/hello", my_text, login, pass, message, orig_text); + } + } else{ + alert("File don't need to be save."); + } +} \ No newline at end of file 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-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,36 @@ +<?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>org.nuiton.jrst.HelloServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>PreviewServlet</servlet-name> + <servlet-class>org.nuiton.jrst.PreviewServlet</servlet-class> + </servlet> + <servlet> + <servlet-name>Saveservlet</servlet-name> + <servlet-class>Saveservlet</servlet-class> + </servlet> + <servlet> + <servlet-name>PrivateSvnServlet</servlet-name> + <servlet-class>org.nuiton.jrst.PrivateSvnServlet</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> + <servlet-mapping> + <servlet-name>Saveservlet</servlet-name> + <url-pattern>/saveservlet</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PrivateSvnServlet</servlet-name> + <url-pattern>/privatesvnservlet</url-pattern> + </servlet-mapping> + </web-app> Added: nuiton-rstedit/src/main/webapp/cancelRedirect.js =================================================================== --- nuiton-rstedit/src/main/webapp/cancelRedirect.js (rev 0) +++ nuiton-rstedit/src/main/webapp/cancelRedirect.js 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,11 @@ +/** + * @author geoffroy lorieux + */ + + +function cancelRedirect(url) + { + if (confirm("Exit SCMWebEditor ?")){ + window.location.replace(url.value); + } + } \ No newline at end of file Added: nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js =================================================================== --- nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js (rev 0) +++ nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js 2009-10-09 07:39:01 UTC (rev 278) @@ -0,0 +1,44 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + + +function createRequestObjec() +{ + 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= createRequestObjec(); + +function sendRe(method, url, text, login, pass, message) +{ + http.open(method, url, true); + http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http.send("Mytext="+text.value+"&username="+login.value+"&pw="+pass.value+"&Commit_message="+message.value+"&Orig_text="+text.value); +} + +function cancelRedirectDelete(orig_text, login, pass, message) + { + if (confirm("Exit SCMWebEditor ?")){ + sendRe("POST", "http://localhost:8080/nuiton-rstedit/hello", orig_text, login, pass, message); + window.history.go(-1); + } + } \ No newline at end of file

1 0

r276 - in jaxx-help-example: . src/main/help/default src/main/help/en
by tchemit＠users.nuiton.org Oct. 8, 2009

Oct. 8, 2009

Author: tchemit Date: 2009-10-08 21:41:53 +0200 (Thu, 08 Oct 2009) New Revision: 276 Added: jaxx-help-example/velocity.log Removed: jaxx-help-example/src/main/help/default/jaxx-help-exampleToc.xml jaxx-help-example/src/main/help/en/jaxx-help-exampleToc.xml Modified: jaxx-help-example/ jaxx-help-example/src/main/help/default/jaxx-help-exampleIndex.xml jaxx-help-example/src/main/help/default/jaxx-help-exampleTOC.xml jaxx-help-example/src/main/help/en/jaxx-help-exampleIndex.xml jaxx-help-example/src/main/help/en/jaxx-help-exampleTOC.xml Log: test files Property changes on: jaxx-help-example ___________________________________________________________________ Added: svn:ignore + target Modified: jaxx-help-example/src/main/help/default/jaxx-help-exampleIndex.xml =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-exampleIndex.xml 2009-10-08 16:51:56 UTC (rev 275) +++ jaxx-help-example/src/main/help/default/jaxx-help-exampleIndex.xml 2009-10-08 19:41:53 UTC (rev 276) @@ -5,14 +5,14 @@ <index version="1.0"> - <indexitem target="top" text=""> + <indexitem target="top" text="jaxx-help-example"> <indexitem target="ui" text="UI"> <indexitem target="ui.main" text="MAIN"> <indexitem target="ui.main.menu" text="Menus"> - <indexitem target="ui.main.menu.help" text=""> - <indexitem target="ui.main.menu.help.help" text=""/> - <indexitem target="ui.main.menu.help.about" text=""/> - <indexitem target="ui.main.menu.help.site" text=""/> + <indexitem target="ui.main.menu.help" text="Menu aide"> + <indexitem target="ui.main.menu.help.help" text="Afficher l'aide"/> + <indexitem target="ui.main.menu.help.about" text="Afficher l'about"/> + <indexitem target="ui.main.menu.help.site" text="Accéder au site"/> </indexitem> <indexitem target="ui.main.menu.file" text=""> <indexitem target="ui.main.menu.file.locale" text=""> Modified: jaxx-help-example/src/main/help/default/jaxx-help-exampleTOC.xml =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-exampleTOC.xml 2009-10-08 16:51:56 UTC (rev 275) +++ jaxx-help-example/src/main/help/default/jaxx-help-exampleTOC.xml 2009-10-08 19:41:53 UTC (rev 276) @@ -5,13 +5,13 @@ <toc version="1.0"> <tocitem target="top" text="jaxx-help-example"> - <tocitem target="ui" text=""> - <tocitem target="ui.main" text=""> - <tocitem target="ui.main.menu" text=""> - <tocitem target="ui.main.menu.help" text=""> - <tocitem target="ui.main.menu.help.help" text=""/> - <tocitem target="ui.main.menu.help.about" text=""/> - <tocitem target="ui.main.menu.help.site" text=""/> + <tocitem target="ui" text="UI"> + <tocitem target="ui.main" text="MAIN"> + <tocitem target="ui.main.menu" text="Menus"> + <tocitem target="ui.main.menu.help" text="Menu Aide"> + <tocitem target="ui.main.menu.help.help" text="Afficher l'aide"/> + <tocitem target="ui.main.menu.help.about" text="Afficher about"/> + <tocitem target="ui.main.menu.help.site" text="Accéder au site"/> </tocitem> <tocitem target="ui.main.menu.file" text=""> <tocitem target="ui.main.menu.file.locale" text=""> Deleted: jaxx-help-example/src/main/help/default/jaxx-help-exampleToc.xml =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-exampleToc.xml 2009-10-08 16:51:56 UTC (rev 275) +++ jaxx-help-example/src/main/help/default/jaxx-help-exampleToc.xml 2009-10-08 19:41:53 UTC (rev 276) @@ -1,32 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> -<!DOCTYPE toc - PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" - "http://buix.labs.libre-entreprise.org/javahelp/toc_1_0.dtd"> - -<toc version="1.0"> - <tocitem target="top" text=""> - <tocitem target="ui" text=""> - <tocitem target="ui.main" text=""> - <tocitem target="ui.main.menu" text=""> - <tocitem target="ui.main.menu.help" text=""> - <tocitem target="ui.main.menu.help.help" text=""/> - <tocitem target="ui.main.menu.help.about" text=""/> - <tocitem target="ui.main.menu.help.site" text=""/> - </tocitem> - <tocitem target="ui.main.menu.file" text=""> - <tocitem target="ui.main.menu.file.locale" text=""> - <tocitem target="ui.main.menu.file.locale.fr" text=""/> - <tocitem target="ui.main.menu.file.locale.uk" text=""/> - </tocitem> - <tocitem target="ui.main.menu.file.leave-fullscreen" text=""/> - <tocitem target="ui.main.menu.file.fullscreen" text=""/> - <tocitem target="ui.main.menu.file.exit" text=""/> - <tocitem target="ui.main.menu.file.configuration" text=""/> - </tocitem> - </tocitem> - <tocitem target="ui.main.content" text=""/> - <tocitem target="ui.main.toolbar" text=""/> - </tocitem> - </tocitem> - </tocitem> -</toc> Modified: jaxx-help-example/src/main/help/en/jaxx-help-exampleIndex.xml =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-exampleIndex.xml 2009-10-08 16:51:56 UTC (rev 275) +++ jaxx-help-example/src/main/help/en/jaxx-help-exampleIndex.xml 2009-10-08 19:41:53 UTC (rev 276) @@ -5,14 +5,14 @@ <index version="1.0"> - <indexitem target="top" text=""> - <indexitem target="ui" text=""> - <indexitem target="ui.main" text=""> - <indexitem target="ui.main.menu" text=""> - <indexitem target="ui.main.menu.help" text=""> - <indexitem target="ui.main.menu.help.help" text=""/> - <indexitem target="ui.main.menu.help.about" text=""/> - <indexitem target="ui.main.menu.help.site" text=""/> + <indexitem target="top" text="jaxx-help-example"> + <indexitem target="ui" text="UI"> + <indexitem target="ui.main" text="MAIN"> + <indexitem target="ui.main.menu" text="Menus"> + <indexitem target="ui.main.menu.help" text="Menu help"> + <indexitem target="ui.main.menu.help.help" text="Show help"/> + <indexitem target="ui.main.menu.help.about" text="Show about"/> + <indexitem target="ui.main.menu.help.site" text="goto website"/> </indexitem> <indexitem target="ui.main.menu.file" text=""> <indexitem target="ui.main.menu.file.locale" text=""> Modified: jaxx-help-example/src/main/help/en/jaxx-help-exampleTOC.xml =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-exampleTOC.xml 2009-10-08 16:51:56 UTC (rev 275) +++ jaxx-help-example/src/main/help/en/jaxx-help-exampleTOC.xml 2009-10-08 19:41:53 UTC (rev 276) @@ -5,13 +5,13 @@ <toc version="1.0"> <tocitem target="top" text="jaxx-help-example"> - <tocitem target="ui" text=""> - <tocitem target="ui.main" text=""> - <tocitem target="ui.main.menu" text=""> - <tocitem target="ui.main.menu.help" text=""> - <tocitem target="ui.main.menu.help.help" text=""/> - <tocitem target="ui.main.menu.help.about" text=""/> - <tocitem target="ui.main.menu.help.site" text=""/> + <tocitem target="ui" text="UI"> + <tocitem target="ui.main" text="MAIN"> + <tocitem target="ui.main.menu" text="Menus"> + <tocitem target="ui.main.menu.help" text="Menu help"> + <tocitem target="ui.main.menu.help.help" text="Show help"/> + <tocitem target="ui.main.menu.help.about" text="Show about"/> + <tocitem target="ui.main.menu.help.site" text="Goto website"/> </tocitem> <tocitem target="ui.main.menu.file" text=""> <tocitem target="ui.main.menu.file.locale" text=""> Deleted: jaxx-help-example/src/main/help/en/jaxx-help-exampleToc.xml =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-exampleToc.xml 2009-10-08 16:51:56 UTC (rev 275) +++ jaxx-help-example/src/main/help/en/jaxx-help-exampleToc.xml 2009-10-08 19:41:53 UTC (rev 276) @@ -1,32 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> -<!DOCTYPE toc - PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" - "http://buix.labs.libre-entreprise.org/javahelp/toc_1_0.dtd"> - -<toc version="1.0"> - <tocitem target="top" text=""> - <tocitem target="ui" text=""> - <tocitem target="ui.main" text=""> - <tocitem target="ui.main.menu" text=""> - <tocitem target="ui.main.menu.help" text=""> - <tocitem target="ui.main.menu.help.help" text=""/> - <tocitem target="ui.main.menu.help.about" text=""/> - <tocitem target="ui.main.menu.help.site" text=""/> - </tocitem> - <tocitem target="ui.main.menu.file" text=""> - <tocitem target="ui.main.menu.file.locale" text=""> - <tocitem target="ui.main.menu.file.locale.fr" text=""/> - <tocitem target="ui.main.menu.file.locale.uk" text=""/> - </tocitem> - <tocitem target="ui.main.menu.file.leave-fullscreen" text=""/> - <tocitem target="ui.main.menu.file.fullscreen" text=""/> - <tocitem target="ui.main.menu.file.exit" text=""/> - <tocitem target="ui.main.menu.file.configuration" text=""/> - </tocitem> - </tocitem> - <tocitem target="ui.main.content" text=""/> - <tocitem target="ui.main.toolbar" text=""/> - </tocitem> - </tocitem> - </tocitem> -</toc>

1 0

Oct. 8, 2009

Author: tchemit Date: 2009-10-08 18:51:56 +0200 (Thu, 08 Oct 2009) New Revision: 275 Added: jaxx-help-example/ jaxx-help-example/LICENSE.txt jaxx-help-example/README.txt jaxx-help-example/changelog.txt jaxx-help-example/pom.xml jaxx-help-example/src/ jaxx-help-example/src/main/ jaxx-help-example/src/main/filters/ jaxx-help-example/src/main/filters/jaxx-demo.properties jaxx-help-example/src/main/help/ jaxx-help-example/src/main/help/default/ jaxx-help-example/src/main/help/default/jaxx-help-example/ jaxx-help-example/src/main/help/default/jaxx-help-example/jaxx-help-example.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/content.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/configuration.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/exit.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/fullscreen.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/leave-fullscreen.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale/ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale/fr.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale/uk.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/about.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/help.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/site.html jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/toolbar.html jaxx-help-example/src/main/help/default/jaxx-help-exampleIndex.xml jaxx-help-example/src/main/help/default/jaxx-help-exampleMap.jhm jaxx-help-example/src/main/help/default/jaxx-help-exampleTOC.xml jaxx-help-example/src/main/help/default/jaxx-help-exampleToc.xml jaxx-help-example/src/main/help/en/ jaxx-help-example/src/main/help/en/jaxx-help-example/ jaxx-help-example/src/main/help/en/jaxx-help-example/jaxx-help-example.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/content.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/configuration.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/exit.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/fullscreen.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/leave-fullscreen.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale/ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale/fr.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale/uk.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/about.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/help.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/site.html jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/toolbar.html jaxx-help-example/src/main/help/en/jaxx-help-exampleIndex.xml jaxx-help-example/src/main/help/en/jaxx-help-exampleMap.jhm jaxx-help-example/src/main/help/en/jaxx-help-exampleTOC.xml jaxx-help-example/src/main/help/en/jaxx-help-exampleToc.xml jaxx-help-example/src/main/help/jaxx-help-example.hs jaxx-help-example/src/main/help/jaxx-help-example_en.hs jaxx-help-example/src/main/java/ jaxx-help-example/src/main/java/jaxx/ jaxx-help-example/src/main/java/jaxx/demo/ jaxx-help-example/src/main/java/jaxx/demo/DemoConfig.java jaxx-help-example/src/main/java/jaxx/demo/DemoUI.css jaxx-help-example/src/main/java/jaxx/demo/DemoUI.jaxx jaxx-help-example/src/main/java/jaxx/demo/DemoUIHandler.java jaxx-help-example/src/main/java/jaxx/demo/RunDemo.java jaxx-help-example/src/main/resources/ jaxx-help-example/src/main/resources/i18n/ jaxx-help-example/src/main/resources/i18n/jaxx-help-example-en_GB.properties jaxx-help-example/src/main/resources/i18n/jaxx-help-example-fr_FR.properties jaxx-help-example/src/main/resources/icons/ jaxx-help-example/src/main/resources/icons/action-about.png jaxx-help-example/src/main/resources/icons/action-accept.png jaxx-help-example/src/main/resources/icons/action-block.png jaxx-help-example/src/main/resources/icons/action-close.png jaxx-help-example/src/main/resources/icons/action-config.png jaxx-help-example/src/main/resources/icons/action-exit.png jaxx-help-example/src/main/resources/icons/action-fullscreen.png jaxx-help-example/src/main/resources/icons/action-help.png jaxx-help-example/src/main/resources/icons/action-i18n-fr.png jaxx-help-example/src/main/resources/icons/action-i18n-uk.png jaxx-help-example/src/main/resources/icons/action-leave-fullscreen.png jaxx-help-example/src/main/resources/icons/action-show-help.png jaxx-help-example/src/main/resources/icons/action-site.png jaxx-help-example/src/main/resources/icons/action-translate.png jaxx-help-example/src/main/resources/icons/jaxx.png jaxx-help-example/src/main/resources/log4j.properties jaxx-help-example/src/site/ jaxx-help-example/src/site/rst/ jaxx-help-example/src/site/rst/images/ jaxx-help-example/src/site/rst/images/Components-screenshot.gif jaxx-help-example/src/site/rst/images/webstart.gif jaxx-help-example/src/site/rst/index.rst jaxx-help-example/src/site/site.xml jaxx-help-example/src/test/ jaxx-help-example/src/test/java/ jaxx-help-example/src/test/resources/ Log: projet temporaire de test de jaxx-help en multi-langue Added: jaxx-help-example/LICENSE.txt =================================================================== --- jaxx-help-example/LICENSE.txt (rev 0) +++ jaxx-help-example/LICENSE.txt 2009-10-08 16:51:56 UTC (rev 275) @@ -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: jaxx-help-example/README.txt =================================================================== --- jaxx-help-example/README.txt (rev 0) +++ jaxx-help-example/README.txt 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Added: jaxx-help-example/pom.xml =================================================================== --- jaxx-help-example/pom.xml (rev 0) +++ jaxx-help-example/pom.xml 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,299 @@ + +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>jaxx</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-help-example</artifactId> + + <dependencies> + +  + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + +  +  +  + + <name>JAXX Help Example</name> + <description>Jaxx help system test</description> + +  +  +  + + <packaging>jar</packaging> + + <properties> + + <maven.jar.main.class>jaxx.demo.RunDemo</maven.jar.main.class> + +  + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.generateHelp>true</jaxx.generateHelp> +  + +  + <jaxx.locales>fr,en</jaxx.locales> +  +  + </properties> + + <build> + + <resources> + <resource> + <directory>src/main/filters</directory> + <filtering>true</filtering> + <includes> + <include>jaxx-demo.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> + <directory>src/main/help</directory> +  + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <configuration> + <jnlpExtensions> + <jnlpExtension> + <name>sun</name> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <includes> + <include>javax.help:javahelp</include> + </includes> + </jnlpExtension> + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer </title> + <vendor>Swing Labs</vendor> + <includes> + <include>org.swinglabs:jxlayer</include> + </includes> + </jnlpExtension> + </jnlpExtensions> + </configuration> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <configuration> + <copyToMETA_INF>true</copyToMETA_INF> + </configuration> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>add-license</goal> + <goal>add-third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </pluginManagement> + + <plugins> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + <goal>generate-help</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <silent>true</silent> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>attach-licenses</id> + </execution> + </executions> + </plugin> + + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> + </plugin> + </plugins> + </reporting> + +  +  +  + + <profiles> +  + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + </profiles> + +</project> Added: jaxx-help-example/src/main/filters/jaxx-demo.properties =================================================================== --- jaxx-help-example/src/main/filters/jaxx-demo.properties (rev 0) +++ jaxx-help-example/src/main/filters/jaxx-demo.properties 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,10 @@ +application.name=${project.name} +application.version=${project.version} +application.site.url=${project.url} +application.icon.path=/icons/jaxx.png +application.license.path=META-INF/${project.artifactId}-LICENSE.txt +application.third-party.path=META-INF/${project.artifactId}-THIRD-PARTY.txt +#licence.name=${project.licenses[0].license.name} +#licence.url=${project.licenses.0.url} +application.organisation.name=${project.organization.name} +application.organisation.url=${project.organization.url} Added: jaxx-help-example/src/main/help/default/jaxx-help-example/jaxx-help-example.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/jaxx-help-example.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/jaxx-help-example.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +top +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>top</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/content.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/content.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/content.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.content +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.content</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/configuration.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/configuration.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/configuration.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.configuration +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.configuration</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/exit.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/exit.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/exit.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.exit +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.exit</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/fullscreen.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/fullscreen.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/fullscreen.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.fullscreen +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.fullscreen</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/leave-fullscreen.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/leave-fullscreen.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/leave-fullscreen.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.leave-fullscreen +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.leave-fullscreen</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale/fr.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale/fr.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale/fr.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.locale.fr +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.locale.fr</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale/uk.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale/uk.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale/uk.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.locale.uk +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.locale.uk</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file/locale.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.locale +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.locale</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/file.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/about.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/about.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/about.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.help.about +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.help.about</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/help.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/help.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/help.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.help.help +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.help.help</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/site.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/site.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help/site.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.help.site +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.help.site</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu/help.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.help +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.help</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/menu.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/toolbar.html =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/toolbar.html (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-example/ui/main/toolbar.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.toolbar +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.toolbar</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/default/jaxx-help-exampleIndex.xml =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-exampleIndex.xml (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-exampleIndex.xml 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,33 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE index + PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 1.0//EN" + "http://buix.labs.libre-entreprise.org/javahelp/index_1_0.dtd"> + + +<index version="1.0"> + <indexitem target="top" text=""> + <indexitem target="ui" text="UI"> + <indexitem target="ui.main" text="MAIN"> + <indexitem target="ui.main.menu" text="Menus"> + <indexitem target="ui.main.menu.help" text=""> + <indexitem target="ui.main.menu.help.help" text=""/> + <indexitem target="ui.main.menu.help.about" text=""/> + <indexitem target="ui.main.menu.help.site" text=""/> + </indexitem> + <indexitem target="ui.main.menu.file" text=""> + <indexitem target="ui.main.menu.file.locale" text=""> + <indexitem target="ui.main.menu.file.locale.fr" text=""/> + <indexitem target="ui.main.menu.file.locale.uk" text=""/> + </indexitem> + <indexitem target="ui.main.menu.file.leave-fullscreen" text=""/> + <indexitem target="ui.main.menu.file.fullscreen" text=""/> + <indexitem target="ui.main.menu.file.exit" text=""/> + <indexitem target="ui.main.menu.file.configuration" text=""/> + </indexitem> + </indexitem> + <indexitem target="ui.main.content" text=""/> + <indexitem target="ui.main.toolbar" text=""/> + </indexitem> + </indexitem> + </indexitem> +</index> Added: jaxx-help-example/src/main/help/default/jaxx-help-exampleMap.jhm =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-exampleMap.jhm (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-exampleMap.jhm 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,27 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE map + PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" + "http://java.sun.com/products/javahelp/map_1_0.dtd"> +<map version="1.0"> + +  +  + + <mapID target="top" url="jaxx-help-example/jaxx-help-example.html" /> + <mapID target="ui.main.content" url="jaxx-help-example/ui/main/content.html" /> + <mapID target="ui.main.menu" url="jaxx-help-example/ui/main/menu.html" /> + <mapID target="ui.main.menu.file" url="jaxx-help-example/ui/main/menu/file.html" /> + <mapID target="ui.main.menu.file.configuration" url="jaxx-help-example/ui/main/menu/file/configuration.html" /> + <mapID target="ui.main.menu.file.exit" url="jaxx-help-example/ui/main/menu/file/exit.html" /> + <mapID target="ui.main.menu.file.fullscreen" url="jaxx-help-example/ui/main/menu/file/fullscreen.html" /> + <mapID target="ui.main.menu.file.leave-fullscreen" url="jaxx-help-example/ui/main/menu/file/leave-fullscreen.html" /> + <mapID target="ui.main.menu.file.locale" url="jaxx-help-example/ui/main/menu/file/locale.html" /> + <mapID target="ui.main.menu.file.locale.fr" url="jaxx-help-example/ui/main/menu/file/locale/fr.html" /> + <mapID target="ui.main.menu.file.locale.uk" url="jaxx-help-example/ui/main/menu/file/locale/uk.html" /> + <mapID target="ui.main.menu.help" url="jaxx-help-example/ui/main/menu/help.html" /> + <mapID target="ui.main.menu.help.about" url="jaxx-help-example/ui/main/menu/help/about.html" /> + <mapID target="ui.main.menu.help.help" url="jaxx-help-example/ui/main/menu/help/help.html" /> + <mapID target="ui.main.menu.help.site" url="jaxx-help-example/ui/main/menu/help/site.html" /> + <mapID target="ui.main.toolbar" url="jaxx-help-example/ui/main/toolbar.html" /> + +</map> Added: jaxx-help-example/src/main/help/default/jaxx-help-exampleTOC.xml =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-exampleTOC.xml (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-exampleTOC.xml 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,32 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE toc + PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" + "http://buix.labs.libre-entreprise.org/javahelp/toc_1_0.dtd"> + +<toc version="1.0"> + <tocitem target="top" text="jaxx-help-example"> + <tocitem target="ui" text=""> + <tocitem target="ui.main" text=""> + <tocitem target="ui.main.menu" text=""> + <tocitem target="ui.main.menu.help" text=""> + <tocitem target="ui.main.menu.help.help" text=""/> + <tocitem target="ui.main.menu.help.about" text=""/> + <tocitem target="ui.main.menu.help.site" text=""/> + </tocitem> + <tocitem target="ui.main.menu.file" text=""> + <tocitem target="ui.main.menu.file.locale" text=""> + <tocitem target="ui.main.menu.file.locale.fr" text=""/> + <tocitem target="ui.main.menu.file.locale.uk" text=""/> + </tocitem> + <tocitem target="ui.main.menu.file.leave-fullscreen" text=""/> + <tocitem target="ui.main.menu.file.fullscreen" text=""/> + <tocitem target="ui.main.menu.file.exit" text=""/> + <tocitem target="ui.main.menu.file.configuration" text=""/> + </tocitem> + </tocitem> + <tocitem target="ui.main.content" text=""/> + <tocitem target="ui.main.toolbar" text=""/> + </tocitem> + </tocitem> + </tocitem> +</toc> Added: jaxx-help-example/src/main/help/default/jaxx-help-exampleToc.xml =================================================================== --- jaxx-help-example/src/main/help/default/jaxx-help-exampleToc.xml (rev 0) +++ jaxx-help-example/src/main/help/default/jaxx-help-exampleToc.xml 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,32 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE toc + PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" + "http://buix.labs.libre-entreprise.org/javahelp/toc_1_0.dtd"> + +<toc version="1.0"> + <tocitem target="top" text=""> + <tocitem target="ui" text=""> + <tocitem target="ui.main" text=""> + <tocitem target="ui.main.menu" text=""> + <tocitem target="ui.main.menu.help" text=""> + <tocitem target="ui.main.menu.help.help" text=""/> + <tocitem target="ui.main.menu.help.about" text=""/> + <tocitem target="ui.main.menu.help.site" text=""/> + </tocitem> + <tocitem target="ui.main.menu.file" text=""> + <tocitem target="ui.main.menu.file.locale" text=""> + <tocitem target="ui.main.menu.file.locale.fr" text=""/> + <tocitem target="ui.main.menu.file.locale.uk" text=""/> + </tocitem> + <tocitem target="ui.main.menu.file.leave-fullscreen" text=""/> + <tocitem target="ui.main.menu.file.fullscreen" text=""/> + <tocitem target="ui.main.menu.file.exit" text=""/> + <tocitem target="ui.main.menu.file.configuration" text=""/> + </tocitem> + </tocitem> + <tocitem target="ui.main.content" text=""/> + <tocitem target="ui.main.toolbar" text=""/> + </tocitem> + </tocitem> + </tocitem> +</toc> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/jaxx-help-example.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/jaxx-help-example.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/jaxx-help-example.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +top +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>top</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/content.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/content.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/content.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.content +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.content</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/configuration.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/configuration.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/configuration.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.configuration +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.configuration</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/exit.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/exit.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/exit.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.exit +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.exit</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/fullscreen.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/fullscreen.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/fullscreen.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.fullscreen +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.fullscreen</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/leave-fullscreen.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/leave-fullscreen.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/leave-fullscreen.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.leave-fullscreen +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.leave-fullscreen</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale/fr.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale/fr.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale/fr.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.locale.fr +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.locale.fr</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale/uk.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale/uk.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale/uk.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.locale.uk +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.locale.uk</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file/locale.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file.locale +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file.locale</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/file.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.file +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.file</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/about.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/about.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/about.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.help.about +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.help.about</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/help.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/help.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/help.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.help.help +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.help.help</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/site.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/site.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help/site.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.help.site +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.help.site</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu/help.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu.help +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu.help</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/menu.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.menu +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.menu</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/toolbar.html =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/toolbar.html (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-example/ui/main/toolbar.html 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> +<HEAD> +<TITLE> +ui.main.toolbar +</TITLE> +</HEAD> +<BODY BGCOLOR="#ffffff"> +<H1>ui.main.toolbar</H1> + + + +</BODY> +</HTML> Added: jaxx-help-example/src/main/help/en/jaxx-help-exampleIndex.xml =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-exampleIndex.xml (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-exampleIndex.xml 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,33 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE index + PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 1.0//EN" + "http://buix.labs.libre-entreprise.org/javahelp/index_1_0.dtd"> + + +<index version="1.0"> + <indexitem target="top" text=""> + <indexitem target="ui" text=""> + <indexitem target="ui.main" text=""> + <indexitem target="ui.main.menu" text=""> + <indexitem target="ui.main.menu.help" text=""> + <indexitem target="ui.main.menu.help.help" text=""/> + <indexitem target="ui.main.menu.help.about" text=""/> + <indexitem target="ui.main.menu.help.site" text=""/> + </indexitem> + <indexitem target="ui.main.menu.file" text=""> + <indexitem target="ui.main.menu.file.locale" text=""> + <indexitem target="ui.main.menu.file.locale.fr" text=""/> + <indexitem target="ui.main.menu.file.locale.uk" text=""/> + </indexitem> + <indexitem target="ui.main.menu.file.leave-fullscreen" text=""/> + <indexitem target="ui.main.menu.file.fullscreen" text=""/> + <indexitem target="ui.main.menu.file.exit" text=""/> + <indexitem target="ui.main.menu.file.configuration" text=""/> + </indexitem> + </indexitem> + <indexitem target="ui.main.content" text=""/> + <indexitem target="ui.main.toolbar" text=""/> + </indexitem> + </indexitem> + </indexitem> +</index> Added: jaxx-help-example/src/main/help/en/jaxx-help-exampleMap.jhm =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-exampleMap.jhm (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-exampleMap.jhm 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,27 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE map + PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" + "http://java.sun.com/products/javahelp/map_1_0.dtd"> +<map version="1.0"> + +  +  + + <mapID target="top" url="jaxx-help-example/jaxx-help-example.html" /> + <mapID target="ui.main.content" url="jaxx-help-example/ui/main/content.html" /> + <mapID target="ui.main.menu" url="jaxx-help-example/ui/main/menu.html" /> + <mapID target="ui.main.menu.file" url="jaxx-help-example/ui/main/menu/file.html" /> + <mapID target="ui.main.menu.file.configuration" url="jaxx-help-example/ui/main/menu/file/configuration.html" /> + <mapID target="ui.main.menu.file.exit" url="jaxx-help-example/ui/main/menu/file/exit.html" /> + <mapID target="ui.main.menu.file.fullscreen" url="jaxx-help-example/ui/main/menu/file/fullscreen.html" /> + <mapID target="ui.main.menu.file.leave-fullscreen" url="jaxx-help-example/ui/main/menu/file/leave-fullscreen.html" /> + <mapID target="ui.main.menu.file.locale" url="jaxx-help-example/ui/main/menu/file/locale.html" /> + <mapID target="ui.main.menu.file.locale.fr" url="jaxx-help-example/ui/main/menu/file/locale/fr.html" /> + <mapID target="ui.main.menu.file.locale.uk" url="jaxx-help-example/ui/main/menu/file/locale/uk.html" /> + <mapID target="ui.main.menu.help" url="jaxx-help-example/ui/main/menu/help.html" /> + <mapID target="ui.main.menu.help.about" url="jaxx-help-example/ui/main/menu/help/about.html" /> + <mapID target="ui.main.menu.help.help" url="jaxx-help-example/ui/main/menu/help/help.html" /> + <mapID target="ui.main.menu.help.site" url="jaxx-help-example/ui/main/menu/help/site.html" /> + <mapID target="ui.main.toolbar" url="jaxx-help-example/ui/main/toolbar.html" /> + +</map> Added: jaxx-help-example/src/main/help/en/jaxx-help-exampleTOC.xml =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-exampleTOC.xml (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-exampleTOC.xml 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,32 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE toc + PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" + "http://buix.labs.libre-entreprise.org/javahelp/toc_1_0.dtd"> + +<toc version="1.0"> + <tocitem target="top" text="jaxx-help-example"> + <tocitem target="ui" text=""> + <tocitem target="ui.main" text=""> + <tocitem target="ui.main.menu" text=""> + <tocitem target="ui.main.menu.help" text=""> + <tocitem target="ui.main.menu.help.help" text=""/> + <tocitem target="ui.main.menu.help.about" text=""/> + <tocitem target="ui.main.menu.help.site" text=""/> + </tocitem> + <tocitem target="ui.main.menu.file" text=""> + <tocitem target="ui.main.menu.file.locale" text=""> + <tocitem target="ui.main.menu.file.locale.fr" text=""/> + <tocitem target="ui.main.menu.file.locale.uk" text=""/> + </tocitem> + <tocitem target="ui.main.menu.file.leave-fullscreen" text=""/> + <tocitem target="ui.main.menu.file.fullscreen" text=""/> + <tocitem target="ui.main.menu.file.exit" text=""/> + <tocitem target="ui.main.menu.file.configuration" text=""/> + </tocitem> + </tocitem> + <tocitem target="ui.main.content" text=""/> + <tocitem target="ui.main.toolbar" text=""/> + </tocitem> + </tocitem> + </tocitem> +</toc> Added: jaxx-help-example/src/main/help/en/jaxx-help-exampleToc.xml =================================================================== --- jaxx-help-example/src/main/help/en/jaxx-help-exampleToc.xml (rev 0) +++ jaxx-help-example/src/main/help/en/jaxx-help-exampleToc.xml 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,32 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE toc + PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" + "http://buix.labs.libre-entreprise.org/javahelp/toc_1_0.dtd"> + +<toc version="1.0"> + <tocitem target="top" text=""> + <tocitem target="ui" text=""> + <tocitem target="ui.main" text=""> + <tocitem target="ui.main.menu" text=""> + <tocitem target="ui.main.menu.help" text=""> + <tocitem target="ui.main.menu.help.help" text=""/> + <tocitem target="ui.main.menu.help.about" text=""/> + <tocitem target="ui.main.menu.help.site" text=""/> + </tocitem> + <tocitem target="ui.main.menu.file" text=""> + <tocitem target="ui.main.menu.file.locale" text=""> + <tocitem target="ui.main.menu.file.locale.fr" text=""/> + <tocitem target="ui.main.menu.file.locale.uk" text=""/> + </tocitem> + <tocitem target="ui.main.menu.file.leave-fullscreen" text=""/> + <tocitem target="ui.main.menu.file.fullscreen" text=""/> + <tocitem target="ui.main.menu.file.exit" text=""/> + <tocitem target="ui.main.menu.file.configuration" text=""/> + </tocitem> + </tocitem> + <tocitem target="ui.main.content" text=""/> + <tocitem target="ui.main.toolbar" text=""/> + </tocitem> + </tocitem> + </tocitem> +</toc> Added: jaxx-help-example/src/main/help/jaxx-help-example.hs =================================================================== --- jaxx-help-example/src/main/help/jaxx-help-example.hs (rev 0) +++ jaxx-help-example/src/main/help/jaxx-help-example.hs 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,34 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE helpset + PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 1.0//EN" + "http://java.sun.com/products/javahelp/helpset_1_0.dtd"> + +<helpset version="1.0" xml:lang="fr"> + +  + +  + <title>${helpSetTitle}</title> + +  + <maps> + <homeID>top</homeID> + <mapref location="default/jaxx-help-exampleMap.jhm"/> + </maps> + +  + <view> + <name>TOC</name> + <label>Table Of Contents</label> + <type>javax.help.TOCView</type> + <data>default/jaxx-help-exampleTOC.xml</data> + </view> + + <view> + <name>Index</name> + <label>Index</label> + <type>javax.help.IndexView</type> + <data>default/jaxx-help-exampleIndex.xml</data> + </view> + +</helpset> Added: jaxx-help-example/src/main/help/jaxx-help-example_en.hs =================================================================== --- jaxx-help-example/src/main/help/jaxx-help-example_en.hs (rev 0) +++ jaxx-help-example/src/main/help/jaxx-help-example_en.hs 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,34 @@ +<?xml version='1.0' encoding='UTF-8' ?> +<!DOCTYPE helpset + PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 1.0//EN" + "http://java.sun.com/products/javahelp/helpset_1_0.dtd"> + +<helpset version="1.0" xml:lang="en"> + +  + +  + <title>${helpSetTitle}</title> + +  + <maps> + <homeID>top</homeID> + <mapref location="en/jaxx-help-exampleMap.jhm"/> + </maps> + +  + <view> + <name>TOC</name> + <label>Table Of Contents</label> + <type>javax.help.TOCView</type> + <data>en/jaxx-help-exampleTOC.xml</data> + </view> + + <view> + <name>Index</name> + <label>Index</label> + <type>javax.help.IndexView</type> + <data>en/jaxx-help-exampleIndex.xml</data> + </view> + +</helpset> Added: jaxx-help-example/src/main/java/jaxx/demo/DemoConfig.java =================================================================== --- jaxx-help-example/src/main/java/jaxx/demo/DemoConfig.java (rev 0) +++ jaxx-help-example/src/main/java/jaxx/demo/DemoConfig.java 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,209 @@ +/* + * *##% + * jaxx-demo + * Copyright (C) 2008 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package jaxx.demo; + +import java.io.IOException; +import java.io.InputStream; +import java.beans.PropertyChangeListener; +import java.util.Locale; +import java.util.Properties; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; +import static org.nuiton.i18n.I18n._; + +/** + * La configuration de l'application. + * + * Il s'agit de l'objet partagé par toutes les démos. + * + * @author chemit + * @since 1.7.2 + */ +public class DemoConfig extends org.nuiton.util.ApplicationConfig { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(DemoConfig.class); + /** + * le fichier de configuration de l'application avec les informations sur + * le projet (version, license,...) et la configuration des ui (icons, ...) + */ + public static final String APPLICATION_PROPERTIES = "/jaxx-demo.properties"; + /** + * un drapeau pour savoir si on est en mode pleine écran + */ + protected boolean fullscreen; + + public DemoConfig() { + + setConfigFileName(Option.CONFIG_FILE.defaultValue); + + // chargement de la configuration interne + + InputStream stream = getClass().getResourceAsStream(APPLICATION_PROPERTIES); + + Properties p = new Properties(); + try { + p.load(stream); + for (Object k : p.keySet()) { + String key = k + ""; + Object value = p.get(k); + if (log.isDebugEnabled()) { + log.debug("install properties " + k + " : " + value); + } + setDefaultOption(key, "" + value); + } + } catch (IOException ex) { + throw new RuntimeException(ex); + } + + for (Option o : Option.values()) { + setDefaultOption(o.key, o.defaultValue); + } + + // on supprime le stamp de snapshot s'il existe + String sVersion = VersionUtil.removeSnapshot(getOption("application.version")); + Version version = VersionUtil.valueOf(sVersion); + setDefaultOption("version", version.getVersion()); + } + + public String getCopyrightText() { + return "Version " + getVersion() + " Codelutin @ 2008-2009"; + } + + /** + * @return la version de l'application. + */ + public Version getVersion() { + Version option = getOption(Version.class, "version"); + return option; + } + + public boolean isFullScreen() { + Boolean result = getOptionAsBoolean(Option.FULL_SCREEN.key); + return result != null && result; + } + + public Locale getLocale() { + Locale result = getOption(Locale.class, Option.LOCALE.key); + return result; + } + + public void setFullscreen(boolean fullscreen) { + Object oldValue = null; + setOption(Option.FULL_SCREEN.key, fullscreen + ""); + saveForUser(); + firePropertyChange("fullscreen", oldValue, fullscreen); + } + + public void setLocale(Locale newLocale) { + setOption(Option.LOCALE.key, newLocale.toString()); + saveForUser(); + firePropertyChange("locale", null, newLocale); + } + + /** + * Save configuration, in user home directory using the + * {@link #getConfigFileName}. Default, env and commande line note saved + */ + public void saveForUser() { + // shoudl we never save any conf ? + super.saveForUser(); + } + public static final String[] DEFAULT_JAXX_PCS = { + "fullScreen", "locale" + }; + + public void removeJaxxPropertyChangeListener() { + PropertyChangeListener[] toRemove = jaxx.runtime.Util.findJaxxPropertyChangeListener(DEFAULT_JAXX_PCS, getPropertyChangeListeners()); + if (toRemove == null || toRemove.length == 0) { + return; + } + if (log.isDebugEnabled()) { + log.debug("before remove : " + getPropertyChangeListeners().length); + log.debug("toRemove : " + toRemove.length); + } + for (PropertyChangeListener listener : toRemove) { + removePropertyChangeListener(listener); + } + if (log.isDebugEnabled()) { + log.debug("after remove : " + getPropertyChangeListeners().length); + } + } + + ////////////////////////////////////////////////// + // Toutes les options disponibles + ////////////////////////////////////////////////// + public static enum Option implements OptionDef { + + CONFIG_FILE(CONFIG_FILE_NAME, _("jaxxdemo.config.configFileName.description"), "jaxx-help-example", String.class, true, true), + FULL_SCREEN("ui.fullscreen", _("jaxxdemo.config.ui.fullscreen"), "false", Boolean.class, false, false), + LOCALE("ui.locale", _("jaxxdemo.config.ui.locale"), Locale.FRANCE.toString(), Locale.class, false, false); + public final String key; + public final String description; + public final String defaultValue; + public final Class<?> type; + public final boolean _transient; + public final boolean _final; + + private Option(String key, String description, String defaultValue, Class<?> type, boolean _transient, boolean _final) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + this._final = _final; + this._transient = _transient; + } + + @Override + public boolean isFinal() { + return _final; + } + + @Override + public boolean isTransient() { + return _transient; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + } +} Property changes on: jaxx-help-example/src/main/java/jaxx/demo/DemoConfig.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: jaxx-help-example/src/main/java/jaxx/demo/DemoUI.css =================================================================== --- jaxx-help-example/src/main/java/jaxx/demo/DemoUI.css (rev 0) +++ jaxx-help-example/src/main/java/jaxx/demo/DemoUI.css 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,151 @@ +/** + * *##% observe-swing + * Copyright (C) 2008 - 2009 IRD + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* +*/ +JToolBar { + borderPainted:false; + floatable:false; + opaque:false; +} + +JSplitPane { + oneTouchExpandable:true; + continuousLayout:true; + dividerSize:6; +} + +#mainFrame { + title:"jaxxdemo.title"; + iconImage:{SwingUtil.createIcon(getConfig().getOption("application.icon.path")).getImage()}; + undecorated:{getConfig().isFullScreen()}; +} + +#menu { + _help:{"ui.main.menu"}; +} + +#menuFile { + text:"jaxxdemo.menu.file"; + mnemonic:F; + _help:{"ui.main.menu.file"}; +} + +#menuFileConfiguration { + text:"jaxxdemo.action.configuration"; + toolTipText:"jaxxdemo.action.configuration.tip"; + actionIcon:"config"; + mnemonic:C; + enabled:false; + _help:{"ui.main.menu.file.configuration"}; +} + +#menuFileLanguage { + text:"jaxxdemo.menu.file.locale"; + toolTipText:"jaxxdemo.menu.file.locale"; + actionIcon:"translate"; + mnemonic:C; + _help:{"ui.main.menu.file.locale"}; +} + +#menuFileLanguageFR { + text:"jaxxdemo.action.locale.fr"; + toolTipText:"jaxxdemo.action.locale.fr.tip"; + actionIcon:"i18n-fr"; + enabled:{!acceptLocale(getConfig().getLocale(), "fr_FR")}; +mnemonic:F; +_help:{"ui.main.menu.file.locale.fr"}; +} + +#menuFileLanguageUK { + text:"jaxxdemo.action.locale.uk"; + toolTipText:"jaxxdemo.action.locale.uk.tip"; + actionIcon:"i18n-uk"; + enabled:{!acceptLocale(getConfig().getLocale(), "en_GB")}; +mnemonic:U; +_help:{"ui.main.menu.file.locale.uk"}; +} + +#menuFileFullscreen { + text:"jaxxdemo.action.fullscreen"; + toolTipText:"jaxxdemo.action.fullscreen.tip"; + actionIcon:"fullscreen"; + mnemonic:P; + visible:{!isUndecorated()}; +_help:{"ui.main.menu.file.fullscreen"}; +} + +#menuFileNormalscreen { + text:"jaxxdemo.action.normalscreen"; + toolTipText:"jaxxdemo.action.normalscreen.tip"; + actionIcon:"leave-fullscreen"; + mnemonic:N; + visible:{isUndecorated()}; +_help:{"ui.main.menu.file.leave-fullscreen"}; +} + +#menuFileExit{ + text:"jaxxdemo.action.exit"; + toolTipText:"jaxxdemo.action.exit.tip"; + actionIcon:"exit"; + mnemonic:X; + _help:{"ui.main.menu.file.exit"}; +} + +#menuHelp{ + text:"jaxxdemo.menu.help"; + mnemonic:e; + _help:{"ui.main.menu.help"}; +} + +#menuHelpHelp{ + text:"jaxxdemo.action.help"; + toolTipText:"jaxxdemo.action.help.tip"; + actionIcon:"help"; + mnemonic:e; + _help:{"ui.main.menu.help.help"}; +} + +#menuHelpSite{ + text:"jaxxdemo.action.site"; + toolTipText:"jaxxdemo.action.site.tip"; + actionIcon:"site"; + mnemonic:s; + _help:{"ui.main.menu.help.site"}; +} + +#menuHelpAbout{ + text:"jaxxdemo.action.about"; + toolTipText:"jaxxdemo.action.about.tip"; + actionIcon:"about"; + mnemonic:A; + _help:{"ui.main.menu.help.about"}; +} + +#showHelp{ + toolTipText:"jaxxdemo.action.showHelp.tip"; + actionIcon:"show-help"; + borderPainted:false; + visible:true; +} +#mainPane{ + _help:{"ui.main.content"}; +} + +#toolbar { + layout:{new BoxLayout(toolbar, 0)}; + _help:{"ui.main.toolbar"}; +} \ No newline at end of file Added: jaxx-help-example/src/main/java/jaxx/demo/DemoUI.jaxx =================================================================== --- jaxx-help-example/src/main/java/jaxx/demo/DemoUI.jaxx (rev 0) +++ jaxx-help-example/src/main/java/jaxx/demo/DemoUI.jaxx 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,105 @@ + + +<JFrame id='mainFrame' width='1024' height='800' + decorator='help' + onWindowClosing='getHandler().close(mainFrame)'> + + <style source='DemoUI.css'/> + + <script><![CDATA[ +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.help.JAXXHelpBroker; +import jaxx.runtime.swing.StatusMessagePanel; + +import java.util.Locale; + +public DemoConfig getConfig() { + return getContextValue(DemoConfig.class); +} + +protected DemoUIHandler getHandler() { + return getContextValue(DemoUIHandler.class); +} + +public boolean acceptLocale(Locale l, String expected) { + return l !=null && l.toString().equals(expected); +} + +private void $afterCompleteSetup() { + +} +]]> + </script> + + <JAXXHelpBroker id='broker' + constructorParams='getConfig().getLocale(), "jaxx-help-example", "help", "top", getHandler()'/> + + <JMenuBar id='menu'> + + <JMenu id='menuFile'> + <JMenuItem id='menuFileConfiguration' + onActionPerformed="getHandler().showConfig(this)"/> + <JMenu id='menuFileLanguage'> + <JMenuItem id='menuFileLanguageFR' + onActionPerformed="getHandler().changeLanguage(this, Locale.FRANCE)"/> + <JMenuItem id='menuFileLanguageUK' + onActionPerformed="getHandler().changeLanguage(this, Locale.UK)"/> + </JMenu> + <JSeparator/> + <JMenuItem id='menuFileFullscreen' + onActionPerformed="getHandler().changeScreen(this, true)"/> + <JMenuItem id='menuFileNormalscreen' + onActionPerformed="getHandler().changeScreen(this, false)"/> + <JSeparator/> + <JMenuItem id='menuFileExit' + onActionPerformed="getHandler().close(this)"/> + </JMenu> + + <JMenu id='menuHelp'> + <JMenuItem id='menuHelpHelp' + onActionPerformed="getHandler().showHelp(this, getBroker(), null)"/> + <JMenuItem id='menuHelpSite' + onActionPerformed="getHandler().gotoSite(this)"/> + <JMenuItem id='menuHelpAbout' + onActionPerformed="getHandler().showAbout(this)"/> + </JMenu> + <JToolBar id='toolbar' + _help='"ui.main.toolbar"'> + +  + <JButton id='showHelp'/> + + <javax.swing.Box.Filler constructorParams='SwingUtil.newMinDimension(), SwingUtil.newMinDimension(), SwingUtil.newMaxXDimension()'/> + </JToolBar> + </JMenuBar> + + <JPanel id='mainPane' layout='{new BorderLayout()}'> + + <JLabel text='jaxxdemo.welcome' + horizontalAlignment='center' + constraints='BorderLayout.CENTER'/> + + <StatusMessagePanel id='p' constraints='BorderLayout.SOUTH'/> + + </JPanel> + +</JFrame> \ No newline at end of file Added: jaxx-help-example/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- jaxx-help-example/src/main/java/jaxx/demo/DemoUIHandler.java (rev 0) +++ jaxx-help-example/src/main/java/jaxx/demo/DemoUIHandler.java 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,298 @@ +/** + * *##% + * jaxx-demo + * Copyright (C) 2008 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package jaxx.demo; + +import jaxx.runtime.swing.help.JAXXHelpUIHandler; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +import java.awt.Desktop; +import java.net.URL; +import java.util.Locale; +import javax.help.JHelp; +import javax.swing.JDialog; +import javax.swing.SwingUtilities; + +import jaxx.runtime.context.DefaultApplicationContext; +import jaxx.runtime.JAXXContext; +import jaxx.runtime.context.JAXXContextEntryDef; +import jaxx.runtime.context.JAXXInitialContext; +import jaxx.runtime.swing.AboutPanel; +import jaxx.runtime.swing.ErrorDialogUI; +import jaxx.runtime.swing.editor.config.ConfigUI; +import jaxx.runtime.swing.editor.config.ConfigUIBuilder; +import jaxx.runtime.swing.editor.config.model.ConfigUIModel; +import jaxx.runtime.swing.help.JAXXHelpBroker; +import org.nuiton.i18n.I18n; + +/** + * Le handler de l'ui principale. + * + * @author chemit + * @see DemoUI + */ +public class DemoUIHandler implements JAXXHelpUIHandler { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(DemoUIHandler.class); + static final JAXXContextEntryDef<DemoUI> MAIN_UI_ENTRY_DEF = JAXXContextEntryDef.newDef("mainui", DemoUI.class); + + /** + * Methode pour initialiser l'ui principale sans l'afficher. + * + * @param rootContext le context applicatif + * @param fullscreen flag pour indiquer si on doit ouvrir l'ui en model console (pleine ecran). + * @return l'ui instancie et initialisee mais non visible encore + */ + public DemoUI initUI(DefaultApplicationContext rootContext, boolean fullscreen) { + + if (log.isDebugEnabled()) { + log.debug("fullscreen ? " + fullscreen); + } + + // create restrict context for ui + JAXXInitialContext context = new JAXXInitialContext(); + + // share handler + context.add(this); + DemoConfig config = rootContext.getContextValue(DemoConfig.class); + + // share config + context.add(config); + +// // share help broker +// context.add(new DemoHelpBroker(config.getLocale())); + + // instanciate ui + DemoUI ui = new DemoUI(context); + + // keep it in root context + MAIN_UI_ENTRY_DEF.setContextValue(rootContext, ui); + + // synch to error dialog + ErrorDialogUI.init(ui); + + // set fullscreen propery on main ui + ui.getGraphicsConfiguration().getDevice().setFullScreenWindow(fullscreen ? ui : null); + + return ui; + } + + public void displayUI(final DemoUI ui) { + + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + + // show ui + ui.setVisible(true); + } + }); + } + + /** + * Permet de recharger l'ui principale et de changer de le mode d'affichage. + * + * @param rootContext le contexte applicatif + * @param fullscreen le type de fenetre à reouvrir + */ + public void reloadUI(DefaultApplicationContext rootContext, boolean fullscreen) { + + // scan main ui + DemoUI ui = getUI(rootContext); + + if (ui != null) { + + ui.getConfig().removeJaxxPropertyChangeListener(); + + ErrorDialogUI.init(null); + + ui.dispose(); + + ui.setVisible(false); + + MAIN_UI_ENTRY_DEF.removeContextValue(rootContext); + + } + + ui = initUI(rootContext, fullscreen); + + displayUI(ui); + } + + /** + * Méthode pour changer de mode d'affichage. + * <p/> + * Si <code>fullscreen</code> est à <code>true</code> alors on passe en + * mode console (c'est à dire en mode plein écran exclusif), sinon on + * passe en mode fenetré normal. + * + * @param context l'ui principale de l'application + * @param fullscreen le nouvel état requis. + */ + public void changeScreen(JAXXContext context, final boolean fullscreen) { + + DemoUI ui = getUI(context); + + // sauvegarde de l'état dans la configuration + ui.getConfig().setFullscreen(fullscreen); + + // rechargement de l'ui + reloadUI(RunDemo.get(), fullscreen); + } + + public void changeLanguage(JAXXContext context, Locale newLocale) { + + DemoUI ui = getUI(context); + + DemoConfig config = ui.getConfig(); + + // sauvegarde de la nouvelle locale + config.setLocale(newLocale); + + // chargement de la nouvelle locale dans le système i18n + I18n.init(newLocale); + + // rechargement de l'ui + reloadUI(RunDemo.get(), config.isFullScreen()); + } + + /** + * Ferme l'application. + * + * @param context l'ui principale de l'application + */ + public void close(JAXXContext context) { + log.info("JAXX Demo quitting..."); + try { + + DemoUI ui = getUI(context); + ui.dispose(); + } finally { + System.exit(0); + } + } + + public void showConfig(JAXXContext context) { + DemoUI ui = getUI(context); + DemoConfig config = ui.getConfig(); + ConfigUIModel model = new ConfigUIModel(config); + + // categorie repertoires + model.addCategory( + n_("jaxxdemo.config.category.directories"), + n_("jaxxdemo.config.category.directories.description"), + DemoConfig.Option.CONFIG_FILE); + + // others + model.addCategory( + n_("jaxxdemo.config.category.other"), + n_("jaxxdemo.config.category.other.description"), + DemoConfig.Option.FULL_SCREEN, + DemoConfig.Option.LOCALE); + + ConfigUI configUI = ConfigUIBuilder.newConfigUI(context, model, "jaxxdemo.config.category.directories"); + + ConfigUIBuilder.showConfigUI(configUI, ui, false); + } + + @Override + public void showHelp(JAXXContext context, JAXXHelpBroker broker, String helpId) { + + DemoUI mainUI = getUI(context); + String id = helpId; + if (helpId == null) { + id = broker.getDefaultID(); + } + log.debug("show help " + id); + + JHelp help = new JHelp(broker.getHelpset()); + help.setCurrentID(id); + + final JDialog d = new JDialog(mainUI); + d.getRootPane().setContentPane(help); + + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + + d.pack(); + + // show ui + d.setVisible(true); + } + }); + } + + public void gotoSite(JAXXContext context) { + + DemoUI ui = getUI(context); + DemoConfig config = ui.getConfig(); + + URL siteURL = config.getOptionAsURL("application.site.url"); + + log.info(_("jaxxdemo.message.goto.site", siteURL)); + + if (log.isDebugEnabled()) { + log.debug("goto " + siteURL); + } + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + try { + Desktop.getDesktop().browse(siteURL.toURI()); + } catch (Exception ex) { + log.error(ex.getMessage(), ex); + ErrorDialogUI.showError(ex); + } + } + } + + public void showAbout(DemoUI ui) { + + DemoConfig config = ui.getConfig(); + + String iconPath = config.getOption("application.icon.path"); + String licensePath = config.getOption("application.license.path"); + String thirdPartyPath = config.getOption("application.third-party.path"); + + AboutPanel about = new AboutPanel(); + about.setTitle(_("jaxxdemo.title.about")); + about.setAboutText(_("jaxxdemo.about.message")); + about.setBottomText(ui.getConfig().getCopyrightText()); + about.setIconPath(iconPath); + about.setLicenseFile(licensePath); + about.setThirdpartyFile(thirdPartyPath); + about.buildTopPanel(); + about.init(); + about.showInDialog(ui, true); + } + + DemoUI getUI(JAXXContext context) { + if (context instanceof DemoUI) { + return (DemoUI) context; + } + DemoUI ui = MAIN_UI_ENTRY_DEF.getContextValue(context); + return ui; + } +} Property changes on: jaxx-help-example/src/main/java/jaxx/demo/DemoUIHandler.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: jaxx-help-example/src/main/java/jaxx/demo/RunDemo.java =================================================================== --- jaxx-help-example/src/main/java/jaxx/demo/RunDemo.java (rev 0) +++ jaxx-help-example/src/main/java/jaxx/demo/RunDemo.java 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,188 @@ +/* + * *##% + * jaxx-demo + * Copyright (C) 2008 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package jaxx.demo; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.util.StringUtil; +import static org.nuiton.i18n.I18n._; + +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.ErrorDialogUI; +import jaxx.runtime.context.DefaultApplicationContext; + +/** + * + * @author chemit + */ +public class RunDemo { + + /** + * Logger + */ + private static Log log = LogFactory.getLog(RunDemo.class); + /** + * When application was started + */ + private static long startingTime = System.nanoTime(); + /** + * The singleton instance of the main context + */ + protected static DefaultApplicationContext context; + + public static void main(String[] args) { + + startingTime = System.nanoTime(); + log.info("JAXX Help example start at " + new java.util.Date() + " args: " + java.util.Arrays.toString(args)); + + try { + + // init root context + // to enable javassist on webstart, must remove any securityManager, + // see if this can be dangerous (should not be since jnlp is signed ?) + // moreover it speeds up the loading :) + System.setSecurityManager(null); + + long t0 = System.nanoTime(); + + I18n.setUniqueBundleName("jaxx-help-example-i18n"); + + Runtime.getRuntime().addShutdownHook(new ShutdownHook()); + + // init root context + DefaultApplicationContext rootContext = init(); + + // init config + DemoConfig config = new DemoConfig(); + config.parse(args); + + // share the config + rootContext.setContextValue(config); + + long t00 = System.nanoTime(); + + // init i18n + I18n.init(config.getLocale()); + + log.info("language : " + config.getLocale()); + + if (log.isDebugEnabled()) { + log.debug("i18n loading time : " + (StringUtil.convertTime(t00, System.nanoTime()))); + } + + log.info(_("jaxxdemo.message.config.loaded", config.getVersion())); + + // prepare ui look&feel and load ui properties + + try { + SwingUtil.initNimbusLoookAndFeel(); + } catch (Exception e) { + // could not find nimbus look-and-feel + log.warn(_("jaxxdemo.warning.nimbus.landf")); + } catch (Throwable e) { + log.warn(_("jaxxdemo.warning.no.ui")); + + } + + if (log.isDebugEnabled()) { + log.debug("init done in " + (StringUtil.convertTime(t0, System.nanoTime()))); + } + + log.info(_("jaxxdemo.init.context.done", StringUtil.convertTime(startingTime, System.nanoTime()))); + + // on affiche l'ui principale + DemoUIHandler handler = new DemoUIHandler(); + + DemoUI ui = handler.initUI(rootContext, config.isFullScreen()); + + log.info(_("jaxxdemo.init.ui.done")); + + handler.displayUI(ui); + + } catch (Exception e) { + ErrorDialogUI.showError(e); + log.error(e.getMessage(), e); + System.exit(1); + } + } + + /** + * @return <code>true</code> si le context a été initialisé via la méthode + * {@link #init()}, <ocde>false</code> autrement. + */ + protected static boolean isInit() { + return context != null; + } + + /** + * Permet l'initialisation du contexte applicatif et positionne + * l'context partagée. + * <p/> + * Note : Cette méthode ne peut être appelée qu'une seule fois. + * @return l'context partagée + * @throws IllegalStateException si un contexte applicatif a déja été positionné. + */ + protected static synchronized DefaultApplicationContext init() throws IllegalStateException { + if (isInit()) { + throw new IllegalStateException("there is an already application context registred."); + } + context = new DefaultApplicationContext(); + return context; + } + + /** + * Récupération du contexte applicatif. + * + * @return l'context partagé du contexte. + * @throws IllegalStateException si le contexte n'a pas été initialisé via + * la méthode {@link #init()} + */ + protected static DefaultApplicationContext get() throws IllegalStateException { + if (!isInit()) { + throw new IllegalStateException("no application context registred."); + } + return context; + } + + protected static class ShutdownHook extends Thread { + + public ShutdownHook() { + super("shutdown JAXXDemo"); + } + + @Override + public void run() { + try { + super.run(); + + //JAXXContext.get().close(); + // force to kill main thread + + log.info(_("jaxxdemo.init.closed", new java.util.Date())); + Runtime.getRuntime().halt(0); + } catch (Exception ex) { + log.error("error while closing " + ex.getMessage(), ex); + Runtime.getRuntime().halt(1); + } + } + } +} Property changes on: jaxx-help-example/src/main/java/jaxx/demo/RunDemo.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: jaxx-help-example/src/main/resources/i18n/jaxx-help-example-en_GB.properties =================================================================== --- jaxx-help-example/src/main/resources/i18n/jaxx-help-example-en_GB.properties (rev 0) +++ jaxx-help-example/src/main/resources/i18n/jaxx-help-example-en_GB.properties 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,92 @@ +JAXXHelpExample.help.top.index= +JAXXHelpExample.help.top.title= +JAXXHelpExample.help.top.toc= +JAXXHelpExample.help.ui.index= +JAXXHelpExample.help.ui.main.content.index= +JAXXHelpExample.help.ui.main.content.title= +JAXXHelpExample.help.ui.main.content.toc= +JAXXHelpExample.help.ui.main.index= +JAXXHelpExample.help.ui.main.menu.file.configuration.index= +JAXXHelpExample.help.ui.main.menu.file.configuration.title= +JAXXHelpExample.help.ui.main.menu.file.configuration.toc= +JAXXHelpExample.help.ui.main.menu.file.exit.index= +JAXXHelpExample.help.ui.main.menu.file.exit.title= +JAXXHelpExample.help.ui.main.menu.file.exit.toc= +JAXXHelpExample.help.ui.main.menu.file.fullscreen.index= +JAXXHelpExample.help.ui.main.menu.file.fullscreen.title= +JAXXHelpExample.help.ui.main.menu.file.fullscreen.toc= +JAXXHelpExample.help.ui.main.menu.file.index= +JAXXHelpExample.help.ui.main.menu.file.leave-fullscreen.index= +JAXXHelpExample.help.ui.main.menu.file.leave-fullscreen.title= +JAXXHelpExample.help.ui.main.menu.file.leave-fullscreen.toc= +JAXXHelpExample.help.ui.main.menu.file.locale.fr.index= +JAXXHelpExample.help.ui.main.menu.file.locale.fr.title= +JAXXHelpExample.help.ui.main.menu.file.locale.fr.toc= +JAXXHelpExample.help.ui.main.menu.file.locale.index= +JAXXHelpExample.help.ui.main.menu.file.locale.title= +JAXXHelpExample.help.ui.main.menu.file.locale.toc= +JAXXHelpExample.help.ui.main.menu.file.locale.uk.index= +JAXXHelpExample.help.ui.main.menu.file.locale.uk.title= +JAXXHelpExample.help.ui.main.menu.file.locale.uk.toc= +JAXXHelpExample.help.ui.main.menu.file.title= +JAXXHelpExample.help.ui.main.menu.file.toc= +JAXXHelpExample.help.ui.main.menu.help.about.index= +JAXXHelpExample.help.ui.main.menu.help.about.title= +JAXXHelpExample.help.ui.main.menu.help.about.toc= +JAXXHelpExample.help.ui.main.menu.help.help.index= +JAXXHelpExample.help.ui.main.menu.help.help.title= +JAXXHelpExample.help.ui.main.menu.help.help.toc= +JAXXHelpExample.help.ui.main.menu.help.index= +JAXXHelpExample.help.ui.main.menu.help.site.index= +JAXXHelpExample.help.ui.main.menu.help.site.title= +JAXXHelpExample.help.ui.main.menu.help.site.toc= +JAXXHelpExample.help.ui.main.menu.help.title= +JAXXHelpExample.help.ui.main.menu.help.toc= +JAXXHelpExample.help.ui.main.menu.index= +JAXXHelpExample.help.ui.main.menu.title= +JAXXHelpExample.help.ui.main.menu.toc= +JAXXHelpExample.help.ui.main.toc= +JAXXHelpExample.help.ui.main.toolbar.index= +JAXXHelpExample.help.ui.main.toolbar.title= +JAXXHelpExample.help.ui.main.toolbar.toc= +JAXXHelpExample.help.ui.toc= +jaxxdemo.about.message=<h3>JAXX Demo</h3><hr/>For more informations, viste the <a href\="http\://maven-site.nuiton.org/jaxx/jaxx-demo">website of the project</a>. +jaxxdemo.action.about=About... +jaxxdemo.action.about.tip=About JAXXDemo... +jaxxdemo.action.configuration=Preferences +jaxxdemo.action.configuration.tip=Change the preferences of the application +jaxxdemo.action.exit=Quit +jaxxdemo.action.exit.tip=Quit JAXXDemo +jaxxdemo.action.fullscreen=Full screen +jaxxdemo.action.fullscreen.tip=Change to full screen mode +jaxxdemo.action.help=Help +jaxxdemo.action.help.tip=Display help +jaxxdemo.action.locale.fr=French +jaxxdemo.action.locale.fr.tip=Change to french language +jaxxdemo.action.locale.uk=English +jaxxdemo.action.locale.uk.tip=Change to english language +jaxxdemo.action.normalscreen=Normal screen +jaxxdemo.action.normalscreen.tip=Change to normal screen mode +jaxxdemo.action.showHelp.tip= +jaxxdemo.action.site=Web site +jaxxdemo.action.site.tip=Go to the web site +jaxxdemo.config.category.directories=Files +jaxxdemo.config.category.directories.description=Files used by application +jaxxdemo.config.category.other=Others +jaxxdemo.config.category.other.description=Others preferences +jaxxdemo.config.configFileName.description=Configuration file name +jaxxdemo.config.ui.fullscreen=To change the screen mode (true for full screen) +jaxxdemo.config.ui.locale=Locale of the application +jaxxdemo.init.closed=JAXXDemo was closed at %1$s +jaxxdemo.init.context.done=Context initialized in %1$s +jaxxdemo.init.ui.done=UI initialized. +jaxxdemo.menu.file=File +jaxxdemo.menu.file.locale=Languages +jaxxdemo.menu.help=Help +jaxxdemo.message.config.loaded=Configuration of JAXXDemo v. %1$s loaded. +jaxxdemo.message.goto.site=Go to JAXXDemo Web site +jaxxdemo.title=JAXX Demo +jaxxdemo.title.about=About JAXXDemo... +jaxxdemo.warning.nimbus.landf=Could not init nymbus look and feel, you need at leasr version 1.6u10 of java. +jaxxdemo.warning.no.ui=No ui environnement detected +jaxxdemo.welcome=< Welcome in JAXX Help example > Added: jaxx-help-example/src/main/resources/i18n/jaxx-help-example-fr_FR.properties =================================================================== --- jaxx-help-example/src/main/resources/i18n/jaxx-help-example-fr_FR.properties (rev 0) +++ jaxx-help-example/src/main/resources/i18n/jaxx-help-example-fr_FR.properties 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,92 @@ +JAXXHelpExample.help.top.index=JAXX Demo +JAXXHelpExample.help.top.title=JAXX Demo +JAXXHelpExample.help.top.toc=JAXX Demo +JAXXHelpExample.help.ui.index= +JAXXHelpExample.help.ui.main.content.index= +JAXXHelpExample.help.ui.main.content.title= +JAXXHelpExample.help.ui.main.content.toc= +JAXXHelpExample.help.ui.main.index= +JAXXHelpExample.help.ui.main.menu.file.configuration.index= +JAXXHelpExample.help.ui.main.menu.file.configuration.title= +JAXXHelpExample.help.ui.main.menu.file.configuration.toc= +JAXXHelpExample.help.ui.main.menu.file.exit.index= +JAXXHelpExample.help.ui.main.menu.file.exit.title= +JAXXHelpExample.help.ui.main.menu.file.exit.toc= +JAXXHelpExample.help.ui.main.menu.file.fullscreen.index= +JAXXHelpExample.help.ui.main.menu.file.fullscreen.title= +JAXXHelpExample.help.ui.main.menu.file.fullscreen.toc= +JAXXHelpExample.help.ui.main.menu.file.index= +JAXXHelpExample.help.ui.main.menu.file.leave-fullscreen.index= +JAXXHelpExample.help.ui.main.menu.file.leave-fullscreen.title= +JAXXHelpExample.help.ui.main.menu.file.leave-fullscreen.toc= +JAXXHelpExample.help.ui.main.menu.file.locale.fr.index= +JAXXHelpExample.help.ui.main.menu.file.locale.fr.title= +JAXXHelpExample.help.ui.main.menu.file.locale.fr.toc= +JAXXHelpExample.help.ui.main.menu.file.locale.index= +JAXXHelpExample.help.ui.main.menu.file.locale.title= +JAXXHelpExample.help.ui.main.menu.file.locale.toc= +JAXXHelpExample.help.ui.main.menu.file.locale.uk.index= +JAXXHelpExample.help.ui.main.menu.file.locale.uk.title= +JAXXHelpExample.help.ui.main.menu.file.locale.uk.toc= +JAXXHelpExample.help.ui.main.menu.file.title= +JAXXHelpExample.help.ui.main.menu.file.toc= +JAXXHelpExample.help.ui.main.menu.help.about.index= +JAXXHelpExample.help.ui.main.menu.help.about.title= +JAXXHelpExample.help.ui.main.menu.help.about.toc= +JAXXHelpExample.help.ui.main.menu.help.help.index= +JAXXHelpExample.help.ui.main.menu.help.help.title= +JAXXHelpExample.help.ui.main.menu.help.help.toc= +JAXXHelpExample.help.ui.main.menu.help.index= +JAXXHelpExample.help.ui.main.menu.help.site.index= +JAXXHelpExample.help.ui.main.menu.help.site.title= +JAXXHelpExample.help.ui.main.menu.help.site.toc= +JAXXHelpExample.help.ui.main.menu.help.title= +JAXXHelpExample.help.ui.main.menu.help.toc= +JAXXHelpExample.help.ui.main.menu.index= +JAXXHelpExample.help.ui.main.menu.title= +JAXXHelpExample.help.ui.main.menu.toc= +JAXXHelpExample.help.ui.main.toc= +JAXXHelpExample.help.ui.main.toolbar.index= +JAXXHelpExample.help.ui.main.toolbar.title= +JAXXHelpExample.help.ui.main.toolbar.toc= +JAXXHelpExample.help.ui.toc= +jaxxdemo.about.message=<h3>JAXX Demo</h3><hr/>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.nuiton.org/jaxx/jaxx-demo">site du projet</a>. +jaxxdemo.action.about=A propos +jaxxdemo.action.about.tip=A propos de JAXX Demo... +jaxxdemo.action.configuration=Configuration +jaxxdemo.action.configuration.tip=Modifier la configuration +jaxxdemo.action.exit=Quitter +jaxxdemo.action.exit.tip=Quitter JAXX Demo +jaxxdemo.action.fullscreen=Plein \u00E9cran +jaxxdemo.action.fullscreen.tip=Passer en mode pleine \u00E9cran +jaxxdemo.action.help=Aide +jaxxdemo.action.help.tip=Affichier l'aide +jaxxdemo.action.locale.fr=Fran\u00E7ais +jaxxdemo.action.locale.fr.tip=Changer la langue en fran\u00E7ais +jaxxdemo.action.locale.uk=Anglais +jaxxdemo.action.locale.uk.tip=Changer la langue en anglais +jaxxdemo.action.normalscreen=Ecran normal +jaxxdemo.action.normalscreen.tip=Revenir en mode normal +jaxxdemo.action.showHelp.tip= +jaxxdemo.action.site=Site internet +jaxxdemo.action.site.tip=Acc\u00E9der au site de l'application sur internet +jaxxdemo.config.category.directories=R\u00E9pertoires +jaxxdemo.config.category.directories.description=R\u00E9pertoires de l'application +jaxxdemo.config.category.other=Autre +jaxxdemo.config.category.other.description=Autres options +jaxxdemo.config.configFileName.description=Le nom du fichier de configuration +jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran +jaxxdemo.config.ui.locale=Langue utilis\u00E9e par l'application (fr_FR, en_GB ou es_ES) +jaxxdemo.init.closed=JAXX Demo a \u00E9t\u00E9 ferm\u00E9 \u00E0 %1$s +jaxxdemo.init.context.done=Initialisation du contexte termin\u00E9e en %1$s. +jaxxdemo.init.ui.done=Initialisation de l'interface graphique termin\u00E9e. +jaxxdemo.menu.file=Fichier +jaxxdemo.menu.file.locale=Langues +jaxxdemo.menu.help=Aide +jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00E9e. +jaxxdemo.message.goto.site=Acc\u00E9der au site de JAXX Demo (%1$s) +jaxxdemo.title=JAXX Demo +jaxxdemo.title.about=A propos de JAXX Demo... +jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java. +jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9 +jaxxdemo.welcome=< Bienvenu dans Jaxx Help example > Added: jaxx-help-example/src/main/resources/icons/action-about.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-about.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-accept.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-accept.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-block.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-block.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-close.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-close.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-config.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-config.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-exit.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-exit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-fullscreen.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-fullscreen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-help.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-help.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-i18n-fr.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-i18n-fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-i18n-uk.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-i18n-uk.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-leave-fullscreen.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-leave-fullscreen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-show-help.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-show-help.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-site.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-site.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/action-translate.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/action-translate.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/icons/jaxx.png =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/main/resources/icons/jaxx.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/main/resources/log4j.properties =================================================================== --- jaxx-help-example/src/main/resources/log4j.properties (rev 0) +++ jaxx-help-example/src/main/resources/log4j.properties 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,11 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + + +log4j.logger.jaxx.runtime.swing.JaxxHelpBroker=INFO +log4j.logger.jaxx.demo=INFO +log4j.logger.org.nuiton=WARN Added: jaxx-help-example/src/site/rst/images/Components-screenshot.gif =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/site/rst/images/Components-screenshot.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/site/rst/images/webstart.gif =================================================================== (Binary files differ) Property changes on: jaxx-help-example/src/site/rst/images/webstart.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: jaxx-help-example/src/site/rst/index.rst =================================================================== --- jaxx-help-example/src/site/rst/index.rst (rev 0) +++ jaxx-help-example/src/site/rst/index.rst 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,43 @@ +=================== +Examples/Components +=================== + +The Components demo displays many different Swing components being used in a variety of ways; it is JAXX's equivalent +of the SwingSet demo. Various pages use advanced features such as data binding, scripting, event handling, and +CSS stylesheets. + +Examples/Calculator +=================== + +This is an implementation of Challenge #2 from the `XUL Grand Coding Challenge 2004`_ . Because this example program +has been implemented in so many different languages, you can easily compare JAXX's +syntax against the competition and decide for yourself which you prefer. + +Screen shot +----------- + +.. image:: images/Components-screenshot.gif + +Set it in action +---------------- + +|webstart| + +To run this example in `Java Web Start`_, click the `following link`_. + +For more details about the `Jaxx Demo webstart`_. + +Source code +----------- + +Unlike the other examples, the source code for Components is too big to display here. You can view it yourself by +downloading JAXX, and you can also view the source code for the individual demos by clicking the "Source" tabs. + + +.. _Java Web Start: http://java.sun.com/products/javawebstart/ + +.. |webstart| image:: images/webstart.gif + +.. _following link: ./launch.jnlp + +.. _Jaxx Demo webstart: jnlp-report.html Added: jaxx-help-example/src/site/site.xml =================================================================== --- jaxx-help-example/src/site/site.xml (rev 0) +++ jaxx-help-example/src/site/site.xml 2009-10-08 16:51:56 UTC (rev 275) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>${site.home.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherited="top"> + <item name="Accueil" href="index.html"/> + <item name="Lancer la démo" href="jnlp/launch.jnlp"/> + </menu> + + <menu ref="reports"/> + + <menu ref="modules"/> + + </body> +</project>

1 0

r274 - test_rstedit/src/site/rst
by glorieux＠users.nuiton.org Oct. 8, 2009

Oct. 8, 2009

Author: glorieux Date: 2009-10-08 17:24:08 +0200 (Thu, 08 Oct 2009) New Revision: 274 Modified: test_rstedit/src/site/rst/index.rst Log: Modified: test_rstedit/src/site/rst/index.rst =================================================================== --- test_rstedit/src/site/rst/index.rst 2009-10-08 14:34:07 UTC (rev 273) +++ test_rstedit/src/site/rst/index.rst 2009-10-08 15:24:08 UTC (rev 274) @@ -1,82 +1,82 @@ -=================================== -Parseur reStructuredText_ : le JRst -=================================== - -Documentation utilisateur -========================= - -.. contents:: Sommaire - - -Présentation ------------- - -Le format reStructuredText_ est un format de description de documents. A l'image -d'autres LaTeX_ ou DocBook_, 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. RST_ dispose quant à lui d'une -syntaxe tellement simple qu'elle en devient presque invisible. -gs to the list, visit the -JRST est un parseur RST_ 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. - - -Usage ------ - -Le parser JRST prend un fichier reStructuredText_ 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 docbook_, le odt (Open-Office), le rtf, ou encore le XML [1]_. - -:: - - JRST myfile.rst - -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 : - --o file,--outFile=file pour rediriger la sortie vers un fichier. --t format,--outType format pour préciser un format de sortie, donc utiliser un ou des fichiers XSL_ de génération. Plusieurs formats sont disponibles xhtml, docbook, xml, html, xdoc, rst, pdf, odt, rtf. --x xslFile,--xslFile xslFile sert à préciser le fichier xsl de génération à utiliser. ---force forcer l'écriture d'un fichier, si le fichier de sortie existe, il sera remplacé. ---help pour afficher les options disponibles : - - -:: - - 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 - - -ex : - -:: - - JRST --force -t html -o myfile.html myfile.rst - -Cette commande produira un fichier html (myfile.html) à partir du fichier reStructuredText_ (myfile.rst) -même si myfile.html existe déjà. - - -Plugin Maven_ -------------- - -Un plugin Maven_ est disponible à l'adresse suivante -http://jrst.labs.libre-entreprise.org/maven-jrst-plugin. Il permet l'utilisation -depuis Maven_ de JRst. - -.. [1] Seul les formats html, xhtml, DocBook_, xdoc et pdf sont disponible pour le moment. - -.. _reStructuredText: http://docutils.sourceforge.net/rst.html -.. _Maven: http://maven.apache.org/ -.. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst -.. _DocBook: http://www.docbook.org/ -.. _LaTex: http://www.latex-project.org/ +=================================== +Parseur reStructuredText_ : le JRst +=================================== + +Documentation utilisateur +========================= + +.. contents:: Sommaire + + +Présentation +------------ + +Le format reStructuredText_ est un format de description de documents. A l'image +d'autres LaTeX_ ou DocBook_, 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. RST_ dispose quant à lui d'une +syntaxe tellement simple qu'elle en devient presque invisible. +gs to the list, visit the +JRST est un parseur RST_ 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. + + +Usage +----- + +Le parser JRST prend un fichier reStructuredText_ 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 docbook_, le odt (Open-Office), le rtf, ou encore le XML [1]_. + +:: + + JRST myfile.rst + +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 : + +-o file,--outFile=file pour rediriger la sortie vers un fichier. +-t format,--outType format pour préciser un format de sortie, donc utiliser un ou des fichiers XSL_ de génération. Plusieurs formats sont disponibles xhtml, docbook, xml, html, xdoc, rst, pdf, odt, rtf. +-x xslFile,--xslFile xslFile sert à préciser le fichier xsl de génération à utiliser. +--force forcer l'écriture d'un fichier, si le fichier de sortie existe, il sera remplacé. +--help pour afficher les options disponibles : + + +:: + + 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 + + +ex : + +:: + + JRST --force -t html -o myfile.html myfile.rst + +Cette commande produira un fichier html (myfile.html) à partir du fichier reStructuredText_ (myfile.rst) +même si myfile.html existe déjà. + + +Plugin Maven_ +------------- + +Un plugin Maven_ est disponible à l'adresse suivante +http://jrst.labs.libre-entreprise.org/maven-jrst-plugin. Il permet l'utilisation +depuis Maven_ de JRst. + +.. [1] Seul les formats html, xhtml, DocBook_, xdoc et pdf sont disponible pour le moment. + +.. _reStructuredText: http://docutils.sourceforge.net/rst.html +.. _Maven: http://maven.apache.org/ +.. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst +.. _DocBook: http://www.docbook.org/ +.. _LaTex: http://www.latex-project.org/ .. _RST: http://docutils.sourceforge.net/rst.html \ No newline at end of file

1 0

r273 - test_rstedit/src/site/rst
by glorieux＠users.nuiton.org Oct. 8, 2009

Oct. 8, 2009

Author: glorieux Date: 2009-10-08 16:34:07 +0200 (Thu, 08 Oct 2009) New Revision: 273 Modified: test_rstedit/src/site/rst/index.rst Log: Modified: test_rstedit/src/site/rst/index.rst =================================================================== --- test_rstedit/src/site/rst/index.rst 2009-10-06 14:58:40 UTC (rev 272) +++ test_rstedit/src/site/rst/index.rst 2009-10-08 14:34:07 UTC (rev 273) @@ -1,82 +1,82 @@ -=================================== -Parseur reStructuredText_ : le JRst -=================================== - -Documentation utilisateur -========================= - -.. contents:: Sommaire - - -Présentation ------------- - -Le format reStructuredText_ est un format de description de documents. A l'image -d'autres LaTeX_ ou DocBook_, 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. RST_ dispose quant à lui d'une -syntaxe tellement simple qu'elle en devient presque invisible. - -JRST est un parseur RST_ 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. - - -Usage ------ - -Le parser JRST prend un fichier reStructuredText_ 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 docbook_, le odt (Open-Office), le rtf, ou encore le XML [1]_. - -:: - - JRST myfile.rst - -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 : - --o file,--outFile=file pour rediriger la sortie vers un fichier. --t format,--outType format pour préciser un format de sortie, donc utiliser un ou des fichiers XSL_ de génération. Plusieurs formats sont disponibles xhtml, docbook, xml, html, xdoc, rst, pdf, odt, rtf. --x xslFile,--xslFile xslFile sert à préciser le fichier xsl de génération à utiliser. ---force forcer l'écriture d'un fichier, si le fichier de sortie existe, il sera remplacé. ---help pour afficher les options disponibles : - - -:: - - 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 - - -ex : - -:: - - JRST --force -t html -o myfile.html myfile.rst - -Cette commande produira un fichier html (myfile.html) à partir du fichier reStructuredText_ (myfile.rst) -même si myfile.html existe déjà. - - -Plugin Maven_ -------------- - -Un plugin Maven_ est disponible à l'adresse suivante -http://jrst.labs.libre-entreprise.org/maven-jrst-plugin. Il permet l'utilisation -depuis Maven_ de JRst. - -.. [1] Seul les formats html, xhtml, DocBook_, xdoc et pdf sont disponible pour le moment. - -.. _reStructuredText: http://docutils.sourceforge.net/rst.html -.. _Maven: http://maven.apache.org/ -.. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst -.. _DocBook: http://www.docbook.org/ -.. _LaTex: http://www.latex-project.org/ -.. _RST: http://www.latex-project.org/ +=================================== +Parseur reStructuredText_ : le JRst +=================================== + +Documentation utilisateur +========================= + +.. contents:: Sommaire + + +Présentation +------------ + +Le format reStructuredText_ est un format de description de documents. A l'image +d'autres LaTeX_ ou DocBook_, 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. RST_ dispose quant à lui d'une +syntaxe tellement simple qu'elle en devient presque invisible. +gs to the list, visit the +JRST est un parseur RST_ 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. + + +Usage +----- + +Le parser JRST prend un fichier reStructuredText_ 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 docbook_, le odt (Open-Office), le rtf, ou encore le XML [1]_. + +:: + + JRST myfile.rst + +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 : + +-o file,--outFile=file pour rediriger la sortie vers un fichier. +-t format,--outType format pour préciser un format de sortie, donc utiliser un ou des fichiers XSL_ de génération. Plusieurs formats sont disponibles xhtml, docbook, xml, html, xdoc, rst, pdf, odt, rtf. +-x xslFile,--xslFile xslFile sert à préciser le fichier xsl de génération à utiliser. +--force forcer l'écriture d'un fichier, si le fichier de sortie existe, il sera remplacé. +--help pour afficher les options disponibles : + + +:: + + 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 + + +ex : + +:: + + JRST --force -t html -o myfile.html myfile.rst + +Cette commande produira un fichier html (myfile.html) à partir du fichier reStructuredText_ (myfile.rst) +même si myfile.html existe déjà. + + +Plugin Maven_ +------------- + +Un plugin Maven_ est disponible à l'adresse suivante +http://jrst.labs.libre-entreprise.org/maven-jrst-plugin. Il permet l'utilisation +depuis Maven_ de JRst. + +.. [1] Seul les formats html, xhtml, DocBook_, xdoc et pdf sont disponible pour le moment. + +.. _reStructuredText: http://docutils.sourceforge.net/rst.html +.. _Maven: http://maven.apache.org/ +.. _XSL: http://jrst.labs.libre-entreprise.org/fr/devel/presentationXSL.rst +.. _DocBook: http://www.docbook.org/ +.. _LaTex: http://www.latex-project.org/ +.. _RST: http://docutils.sourceforge.net/rst.html \ No newline at end of file

1 0

r272 - / nuiton-rstedit nuiton-rstedit/src nuiton-rstedit/src/main nuiton-rstedit/src/main/java nuiton-rstedit/src/main/java/org nuiton-rstedit/src/main/java/org/nuiton nuiton-rstedit/src/main/java/org/nuiton/jrst nuiton-rstedit/src/main/resources nuiton-rstedit/src/main/webapp nuiton-rstedit/src/main/webapp/WEB-INF nuiton-rstedit/src/test
by glorieux＠users.nuiton.org Oct. 6, 2009

Oct. 6, 2009

Author: glorieux Date: 2009-10-06 16:58:40 +0200 (Tue, 06 Oct 2009) New Revision: 272 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/org/ nuiton-rstedit/src/main/java/org/nuiton/ nuiton-rstedit/src/main/java/org/nuiton/jrst/ nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java nuiton-rstedit/src/main/resources/ nuiton-rstedit/src/main/resources/log4j.properties nuiton-rstedit/src/main/webapp/ nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp nuiton-rstedit/src/main/webapp/Error.jsp nuiton-rstedit/src/main/webapp/GereFormSize.js nuiton-rstedit/src/main/webapp/GereSession.js nuiton-rstedit/src/main/webapp/ModificationViewer.jsp nuiton-rstedit/src/main/webapp/OutConnection.jsp nuiton-rstedit/src/main/webapp/Preview.js nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp nuiton-rstedit/src/main/webapp/Recall.jsp nuiton-rstedit/src/main/webapp/Redirect.jsp nuiton-rstedit/src/main/webapp/Saver.js nuiton-rstedit/src/main/webapp/WEB-INF/ nuiton-rstedit/src/main/webapp/WEB-INF/web.xml nuiton-rstedit/src/main/webapp/cancelRedirect.js nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js 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-10-06 14:58:40 UTC (rev 272) @@ -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-10-06 14:58:40 UTC (rev 272) @@ -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-10-06 14:58:40 UTC (rev 272) @@ -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> + +  +  +  + + <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> + +  +  +  + + <name>Nuiton-rstedit</name> + <description>. + </description> + <inceptionYear>2009</inceptionYear> + <url>http://maven-site.nuiton.org/${project.artifactId}</url> + +  +  +  + + <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> + +  + <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> + +  + <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/org/nuiton/jrst/HelloServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,340 @@ +package org.nuiton.jrst; + +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.FileNotFoundException; +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.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; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + + +/** + * @author geoffroy lorieux + */ +public class HelloServlet extends HttpServlet { + + /** + * Handles the HTTP <code>GET</code> method. + * Do checkout on a private or not scm and call modification jsp page + * @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("--------------------------"); + log.debug("Connection to SCMWebEditor"); + log.debug("--------------------------"); + System.setProperty("file.encoding", "UTF-8"); + + if (request.getParameter("adresse") != null && request.getParameter("file_name") != null && request.getParameter("project_url") != null){ + if (request.getParameter("adresse").equals("") == true || request.getParameter("file_name").equals("") == true || request.getParameter("project_url").equals("") == true){ + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/BadFileRedirect.jsp"); + requestDispacher.forward(request, response); + return; + } + + } else { + SvnSession svnSess = (SvnSession)request.getSession(true).getAttribute("myInfo"); + if (svnSess != null){ + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + } + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/OutConnection.jsp"); + requestDispacher.forward(request, response); + return; + } + HttpSession httpSession = request.getSession(true); + log.debug("Le nom du fichier est : "+request.getParameter("file_name")); +// svnSession object creation if doesn't already exist + + SvnSession svnSess = (SvnSession) httpSession.getAttribute("myInfo"); + + if (svnSess == null){ + svnSess = new SvnSession((request.getParameter("adresse").startsWith("scm:svn:") == true ? request.getParameter("adresse").replace("scm:svn:", "") : request.getParameter("adresse")), + request.getParameter("file_name"), request.getParameter("project_url"), + null, null, (File) getServletContext().getAttribute("javax.servlet.context.tempdir"),httpSession.getId()); + } else if (svnSess.getLogin() != null && svnSess.getPassword() != null){ + String tmp_log = svnSess.getLogin(); + String tmp_pass = svnSess.getPassword(); + svnSess = new SvnSession((request.getParameter("adresse").startsWith("scm:svn:") == true ? request.getParameter("adresse").replace("scm:svn:", "") : request.getParameter("adresse")), + request.getParameter("file_name"), request.getParameter("project_url"), + tmp_log, tmp_pass, (File) getServletContext().getAttribute("javax.servlet.context.tempdir"),httpSession.getId()); + } + + PrintWriter out = response.getWriter(); + +// UTF-8 Test + if (SVNProperty.isUTF8(svnSess.getSvnOption().getNativeCharset()) == true){ + log.debug("Je suis en utf8"); + } else { + log.debug("Je ne suis pas en utf8"); + } + + httpSession.setAttribute("myInfo", svnSess); +// Tempdir creation + + log.debug("Creating temporary directory on: " + svnSess.getCheckoutdir()); + + svnSess.getCheckoutdir().mkdir(); +// doCheckout declaration + + DAVRepositoryFactory.setup(); + SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + +// Checkout svn and file organisation + try{ + log.debug("Do Checkout"); + upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), + SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + } catch (SVNAuthenticationException authexep) { +// if svn authentication failed user is redirected on login page + log.debug("Private SCM on reading"); + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + request.setAttribute("adresse", svnSess.getSvnPath()); + request.setAttribute("file_name", svnSess.getFileName()); + request.setAttribute("projectUrl", svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/PrivateSvnRedirect.jsp"); + requestDispacher.forward(request, response); + return; + } + log.debug("Checkout done"); + + File file_in_dir = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + try { + String original_text = FileUtils.readFileToString(file_in_dir); + request.setAttribute("OrigText", original_text); + request.setAttribute("InvalidateMaxTime", (httpSession.getMaxInactiveInterval()/60)); + log.debug("Invalidate time is :"+(httpSession.getMaxInactiveInterval()/60)); + request.setAttribute("IsLogin", (svnSess.getLogin() != null && svnSess.getPassword() != null ? true : false)); + log.debug("IsLogin : "+(svnSess.getLogin() != null && svnSess.getPassword() != null ? true : false)); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/ModificationViewer.jsp"); + // End on first part + requestDispacher.forward(request, response); + out.close(); + } catch (FileNotFoundException ee){ + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/BadFileRedirect.jsp"); + requestDispacher.forward(request, response); + return; + } +// JSP data transfert + + } catch (SVNException ex) { + SvnSession svnSess = (SvnSession)request.getSession(true).getAttribute("myInfo"); + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/BadFileRedirect.jsp"); + requestDispacher.forward(request, response); + return; + + } + } + + /** + * Handles the HTTP <code>POST</code> method. + * Receve the new text and commit it to scm + * @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"); + HttpSession httpSession = request.getSession(true); + SvnSession svnSess = (SvnSession) httpSession.getAttribute("myInfo"); + +// Resetting authentification information and manager + svnSess.setLogin(svnSess.getLogin() != null ? svnSess.getLogin() : request.getParameter("username")); + svnSess.setPassword(svnSess.getPassword() != null ? svnSess.getPassword() : request.getParameter("pw")); + svnSess.setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(svnSess.getCheckoutdir(), svnSess.getLogin(), svnSess.getPassword(), false)); + svnSess.setManager(SVNClientManager.newInstance(svnSess.getSvnOption(), svnSess.getAuthManager())); + + File pathToFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + + SVNCommitClient commitClient = new SVNCommitClient(svnSess.getManager(), svnSess.getSvnOption()); + FileUtils.writeStringToFile(pathToFile, request.getParameter("Mytext")); + + List<File> list = new java.util.ArrayList<File>(1); + list.add(0, pathToFile); + + list = convertToUnicode(list); + + File[] tabFile = new File[1]; + tabFile[0] = pathToFile; +// Sending Data to SVN + + if (request.getParameter("Mytext").equals(request.getParameter("Orig_text")) == false){ + try{ + log.debug("Do Commit"); + commitClient.doCommit(tabFile, false, request.getParameter("Commit_message"), null, null, false, true, SVNDepth.FILES); + } catch (SVNAuthenticationException authexep) { + // if authentication failed edition page is reload form user's relogin + log.debug("Bad Login or Password"); + response.setStatus(401); + request.setAttribute("svnPath_url", svnSess.getSvnPath()); + request.setAttribute("fileName_url", svnSess.getFileName()); + request.setAttribute("Redirection_url", svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Error.jsp"); + requestDispacher.forward(request, response); + return; + } + } +// if commit success user is redirect on the project page + log.debug("Redirect"); + request.setAttribute("Redirection_url", svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Redirect.jsp"); +// Deleting temp directory + + log.debug("Deleting temporary directory : " + svnSess.getCheckoutdir()); + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); +// End of Second part + + requestDispacher.forward(request, response); + log.debug("Exit RSTEditor"); + + } catch (SVNException ex) { + Logger.getLogger(HelloServlet.class.getName()).log(Level.SEVERE, null, ex); + } + } + + 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/org/nuiton/jrst/PreviewServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,180 @@ +package org.nuiton.jrst; + +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 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; + +/** + * @author geoffroy lorieux + */ +public class PreviewServlet extends HttpServlet { + + /** + * Processes requests for <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 { + log.debug("je suis dans la previewservlet"); + HttpSession httpSession = request.getSession(true); + 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"); +// Text formating and tempfile creating + String myDataWithoutcrlf = myData.replace("\r", ""); + File file_in_dir_copy = new File(tmp_dir, "copy"+httpSession.getId()+".rst"); + File http_file = new File(tmp_dir, "preview"+httpSession.getId()+".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); + + File copy = new File(tmp_dir, "copy"+httpSession.getId()+".rst"); +// Using jrst for generate html document + try{ + JRST.generate(JRST.TYPE_HTML, copy, http_file, JRST.Overwrite.ALLTIME); + log.debug("generate okai"); + } catch (Exception eee) { + log.debug("Bad RST file"); + response.setStatus(406); + return; + } + copy.delete(); +// Sending html content to pop-up preview page + response.setContentType("text/html"); + 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/java/org/nuiton/jrst/PrivateSvnServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,45 @@ +package org.nuiton.jrst; + +import java.io.IOException; +import java.io.PrintWriter; +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.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.tmatesoft.svn.core.wc.SVNClientManager; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + +/** + * @author geoffroy lorieux + */ +public class PrivateSvnServlet extends HttpServlet{ + + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + log.debug("New Log setting"); + HttpSession httpSession = request.getSession(true); + System.setProperty("file.encoding", "UTF-8"); + PrintWriter out = response.getWriter(); + SvnSession svnSess = (SvnSession) httpSession.getAttribute("myInfo"); +// Resetting User Information + svnSess.setLogin(request.getParameter("username")); + svnSess.setPassword(request.getParameter("pw")); + svnSess.setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(svnSess.getCheckoutdir(),svnSess.getLogin(), svnSess.getPassword(), false)); + svnSess.setManager(SVNClientManager.newInstance(svnSess.getSvnOption(), svnSess.getAuthManager())); + httpSession.setAttribute("myInfo", svnSess); +// Recalling helloservlet with user information stock on session + request.setAttribute("Redirect_url", + "http://localhost:8080/nuiton-rstedit/hello?adresse="+svnSess.getSvnPath()+"&"+"file_name="+svnSess.getFileName()+"&"+"project_url="+svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Recall.jsp"); + + requestDispacher.forward(request, response); + out.close(); + } + private static final Log log = LogFactory.getLog(PrivateSvnServlet.class); +} Added: nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,129 @@ +package org.nuiton.jrst; + +import java.io.File; +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.wc.DefaultSVNOptions; +import org.tmatesoft.svn.core.wc.SVNClientManager; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + +class SvnSession { + + public ISVNAuthenticationManager getAuthManager() { + return authManager; + } + + public void setAuthManager(ISVNAuthenticationManager authManager) { + this.authManager = authManager; + } + + public File getCheckoutdir() { + return checkoutdir; + } + + public void setCheckoutdir(File checkoutdir) { + this.checkoutdir = checkoutdir; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public SVNClientManager getManager() { + return manager; + } + + public void setManager(SVNClientManager manager) { + this.manager = manager; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getProjectUrl() { + return projectUrl; + } + + public void setProjectUrl(String projectUrl) { + this.projectUrl = projectUrl; + } + + public SVNURL getRemoteUrl() { + return remoteUrl; + } + + public void setRemoteUrl(SVNURL remoteUrl) { + this.remoteUrl = remoteUrl; + } + + public DefaultSVNOptions getSvnOption() { + return svnOption; + } + + public void setSvnOption(DefaultSVNOptions svnOption) { + this.svnOption = svnOption; + } + + public String getSvnPath() { + return svnPath; + } + + public void setSvnPath(String svnPath) { + this.svnPath = svnPath; + } + + public File getTmpDir() { + return tmpDir; + } + + public void setTmpDir(File tmpDir) { + this.tmpDir = tmpDir; + } + + String svnPath;// svn path without fileName + String fileName;// fileName of modif file + String projectUrl;// Projectname + String login;// user's login + String password;// user's password + File tmpDir;// Temp directory path + File checkoutdir;// Temp directory for checkout + SVNURL remoteUrl;// url of svn path + ISVNAuthenticationManager authManager;// AuthenticationManager with login and password + DefaultSVNOptions svnOption;// svn default option + SVNClientManager manager; + + SvnSession(String svnPath, String fileName, String projectUrl, String login, String password, File tmpDir, String id) throws SVNException { + super(); + this.svnPath = svnPath; + this.fileName = fileName; + this.projectUrl = projectUrl; + this.login = login; + this.password = password; + this.tmpDir = tmpDir; + this.checkoutdir = new File(this.tmpDir, "temp_rst"+id); + this.remoteUrl = SVNURL.parseURIEncoded(svnPath); + this.authManager = SVNWCUtil.createDefaultAuthenticationManager(this.checkoutdir, this.login, this.password, false); + this.svnOption = SVNWCUtil.createDefaultOptions(this.checkoutdir, false); + this.svnOption.setPropertyValue(SVNProperty.EOL_STYLE, SVNProperty.EOL_STYLE_LF); + this.manager = SVNClientManager.newInstance(this.svnOption, this.authManager); + } +} 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-10-06 14:58:40 UTC (rev 272) @@ -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/BadFileRedirect.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,23 @@ +<%-- + Document : BadFileRedirect + Created on : 6 oct. 2009, 15:33:56 + 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="3; url=http://localhost:8080/nuiton-rstedit/hello"> + </head> + <body> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <p>Bad SCM path or file name! Please correct it.</p> + <p>You should be transferred automatically to the form page. If +not please <a href="http://localhost:8080/nuiton-rstedit/hello">click this link</a>.</p> + </body> +</html> 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-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,22 @@ +<%-- + 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> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <p>Bad Login or Password. Please Wait.</p> + </body> +</html> Added: nuiton-rstedit/src/main/webapp/GereFormSize.js =================================================================== --- nuiton-rstedit/src/main/webapp/GereFormSize.js (rev 0) +++ nuiton-rstedit/src/main/webapp/GereFormSize.js 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,43 @@ +/** + * @author geoffroy lorieux + */ + + +function countLines(strtocount, cols) + { + var hard_lines = 1; + var last = 0; + while ( true ) + { + last = strtocount.indexOf("\n", last+1); + hard_lines ++; + if ( last == -1 ) + { + break; + } + } + var soft_lines = Math.round(strtocount.length / (cols-1)); + var hard = eval("hard_lines " + unescape("%3e") + "soft_lines;"); + if ( hard ) + { + soft_lines = hard_lines; + } + return soft_lines; + } +function cleanForm() + { + var the_form = document.forms[0]; + for ( var x in the_form ) + { + if ( ! the_form[x] ) + { + continue; + } + if( typeof the_form[x].rows != "number" ) + { + continue; + } + the_form[x].rows = countLines(the_form[x].value,the_form[x].cols) +1; + } + setTimeout("cleanForm();", 300); + } \ No newline at end of file Added: nuiton-rstedit/src/main/webapp/GereSession.js =================================================================== --- nuiton-rstedit/src/main/webapp/GereSession.js (rev 0) +++ nuiton-rstedit/src/main/webapp/GereSession.js 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,41 @@ +/** + * @author geoffroy lorieux + */ + +function rappelSession(minutes) +{ + var msg='Your session expire on '+minutes+' minute'; + if(minutes>1) + { + msg+='s'; + } + msg+='.\nDo you want to reload this page ?'; + + if(confirm(msg)) + { + location.reload(); + } +} + +/** + * affiche une alerte sur l'expiration de la session et redirige vers une autre page + */ +function expirationSession() +{ + alert("Your session has expire. Please relogin"); + window.history.back(-1); +} + +/** + * affiche des avertissements sur le délai d'expiration de la session : + * - un premier au bout de (expiration-rappel) minutes (par ex. : 20-3 = 17 minutes) + * - un second au bout de (expiration) minutes (par ex. : 20 minutes) + */ +function geresession(expiration, rappel) +{ + // affichage du rappel + var chronoRappel=setTimeout('rappelSession('+rappel+')', (expiration-rappel)*60*1000); + + // une fois le rappel affiché, on avertit uniquement de l'expiration + var chronoExpiration=setTimeout('expirationSession()', (expiration)*60*1000); +} 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-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,45 @@ +<%-- + Document : ModificationViewer + 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>SCMWebEditor</title> + + </head> +<body onload="cleanForm(); geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <center><h2><p>Welcome on SCMWebEditor</p></h2><h4><p>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</p></h4></center> + <center><form method="post" action="/nuiton-rstedit/hello"> + <script src="GereFormSize.js"></script> + <textarea name="Mytext" id="Mytext" rows="20" cols="150"><%=request.getAttribute("OrigText")%></textarea> + <script src="Preview.js"></script> + <script src="Saver.js"></script> + <script src="GereSession.js"></script> + <script src="cancelRedirectDelete.js"></script> + <p>Commit Message: <input type="text" name="Commit_message"/></p> + <%if (request.getAttribute("IsLogin").equals(false) == true){ + %><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><% + } else { + %><input type="hidden" NAME=username><input type="hidden" NAME=pw><% + }%> + <input type="hidden" name="Orig_text" value="<%=request.getAttribute("OrigText")%>"/> + <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);"/> + <input type="submit" value="Save and Quit" 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="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.Orig_text, this.form.username, this.form.pw, this.form.Commit_message);"/> + </form></center> + + <h4><p>Older Text Preview :</p></h4> + <pre><%=request.getAttribute("OrigText")%></pre> +</body> +</html> Added: nuiton-rstedit/src/main/webapp/OutConnection.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/OutConnection.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/OutConnection.jsp 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,28 @@ +<%-- + Document : OutConnection + Created on : 6 oct. 2009, 12:07:27 + 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>SCM Web Editor</title> + </head> + <body> + <script src="cancelRedirect.js"></script> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <center><h2><p>Welcome on SCMWebEditor</p></h2><h4><p>You try to access SCM Web Editor from an unknow page please complete this form for application using.</p></h4></center> + <center><form method="get" action="/nuiton-rstedit/hello"> + <p><label>SCM path: <input TYPE=text NAME=adresse SIZE=50></label></p> + <p><label>File name: <input TYPE=text NAME=file_name SIZE=20></label></p> + <input type="hidden" name="project_url" value="<%=request.getRequestURI()%>"/> + <input type="submit" value="Continue" name="Save"/> + <input type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirect();"/> + </form></center> + </body> +</html> 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-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,56 @@ +/** + * @author geoffroy lorieux + */ + +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 && http.status != 406) + { + var response = http.responseText; + var wind = window.open("", "Preview", "scrollbars=yes,resizable=yes,status=yes"); + wind.document.body.innerHTML = response; + } + else if (http.readyState == 4 && http.status == 406) + { + alert("Bad RestructuredText file format please correct it."); + } +} + +function preview(my_text) +{ + sendRequest("POST", "http://localhost:8080/nuiton-rstedit/previewservlet", my_text); +} + Added: nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,29 @@ +<%-- + Document : PrivateSvnRedirect + Created on : 30 sept. 2009, 14:05:43 + 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>Private Scm</title> + </head> + <body><form method="post" action="/nuiton-rstedit/privatesvnservlet"> + <script src="cancelRedirect.js"></script> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <p>You try to access a Private SCM. Please login</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="Submit" name="Save"/> + <input type="button" value="Exit" name="Cancel" onclick="cancelRedirect();"/> + <input type="hidden" name="adresse" value="<%=request.getAttribute("adresse")%>"/> + <input type="hidden" name="file_name" value="<%=request.getAttribute("file_name")%>"/> + <input type="hidden" name="project_url" value="<%=request.getAttribute("project_url")%>"/> + </form> + </body> +</html> \ No newline at end of file Added: nuiton-rstedit/src/main/webapp/Recall.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/Recall.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/Recall.jsp 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,17 @@ +<%-- + Document : Recall + Created on : 30 sept. 2009, 17:05:40 + 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>Redirect...</title> + <meta http-equiv="Refresh" content="0; url=<%=request.getAttribute("Redirect_url")%>"> + </head> +</html> 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-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,23 @@ +<%-- + 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> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <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/Saver.js =================================================================== --- nuiton-rstedit/src/main/webapp/Saver.js (rev 0) +++ nuiton-rstedit/src/main/webapp/Saver.js 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,56 @@ +/** + * @author geoffroy lorieux + */ + +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 sendReq(method, url, text, login, pass, message, orig_text) +{ + http.open(method, url, true); + http.onreadystatechange = handleResp; + http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http.send("Mytext="+text.value+"&username="+login.value+"&pw="+pass.value+"&Commit_message="+message.value+"&Orig_text="+orig_text.value); +} + +function handleResp() +{ + if(http.readyState == 4 && http.status != 401){ + alert("Save Ok."); +// window.location.reload(true); + } else if (http.readyState == 4 && http.status == 401){ + alert("Bad login or password please recheck."); + } +} + +function saver(my_text, login, pass, message, orig_text) +{ + if (my_text.value != orig_text.value){ + if (confirm("Do you really want to save?")){ + sendReq("POST", "http://localhost:8080/nuiton-rstedit/hello", my_text, login, pass, message, orig_text); + } + } else{ + alert("File don't need to be save."); + } +} \ No newline at end of file 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-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,36 @@ +<?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>org.nuiton.jrst.HelloServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>PreviewServlet</servlet-name> + <servlet-class>org.nuiton.jrst.PreviewServlet</servlet-class> + </servlet> + <servlet> + <servlet-name>Saveservlet</servlet-name> + <servlet-class>Saveservlet</servlet-class> + </servlet> + <servlet> + <servlet-name>PrivateSvnServlet</servlet-name> + <servlet-class>org.nuiton.jrst.PrivateSvnServlet</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> + <servlet-mapping> + <servlet-name>Saveservlet</servlet-name> + <url-pattern>/saveservlet</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PrivateSvnServlet</servlet-name> + <url-pattern>/privatesvnservlet</url-pattern> + </servlet-mapping> + </web-app> Added: nuiton-rstedit/src/main/webapp/cancelRedirect.js =================================================================== --- nuiton-rstedit/src/main/webapp/cancelRedirect.js (rev 0) +++ nuiton-rstedit/src/main/webapp/cancelRedirect.js 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,11 @@ +/** + * @author geoffroy lorieux + */ + + +function cancelRedirect() + { + if (confirm("Exit SCMWebEditor ?")){ + window.history.back(-1); + } + } \ No newline at end of file Added: nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js =================================================================== --- nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js (rev 0) +++ nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js 2009-10-06 14:58:40 UTC (rev 272) @@ -0,0 +1,44 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + + +function createRequestObjec() +{ + 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= createRequestObjec(); + +function sendRe(method, url, text, login, pass, message) +{ + http.open(method, url, true); + http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http.send("Mytext="+text.value+"&username="+login.value+"&pw="+pass.value+"&Commit_message="+message.value+"&Orig_text="+text.value); +} + +function cancelRedirectDelete(orig_text, login, pass, message) + { + if (confirm("Exit SCMWebEditor ?")){ + sendRe("POST", "http://localhost:8080/nuiton-rstedit/hello", orig_text, login, pass, message); + window.history.back(-1); + } + } \ No newline at end of file

1 0

r271 - /
by glorieux＠users.nuiton.org Oct. 6, 2009

Oct. 6, 2009

Author: glorieux Date: 2009-10-06 16:57:58 +0200 (Tue, 06 Oct 2009) New Revision: 271 Removed: nuiton-rstedit/ Log:

1 0

r270 - / nuiton-rstedit nuiton-rstedit/src nuiton-rstedit/src/main nuiton-rstedit/src/main/java nuiton-rstedit/src/main/java/org nuiton-rstedit/src/main/java/org/nuiton nuiton-rstedit/src/main/java/org/nuiton/jrst nuiton-rstedit/src/main/resources nuiton-rstedit/src/main/webapp nuiton-rstedit/src/main/webapp/WEB-INF nuiton-rstedit/src/test
by glorieux＠users.nuiton.org Oct. 5, 2009

Oct. 5, 2009

Author: glorieux Date: 2009-10-05 17:04:40 +0200 (Mon, 05 Oct 2009) New Revision: 270 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/org/ nuiton-rstedit/src/main/java/org/nuiton/ nuiton-rstedit/src/main/java/org/nuiton/jrst/ nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.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/GereFormSize.js nuiton-rstedit/src/main/webapp/GereSession.js nuiton-rstedit/src/main/webapp/ModificationViewer.jsp nuiton-rstedit/src/main/webapp/Preview.js nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp nuiton-rstedit/src/main/webapp/Recall.jsp nuiton-rstedit/src/main/webapp/Redirect.jsp nuiton-rstedit/src/main/webapp/Saver.js nuiton-rstedit/src/main/webapp/WEB-INF/ nuiton-rstedit/src/main/webapp/WEB-INF/web.xml nuiton-rstedit/src/main/webapp/cancelRedirect.js 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-10-05 15:04:40 UTC (rev 270) @@ -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-10-05 15:04:40 UTC (rev 270) @@ -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-10-05 15:04:40 UTC (rev 270) @@ -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> + +  +  +  + + <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> + +  +  +  + + <name>Nuiton-rstedit</name> + <description>. + </description> + <inceptionYear>2009</inceptionYear> + <url>http://maven-site.nuiton.org/${project.artifactId}</url> + +  +  +  + + <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> + +  + <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> + +  + <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/org/nuiton/jrst/HelloServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java 2009-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,305 @@ +package org.nuiton.jrst; + +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.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; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + + +/** + * @author geoffroy lorieux + */ +public class HelloServlet extends HttpServlet { + + /** + * Handles the HTTP <code>GET</code> method. + * Do checkout on a private or not scm and call modification jsp page + * @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("--------------------------"); + log.debug("Connection to SCMWebEditor"); + log.debug("--------------------------"); + System.setProperty("file.encoding", "UTF-8"); + HttpSession httpSession = request.getSession(true); + + if (request.getParameter("adresse").startsWith("scm:svn:") == true){ + + log.debug("La chaine debute par scm:svn"); + String adress = request.getParameter("adresse").replace("scm:svn:", ""); + log.debug("Le new chaine est : "+adress); + } + +// svnSession object creation if doesn't already exist + SvnSession svnSess = (httpSession.getAttribute("myInfo") == null? + new SvnSession((request.getParameter("adresse").startsWith("scm:svn:") == true ? request.getParameter("adresse").replace("scm:svn:", "") : request.getParameter("adresse")), + request.getParameter("file_name"), request.getParameter("project_url"), + null, null, (File) getServletContext().getAttribute("javax.servlet.context.tempdir"),httpSession.getId()) : + (SvnSession) httpSession.getAttribute("myInfo")); + + PrintWriter out = response.getWriter(); + +// UTF-8 Test + if (SVNProperty.isUTF8(svnSess.getSvnOption().getNativeCharset()) == true){ + log.debug("Je suis en utf8"); + } else { + log.debug("Je ne suis pas en utf8"); + } + + httpSession.setAttribute("myInfo", svnSess); +// Tempdir creation + + log.debug("Creating temporary directory on: " + svnSess.getCheckoutdir()); + svnSess.getCheckoutdir().mkdir(); + +// doCheckout declaration + + DAVRepositoryFactory.setup(); + SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + +// Checkout svn and file organisation + try{ + log.debug("Do Checkout"); + upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), + SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + } catch (SVNAuthenticationException authexep) { +// if svn authentication failed user is redirected on login page + log.debug("Private SCM on reading"); + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); + request.setAttribute("adresse", svnSess.getSvnPath()); + request.setAttribute("file_name", svnSess.getFileName()); + request.setAttribute("projectUrl", svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/PrivateSvnRedirect.jsp"); + requestDispacher.forward(request, response); + return; + } + log.debug("Checkout done"); + + File file_in_dir = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + String original_text = FileUtils.readFileToString(file_in_dir); + +// JSP data transfert + request.setAttribute("OrigText", original_text); + request.setAttribute("InvalidateMaxTime", (httpSession.getMaxInactiveInterval()/60)); + log.debug("Invalidate time is :"+(httpSession.getMaxInactiveInterval()/60)); + request.setAttribute("IsLogin", (svnSess.getLogin() != null && svnSess.getPassword() != null ? true : false)); + log.debug("IsLogin : "+(svnSess.getLogin() != null && svnSess.getPassword() != null ? true : false)); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/ModificationViewer.jsp"); +// End on first part + requestDispacher.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. + * Receve the new text and commit it to scm + * @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"); + HttpSession httpSession = request.getSession(true); + SvnSession svnSess = (SvnSession) httpSession.getAttribute("myInfo"); + +// Resetting authentification information and manager + svnSess.setLogin(svnSess.getLogin() != null ? svnSess.getLogin() : request.getParameter("username")); + svnSess.setPassword(svnSess.getPassword() != null ? svnSess.getPassword() : request.getParameter("pw")); + svnSess.setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(svnSess.getCheckoutdir(), svnSess.getLogin(), svnSess.getPassword(), false)); + svnSess.setManager(SVNClientManager.newInstance(svnSess.getSvnOption(), svnSess.getAuthManager())); + + File pathToFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + + SVNCommitClient commitClient = new SVNCommitClient(svnSess.getManager(), svnSess.getSvnOption()); + FileUtils.writeStringToFile(pathToFile, request.getParameter("Mytext")); + + List<File> list = new java.util.ArrayList<File>(1); + list.add(0, pathToFile); + + list = convertToUnicode(list); + + File[] tabFile = new File[1]; + tabFile[0] = pathToFile; +// Sending Data to SVN + try{ + log.debug("Try to Commit"); + commitClient.doCommit(tabFile, false, request.getParameter("Commit_message"), null, null, false, true, SVNDepth.FILES); + } catch (SVNAuthenticationException authexep) { +// if authentication failed edition page is reload form user's relogin + log.debug("Bad Login or Password"); + response.setStatus(401); + request.setAttribute("svnPath_url", svnSess.getSvnPath()); + request.setAttribute("fileName_url", svnSess.getFileName()); + request.setAttribute("Redirection_url", svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Error.jsp"); + requestDispacher.forward(request, response); + return; + } +// if commit success user is redirect on the project page + log.debug("Commit success"); + request.setAttribute("Redirection_url", svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Redirect.jsp"); +// Deleting temp directory + + log.debug("Deleting temporary directory : " + svnSess.getCheckoutdir()); + FileUtils.deleteDirectory(svnSess.getCheckoutdir()); +// End of Second part + + requestDispacher.forward(request, response); + log.debug("Exit RSTEditor"); + + } catch (SVNException ex) { + Logger.getLogger(HelloServlet.class.getName()).log(Level.SEVERE, null, ex); + } + } + + 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/org/nuiton/jrst/PreviewServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java 2009-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,180 @@ +package org.nuiton.jrst; + +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 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; + +/** + * @author geoffroy lorieux + */ +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"); + HttpSession httpSession = request.getSession(true); + 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"); +// Text formating and tempfile creating + String myDataWithoutcrlf = myData.replace("\r", ""); + File file_in_dir_copy = new File(tmp_dir, "copy"+httpSession.getId()+".rst"); + File http_file = new File(tmp_dir, "preview"+httpSession.getId()+".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); + + File copy = new File(tmp_dir, "copy"+httpSession.getId()+".rst"); +// Using jrst for generate html document + try{ + JRST.generate(JRST.TYPE_HTML, copy, http_file, JRST.Overwrite.ALLTIME); + log.debug("generate okai"); + } catch (Exception eee) { + log.debug("Bad RST file"); + response.setStatus(406); + return; + } + copy.delete(); +// Sending html content to pop-up preview page + response.setContentType("text/html"); + 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/java/org/nuiton/jrst/PrivateSvnServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java 2009-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,45 @@ +package org.nuiton.jrst; + +import java.io.IOException; +import java.io.PrintWriter; +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.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.tmatesoft.svn.core.wc.SVNClientManager; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + +/** + * @author geoffroy lorieux + */ +public class PrivateSvnServlet extends HttpServlet{ + + + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + log.debug("New Log setting"); + HttpSession httpSession = request.getSession(true); + System.setProperty("file.encoding", "UTF-8"); + PrintWriter out = response.getWriter(); + SvnSession svnSess = (SvnSession) httpSession.getAttribute("myInfo"); +// Resetting User Information + svnSess.setLogin(request.getParameter("username")); + svnSess.setPassword(request.getParameter("pw")); + svnSess.setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(svnSess.getCheckoutdir(),svnSess.getLogin(), svnSess.getPassword(), false)); + svnSess.setManager(SVNClientManager.newInstance(svnSess.getSvnOption(), svnSess.getAuthManager())); + httpSession.setAttribute("myInfo", svnSess); +// Recalling helloservlet with user information stock on session + request.setAttribute("Redirect_url", + "http://localhost:8080/nuiton-rstedit/hello?adresse="+svnSess.getSvnPath()+"&"+"file_name="+svnSess.getFileName()+"&"+"projectUrl="+svnSess.getProjectUrl()); + RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Recall.jsp"); + + requestDispacher.forward(request, response); + out.close(); + } + private static final Log log = LogFactory.getLog(PrivateSvnServlet.class); +} Added: nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java (rev 0) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java 2009-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,129 @@ +package org.nuiton.jrst; + +import java.io.File; +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.wc.DefaultSVNOptions; +import org.tmatesoft.svn.core.wc.SVNClientManager; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + +class SvnSession { + + public ISVNAuthenticationManager getAuthManager() { + return authManager; + } + + public void setAuthManager(ISVNAuthenticationManager authManager) { + this.authManager = authManager; + } + + public File getCheckoutdir() { + return checkoutdir; + } + + public void setCheckoutdir(File checkoutdir) { + this.checkoutdir = checkoutdir; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public SVNClientManager getManager() { + return manager; + } + + public void setManager(SVNClientManager manager) { + this.manager = manager; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getProjectUrl() { + return projectUrl; + } + + public void setProjectUrl(String projectUrl) { + this.projectUrl = projectUrl; + } + + public SVNURL getRemoteUrl() { + return remoteUrl; + } + + public void setRemoteUrl(SVNURL remoteUrl) { + this.remoteUrl = remoteUrl; + } + + public DefaultSVNOptions getSvnOption() { + return svnOption; + } + + public void setSvnOption(DefaultSVNOptions svnOption) { + this.svnOption = svnOption; + } + + public String getSvnPath() { + return svnPath; + } + + public void setSvnPath(String svnPath) { + this.svnPath = svnPath; + } + + public File getTmpDir() { + return tmpDir; + } + + public void setTmpDir(File tmpDir) { + this.tmpDir = tmpDir; + } + + String svnPath;// svn path without fileName + String fileName;// fileName of modif file + String projectUrl;// Projectname + String login;// user's login + String password;// user's password + File tmpDir;// Temp directory path + File checkoutdir;// Temp directory for checkout + SVNURL remoteUrl;// url of svn path + ISVNAuthenticationManager authManager;// AuthenticationManager with login and password + DefaultSVNOptions svnOption;// svn default option + SVNClientManager manager; + + SvnSession(String svnPath, String fileName, String projectUrl, String login, String password, File tmpDir, String id) throws SVNException { + super(); + this.svnPath = svnPath; + this.fileName = fileName; + this.projectUrl = projectUrl; + this.login = login; + this.password = password; + this.tmpDir = tmpDir; + this.checkoutdir = new File(this.tmpDir, "temp_rst"+id); + this.remoteUrl = SVNURL.parseURIEncoded(svnPath); + this.authManager = SVNWCUtil.createDefaultAuthenticationManager(this.checkoutdir, this.login, this.password, false); + this.svnOption = SVNWCUtil.createDefaultOptions(this.checkoutdir, false); + this.svnOption.setPropertyValue(SVNProperty.EOL_STYLE, SVNProperty.EOL_STYLE_LF); + this.manager = SVNClientManager.newInstance(this.svnOption, this.authManager); + } +} 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-10-05 15:04:40 UTC (rev 270) @@ -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-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,22 @@ +<%-- + 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> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <p>Bad Login or Password. Please Wait.</p> + </body> +</html> Added: nuiton-rstedit/src/main/webapp/GereFormSize.js =================================================================== --- nuiton-rstedit/src/main/webapp/GereFormSize.js (rev 0) +++ nuiton-rstedit/src/main/webapp/GereFormSize.js 2009-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,43 @@ +/** + * @author geoffroy lorieux + */ + + +function countLines(strtocount, cols) + { + var hard_lines = 1; + var last = 0; + while ( true ) + { + last = strtocount.indexOf("\n", last+1); + hard_lines ++; + if ( last == -1 ) + { + break; + } + } + var soft_lines = Math.round(strtocount.length / (cols-1)); + var hard = eval("hard_lines " + unescape("%3e") + "soft_lines;"); + if ( hard ) + { + soft_lines = hard_lines; + } + return soft_lines; + } +function cleanForm() + { + var the_form = document.forms[0]; + for ( var x in the_form ) + { + if ( ! the_form[x] ) + { + continue; + } + if( typeof the_form[x].rows != "number" ) + { + continue; + } + the_form[x].rows = countLines(the_form[x].value,the_form[x].cols) +1; + } + setTimeout("cleanForm();", 300); + } \ No newline at end of file Added: nuiton-rstedit/src/main/webapp/GereSession.js =================================================================== --- nuiton-rstedit/src/main/webapp/GereSession.js (rev 0) +++ nuiton-rstedit/src/main/webapp/GereSession.js 2009-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,41 @@ +/** + * @author geoffroy lorieux + */ + +function rappelSession(minutes) +{ + var msg='Your session expire on '+minutes+' minute'; + if(minutes>1) + { + msg+='s'; + } + msg+='.\nDo you want to reload this page ?'; + + if(confirm(msg)) + { + location.reload(); + } +} + +/** + * affiche une alerte sur l'expiration de la session et redirige vers une autre page + */ +function expirationSession() +{ + alert("Your session has expire. Please relogin"); + window.history.back(-1); +} + +/** + * affiche des avertissements sur le délai d'expiration de la session : + * - un premier au bout de (expiration-rappel) minutes (par ex. : 20-3 = 17 minutes) + * - un second au bout de (expiration) minutes (par ex. : 20 minutes) + */ +function geresession(expiration, rappel) +{ + // affichage du rappel + var chronoRappel=setTimeout('rappelSession('+rappel+')', (expiration-rappel)*60*1000); + + // une fois le rappel affiché, on avertit uniquement de l'expiration + var chronoExpiration=setTimeout('expirationSession()', (expiration-1)*60*1000); +} 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-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,45 @@ +<%-- + Document : ModificationViewer + 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>SCMWebEditor</title> + + </head> +<body onload="cleanForm(); geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <center><h2><p>Welcome on SCMWebEditor</p></h2><h4><p>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</p></h4></center> + <center><form method="post" action="/nuiton-rstedit/hello"> + <script src="GereFormSize.js"></script> + <textarea name="Mytext" id="Mytext" rows="20" cols="150"><%=request.getAttribute("OrigText")%></textarea> + <script src="Preview.js"></script> + <script src="Saver.js"></script> + <script src="GereSession.js"></script> + <script src="cancelRedirect.js"></script> + <p>Commit Message: <input type="text" name="Commit_message"/></p> + <%if (request.getAttribute("IsLogin").equals(false) == true){ + %><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><% + } else { + %><input type="hidden" NAME=username><input type="hidden" NAME=pw><% + }%> + <input type="hidden" name="Orig_text" value="<%=request.getAttribute("OrigText")%>"/> + <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);"/> + <input type="submit" value="Save and Quit" 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="Exit" name="Cancel" onclick="javascript:cancelRedirect();"/> + </form></center> + + <h4><p>Older Text Preview :</p></h4> + <pre><%=request.getAttribute("OrigText")%></pre> +</body> +</html> 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-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,56 @@ +/** + * @author geoffroy lorieux + */ + +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 && http.status != 406) + { + var response = http.responseText; + var wind = window.open("", "Preview", "scrollbars=yes,resizable=yes,status=yes"); + wind.document.body.innerHTML = response; + } + else if (http.readyState == 4 && http.status == 406) + { + alert("Bad RestructuredText file format please correct it."); + } +} + +function preview(my_text) +{ + sendRequest("POST", "http://localhost:8080/nuiton-rstedit/previewservlet", my_text); +} + Added: nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/PrivateSvnRedirect.jsp 2009-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,29 @@ +<%-- + Document : PrivateSvnRedirect + Created on : 30 sept. 2009, 14:05:43 + 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>Private Scm</title> + </head> + <body><form method="post" action="/nuiton-rstedit/privatesvnservlet"> + <script src="cancelRedirect.js"></script> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <p>You try to access a Private SCM. Please login</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="Submit" name="Save"/> + <input type="button" value="Exit" name="Cancel" onclick="cancelRedirect();"/> + <input type="hidden" name="adresse" value="<%=request.getAttribute("adresse")%>"/> + <input type="hidden" name="file_name" value="<%=request.getAttribute("file_name")%>"/> + <input type="hidden" name="project_url" value="<%=request.getAttribute("project_url")%>"/> + </form> + </body> +</html> \ No newline at end of file Added: nuiton-rstedit/src/main/webapp/Recall.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/Recall.jsp (rev 0) +++ nuiton-rstedit/src/main/webapp/Recall.jsp 2009-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,17 @@ +<%-- + Document : Recall + Created on : 30 sept. 2009, 17:05:40 + 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>Redirect...</title> + <meta http-equiv="Refresh" content="0; url=<%=request.getAttribute("Redirect_url")%>"> + </head> +</html> 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-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,23 @@ +<%-- + 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> + <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <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/Saver.js =================================================================== --- nuiton-rstedit/src/main/webapp/Saver.js (rev 0) +++ nuiton-rstedit/src/main/webapp/Saver.js 2009-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,63 @@ +/** + * @author geoffroy lorieux + */ + +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 sendReq(method, url, text, login, pass, message) +{ + http.open(method, url, true); + http.onreadystatechange = handleResp; + http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http.send("Mytext="+text.value+"&username="+login.value+"&pw="+pass.value+"&Commit_message="+message.value); +} + +function handleResp() +{ + if(http.readyState == 4 && http.status != 401) + { + alert("Save Ok. This page will be reloaded shortly."); + window.location.reload(true); + } + else if (http.readyState == 4 && http.status == 401) + { + alert("Bad login or password please recheck."); + } +} + +function saver(my_text, login, pass, message, orig_text) +{ + if (my_text.value != orig_text.value) + { + if (confirm("Do you really want to save?")) + { + sendReq("POST", "http://localhost:8080/nuiton-rstedit/hello", my_text, login, pass, message); + } + } + else + { + alert("File don't need to be save."); + } +} \ No newline at end of file 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-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,36 @@ +<?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>org.nuiton.jrst.HelloServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>PreviewServlet</servlet-name> + <servlet-class>org.nuiton.jrst.PreviewServlet</servlet-class> + </servlet> + <servlet> + <servlet-name>Saveservlet</servlet-name> + <servlet-class>Saveservlet</servlet-class> + </servlet> + <servlet> + <servlet-name>PrivateSvnServlet</servlet-name> + <servlet-class>org.nuiton.jrst.PrivateSvnServlet</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> + <servlet-mapping> + <servlet-name>Saveservlet</servlet-name> + <url-pattern>/saveservlet</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PrivateSvnServlet</servlet-name> + <url-pattern>/privatesvnservlet</url-pattern> + </servlet-mapping> + </web-app> Added: nuiton-rstedit/src/main/webapp/cancelRedirect.js =================================================================== --- nuiton-rstedit/src/main/webapp/cancelRedirect.js (rev 0) +++ nuiton-rstedit/src/main/webapp/cancelRedirect.js 2009-10-05 15:04:40 UTC (rev 270) @@ -0,0 +1,11 @@ +/** + * @author geoffroy lorieux + */ + + +function cancelRedirect() + { + if (confirm("Exit SCMWebEditor ?")){ + window.history.back(-1); + } + } \ No newline at end of file

1 0

r269 - /
by glorieux＠users.nuiton.org Oct. 5, 2009

Oct. 5, 2009

Author: glorieux Date: 2009-10-05 17:03:55 +0200 (Mon, 05 Oct 2009) New Revision: 269 Removed: nuiton-rstedit/ Log:

1 0