[Scmwebeditor-commits] r51 - trunk/src/main/java/org/nuiton/scmwebeditor

30 Nov 2009

Author: glorieux
Date: 2009-11-30 11:01:36 +0100 (Mon, 30 Nov 2009)
New Revision: 51

Modified:
   trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java
   trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java
   trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java
   trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java
Log:
Cleaning project after Tony Chemit modification.

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java
===================================================================

--- trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java	2009-11-25 15:32:58 UTC (rev 50)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/AbstractScmWebEditorServlet.java	2009-11-30 10:01:36 UTC (rev 51)
@@ -165,7 +165,6 @@
 
     protected void redirect(HttpServletRequest request, HttpServletResponse response, String path) throws IOException, ServletException {
         RequestDispatcher requestDispacher = getServletContext().getRequestDispatcher(path);
-
         requestDispacher.forward(request, response);
     }
 

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java
===================================================================
--- trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java	2009-11-25 15:32:58 UTC (rev 50)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/PreviewServlet.java	2009-11-30 10:01:36 UTC (rev 51)
@@ -64,9 +64,7 @@
         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);
+
         convertToUnicode(file_in_dir_copy);
 
         File copy = new File(tmp_dir, "copy" + httpSession.getId() + ".rst");
@@ -88,101 +86,5 @@
         ret.print(FileUtils.readFileToString(http_file));
         http_file.delete();
     }
-
-
-//    protected static CodepageDetectorProxy detector;
-//
-//    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;
-//    }
 }
 

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java
===================================================================
--- trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java	2009-11-25 15:32:58 UTC (rev 50)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/PrivateSvnServlet.java	2009-11-30 10:01:36 UTC (rev 51)
@@ -49,13 +49,8 @@
 
         // Resetting User Information
         svnSess.updateAuthentication(request.getParameter(PARAMETER_USERNAME), request.getParameter(PARAMETER_PW));
-//        svnSess.setLogin(request.getParameter(PARAMETER_USERNAME));
-//        svnSess.setPassword(request.getParameter(PARAMETER_PW));
-//        svnSess.setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(svnSess.getCheckoutdir(), svnSess.getLogin(), svnSess.getPassword(), false));
-//        svnSess.setManager(SVNClientManager.newInstance(svnSess.getSvnOption(), svnSess.getAuthManager()));
         //FIXME-TC20091124 : why repush the object already in session, I don't see the point...
         setSvnSession(httpSession, svnSess);
-//        httpSession.setAttribute(ATTRIBUTE_SVN_SESSION, svnSess);
 //            Recalling helloservlet with user information stock on session
         String url = getRedirectUrl(svnSess);
         if (log.isDebugEnabled()) {
@@ -64,11 +59,6 @@
         request.setAttribute(ATTRIBUTE_REDIRECT_URL, url);
         redirect(request, response, "/Recall.jsp");
 
-//        request.setAttribute(ATTRIBUTE_REDIRECT_URL,
-//                svnSess.getScmEditorUrl() + "?adresse=" + svnSess.getSvnPath() + "&" + "file_name=" + svnSess.getFileName() + "&" + "project_url=" + svnSess.getProjectUrl() + "&" + "lang=" + svnSess.getLang() + "&" + "format=" + svnSess.getFormat());
-//        RequestDispatcher requestDispacher = getServletContext().getRequestDispatcher("/Recall.jsp");
-//
-//        requestDispacher.forward(request, response);
         out.close();
     }
 

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java
===================================================================
--- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java	2009-11-25 15:32:58 UTC (rev 50)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorMainServlet.java	2009-11-30 10:01:36 UTC (rev 51)
@@ -85,18 +85,14 @@
                 // il manque des paramètres pour editer une ressource
 
                 SvnSession svnSess = getSvnSession(httpSession);
-//                SvnSession svnSess = (SvnSession)request.getSession(true).getAttribute(ATTRIBUTE_SVN_SESSION);
                 if (svnSess != null) {
                     // on nettoye le répertoire de checkout
                     svnSess.cleanCheckoutDir();
-//                    FileUtils.deleteDirectory(svnSess.getCheckoutdir());
                 }
                 // on redirige vers la page OutConnection.jsp
                 request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI());
                 log.debug("l'uri est: " + request.getRequestURI());
                 redirect(request, response, "/OutConnection.jsp");
-//                RequestDispatcher requestDispacher = getServletContext().getRequestDispatcher("/OutConnection.jsp");
-//                requestDispacher.forward(request, response);
                 return;
             }
 
@@ -105,37 +101,11 @@
                 // on redirige sur la page BadFileRedirect.jsp
                 request.setAttribute(PARAMETER_SCM_EDITOR_URL, paramProjectUrl);
                 redirect(request, response, "/BadFileRedirect.jsp");
-//                    RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/BadFileRedirect.jsp");
-//                    requestDispacher.forward(request, response);
                 return;
             }
 
-//            if (paramAdresse != null && paramFileName != null && paramProjectUrl != null) {
-//                if (paramAdresse.equals("") || paramFileName.equals("") || paramProjectUrl.equals("")) {
-//                    request.setAttribute(PARAMETER_SCM_EDITOR_URL, paramProjectUrl);
-//                    redirect(request, response, "/BadFileRedirect.jsp");
-////                    RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/BadFileRedirect.jsp");
-////                    requestDispacher.forward(request, response);
-//                    return;
-//                }
-//
-//            } else {
-//                SvnSession svnSess = getSvnSession(httpSession);
-////                SvnSession svnSess = (SvnSession)request.getSession(true).getAttribute(ATTRIBUTE_SVN_SESSION);
-//                if (svnSess != null) {
-//                    FileUtils.deleteDirectory(svnSess.getCheckoutdir());
-//                }
-//                request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI());
-//                log.debug("l'uri est: " + request.getRequestURI());
-//                redirect(request, response, "/OutConnection.jsp");
-////                RequestDispatcher requestDispacher = getServletContext().getRequestDispatcher("/OutConnection.jsp");
-////                requestDispacher.forward(request, response);
-//                return;
-//            }
-//              svnSession object creation if doesn't already exist
-
+//            SvnSession object creation if doesn't already exist
             SvnSession svnSess = getSvnSession(httpSession);
-//            SvnSession svnSess = (SvnSession) httpSession.getAttribute(ATTRIBUTE_SVN_SESSION);
 
             String scmUrl = paramAdresse.startsWith("scm:svn:") ? paramAdresse.replace("scm:svn:", "") : paramAdresse;
 
@@ -152,7 +122,6 @@
             String scmPath = paramAdresse.endsWith(relativePath) ? "" : relativePath;
 
             String scmFilename = paramFileName.endsWith(".html") ? paramFileName.replace(".html", "." + paramFormat) : paramFileName;
-//            File tempDir = (File) getServletContext().getAttribute(ATTRIBUTE_TEMPDIR);
             File tempDir = getTempDir();
             String tmp_log = null;
             String tmp_pass = null;
@@ -173,37 +142,7 @@
                     paramFormat,
                     request.getRequestURL());
 
-//            if (svnSess == null || (svnSess.getLogin() == null && svnSess.getPassword() == null)) {
-//                svnSess = new SvnSession(scmUrl +
-//                        scmPath,
-//                        scmFilename,
-//                        paramProjectUrl,
-//                        null,
-//                        null,
-//                        tempDir,
-//                        httpSession.getId(),
-//                        paramLang,
-//                        paramDefaultLang,
-//                        paramFormat,
-//                        request.getRequestURL());
-//            } else if (svnSess.getLogin() != null && svnSess.getPassword() != null) {
-//                String tmp_log = svnSess.getLogin();
-//                String tmp_pass = svnSess.getPassword();
-//                svnSess = new SvnSession(scmUrl +
-//                        scmPath,
-//                        scmFilename,
-//                        paramProjectUrl,
-//                        tmp_log,
-//                        tmp_pass,
-//                        tempDir,
-//                        httpSession.getId(),
-//                        paramLang,
-//                        paramDefaultLang,
-//                        paramFormat,
-//                        request.getRequestURL());
-//            }
             setSvnSession(httpSession, svnSess);
-//            httpSession.setAttribute(ATTRIBUTE_SVN_SESSION, svnSess);
 //            Tempdir creation on servlet default temporary directory
 
             svnSess.getCheckoutdir().mkdir();
@@ -223,11 +162,10 @@
                 // if svn authentication failed user is redirected on login page
                 log.debug("Private SCM on reading " + svnSess.getRemoteUrl());
                 svnSess.cleanCheckoutDir();
-//                FileUtils.deleteDirectory(svnSess.getCheckoutdir());
+
                 request.setAttribute(ATTRIBUTE_PRIVATE_SERVLET_URI, request.getContextPath() + "/privatesvnservlet");
                 redirect(request, response, "/PrivateSvnRedirect.jsp");
-//                RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/PrivateSvnRedirect.jsp");
-//                requestDispacher.forward(request, response);
+
                 return;
             }
 
@@ -246,17 +184,13 @@
                 request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI());
                 request.setAttribute(ATTRIBUTE_PREVIEW_SERVLET_URL, request.getContextPath() + "/previewservlet");
                 redirect(request, response, "/ModificationViewer.jsp");
-//                RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/ModificationViewer.jsp");
                 // End on first part
-//                requestDispacher.forward(request, response);
 
             } catch (FileNotFoundException ee) {
                 // fichier non trouve, on redirige vers BadFileRedirect.jsp
                 FileUtils.deleteDirectory(svnSess.getCheckoutdir());
                 request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getProjectUrl());
                 redirect(request, response, "/BadFileRedirect.jsp");
-//                RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/BadFileRedirect.jsp");
-//                requestDispacher.forward(request, response);
             }
 //            JSP data transfert
 
@@ -266,13 +200,9 @@
                 log.error(ex);
             }
             SvnSession svnSess = getSvnSession(httpSession);
-//            SvnSession svnSess = (SvnSession) request.getSession(true).getAttribute(ATTRIBUTE_SVN_SESSION);
             FileUtils.deleteDirectory(svnSess.getCheckoutdir());
             request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getProjectUrl());
             redirect(request, response, "/BadUseRedirect.jsp");
-//            RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/BadUseRedirect.jsp");
-//            requestDispacher.forward(request, response);
-
         }
     }
 
@@ -295,28 +225,18 @@
             System.setProperty("file.encoding", "UTF-8");
             HttpSession httpSession = request.getSession(true);
             SvnSession svnSess = getSvnSession(httpSession);
-//            SvnSession svnSess = (SvnSession) httpSession.getAttribute(ATTRIBUTE_SVN_SESSION);
 
 //            Resetting authentification information and manager
             svnSess.updateAuthentication(
                     svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : request.getParameter(PARAMETER_USERNAME),
                     svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : request.getParameter(PARAMETER_PW));
 
-//            svnSess.setLogin(svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : request.getParameter(PARAMETER_USERNAME));
-//            svnSess.setPassword(svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : request.getParameter(PARAMETER_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(PARAMETER_MYTEXT));
 
-//            List<File> list = new java.util.ArrayList<File>(1);
-//            list.add(0, pathToFile);
-
             convertToUnicode(pathToFile);
-            //list = convertToUnicode(list);
 
             File[] tabFile = new File[1];
             tabFile[0] = pathToFile;
@@ -333,14 +253,6 @@
                     String url = getRedirectUrl(svnSess);
                     request.setAttribute(ATTRIBUTE_REDIRECT_URL, url);
                     redirect(request, response, "/Error.jsp");
-//                    request.setAttribute(ATTRIBUTE_SVN_PATH_URL, svnSess.getSvnPath());
-//                    request.setAttribute(ATTRIBUTE_FILE_NAME_URL, svnSess.getFileName());
-//                    request.setAttribute(ATTRIBUTE_REDIRECTION_URL, svnSess.getProjectUrl());
-//                    request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getScmEditorUrl());
-//                    request.setAttribute(ATTRIBUTE_LANG, svnSess.getLang());
-//                    request.setAttribute(ATTRIBUTE_FORMAT, svnSess.getFormat());
-//                    RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Error.jsp");
-//                    requestDispacher.forward(request, response);
                     return;
                 }
             }
@@ -352,13 +264,9 @@
 //            if commit success user is redirect on the project page
             request.setAttribute(ATTRIBUTE_REDIRECTION_URL, svnSess.getProjectUrl());
             redirect(request, response, "/Redirect.jsp");
-//            RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Redirect.jsp");
-//            Deleting temp directory
 
-
 // End of Second part
 
-//            requestDispacher.forward(request, response);
             log.debug("Exit RSTEditor");
 
         } catch (SVNException ex) {
@@ -366,97 +274,4 @@
         }
     }
 
-
-//    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;
-//    }
 }

    

[Scmwebeditor-commits] r51 - trunk/src/main/java/org/nuiton/scmwebeditor

glorieux＠users.nuiton.org