From aeaa45c7cfbb4f2376a4ec02e6dd71d711a52c5b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 21 Aug 2012 15:00:18 +0000 Subject: [PATCH] Rename default artifact base path git-svn-id: https://svn.argeo.org/slc/trunk@5528 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../java/org/argeo/slc/repo/ArtifactIndexer.java | 4 ++-- .../main/java/org/argeo/slc/repo/RepoConstants.java | 2 +- .../src/main/java/org/argeo/slc/repo/RepoImpl.java | 2 +- .../slc/repo/maven/ImportMavenDependencies.java | 2 +- .../org/argeo/slc/repo/maven/IndexDistribution.java | 2 +- .../slc/repo/maven/proxy/MavenProxyServiceImpl.java | 13 ++++++++----- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java index 896071151..a0f0be25b 100644 --- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java +++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java @@ -122,7 +122,7 @@ public class ArtifactIndexer implements NodeIndexer { artifact.getGroupId()); } JcrUtils.updateLastModifiedAndParents(groupBase, - RepoConstants.ARTIFACTS_BASE_PATH); + RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH); if (log.isTraceEnabled()) log.trace("Indexed artifact " + artifact + " on " + fileNode); @@ -133,7 +133,7 @@ public class ArtifactIndexer implements NodeIndexer { } private String getRelativePath(String nodePath) { - String basePath = RepoConstants.ARTIFACTS_BASE_PATH; + String basePath = RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH; if (!nodePath.startsWith(basePath)) return null; String relativePath = nodePath.substring(basePath.length()); 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 f1499e6fd..6696bfb7b 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 @@ -17,7 +17,7 @@ package org.argeo.slc.repo; /** SLC repository constants */ public interface RepoConstants { - public final static String ARTIFACTS_BASE_PATH = "/"; + public final static String DEFAULT_ARTIFACTS_BASE_PATH = "/"; public final static String REPO_BASEPATH = "/slc:repo"; public final static String PROXIED_REPOSITORIES = REPO_BASEPATH + "/slc:sources"; diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoImpl.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoImpl.java index 380916d82..83794e5f4 100644 --- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoImpl.java +++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoImpl.java @@ -49,7 +49,7 @@ public class RepoImpl { .getWorkspace() .getObservationManager() .addEventListener(artifactListener, Event.NODE_ADDED, - RepoConstants.ARTIFACTS_BASE_PATH, true, null, + RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH, true, null, null, true); // localrepo String localrepoWorkspace = "localrepo"; 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 e6e51741b..19d7c8d8c 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 @@ -62,7 +62,7 @@ public class ImportMavenDependencies implements Runnable { private Repository repository; private String workspace; - private String artifactBasePath = RepoConstants.ARTIFACTS_BASE_PATH; + private String artifactBasePath = RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH; private ArtifactIndexer artifactIndexer = new ArtifactIndexer(); private JarFileIndexer jarFileIndexer = new JarFileIndexer(); diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/IndexDistribution.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/IndexDistribution.java index a823a2478..6f69aa59b 100644 --- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/IndexDistribution.java +++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/IndexDistribution.java @@ -39,7 +39,7 @@ public class IndexDistribution implements Runnable { private Repository repository; private String workspace; - private String artifactBasePath = RepoConstants.ARTIFACTS_BASE_PATH; + private String artifactBasePath = RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH; private String distributionsBasePath = RepoConstants.DISTRIBUTIONS_BASE_PATH; private String distributionName; diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java index ee5c5ff5c..ef9369799 100644 --- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java +++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java @@ -43,14 +43,13 @@ public class MavenProxyServiceImpl extends AbstractUrlProxy implements private List defaultRepositories = new ArrayList(); - private boolean rootNodeIsArtifactBase = RepoConstants.ARTIFACTS_BASE_PATH - .equals("/"); + private String artifactsBasePath = RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH; /** Inititalizes the artifacts area. */ @Override protected void beforeInitSessionSave(Session session) throws RepositoryException { - JcrUtils.mkdirsSafe(session, RepoConstants.ARTIFACTS_BASE_PATH); + JcrUtils.mkdirsSafe(session, RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH); Node proxiedRepositories = JcrUtils.mkdirsSafe(session, RepoConstants.PROXIED_REPOSITORIES); for (RemoteRepository repository : defaultRepositories) { @@ -112,10 +111,10 @@ public class MavenProxyServiceImpl extends AbstractUrlProxy implements /** The JCR path where this file could be found */ public String getNodePath(String path) { - if (rootNodeIsArtifactBase) + if (artifactsBasePath.equals(RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH)) return path; else - return RepoConstants.ARTIFACTS_BASE_PATH + path; + return artifactsBasePath + path; } public void setDefaultRepositories( @@ -123,4 +122,8 @@ public class MavenProxyServiceImpl extends AbstractUrlProxy implements this.defaultRepositories = defaultRepositories; } + public void setArtifactsBasePath(String artifactsBasePath) { + this.artifactsBasePath = artifactsBasePath; + } + } -- 2.39.2