You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/08/11 19:52:23 UTC
svn commit: r1156706 - in /karaf/sandbox/jbonofre/cave/trunk/server:
backend/api/ backend/filesystem/
backend/filesystem/src/main/resources/OSGI-INF/blueprint/ command/
command/src/main/java/org/apache/karaf/cave/server/command/
command/src/main/java/o...
Author: jbonofre
Date: Thu Aug 11 17:52:22 2011
New Revision: 1156706
URL: http://svn.apache.org/viewvc?rev=1156706&view=rev
Log:
Fix filesystem backend Import-Package statement.
Add the list-repositories command.
Added:
karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ListRepositoryCommand.java
Modified:
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/resources/OSGI-INF/blueprint/cave-filesystem-backend.xml
karaf/sandbox/jbonofre/cave/trunk/server/command/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/completers/RepositoryCompleter.java
karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml
Modified: karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml?rev=1156706&r1=1156705&r2=1156706&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml Thu Aug 11 17:52:22 2011
@@ -40,6 +40,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.apache.karaf.cave.server.backend.api
</Export-Package>
Modified: karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml?rev=1156706&r1=1156705&r2=1156706&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml Thu Aug 11 17:52:22 2011
@@ -50,7 +50,9 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration> <instructions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
org.apache.karaf.cave.server.backend.api;version="${project.version}",
org.slf4j*;resolution:=optional,
@@ -60,6 +62,7 @@
org.osgi.service.log,
org.osgi.service.url,
!org.apache.felix.shell,
+ !org.apache.felix.bundlerepository.impl.wrapper,
!org.osgi.service.obr,
!javax.xml.stream,
</Import-Package>
@@ -67,7 +70,7 @@
org.kxml2.io,
org.xmlpull.v1,
org.apache.felix.utils*,
- org.apache.felix.bundlerepository.impl,
+ org.apache.felix.bundlerepository.impl*,
org.apache.karaf.cave.server.backend.impl
</Private-Package>
</instructions>
Modified: karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/resources/OSGI-INF/blueprint/cave-filesystem-backend.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/resources/OSGI-INF/blueprint/cave-filesystem-backend.xml?rev=1156706&r1=1156705&r2=1156706&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/resources/OSGI-INF/blueprint/cave-filesystem-backend.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/resources/OSGI-INF/blueprint/cave-filesystem-backend.xml Thu Aug 11 17:52:22 2011
@@ -22,7 +22,7 @@
default-activation="lazy">
<bean id="caveRepositoryService" class="org.apache.karaf.cave.server.backend.impl.CaveRepositoryServiceImpl">
- <property name="storageLocation" value="${karaf.cave.repositories}"/>
+ <property name="storageLocation" value="cave"/>
</bean>
<service ref="caveRepositoryService" interface="org.apache.karaf.cave.server.backend.api.CaveRepositoryService"/>
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/pom.xml?rev=1156706&r1=1156705&r2=1156706&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/pom.xml Thu Aug 11 17:52:22 2011
@@ -52,6 +52,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
Added: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ListRepositoryCommand.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ListRepositoryCommand.java?rev=1156706&view=auto
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ListRepositoryCommand.java (added)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ListRepositoryCommand.java Thu Aug 11 17:52:22 2011
@@ -0,0 +1,39 @@
+/*
+ * 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.karaf.cave.server.backend.api.CaveRepository;
+
+/**
+ * Command to list all Karaf Cave repositories available.
+ */
+public class ListRepositoryCommand extends CaveRepositoryCommandSupport {
+
+ private static final String OUTPUT_FORMAT = "%-20s %-20s";
+
+ protected Object doExecute() throws Exception {
+ CaveRepository[] repositories = getCaveRepositoryService().getRepositories();
+
+ System.out.println(String.format(OUTPUT_FORMAT, "Name", "Location"));
+ for (int i = 0; i < repositories.length; i++) {
+ System.out.println(String.format(OUTPUT_FORMAT, "[" + repositories[i].getName() + "]", "[" + repositories[i].getLocation() + "]"));
+ }
+
+ return null;
+ }
+
+}
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/completers/RepositoryCompleter.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/completers/RepositoryCompleter.java?rev=1156706&r1=1156705&r2=1156706&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/completers/RepositoryCompleter.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/completers/RepositoryCompleter.java Thu Aug 11 17:52:22 2011
@@ -16,9 +16,9 @@
*/
package org.apache.karaf.cave.server.command.completers;
-import jline.console.completer.Completer;
import org.apache.karaf.cave.server.backend.api.CaveRepository;
import org.apache.karaf.cave.server.backend.api.CaveRepositoryService;
+import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
import java.util.List;
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml?rev=1156706&r1=1156705&r2=1156706&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/resources/OSGI-INF/blueprint/cave-server-commands.xml Thu Aug 11 17:52:22 2011
@@ -22,6 +22,11 @@
<reference id="caveRepositoryService" interface="org.apache.karaf.cave.server.backend.api.CaveRepositoryService"/>
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
+ <command name="cave/list-repository">
+ <action class="org.apache.karaf.cave.server.command.ListRepositoryCommand">
+ <property name="caveRepositoryService" ref="caveRepositoryService"/>
+ </action>
+ </command>
<command name="cave/create-repository">
<action class="org.apache.karaf.cave.server.command.CreateRepositoryCommand">
<property name="caveRepositoryService" ref="caveRepositoryService"/>