Author: jbonofre
Date: Wed Sep 7 14:56:51 2011
New Revision: 1166207
URL: http://svn.apache.org/viewvc?rev=1166207&view=rev
Log:
OBR metadata are updated by default in Cave commands
Added:
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/UpdateRepositoryCommand.java
- copied, changed from r1166160,
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ScanRepositoryCommand.java
Modified:
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ScanRepositoryCommand.java
karaf/cave/trunk/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml
Modified:
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java?rev=1166207&r1=1166206&r2=1166207&view=diff
==============================================================================
---
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java
(original)
+++
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java
Wed Sep 7 14:56:51 2011
@@ -30,11 +30,11 @@ public class CreateRepositoryCommand ext
@Option(name = "-l", aliases = {"--location"}, description = "Location of
the new Cave Repository on the file system", required = false, multiValued =
false)
String location;
- @Option(name = "-s", aliases = {"--scan"}, description = "If the Cave
Repository should be scanned now", required = false, multiValued = false)
- boolean scan;
+ @Option(name = "-nu", aliases = {"--no-update"}, description = "Disable
the OBR metadata generation at creation time", required = false, multiValued =
false)
+ boolean noUpdate = false;
- @Option(name = "-r", aliases = {"--register"}, description = "If the Cave
Repository should be registered in Karaf OBR", required = false, multiValued =
false)
- boolean register;
+ @Option(name = "-nr", aliases = {"--no-register"}, description = "Disable
the registration of this Cave Repository in the OBR service", required = false,
multiValued = false)
+ boolean noRegister;
@Argument(index = 0, name = "name", description = "The name of the Cave
Repository", required = true, multiValued = false)
String name = null;
@@ -46,10 +46,10 @@ public class CreateRepositoryCommand ext
getCaveRepositoryService().createRepository(name, false);
}
CaveRepository caveRepository = getExistingRepository(name);
- if (scan) {
+ if (!noUpdate) {
caveRepository.scan();
}
- if (register) {
+ if (!noRegister) {
getCaveRepositoryService().register(name);
}
return null;
Modified:
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java
URL:
http://svn.apache.org/viewvc/karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java?rev=1166207&r1=1166206&r2=1166207&view=diff
==============================================================================
---
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java
(original)
+++
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java
Wed Sep 7 14:56:51 2011
@@ -29,8 +29,8 @@ import java.net.URL;
@Command(scope = "cave", name = "populate-repository", description = "Populate
a Karaf Cave repository with the artifacts present at the given URL")
public class PopulateRepositoryCommand extends CaveRepositoryCommandSupport {
- @Option(name = "-u", aliases = { "--update" }, description = "Update the
OBR metadata on the fly", required = false, multiValued = false)
- boolean update = false;
+ @Option(name = "-nu", aliases = { "--no-update" }, description = "Update
the OBR metadata on the fly", required = false, multiValued = false)
+ boolean noUpdate = false;
@Argument(index = 0, name = "name", description = "The name of the Karaf
Cave repository", required = true, multiValued = false)
String name = null;
@@ -40,7 +40,7 @@ public class PopulateRepositoryCommand e
protected Object doExecute() throws Exception {
CaveRepository repository = getExistingRepository(name);
- repository.populate(new URL(url), update);
+ repository.populate(new URL(url), !noUpdate);
return null;
}
Copied:
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/UpdateRepositoryCommand.java
(from r1166160,
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ScanRepositoryCommand.java)
URL:
http://svn.apache.org/viewvc/karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/UpdateRepositoryCommand.java?p2=karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/UpdateRepositoryCommand.java&p1=karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ScanRepositoryCommand.java&r1=1166160&r2=1166207&rev=1166207&view=diff
==============================================================================
---
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ScanRepositoryCommand.java
(original)
+++
karaf/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/UpdateRepositoryCommand.java
Wed Sep 7 14:56:51 2011
@@ -21,10 +21,10 @@ import org.apache.felix.gogo.commands.Co
import org.apache.karaf.cave.server.api.CaveRepository;
/**
- * Command to scan an existing repository and update the OBR metadata
+ * Command to update the OBR metadata
*/
-@Command(scope = "cave", name = "scan-repository", description = "Scan an
existing Karaf Cave repository and update OBR metadata")
-public class ScanRepositoryCommand extends CaveRepositoryCommandSupport {
+@Command(scope = "cave", name = "update-repository", description = "Update OBR
metadata of a Cave Repository")
+public class UpdateRepositoryCommand extends CaveRepositoryCommandSupport {
@Argument(index = 0, name = "name", description = "The name of the Karaf
Cave repository", required = true, multiValued = false)
String name = null;
Modified:
karaf/cave/trunk/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml
URL:
http://svn.apache.org/viewvc/karaf/cave/trunk/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml?rev=1166207&r1=1166206&r2=1166207&view=diff
==============================================================================
---
karaf/cave/trunk/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml
(original)
+++
karaf/cave/trunk/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml
Wed Sep 7 14:56:51 2011
@@ -50,8 +50,8 @@
<null/>
</completers>
</command>
- <command name="cave/scan-repository">
- <action
class="org.apache.karaf.cave.server.command.ScanRepositoryCommand">
+ <command name="cave/update-repository">
+ <action
class="org.apache.karaf.cave.server.command.UpdateRepositoryCommand">
<property name="caveRepositoryService"
ref="caveRepositoryService"/>
</action>
<completers>
