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

r58 - trunk/src/main/webapp
by glorieux＠users.nuiton.org 15 Dec '09

15 Dec '09

Author: glorieux Date: 2009-12-15 10:53:24 +0100 (Tue, 15 Dec 2009) New Revision: 58 Modified: trunk/src/main/webapp/BadFileRedirect.jsp trunk/src/main/webapp/BadUseRedirect.jsp trunk/src/main/webapp/Error.jsp trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/OutConnection.jsp trunk/src/main/webapp/PrivateSvnRedirect.jsp trunk/src/main/webapp/Redirect.jsp Log: Modification of pages view Modified: trunk/src/main/webapp/BadFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/BadFileRedirect.jsp 2009-12-15 09:52:29 UTC (rev 57) +++ trunk/src/main/webapp/BadFileRedirect.jsp 2009-12-15 09:53:24 UTC (rev 58) @@ -8,12 +8,13 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Error...</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> <meta http-equiv="Refresh" content="3; url= <%=request.getAttribute("scmEditorUrl")%>"> </head> <body> -<img src="http://www.codelutin.com/images/lutinorange-codelutin.png" - alt="$alt" /> +<img src="img/ScmWebEditor_main.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="<%=request.getAttribute("scmEditorUrl")%>">click Modified: trunk/src/main/webapp/BadUseRedirect.jsp =================================================================== --- trunk/src/main/webapp/BadUseRedirect.jsp 2009-12-15 09:52:29 UTC (rev 57) +++ trunk/src/main/webapp/BadUseRedirect.jsp 2009-12-15 09:53:24 UTC (rev 58) @@ -8,12 +8,13 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Error...</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> <meta http-equiv="Refresh" content="3; url= <%=request.getAttribute("scmEditorUrl")%>"> </head> <body> -<img src="http://www.codelutin.com/images/lutinorange-codelutin.png" - alt="$alt" /> +<img src="img/ScmWebEditor_main.png" alt="$alt" /> <p>Bad Use of ScmWebEditor! Please try again.</p> <p>You should be transferred automatically to the previous page. If not please <a href="<%=request.getAttribute("scmEditorUrl")%>">click Modified: trunk/src/main/webapp/Error.jsp =================================================================== --- trunk/src/main/webapp/Error.jsp 2009-12-15 09:52:29 UTC (rev 57) +++ trunk/src/main/webapp/Error.jsp 2009-12-15 09:53:24 UTC (rev 58) @@ -7,14 +7,15 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Error</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> <meta http-equiv="Refresh" content="2; url=" <%=request.getAttribute("Redirect_url")%>"> <%--%=request.getAttribute("scmEditorUrl")%>?adresse=<%=request.getAttribute("Svnpath_url")%>&file_name=<%=request.getAttribute("Filename_url")%>&project_url=<%=request.getAttribute("Redirection_url")%>&lang=<%=request.getAttribute("Lang")%>&format=<%=request.getAttribute("Format")%>"--%> </head> <body> -<img src="http://www.codelutin.com/images/lutinorange-codelutin.png" - alt="$alt" /> +<img src="img/ScmWebEditor_main.png" alt="$alt" /> <p>Bad Login or Password. Please Wait.</p> <p>©2004-2009 CodeLutin</p> </body> Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2009-12-15 09:52:29 UTC (rev 57) +++ trunk/src/main/webapp/ModificationViewer.jsp 2009-12-15 09:53:24 UTC (rev 58) @@ -7,10 +7,12 @@ <head> <title>SCMWebEditor</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body onload="cleanForm();geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> - <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> + <img src="img/ScmWebEditor_main.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> @@ -51,6 +53,6 @@ <p>Upload a picture: <input id="newPic" type="file" name="newPic" size="30"> <input type="submit" value="Upload" name="upPic"/></p> </form></center> - <p>©2004-2009 CodeLutin</p> + <p align="right">©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/OutConnection.jsp =================================================================== --- trunk/src/main/webapp/OutConnection.jsp 2009-12-15 09:52:29 UTC (rev 57) +++ trunk/src/main/webapp/OutConnection.jsp 2009-12-15 09:53:24 UTC (rev 58) @@ -3,39 +3,46 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> +<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> <title>SCM Web Editor</title> </head> <body> -<script src="cancelRedirect.js"></script> -<img src="http://www.codelutin.com/images/lutinorange-codelutin.png" - alt="$alt" /> + <img align="top"></img> +<script src="fileSearch.js"></script> +<img src="img/ScmWebEditor_main.png" alt="$alt" /> <center> <h2> <p>Welcome on SCMWebEditor</p> </h2> +<noscript><h4><p>Javascript is not activated. Please activate it for a fully use of ScmWebEditor.</p></h4></noscript> <h4> -<p>You try to access SCM Web Editor from an unknow page please -complete this form for application using.</p> +<p>Please complete this form for application using.</p> </h4> </center> <center> <form method="get" action=<%=request.getAttribute("scmEditorUri")%>> -<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> -<p><label>File type: <select name=format> + <p><label>SCM path: <input TYPE=text name="adresse" SIZE=100></label><input type="button" value="Search Files" name="search" onclick="javascript:fileSearch(this.form.adresse, this.form.searchServletUrl);"/></p> + <p><label>File name: <input TYPE=text NAME=file_name SIZE=20></label> +<label>File type: <select name=format> <option value="rst">Rst <option value="apt">Apt </select></label></p> -<p><label>Lang:</label>: <select name=lang> +<p><label>Lang: <select name=lang> <option value="fr">Fr <option value="en">En +</select></label> +<label>Default Lang: <select name=defaultLang> +<option value="fr">Fr +<option value="en">En </select></label></p> -<input type="hidden" name="project_url" value="<%=request.getRequestURI()%>"/> + +<input type="hidden" name="searchServletUrl" value="<%=request.getAttribute("searchServletUrl")%>"/> <input type="submit" name="Save" /></form> </center> -<p>©2004-2009 CodeLutin</p> +<p align="right">©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/PrivateSvnRedirect.jsp =================================================================== --- trunk/src/main/webapp/PrivateSvnRedirect.jsp 2009-12-15 09:52:29 UTC (rev 57) +++ trunk/src/main/webapp/PrivateSvnRedirect.jsp 2009-12-15 09:53:24 UTC (rev 58) @@ -8,12 +8,13 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Private Scm</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> </head> <body> +<img src="img/ScmWebEditor_main.png" alt="$alt" /> <form method="post" action=<%=request.getAttribute("privateServletUri")%>> -<script src="cancelRedirect.js"></script> <img - src="http://www.codelutin.com/images/lutinorange-codelutin.png" - alt="$alt" /> +<script src="cancelRedirect.js"></script> <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 Modified: trunk/src/main/webapp/Redirect.jsp =================================================================== --- trunk/src/main/webapp/Redirect.jsp 2009-12-15 09:52:29 UTC (rev 57) +++ trunk/src/main/webapp/Redirect.jsp 2009-12-15 09:53:24 UTC (rev 58) @@ -7,12 +7,13 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Redirection...</title> +<link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> +<link rel="stylesheet" type="text/css" href="css/main.css"> <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" /> +<img src="img/ScmWebEditor_main.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

1 0

r57 - trunk/src/main/webapp/WEB-INF
by glorieux＠users.nuiton.org 15 Dec '09

15 Dec '09

Author: glorieux Date: 2009-12-15 10:52:29 +0100 (Tue, 15 Dec 2009) New Revision: 57 Modified: trunk/src/main/webapp/WEB-INF/web.xml Log: Add of searchServlet Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2009-12-15 09:52:02 UTC (rev 56) +++ trunk/src/main/webapp/WEB-INF/web.xml 2009-12-15 09:52:29 UTC (rev 57) @@ -1,7 +1,5 @@ <?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"> +<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>ScmWebEditorMainServlet</servlet-name> <servlet-class>org.nuiton.scmwebeditor.ScmWebEditorMainServlet</servlet-class> @@ -18,7 +16,11 @@ <servlet-name>PictureUpload</servlet-name> <servlet-class>org.nuiton.scmwebeditor.PictureUpload</servlet-class> </servlet> - <servlet-mapping> + <servlet> + <servlet-name>SearchServlet</servlet-name> + <servlet-class>org.nuiton.scmwebeditor.SearchServlet</servlet-class> + </servlet> + <servlet-mapping> <servlet-name>ScmWebEditorMainServlet</servlet-name> <url-pattern>/scmwebeditor</url-pattern> </servlet-mapping> @@ -35,4 +37,8 @@ <url-pattern>/pictureUpload</url-pattern> </servlet-mapping> -</web-app> + <servlet-mapping> + <servlet-name>SearchServlet</servlet-name> + <url-pattern>/searchservlet</url-pattern> + </servlet-mapping> + </web-app>

1 0

r56 - in trunk/src/main/webapp: . img
by glorieux＠users.nuiton.org 15 Dec '09

15 Dec '09

Author: glorieux Date: 2009-12-15 10:52:02 +0100 (Tue, 15 Dec 2009) New Revision: 56 Added: trunk/src/main/webapp/img/ trunk/src/main/webapp/img/ScmWebEditor_little.png trunk/src/main/webapp/img/ScmWebEditor_main.png Log: Add ScmWebEditor icons. Added: trunk/src/main/webapp/img/ScmWebEditor_little.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/ScmWebEditor_little.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/ScmWebEditor_main.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/ScmWebEditor_main.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r55 - in trunk/src/main/webapp: . css
by glorieux＠users.nuiton.org 15 Dec '09

15 Dec '09

Author: glorieux Date: 2009-12-15 10:49:06 +0100 (Tue, 15 Dec 2009) New Revision: 55 Added: trunk/src/main/webapp/css/ trunk/src/main/webapp/css/main.css Log: Add ScmWebEditor css. Added: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css (rev 0) +++ trunk/src/main/webapp/css/main.css 2009-12-15 09:49:06 UTC (rev 55) @@ -0,0 +1,6 @@ +body { + + font-family: Verdana,Arial,Helvetica,sans-serif; + background-color: #b8b1b1; +} +

1 0

r54 - trunk/src/main/java/org/nuiton/scmwebeditor
by glorieux＠users.nuiton.org 15 Dec '09

15 Dec '09

Author: glorieux Date: 2009-12-15 10:42:46 +0100 (Tue, 15 Dec 2009) New Revision: 54 Modified: trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java Log: Add SearchServlet Attribute. Modified: trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java 2009-12-15 09:41:48 UTC (rev 53) +++ trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java 2009-12-15 09:42:46 UTC (rev 54) @@ -56,6 +56,7 @@ protected static final String ATTRIBUTE_PROJECT_URL = "Project_url"; protected static final String ATTRIBUTE_SCM_EDITOR_URI = "scmEditorUri"; protected static final String ATTRIBUTE_PREVIEW_SERVLET_URL = "previewServletUrl"; + protected static final String ATTRIBUTE_FILESEARCH_SERVLET_URL = "searchServletUrl"; protected static final String ATTRIBUTE_REDIRECT_URL = "Redirect_url"; protected static final String ATTRIBUTE_PRIVATE_SERVLET_URI = "privateServletUri";

1 0

r53 - trunk/src/main/java/org/nuiton/scmwebeditor
by glorieux＠users.nuiton.org 15 Dec '09

15 Dec '09

Author: glorieux Date: 2009-12-15 10:41:48 +0100 (Tue, 15 Dec 2009) New Revision: 53 Added: trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java Log: Add SearchServlet. Added: trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java (rev 0) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java 2009-12-15 09:41:48 UTC (rev 53) @@ -0,0 +1,81 @@ +/* *##% ScmWebEditor + * Copyright (C) 2004 - 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 org.nuiton.scmwebeditor; + +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.tmatesoft.svn.core.ISVNDirEntryHandler; +import org.tmatesoft.svn.core.SVNDirEntry; +import org.tmatesoft.svn.core.SVNException; +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.SVNLogClient; +import org.tmatesoft.svn.core.wc.SVNRevision; +import org.tmatesoft.svn.core.wc.SVNWCUtil; + +public class SearchServlet extends AbstractScmWebEditorServlet { + + private static final Log log = LogFactory.getLog(SearchServlet.class); + + /** + * Handles the HTTP <code>POST</code> method. + * Search files list on scm repository + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + */ + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException{ + try { + String adresse = request.getParameter(PARAMETER_ADRESSE); + if (log.isDebugEnabled()) { + log.debug("Search for files on " + adresse + " repository"); + } + //Create default access + DefaultSVNOptions svnOption = SVNWCUtil.createDefaultOptions(false); + ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager(); + //Convert url to SVNUrl + SVNURL svnUrl; + svnUrl = SVNURL.parseURIEncoded(adresse); + //get a SVNLogClient + SVNLogClient logClient = new SVNLogClient(authManager, svnOption); + //recup info about svn repository + ISVNDirEntryHandler dirEntryHandler = new ISVNDirEntryHandler() { + + @Override + public void handleDirEntry(SVNDirEntry arg0) throws SVNException { + log.debug("le fichier est: " + arg0.getName()); + throw new UnsupportedOperationException("Not supported yet."); + } + }; + logClient.doList(svnUrl, SVNRevision.WORKING, SVNRevision.HEAD, true, true, dirEntryHandler); + } catch (SVNException ex) { + response.setStatus(401); + Logger.getLogger(SearchServlet.class.getName()).log(Level.SEVERE, null, ex); + } + + + } +} \ No newline at end of file

1 0

r52 - trunk/src/main/java/org/nuiton/scmwebeditor
by glorieux＠users.nuiton.org 15 Dec '09

15 Dec '09

Author: glorieux Date: 2009-12-15 10:10:57 +0100 (Tue, 15 Dec 2009) New Revision: 52 Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java Log: Fixed redirect url if parmaLang = paramDefaultLang. Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java 2009-11-30 10:01:36 UTC (rev 51) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java 2009-12-15 09:10:57 UTC (rev 52) @@ -67,9 +67,7 @@ log.debug("Connection to SCMWebEditor"); log.debug("--------------------------"); } - HttpSession httpSession = request.getSession(true); - try { // First Part Svn checkout and JSP call @@ -91,6 +89,7 @@ } // on redirige vers la page OutConnection.jsp request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI()); + request.setAttribute(ATTRIBUTE_FILESEARCH_SERVLET_URL, request.getContextPath() + "/searchservlet"); log.debug("l'uri est: " + request.getRequestURI()); redirect(request, response, "/OutConnection.jsp"); return; @@ -117,6 +116,7 @@ if (paramLang.equals(paramDefaultLang)) { // on a maven site, default locale is on root relativePath = "/src/site/" + paramFormat + "/"; + paramProjectUrl = paramProjectUrl.replace("/"+paramDefaultLang+"/", "/"); } String scmPath = paramAdresse.endsWith(relativePath) ? "" : relativePath;

1 0