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/25 11:18:34 UTC
svn commit: r1161457 - in /karaf/sandbox/jbonofre/cave/trunk:
assembly/src/main/resources/ server/ server/api/ server/api/src/
server/api/src/main/ server/api/src/main/java/
server/api/src/main/java/org/ server/api/src/main/java/org/apache/
server/api/...
Author: jbonofre
Date: Thu Aug 25 09:18:32 2011
New Revision: 1161457
URL: http://svn.apache.org/viewvc?rev=1161457&view=rev
Log:
Refactoring of the Cave modules.
Complete HTTP service wrapper.
Added:
karaf/sandbox/jbonofre/cave/trunk/server/api/
karaf/sandbox/jbonofre/cave/trunk/server/api/pom.xml
- copied, changed from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/api/src/
karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/
karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/
karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/
karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/
karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/
karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/
karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/
karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/
karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepository.java
- copied, changed from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepository.java
karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepositoryService.java
- copied, changed from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepositoryService.java
karaf/sandbox/jbonofre/cave/trunk/server/storage/
karaf/sandbox/jbonofre/cave/trunk/server/storage/pom.xml
- copied, changed from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryImpl.java
- copied, changed from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryServiceImpl.java
- copied, changed from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/resources/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/resources/OSGI-INF/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/resources/OSGI-INF/blueprint/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/resources/OSGI-INF/blueprint/cave-storage.xml
- copied, changed from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/resources/OSGI-INF/blueprint/cave-filesystem-backend.xml
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/apache/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/apache/karaf/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/apache/karaf/cave/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/apache/karaf/cave/server/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/apache/karaf/cave/server/storage/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/apache/karaf/cave/server/storage/CaveRepositoryImplTest.java
- copied, changed from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/resources/
karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/resources/log4j.xml
- copied, changed from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/resources/log4j.xml
Removed:
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepository.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepositoryService.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/resources/OSGI-INF/blueprint/cave-filesystem-backend.xml
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/resources/log4j.xml
karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml
Modified:
karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.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/CaveRepositoryCommandSupport.java
karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java
karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ListRepositoriesCommand.java
karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java
karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ProxyRepositoryCommand.java
karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/RegisterRepositoryCommand.java
karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ScanRepositoryCommand.java
karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/UploadArtifactCommand.java
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
karaf/sandbox/jbonofre/cave/trunk/server/http/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/http/src/main/java/org/apache/karaf/cave/server/http/WrapperServlet.java
karaf/sandbox/jbonofre/cave/trunk/server/management/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java
karaf/sandbox/jbonofre/cave/trunk/server/management/src/main/resources/OSGI-INF/blueprint/cave-management.xml
karaf/sandbox/jbonofre/cave/trunk/server/pom.xml
Modified: karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.xml?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.xml Thu Aug 25 09:18:32 2011
@@ -27,15 +27,15 @@
<feature version="[2.4,3)">cxf</feature>
<feature>obr</feature>
<feature>war</feature>
- <configfile finalname="/etc/org.apache.karaf.cave.server.backend.filesystem.cfg">
+ <configfile finalname="/etc/org.apache.karaf.cave.server.storage.cfg">
mvn:org.apache.karaf.cave/apache-karaf-cave/${project.version}/cfg/filesystem
</configfile>
<bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient.version}</bundle>
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
<bundle>mvn:org.jsoup/jsoup/${jsoup.version}</bundle>
- <bundle>mvn:org.apache.karaf.cave.server.backend/org.apache.karaf.cave.server.backend.api/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.cave.server.backend/org.apache.karaf.cave.server.backend.filesystem/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.api/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.storage/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.management/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.command/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.http/${project.version}</bundle>
Copied: karaf/sandbox/jbonofre/cave/trunk/server/api/pom.xml (from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/api/pom.xml?p2=karaf/sandbox/jbonofre/cave/trunk/server/api/pom.xml&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml&r1=1161420&r2=1161457&rev=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/api/pom.xml Thu Aug 25 09:18:32 2011
@@ -22,15 +22,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.cave.server</groupId>
- <artifactId>org.apache.karaf.cave.server.backend</artifactId>
+ <groupId>org.apache.karaf.cave</groupId>
+ <artifactId>org.apache.karaf.cave.server</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.karaf.cave.server.backend</groupId>
- <artifactId>org.apache.karaf.cave.server.backend.api</artifactId>
- <name>Apache Karaf :: Cave :: Server :: Backend :: API</name>
+ <groupId>org.apache.karaf.cave.server</groupId>
+ <artifactId>org.apache.karaf.cave.server.api</artifactId>
+ <name>Apache Karaf :: Cave :: Server :: API</name>
<packaging>bundle</packaging>
<dependencies>
@@ -49,7 +49,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.karaf.cave.server.backend.api
+ org.apache.karaf.cave.server.api
</Export-Package>
</instructions>
</configuration>
Copied: karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepository.java (from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepository.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepository.java?p2=karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepository.java&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepository.java&r1=1161420&r2=1161457&rev=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepository.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepository.java Thu Aug 25 09:18:32 2011
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cave.server.backend.api;
+package org.apache.karaf.cave.server.api;
import javax.xml.bind.annotation.XmlRootElement;
-import java.io.OutputStream;
import java.net.URL;
/**
Copied: karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepositoryService.java (from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepositoryService.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepositoryService.java?p2=karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepositoryService.java&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepositoryService.java&r1=1161420&r2=1161457&rev=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepositoryService.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/api/src/main/java/org/apache/karaf/cave/server/api/CaveRepositoryService.java Thu Aug 25 09:18:32 2011
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cave.server.backend.api;
+package org.apache.karaf.cave.server.api;
import javax.ws.rs.*;
-import java.io.InputStream;
/**
* Service to manipulate a Cave repository.
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=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/pom.xml Thu Aug 25 09:18:32 2011
@@ -39,8 +39,8 @@
<artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.cave.server.backend</groupId>
- <artifactId>org.apache.karaf.cave.server.backend.api</artifactId>
+ <groupId>org.apache.karaf.cave.server</groupId>
+ <artifactId>org.apache.karaf.cave.server.api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -57,7 +57,7 @@
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console*;version="[2.2,4)",
- org.apache.karaf.cave.server.backend.api;version="${project.version}",
+ org.apache.karaf.cave.server.api;version="${project.version}",
*
</Import-Package>
</instructions>
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CaveRepositoryCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CaveRepositoryCommandSupport.java?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CaveRepositoryCommandSupport.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CaveRepositoryCommandSupport.java Thu Aug 25 09:18:32 2011
@@ -16,9 +16,8 @@
*/
package org.apache.karaf.cave.server.command;
-import org.apache.aries.blueprint.di.Repository;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
-import org.apache.karaf.cave.server.backend.api.CaveRepositoryService;
+import org.apache.karaf.cave.server.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepositoryService;
import org.apache.karaf.shell.console.OsgiCommandSupport;
/**
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/CreateRepositoryCommand.java Thu Aug 25 09:18:32 2011
@@ -19,7 +19,7 @@ package org.apache.karaf.cave.server.com
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepository;
/**
* Command to create a Karaf Cave repository.
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ListRepositoriesCommand.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ListRepositoriesCommand.java?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ListRepositoriesCommand.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ListRepositoriesCommand.java Thu Aug 25 09:18:32 2011
@@ -17,7 +17,7 @@
package org.apache.karaf.cave.server.command;
import org.apache.felix.gogo.commands.Command;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepository;
/**
* Command to list all Karaf Cave repositories available.
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/PopulateRepositoryCommand.java Thu Aug 25 09:18:32 2011
@@ -19,7 +19,7 @@ package org.apache.karaf.cave.server.com
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepository;
import java.net.URL;
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ProxyRepositoryCommand.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ProxyRepositoryCommand.java?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ProxyRepositoryCommand.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ProxyRepositoryCommand.java Thu Aug 25 09:18:32 2011
@@ -18,7 +18,7 @@ package org.apache.karaf.cave.server.com
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepository;
import java.net.URL;
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/RegisterRepositoryCommand.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/RegisterRepositoryCommand.java?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/RegisterRepositoryCommand.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/RegisterRepositoryCommand.java Thu Aug 25 09:18:32 2011
@@ -18,7 +18,7 @@ package org.apache.karaf.cave.server.com
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepository;
/**
* Command to register a Karaf Cave repository into the Karaf OBR.
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ScanRepositoryCommand.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ScanRepositoryCommand.java?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ScanRepositoryCommand.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/ScanRepositoryCommand.java Thu Aug 25 09:18:32 2011
@@ -18,7 +18,7 @@ package org.apache.karaf.cave.server.com
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepository;
/**
* Command to scan an existing repository and update the OBR metadata
Modified: karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/UploadArtifactCommand.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/UploadArtifactCommand.java?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/UploadArtifactCommand.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/command/src/main/java/org/apache/karaf/cave/server/command/UploadArtifactCommand.java Thu Aug 25 09:18:32 2011
@@ -18,7 +18,7 @@ package org.apache.karaf.cave.server.com
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepository;
import java.net.URL;
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=1161457&r1=1161456&r2=1161457&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 25 09:18:32 2011
@@ -16,8 +16,8 @@
*/
package org.apache.karaf.cave.server.command.completers;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
-import org.apache.karaf.cave.server.backend.api.CaveRepositoryService;
+import org.apache.karaf.cave.server.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepositoryService;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
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=1161457&r1=1161456&r2=1161457&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 25 09:18:32 2011
@@ -19,7 +19,7 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
- <reference id="caveRepositoryService" interface="org.apache.karaf.cave.server.backend.api.CaveRepositoryService"/>
+ <reference id="caveRepositoryService" interface="org.apache.karaf.cave.server.api.CaveRepositoryService"/>
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
<command name="cave/list-repositories">
Modified: karaf/sandbox/jbonofre/cave/trunk/server/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/http/pom.xml?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/http/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/http/pom.xml Thu Aug 25 09:18:32 2011
@@ -45,8 +45,8 @@
<artifactId>org.apache.felix.bundlerepository</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.cave.server.backend</groupId>
- <artifactId>org.apache.karaf.cave.server.backend.api</artifactId>
+ <groupId>org.apache.karaf.cave.server</groupId>
+ <artifactId>org.apache.karaf.cave.server.api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -66,6 +66,10 @@
<Export-Package>
org.apache.karaf.cave.server.http*;version=${project.version}
</Export-Package>
+ <Import-Package>
+ org.apache.karaf.cave.server.api*;version=${project.version},
+ *
+ </Import-Package>
<Webapp-Context>/cave</Webapp-Context>
<Web-ContextPath>/cave</Web-ContextPath>
</instructions>
Modified: karaf/sandbox/jbonofre/cave/trunk/server/http/src/main/java/org/apache/karaf/cave/server/http/WrapperServlet.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/http/src/main/java/org/apache/karaf/cave/server/http/WrapperServlet.java?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/http/src/main/java/org/apache/karaf/cave/server/http/WrapperServlet.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/http/src/main/java/org/apache/karaf/cave/server/http/WrapperServlet.java Thu Aug 25 09:18:32 2011
@@ -16,11 +16,10 @@
*/
package org.apache.karaf.cave.server.http;
-import com.sun.org.omg.CORBA.Repository;
import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.apache.felix.bundlerepository.Resource;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
-import org.apache.karaf.cave.server.backend.api.CaveRepositoryService;
+import org.apache.karaf.cave.server.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepositoryService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -78,18 +77,23 @@ public class WrapperServlet extends Http
try {
URL url = null;
- if (uri.endsWith("repository.xml")) {
+ if (uri.endsWith("-repository.xml")) {
// the user wants to get the Cave repository repository.xml
-
- ServiceReference caveRepositoryAdminReference = bundleContext.getServiceReference(CaveRepositoryService.class.getName());
- if (caveRepositoryAdminReference != null) {
- CaveRepositoryService caveRepositoryService = (CaveRepositoryService) bundleContext.getService(caveRepositoryAdminReference);
+ // the expected format is {cave-repo-name}-repository.xml
+ int index = uri.indexOf("-repository.xml");
+ String caveRepositoryName = uri.substring(0, index);
+
+ ServiceReference caveRepositoryServiceReference = bundleContext.getServiceReference(CaveRepositoryService.class.getName());
+ if (caveRepositoryServiceReference != null) {
+ CaveRepositoryService caveRepositoryService = (CaveRepositoryService) bundleContext.getService(caveRepositoryServiceReference);
if (caveRepositoryService != null) {
- CaveRepository caveRepository = caveRepositoryService.getRepository(uri);
- url = caveRepository.getRepositoryXml();
- response.setContentType("text/xml");
+ CaveRepository caveRepository = caveRepositoryService.getRepository(caveRepositoryName);
+ if (caveRepository != null) {
+ url = caveRepository.getRepositoryXml();
+ response.setContentType("text/xml");
+ }
}
- bundleContext.ungetService(caveRepositoryAdminReference);
+ bundleContext.ungetService(caveRepositoryServiceReference);
}
} else {
Resource[] resources = repositoryAdmin.discoverResources("(uri=*" + uri + ")");
@@ -104,16 +108,20 @@ public class WrapperServlet extends Http
response.setContentType("application/java-archive");
}
- // send the resource content to the HTTP response
- InputStream inputStream = url.openStream();
- OutputStream outputStream = response.getOutputStream();
- int c;
- while ((c = inputStream.read()) >= 0) {
- outputStream.write(c);
+ if (url != null) {
+ // send the resource content to the HTTP response
+ InputStream inputStream = url.openStream();
+ OutputStream outputStream = response.getOutputStream();
+ int c;
+ while ((c = inputStream.read()) >= 0) {
+ outputStream.write(c);
+ }
+ inputStream.close();
+ outputStream.flush();
+ outputStream.close();
+ } else {
+ throw new ServletException("No resource look-up provided");
}
- inputStream.close();
- outputStream.flush();
- outputStream.close();
} catch (ServletException servletException) {
throw servletException;
Modified: karaf/sandbox/jbonofre/cave/trunk/server/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/management/pom.xml?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/management/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/management/pom.xml Thu Aug 25 09:18:32 2011
@@ -35,8 +35,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.karaf.cave.server.backend</groupId>
- <artifactId>org.apache.karaf.cave.server.backend.api</artifactId>
+ <groupId>org.apache.karaf.cave.server</groupId>
+ <artifactId>org.apache.karaf.cave.server.api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -58,7 +58,7 @@
javax.management.loading,
javax.management.openmbean,
org.apache.karaf.management*;version="[2,4)",
- org.apache.karaf.cave.server.backend.api;version=${project.version},
+ org.apache.karaf.cave.server.api;version=${project.version},
*
</Import-Package>
</instructions>
Modified: karaf/sandbox/jbonofre/cave/trunk/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/management/src/main/java/org/apache/karaf/cave/server/management/internal/CaveRepositoryMBeanImpl.java Thu Aug 25 09:18:32 2011
@@ -14,8 +14,8 @@
package org.apache.karaf.cave.server.management.internal;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
-import org.apache.karaf.cave.server.backend.api.CaveRepositoryService;
+import org.apache.karaf.cave.server.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepositoryService;
import org.apache.karaf.cave.server.management.CaveRepositoryMBean;
import javax.management.NotCompliantMBeanException;
Modified: karaf/sandbox/jbonofre/cave/trunk/server/management/src/main/resources/OSGI-INF/blueprint/cave-management.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/management/src/main/resources/OSGI-INF/blueprint/cave-management.xml?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/management/src/main/resources/OSGI-INF/blueprint/cave-management.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/management/src/main/resources/OSGI-INF/blueprint/cave-management.xml Thu Aug 25 09:18:32 2011
@@ -2,7 +2,7 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<!-- reference to the Cave repository service -->
- <reference id="caveRepositoryService" interface="org.apache.karaf.cave.server.backend.api.CaveRepositoryService"/>
+ <reference id="caveRepositoryService" interface="org.apache.karaf.cave.server.api.CaveRepositoryService"/>
<!-- reference to the Karaf MBean server -->
<reference id="mbeanServer" interface="javax.management.MBeanServer">
Modified: karaf/sandbox/jbonofre/cave/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/pom.xml?rev=1161457&r1=1161456&r2=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/pom.xml Thu Aug 25 09:18:32 2011
@@ -34,7 +34,8 @@
<packaging>pom</packaging>
<modules>
- <module>backend</module>
+ <module>api</module>
+ <module>storage</module>
<module>management</module>
<module>command</module>
<module>http</module>
Copied: karaf/sandbox/jbonofre/cave/trunk/server/storage/pom.xml (from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/storage/pom.xml?p2=karaf/sandbox/jbonofre/cave/trunk/server/storage/pom.xml&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml&r1=1161420&r2=1161457&rev=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/storage/pom.xml Thu Aug 25 09:18:32 2011
@@ -22,15 +22,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.cave.server</groupId>
- <artifactId>org.apache.karaf.cave.server.backend</artifactId>
+ <groupId>org.apache.karaf.cave</groupId>
+ <artifactId>org.apache.karaf.cave.server</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.karaf.cave.server.backend</groupId>
- <artifactId>org.apache.karaf.cave.server.backend.filesystem</artifactId>
- <name>Apache Karaf :: Cave :: Server :: Backend :: Filesystem</name>
+ <groupId>org.apache.karaf.cave.server</groupId>
+ <artifactId>org.apache.karaf.cave.server.storage</artifactId>
+ <name>Apache Karaf :: Cave :: Server :: Storage</name>
<packaging>bundle</packaging>
<dependencies>
@@ -39,8 +39,8 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf.cave.server.backend</groupId>
- <artifactId>org.apache.karaf.cave.server.backend.api</artifactId>
+ <groupId>org.apache.karaf.cave.server</groupId>
+ <artifactId>org.apache.karaf.cave.server.api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -70,7 +70,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
- org.apache.karaf.cave.server.backend.api;version="${project.version}",
+ org.apache.karaf.cave.server.api;version="${project.version}",
org.slf4j*;resolution:=optional,
org.apache.felix.bundlerepository*;version="[2,3)",
org.osgi.framework,
@@ -89,8 +89,7 @@
org.kxml2.io,
org.xmlpull.v1,
org.apache.felix.utils*,
- org.apache.felix.bundlerepository.impl*,
- org.apache.karaf.cave.server.backend.impl
+ org.apache.felix.bundlerepository.impl*
</Private-Package>
</instructions>
</configuration>
Copied: karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryImpl.java (from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryImpl.java?p2=karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryImpl.java&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java&r1=1161420&r2=1161457&rev=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryImpl.java Thu Aug 25 09:18:32 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cave.server.backend.impl;
+package org.apache.karaf.cave.server.storage;
import org.apache.commons.io.FileUtils;
import org.apache.felix.bundlerepository.Resource;
@@ -26,7 +26,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepository;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@@ -34,8 +34,9 @@ import org.jsoup.select.Elements;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.*;
-import java.net.URI;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
import java.net.URL;
/**
Copied: karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryServiceImpl.java (from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryServiceImpl.java?p2=karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryServiceImpl.java&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java&r1=1161420&r2=1161457&rev=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/java/org/apache/karaf/cave/server/storage/CaveRepositoryServiceImpl.java Thu Aug 25 09:18:32 2011
@@ -14,16 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cave.server.backend.impl;
+package org.apache.karaf.cave.server.storage;
import org.apache.felix.bundlerepository.RepositoryAdmin;
-import org.apache.felix.bundlerepository.Resource;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
-import org.apache.karaf.cave.server.backend.api.CaveRepositoryService;
+import org.apache.karaf.cave.server.api.CaveRepository;
+import org.apache.karaf.cave.server.api.CaveRepositoryService;
import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
import java.util.HashMap;
import java.util.Map;
Copied: karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/resources/OSGI-INF/blueprint/cave-storage.xml (from r1161420, 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/storage/src/main/resources/OSGI-INF/blueprint/cave-storage.xml?p2=karaf/sandbox/jbonofre/cave/trunk/server/storage/src/main/resources/OSGI-INF/blueprint/cave-storage.xml&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/resources/OSGI-INF/blueprint/cave-filesystem-backend.xml&r1=1161420&r2=1161457&rev=1161457&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/storage/src/main/resources/OSGI-INF/blueprint/cave-storage.xml Thu Aug 25 09:18:32 2011
@@ -29,17 +29,17 @@
"
default-activation="lazy">
- <bean id="caveRepositoryService" class="org.apache.karaf.cave.server.backend.impl.CaveRepositoryServiceImpl">
+ <bean id="caveRepositoryService" class="org.apache.karaf.cave.server.storage.CaveRepositoryServiceImpl">
<property name="storageLocation" value="${storage.location}"/>
<property name="repositoryAdmin" ref="repositoryAdmin"/>
</bean>
<reference id="repositoryAdmin" interface="org.apache.felix.bundlerepository.RepositoryAdmin"/>
- <service ref="caveRepositoryService" interface="org.apache.karaf.cave.server.backend.api.CaveRepositoryService"/>
+ <service ref="caveRepositoryService" interface="org.apache.karaf.cave.server.api.CaveRepositoryService"/>
<!-- use the cm of Cave filesystem backend -->
- <cm:property-placeholder persistent-id="org.apache.karaf.cave.server.backend.filesystem" update-strategy="reload">
+ <cm:property-placeholder persistent-id="org.apache.karaf.cave.server.storage" update-strategy="reload">
<cm:default-properties>
<cm:property name="storage.location" value="cave"/>
</cm:default-properties>
Copied: karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/apache/karaf/cave/server/storage/CaveRepositoryImplTest.java (from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/apache/karaf/cave/server/storage/CaveRepositoryImplTest.java?p2=karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/apache/karaf/cave/server/storage/CaveRepositoryImplTest.java&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java&r1=1161420&r2=1161457&rev=1161457&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/java/org/apache/karaf/cave/server/storage/CaveRepositoryImplTest.java Thu Aug 25 09:18:32 2011
@@ -14,15 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.cave.server.backend.impl;
+package org.apache.karaf.cave.server.storage;
-import org.apache.karaf.cave.server.backend.api.CaveRepository;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-import java.io.File;
import java.net.URL;
/**
Copied: karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/resources/log4j.xml (from r1161420, karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/resources/log4j.xml?p2=karaf/sandbox/jbonofre/cave/trunk/server/storage/src/test/resources/log4j.xml&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/resources/log4j.xml&r1=1161420&r2=1161457&rev=1161457&view=diff
==============================================================================
(empty)