Author: glorieux Date: 2009-10-09 14:43:09 +0200 (Fri, 09 Oct 2009) New Revision: 280 Added: nuiton-rstedit/.classpath nuiton-rstedit/.project nuiton-rstedit/.settings/ nuiton-rstedit/.settings/org.eclipse.jdt.core.prefs nuiton-rstedit/.settings/org.maven.ide.eclipse.prefs nuiton-rstedit/target/ Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp nuiton-rstedit/src/main/webapp/Error.jsp nuiton-rstedit/src/main/webapp/Preview.js nuiton-rstedit/src/main/webapp/Saver.js nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js Log: Et la je ne suprime pas tout. Added: nuiton-rstedit/.classpath =================================================================== --- nuiton-rstedit/.classpath (rev 0) +++ nuiton-rstedit/.classpath 2009-10-09 12:43:09 UTC (rev 280) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: nuiton-rstedit/.project =================================================================== --- nuiton-rstedit/.project (rev 0) +++ nuiton-rstedit/.project 2009-10-09 12:43:09 UTC (rev 280) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>nuiton-rstedit</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Added: nuiton-rstedit/.settings/org.eclipse.jdt.core.prefs =================================================================== --- nuiton-rstedit/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ nuiton-rstedit/.settings/org.eclipse.jdt.core.prefs 2009-10-09 12:43:09 UTC (rev 280) @@ -0,0 +1,5 @@ +#Fri Oct 09 11:40:58 CEST 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 Added: nuiton-rstedit/.settings/org.maven.ide.eclipse.prefs =================================================================== --- nuiton-rstedit/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ nuiton-rstedit/.settings/org.maven.ide.eclipse.prefs 2009-10-09 12:43:09 UTC (rev 280) @@ -0,0 +1,9 @@ +#Fri Oct 09 11:40:55 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java 2009-10-09 08:56:10 UTC (rev 279) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/HelloServlet.java 2009-10-09 12:43:09 UTC (rev 280) @@ -5,6 +5,7 @@ import info.monitorenter.cpdetector.io.CodepageDetectorProxy; import info.monitorenter.cpdetector.io.JChardetFacade; import info.monitorenter.cpdetector.io.ParsingDetector; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -14,7 +15,6 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.PrintWriter; import java.io.Reader; import java.io.Writer; import java.net.MalformedURLException; @@ -22,12 +22,14 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; + import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java 2009-10-09 08:56:10 UTC (rev 279) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PreviewServlet.java 2009-10-09 12:43:09 UTC (rev 280) @@ -5,6 +5,7 @@ import info.monitorenter.cpdetector.io.CodepageDetectorProxy; import info.monitorenter.cpdetector.io.JChardetFacade; import info.monitorenter.cpdetector.io.ParsingDetector; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -19,11 +20,13 @@ import java.net.MalformedURLException; import java.nio.charset.Charset; import java.util.List; + import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java 2009-10-09 08:56:10 UTC (rev 279) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/PrivateSvnServlet.java 2009-10-09 12:43:09 UTC (rev 280) @@ -2,12 +2,14 @@ import java.io.IOException; import java.io.PrintWriter; + import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.tmatesoft.svn.core.wc.SVNClientManager; @@ -35,7 +37,7 @@ httpSession.setAttribute("myInfo", svnSess); // Recalling helloservlet with user information stock on session request.setAttribute("Redirect_url", - "http://localhost:8080/nuiton-rstedit/hello?adresse="+svnSess.getSvnPath()+"&"+"file_name="+svnSess.getFileName()+"&"+"project_url="+svnSess.getProjectUrl()); + "http://localhost:8081/nuiton-rstedit/hello?adresse="+svnSess.getSvnPath()+"&"+"file_name="+svnSess.getFileName()+"&"+"project_url="+svnSess.getProjectUrl()); RequestDispatcher requestDispacher = this.getServletContext().getRequestDispatcher("/Recall.jsp"); requestDispacher.forward(request, response); Modified: nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java =================================================================== --- nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java 2009-10-09 08:56:10 UTC (rev 279) +++ nuiton-rstedit/src/main/java/org/nuiton/jrst/SvnSession.java 2009-10-09 12:43:09 UTC (rev 280) @@ -1,6 +1,7 @@ package org.nuiton.jrst; import java.io.File; + import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNProperty; import org.tmatesoft.svn.core.SVNURL; Modified: nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp 2009-10-09 08:56:10 UTC (rev 279) +++ nuiton-rstedit/src/main/webapp/BadFileRedirect.jsp 2009-10-09 12:43:09 UTC (rev 280) @@ -12,7 +12,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Error...</title> - <meta http-equiv="Refresh" content="3; url=http://localhost:8080/nuiton-rstedit/hello"> + <meta http-equiv="Refresh" content="3; url=http://localhost:9000/nuiton-rstedit/hello"> </head> <body> <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> Modified: nuiton-rstedit/src/main/webapp/Error.jsp =================================================================== --- nuiton-rstedit/src/main/webapp/Error.jsp 2009-10-09 08:56:10 UTC (rev 279) +++ nuiton-rstedit/src/main/webapp/Error.jsp 2009-10-09 12:43:09 UTC (rev 280) @@ -13,7 +13,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>Error</title> <meta http-equiv="Refresh" content="2; - url=http://localhost:8080/nuiton-rstedit/hello?adresse=<%=request.getAttribute("Svnpath_url")%>&file_name=<%=request.getAttribute("Filename_url")%>&project_url=<%=request.getAttribute("Redirection_url")%>"> + url=http://localhost:8081/nuiton-rstedit/hello?adresse=<%=request.getAttribute("Svnpath_url")%>&file_name=<%=request.getAttribute("Filename_url")%>&project_url=<%=request.getAttribute("Redirection_url")%>"> </head> <body> <img src="http://www.codelutin.com/images/lutinorange-codelutin.png" alt="$alt" /> Modified: nuiton-rstedit/src/main/webapp/Preview.js =================================================================== --- nuiton-rstedit/src/main/webapp/Preview.js 2009-10-09 08:56:10 UTC (rev 279) +++ nuiton-rstedit/src/main/webapp/Preview.js 2009-10-09 12:43:09 UTC (rev 280) @@ -51,6 +51,6 @@ function preview(my_text) { - sendRequest("POST", "http://localhost:8080/nuiton-rstedit/previewservlet", my_text); + sendRequest("POST", "http://localhost:8081/nuiton-rstedit/previewservlet", my_text); } Modified: nuiton-rstedit/src/main/webapp/Saver.js =================================================================== --- nuiton-rstedit/src/main/webapp/Saver.js 2009-10-09 08:56:10 UTC (rev 279) +++ nuiton-rstedit/src/main/webapp/Saver.js 2009-10-09 12:43:09 UTC (rev 280) @@ -38,7 +38,7 @@ { if(http.readyState == 4 && http.status != 401){ alert("Save Ok."); -// window.location.reload(true); + window.location.reload(true); } else if (http.readyState == 4 && http.status == 401){ alert("Bad login or password please recheck."); } @@ -48,7 +48,7 @@ { if (my_text.value != orig_text.value){ if (confirm("Do you really want to save?")){ - sendReq("POST", "http://localhost:8080/nuiton-rstedit/hello", my_text, login, pass, message, orig_text); + sendReq("POST", "http://localhost:8081/nuiton-rstedit/hello", my_text, login, pass, message, orig_text); } } else{ alert("File don't need to be save."); Modified: nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js =================================================================== --- nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js 2009-10-09 08:56:10 UTC (rev 279) +++ nuiton-rstedit/src/main/webapp/cancelRedirectDelete.js 2009-10-09 12:43:09 UTC (rev 280) @@ -38,7 +38,7 @@ function cancelRedirectDelete(orig_text, login, pass, message) { if (confirm("Exit SCMWebEditor ?")){ - sendRe("POST", "http://localhost:8080/nuiton-rstedit/hello", orig_text, login, pass, message); + sendRe("POST", "http://localhost:8081/nuiton-rstedit/hello", orig_text, login, pass, message); window.history.go(-1); } } \ No newline at end of file