Author: kcardineaud Date: 2011-08-12 16:29:54 +0200 (Fri, 12 Aug 2011) New Revision: 214 Url: http://nuiton.org/repositories/revision/scmwebeditor/214 Log: Remove java code, use for authentification, from jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 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 Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-12 13:25:23 UTC (rev 213) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-12 14:29:54 UTC (rev 214) @@ -133,8 +133,11 @@ return false; } } - +// public void prepare() { +// +// } + /** * Methode principale de la classe * @return @@ -225,9 +228,6 @@ String originalText = ""; - String login = this.getUsername(); - String password = this.getPw(); - //Si le repo n'est pas protege en ecriture on recupere sont UUID String repositoryUUID = svnConn.getUUID(); if (repositoryUUID==null) { @@ -235,25 +235,25 @@ } if(log.isDebugEnabled()) { - log.debug("Login : "+login); + log.debug("Login : "+username); } - if(login==null && password==null) { + if(username==null && pw==null) { if(getScmSession().getUsername(repositoryUUID)!=null && getScmSession().getPassword(repositoryUUID)!=null) { //On recupère les identifiants en session - login = getScmSession().getUsername(repositoryUUID); - password = getScmSession().getPassword(repositoryUUID); + username = getScmSession().getUsername(repositoryUUID); + pw = getScmSession().getPassword(repositoryUUID); } else { - login = "anonymous"; - password = "anonymous"; + username = null; + pw = null; } } else { - getScmSession().addScmUser(repositoryUUID, login , password); + getScmSession().addScmUser(repositoryUUID, username , pw); } - svnConn.updateAuthentication(login, password); + svnConn.updateAuthentication(username, pw); try { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-12 13:25:23 UTC (rev 213) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-08-12 14:29:54 UTC (rev 214) @@ -106,6 +106,11 @@ } +// public void prepare() { +// +// } + + public String execute() { SvnConnection svnConnection = new SvnConnection(address); @@ -118,19 +123,7 @@ } - if(upload==null) { - return "redirect"; - } - badLogin=false; - error=false; - - if(log.isDebugEnabled()) { - log.debug("FileName : "+uploadFileName); - log.debug("ContentType : "+uploadContentType); - } - - SvnConnection svnConn = null; try { @@ -145,34 +138,50 @@ } - String login = this.getUsername(); - String password = this.getPw(); - + //Si le repo n'est pas protege en ecriture on recupere sont UUID String repositoryUUID = svnConn.getUUID(); if (repositoryUUID==null) { repositoryUUID=address; } - - if(login==null && password==null) { + + if(username==null && pw==null) { if(getScmSession().getUsername(repositoryUUID)!=null && getScmSession().getPassword(repositoryUUID)!=null) { //On recupère les identifiants en session - login = getScmSession().getUsername(repositoryUUID); - password = getScmSession().getPassword(repositoryUUID); + username = getScmSession().getUsername(repositoryUUID); + pw = getScmSession().getPassword(repositoryUUID); } else { - login = "anonymous"; - password = "anonymous"; + username = null; + pw = null; } } else { - getScmSession().addScmUser(repositoryUUID, login , password); + getScmSession().addScmUser(repositoryUUID, username , pw); } + - svnConn.updateAuthentication( login, password); + svnConn.updateAuthentication( username, pw); + //Si il n'y a pas de fichier à uploader on retourne sur le formulaire d'upload + if(upload==null) { + return "redirect"; + } + + badLogin=false; + error=false; + + if(log.isDebugEnabled()) { + log.debug("FileName : "+uploadFileName); + log.debug("ContentType : "+uploadContentType); + } + + + + + /* * Checkout process */ @@ -321,7 +330,7 @@ } if(log.isInfoEnabled()) { - log.info(login + " with IP "+request.getRemoteAddr()+" add the file "+this.getUploadFileName()+" on the repository."); + log.info(username + " with IP "+request.getRemoteAddr()+" add the file "+this.getUploadFileName()+" on the repository."); } return SUCCESS; Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-12 13:25:23 UTC (rev 213) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-12 14:29:54 UTC (rev 214) @@ -157,31 +157,8 @@ <p> -<% -Object obj = session.getAttribute("ScmSession"); -String usernameSvn = null; -String passwordSvn = null; -if(obj!=null) { - ScmSession scmSession = (ScmSession) obj; - - if(request.getAttribute("address")!=null) { - String address = request.getAttribute("address").toString(); - address = scmSession.getUUID(address); - - if(address==null) { - address = request.getAttribute("address").toString(); - } - usernameSvn = scmSession.getUsername(address); - passwordSvn = scmSession.getPassword(address); - - } - -} -%> -<% - if (usernameSvn==null || passwordSvn==null) { -%> + <s:if test="username==null || pw==null" > <s:set id="scm.username"> <s:text name="scm.username"/> </s:set> @@ -198,53 +175,12 @@ <s:textfield accesskey="U" size="12" label="%{scm.username}" name="username" title="%{scm.usernameTitle}" /> <s:password accesskey="P" size="12" label="%{scm.password}" name="pw" title="%{scm.passwordTitle}" /> </div> - <% - } else { -%> - <s:text name="scm.logAs" /> <%=usernameSvn%> <br/> + </s:if> + <s:else > + <s:text name="scm.logAs" /> <s:property value="username" /> <br/> + </s:else> -<% } %> - - - -<%-- <s:set name="addressSvn"> --%> -<%-- <s:property value="address" /> --%> -<%-- </s:set> --%> -<%-- <s:set name="usernameSvn"> --%> -<%-- <s:property value="#session.ScmSession"/> --%> -<%-- </s:set> --%> -<%-- <s:set name="passwordSvn"> --%> -<%-- <s:property value="#session.ScmSession"/> --%> -<%-- </s:set> --%> -<%-- <h1><s:property value="%{usernameSvn}" /></h1> --%> -<%-- <h1><s:property value="%{passwordSvn}" /></h1> --%> - -<%-- <s:if test="%{username}==null"> --%> -<%-- <s:set id="scm.username"> --%> -<%-- <s:text name="scm.username"/> --%> -<%-- </s:set> --%> -<%-- <s:set id="scm.usernameTitle"> --%> -<%-- <s:text name="scm.usernameTitle"/> --%> -<%-- </s:set> --%> -<%-- <s:set id="scm.password"> --%> -<%-- <s:text name="scm.password"/> --%> -<%-- </s:set> --%> -<%-- <s:set id="scm.passwordTitle"> --%> -<%-- <s:text name="scm.passwordTitle"/> --%> -<%-- </s:set> --%> -<!-- <div id="loginDiv"> --> -<%-- <s:textfield accesskey="U" size="12" label="%{scm.username}" name="username" title="%{scm.usernameTitle}" /> --%> -<%-- <s:password accesskey="P" size="12" label="%{scm.password}" name="pw" title="%{scm.passwordTitle}" /> --%> -<!-- </div> --> -<%-- </s:if> --%> -<%-- <s:else> --%> -<%-- Login as : <s:property value="%{username}" /><br/> --%> - -<%-- <s:hidden value="%{username}" label="%{scm.username}" name="username" /> --%> -<%-- <s:hidden value="%{tototo}" label="%{scm.password}" name="pw" /> --%> -<%-- </s:else> --%> - <input type="hidden" name="address" value="<%=request.getAttribute("address")%>"/> <input type="hidden" id="origText" name="origText" value="<%=request.getAttribute("OrigText")%>"/> Modified: trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-12 13:25:23 UTC (rev 213) +++ trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp 2011-08-12 14:29:54 UTC (rev 214) @@ -49,36 +49,15 @@ </div> - - <% - Object obj = session.getAttribute("ScmSession"); - String usernameSvn = null; - String passwordSvn = null; - if(obj!=null) { - ScmSession scmSession = (ScmSession) obj; - if(request.getParameter("address")!=null) { - String address = request.getParameter("address").toString(); - address = scmSession.getUUID(address); - - if(address==null) { - address = request.getParameter("address").toString(); - } - usernameSvn = scmSession.getUsername(address); - passwordSvn = scmSession.getPassword(address); - } - } - - if (usernameSvn==null || passwordSvn==null) { - %> + + <s:if test="username==null || pw==null" > <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/> - <% - } else { - %> - <s:text name="scm.logAs" /> <%=usernameSvn%> <br/> - <input type="hidden" value="<%=usernameSvn%>" name="username" /> - <input type="hidden" value="<%=passwordSvn%>" name="pw" /> - <% } %> + </s:if> + + <s:else> + <s:text name="scm.logAs" /> <s:property value="username" /> <br/> + </s:else> <input type="hidden" name="address" value="<%=request.getParameter("address") %>" />