Commit @66af7ac69d322a986dd450d962d08fe5a4a8ca69

변동호 2017-09-06

svn: Fix malformed xml error

@66af7ac69d322a986dd450d962d08fe5a4a8ca69

281f356

66af7ac

app/playRepository/RepositoryService.java

--- app/playRepository/RepositoryService.java

+++ app/playRepository/RepositoryService.java


 import play.mvc.Http.Request;
 import play.mvc.Http.Response;
 import playRepository.hooks.*;
+import utils.PlayServletContext;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;

     public static DAVServlet createDavServlet(final String userName) throws ServletException {
         DAVServlet servlet = new DAVServlet();
         servlet.init(new ServletConfig() {
+            private ServletContext servletContext = new PlayServletContext();
 
             @Override
             public String getInitParameter(String name) {

 
             @Override
             public ServletContext getServletContext() {
-                throw new UnsupportedOperationException();
+                return servletContext;
             }
 
             @Override

281f356

66af7ac

app/utils/PlayServletResponse.java

--- app/utils/PlayServletResponse.java

+++ app/utils/PlayServletResponse.java


     public void sendError(int statusCode, String msg) throws IOException {
         // FIXME response should be returned at this time.
         setStatus(statusCode);
-        resetBuffer();
         if (msg != null) {
-            play.Logger.error(msg);
+            setContentType("text/plain");
+            resetBuffer();
             getWriter().write(msg);
-            response.setHeader(Http.HeaderNames.CONTENT_TYPE, "text/plain");
+            play.Logger.error(msg);
         } else {
             response.getHeaders().remove(Http.HeaderNames.CONTENT_TYPE);
+            resetBuffer();
         }
     }
 

281f356

66af7ac

build.sbt

--- build.sbt

+++ build.sbt


   // JGit Archive Formats
   "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.5.0.201609210915-r",
   // svnkit
-  "org.tmatesoft.svnkit" % "svnkit" % "1.8.12",
+  "org.tmatesoft.svnkit" % "svnkit" % "1.8.15",
   // svnkit-dav
-  "sonia.svnkit" % "svnkit-dav" % "1.8.5-scm2",
+  "sonia.svnkit" % "svnkit-dav" % "1.8.15-scm1",
   // javahl
-  "org.tmatesoft.svnkit" % "svnkit-javahl16" % "1.8.11",
+  "org.tmatesoft.svnkit" % "svnkit-javahl16" % "1.8.15",
   "net.sourceforge.jexcelapi" % "jxl" % "2.6.10",
 // shiro
   "org.apache.shiro" % "shiro-core" % "1.2.1",

   "org.mozilla" % "rhino" % "1.7.7.1"
 )
 
+libraryDependencies += "org.apache.subversion" % "svn-javahl-api" % "1.9.0"
+
 val projectSettings = Seq(
   // Add your own project settings here
   resolvers += "jgit-repository" at "https://repo.eclipse.org/content/groups/releases/",
-  resolvers += "java-semVer" at "http://oss.sonatype.org/content/repositories/snapshots/",
-  resolvers += "scm-manager release repository" at "http://maven.scm-manager.org/nexus/content/groups/public",
-  resolvers += "tmatesoft release repository" at "http://maven.tmatesoft.com/content/repositories/releases",
+  resolvers += "java-semVer" at "https://oss.sonatype.org/content/repositories/snapshots/",
+  resolvers += "scm-manager release repository" at "https://maven.scm-manager.org/nexus/content/groups/public",
+  resolvers += "tmatesoft release repository" at "https://maven.tmatesoft.com/content/repositories/releases",
+  resolvers += "tmatesoft snapshot repository" at "https://maven.tmatesoft.com/content/repositories/snapshots",
   resolvers += "julienrf.github.com" at "http://julienrf.github.com/repo/",
   resolvers += "opencast-public" at "http://nexus.opencast.org/nexus/content/repositories/public",
   resolvers += "jfrog" at "http://repo.jfrog.org/artifactory/libs-releases/", 

Add a comment

Open 0
Closed 0

List

...	...	@@ -36,6 +36,7 @@
36	36	import play.mvc.Http.Request;
37	37	import play.mvc.Http.Response;
38	38	import playRepository.hooks.*;
	39	+import utils.PlayServletContext;
39	40
40	41	import javax.servlet.ServletConfig;
41	42	import javax.servlet.ServletContext;
...	...	@@ -144,6 +145,7 @@
144	145	public static DAVServlet createDavServlet(final String userName) throws ServletException {
145	146	DAVServlet servlet = new DAVServlet();
146	147	servlet.init(new ServletConfig() {
	148	+ private ServletContext servletContext = new PlayServletContext();
147	149
148	150	@Override
149	151	public String getInitParameter(String name) {
...	...	@@ -161,7 +163,7 @@
161	163
162	164	@Override
163	165	public ServletContext getServletContext() {
164		- throw new UnsupportedOperationException();
	166	+ return servletContext;
165	167	}
166	168
167	169	@Override

...	...	@@ -313,13 +313,14 @@
313	313	public void sendError(int statusCode, String msg) throws IOException {
314	314	// FIXME response should be returned at this time.
315	315	setStatus(statusCode);
316		- resetBuffer();
317	316	if (msg != null) {
318		- play.Logger.error(msg);
	317	+ setContentType("text/plain");
	318	+ resetBuffer();
319	319	getWriter().write(msg);
320		- response.setHeader(Http.HeaderNames.CONTENT_TYPE, "text/plain");
	320	+ play.Logger.error(msg);
321	321	} else {
322	322	response.getHeaders().remove(Http.HeaderNames.CONTENT_TYPE);
	323	+ resetBuffer();
323	324	}
324	325	}
325	326

...	...	@@ -31,11 +31,11 @@
31	31	// JGit Archive Formats
32	32	"org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.5.0.201609210915-r",
33	33	// svnkit
34		- "org.tmatesoft.svnkit" % "svnkit" % "1.8.12",
	34	+ "org.tmatesoft.svnkit" % "svnkit" % "1.8.15",
35	35	// svnkit-dav
36		- "sonia.svnkit" % "svnkit-dav" % "1.8.5-scm2",
	36	+ "sonia.svnkit" % "svnkit-dav" % "1.8.15-scm1",
37	37	// javahl
38		- "org.tmatesoft.svnkit" % "svnkit-javahl16" % "1.8.11",
	38	+ "org.tmatesoft.svnkit" % "svnkit-javahl16" % "1.8.15",
39	39	"net.sourceforge.jexcelapi" % "jxl" % "2.6.10",
40	40	// shiro
41	41	"org.apache.shiro" % "shiro-core" % "1.2.1",
...	...	@@ -59,12 +59,15 @@
59	59	"org.mozilla" % "rhino" % "1.7.7.1"
60	60	)
61	61
	62	+libraryDependencies += "org.apache.subversion" % "svn-javahl-api" % "1.9.0"
	63	+
62	64	val projectSettings = Seq(
63	65	// Add your own project settings here
64	66	resolvers += "jgit-repository" at "https://repo.eclipse.org/content/groups/releases/",
65		- resolvers += "java-semVer" at "http://oss.sonatype.org/content/repositories/snapshots/",
66		- resolvers += "scm-manager release repository" at "http://maven.scm-manager.org/nexus/content/groups/public",
67		- resolvers += "tmatesoft release repository" at "http://maven.tmatesoft.com/content/repositories/releases",
	67	+ resolvers += "java-semVer" at "https://oss.sonatype.org/content/repositories/snapshots/",
	68	+ resolvers += "scm-manager release repository" at "https://maven.scm-manager.org/nexus/content/groups/public",
	69	+ resolvers += "tmatesoft release repository" at "https://maven.tmatesoft.com/content/repositories/releases",
	70	+ resolvers += "tmatesoft snapshot repository" at "https://maven.tmatesoft.com/content/repositories/snapshots",
68	71	resolvers += "julienrf.github.com" at "http://julienrf.github.com/repo/",
69	72	resolvers += "opencast-public" at "http://nexus.opencast.org/nexus/content/repositories/public",
70	73	resolvers += "jfrog" at "http://repo.jfrog.org/artifactory/libs-releases/",

Delete comment