From 3c2517e2d725350d652e526f2c64c8265694554e Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 2 Mar 2012 16:40:47 +0000 Subject: [PATCH] Improve import maven dependencies git-svn-id: https://svn.argeo.org/slc/trunk@5138 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/main/java/org/argeo/slc/repo/RepoConstants.java | 2 ++ .../org/argeo/slc/repo/maven/ImportMavenDependencies.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java index e304907e2..d112b64be 100644 --- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java +++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java @@ -6,4 +6,6 @@ public interface RepoConstants { public final static String REPO_BASEPATH = "/slc:repo"; public final static String PROXIED_REPOSITORIES = REPO_BASEPATH + "/slc:sources"; + public final static String DISTRIBUTIONS_BASE_PATH = REPO_BASEPATH + + "/slc:distributions"; } diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java index 962e429ea..2ad3e7b5a 100644 --- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java +++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java @@ -57,7 +57,7 @@ public class ImportMavenDependencies implements Runnable { private Session jcrSession; private String artifactBasePath = RepoConstants.ARTIFACTS_BASE_PATH; - private String distributionsBasePath = "/slc/repo/distributions"; + private String distributionsBasePath = RepoConstants.DISTRIBUTIONS_BASE_PATH; private String distributionName; private ArtifactIndexer artifactIndexer = new ArtifactIndexer(); @@ -141,7 +141,8 @@ public class ImportMavenDependencies implements Runnable { } try { - String parentPath = artifactBasePath + '/' + String parentPath = artifactBasePath + + (artifactBasePath.endsWith("/") ? "" : "/") + artifactParentPath(artifact); Node parentNode; if (!jcrSession.itemExists(parentPath)) { -- 2.39.2