Author: kcardineaud Date: 2011-08-04 12:03:03 +0200 (Thu, 04 Aug 2011) New Revision: 202 Url: http://nuiton.org/repositories/revision/scmwebeditor/202 Log: Fix somme issues with upload to use it without session Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp trunk/src/main/webapp/js/pictureUpload.js Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-04 09:52:16 UTC (rev 201) +++ trunk/pom.xml 2011-08-04 10:03:03 UTC (rev 202) @@ -195,7 +195,7 @@ <strutsxworksVersion>2.2.3</strutsxworksVersion> <nuitonI18nVersion>2.4</nuitonI18nVersion> - <!-- <scmwebeditorUrl>http://localhost:8080/scmwebeditor/checkout.action</scmwebeditorUrl> --> + <scmwebeditorUrl>http://localhost:8080/scmwebeditor/checkout.action</scmwebeditorUrl> <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -207,7 +207,7 @@ <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> -<!-- <nuitonSkinVersion>1.0.6-SNAPSHOT</nuitonSkinVersion> --> + <nuitonSkinVersion>1.0.6-SNAPSHOT</nuitonSkinVersion> </properties> Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-04 09:52:16 UTC (rev 201) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-04 10:03:03 UTC (rev 202) @@ -36,6 +36,7 @@ protected String username; protected String pw; protected String svnPath; + protected String address; protected boolean badLogin; protected boolean error; @@ -79,6 +80,10 @@ public void setPw(String pw) { this.pw = pw; } + + public void setAddress(String address) { + this.address = address; + } public boolean isBadLogin() { return badLogin; @@ -102,11 +107,20 @@ } - HttpSession httpSession = request.getSession(true); - SvnSession svnSess = getSvnSession(httpSession); + SvnSession svnSess = null; + try { + svnSess = new SvnSession(address); + } + catch (StringIndexOutOfBoundsException e) { + if(log.isErrorEnabled()) { + log.error("error when creating SvnSession in UploadAction",e); + } + error=true; + return "error"; + } - + svnSess.updateAuthentication( username, pw); /* * Checkout process */ @@ -125,6 +139,9 @@ } + + + try { if (log.isDebugEnabled()) { log.debug("Do Checkout of " + svnSess.getRemoteUrl()); Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-04 09:52:16 UTC (rev 201) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-04 10:03:03 UTC (rev 202) @@ -268,6 +268,8 @@ <s:set id="scm.exitJavascript"> <s:text name="scm.exitJavascript"/> </s:set> + + <s:submit title="%{scm.exitTitle}" type="button" value="%{scm.exit}" name="Cancel" onclick="return cancelRedirect('%{scm.exitJavascript}',this.form.ProjectUrl);"/> @@ -283,8 +285,14 @@ <s:set id="scm.uploadTitle"> <s:text name="scm.uploadTitle"/> </s:set> + + + <s:set name="address"> + <s:property value="address"/> + </s:set> + <s:hidden id="fileaddress" value="%{address}" /> <center> - <s:submit name="uploadButton" value="%{scm.upload}" title="%{scm.uploadTitle}" onClick="javascript:upload_popup('doUpload.action','upload');" /> + <s:submit name="uploadButton" value="%{scm.upload}" title="%{scm.uploadTitle}" onClick="javascript:upload_popup('doUpload.action', 'upload' , getElementById('fileaddress') );" /> </center> Modified: trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-04 09:52:16 UTC (rev 201) +++ trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-04 10:03:03 UTC (rev 202) @@ -14,7 +14,7 @@ <label><s:text name="scm.uploadPath" /> : <input type="text" name="svnPath" /></label><br/> <label><s:text name="scm.username" /> : <input type="text" name="username" /></label><br/> <label><s:text name="scm.password" /> : <input type="password" name="pw" /></label><br/> - + <input type="hidden" name="address" value="<%=request.getParameter("address") %>" /> <s:if test="badLogin"> <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p> </s:if> Modified: trunk/src/main/webapp/js/pictureUpload.js =================================================================== --- trunk/src/main/webapp/js/pictureUpload.js 2011-08-04 09:52:16 UTC (rev 201) +++ trunk/src/main/webapp/js/pictureUpload.js 2011-08-04 10:03:03 UTC (rev 202) @@ -1,4 +1,5 @@ -function upload_popup(page, name) +function upload_popup(page, name, fileAddress) { -window.open (page, name, config='top=300, left=300, height=300, width=500, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') + 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') } \ No newline at end of file