svn commit: r1230904 - /karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg

[jb...@apache.org]

Author: jbonofre
Date: Fri Jan 13 06:42:44 2012
New Revision: 1230904

URL: http://svn.apache.org/viewvc?rev=1230904&view=rev
Log:
[KARAF-1150] Update the etc/org.ops4j.pax.url.mvn.cfg file in the Karaf child instances

Modified:
    karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg

Modified: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg?rev=1230904&r1=1230903&r2=1230904&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg (original)
+++ karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg Fri Jan 13 06:42:44 2012
@@ -19,12 +19,12 @@
 
 #
 # If set to true, the following property will not allow any certificate to be used
-# when accessing maven repositories through SSL
+# when accessing Maven repositories through SSL
 #
 #org.ops4j.pax.url.mvn.certificateCheck=
 
 #
-# Path to the local maven settings file.
+# Path to the local Maven settings file.
 # The repositories defined in this file will be automatically added to the list
 # of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
 # below is not set.
@@ -37,7 +37,7 @@
 #org.ops4j.pax.url.mvn.settings=
 
 #
-# Path to the local maven repository which is used to avoid downloading
+# Path to the local Maven repository which is used to avoid downloading
 # artifacts when they already exist locally.
 # The value of this property will be extracted from the settings.xml file
 # above, or defaulted to:
@@ -46,22 +46,42 @@
 #org.ops4j.pax.url.mvn.localRepository=
 
 #
+# Default this to false. It's just weird to use undocumented repos
+#
+org.ops4j.pax.url.mvn.useFallbackRepositories=false
+
+#
+# Uncomment if you are behind a web proxy. PAX URL will use the proxy settings
+# from the Maven conf/settings.xml file
+#
+# org.ops4j.pax.url.mvn.proxySupport=true
+
+#
+# Disable aether support by default.  This ensure that the defaultRepositories
+# below will be used
+#
+#org.ops4j.pax.url.mvn.disableAether=true
+
+#
 # Comma separated list of repositories scanned when resolving an artifact.
 # Those repositories will be checked before iterating through the
-     below list of repositories and even before the local repository
+#    below list of repositories and even before the local repository
 # A repository url can be appended with zero or more of the following flags:
 #    @snapshots  : the repository contains snaphots
 #    @noreleases : the repository does not contain any released artifacts
 #
 # 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.base}/${karaf.default.repository}@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.
 # The default list includes the following repositories:
 #    http://repo1.maven.org/maven2
+#    http://repository.apache.org/content/groups/snapshots-group
 #    http://svn.apache.org/repos/asf/servicemix/m2-repo
 #    http://repository.springsource.com/maven/bundles/release
 #    http://repository.springsource.com/maven/bundles/external
@@ -70,11 +90,8 @@ org.ops4j.pax.url.mvn.defaultRepositorie
 # A repository url can be appended with zero or more of the following flags:
 #    @snapshots  : the repository contains snaphots
 #    @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 
 #
-# The following property value will add the system folder as a repo.
-#
-org.ops4j.pax.url.mvn.repositories= \
-    http://repo1.maven.org/maven2, \
-    http://svn.apache.org/repos/asf/servicemix/m2-repo, \
-    http://repository.springsource.com/maven/bundles/release, \
-    http://repository.springsource.com/maven/bundles/external
+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
\ No newline at end of file