You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by li...@apache.org on 2010/09/08 15:32:51 UTC
svn commit: r995052 - in /incubator/aries/trunk/subsystem: ./
subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/
subsystem-core/src/test/java/org/apache/aries/subsystem/core/
subsystem-itests/src/test/java/org/apache/aries/subsystem...
Author: linsun
Date: Wed Sep 8 13:32:51 2010
New Revision: 995052
URL: http://svn.apache.org/viewvc?rev=995052&view=rev
Log:
[subsystem]avoid generate repository.xml when it already exists & disable subsystemAdminTest
Modified:
incubator/aries/trunk/subsystem/readme.txt
incubator/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceResolverImpl.java
incubator/aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/ResourceResolverTest.java
incubator/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdminTest.java
Modified: incubator/aries/trunk/subsystem/readme.txt
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/subsystem/readme.txt?rev=995052&r1=995051&r2=995052&view=diff
==============================================================================
--- incubator/aries/trunk/subsystem/readme.txt (original)
+++ incubator/aries/trunk/subsystem/readme.txt Wed Sep 8 13:32:51 2010
@@ -5,3 +5,6 @@ You need to download the implementation
You need to copy it in your local m2 repository:
~/.m2/repository/org/eclipse/osgi/v43prototype-3.6.0.201003231329/osgi-v43prototype-3.6.0.201003231329.jar
+Also, you need to run the following command to index your local m2 repo to ~/.m2/repository/repository.xml file.
+
+mvn org.apache.felix:maven-bundle-plugin:2.1.0:index -DurlTemplate=maven
Modified: incubator/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceResolverImpl.java?rev=995052&r1=995051&r2=995052&view=diff
==============================================================================
--- incubator/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceResolverImpl.java (original)
+++ incubator/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceResolverImpl.java Wed Sep 8 13:32:51 2010
@@ -82,6 +82,13 @@ public class ResourceResolverImpl implem
}
}
+
+ // if repository.xml already exists, no need to generate it
+ if (new File(obrPath + "repository.xml").exists()) {
+ registerOBR();
+ generated = true;
+ return;
+ }
File rootFile = new File(obrPath);
if (!rootFile.exists() || !rootFile.isDirectory()) {
Modified: incubator/aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/ResourceResolverTest.java?rev=995052&r1=995051&r2=995052&view=diff
==============================================================================
--- incubator/aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/ResourceResolverTest.java (original)
+++ incubator/aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/ResourceResolverTest.java Wed Sep 8 13:32:51 2010
@@ -40,10 +40,6 @@ public class ResourceResolverTest {
ctx.registerService(RepositoryAdmin.class.getCanonicalName(), ra, null);
- File file = new File(System.getProperty("user.home") + "/.m2/repository/repository.xml");
- if (file.exists()) {
- assertTrue(file.delete());
- }
}
@Test
public void testGenerateRepo() throws Exception {
@@ -51,6 +47,5 @@ public class ResourceResolverTest {
rr.generateOBR();
File file = new File(System.getProperty("user.home") + "/.m2/repository/repository.xml");
assertTrue("file " + file.toString() + " should exist after generate OBR", file.exists());
- file.delete();
}
}
Modified: incubator/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdminTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdminTest.java?rev=995052&r1=995051&r2=995052&view=diff
==============================================================================
--- incubator/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdminTest.java (original)
+++ incubator/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemAdminTest.java Wed Sep 8 13:32:51 2010
@@ -84,7 +84,8 @@ public class SubsystemAdminTest extends
}
- @Test
+ // Disable this test since it is designed to use the NoOpResolver which isn't registered.
+ //@Test
public void test() throws Exception {
// make sure we are using a framework that provides composite admin service
CompositeAdmin ca = getOsgiService(CompositeAdmin.class);