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

r224 - in trunk/src/main: resources/i18n webapp/WEB-INF/content webapp/css webapp/img webapp/img/accueil webapp/img/editor
by kcardineaud＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: kcardineaud Date: 2011-08-18 15:51:09 +0200 (Thu, 18 Aug 2011) New Revision: 224 Url: http://nuiton.org/repositories/revision/scmwebeditor/224 Log: Add a theme for welcome page Added: trunk/src/main/webapp/img/accueil/ trunk/src/main/webapp/img/accueil/background.png trunk/src/main/webapp/img/accueil/background2.png trunk/src/main/webapp/img/accueil/machine-a-ecrire.png trunk/src/main/webapp/img/accueil/machine-a-ecrire.xcf trunk/src/main/webapp/img/accueil/tache.png trunk/src/main/webapp/img/editor/ trunk/src/main/webapp/img/editor/edit-hover.png trunk/src/main/webapp/img/editor/edit.png trunk/src/main/webapp/img/editor/machine-a-ecrire.png trunk/src/main/webapp/img/editor/post-it.png trunk/src/main/webapp/img/editor/recycle-hover.png trunk/src/main/webapp/img/editor/recycle.png trunk/src/main/webapp/img/editor/save-hover.png trunk/src/main/webapp/img/editor/save.png trunk/src/main/webapp/img/editor/screen-hover.png trunk/src/main/webapp/img/editor/screen.png trunk/src/main/webapp/img/editor/shut-down-hover.png trunk/src/main/webapp/img/editor/shut-down.png Modified: 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/modificationViewer.jsp trunk/src/main/webapp/WEB-INF/content/outConnection.jsp trunk/src/main/webapp/css/main.css Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-08-18 13:48:04 UTC (rev 223) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-08-18 13:51:09 UTC (rev 224) @@ -1,4 +1,5 @@ scm.FileInEditor=File in editor \: +scm.atRevision=at revision 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 Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-08-18 13:48:04 UTC (rev 223) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-08-18 13:51:09 UTC (rev 224) @@ -1,4 +1,5 @@ scm.FileInEditor=Fichier dans l''editeur \: +scm.atRevision=a la revision 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 devriez etre redirige sur une nouvelle page. si non Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-18 13:48:04 UTC (rev 223) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-18 13:51:09 UTC (rev 224) @@ -76,7 +76,7 @@ </head> <body> - <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="ScmWebEditor logo"/></a> + <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img width="150" height="120" src="img/editor/machine-a-ecrire.png" alt="ScmWebEditor logo"/></a> <center> <h2><s:text name="scm.welcome"/></h2> @@ -110,7 +110,7 @@ <p> <s:text name="scm.FileInEditor"/><a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> - at revision <span id="numrevisionDiv"><s:property value="numRevision" /></span> + <s:text name="scm.atRevision"/> <span id="numrevisionDiv"><s:property value="numRevision" /></span> </p> <textarea id="newTextId" rows="50" cols="80" name="newText"><%=valueTextarea%></textarea> @@ -164,7 +164,7 @@ <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> <p> <font color="red"> - Bad username or password + <s:text name="scm.badUsernameOrPassword"/> </font> </p> <%} %> Modified: trunk/src/main/webapp/WEB-INF/content/outConnection.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/outConnection.jsp 2011-08-18 13:48:04 UTC (rev 223) +++ trunk/src/main/webapp/WEB-INF/content/outConnection.jsp 2011-08-18 13:51:09 UTC (rev 224) @@ -40,18 +40,21 @@ <title>SCM Web Editor</title> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> -<center> -<h2><s:text name="scm.welcome"/></h2> -<noscript><h4><s:text name="scm.outConnection.noJavascript"/></h4></noscript> -<h4> -<s:text name="scm.outConnection.enterRepo"/> -</h4> -</center> + +<div id="wrapperConfig"> +<div id="wrapper2Config"> +<div id="titleConfig" > + <h2><s:text name="scm.welcome"/></h2> + <noscript><h4><s:text name="scm.outConnection.noJavascript"/></h4></noscript> + <h4> + <s:text name="scm.outConnection.enterRepo"/> + </h4> +</div> + <form id="configForm" method="get" action="checkout.action"> <center> - <p><label><s:text name="scm.outConnection.scmPath"/> <input TYPE=text name="address" SIZE=100></label> + <p><label><s:text name="scm.outConnection.scmPath"/> <input TYPE=text name="address" SIZE=50></label> <s:url id="ajaxSearch" value="search.action" /> @@ -88,7 +91,9 @@ </div> --> +</div> +</div> +<p align="right">©2004-2011 CodeLutin</p> -<p align="right">©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-08-18 13:48:04 UTC (rev 223) +++ trunk/src/main/webapp/css/main.css 2011-08-18 13:51:09 UTC (rev 224) @@ -26,7 +26,7 @@ font-family: Verdana,Arial,Helvetica,sans-serif; background-color: #b8b1b1; - max-width:70%; + width:1000px; margin:auto; } @@ -74,10 +74,37 @@ float:left; } -#scmButton { - +#wrapperConfig { + background-color:white; + background-image:url("../img/accueil/background2.png"); + background-position:right top; + margin-top:10px; } +#wrapper2Config { + background-image:url("../img/accueil/machine-a-ecrire.png"); + background-repeat:no-repeat; + background-position:-210px 0px; + min-height:500px; +} + +#titleConfig { + width:500px; + margin:auto; + text-align:center; + background-image:url("../img/accueil/tache.png"); + background-repeat:no-repeat; + background-position:right -1px; + padding-top:10px; + padding-right:30px; + padding-left:30px; +} + +#configForm { + padding-top:80px; + padding-left:250px; +} + #loginDiv { margin:auto; width:285px; @@ -108,8 +135,9 @@ border : solid 3px black; } -#search { +#searchTree { margin:auto; display:block; - border : solid 2px black; + border : solid 1px black; + margin-right:15px; } Added: trunk/src/main/webapp/img/accueil/background.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/accueil/background.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/accueil/background2.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/accueil/background2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/accueil/machine-a-ecrire.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/accueil/machine-a-ecrire.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/accueil/machine-a-ecrire.xcf =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/accueil/machine-a-ecrire.xcf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/accueil/tache.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/accueil/tache.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/edit-hover.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/edit-hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/machine-a-ecrire.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/machine-a-ecrire.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/post-it.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/post-it.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/recycle-hover.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/recycle-hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/recycle.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/recycle.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/save-hover.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/save-hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/save.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/screen-hover.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/screen-hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/screen.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/screen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/shut-down-hover.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/shut-down-hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/shut-down.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/shut-down.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r223 - trunk
by kcardineaud＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: kcardineaud Date: 2011-08-18 15:48:04 +0200 (Thu, 18 Aug 2011) New Revision: 223 Url: http://nuiton.org/repositories/revision/scmwebeditor/223 Log: Change some properties in pom.xml Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 13:43:48 UTC (rev 222) +++ trunk/pom.xml 2011-08-18 13:48:04 UTC (rev 223) @@ -255,6 +255,20 @@ </dependency> </dependencies> </plugin> + + + <plugin> + + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + + </plugin> + + + + + </plugins> </pluginManagement> @@ -266,13 +280,8 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - <configuration> - <bundles>fr_FR,en_GB</bundles> - </configuration> <executions> <execution> - <id>scan-java-sources</id> <goals> <goal>parserJava</goal> </goals> @@ -304,24 +313,28 @@ </goals> </execution> </executions> + </plugin> + + + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <webAppConfig> + <contextPath>/${project.artifactId}</contextPath> + </webAppConfig> + + + </configuration> + </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>7.0.1.v20091125</version> - <configuration> - <connectors> - <connector - implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> - <port>10000</port> - </connector> - </connectors> - </configuration> - </plugin> - </plugins> </build>

1 0

r222 - in trunk/src/main/java/org/nuiton/scmwebeditor: . actions
by kcardineaud＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: kcardineaud Date: 2011-08-18 15:43:48 +0200 (Thu, 18 Aug 2011) New Revision: 222 Url: http://nuiton.org/repositories/revision/scmwebeditor/222 Log: Fix an issue when using scmwebeditor with file that is not editable 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-08-18 09:50:14 UTC (rev 221) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-18 13:43:48 UTC (rev 222) @@ -258,7 +258,7 @@ * @throws SVNException * @throws IOException */ - public String getHeadRevision(String address, String login, String password) throws SVNException { + public String getHeadRevision(String address, String login, String password) throws SVNException , IllegalArgumentException { String lastRevision = ""; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-18 09:50:14 UTC (rev 221) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-18 13:43:48 UTC (rev 222) @@ -319,6 +319,13 @@ log.error("SVN error ",e); } return "errorPath"; + } catch (IllegalArgumentException e) { + request.setAttribute("projectUrl", projectUrl); + + if(log.isDebugEnabled()) { + log.debug("SVN error debug",e); + } + return "errorPath"; }

1 0

r221 - in trunk: . src/main/java/org/nuiton/scmwebeditor src/main/java/org/nuiton/scmwebeditor/actions src/main/java/org/nuiton/scmwebeditor/urlResolver src/main/java/org/nuiton/scmwebeditor/urlResolver/impl src/main/resources src/main/webapp/WEB-INF src/main/webapp/WEB-INF/content src/main/webapp/codemirror-ui src/main/webapp/codemirror-ui/css src/main/webapp/codemirror-ui/js src/main/webapp/codemirror-ui/lib/CodeMirror-2.1 src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css src/mai
by tchemit＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: tchemit Date: 2011-08-18 11:50:14 +0200 (Thu, 18 Aug 2011) New Revision: 221 Url: http://nuiton.org/repositories/revision/scmwebeditor/221 Log: add headers + improve pom for release Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/ScmSession.java trunk/src/main/java/org/nuiton/scmwebeditor/ScmUser.java trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.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/SaveAction.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/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolver.java trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolverEngine.java trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverDefaultImpl.java trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverMavenDocImpl.java trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverMavenSiteXmlImpl.java trunk/src/main/resources/log4j.properties trunk/src/main/resources/scm.properties trunk/src/main/resources/struts.properties trunk/src/main/resources/struts.xml trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp trunk/src/main/webapp/WEB-INF/content/error.jsp trunk/src/main/webapp/WEB-INF/content/fileModify.jsp trunk/src/main/webapp/WEB-INF/content/index.jsp trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/WEB-INF/content/outConnection.jsp trunk/src/main/webapp/WEB-INF/content/preview.jsp trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp trunk/src/main/webapp/WEB-INF/content/recall.jsp trunk/src/main/webapp/WEB-INF/content/redirect.jsp trunk/src/main/webapp/WEB-INF/content/reset.jsp trunk/src/main/webapp/WEB-INF/content/save.jsp trunk/src/main/webapp/WEB-INF/content/search.jsp trunk/src/main/webapp/WEB-INF/content/upload.jsp trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp trunk/src/main/webapp/WEB-INF/web.xml trunk/src/main/webapp/codemirror-ui/css/codemirror-ui-find.css trunk/src/main/webapp/codemirror-ui/css/codemirror-ui.css trunk/src/main/webapp/codemirror-ui/index.html trunk/src/main/webapp/codemirror-ui/js/codemirror-ui-find.js trunk/src/main/webapp/codemirror-ui/js/codemirror-ui.js trunk/src/main/webapp/codemirror-ui/js/find_replace.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/compress.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/docs.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/activeline.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/marker.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/mustache.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/resize.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/runmode.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/search.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/theme.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/internals.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/overlay.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/runmode.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/manual.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/haskell.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/lua.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/php.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/plsql.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/python.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/smalltalk.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/oldrelease.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/test.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/default.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/elegant.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/neat.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/night.css trunk/src/main/webapp/css/main.css trunk/src/main/webapp/js/cancelRedirect.js trunk/src/main/webapp/js/gereSession.js trunk/src/main/webapp/js/pictureUpload.js trunk/src/main/webapp/js/selectLanguage.js trunk/src/site/en/rst/index.rst trunk/src/site/en/rst/install.rst trunk/src/site/en/rst/tutoriel.rst trunk/src/site/en/rst/user.rst trunk/src/site/rst/index.rst trunk/src/site/rst/install.rst trunk/src/site/rst/tutoriel.rst trunk/src/site/rst/user.rst trunk/src/test/java/org/nuiton/scmwebeditor/BaseActionTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/pom.xml 2011-08-18 09:50:14 UTC (rev 221) @@ -1,5 +1,7 @@ <?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -24,6 +26,11 @@ </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId>  @@ -48,16 +55,23 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>jrst</artifactId> - <version>1.4-SNAPSHOT</version> + <version>${jrstPluginVersion}</version> <scope>compile</scope> <exclusions> <exclusion> - <groupId>net.sourceforge.saxon</groupId> - <artifactId>saxon</artifactId> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> </exclusion> - </exclusions> + </exclusions> </dependency> <dependency> @@ -67,29 +81,29 @@ <scope>compile</scope> </dependency> - <dependency> +  + + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + <version>0.9</version> </dependency> + <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - <version>0.9</version> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>provided</scope> </dependency> +  - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - <scope>compile</scope> - </dependency> - -  - - <dependency> + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts2Version}</version> @@ -107,26 +121,27 @@ <artifactId>struts2-jquery-plugin</artifactId> <version>${struts2jqueryVersion}</version> <scope>runtime</scope> - </dependency> + </dependency> <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-tree-plugin</artifactId> - <version>${struts2jqueryVersion}</version> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-tree-plugin</artifactId> + <version>${struts2jqueryVersion}</version> </dependency> - + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>${strutsxworksVersion}</version> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-json-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> - + <version>${struts2Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <version>${struts2Version}</version> + <scope>runtime</scope> + </dependency> + </dependencies>  @@ -190,31 +205,33 @@  <siteLocales>fr,en</siteLocales> + <struts2Version>2.2.3</struts2Version> <struts2jqueryVersion>3.1.0</struts2jqueryVersion> - <strutsxworksVersion>2.2.3</strutsxworksVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - - + <nuitonUtilsVersion>2.2</nuitonUtilsVersion> + <jrstPluginVersion>1.4-SNAPSHOT</jrstPluginVersion> +  + <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> - - + + <i18n.bundleOutputName>scmwebeditor-i18n</i18n.bundleOutputName> <i18n.bundleOutputPackage/>  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + <redmine.releaseFiles> + target/${project.artifactId}-${project.version}.war + </redmine.releaseFiles> - +  </properties> + <build> - - <build> - <resources> <resource> <directory>src/main/resources</directory> @@ -224,7 +241,7 @@ <filtering>true</filtering> </resource> </resources> - + <pluginManagement> <plugins> @@ -235,7 +252,7 @@ <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> <version>1.4-SNAPSHOT</version> - </dependency> + </dependency> </dependencies> </plugin> </plugins> @@ -244,9 +261,9 @@ <plugins> - + <plugin> - + <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> <version>${nuitonI18nVersion}</version> @@ -271,8 +288,10 @@ </userRulesFiles> <namespaces> <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx> - <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sj> + <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd + </sx> + <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd + </sj> <jsp>http://java.sun.com/JSP/Page</jsp> </namespaces> </configuration> @@ -286,30 +305,33 @@ </execution> </executions> </plugin> - - - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>7.0.1.v20091125</version> - <configuration> - <connectors> - <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> - <port>10000</port> - </connector> - </connectors> - </configuration> - </plugin> - - </plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>7.0.1.v20091125</version> + <configuration> + <connectors> + <connector + implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> + <port>10000</port> + </connector> + </connectors> + </configuration> + </plugin> + + + </plugins> + </build>  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk</developerConnection> + <connection>scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk + </connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/scmwebeditor/trunk + </developerConnection> <url>http://www.nuiton.org/repositories/browse/scmwebeditor/trunk</url> </scm> @@ -329,7 +351,6 @@ <plugins> - </plugins> </build> </profile> Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmSession.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmSession.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmSession.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor; import java.util.HashMap; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmUser.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmUser.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmUser.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor; public class ScmUser { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorApplicationListener.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor; import javax.servlet.ServletContextEvent; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.actions; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.actions; import org.apache.commons.logging.Log; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.actions; import java.util.Date; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.actions; import java.io.ByteArrayOutputStream; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.actions; import java.io.IOException; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.actions; import java.util.ArrayList; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.actions; import java.io.File; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolver.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolver.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolver.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.urlResolver; import java.io.IOException; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolverEngine.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolverEngine.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/ScmUrlResolverEngine.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.urlResolver; import java.io.IOException; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverDefaultImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverDefaultImpl.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverDefaultImpl.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.urlResolver.impl; import java.io.IOException; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverMavenDocImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverMavenDocImpl.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverMavenDocImpl.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.urlResolver.impl; import java.io.IOException; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverMavenSiteXmlImpl.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverMavenSiteXmlImpl.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/java/org/nuiton/scmwebeditor/urlResolver/impl/ScmUrlResolverMavenSiteXmlImpl.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor.urlResolver.impl; import java.io.IOException; Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/resources/log4j.properties 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +### +# #%L +# ScmWebEditor +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2011 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>. +# #L% +### # Global logging configuration log4j.rootLogger=INFO, stdout Modified: trunk/src/main/resources/scm.properties =================================================================== --- trunk/src/main/resources/scm.properties 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/resources/scm.properties 2011-08-18 09:50:14 UTC (rev 221) @@ -1 +1,25 @@ +### +# #%L +# ScmWebEditor +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2011 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>. +# #L% +### editableFiles=text,xml,javascript,sh,x-tex,x-java \ No newline at end of file Modified: trunk/src/main/resources/struts.properties =================================================================== --- trunk/src/main/resources/struts.properties 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/resources/struts.properties 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +### +# #%L +# ScmWebEditor +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2011 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>. +# #L% +### struts.locale=fr_FR struts.i18n.encoding=UTF-8 Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/resources/struts.xml 2011-08-18 09:50:14 UTC (rev 221) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" Modified: trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/badFileRedirect.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%-- Document : BadFileRedirect Created on : 6 oct. 2009, 15:33:56 Author : glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> Modified: trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags"%> Modified: trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/badUseRedirect.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%-- Document : BadFileRedirect Created on : 6 oct. 2009, 15:33:56 Author : glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> Modified: trunk/src/main/webapp/WEB-INF/content/error.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/error.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/error.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%-- Document : Error Created on : 15 sept. 2009, 12:22:29 Author : glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags"%> Modified: trunk/src/main/webapp/WEB-INF/content/fileModify.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/fileModify.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/fileModify.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags"%> Modified: trunk/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/index.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/index.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <% response.sendRedirect("checkout.action"); %> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/loginSearch.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="java.util.Map"%> Modified: trunk/src/main/webapp/WEB-INF/content/outConnection.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/outConnection.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/outConnection.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%-- Document : OutConnection Created on : 6 oct. 2009, 12:07:27 Author: glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags"%> Modified: trunk/src/main/webapp/WEB-INF/content/preview.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/preview.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/preview.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%@ taglib prefix="s" uri="/struts-tags"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%--Title and div for rst preview--%> Modified: trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/privateSvnRedirect.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%-- Document : PrivateSvnRedirect Created on : 30 sept. 2009, 14:05:43 Author : glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> Modified: trunk/src/main/webapp/WEB-INF/content/recall.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/recall.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/recall.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%-- Document : Recall Created on : 30 sept. 2009, 17:05:40 Author : glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags"%> Modified: trunk/src/main/webapp/WEB-INF/content/redirect.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/redirect.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/redirect.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%-- Document : Redirect Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags"%> Modified: trunk/src/main/webapp/WEB-INF/content/reset.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/reset.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/reset.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%@ taglib prefix="s" uri="/struts-tags"%> <s:set name="lastRevision"> Modified: trunk/src/main/webapp/WEB-INF/content/save.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%@ taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> Modified: trunk/src/main/webapp/WEB-INF/content/search.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/search.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/search.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="org.nuiton.scmwebeditor.actions.SearchAction"%> Modified: trunk/src/main/webapp/WEB-INF/content/upload.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/upload.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/upload.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%@ taglib prefix="s" uri="/struts-tags"%> Modified: trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@page import="org.nuiton.scmwebeditor.ScmSession"%> Modified: trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +<%-- + #%L + ScmWebEditor + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2011 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>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags"%> Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/WEB-INF/web.xml 2011-08-18 09:50:14 UTC (rev 221) @@ -1,4 +1,29 @@ <?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"> Modified: trunk/src/main/webapp/codemirror-ui/css/codemirror-ui-find.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/css/codemirror-ui-find.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/css/codemirror-ui-find.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ #buttons{ float:right; } Modified: trunk/src/main/webapp/codemirror-ui/css/codemirror-ui.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/css/codemirror-ui.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/css/codemirror-ui.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ .codemirror-ui-button-frame{ border:1px solid #ccc; background:#eee; Modified: trunk/src/main/webapp/codemirror-ui/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> Modified: trunk/src/main/webapp/codemirror-ui/js/codemirror-ui-find.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/js/codemirror-ui-find.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/js/codemirror-ui-find.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ /** * @author jgreen */ Modified: trunk/src/main/webapp/codemirror-ui/js/codemirror-ui.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/js/codemirror-ui.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/js/codemirror-ui.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ /* Demonstration of embedding CodeMirror in a bigger application. The * interface defined here is a mess of prompts and confirms, and * should probably not be used in a real project. Modified: trunk/src/main/webapp/codemirror-ui/js/find_replace.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/js/find_replace.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/js/find_replace.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/compress.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/compress.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/compress.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/docs.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/docs.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/docs.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ body { font-family: Droid Sans, Arial, sans-serif; line-height: 1.5; Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/activeline.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/activeline.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/activeline.html 2011-08-18 09:50:14 UTC (rev 221) @@ -18,6 +18,31 @@ <form><textarea id="code" name="code"> <?xml version="1.0" encoding="UTF-8"?> + + <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com"> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ (function () { // Minimal event-handling wrapper. function stopEvent() { Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/marker.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/marker.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/marker.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/mustache.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/mustache.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/mustache.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/resize.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/resize.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/resize.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/runmode.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/runmode.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/runmode.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/search.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/search.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/search.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/theme.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/theme.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/theme.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/internals.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/internals.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/internals.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ .CodeMirror { line-height: 1em; font-family: monospace; Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ // All functions that need access to the editor's state live inside // the CodeMirror function. Below that, at the bottom of the file, // some utilities are defined. Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/overlay.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/overlay.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/overlay.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ // Utility function that allows modes to be combined. The mode given // as the base argument takes care of most of the normal mode // functionality, but a second (typically simple) mode is used, which Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/runmode.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/runmode.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/runmode.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.runMode = function(string, modespec, callback) { var mode = CodeMirror.getMode({indentUnit: 2}, modespec); var isNode = callback.nodeType == 1; Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/manual.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/manual.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/manual.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ span.c-like-keyword {color: #90b;} span.c-like-number {color: #291;} span.c-like-comment {color: #a70;} Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode("clike", function(config, parserConfig) { var indentUnit = config.indentUnit, keywords = parserConfig.keywords, cpp = parserConfig.useCPP, multiLineStrings = parserConfig.multiLineStrings, Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode("css", function(config) { var indentUnit = config.indentUnit, type; function ret(style, tp) {type = tp; return style;} Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ .cm-s-default span.cm-rangeinfo {color: #a0b;} .cm-s-default span.cm-minus {color: #a22;} .cm-s-default span.cm-plus {color: #2b2;} Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode("diff", function() { return { token: function(stream) { Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/haskell.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/haskell.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/haskell.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode("haskell", function(cmCfg, modeCfg) { function switchState(source, setState, f) { Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) { var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true}); var jsMode = CodeMirror.getMode(config, "javascript"); Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode("javascript", function(config, parserConfig) { var indentUnit = config.indentUnit; var jsonMode = parserConfig.json; Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/lua.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/lua.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/lua.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ // LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's // CodeMirror 1 mode. // highlights keywords, strings, comments (no leveling supported! ("[==[")), tokens, basic indenting Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/php.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/php.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/php.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ (function() { function keywords(str) { var obj = {}, words = str.split(" "); Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/plsql.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/plsql.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/plsql.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode("plsql", function(config, parserConfig) { var indentUnit = config.indentUnit, keywords = parserConfig.keywords, Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/python.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/python.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/python.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode("python", function(conf) { var ERRORCLASS = 'error'; Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ .cm-s-default span.cm-emphasis { font-style: italic; } Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode('rst', function(config, options) { function setState(state, fn, ctx) { state.fn = fn; Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/smalltalk.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/smalltalk.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/smalltalk.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode("smalltalk", function(config, parserConfig) { var keywords = {"true": 1, "false": 1, nil: 1, self: 1, "super": 1, thisContext: 1}; var indentUnit = config.indentUnit; Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,4 +1,28 @@ /* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ +/* * Author: Constantin Jucovschi (c.jucovschi(a)jacobs-university.de) * Licence: MIT */ Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ CodeMirror.defineMode("xml", function(config, parserConfig) { var indentUnit = config.indentUnit; var Kludges = parserConfig.htmlMode ? { Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/oldrelease.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/oldrelease.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/oldrelease.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/index.html 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/index.html 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/test.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/test.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/test.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ var tests = []; test("fromTextArea", function() { Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/default.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/default.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/default.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ .cm-s-default span.cm-keyword {color: #708;} .cm-s-default span.cm-atom {color: #219;} .cm-s-default span.cm-number {color: #164;} Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/elegant.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/elegant.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/elegant.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ .cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;} .cm-s-elegant span.cm-comment {color: #262;font-style: italic;} .cm-s-elegant span.cm-meta {color: #555;font-style: italic;} Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/neat.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/neat.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/neat.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ .cm-s-neat span.cm-comment { color: #a86; } .cm-s-neat span.cm-keyword { font-weight: bold; color: blue; } .cm-s-neat span.cm-string { color: #a22; } Modified: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/night.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/night.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/night.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ /* Loosely based on the Midnight Textmate theme */ .cm-s-night { background: #0a001f; color: #f8f8f8; } Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/css/main.css 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ body { font-family: Verdana,Arial,Helvetica,sans-serif; Modified: trunk/src/main/webapp/js/cancelRedirect.js =================================================================== --- trunk/src/main/webapp/js/cancelRedirect.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/js/cancelRedirect.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ /** * @author geoffroy lorieux */ Modified: trunk/src/main/webapp/js/gereSession.js =================================================================== --- trunk/src/main/webapp/js/gereSession.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/js/gereSession.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ /** * @author geoffroy lorieux */ Modified: trunk/src/main/webapp/js/pictureUpload.js =================================================================== --- trunk/src/main/webapp/js/pictureUpload.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/js/pictureUpload.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ function upload_popup(page, name, fileAddress) { var address = fileAddress.value; Modified: trunk/src/main/webapp/js/selectLanguage.js =================================================================== --- trunk/src/main/webapp/js/selectLanguage.js 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/main/webapp/js/selectLanguage.js 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ /** * */ Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/site/en/rst/index.rst 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * ScmWebEditor +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2011 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>. +.. * #L% +.. - Presentation ============ Modified: trunk/src/site/en/rst/install.rst =================================================================== --- trunk/src/site/en/rst/install.rst 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/site/en/rst/install.rst 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * ScmWebEditor +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2011 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>. +.. * #L% +.. - Installation Guide ================== Modified: trunk/src/site/en/rst/tutoriel.rst =================================================================== --- trunk/src/site/en/rst/tutoriel.rst 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/site/en/rst/tutoriel.rst 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * ScmWebEditor +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2011 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>. +.. * #L% +.. - Tutoriel ======== Modified: trunk/src/site/en/rst/user.rst =================================================================== --- trunk/src/site/en/rst/user.rst 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/site/en/rst/user.rst 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * ScmWebEditor +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2011 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>. +.. * #L% +.. - User documentation ================== Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/site/rst/index.rst 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * ScmWebEditor +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2011 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>. +.. * #L% +.. - Présentation ============ Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/site/rst/install.rst 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * ScmWebEditor +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2011 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>. +.. * #L% +.. - Installation ============ Modified: trunk/src/site/rst/tutoriel.rst =================================================================== --- trunk/src/site/rst/tutoriel.rst 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/site/rst/tutoriel.rst 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * ScmWebEditor +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2011 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>. +.. * #L% +.. - Tutoriel ======== Modified: trunk/src/site/rst/user.rst =================================================================== --- trunk/src/site/rst/user.rst 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/site/rst/user.rst 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * ScmWebEditor +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2011 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>. +.. * #L% +.. - Documentation utilisateur ========================= Modified: trunk/src/test/java/org/nuiton/scmwebeditor/BaseActionTest.java =================================================================== --- trunk/src/test/java/org/nuiton/scmwebeditor/BaseActionTest.java 2011-08-18 09:05:32 UTC (rev 220) +++ trunk/src/test/java/org/nuiton/scmwebeditor/BaseActionTest.java 2011-08-18 09:50:14 UTC (rev 221) @@ -1,3 +1,27 @@ +/* + * #%L + * ScmWebEditor + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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>. + * #L% + */ package org.nuiton.scmwebeditor; import static org.junit.Assert.assertTrue;

1 0

r220 - trunk/src/main/webapp/WEB-INF/content
by kcardineaud＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: kcardineaud Date: 2011-08-18 11:05:32 +0200 (Thu, 18 Aug 2011) New Revision: 220 Url: http://nuiton.org/repositories/revision/scmwebeditor/220 Log: #261 Improve user interface - enlarge textarea for commit message Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-18 06:17:53 UTC (rev 219) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-18 09:05:32 UTC (rev 220) @@ -153,8 +153,7 @@ <s:text name="scm.commitMessageTitle"/> </s:set> - <s:textfield required="true" label="%{scm.commitMessage} " name="commitMessage" title="%{scm.commitMessageTitle}" /> - + <s:textarea cols="70" required="true" label="%{scm.commitMessage} " name="commitMessage" title="%{scm.commitMessageTitle}" ></s:textarea> <p> <s:if test="username==null || pw==null" >

1 0

r219 - trunk/src/license
by tchemit＠users.nuiton.org 18 Aug '11

18 Aug '11

Author: tchemit Date: 2011-08-18 08:17:53 +0200 (Thu, 18 Aug 2011) New Revision: 219 Url: http://nuiton.org/repositories/revision/scmwebeditor/219 Log: add third-parties Added: trunk/src/license/THIRD-PARTY.properties Added: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/src/license/THIRD-PARTY.properties 2011-08-18 06:17:53 UTC (rev 219) @@ -0,0 +1,44 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - BSD licence +# - BSD-style license +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - GPL +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - JDom license (Apache-like) +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - Lesser General Public License v2.1 +# - MIT License +# - Mozilla Public License 1.1 (MPL 1.1) +# - Mozilla Public License version 1.1 +# - The Apache Software License, Version 1.1 +# - The Apache Software License, Version 2.0 +# - http://asm.ow2.org/license.html +# - http://source.icu-project.org/repos/icu/icu/trunk/license.html +# - http://sqljet.com/ +# - http://svnkit.com/license.html +# - http://www.trilead.com/Products/Trilead_SSH_for_Java/License/ +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Aug 18 08:16:13 CEST 2011 +asm--asm--3.1=http\://asm.ow2.org/license.html +asm--asm-commons--3.1=http\://asm.ow2.org/license.html +asm--asm-tree--3.1=http\://asm.ow2.org/license.html +com.ibm.icu--icu4j--2.6.1=http\://source.icu-project.org/repos/icu/icu/trunk/license.html +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.11.0.GA=Lesser General Public License v2.1 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jaxen--jaxen--1.1.1=The Apache Software License, Version 2.0 +jdom--jdom--1.0=JDom license (Apache-like) +net.java.dev.jna--jna--3.2.3=The Apache Software License, Version 2.0 +org.antlr--antlr-runtime--3.1.3=BSD License +oro--oro--2.0.8=The Apache Software License, Version 2.0 +xerces--xercesImpl--2.6.2=The Apache Software License, Version 2.0 Property changes on: trunk/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r218 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions resources resources/i18n webapp/WEB-INF/content webapp/css
by kcardineaud＠users.nuiton.org 17 Aug '11

17 Aug '11

Author: kcardineaud Date: 2011-08-17 18:00:44 +0200 (Wed, 17 Aug 2011) New Revision: 218 Url: http://nuiton.org/repositories/revision/scmwebeditor/218 Log: Add a conflits detection system when commit Added: trunk/src/main/webapp/WEB-INF/content/fileModify.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.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/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties trunk/src/main/resources/struts.xml trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/WEB-INF/content/reset.jsp trunk/src/main/webapp/WEB-INF/content/save.jsp trunk/src/main/webapp/css/main.css Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-17 16:00:44 UTC (rev 218) @@ -37,12 +37,17 @@ import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNNodeKind; +import org.tmatesoft.svn.core.SVNProperties; +import org.tmatesoft.svn.core.SVNProperty; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; +import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions; import org.tmatesoft.svn.core.io.SVNRepository; import org.tmatesoft.svn.core.io.SVNRepositoryFactory; +import org.tmatesoft.svn.core.wc.SVNInfo; import org.tmatesoft.svn.core.wc.SVNRevision; import org.tmatesoft.svn.core.wc.SVNUpdateClient; +import org.tmatesoft.svn.core.wc.SVNWCClient; import org.tmatesoft.svn.core.wc.SVNWCUtil; import org.xml.sax.SAXException; @@ -202,19 +207,48 @@ * @param checkoutdir * @throws SVNException */ - public void checkout(SvnConnection svnSess, File checkoutdir) throws SVNException { - + public void checkout(SvnConnection svnSess, File checkoutdir , String numVersion) throws SVNException { + SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); - if (log.isDebugEnabled()) { + if (log.isDebugEnabled()) { log.debug("Do Checkout of " + svnSess.getRemoteUrl()); } - upclient.doCheckout(svnSess.getRemoteUrl(), checkoutdir, - SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + try { + upclient.doCheckout(svnSess.getRemoteUrl(), checkoutdir, + SVNRevision.create(Long.parseLong(numVersion)), SVNRevision.create(Long.parseLong(numVersion)), SVNDepth.FILES, false); + } + catch (NumberFormatException e) { + if(log.isErrorEnabled()) { + log.error("The number version is not valid."); + } + upclient.doCheckout(svnSess.getRemoteUrl(), checkoutdir, + SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + + } + } + /** + * + * @param svnSess + * @param checkoutdir + * @throws SVNException + */ + public void checkout(SvnConnection svnSess, File checkoutdir) throws SVNException { + + SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + + if (log.isDebugEnabled()) { + log.debug("Do Checkout of " + svnSess.getRemoteUrl()); + } + + upclient.doCheckout(svnSess.getRemoteUrl(), checkoutdir, + SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + } + /** * * @param svnFile @@ -282,8 +316,13 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream( ); - repository.getFile( file , -1 , null , baos ); + SVNProperties fileProperties = new SVNProperties(); + + repository.getFile( file , -1 , fileProperties , baos ); + fileProperties.getStringValue(SVNProperty.REVISION); + + lastRevision = baos.toString(); try { @@ -298,6 +337,42 @@ } + + public String getHeadNumberRevision(String address, String login, String password) throws SVNException { + + ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager( login , password ); + + DefaultSVNOptions svnOption = new DefaultSVNOptions(); + svnOption.setPropertyValue(SVNProperty.EOL_STYLE, SVNProperty.EOL_STYLE_LF); + + SVNWCClient wcClient = new SVNWCClient(authManager,svnOption); + + SVNInfo info = wcClient.doInfo(SVNURL.parseURIEncoded(address), SVNRevision.HEAD, SVNRevision.HEAD); + + String headRevision = info.getRevision().toString(); + + + return headRevision; + } + + public String getHeadcommiter(String address, String login, String password) throws SVNException { + + ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager( login , password ); + + DefaultSVNOptions svnOption = new DefaultSVNOptions(); + svnOption.setPropertyValue(SVNProperty.EOL_STYLE, SVNProperty.EOL_STYLE_LF); + + SVNWCClient wcClient = new SVNWCClient(authManager,svnOption); + + SVNInfo info = wcClient.doInfo(SVNURL.parseURIEncoded(address), SVNRevision.HEAD, SVNRevision.HEAD); + + String headAuthor = info.getAuthor(); + + + return headAuthor; + } + + /** * Use to delete the checkout temp directory * @param checkoutdir The dir temp directory Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java 2011-08-17 16:00:44 UTC (rev 218) @@ -24,9 +24,11 @@ */ package org.nuiton.scmwebeditor; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; +import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNProperty; import org.tmatesoft.svn.core.SVNURL; @@ -35,8 +37,11 @@ import org.tmatesoft.svn.core.io.SVNRepository; import org.tmatesoft.svn.core.io.SVNRepositoryFactory; import org.tmatesoft.svn.core.wc.SVNClientManager; +import org.tmatesoft.svn.core.wc.SVNDiffClient; +import org.tmatesoft.svn.core.wc.SVNRevision; import org.tmatesoft.svn.core.wc.SVNWCUtil; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -166,8 +171,58 @@ } + + + public boolean isDifferent(String text) throws IOException { + File pathToFile = new File(checkoutdir, getFileName()); + SVNDiffClient diffClient = new SVNDiffClient(getManager(), getSvnOption()); + + FileUtils.writeStringToFile(pathToFile, text); + + ByteArrayOutputStream diff = new ByteArrayOutputStream(); + + try { + diffClient.doDiff(pathToFile, SVNRevision.UNDEFINED, SVNRevision.WORKING, SVNRevision.HEAD, SVNDepth.INFINITY, true, diff, null); + } catch (SVNException e) { + log.error("Diff fail",e); + return false; + } + if(diff.size()>0) { + return true; + } + else { + return false; + } + + + } + + public ByteArrayOutputStream getDiff(String text) throws IOException { + File pathToFile = new File(checkoutdir, getFileName()); + + SVNDiffClient diffClient = new SVNDiffClient(getManager(), getSvnOption()); + + FileUtils.writeStringToFile(pathToFile, text); + + ByteArrayOutputStream diff = new ByteArrayOutputStream(); + + try { + diffClient.doDiff(pathToFile, SVNRevision.UNDEFINED, SVNRevision.WORKING, SVNRevision.HEAD, SVNDepth.INFINITY, true, diff, null); + } catch (SVNException e) { + log.error("Diff fail",e); + } + + + return diff; + + + + } + + + public ISVNAuthenticationManager getAuthManager() { return authManager; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ResetAction.java 2011-08-17 16:00:44 UTC (rev 218) @@ -17,6 +17,8 @@ protected String lastRevision; + protected String numRevision; + protected String address; protected String username; @@ -30,6 +32,10 @@ return lastRevision; } + public String getNumRevision() { + return numRevision; + } + public void setAddress(String address) { this.address = address; } @@ -54,6 +60,9 @@ lastRevision = getHeadRevision(address, username, pw); + numRevision=getHeadNumberRevision(address, username, pw); + + } catch (SVNAuthenticationException authexep) { if(log.isErrorEnabled()) { log.error("AUTH FAIL"); @@ -65,6 +74,7 @@ log.error("Can't reach the svn repository"); } error = "errorPath"; + numRevision=null; return "errorPath"; } catch (StringIndexOutOfBoundsException e) { if(log.isErrorEnabled()) { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-17 16:00:44 UTC (rev 218) @@ -1,5 +1,6 @@ package org.nuiton.scmwebeditor.actions; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -14,13 +15,13 @@ import org.nuiton.jrst.JRST; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; import org.nuiton.scmwebeditor.SvnConnection; -import org.nuiton.util.FileUtil; import org.tmatesoft.svn.core.SVNAuthenticationException; import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.wc.SVNCommitClient; + import com.opensymphony.xwork2.Action; @@ -42,9 +43,14 @@ protected String lastText; protected String format; protected String projectUrl; + protected String diff; + protected String headCommiter; + protected boolean force; + protected String numRevision; + @@ -129,7 +135,22 @@ } + public String getNumRevision() { + return numRevision; + } + public void setNumRevision(String numRevision) { + this.numRevision = numRevision; + } + + public String getDiff() { + return diff; + } + + public String getHeadCommiter() { + return headCommiter; + } + protected boolean isRstValid(String newText) { try { JRST.generate(JRST.TYPE_HTML, newText); @@ -182,8 +203,6 @@ repositoryUUID=address; } - log.info("username : |"+login+"|"); - if( ( login==null || login.equals("") ) && ( password==null || password.equals("") ) ) { if(getScmSession().getUsername(repositoryUUID)!=null && getScmSession().getPassword(repositoryUUID)!=null) { //On recupère les identifiants en session @@ -204,13 +223,14 @@ File checkoutdir = null; try { - checkoutdir = FileUtil.createTempDirectory("scm_", ""); + svnConn.createCheckoutdir(); } catch (IOException e1) { if(log.isErrorEnabled()) { log.error("Can't create checkoutDir",e1); } return "error"; } + checkoutdir = svnConn.getCheckoutdir(); // Avant le commit, il faut checkout le repertoire @@ -253,7 +273,6 @@ request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(originalText)); - // End on first part } catch (FileNotFoundException ee) { /* fichier non trouve, on redirige vers BadFileRedirect.jsp @@ -268,24 +287,54 @@ + + /* + * Diff + */ + if(!force) { + try { + + if(svnConn.isDifferent(origText)) { + ByteArrayOutputStream differents = svnConn.getDiff(newText); + + if(differents.size()>0) { + diff=differents.toString(); + diff = diff.substring(diff.indexOf("@@")); + delTempDirectory(checkoutdir); + try { + headCommiter=getHeadcommiter(address, login, password); + } catch (SVNException e) { + log.error("Can't get head commiter",e); + } + return "fileModify"; + } + } + + } catch (IOException e) { + if(log.isErrorEnabled()) { + log.error("Can't do diff on file, IO error",e); + } + } + } + + + /* * Commit process */ - File pathToFile = new File(checkoutdir, svnConn.getFileName()); +// File pathToFile = new File(checkoutdir, svnConn.getFileName()); SVNCommitClient commitClient = new SVNCommitClient(svnConn.getManager(), svnConn.getSvnOption()); + + File pathToFile = new File(checkoutdir, svnConn.getFileName()); + try { FileUtils.writeStringToFile(pathToFile, newText); - } catch (IOException e) { - if(log.isErrorEnabled()) { - log.error("Can't write in file " , e); - } + } catch (IOException e1) { + delTempDirectory(checkoutdir); return "error"; } - - convertToUnicode(pathToFile); - File[] tabFile = new File[1]; tabFile[0] = pathToFile; @@ -339,6 +388,12 @@ log.info(login + " with IP "+request.getRemoteAddr()+" commit the file "+address+" with message : "+commitMessage); } + try { + numRevision=getHeadNumberRevision(address, login, password); + } catch (SVNException e) { + numRevision=null; + } + return "success"; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-17 16:00:44 UTC (rev 218) @@ -34,6 +34,11 @@ protected String address; protected String projectUrl; protected String format; + protected String origText; + + + protected String numRevision; + protected String addressSvn; @@ -106,10 +111,18 @@ } + public String getOrigText() { + return origText; + } + + public String getProjectUrl() { return projectUrl; } + public String getNumRevision() { + return numRevision; + } public void setProjectUrl(String projectUrl) { this.projectUrl = projectUrl; @@ -120,6 +133,8 @@ this.fromLoginPage = fromLoginPage; } + + /** * On test si les parametres ne sont pas vide @@ -258,6 +273,7 @@ try { originalText = getHeadRevision(address, username, pw); + numRevision = getHeadNumberRevision(address, username, pw); } catch (SVNAuthenticationException authexep) { @@ -344,7 +360,7 @@ - request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(originalText)); + origText=StringEscapeUtils.escapeHtml(originalText); request.setAttribute(ATTRIBUTE_PROJECT_URL, projectUrl); if(log.isInfoEnabled()) { Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-08-17 16:00:44 UTC (rev 218) @@ -2,6 +2,8 @@ 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.by=By +scm.cannotSave=Can't save modification. scm.clickHere=click here scm.commitMessage=Commit message scm.commitMessageTitle=let a message for commit @@ -9,10 +11,13 @@ scm.exit=Exit scm.exitJavascript=Exit ScmWebEditor without saving ? All modification will be lost. scm.exitTitle=Exit ScmWebEditor without saving. +scm.fileModify=File modify while editing. +scm.forceSave=Force save 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.lastChangeSave=Last change save scm.logAs=You are log as \: scm.loginButton=Login scm.modificationViewer.betterUseJavascript=For a better use of SCMWebEditor please activate JavaScript. @@ -25,6 +30,7 @@ scm.outConnection.search=Search scm.password=Password scm.passwordTitle=Repository password +scm.pathError=Path error scm.preview=Preview scm.privateScmAccess=You try to access a Private SCM. Please login scm.redirection=Redirection... @@ -35,6 +41,7 @@ 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.showDiff=Show differences scm.text=Text scm.thankUsing=Thank you using SCMWebEditor scm.upload=Upload @@ -42,6 +49,7 @@ scm.uploadPath=Path on Repository scm.uploadSuccess=File upload successful scm.uploadTitle=Upload a file on the repository +scm.uselessSave=It's useless to save the file, file is not modify. 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-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-08-17 16:00:44 UTC (rev 218) @@ -2,6 +2,8 @@ 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 devriez etre redirige sur une nouvelle page. si non +scm.by=Par +scm.cannotSave=Modification impossible scm.clickHere=cliquez ici scm.commitMessage=Message associe au commit scm.commitMessageTitle=laisser un message pour le commit @@ -9,13 +11,16 @@ scm.exit=Quitter scm.exitJavascript=Quitter ScmWebEditor sans sauvegarder ? Toutes les modifications serons perdues. scm.exitTitle=Quitter ScmWebEditor sans sauvegarder. +scm.fileModify=Fichier modifie pendant l'edition. +scm.forceSave=Forcer la sauvegarde 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 +scm.lastChangeSave=Derniere sauvegarde effectuee scm.logAs=Connecte en tant que \: scm.loginButton=Connexion -scm.modificationViewer.betterUseJavascript= +scm.modificationViewer.betterUseJavascript=Activer Javascript pour acceder a toute les fonctionnalitees. scm.modificationViewer.noJavascript=Javascript est desactive. Vous pouvais seulement utiliser les boutons sauvegarder et quitter, quitter ou upload. scm.mustBeLog=Vous devez vous identifier pour parcourir ce depot. scm.no=Non @@ -25,6 +30,7 @@ scm.outConnection.search=Chercher scm.password=Mot de passe scm.passwordTitle=Mot de passe du depot +scm.pathError=erreur dans le chemin scm.preview=Apercu scm.privateScmAccess=Pour modifier ce fichier, veuillez vous connecter. scm.redirection=Redirection... @@ -35,13 +41,15 @@ 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.showDiff=Voir les differences scm.text=Texte -scm.thankUsing=merci d'avoir utilise SCMWebEditor +scm.thankUsing=merci d''avoir utilise SCMWebEditor scm.upload=Ajouter un fichier scm.uploadFile=Url du fichier scm.uploadPath=Repertoire sur le depot scm.uploadSuccess=Fichier telecharche avec succes scm.uploadTitle=Ajouter un fichier sur le depot +scm.uselessSave=Inutile de sauvegarder le fichier, aucune modification n''ont ete apporte scm.username=Identifiant scm.usernameTitle=Identifiant du depot scm.welcome=Bienvenue sur SCMWebEditor Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/resources/struts.xml 2011-08-17 16:00:44 UTC (rev 218) @@ -22,6 +22,7 @@ <result name="error">/WEB-INF/content/badFileRedirect.jsp</result> <result name="errorPath">/WEB-INF/content/badFileRedirect.jsp</result> <result name="errorRst">/WEB-INF/content/badRstFile.jsp</result> + <result name="fileModify">/WEB-INF/content/fileModify.jsp</result> </action> <action name="save" class="org.nuiton.scmwebeditor.actions.SaveAction" method="save"> Modified: trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/webapp/WEB-INF/content/badRstFile.jsp 2011-08-17 16:00:44 UTC (rev 218) @@ -10,6 +10,8 @@ <link rel="stylesheet" type="text/css" href="css/main.css"> </head> <body> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> + <form id="forceCommitForm" method="POST" action="commit.action" > <h4><s:text name="scm.rstNotValidMessage" /></h4> Added: trunk/src/main/webapp/WEB-INF/content/fileModify.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/fileModify.jsp (rev 0) +++ trunk/src/main/webapp/WEB-INF/content/fileModify.jsp 2011-08-17 16:00:44 UTC (rev 218) @@ -0,0 +1,69 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib prefix="s" uri="/struts-tags"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title><s:text name="scm.fileModify" /></title> +<link rel="stylesheet" type="text/css" href="css/main.css"> +</head> +<body> +<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> + + + + + <form id="forceCommitForm" method="POST" action="commit.action" > + <h4><s:text name="scm.fileModify" /> <s:text name="scm.by" /> <s:property value="headCommiter" /></h4> + + <s:set id="scm.showDiff" > + <s:text name="scm.showDiff" /> + </s:set> + <s:submit value="%{scm.showDiff}" onclick="getElementById('diffArea').style.display='inline';return false;" /> + + <s:set id="diff" > + <s:property value="diff" /> + </s:set> + <s:textarea id="diffArea" cssStyle="display:none" rows="20" cols="80" value="%{diff}" /> + + + <input type="hidden" name="force" value="true"/> + <s:hidden name="address" value="%{address}" /> + <s:hidden name="commitMessage" value="%{commitMessage}" /> + <s:hidden name="newText" value="%{newText}" /> + <s:hidden name="lastText" value="%{lastText}" /> + <s:hidden name="fileType" value="%{fileType}" /> + <s:hidden name="projectUrl" value="%{projectUrl}" /> + <s:hidden name="format" value="%{format}" /> + + <s:hidden name="username" value="%{username}" /> + <s:hidden name="pw" value="%{pw}" /> + + + <s:set id="scm.forceSave"> + <s:text name="scm.forceSave"/> + </s:set> + + <input type="hidden" name="force" value="true"/> + <s:submit + id="ajaxForceSaveButton" + formIds="editForm" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="%{scm.forceSave}" + > + </s:submit> + + + <s:set id="scm.exit"> + <s:text name="scm.exit"/> + </s:set> + <s:submit type="button" value="%{scm.exit}" onclick="history.back();return false;" /> + + + </form> + +</body> +</html> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-17 16:00:44 UTC (rev 218) @@ -85,7 +85,8 @@ %> <p> - <s:text name="scm.FileInEditor"/><a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> + <s:text name="scm.FileInEditor"/><a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> + at revision <span id="numrevisionDiv"><s:property value="numRevision" /></span> </p> <textarea id="newTextId" rows="50" cols="80" name="newText"><%=valueTextarea%></textarea> @@ -152,12 +153,10 @@ <s:text name="scm.commitMessageTitle"/> </s:set> - <s:textfield required="true" label="%{scm.commitMessage}" name="commitMessage" title="%{scm.commitMessageTitle}" /> + <s:textfield required="true" label="%{scm.commitMessage} " name="commitMessage" title="%{scm.commitMessageTitle}" /> - <p> + <p> - - <s:if test="username==null || pw==null" > <s:set id="scm.username"> <s:text name="scm.username"/> Modified: trunk/src/main/webapp/WEB-INF/content/reset.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/reset.jsp 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/webapp/WEB-INF/content/reset.jsp 2011-08-17 16:00:44 UTC (rev 218) @@ -16,5 +16,9 @@ editor.mirror.setValue(document.getElementById('valueOfLastRevision').value); + var numrev = <%=request.getAttribute("numRevision")%>; + if(numrev!=null) { + document.getElementById('numrevisionDiv').innerHTML=numrev; + } </script> </s:else> \ No newline at end of file Modified: trunk/src/main/webapp/WEB-INF/content/save.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-17 16:00:44 UTC (rev 218) @@ -4,17 +4,22 @@ <s:if test="result=='login'" > - <h4> <font color="red"> Bad username or password, can't save modification</font> </h4> + <h4> <font color="red"><s:text name="scm.badUsernameOrPassword"/> <s:text name="scm.cannotSave"/></font> </h4> </s:if> <s:elseif test="result=='error'" > - <h4> Can't save modification </h4> + <h4> <s:text name="scm.cannotSave" /></h4> </s:elseif> <s:elseif test="result=='errorRst'" > <h4> <s:text name="scm.rstNotValidMessage" /> </h4> <s:url id="ajaxForceSave" action="save" /> <input type="hidden" name="force" value="true"/> - <sj:submit onclick="loadChange()" + + <s:set id="scm.yes"> + <s:text name="scm.yes"/> + </s:set> + + <sj:submit id="ajaxForceSaveButton" formIds="editForm" targets="htmlcontentCommit" @@ -22,24 +27,63 @@ indicator="indicator" button="true" buttonIcon="ui-icon-refresh" - value="YES" + value="%{scm.yes}" > </sj:submit> </s:elseif> + + <s:elseif test="result=='fileModify'" > + <h4><s:text name="scm.fileModify" /> <s:text name="scm.by" /> <s:property value="headCommiter" /></h4> + + <s:set id="scm.showDiff" > + <s:text name="scm.showDiff" /> + </s:set> + <s:submit value="%{scm.showDiff}" onclick="getElementById('diffArea').style.display='inline';return false;" /> + + <s:set id="diff" > + <s:property value="diff" /> + </s:set> + <s:textarea id="diffArea" cssStyle="display:none" rows="20" cols="80" value="%{diff}" /> + <s:url id="ajaxForceSave" action="save" /> + + <input type="hidden" name="force" value="true"/> + + <s:set id="scm.forceSave"> + <s:text name="scm.forceSave"/> + </s:set> + <sj:submit + id="ajaxForceSaveButton" + formIds="editForm" + targets="htmlcontentCommit" + href="%{ajaxForceSave}" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="%{scm.forceSave}" + > + </sj:submit> + + </s:elseif> + <s:elseif test="result=='errorPath'" > - <h4> Can't save modification, Path Error</h4> + <h4><s:text name="scm.cannotSave"/>, <s:text name="scm.pathError"/></h4> </s:elseif> + <s:elseif test="result=='uselessSave'" > - <h4> It's useless to save the file, file is not modify</h4> + <h4><s:text name="scm.uselessSave"/></h4> </s:elseif> + <s:else> - <h4>Last change save <s:property value="formatDate" /> </h4> + <h4><s:text name="scm.lastChangeSave"/><s:property value="formatDate" /> </h4> <s:set id="lastRevSet" value="newText" /> <s:hidden id="lastRev" value="%{lastRevSet}" /> <script type="text/javascript"> origText = document.getElementById("origText"); origText.value = document.getElementById("lastRev").value; - + var numrev = <%=request.getAttribute("numRevision")%>; + if(numrev!=null) { + document.getElementById('numrevisionDiv').innerHTML=numrev; + } </script> </s:else> \ No newline at end of file Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-08-16 23:13:01 UTC (rev 217) +++ trunk/src/main/webapp/css/main.css 2011-08-17 16:00:44 UTC (rev 218) @@ -37,7 +37,7 @@ width:30% } -#wwctrl_Save, #wwctrl_Cancel, #wwctrl_uploadButton { +#wwctrl_Save, #wwctrl_Cancel, #wwctrl_uploadButton, #wwctrl_ { text-align:center; }

1 0

r217 - trunk
by tchemit＠users.nuiton.org 16 Aug '11

16 Aug '11

Author: tchemit Date: 2011-08-17 01:13:01 +0200 (Wed, 17 Aug 2011) New Revision: 217 Url: http://nuiton.org/repositories/revision/scmwebeditor/217 Log: Update mavenpom4redmine to 3.0.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-16 10:31:44 UTC (rev 216) +++ trunk/pom.xml 2011-08-16 23:13:01 UTC (rev 217) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0</version> + <version>3.0.1</version> </parent> <artifactId>scmwebeditor</artifactId>

1 0

r216 - trunk/src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org 16 Aug '11

16 Aug '11

Author: kcardineaud Date: 2011-08-16 12:31:44 +0200 (Tue, 16 Aug 2011) New Revision: 216 Url: http://nuiton.org/repositories/revision/scmwebeditor/216 Log: It is now possible to create directory on repository when upload a file Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-16 08:49:20 UTC (rev 215) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-16 10:31:44 UTC (rev 216) @@ -217,9 +217,9 @@ try { if (log.isDebugEnabled()) { - log.debug("Do Checkout of " + svnPath); + log.debug("Do Checkout of " + svnRoot); } - upclient.doCheckout(SVNURL.parseURIEncoded(svnPath), checkoutDir, + upclient.doCheckout(SVNURL.parseURIEncoded(svnRoot), checkoutDir, SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.INFINITY, false); } catch (SVNAuthenticationException authexep) { @@ -244,22 +244,22 @@ - //On test si le chemin commence par un / si non, on l'ajoute - if(!svnPath.startsWith("/")) { - svnPath="/"+svnPath; - } +// //On test si le chemin commence par un / si non, on l'ajoute +// if(!svnPath.startsWith("/")) { +// svnPath="/"+svnPath; +// } //On test si le chemin se termine par un / si non, on l'ajoute if(!svnPath.endsWith("/")) { svnPath+=("/"); } - + //Copy file in checkourdir String checkoutPath = checkoutDir.getAbsolutePath(); -// File file = new File(checkoutPath+svnPath,uploadFileName); - File file = new File(checkoutPath,uploadFileName); + File file = new File(checkoutPath+svnPath.replace(svnRoot, ""),uploadFileName); + try { FileUtils.copyFile(upload, file); } catch (IOException e) { @@ -281,7 +281,7 @@ try { if(log.isDebugEnabled()) { - log.debug("leSvnPath : "+checkoutPath+uploadFileName); + log.debug("leSvnPath : "+file.toString()); } //On ajoute le repertoire @@ -289,7 +289,7 @@ if(log.isDebugEnabled()) { log.debug("Add success !"); } - //On ajoute l'image aux fichiers versionnés + //On ajoute le fichier aux fichiers versionnés } catch (SVNException e) {

1 0

r215 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions webapp/WEB-INF/content webapp/js
by kcardineaud＠users.nuiton.org 16 Aug '11

16 Aug '11

Author: kcardineaud Date: 2011-08-16 10:49:20 +0200 (Tue, 16 Aug 2011) New Revision: 215 Url: http://nuiton.org/repositories/revision/scmwebeditor/215 Log: svn tree can now be use with repository that is read/write protect Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java trunk/src/main/webapp/WEB-INF/content/save.jsp trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp trunk/src/main/webapp/js/pictureUpload.js Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-16 08:49:20 UTC (rev 215) @@ -211,7 +211,7 @@ } upclient.doCheckout(svnSess.getRemoteUrl(), checkoutdir, SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); - + } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SvnConnection.java 2011-08-16 08:49:20 UTC (rev 215) @@ -155,6 +155,18 @@ return repositoryRoot; } + + + public void testConnection() throws SVNException { + SVNRepository repository = SVNRepositoryFactory.create(SVNURL.parseURIDecoded(addressSvn)); + repository.setAuthenticationManager(this.authManager); + + + repository.testConnection(); + + + } + public ISVNAuthenticationManager getAuthManager() { return authManager; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-08-16 08:49:20 UTC (rev 215) @@ -232,6 +232,9 @@ return Action.LOGIN; } catch (SVNException e) { + if(log.isErrorEnabled()) { + log.error("Can't checkout the file",e); + } //Suppression du repertoire temporaire delTempDirectory(checkoutdir); return "errorPath"; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-16 08:49:20 UTC (rev 215) @@ -164,7 +164,19 @@ svnConn.updateAuthentication( username, pw); + try { + svnConn.testConnection(); + } catch (SVNException e) { + if(log.isDebugEnabled()) { + log.debug("Test connection fail",e); + } + getScmSession().delScmUser(repositoryUUID); + username = null; + pw = null; + } + + //Si il n'y a pas de fichier à uploader on retourne sur le formulaire d'upload if(upload==null) { return "redirect"; @@ -309,6 +321,7 @@ badLogin=true; //Suppression du repertoire temporaire delTempDirectory(checkoutDir); + getScmSession().delScmUser(repositoryUUID); return Action.LOGIN; } catch (SVNException e) { Modified: trunk/src/main/webapp/WEB-INF/content/save.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/webapp/WEB-INF/content/save.jsp 2011-08-16 08:49:20 UTC (rev 215) @@ -28,7 +28,7 @@ </s:elseif> <s:elseif test="result=='errorPath'" > - <h4> Can't save modification, RST is not valid</h4> + <h4> Can't save modification, Path Error</h4> </s:elseif> <s:elseif test="result=='uselessSave'" > <h4> It's useless to save the file, file is not modify</h4> Modified: trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-16 08:49:20 UTC (rev 215) @@ -13,6 +13,9 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>UploadFile</title> <link rel="stylesheet" type="text/css" href="css/main.css"> + + + </head> <body> @@ -23,15 +26,18 @@ var item = event.originalEvent.data.rslt.obj; if(item.text().indexOf("/") != -1) { - window.document.getElementById("svnPath").value=item.attr("id"); + window.document.getElementById("svnPath").value=item.attr("id"); } }); </script> + <s:set id="scm.upload"> + <s:text name="scm.upload"/> + </s:set> + <center><h1><s:text name="%{scm.upload}" ></s:text></h1></center> - <form method="POST" id="uploadForm" action="doUpload.action" enctype="multipart/form-data"> <label><s:text name="scm.uploadFile" /> : <input type="file" name="upload"/></label><br/> <label><s:text name="scm.uploadPath" /> : <s:textfield size="50px" type="text" name="svnPath" id="svnPath" value="%{fileRoot}" /></label><br/> @@ -39,7 +45,7 @@ <div id="searchTree"> - <s:url id="searchTreeUrl" action="search?address=%{svnRoot}" /> + <s:url id="searchTreeUrl" action="search?address=%{svnRoot}&username=%{username}&pw=%{pw}" /> <sjt:tree id="svnTree" htmlTitles="true" jstreetheme="classic" Modified: trunk/src/main/webapp/js/pictureUpload.js =================================================================== --- trunk/src/main/webapp/js/pictureUpload.js 2011-08-12 14:29:54 UTC (rev 214) +++ trunk/src/main/webapp/js/pictureUpload.js 2011-08-16 08:49:20 UTC (rev 215) @@ -1,5 +1,5 @@ function upload_popup(page, name, fileAddress) { var address = fileAddress.value; - window.open (page+'?address='+address, name, config='top=300, left=300, height=300, width=500, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') + window.open (page+'?address='+address, name, config='top=200, left=300, height=600, width=700, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') } \ No newline at end of file

1 0