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 11:47:09 UTC
svn commit: r1156558 - in /karaf/sandbox/jbonofre/cave/trunk/server/backend:
./ api/ api/src/ api/src/main/ api/src/main/java/ api/src/main/java/org/
api/src/main/java/org/apache/ api/src/main/java/org/apache/karaf/
api/src/main/java/org/apache/karaf/c...
Author: jbonofre
Date: Thu Aug 11 09:47:08 2011
New Revision: 1156558
URL: http://svn.apache.org/viewvc?rev=1156558&view=rev
Log:
Refactoring to allow multiple backend.
Add repository scanning at creation time.
Added:
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml
- copied, changed from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/
karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepository.java
- copied, changed from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/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/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml
- copied, changed from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java
- copied, changed from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/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
- copied, changed from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java
- copied, changed from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/resources/
karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/resources/log4j.xml
- copied, changed from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/src/test/resources/log4j.xml
Removed:
karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/CaveRepository.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/CaveRepositoryService.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java
karaf/sandbox/jbonofre/cave/trunk/server/backend/src/test/resources/log4j.xml
Modified:
karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml
Copied: karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml (from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml?p2=karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml&r1=1156329&r2=1156558&rev=1156558&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/api/pom.xml Thu Aug 11 09:47:08 2011
@@ -22,24 +22,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.cave</groupId>
- <artifactId>org.apache.karaf.cave.server</artifactId>
+ <groupId>org.apache.karaf.cave.server</groupId>
+ <artifactId>org.apache.karaf.cave.server.backend</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.karaf.cave.server</groupId>
- <artifactId>org.apache.karaf.cave.server.backend</artifactId>
- <name>Apache Karaf :: Cave :: Server :: Backend</name>
+ <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>
<packaging>bundle</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -47,25 +40,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>
- org.apache.felix.bundlerepository*;version="[2,3)",
- org.osgi.framework,
- 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>
- <Private-Package>
- org.kxml2.io,
- org.xmlpull.v1,
- org.apache.felix.utils*,
- org.apache.felix.bundlerepository.impl
- </Private-Package>
- <Export-Service>
- org.apache.felix.bundlerepository.RepositoryAdmin
- </Export-Service>
+ <Export-Package>
+ org.apache.karaf.cave.server.backend.api
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Copied: karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepository.java (from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/CaveRepository.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepository.java?p2=karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepository.java&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/CaveRepository.java&r1=1156329&r2=1156558&rev=1156558&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/CaveRepository.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepository.java Thu Aug 11 09:47:08 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;
+package org.apache.karaf.cave.server.backend.api;
import java.io.File;
import java.io.InputStream;
Added: 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/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepositoryService.java?rev=1156558&view=auto
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepositoryService.java (added)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/api/src/main/java/org/apache/karaf/cave/server/backend/api/CaveRepositoryService.java Thu Aug 11 09:47:08 2011
@@ -0,0 +1,60 @@
+/*
+ * 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.backend.api;
+
+/**
+ * Service to manipulate Cave repository.
+ */
+public interface CaveRepositoryService {
+
+ /**
+ * Create a new Karaf Cave repository.
+ *
+ * @param name the name of the repository
+ * @param scan if true, the repository is scanned at creation time.
+ * @return the Karaf Cave repository.
+ * @throws Exception in case of creation failure.
+ */
+ CaveRepository createRepository(String name, boolean scan) throws Exception;
+
+ /**
+ * Create a new Karaf Cave repository.
+ *
+ * @param name the name of the repository.
+ * @param location the storage location of the repository.
+ * @param scan if true, the repostory is scanned at creation time.
+ * @return the Karaf Cave repository.
+ * @throws Exception in case of creation failure.
+ */
+ CaveRepository createRepository(String name, String location, boolean scan) throws Exception;
+
+ /**
+ * Get the list of all Karaf Cave repositories.
+ *
+ * @return the Karaf Cave repositories.
+ */
+ CaveRepository[] getRepositories();
+
+ /**
+ * Get the Karaf Cave repository identified by the given name.
+ *
+ * @param name the name of the Karaf Cave repository to look for.
+ * @return the Karaf Cave repository
+ */
+ CaveRepository getRepository(String name);
+
+}
Copied: karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml (from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml?p2=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml&r1=1156329&r2=1156558&rev=1156558&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/pom.xml Thu Aug 11 09:47:08 2011
@@ -22,19 +22,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.cave</groupId>
- <artifactId>org.apache.karaf.cave.server</artifactId>
+ <groupId>org.apache.karaf.cave.server</groupId>
+ <artifactId>org.apache.karaf.cave.server.backend</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.karaf.cave.server</groupId>
- <artifactId>org.apache.karaf.cave.server.backend</artifactId>
- <name>Apache Karaf :: Cave :: Server :: Backend</name>
+ <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>
<packaging>bundle</packaging>
<dependencies>
<dependency>
+ <groupId>org.apache.karaf.cave.server.backend</groupId>
+ <artifactId>org.apache.karaf.cave.server.backend.api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
</dependency>
@@ -45,9 +50,10 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
+ <configuration> <instructions>
<Import-Package>
+ org.apache.karaf.cave.server.backend.api;version="${project.version}",
+ org.slf4j*;resolution:=optional,
org.apache.felix.bundlerepository*;version="[2,3)",
org.osgi.framework,
org.osgi.service.log,
@@ -61,11 +67,9 @@
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>
- <Export-Service>
- org.apache.felix.bundlerepository.RepositoryAdmin
- </Export-Service>
</instructions>
</configuration>
</plugin>
Copied: karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java (from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java?p2=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java&r1=1156329&r2=1156558&rev=1156558&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java Thu Aug 11 09:47:08 2011
@@ -20,7 +20,7 @@ import org.apache.felix.bundlerepository
import org.apache.felix.bundlerepository.Resource;
import org.apache.felix.bundlerepository.impl.DataModelHelperImpl;
import org.apache.felix.bundlerepository.impl.RepositoryImpl;
-import org.apache.karaf.cave.server.backend.CaveRepository;
+import org.apache.karaf.cave.server.backend.api.CaveRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,11 +40,14 @@ public class CaveRepositoryImpl implemen
private RepositoryImpl obrRepository;
private RepositoryAdmin repositoryAdmin;
- public CaveRepositoryImpl(String name, File location) throws Exception {
+ public CaveRepositoryImpl(String name, File location, boolean scan) throws Exception {
this.name = name;
this.location = location;
this.createRepositoryDirectory();
+ if (scan) {
+ this.scan();
+ }
}
/**
@@ -131,7 +134,8 @@ public class CaveRepositoryImpl implemen
Resource resource = new DataModelHelperImpl().createResource(temp.toURI().toURL());
if (resource == null) {
temp.delete();
- throw new IllegalArgumentException("The " + url + " artifact source is not a valid OSGi bundle");
+ LOGGER.warn("The {} artifact source is not a valid OSGi bundle", url);
+ return;
}
File destination = new File(location, resource.getSymbolicName() + "-" + resource.getVersion() + ".jar");
temp.renameTo(destination);
@@ -164,8 +168,12 @@ public class CaveRepositoryImpl implemen
}
} else {
// populate the repository
- Resource resource = new DataModelHelperImpl().createResource(entry.toURI().toURL());
- this.addResource(resource);
+ try {
+ Resource resource = new DataModelHelperImpl().createResource(entry.toURI().toURL());
+ this.addResource(resource);
+ } catch (IllegalArgumentException e) {
+ LOGGER.warn(e.getMessage());
+ }
}
}
Copied: karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java (from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java?p2=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java&r1=1156329&r2=1156558&rev=1156558&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryServiceImpl.java Thu Aug 11 09:47:08 2011
@@ -16,8 +16,8 @@
*/
package org.apache.karaf.cave.server.backend.impl;
-import org.apache.karaf.cave.server.backend.CaveRepository;
-import org.apache.karaf.cave.server.backend.CaveRepositoryService;
+import org.apache.karaf.cave.server.backend.api.CaveRepository;
+import org.apache.karaf.cave.server.backend.api.CaveRepositoryService;
import java.io.File;
import java.util.HashMap;
@@ -40,11 +40,16 @@ public class CaveRepositoryServiceImpl i
this.storageLocation = storageLocation;
}
- public synchronized CaveRepository createRepository(String name) throws Exception {
+ public synchronized CaveRepository createRepository(String name, boolean scan) throws Exception {
+ File location = new File(storageLocation, name);
+ return this.createRepository(name, location.getAbsolutePath(), scan);
+ }
+
+ public synchronized CaveRepository createRepository(String name, String location, boolean scan) throws Exception {
if (repositories.get(name) != null) {
throw new IllegalArgumentException("Cave repository " + name + " already exists.");
}
- CaveRepository repository = new CaveRepositoryImpl(name, new File(storageLocation, name));
+ CaveRepository repository = new CaveRepositoryImpl(name, new File(location), scan);
repositories.put(name, repository);
return repository;
}
Copied: karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java (from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java?p2=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java&r1=1156329&r2=1156558&rev=1156558&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImplTest.java Thu Aug 11 09:47:08 2011
@@ -16,7 +16,7 @@
*/
package org.apache.karaf.cave.server.backend.impl;
-import org.apache.karaf.cave.server.backend.CaveRepository;
+import org.apache.karaf.cave.server.backend.api.CaveRepository;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -35,7 +35,7 @@ public class CaveRepositoryImplTest {
@Before
public void setUp() throws Exception {
- repository = new CaveRepositoryImpl("test", new File("target/test-repository"));
+ repository = new CaveRepositoryImpl("test", new File("target/test-repository"), false);
}
@Test
@@ -44,7 +44,7 @@ public class CaveRepositoryImplTest {
repository.upload(new URL("http://repo1.maven.org/maven2/org/apache/servicemix/bundles/org.apache.servicemix.bundles.commons-lang/2.4_5/org.apache.servicemix.bundles.commons-lang-2.4_5.jar"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testUploadNonBundleFromURL() throws Exception {
repository.upload(new URL("http://repo1.maven.org/maven2/commons-vfs/commons-vfs/1.0/commons-vfs-1.0.jar"));
}
Copied: karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/resources/log4j.xml (from r1156329, karaf/sandbox/jbonofre/cave/trunk/server/backend/src/test/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/resources/log4j.xml?p2=karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/test/resources/log4j.xml&p1=karaf/sandbox/jbonofre/cave/trunk/server/backend/src/test/resources/log4j.xml&r1=1156329&r2=1156558&rev=1156558&view=diff
==============================================================================
(empty)
Modified: karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml?rev=1156558&r1=1156557&r2=1156558&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/pom.xml Thu Aug 11 09:47:08 2011
@@ -31,45 +31,11 @@
<groupId>org.apache.karaf.cave.server</groupId>
<artifactId>org.apache.karaf.cave.server.backend</artifactId>
<name>Apache Karaf :: Cave :: Server :: Backend</name>
- <packaging>bundle</packaging>
+ <packaging>pom</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>
- org.apache.felix.bundlerepository*;version="[2,3)",
- org.osgi.framework,
- 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>
- <Private-Package>
- org.kxml2.io,
- org.xmlpull.v1,
- org.apache.felix.utils*,
- org.apache.felix.bundlerepository.impl
- </Private-Package>
- <Export-Service>
- org.apache.felix.bundlerepository.RepositoryAdmin
- </Export-Service>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <modules>
+ <module>api</module>
+ <module>filesystem</module>
+ </modules>
</project>
\ No newline at end of file