Author: kcardineaud Date: 2011-07-20 10:53:51 +0200 (Wed, 20 Jul 2011) New Revision: 179 Url: http://nuiton.org/repositories/revision/scmwebeditor/179 Log: Modify some log Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -244,7 +244,9 @@ AutoDetectParser parser = new AutoDetectParser(); parser.parse(is, contenthandler, metadata); String result = metadata.get(Metadata.CONTENT_TYPE); - log.info("Mine type of " + file.getName() + " is : " + result); + if(log.isDebugEnabled()) { + log.debug("Mine type of " + file.getName() + " is : " + result); + } return result; } finally { @@ -261,7 +263,10 @@ AutoDetectParser parser = new AutoDetectParser(); parser.parse(is, contenthandler, metadata); String result = metadata.get(Metadata.CONTENT_TYPE); - log.info("Mine type of " + filename + " is : " + result); + if(log.isDebugEnabled()) { + log.debug("Mine type of " + filename + " is : " + result); + } + return result; } finally { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -60,7 +60,7 @@ log.debug(newText); } XMLResponse=""; - //Using jrst for generate html document + //Using jrst to generate html document try { XMLResponse = JRST.generate(JRST.TYPE_HTML, newText); if(log.isDebugEnabled()) { @@ -71,7 +71,7 @@ if(log.isWarnEnabled()) { log.warn("RST generate fail",eee); } - XMLResponse = "<h4>Parsing érror, please read RST specification<h4>"; + XMLResponse = "<h4>Parsing error, please read RST specification<h4>"; return; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -50,6 +50,7 @@ String url = svnSess.getSvnPath(); String file = svnSess.getFileName(); + //Si le login ou le mot de passe ne sont pas renseignes, on tente de se connecter en anonyme if(login==null && pw==null) { login = "anonymous"; pw = "anonymous"; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -111,6 +111,7 @@ svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + // Avant le commit, il faut checkout le repertoire try { checkout(svnSess); } catch (SVNAuthenticationException authexep) { @@ -126,7 +127,7 @@ return Action.LOGIN; } catch (SVNException e) { - //Suppression du repertoire temporaire + //Suppression du repertoire temporaire delTempDirectory(svnSess); return "errorPath"; } @@ -188,7 +189,7 @@ File[] tabFile = new File[1]; tabFile[0] = pathToFile; -// Sending Data to SVN + try { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -103,9 +103,7 @@ if(log.isDebugEnabled()) { - log.debug("--------------------------\n" + - "Connection to SCMWebEditor\n" + - "--------------------------"); + log.debug("Connection to SCMWebEditor\n"); } @@ -117,15 +115,16 @@ return "noParameter"; } - if(log.isInfoEnabled()) { - log.info("ProjectUrl= "+request.getHeader("referer")); + if(log.isDebugEnabled()) { + log.debug("ProjectUrl= "+request.getHeader("referer")); } + projectUrl=request.getHeader("referer"); HttpSession httpSession = request.getSession(true); if(log.isInfoEnabled()) { - log.info("IP client : "+request.getRemoteAddr()); + log.info("IP client : "+request.getRemoteAddr() + " , get file : "+address); } //SvnSession object creation if doesn't already exist Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -123,8 +123,8 @@ public String search() { - if(log.isInfoEnabled()) { - log.info("Enter in search action"); + if(log.isDebugEnabled()) { + log.debug("Enter in search action"); } @@ -162,8 +162,9 @@ if(id.equals("")) { try { - log.info("Address svn : "+address); - + if(log.isDebugEnabled()) { + log.debug("Address svn : "+address); + } repository = SVNRepositoryFactory.create( SVNURL.parseURIDecoded( address ) ); authManager = SVNWCUtil.createDefaultAuthenticationManager( name , password ); @@ -200,21 +201,21 @@ authManager = SVNWCUtil.createDefaultAuthenticationManager( name , password ); repository.setAuthenticationManager( authManager ); - if(log.isInfoEnabled()) { - log.info( "Repository Root: " + repository.getRepositoryRoot( true ) ); - log.info( "Repository UUID: " + repository.getRepositoryUUID( true ) ); + if(log.isDebugEnabled()) { + log.debug( "Repository Root: " + repository.getRepositoryRoot( true ) ); + log.debug( "Repository UUID: " + repository.getRepositoryUUID( true ) ); } SVNNodeKind nodeKind = repository.checkPath( "" , -1 ); if ( nodeKind == SVNNodeKind.NONE ) { - if(log.isErrorEnabled()) { - log.error( "There is no entry at '" + url + "'." ); + if(log.isWarnEnabled()) { + log.warn( "There is no entry at '" + url + "'." ); } error="There is no entry at '" + url + "'."; return Action.SUCCESS; } else if ( nodeKind == SVNNodeKind.FILE ) { - if(log.isInfoEnabled()) { - log.info( "The entry at '" + url + "' is a file." ); + if(log.isDebugEnabled()) { + log.debug( "The entry at '" + url + "' is a file." ); } TreeNode node = new TreeNode(); node.setId(url); @@ -226,8 +227,8 @@ } numberOfFile=0; listEntries( repository , "" ); - if(log.isInfoEnabled()) { - log.info("Nombre de fichier : "+files.size()); + if(log.isDebugEnabled()) { + log.debug("Number of file : "+files.size()); } @@ -272,7 +273,10 @@ error="Can't access to the repository"; } - log.info("Search success"); + if(log.isDebugEnabled()) { + log.debug("Search success"); + } + return Action.SUCCESS; } @@ -282,7 +286,9 @@ try { entries = repository.getDir( path, -1 , null , (Collection<?>) null ); } catch (SVNException e) { - log.error("Can not reach the repository",e); + if(log.isErrorEnabled()) { + log.error("Can not reach the repository",e); + } } Iterator<?> iterator = entries.iterator(); @@ -328,7 +334,9 @@ public String getAddressUnique(String leFichier) { String result = leFichier.replaceAll("/|:", ""); - log.info("Result of getAddressUnique : "+result); + if(log.isDebugEnabled()) { + log.debug("Result of getAddressUnique : "+result); + } return result; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-20 08:53:51 UTC (rev 179) @@ -95,9 +95,9 @@ badLogin=false; error=false; - if(log.isInfoEnabled()) { - log.info("PictureName : "+uploadFileName); - log.info("ContentType : "+uploadContentType); + if(log.isDebugEnabled()) { + log.debug("PictureName : "+uploadFileName); + log.debug("ContentType : "+uploadContentType); } @@ -163,7 +163,9 @@ FileUtils.copyFile(upload, file); } catch (IOException e) { error=true; - log.error("Can't copy the file to the checkout directory",e); + if(log.isErrorEnabled()) { + log.error("Can't copy the file to the checkout directory",e); + } return ERROR; } @@ -190,7 +192,9 @@ } catch (SVNException e) { - log.error("Erreur SVN Add",e); + if(log.isErrorEnabled()){ + log.error("Erreur SVN Add",e); + } error=true; //Suppression du repertoire temporaire delTempDirectory(svnSess); @@ -210,14 +214,18 @@ } } catch (SVNAuthenticationException authexep) { - log.error("authentification fail"); + if(log.isErrorEnabled()) { + log.error("authentification fail"); + } badLogin=true; //Suppression du repertoire temporaire delTempDirectory(svnSess); return Action.LOGIN; } catch (SVNException e) { - log.error("Erreur SVN commit",e); + if(log.isErrorEnabled()) { + log.error("Erreur SVN commit",e); + } error=true; //Suppression du repertoire temporaire delTempDirectory(svnSess); @@ -228,8 +236,8 @@ //Suppression du repertoire temporaire delTempDirectory(svnSess); - if(log.isInfoEnabled()) { - log.info("File upload successful"); + if(log.isDebugEnabled()) { + log.debug("File upload successful"); } return SUCCESS; Modified: trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-19 16:05:25 UTC (rev 178) +++ trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-20 08:53:51 UTC (rev 179) @@ -16,7 +16,7 @@ <body> <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <p><s:text name="badPathOrFileName" /></p> -<p><s:text name="scm.formTransferred" /> You should be transferred automatically to the form page. If notplease <a href="<%=request.getAttribute("projectUrl")%>"> +<p><s:text name="scm.formTransferred" /> <a href="<%=request.getAttribute("projectUrl")%>"> <s:text name="scm.clickHere" /></a>.</p> <p>©2004-2009 CodeLutin</p> </body>