Repository: camel Updated Branches: refs/heads/master 93992e836 -> 3e7dbf574
Added to camel-itest-osgi so we can add custom staging repos which the karaf container can use for testing. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e7dbf57 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e7dbf57 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e7dbf57 Branch: refs/heads/master Commit: 3e7dbf574985755a173a867ff0a87c553fcda187 Parents: 93992e8 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Mar 17 13:55:14 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Mar 17 13:55:30 2014 +0100 ---------------------------------------------------------------------- .../itest/osgi/OSGiIntegrationTestSupport.java | 2 + .../camel/itest/karaf/org.ops4j.pax.url.mvn.cfg | 103 +++++++++++++++++++ 2 files changed, 105 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3e7dbf57/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java index 5e8282c..088f10c 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java @@ -140,6 +140,8 @@ public class OSGiIntegrationTestSupport extends CamelTestSupport { // override the config.properties (to fix pax-exam bug) replaceConfigurationFile("etc/config.properties", new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")), replaceConfigurationFile("etc/custom.properties", new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")), + replaceConfigurationFile("etc/org.ops4j.pax.url.mvn.cfg", new File("src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg")), + // we need INFO logging otherwise we cannot see what happens logLevel(LogLevelOption.LogLevel.INFO), http://git-wip-us.apache.org/repos/asf/camel/blob/3e7dbf57/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg new file mode 100644 index 0000000..18fed15 --- /dev/null +++ b/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg @@ -0,0 +1,103 @@ +################################################################################ +# +# 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. +# +################################################################################ + +# +# If set to true, the following property will not allow any certificate to be used +# when accessing Maven repositories through SSL +# +#org.ops4j.pax.url.mvn.certificateCheck= + +# +# 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. +# The following locations are checked for the existence of the settings.xml file +# * 1. looks for the specified url +# * 2. if not found looks for ${user.home}/.m2/settings.xml +# * 3. if not found looks for ${maven.home}/conf/settings.xml +# * 4. if not found looks for ${M2_HOME}/conf/settings.xml +# +#org.ops4j.pax.url.mvn.settings= + +# +# 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: +# System.getProperty( "user.home" ) + "/.m2/repository" +# +#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 don't wanna use the proxy settings +# from the Maven conf/settings.xml file +# +# org.ops4j.pax.url.mvn.proxySupport=false + +# +# 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 +# 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.defaultRepositories=file:${karaf.home}/${karaf.default.repository}@snapshots@id=karaf.${karaf.default.repository} + +# +# Comma separated list of repositories scanned when resolving an artifact. +# The default list includes the following repositories containing releases: +# http://repo1.maven.org/maven2@id=central +# http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix +# http://repository.springsource.com/maven/bundles/release@id=springsource.release +# http://repository.springsource.com/maven/bundles/external@id=springsource.external +# To add repositories to the default ones, prepend '+' to the list of repositories +# to add. +# A repository url can be appended with zero or more of the following flags: +# @snapshots : the repository contains snapshots +# @noreleases : the repository does not contain any released artifacts +# +# The default list doesn't contain any repository containing snapshots as it can impact the artifacts resolution. +# You may want to add the following repositories containing snapshots: +# http://oss.sonatype.org/content/repositories/snapshots@snapshots@noreleases@id=sonatype.snapshot +# http://oss.sonatype.org/content/repositories/ops4j-snapshots@snapshots@noreleases@id=ops4j.snapshot +# http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache +# +org.ops4j.pax.url.mvn.repositories= \ + http://repo1.maven.org/maven2@id=central, \ + http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix, \ + http://repository.springsource.com/maven/bundles/release@id=springsource.release, \ + http://repository.springsource.com/maven/bundles/external@id=springsource.external, \ + http://oss.sonatype.org/content/repositories/releases/@id=sonatype +
