You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/06/27 10:15:17 UTC
svn commit: r1354360 - in /karaf/trunk: ./
assemblies/features/framework/src/main/resources/resources/etc/
kar/core/src/main/java/org/apache/karaf/kar/internal/
kar/core/src/main/resources/OSGI-INF/blueprint/
kar/core/src/test/java/org/apache/karaf/kar...
Author: cschneider
Date: Wed Jun 27 08:15:16 2012
New Revision: 1354360
URL: http://svn.apache.org/viewvc?rev=1354360&view=rev
Log:
KARAF-1551 Use the new pax url aether multi repos and get rid of own maven repo handling
Removed:
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/MavenRepoManager.java
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/NoSubstProperties.java
karaf/trunk/kar/core/src/test/java/org/apache/karaf/kar/internal/MavenRepoManagerTest.java
Modified:
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg?rev=1354360&r1=1354359&r2=1354360&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg Wed Jun 27 08:15:16 2012
@@ -96,4 +96,5 @@ org.ops4j.pax.url.mvn.repositories= \
http://repo1.maven.org/maven2@id=central, \
http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \
https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases, \
- file:${karaf.home}/${karaf.default.repository}@id=systemrepo
+ file:${karaf.home}/${karaf.default.repository}@id=systemrepo, \
+ file:${karaf.data}/kar@id=karrepos@multi
Modified: karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java?rev=1354360&r1=1354359&r2=1354360&view=diff
==============================================================================
--- karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java (original)
+++ karaf/trunk/kar/core/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java Wed Jun 27 08:15:16 2012
@@ -63,13 +63,11 @@ public class KarServiceImpl implements K
private File storage;
private File base;
private FeaturesService featuresService;
- private final MavenRepoManager mavenRepoManager;
- public KarServiceImpl(String karafBase, FeaturesService featuresService, MavenRepoManager mavenRepoManager) {
+ public KarServiceImpl(String karafBase, FeaturesService featuresService) {
this.base = new File(karafBase);
this.storage = new File(this.base, "data" + File.separator + "kar");
this.featuresService = featuresService;
- this.mavenRepoManager = mavenRepoManager;
this.storage.mkdirs();
if (!storage.isDirectory()) {
throw new IllegalStateException("KAR storage " + storage + " is not a directory");
@@ -96,9 +94,6 @@ public class KarServiceImpl implements K
installFeatures(kar.getFeatureRepos());
}
- if (mavenRepoManager != null) {
- mavenRepoManager.addRepo(repoDir.toURI());
- }
}
@@ -167,9 +162,6 @@ public class KarServiceImpl implements K
featuresService.removeRepository(featuresRepository);
}
- // Creating the URI before deleting the dir to get a "/" at the end
- URI karURI = karDir.toURI();
- mavenRepoManager.removeRepo(karURI);
deleteRecursively(karDir);
}
Modified: karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml?rev=1354360&r1=1354359&r2=1354360&view=diff
==============================================================================
--- karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml (original)
+++ karaf/trunk/kar/core/src/main/resources/OSGI-INF/blueprint/kar-core.xml Wed Jun 27 08:15:16 2012
@@ -27,13 +27,8 @@
<bean id="karService" class="org.apache.karaf.kar.internal.KarServiceImpl">
<argument value="$[karaf.base]" />
<argument ref="featuresService" />
- <argument ref="mavenRepoManager"/>
</bean>
- <bean id="mavenRepoManager" class="org.apache.karaf.kar.internal.MavenRepoManager">
- <argument value="$[karaf.base]" />
- </bean>
-
<service ref="karService" interface="org.apache.karaf.kar.KarService"/>
<bean id="mbeanImpl" class="org.apache.karaf.kar.internal.Kars">
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1354360&r1=1354359&r2=1354360&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Jun 27 08:15:16 2012
@@ -195,7 +195,7 @@
<pax.logging.version>1.6.9</pax.logging.version>
<pax.runner.version>1.7.5</pax.runner.version>
<pax.base.version>1.3.0</pax.base.version>
- <pax.url.version>1.4.2</pax.url.version>
+ <pax.url.version>1.4.3-SNAPSHOT</pax.url.version>
<pax.web.version>2.0.0</pax.web.version>
<pax.swissbox.version>1.5.0</pax.swissbox.version>
<pax.tinybundle.version>1.0.0</pax.tinybundle.version>