[KARAF-869] Rid off Cave repository destroy action git-svn-id: https://svn.apache.org/repos/asf/karaf/cave/trunk@1172507 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/815cf5b5 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/815cf5b5 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/815cf5b5 Branch: refs/heads/master Commit: 815cf5b5ac32a74c167e15f41f6d96e233fb1416 Parents: 4fee922 Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Mon Sep 19 08:24:37 2011 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Mon Sep 19 08:24:37 2011 +0000 ---------------------------------------------------------------------- .../cave/server/api/CaveRepositoryService.java | 11 ------- .../command/DestroyRepositoryCommand.java | 34 -------------------- .../server/command/RemoveRepositoryCommand.java | 2 +- .../OSGI-INF/blueprint/cave-server-commands.xml | 9 ------ .../server/management/CaveRepositoryMBean.java | 2 +- .../internal/CaveRepositoryMBeanImpl.java | 4 +-- .../storage/CaveRepositoryServiceImpl.java | 14 -------- 7 files changed, 4 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/815cf5b5/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 4e99e79..8bbd9ff 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,17 +52,6 @@ public interface CaveRepositoryService { CaveRepository createRepository(String name, String location, boolean scan) throws Exception; /** - * Destroy an existing Karaf Cave repository. - * Warning: destroy also remove the Karaf Cave repository storage. - * - * @param name the name of Karaf Cave repository to destroy. - * @throws Exception in case of destroy failure. - */ - @POST - @Consumes("text/plain") - void destroy(String name) throws Exception; - - /** * Remove an existing Karaf Cave repository from the registry. * NB: the Karaf Cave repository storage is not removed. * http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/815cf5b5/server/command/src/main/java/org/apache/karaf/cave/server/command/DestroyRepositoryCommand.java ---------------------------------------------------------------------- diff --git a/server/command/src/main/java/org/apache/karaf/cave/server/command/DestroyRepositoryCommand.java b/server/command/src/main/java/org/apache/karaf/cave/server/command/DestroyRepositoryCommand.java deleted file mode 100644 index 8cb4490..0000000 --- a/server/command/src/main/java/org/apache/karaf/cave/server/command/DestroyRepositoryCommand.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.cave.server.command; - -import org.apache.felix.gogo.commands.Argument; - -/** - * Destroy a Karaf Cave repository (including content). - */ -public class DestroyRepositoryCommand extends CaveRepositoryCommandSupport { - - @Argument(index = 0, name = "name", description = "The Karaf Cave repository name", required = true, multiValued = false) - String name = null; - - protected Object doExecute() throws Exception { - getCaveRepositoryService().destroy(name); - return null; - } - -} http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/815cf5b5/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 5c9a39b..73504fc 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 @@ -27,7 +27,7 @@ public class RemoveRepositoryCommand extends CaveRepositoryCommandSupport { String name = null; protected Object doExecute() throws Exception { - getCaveRepositoryService().destroy(name); + getCaveRepositoryService().remove(name); return null; } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/815cf5b5/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml ---------------------------------------------------------------------- diff --git a/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml b/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml index feb6a04..e88a63f 100644 --- a/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml +++ b/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml @@ -41,15 +41,6 @@ <null/> </completers> </command> - <command name="cave/destroy-repository"> - <action class="org.apache.karaf.cave.server.command.DestroyRepositoryCommand"> - <property name="caveRepositoryService" ref="caveRepositoryService"/> - </action> - <completers> - <ref component-id="repositoryCompleter"/> - <null/> - </completers> - </command> <command name="cave/update-repository"> <action class="org.apache.karaf.cave.server.command.UpdateRepositoryCommand"> <property name="caveRepositoryService" ref="caveRepositoryService"/> http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/815cf5b5/server/management/src/main/java/org/apache/karaf/cave/server/management/CaveRepositoryMBean.java ---------------------------------------------------------------------- diff --git a/server/management/src/main/java/org/apache/karaf/cave/server/management/CaveRepositoryMBean.java b/server/management/src/main/java/org/apache/karaf/cave/server/management/CaveRepositoryMBean.java index 5936d1a..cc50dd3 100644 --- a/server/management/src/main/java/org/apache/karaf/cave/server/management/CaveRepositoryMBean.java +++ b/server/management/src/main/java/org/apache/karaf/cave/server/management/CaveRepositoryMBean.java @@ -23,6 +23,6 @@ public interface CaveRepositoryMBean { TabularData getCaveRepositories() throws Exception; void createRepository(String name) throws Exception; - void destroyRepository(String name) throws Exception; + void removeRepository(String name) throws Exception; } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/815cf5b5/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 0421700..8e0ffa2 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 @@ -68,8 +68,8 @@ public class CaveRepositoryMBeanImpl extends StandardMBean implements CaveReposi caveRepositoryService.createRepository(name, true); } - public void destroyRepository(String name) throws Exception { - caveRepositoryService.destroy(name); + public void removeRepository(String name) throws Exception { + caveRepositoryService.remove(name); } } http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/815cf5b5/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 87fcec5..312f7ae 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 @@ -95,20 +95,6 @@ public class CaveRepositoryServiceImpl implements CaveRepositoryService { } /** - * Destroy a Karaf Cave repository. - * - * @param name the name of Karaf Cave repository to destroy. - * @throws Exception in case of destroy failure. - */ - public synchronized void destroy(String name) throws Exception { - CaveRepository repository = this.getRepository(name); - if (repository != null) { - repository.cleanup(); - repositories.remove(name); - } - } - - /** * Register a Karaf Cave repository in the OBR service. * NB: this method allows refresh the repository in the OBR "client". *
