[KARAF-871] Start renaming of API git-svn-id: https://svn.apache.org/repos/asf/karaf/cave/trunk@1510291 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/24b8c835 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/24b8c835 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/24b8c835 Branch: refs/heads/master Commit: 24b8c835ae5e4a44413460849cfd7c3643c3c5c5 Parents: cd892b1 Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Sun Aug 4 18:09:07 2013 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Sun Aug 4 18:09:07 2013 +0000 ---------------------------------------------------------------------- .../apache/karaf/cave/server/api/CaveRepositoryService.java | 8 ++++---- .../karaf/cave/server/command/CreateRepositoryCommand.java | 2 +- .../karaf/cave/server/command/PopulateRepositoryCommand.java | 2 +- .../karaf/cave/server/command/ProxyRepositoryCommand.java | 2 +- .../karaf/cave/server/command/RegisterRepositoryCommand.java | 2 +- .../karaf/cave/server/command/RemoveRepositoryCommand.java | 2 +- .../karaf/cave/server/command/UploadArtifactCommand.java | 2 +- .../server/management/internal/CaveRepositoryMBeanImpl.java | 2 +- .../karaf/cave/server/storage/CaveRepositoryServiceImpl.java | 8 ++++---- 9 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/24b8c835/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepositoryService.java ---------------------------------------------------------------------- diff --git a/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepositoryService.java b/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepositoryService.java index 8bbd9ff..945d813 100644 --- a/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepositoryService.java +++ b/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepositoryService.java @@ -52,23 +52,23 @@ public interface CaveRepositoryService { CaveRepository createRepository(String name, String location, boolean scan) throws Exception; /** - * Remove an existing Karaf Cave repository from the registry. + * Uninstall (remove) an existing Karaf Cave repository from the OBR registry. * NB: the Karaf Cave repository storage is not removed. * * @param name the name of Karaf Cave repository to remove. * @throws Exception in case of remove failure. */ - void remove(String name) throws Exception; + void uninstall(String name) throws Exception; /** - * Register a Karaf Cave repository into the OBR. + * Install (register) a Karaf Cave repository into the OBR registry. * * @param name the name of the Karaf Cave repository. * @throws Exception in case of registration failure. */ @POST @Consumes("text/plain") - void register(String name) throws Exception; + void install(String name) throws Exception; /** * Get the list of all Karaf Cave repositories. http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/24b8c835/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java ---------------------------------------------------------------------- diff --git a/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java b/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java index 425900d..c54a10e 100644 --- a/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java +++ b/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java @@ -50,7 +50,7 @@ public class CreateRepositoryCommand extends CaveRepositoryCommandSupport { caveRepository.scan(); } if (!noRegister) { - getCaveRepositoryService().register(name); + getCaveRepositoryService().install(name); } return null; } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/24b8c835/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java ---------------------------------------------------------------------- diff --git a/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java b/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java index c9e7913..f0e1f07 100644 --- a/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java +++ b/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java @@ -45,7 +45,7 @@ public class PopulateRepositoryCommand extends CaveRepositoryCommandSupport { CaveRepository repository = getExistingRepository(name); repository.populate(new URL(url), filter, !noUpdate); if (!noUpdate) { - getCaveRepositoryService().register(name); + getCaveRepositoryService().install(name); } return null; } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/24b8c835/server/command/src/main/java/org/apache/karaf/cave/server/command/ProxyRepositoryCommand.java ---------------------------------------------------------------------- diff --git a/server/command/src/main/java/org/apache/karaf/cave/server/command/ProxyRepositoryCommand.java b/server/command/src/main/java/org/apache/karaf/cave/server/command/ProxyRepositoryCommand.java index 0ea5373..8d7bba1 100644 --- a/server/command/src/main/java/org/apache/karaf/cave/server/command/ProxyRepositoryCommand.java +++ b/server/command/src/main/java/org/apache/karaf/cave/server/command/ProxyRepositoryCommand.java @@ -45,7 +45,7 @@ public class ProxyRepositoryCommand extends CaveRepositoryCommandSupport { CaveRepository repository = getExistingRepository(name); repository.proxy(new URL(url), filter); if (!noUpdate) { - getCaveRepositoryService().register(name); + getCaveRepositoryService().install(name); } return null; } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/24b8c835/server/command/src/main/java/org/apache/karaf/cave/server/command/RegisterRepositoryCommand.java ---------------------------------------------------------------------- diff --git a/server/command/src/main/java/org/apache/karaf/cave/server/command/RegisterRepositoryCommand.java b/server/command/src/main/java/org/apache/karaf/cave/server/command/RegisterRepositoryCommand.java index d413cc1..1dbda52 100644 --- a/server/command/src/main/java/org/apache/karaf/cave/server/command/RegisterRepositoryCommand.java +++ b/server/command/src/main/java/org/apache/karaf/cave/server/command/RegisterRepositoryCommand.java @@ -30,7 +30,7 @@ public class RegisterRepositoryCommand extends CaveRepositoryCommandSupport { String name = null; protected Object doExecute() throws Exception { - getCaveRepositoryService().register(name); + getCaveRepositoryService().install(name); return null; } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/24b8c835/server/command/src/main/java/org/apache/karaf/cave/server/command/RemoveRepositoryCommand.java ---------------------------------------------------------------------- diff --git a/server/command/src/main/java/org/apache/karaf/cave/server/command/RemoveRepositoryCommand.java b/server/command/src/main/java/org/apache/karaf/cave/server/command/RemoveRepositoryCommand.java index 8111449..c43650f 100644 --- a/server/command/src/main/java/org/apache/karaf/cave/server/command/RemoveRepositoryCommand.java +++ b/server/command/src/main/java/org/apache/karaf/cave/server/command/RemoveRepositoryCommand.java @@ -29,7 +29,7 @@ public class RemoveRepositoryCommand extends CaveRepositoryCommandSupport { String name = null; protected Object doExecute() throws Exception { - getCaveRepositoryService().remove(name); + getCaveRepositoryService().uninstall(name); return null; } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/24b8c835/server/command/src/main/java/org/apache/karaf/cave/server/command/UploadArtifactCommand.java ---------------------------------------------------------------------- diff --git a/server/command/src/main/java/org/apache/karaf/cave/server/command/UploadArtifactCommand.java b/server/command/src/main/java/org/apache/karaf/cave/server/command/UploadArtifactCommand.java index b61707e..72e7ae9 100644 --- a/server/command/src/main/java/org/apache/karaf/cave/server/command/UploadArtifactCommand.java +++ b/server/command/src/main/java/org/apache/karaf/cave/server/command/UploadArtifactCommand.java @@ -42,7 +42,7 @@ public class UploadArtifactCommand extends CaveRepositoryCommandSupport { CaveRepository caveRepository = getExistingRepository(name); caveRepository.upload(new URL(url)); if (!noUpdate) { - getCaveRepositoryService().register(name); + getCaveRepositoryService().install(name); } return null; } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/24b8c835/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java ---------------------------------------------------------------------- diff --git a/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java b/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java index 8e0ffa2..f4c1d47 100644 --- a/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java +++ b/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java @@ -69,7 +69,7 @@ public class CaveRepositoryMBeanImpl extends StandardMBean implements CaveReposi } public void removeRepository(String name) throws Exception { - caveRepositoryService.remove(name); + caveRepositoryService.uninstall(name); } } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/24b8c835/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryServiceImpl.java b/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryServiceImpl.java index e216fc9..194e3b8 100644 --- a/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryServiceImpl.java +++ b/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryServiceImpl.java @@ -82,12 +82,12 @@ public class CaveRepositoryServiceImpl implements CaveRepositoryService { } /** - * Remove a Karaf Cave repository from the repositories registry. + * Uninstall (remove) a Karaf Cave repository from the repositories registry. * * @param name the name of Karaf Cave repository to remove. * @throws Exception in case of remove failure. */ - public synchronized void remove(String name) throws Exception { + public synchronized void uninstall(String name) throws Exception { CaveRepository repository = this.getRepository(name); if (repository != null) { repositoryAdmin.removeRepository(repository.getRepositoryXml().toString()); @@ -98,13 +98,13 @@ public class CaveRepositoryServiceImpl implements CaveRepositoryService { } /** - * Register a Karaf Cave repository in the OBR service. + * Install (register) a Karaf Cave repository in the OBR service. * NB: this method allows refresh the repository in the OBR "client". * * @param name the name of the Karaf Cave repository. * @throws Exception in case of registration failure. */ - public synchronized void register(String name) throws Exception { + public synchronized void install(String name) throws Exception { CaveRepository caveRepository = this.getRepository(name); if (caveRepository != null) { repositoryAdmin.addRepository(caveRepository.getRepositoryXml());
