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

r189 - trunk/src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org 27 Jul '11

27 Jul '11

Author: kcardineaud Date: 2011-07-27 14:55:22 +0200 (Wed, 27 Jul 2011) New Revision: 189 Url: http://nuiton.org/repositories/revision/scmwebeditor/189 Log: Add close() to a stream and remove some useless instructions Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-27 08:11:22 UTC (rev 188) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-27 12:55:22 UTC (rev 189) @@ -182,80 +182,80 @@ SVNRepository repository = null; try { - repository = SVNRepositoryFactory.create( SVNURL.parseURIEncoded( url ) ); - ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager( login , pw ); - repository.setAuthenticationManager( authManager ); + repository = SVNRepositoryFactory.create( SVNURL.parseURIEncoded( url ) ); + ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager( login , pw ); + repository.setAuthenticationManager( authManager ); + + SVNNodeKind nodeKind = repository.checkPath( file , -1 ); + + + + + if ( nodeKind == SVNNodeKind.NONE ) { + if(log.isErrorEnabled()) { + log.error( "There is no entry at '" + url + "'." ); + } + request.setAttribute("projectUrl", projectUrl); + return "errorPath"; + + } else if ( nodeKind == SVNNodeKind.DIR ) { + if(log.isErrorEnabled()) { + log.error( "The entry at '" + url + "' is a file while a directory was expected." ); + } + request.setAttribute("projectUrl", projectUrl); + if(log.isErrorEnabled()) { + log.error("Error with svn path or file "); + } + return "errorPath"; + } + + + ByteArrayOutputStream baos = new ByteArrayOutputStream( ); + + //On récupere le contenu du fichier, et on le met dans un outputStream + repository.getFile( file , -1 , null , baos ); + + originalText=baos.toString(); + baos.close(); - SVNNodeKind nodeKind = repository.checkPath( file , -1 ); - - - - - if ( nodeKind == SVNNodeKind.NONE ) { - if(log.isErrorEnabled()) { - log.error( "There is no entry at '" + url + "'." ); + } catch (SVNAuthenticationException authexep) { + + request.setAttribute(PARAMETER_ADDRESS, address); + + // if svn authentication failed user is redirected on login page + if(log.isDebugEnabled()) { + log.debug("Private SCM on reading " + svnSess.getRemoteUrl()); } + //redirect to a login page + return Action.LOGIN; + + } catch (SVNException e) { request.setAttribute("projectUrl", projectUrl); - //Suppression du repertoire temporaire - delTempDirectory(svnSess); - return "errorPath"; - } else if ( nodeKind == SVNNodeKind.DIR ) { + if(log.isErrorEnabled()) { - log.error( "The entry at '" + url + "' is a file while a directory was expected." ); + log.error("SVN error ",e); } - request.setAttribute("projectUrl", projectUrl); - //Suppression du repertoire temporaire - delTempDirectory(svnSess); + return "errorPath"; + } catch (IOException e) { if(log.isErrorEnabled()) { - log.error("Error with svn path or file "); + log.error("IO error ",e); } return "errorPath"; - } - + } - ByteArrayOutputStream baos = new ByteArrayOutputStream( ); - - repository.getFile( file , -1 , null , baos ); - - originalText=baos.toString(); - - - } catch (SVNAuthenticationException authexep) { - - request.setAttribute(PARAMETER_ADDRESS, address); - - // if svn authentication failed user is redirected on login page - if(log.isDebugEnabled()) { - log.debug("Private SCM on reading " + svnSess.getRemoteUrl()); - } - //On supprime le repertoire temporaire - delTempDirectory(svnSess); - //redirect to a login page - return Action.LOGIN; - - } catch (SVNException e) { - request.setAttribute("projectUrl", projectUrl); - //Suppression du repertoire temporaire - delTempDirectory(svnSess); - if(log.isErrorEnabled()) { - log.error("SVN error ",e); - } - return "errorPath"; - } - String mimeType =null; - try { - mimeType = getMimeType(originalText, svnSess.getFileName()); - } catch (IOException e) { - if(log.isErrorEnabled()) { - log.error("Can't get MimeType, problem when reading file",e); - } - } + try { + mimeType = getMimeType(originalText, svnSess.getFileName()); + } catch (IOException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, problem when reading file",e); + } + } /* @@ -309,8 +309,6 @@ // Si le fichier n'est pas de type texte, on ne peut pas l'éditer if(mimeType==null || editable==false ) { request.setAttribute("projectUrl", projectUrl); - //On supprime le repertoire temporaire - delTempDirectory(svnSess); if(log.isErrorEnabled()) { log.error("Can't edit this file, mimetype : "+mimeType);

1 0

r188 - in trunk/src/main/java/org/nuiton/scmwebeditor: . actions
by kcardineaud＠users.nuiton.org 27 Jul '11

27 Jul '11

Author: kcardineaud Date: 2011-07-27 10:11:22 +0200 (Wed, 27 Jul 2011) New Revision: 188 Url: http://nuiton.org/repositories/revision/scmwebeditor/188 Log: Fix an issue with temp directory Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.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/UploadAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java 2011-07-25 09:02:54 UTC (rev 187) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SvnSession.java 2011-07-27 08:11:22 UTC (rev 188) @@ -116,12 +116,12 @@ this.projectUrl = projectUrl; this.login = login; this.password = password; +// try { +// this.checkoutdir = FileUtil.createTempDirectory("scm_", ""); +// } catch (IOException e) { +// e.printStackTrace(); +// } try { - this.checkoutdir = FileUtil.createTempDirectory("scm_", ""); - } catch (IOException e) { - e.printStackTrace(); - } - try { this.remoteUrl = SVNURL.parseURIEncoded(svnPath); } catch (SVNException e) { log.debug("SVNSESS NULL"); @@ -137,14 +137,14 @@ * * @throws IOException if any io pb */ - public void cleanCheckoutDir() throws IOException { - FileUtils.deleteDirectory(getCheckoutdir()); - } +// public void cleanCheckoutDir() throws IOException { +// FileUtils.deleteDirectory(getCheckoutdir()); +// } public void updateAuthentication(String login, String password) { setLogin(login); setPassword(password); - setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(getCheckoutdir(), getLogin(), getPassword(), false)); + setAuthManager(SVNWCUtil.createDefaultAuthenticationManager(getLogin(), getPassword())); setManager(SVNClientManager.newInstance(getSvnOption(), getAuthManager())); } @@ -160,6 +160,10 @@ return checkoutdir; } + public void createCheckoutdir() throws IOException { + this.checkoutdir = FileUtil.createTempDirectory("scm_", ""); + } + public void setCheckoutdir(File checkoutdir) { this.checkoutdir = checkoutdir; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-25 09:02:54 UTC (rev 187) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-27 08:11:22 UTC (rev 188) @@ -110,7 +110,16 @@ svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : username, svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + try { + svnSess.createCheckoutdir(); + } catch (IOException e1) { + if(log.isErrorEnabled()) { + log.error("Can't create checkoutDir",e1); + } + return "error"; + } + // Avant le commit, il faut checkout le repertoire try { checkout(svnSess); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 09:02:54 UTC (rev 187) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-27 08:11:22 UTC (rev 188) @@ -13,7 +13,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; -import org.apache.tika.exception.TikaException; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; import org.nuiton.scmwebeditor.SvnSession; import org.tmatesoft.svn.core.SVNAuthenticationException; @@ -24,9 +23,9 @@ import org.tmatesoft.svn.core.io.SVNRepository; import org.tmatesoft.svn.core.io.SVNRepositoryFactory; import org.tmatesoft.svn.core.wc.SVNWCUtil; -import org.xml.sax.SAXException; + import com.opensymphony.xwork2.Action; public class ScmWebEditorMainAction extends ScmWebEditorBaseAction implements ServletRequestAware { @@ -257,8 +256,8 @@ log.error("Can't get MimeType, problem when reading file",e); } } - - + + /* String[] mimeTypes =null; try { @@ -291,8 +290,8 @@ if(log.isErrorEnabled()) { log.error("Can't read properties file", e ); } - editableFiles = new String[1]; - editableFiles[0] = "text"; + editableFiles = new String[1]; + editableFiles[0] = "text"; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-25 09:02:54 UTC (rev 187) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-27 08:11:22 UTC (rev 188) @@ -114,7 +114,17 @@ */ SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + try { + svnSess.createCheckoutdir(); + } catch (IOException e1) { + if(log.isErrorEnabled()) { + log.error("Can't create checkoutDir",e1); + } + error=true; + return "error"; + } + try { if (log.isDebugEnabled()) { log.debug("Do Checkout of " + svnSess.getRemoteUrl());

1 0

r187 - in trunk/src/main/java/org/nuiton/scmwebeditor: . actions
by kcardineaud＠users.nuiton.org 25 Jul '11

25 Jul '11

Author: kcardineaud Date: 2011-07-25 11:02:54 +0200 (Mon, 25 Jul 2011) New Revision: 187 Url: http://nuiton.org/repositories/revision/scmwebeditor/187 Log: Change exception when reading file mimetype Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 08:42:29 UTC (rev 186) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 09:02:54 UTC (rev 187) @@ -238,41 +238,60 @@ protected String getMimeType(File file) throws IOException, SAXException, TikaException { InputStream is = new FileInputStream(file); + String result = null; try { BodyContentHandler contenthandler = new BodyContentHandler(); Metadata metadata = new Metadata(); metadata.set(Metadata.RESOURCE_NAME_KEY, file.getName()); AutoDetectParser parser = new AutoDetectParser(); parser.parse(is, contenthandler, metadata); - String result = metadata.get(Metadata.CONTENT_TYPE); + result = metadata.get(Metadata.CONTENT_TYPE); if(log.isDebugEnabled()) { log.debug("Mine type of " + file.getName() + " is : " + result); + } + + } catch (SAXException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, parsing error",e); } - return result; + } catch (TikaException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, tika error",e); + } } finally { is.close(); } + return result; } - protected String getMimeType(String content, String filename) throws IOException, SAXException, TikaException { + protected String getMimeType(String content, String filename) throws IOException { InputStream is = new ByteArrayInputStream(content.getBytes()); + String result = null; try { BodyContentHandler contenthandler = new BodyContentHandler(); Metadata metadata = new Metadata(); metadata.set(Metadata.RESOURCE_NAME_KEY, filename); AutoDetectParser parser = new AutoDetectParser(); parser.parse(is, contenthandler, metadata); - String result = metadata.get(Metadata.CONTENT_TYPE); + result = metadata.get(Metadata.CONTENT_TYPE); if(log.isDebugEnabled()) { log.debug("Mine type of " + filename + " is : " + result); } - return result; + } catch (SAXException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, parsing error",e); + } + } catch (TikaException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, tika error",e); + } } finally { is.close(); } + return result; } protected String[] getMimeTypes(String content, String filename) throws IOException, SAXException, TikaException { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 08:42:29 UTC (rev 186) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 09:02:54 UTC (rev 187) @@ -13,6 +13,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; +import org.apache.tika.exception.TikaException; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; import org.nuiton.scmwebeditor.SvnSession; import org.tmatesoft.svn.core.SVNAuthenticationException; @@ -23,6 +24,7 @@ import org.tmatesoft.svn.core.io.SVNRepository; import org.tmatesoft.svn.core.io.SVNRepositoryFactory; import org.tmatesoft.svn.core.wc.SVNWCUtil; +import org.xml.sax.SAXException; import com.opensymphony.xwork2.Action; @@ -247,14 +249,16 @@ String mimeType =null; - try { - mimeType = getMimeType(originalText, svnSess.getFileName()); - } catch (Exception e) { - if(log.isErrorEnabled()) { - log.error("Can't get MimeType",e); - } - } + + try { + mimeType = getMimeType(originalText, svnSess.getFileName()); + } catch (IOException e) { + if(log.isErrorEnabled()) { + log.error("Can't get MimeType, problem when reading file",e); + } + } + /* String[] mimeTypes =null; try {

1 0

r186 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions resources/i18n
by kcardineaud＠users.nuiton.org 25 Jul '11

25 Jul '11

Author: kcardineaud Date: 2011-07-25 10:42:29 +0200 (Mon, 25 Jul 2011) New Revision: 186 Url: http://nuiton.org/repositories/revision/scmwebeditor/186 Log: Fix an issue with Exception when reading scm.properties file Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 08:02:49 UTC (rev 185) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 08:42:29 UTC (rev 186) @@ -302,7 +302,7 @@ * @param file le fichier contenant les propriétés * @return un objet Properties contenant les propriétés du fichier */ - public static Properties loadProperties(String file) throws IOException, FileNotFoundException{ + public static Properties loadProperties(String file) throws IOException { Properties properties = new Properties(); FileInputStream input = new FileInputStream(file); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 08:02:49 UTC (rev 185) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 08:42:29 UTC (rev 186) @@ -1,6 +1,7 @@ package org.nuiton.scmwebeditor.actions; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.util.Properties; @@ -272,22 +273,23 @@ Properties properties=null; String[] editableFiles=null; - try{ - // chargement des propriétés - properties = loadProperties("src/main/resources/scm.properties"); - if(log.isDebugEnabled()) { - log.debug("editableFiles: "+ properties.getProperty("editableFiles", "text")); - } - editableFiles=properties.getProperty("editableFiles").split(","); - } - catch(Exception e){ - if(log.isErrorEnabled()) { - log.error("Can't read properties file", e ); - editableFiles = new String[1]; - editableFiles[0] = "text"; - - } - } + + + try { + properties = loadProperties("src/main/resources/scm.properties"); + + if(log.isDebugEnabled()) { + log.debug("editableFiles: "+ properties.getProperty("editableFiles", "text")); + } + editableFiles=properties.getProperty("editableFiles", "text").split(","); + + } catch (IOException e) { + if(log.isErrorEnabled()) { + log.error("Can't read properties file", e ); + } + editableFiles = new String[1]; + editableFiles[0] = "text"; + } boolean editable =false; Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-25 08:02:49 UTC (rev 185) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-25 08:42:29 UTC (rev 186) @@ -30,7 +30,7 @@ scm.reset=Reinitialiser scm.resetTitle=Retour a la derniere revision du fichier scm.saveAndContinue=Sauvegarder et continuer -scm.saveAndContinueTitle=Enregister les modifications sur le depot et continer d''editer le fichier +scm.saveAndContinueTitle=Enregister les modifications sur le depot et continuer d''editer le fichier scm.saveAndQuit=Sauvegarder et quitter scm.saveAndQuitTitle=Sauvegarder le fichier sur le depot et retourner à la page precedente. scm.text=Texte

1 0

r185 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions resources resources/i18n
by kcardineaud＠users.nuiton.org 25 Jul '11

25 Jul '11

Author: kcardineaud Date: 2011-07-25 10:02:49 +0200 (Mon, 25 Jul 2011) New Revision: 185 Url: http://nuiton.org/repositories/revision/scmwebeditor/185 Log: Add a configuration file where can be add compatible file type Added: trunk/src/main/resources/scm.properties Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-22 09:31:15 UTC (rev 184) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 08:02:49 UTC (rev 185) @@ -46,6 +46,7 @@ import java.io.*; import java.net.MalformedURLException; import java.nio.charset.Charset; +import java.util.Properties; /** * User: chemit @@ -295,5 +296,26 @@ } } + /** + * Recuperation des propriétés dans un fichier properties + * + * @param file le fichier contenant les propriétés + * @return un objet Properties contenant les propriétés du fichier + */ + public static Properties loadProperties(String file) throws IOException, FileNotFoundException{ + Properties properties = new Properties(); + + FileInputStream input = new FileInputStream(file); + try{ + properties.load(input); + return properties; + } + + finally{ + input.close(); + } + + } + } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-22 09:31:15 UTC (rev 184) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 08:02:49 UTC (rev 185) @@ -1,6 +1,7 @@ package org.nuiton.scmwebeditor.actions; import java.io.ByteArrayOutputStream; +import java.util.Properties; import javax.servlet.http.HttpServletRequest; @@ -268,9 +269,40 @@ } */ + + Properties properties=null; + String[] editableFiles=null; + try{ + // chargement des propriétés + properties = loadProperties("src/main/resources/scm.properties"); + if(log.isDebugEnabled()) { + log.debug("editableFiles: "+ properties.getProperty("editableFiles", "text")); + } + editableFiles=properties.getProperty("editableFiles").split(","); + } + catch(Exception e){ + if(log.isErrorEnabled()) { + log.error("Can't read properties file", e ); + editableFiles = new String[1]; + editableFiles[0] = "text"; + + } + } + + boolean editable =false; + if(mimeType!=null ) { + for (String fileType : editableFiles){ + if (mimeType.matches(".*"+fileType+".*")) { + editable=true; + } + } + } + + + // Si le fichier n'est pas de type texte, on ne peut pas l'éditer - if(mimeType==null || !mimeType.matches(".*text.*|.*xml.*|.*javascript.*|.*sh.*|.*x-tex.*") ) { + if(mimeType==null || editable==false ) { request.setAttribute("projectUrl", projectUrl); //On supprime le repertoire temporaire delTempDirectory(svnSess); Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-22 09:31:15 UTC (rev 184) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-25 08:02:49 UTC (rev 185) @@ -1,5 +1,5 @@ scm.FileInEditor=File in editor \: -scm.badPathOrFileName=Bad repository path or file name\! Please correct it. +scm.badPathOrFileName=Bad repository path or file name, or the file is not editable \! Please correct it. scm.badUsernameOrPassword=Bad username or password scm.beTransferred=You should be transferred automatically to the new page. If not please scm.clickHere=click here Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-22 09:31:15 UTC (rev 184) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-25 08:02:49 UTC (rev 185) @@ -1,7 +1,7 @@ scm.FileInEditor=Fichier dans l''editeur \: -scm.badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect \! +scm.badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect, ou le fichier n''est pas editable \! scm.badUsernameOrPassword=Identifiant ou mot de passe incorrect -scm.beTransferred=Vous devrais être redirige sur une nouvelle page. si non +scm.beTransferred=Vous devriez etre redirige sur une nouvelle page. si non scm.clickHere=cliquez ici scm.commitMessage=Message associe au commit scm.commitMessageTitle=laisser un message pour le commit @@ -9,7 +9,7 @@ scm.exit=Quitter scm.exitJavascript=Quitter ScmWebEditor sans sauvegarder ? Toutes les modifications serons perdues. scm.exitTitle=Quitter ScmWebEditor sans sauvegarder. -scm.formTransferred=Vous devrais être redirige vers la page du formulaire. si non +scm.formTransferred=Vous devriez etre redirige vers la page du formulaire. si non scm.info.ProblemWithRst=Si vous rencontrez des problemes avec RestruturedText, visitez le scm.info.rstWebsite=site de la documentation RST scm.language=Langage Added: trunk/src/main/resources/scm.properties =================================================================== --- trunk/src/main/resources/scm.properties (rev 0) +++ trunk/src/main/resources/scm.properties 2011-07-25 08:02:49 UTC (rev 185) @@ -0,0 +1 @@ +editableFiles=text,xml,javascript,sh,x-tex,x-java \ No newline at end of file

1 0

r184 - in trunk/src/main/webapp: WEB-INF/content js
by kcardineaud＠users.nuiton.org 22 Jul '11

22 Jul '11

Author: kcardineaud Date: 2011-07-22 11:31:15 +0200 (Fri, 22 Jul 2011) New Revision: 184 Url: http://nuiton.org/repositories/revision/scmwebeditor/184 Log: Add LaTeX to supported file by codemirror Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/js/selectLanguage.js Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-22 09:04:24 UTC (rev 183) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-22 09:31:15 UTC (rev 184) @@ -19,6 +19,8 @@ <script src="codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js" type="text/javascript"></script> <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css"> + + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js"></script> <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css"> @@ -32,6 +34,7 @@ <script src="codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js"></script> <script src="codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js"></script> + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.js"></script>  <script src="codemirror-ui/js/codemirror-ui.js" type="text/javascript"></script> @@ -98,6 +101,7 @@ <option value="xml">XML</option> <option value="text/x-java">JAVA</option> <option value="css">CSS</option> + <option value="stex">LaTeX</option> </select> </label> Modified: trunk/src/main/webapp/js/selectLanguage.js =================================================================== --- trunk/src/main/webapp/js/selectLanguage.js 2011-07-22 09:04:24 UTC (rev 183) +++ trunk/src/main/webapp/js/selectLanguage.js 2011-07-22 09:31:15 UTC (rev 184) @@ -44,13 +44,17 @@ document.getElementById('language').selectedIndex=4 } else if( contains(minetype, "java/application") ) { - typeEditor="xml"; + typeEditor="text/x-java"; document.getElementById('language').selectedIndex=5 } else if(contains(minetype, "text/css") ) { typeEditor="css"; document.getElementById('language').selectedIndex=6 } + else if(contains(minetype, "x-tex") ) { + typeEditor="text/stex"; + document.getElementById('language').selectedIndex=7 + } } if (typeEditor==null && format!=null){ @@ -82,10 +86,15 @@ document.getElementById('language').selectedIndex=5 } else if(format==("css")) { - typeEditor="css"; + typeEditor="css"; - document.getElementById('language').selectedIndex=6 + document.getElementById('language').selectedIndex=6 + } else if(format==("tex")) { + typeEditor="text/stex"; + + document.getElementById('language').selectedIndex=7 + } }

1 0

r183 - in trunk/src/main/java/org/nuiton/scmwebeditor: . actions
by kcardineaud＠users.nuiton.org 22 Jul '11

22 Jul '11

Author: kcardineaud Date: 2011-07-22 11:04:24 +0200 (Fri, 22 Jul 2011) New Revision: 183 Url: http://nuiton.org/repositories/revision/scmwebeditor/183 Log: Add some file's types in compatibility list Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-21 08:19:04 UTC (rev 182) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-22 09:04:24 UTC (rev 183) @@ -235,7 +235,7 @@ } - protected String getMineType(File file) throws IOException, SAXException, TikaException { + protected String getMimeType(File file) throws IOException, SAXException, TikaException { InputStream is = new FileInputStream(file); try { BodyContentHandler contenthandler = new BodyContentHandler(); @@ -254,7 +254,7 @@ } } - protected String getMineType(String content, String filename) throws IOException, SAXException, TikaException { + protected String getMimeType(String content, String filename) throws IOException, SAXException, TikaException { InputStream is = new ByteArrayInputStream(content.getBytes()); try { BodyContentHandler contenthandler = new BodyContentHandler(); @@ -274,4 +274,26 @@ } } + protected String[] getMimeTypes(String content, String filename) throws IOException, SAXException, TikaException { + InputStream is = new ByteArrayInputStream(content.getBytes()); + try { + BodyContentHandler contenthandler = new BodyContentHandler(); + Metadata metadata = new Metadata(); + metadata.set(Metadata.RESOURCE_NAME_KEY, filename); + AutoDetectParser parser = new AutoDetectParser(); + parser.parse(is, contenthandler, metadata); + String[] result = metadata.getValues(Metadata.CONTENT_TYPE); + + if(log.isDebugEnabled()) { + log.debug("Mine type of " + filename + " is : " + result); + } + + return result; + } + finally { + is.close(); + } + } + + } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-21 08:19:04 UTC (rev 182) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-22 09:04:24 UTC (rev 183) @@ -2,6 +2,7 @@ import java.io.ByteArrayOutputStream; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -21,6 +22,7 @@ import org.tmatesoft.svn.core.io.SVNRepositoryFactory; import org.tmatesoft.svn.core.wc.SVNWCUtil; + import com.opensymphony.xwork2.Action; public class ScmWebEditorMainAction extends ScmWebEditorBaseAction implements ServletRequestAware { @@ -123,9 +125,6 @@ HttpSession httpSession = request.getSession(true); - if(log.isInfoEnabled()) { - log.info("IP client : "+request.getRemoteAddr() + " , get file : "+address); - } //SvnSession object creation if doesn't already exist SvnSession svnSess = getSvnSession(httpSession); @@ -204,6 +203,9 @@ request.setAttribute("projectUrl", projectUrl); //Suppression du repertoire temporaire delTempDirectory(svnSess); + if(log.isErrorEnabled()) { + log.error("Error with svn path or file "); + } return "errorPath"; } @@ -232,6 +234,9 @@ request.setAttribute("projectUrl", projectUrl); //Suppression du repertoire temporaire delTempDirectory(svnSess); + if(log.isErrorEnabled()) { + log.error("SVN error ",e); + } return "errorPath"; } @@ -239,26 +244,44 @@ - String mineType =null; + String mimeType =null; try { - mineType = getMineType(originalText, svnSess.getFileName()); + mimeType = getMimeType(originalText, svnSess.getFileName()); } catch (Exception e) { if(log.isErrorEnabled()) { log.error("Can't get MimeType",e); } } + /* + String[] mimeTypes =null; + try { + mimeTypes = getMimeTypes(originalText, svnSess.getFileName()); + + log.info("size : "+mimeTypes.length); + + for (String element : mimeTypes){ + log.info("Type : "+element); + } + } catch (Exception e) { + log.error("tika error",e); + } + */ // Si le fichier n'est pas de type texte, on ne peut pas l'éditer - if(mineType==null || !mineType.matches(".*text.*|.*xml.*|.*javascript.*") ) { + if(mimeType==null || !mimeType.matches(".*text.*|.*xml.*|.*javascript.*|.*sh.*|.*x-tex.*") ) { request.setAttribute("projectUrl", projectUrl); //On supprime le repertoire temporaire delTempDirectory(svnSess); + + if(log.isErrorEnabled()) { + log.error("Can't edit this file, mimetype : "+mimeType); + } return "errorPath"; } else { - request.setAttribute("minetype", mineType); + request.setAttribute("minetype", mimeType); } @@ -277,6 +300,10 @@ request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI()); request.setAttribute(ATTRIBUTE_PREVIEW_SERVLET_URL, request.getContextPath() + "/previewservlet"); + if(log.isInfoEnabled()) { + log.info("IP client : "+request.getRemoteAddr() + " , get file : "+address+ ". File's mimetype : "+mimeType); + } + return "editPage";

1 0

r182 - in trunk: . src/main/resources/i18n src/main/webapp/WEB-INF/content
by kcardineaud＠users.nuiton.org 21 Jul '11

21 Jul '11

Author: kcardineaud Date: 2011-07-21 10:19:04 +0200 (Thu, 21 Jul 2011) New Revision: 182 Url: http://nuiton.org/repositories/revision/scmwebeditor/182 Log: Fix some name in i18n proterties files Modified: trunk/pom.xml trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/pom.xml 2011-07-21 08:19:04 UTC (rev 182) @@ -198,7 +198,7 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> - <i18n.silent>true</i18n.silent> + <i18n.bundleOutputName>scmwebeditor-i18n</i18n.bundleOutputName> <i18n.bundleOutputPackage/> @@ -233,7 +233,7 @@ <artifactId>maven-i18n-plugin</artifactId> <version>${nuitonI18nVersion}</version> <configuration> - <bundles>fr_FR</bundles> + <bundles>fr_FR,en_GB</bundles> </configuration> <executions> <execution> Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-07-21 08:19:04 UTC (rev 182) @@ -1,45 +1,45 @@ -scm.outConnection.search=Search -scm.outConnection.scmPath=SCM path \: -scm.welcome=Welcome on SCMWebEditor -scm.outConnection.noJavascript=Javascript is not activated. Please activate it for a fully use of ScmWebEditor. -scm.outConnection.enterRepo=Please enter your repository address. +scm.FileInEditor=File in editor \: +scm.badPathOrFileName=Bad repository path or file name\! Please correct it. +scm.badUsernameOrPassword=Bad username or password +scm.beTransferred=You should be transferred automatically to the new page. If not please +scm.clickHere=click here +scm.commitMessage=Commit message +scm.commitMessageTitle=let a message for commit +scm.erreurRepo=Error on repository +scm.exit=Exit +scm.exitJavascript=Exit ScmWebEditor without saving ? All modification will be lost. +scm.exitTitle=Exit ScmWebEditor without saving. +scm.formTransferred=You should be transferred automatically to the form page. If not please scm.info.ProblemWithRst=For any Problem with RestruturedText visit scm.info.rstWebsite=RST documentation website scm.language=Language -scm.text=Text +scm.logAs=You are log as \: +scm.loginButton=Login +scm.modificationViewer.betterUseJavascript=For a better use of SCMWebEditor please activate JavaScript. scm.modificationViewer.noJavascript=Javascript is not activated. You can't only use Save and Quit or upload button. -scm.modificationViewer.betterUseJavascript=For a better use of SCMWebEditor please activate JavaScript. -scm.commitMessage=Commit message -scm.username=Username +scm.mustBeLog=You must be login to see this repository. +scm.outConnection.enterRepo=Please enter your repository address. +scm.outConnection.noJavascript=Javascript is not activated. Please activate it for a fully use of ScmWebEditor. +scm.outConnection.scmPath=SCM path \: +scm.outConnection.search=Search scm.password=Password -scm.commitMessageTitle=let a message for commit -scm.FileInEditor=File in editor \: -scm.usernameTitle=Repository username scm.passwordTitle=Repository password -scm.logAs=You are log as \: +scm.preview=Preview +scm.privateScmAccess=You try to access a Private SCM. Please login +scm.redirection=Redirection... +scm.reset=Reset +scm.resetTitle=Go back to the last revision of the file scm.saveAndContinue=Save and Continue Editing scm.saveAndContinueTitle=Commit modifications and continue editing the file. scm.saveAndQuit=Save and quit scm.saveAndQuitTitle=Save this file and go back to previous page. -scm.preview=Preview -scm.reset=Reset -scm.resetTitle=Go back to the last revision of the file -scm.exit=Exit -scm.exitTitle=Exit ScmWebEditor without saving. -scm.exitJavascript=Exit ScmWebEditor without saving ? All modification will be lost. +scm.text=Text +scm.thankUsing=Thank you using SCMWebEditor scm.upload=Upload -scm.uploadTitle=Upload a file on the repository scm.uploadFile=File Url scm.uploadPath=Path on Repository -scm.badUsernameOrPassword=Bad username or password -scm.erreurRepo=Error on repository scm.uploadSuccess=File upload successful -scm.mustBeLog=You must be login to see this repository. -scm.loginButton=Login -scm.privateScmAccess=You try to access a Private SCM. Please login -scm.thankUsing=Thank you using SCMWebEditor -scm.beTransferred=You should be transferred automatically to the new page. If not please -scm.clickHere=click here -scm.redirection=Redirection... -badPathOrFileName=Bad repository path or file name! Please correct it. -scm.formTransferred=You should be transferred automatically to the form page. If not please \ No newline at end of file +scm.uploadTitle=Upload a file on the repository +scm.username=Username +scm.usernameTitle=Repository username +scm.welcome=Welcome on SCMWebEditor Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-21 08:19:04 UTC (rev 182) @@ -1,5 +1,5 @@ -badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect \! scm.FileInEditor=Fichier dans l''editeur \: +scm.badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect \! scm.badUsernameOrPassword=Identifiant ou mot de passe incorrect scm.beTransferred=Vous devrais être redirige sur une nouvelle page. si non scm.clickHere=cliquez ici Modified: trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-20 10:26:16 UTC (rev 181) +++ trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-07-21 08:19:04 UTC (rev 182) @@ -15,7 +15,7 @@ </head> <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.badPathOrFileName" /></p> <p><s:text name="scm.formTransferred" /> <a href="<%=request.getAttribute("projectUrl")%>"> <s:text name="scm.clickHere" /></a>.</p> <p>©2004-2009 CodeLutin</p>

1 0

r181 - in trunk/src/main: resources webapp/WEB-INF/content webapp/js
by kcardineaud＠users.nuiton.org 20 Jul '11

20 Jul '11

Author: kcardineaud Date: 2011-07-20 12:26:16 +0200 (Wed, 20 Jul 2011) New Revision: 181 Url: http://nuiton.org/repositories/revision/scmwebeditor/181 Log: Add CSS to support language Modified: trunk/src/main/resources/log4j.properties trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/js/selectLanguage.js Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2011-07-20 09:49:00 UTC (rev 180) +++ trunk/src/main/resources/log4j.properties 2011-07-20 10:26:16 UTC (rev 181) @@ -25,6 +25,8 @@ #log4j.appender.rolling.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # package level +#log4j.logger.org.nuiton.scmwebeditor.actions=DEBUG + #log4j.logger.org.chorem.jtimer=DEBUG #log4j.logger.org.chorem.jtimer.ws=DEBUG #log4j.logger.org.chorem.jtimer.ui.report=DEBUG Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-20 09:49:00 UTC (rev 180) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-07-20 10:26:16 UTC (rev 181) @@ -97,6 +97,7 @@ <option value="text/html">HTML</option> <option value="xml">XML</option> <option value="text/x-java">JAVA</option> + <option value="css">CSS</option> </select> </label> Modified: trunk/src/main/webapp/js/selectLanguage.js =================================================================== --- trunk/src/main/webapp/js/selectLanguage.js 2011-07-20 09:49:00 UTC (rev 180) +++ trunk/src/main/webapp/js/selectLanguage.js 2011-07-20 10:26:16 UTC (rev 181) @@ -37,33 +37,30 @@ } else if(contains(minetype, "html") ) { typeEditor="text/html"; - - - document.getElementById('language').selectedIndex=3 - - - } + document.getElementById('language').selectedIndex=3 + } else if( contains(minetype, "xml") ) { typeEditor="xml"; - - - document.getElementById('language').selectedIndex=4 - - + document.getElementById('language').selectedIndex=4 } + else if( contains(minetype, "java/application") ) { + typeEditor="xml"; + document.getElementById('language').selectedIndex=5 + } + else if(contains(minetype, "text/css") ) { + typeEditor="css"; + document.getElementById('language').selectedIndex=6 + } } if (typeEditor==null && format!=null){ if (format==("rst")) { - typeEditor="rst"; + typeEditor="rst"; + + document.getElementById('language').selectedIndex=1 - - document.getElementById('language').selectedIndex=1 -// var element = document.getElementById('language'); -// element.value = "rst"; - } else if(format==("javascript")) { typeEditor="javascript"; @@ -84,6 +81,11 @@ document.getElementById('language').selectedIndex=5 + } else if(format==("css")) { + typeEditor="css"; + + document.getElementById('language').selectedIndex=6 + } }

1 0

r180 - trunk/src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org 20 Jul '11

20 Jul '11

Author: kcardineaud Date: 2011-07-20 11:49:00 +0200 (Wed, 20 Jul 2011) New Revision: 180 Url: http://nuiton.org/repositories/revision/scmwebeditor/180 Log: Add logs that give some informations about the user who commit Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-20 08:53:51 UTC (rev 179) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-20 09:49:00 UTC (rev 180) @@ -242,6 +242,11 @@ } //Suppression du repertoire temporaire delTempDirectory(svnSess); + + if(log.isInfoEnabled()) { + log.info(username + " with IP "+request.getRemoteAddr()+" commit the file "+address+" with message : "+commitMessage); + } + return "success"; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-20 08:53:51 UTC (rev 179) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-07-20 09:49:00 UTC (rev 180) @@ -96,7 +96,7 @@ error=false; if(log.isDebugEnabled()) { - log.debug("PictureName : "+uploadFileName); + log.debug("FileName : "+uploadFileName); log.debug("ContentType : "+uploadContentType); } @@ -240,6 +240,9 @@ log.debug("File upload successful"); } + if(log.isInfoEnabled()) { + log.info(username + " with IP "+request.getRemoteAddr()+" add the file "+this.getUploadFileName()+" on the repository."); + } return SUCCESS;

1 0