Commit @f155f742d4278e231ecac9bdd1b49956e9331a6c

[Notice] Announcing the End of Demo Server [Read me]

Yi EungJun 2015-01-28

svn: Fix a server error when edit revision property

NPE occured when edit revprop so we couldn't use svnsync.

@f155f742d4278e231ecac9bdd1b49956e9331a6c

2b2a16e

f155f74

build.sbt

--- build.sbt

+++ build.sbt


   // Symlink support for Java7
   "org.eclipse.jgit" % "org.eclipse.jgit.java7" % "3.5.3.201412180710-r",
   // svnkit
-  "sonia.svnkit" % "svnkit" % "1.7.10-scm3",
+  "sonia.svnkit" % "svnkit" % "1.8.5-scm2",
   // svnkit-dav
-  "sonia.svnkit" % "svnkit-dav" % "1.7.10-scm3",
+  "sonia.svnkit" % "svnkit-dav" % "1.8.5-scm2",
   // javahl
-  "sonia.svnkit" % "svnkit-javahl16" % "1.7.10-scm3",
+  "sonia.svnkit" % "svnkit-javahl16" % "1.8.5-scm2",
   "net.sourceforge.jexcelapi" % "jxl" % "2.6.10",
 // shiro
   "org.apache.shiro" % "shiro-core" % "1.2.1",

2b2a16e

f155f74

test/controllers/ProjectAppTest.java

--- test/controllers/ProjectAppTest.java

+++ test/controllers/ProjectAppTest.java


 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.tigris.subversion.javahl.ClientException;
+import org.tmatesoft.svn.core.SVNException;
 import play.libs.Json;
 import play.mvc.Http;
 import play.mvc.Result;

     }
 
     @Test
-    public void testAcceptTransfer() throws IOException, ServletException, ClientException {
+    public void testAcceptTransfer() throws IOException, ServletException, SVNException {
         //Given
         GitRepository.setRepoPrefix("resources/test/repo/git/");
 

     }
 
     @Test
-    public void testAcceptTransferWithWrongKey() throws IOException, ServletException, ClientException {
+    public void testAcceptTransferWithWrongKey() throws IOException, ServletException, SVNException {
         //Given
         GitRepository.setRepoPrefix("resources/test/repo/git/");
 

2b2a16e

f155f74

test/models/PullRequestTest.java

--- test/models/PullRequestTest.java

+++ test/models/PullRequestTest.java


 import org.apache.commons.lang3.time.DateUtils;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.diff.*;
+import org.eclipse.jgit.diff.DiffAlgorithm;
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.diff.RawText;
+import org.eclipse.jgit.diff.RawTextComparator;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.transport.RefSpec;
-import org.junit.*;
-
-import org.tigris.subversion.javahl.ClientException;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.tmatesoft.svn.core.SVNException;
 import play.test.Helpers;
-import playRepository.*;
+import playRepository.FileDiff;
+import playRepository.GitRepository;
+import playRepository.PlayRepository;
+import playRepository.RepositoryService;
 
 import javax.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.text.ParseException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

 
     @Before
     public void initRepositories() throws IOException, GitAPIException, ServletException,
-            ClientException, PullRequestException {
+            PullRequestException, SVNException {
         GitRepository.setRepoPrefix(REPO_PREFIX);
 
         app = support.Helpers.makeTestApplication();

Add a comment

Open 0
Closed 0

List

...	...	@@ -30,6 +30,7 @@
30	30	import org.junit.BeforeClass;
31	31	import org.junit.Test;
32	32	import org.tigris.subversion.javahl.ClientException;
	33	+import org.tmatesoft.svn.core.SVNException;
33	34	import play.libs.Json;
34	35	import play.mvc.Http;
35	36	import play.mvc.Result;
...	...	@@ -435,7 +436,7 @@
435	436	}
436	437
437	438	@Test
438		- public void testAcceptTransfer() throws IOException, ServletException, ClientException {
	439	+ public void testAcceptTransfer() throws IOException, ServletException, SVNException {
439	440	//Given
440	441	GitRepository.setRepoPrefix("resources/test/repo/git/");
441	442
...	...	@@ -461,7 +462,7 @@
461	462	}
462	463
463	464	@Test
464		- public void testAcceptTransferWithWrongKey() throws IOException, ServletException, ClientException {
	465	+ public void testAcceptTransferWithWrongKey() throws IOException, ServletException, SVNException {
465	466	//Given
466	467	GitRepository.setRepoPrefix("resources/test/repo/git/");
467	468

...	...	@@ -24,22 +24,30 @@
24	24	import org.apache.commons.lang3.time.DateUtils;
25	25	import org.eclipse.jgit.api.Git;
26	26	import org.eclipse.jgit.api.errors.GitAPIException;
27		-import org.eclipse.jgit.diff.*;
	27	+import org.eclipse.jgit.diff.DiffAlgorithm;
	28	+import org.eclipse.jgit.diff.DiffEntry;
	29	+import org.eclipse.jgit.diff.RawText;
	30	+import org.eclipse.jgit.diff.RawTextComparator;
28	31	import org.eclipse.jgit.lib.Repository;
29	32	import org.eclipse.jgit.revwalk.RevCommit;
30	33	import org.eclipse.jgit.transport.RefSpec;
31		-import org.junit.*;
32		-
33		-import org.tigris.subversion.javahl.ClientException;
	34	+import org.junit.After;
	35	+import org.junit.Before;
	36	+import org.junit.Test;
34	37	import org.tmatesoft.svn.core.SVNException;
35	38	import play.test.Helpers;
36		-import playRepository.*;
	39	+import playRepository.FileDiff;
	40	+import playRepository.GitRepository;
	41	+import playRepository.PlayRepository;
	42	+import playRepository.RepositoryService;
37	43
38	44	import javax.servlet.ServletException;
39	45	import java.io.File;
40	46	import java.io.IOException;
41	47	import java.text.ParseException;
42		-import java.util.*;
	48	+import java.util.ArrayList;
	49	+import java.util.List;
	50	+import java.util.Set;
43	51	import java.util.regex.Matcher;
44	52	import java.util.regex.Pattern;
45	53
...	...	@@ -58,7 +66,7 @@
58	66
59	67	@Before
60	68	public void initRepositories() throws IOException, GitAPIException, ServletException,
61		- ClientException, PullRequestException {
	69	+ PullRequestException, SVNException {
62	70	GitRepository.setRepoPrefix(REPO_PREFIX);
63	71
64	72	app = support.Helpers.makeTestApplication();

...	...	@@ -24,11 +24,11 @@
24	24	// Symlink support for Java7
25	25	"org.eclipse.jgit" % "org.eclipse.jgit.java7" % "3.5.3.201412180710-r",
26	26	// svnkit
27		- "sonia.svnkit" % "svnkit" % "1.7.10-scm3",
	27	+ "sonia.svnkit" % "svnkit" % "1.8.5-scm2",
28	28	// svnkit-dav
29		- "sonia.svnkit" % "svnkit-dav" % "1.7.10-scm3",
	29	+ "sonia.svnkit" % "svnkit-dav" % "1.8.5-scm2",
30	30	// javahl
31		- "sonia.svnkit" % "svnkit-javahl16" % "1.7.10-scm3",
	31	+ "sonia.svnkit" % "svnkit-javahl16" % "1.8.5-scm2",
32	32	"net.sourceforge.jexcelapi" % "jxl" % "2.6.10",
33	33	// shiro
34	34	"org.apache.shiro" % "shiro-core" % "1.2.1",

Delete comment