Merge branch 'gradle-deploy'

Author: bozaro

git-as-svn/build.gradle

@@ -41,3 +41,33 @@ tasks.withType(JavaCompile) {
 test {
   useTestNG()
 }
+
+jar {
+  manifest {
+    attributes(
+        "Main-Class": "svnserver.server.Main",
+        "Class-Path": "${-> createLauncherClassPath()}"
+    )
+  }
+}
+
+task deployJars(dependsOn: jar) << {
+  def projectArtifacts = configurations.archives.artifacts*.file
+  def fullArtifacts = configurations.archives.artifacts*.file + configurations.runtime.files
+  copy {
+    from fullArtifacts.intersect(projectArtifacts)
+    from "config.example"
+    into "${project.buildDir}/deploy"
+  }
+  copy {
+    from fullArtifacts.minus(projectArtifacts)
+    into "${project.buildDir}/deploy/vendors"
+  }
+}
+
+def createLauncherClassPath() {
+  def projectArtifacts = configurations.archives.artifacts*.file
+  def fullArtifacts = configurations.archives.artifacts*.file + configurations.runtime.files
+  def vendorJars = fullArtifacts.minus(projectArtifacts).collect { "vendors/${it.name}" }
+  return vendorJars.join(" ")
+}

git-as-svn/src/main/java/svnserver/repository/git/GitRepository.java

@@ -61,6 +61,7 @@ public class GitRepository implements VcsRepository {
 
   public GitRepository(@NotNull RepositoryConfig config) throws IOException, SVNException {
     this.repository = new FileRepository(new File(config.getPath()).getAbsolutePath());
+    log.info("Repository path: {}", repository.getDirectory());
     final Ref branchRef = repository.getRef(config.getBranch());
     if (branchRef == null) {
       throw new IOException("Branch not found: " + config.getBranch());

git-as-svn/src/main/java/svnserver/server/Main.java

@@ -49,7 +49,7 @@ public static class CmdArgs {
     @NotNull
     private File configuration;
 
-    @Parameter(names = {"--show-config"}, description = "Show actual configuration on start")
+    @Parameter(names = {"-s", "--show-config"}, description = "Show actual configuration on start")
     private boolean showConfig = false;
 
     @Parameter(names = {"-h", "--help"}, description = "Show help", help = true)