You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by dj...@apache.org on 2012/01/11 01:03:32 UTC
svn commit: r1229812 - in /karaf/trunk: ./
assemblies/features/framework/src/main/filtered-resources/resources/etc/
assemblies/features/framework/src/main/resources/resources/etc/
features/core/src/main/java/org/apache/karaf/features/internal/ features...
Author: djencks
Date: Wed Jan 11 00:03:32 2012
New Revision: 1229812
URL: http://svn.apache.org/viewvc?rev=1229812&view=rev
Log:
KARAF-910 Use fixes for PAXURL-147, 149, and 150 and make the feature service wait for the mvn url handler service. Also only use pax-url-aether.
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
karaf/trunk/itests/tests/pom.xml
karaf/trunk/pom.xml
karaf/trunk/tooling/exam/container/pom.xml
karaf/trunk/tooling/karaf-maven-plugin/pom.xml
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties?rev=1229812&r1=1229811&r2=1229812&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties Wed Jan 11 00:03:32 2012
@@ -122,3 +122,8 @@ org.apache.aries.blueprint.synchronous=t
# Do not weave all any classes by default
#
org.apache.aries.proxy.weaving.enabled=
+
+#
+# mvn url handler requires config admin configuration
+#
+org.ops4j.pax.url.mvn.requireConfigAdminConfig=true
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=1229812&r1=1229811&r2=1229812&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 Jan 11 00:03:32 2012
@@ -60,7 +60,7 @@ org.ops4j.pax.url.mvn.useFallbackReposit
# Disable aether support by default. This ensure that the defaultRepositories
# below will be used
#
-org.ops4j.pax.url.mvn.disableAether=true
+#org.ops4j.pax.url.mvn.disableAether=true
#
# Comma separated list of repositories scanned when resolving an artifact.
@@ -72,8 +72,10 @@ org.ops4j.pax.url.mvn.disableAether=true
#
# The following property value will add the system folder as a repo.
#
-org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots, \
- file:${karaf.home}/local-repo@snapshots
+org.ops4j.pax.url.mvn.localRepository=file:${karaf.home}/${karaf.default.repository}@snapshots
+
+# Use the default local repo (e.g.~/.m2/repository) as a "remote" repo
+org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=true
#
# Comma separated list of repositories scanned when resolving an artifact.
@@ -90,12 +92,7 @@ org.ops4j.pax.url.mvn.defaultRepositorie
# @noreleases : the repository does not contain any released artifacts
# @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet
#
-org.ops4j.pax.url.mvn.repositories= \
+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, \
- http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix, \
- http://repository.springsource.com/maven/bundles/release@id=springsource, \
- http://repository.springsource.com/maven/bundles/external@id=springsourceext, \
- http://oss.sonatype.org/content/repositories/releases/@id=sonatype, \
- http://zodiac.springsource.com/maven/bundles/release@id=zodiac-repository
+ http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
Modified: karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java?rev=1229812&r1=1229811&r2=1229812&view=diff
==============================================================================
--- karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java (original)
+++ karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java Wed Jan 11 00:03:32 2012
@@ -80,6 +80,7 @@ import org.osgi.framework.startlevel.Bun
import org.osgi.framework.wiring.FrameworkWiring;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.url.URLStreamHandlerService;
import org.osgi.util.tracker.ServiceTracker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -159,6 +160,10 @@ public class FeaturesServiceImpl impleme
this.refreshTimeout = refreshTimeout;
}
+ //dependency, not used directly
+ public void setMvnUrlHandler(URLStreamHandlerService mvnUrlHandler) {
+ }
+
public void registerListener(FeaturesListener listener) {
listeners.add(listener);
for (Repository repository : listRepositories()) {
Modified: karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml?rev=1229812&r1=1229811&r2=1229812&view=diff
==============================================================================
--- karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml (original)
+++ karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml Wed Jan 11 00:03:32 2012
@@ -37,6 +37,7 @@
<property name="resolverTimeout" value="$[resolverTimeout]" />
<property name="configAdmin" ref="configAdmin" />
<property name="regionsPersistence" ref="regionsPersistence" />
+ <property name="mvnUrlHandler" ref="mvnUrlHandler" />
<property name="bundleContext" ref="blueprintBundleContext" />
</bean>
@@ -50,6 +51,8 @@
<reference id="regionsPersistence" interface="org.apache.karaf.region.persist.RegionsPersistence" />
+ <reference id="mvnUrlHandler" interface="org.osgi.service.url.URLStreamHandlerService" filter="(url.handler.protocol=mvn)" />
+
<service ref="featuresService" interface="org.apache.karaf.features.FeaturesService" />
</blueprint>
Modified: karaf/trunk/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/tests/pom.xml?rev=1229812&r1=1229811&r2=1229812&view=diff
==============================================================================
--- karaf/trunk/itests/tests/pom.xml (original)
+++ karaf/trunk/itests/tests/pom.xml Wed Jan 11 00:03:32 2012
@@ -38,6 +38,11 @@
<dependencies>
<dependency>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf.tooling.exam</groupId>
<artifactId>org.apache.karaf.tooling.exam.container</artifactId>
<scope>test</scope>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1229812&r1=1229811&r2=1229812&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Jan 11 00:03:32 2012
@@ -182,7 +182,7 @@
<pax.logging.version>1.6.3</pax.logging.version>
<pax.runner.version>1.7.5</pax.runner.version>
<pax.base.version>1.2.3</pax.base.version>
- <pax.url.version>1.3.5</pax.url.version>
+ <pax.url.version>1.4-SNAPSHOT</pax.url.version>
<pax.web.version>1.1.2-SNAPSHOT</pax.web.version>
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<servlet.api.version>2.5</servlet.api.version>
@@ -1094,11 +1094,6 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
- <version>${pax.url.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>${pax.url.version}</version>
<exclusions>
Modified: karaf/trunk/tooling/exam/container/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/pom.xml?rev=1229812&r1=1229811&r2=1229812&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/pom.xml (original)
+++ karaf/trunk/tooling/exam/container/pom.xml Wed Jan 11 00:03:32 2012
@@ -103,7 +103,7 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
+ <artifactId>pax-url-aether</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/pom.xml?rev=1229812&r1=1229811&r2=1229812&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/pom.xml Wed Jan 11 00:03:32 2012
@@ -109,7 +109,7 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
+ <artifactId>pax-url-aether</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.deployer</groupId>