Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-07-29 18:24:00 -0400
committerBorislav Kapukaranov2012-07-29 18:24:00 -0400
commit313876dd6a4ae133c3cd4262e5906c497c2fc134 (patch)
tree211e0c4fa9fe8700f4c1bcdd6b41f87f7086fff7 /org.eclipse.virgo.medic.integrationtest
parent983b3be5940a6b2bb37d2a7b2606db95daba7ce7 (diff)
parent02d7b150f332534386bc6d25877ab3baf15f6f5b (diff)
downloadorg.eclipse.virgo.medic-313876dd6a4ae133c3cd4262e5906c497c2fc134.tar.gz
org.eclipse.virgo.medic-313876dd6a4ae133c3cd4262e5906c497c2fc134.tar.xz
org.eclipse.virgo.medic-313876dd6a4ae133c3cd4262e5906c497c2fc134.zip
Merge branch 'juno-contribution' into 380765-shared-ivycache
Conflicts: build.versions org.eclipse.virgo.medic.core/.classpath org.eclipse.virgo.medic.core/ivy.xml org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProvider.java org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationProvider.java org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/eventlog/impl/logback/LogBackEventLoggerTests.java org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/LogControllerTests.java org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProviderTests.java org.eclipse.virgo.medic.integrationtest/.classpath org.eclipse.virgo.medic.integrationtest/ivy.xml org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties org.eclipse.virgo.medic.testfragment/.classpath org.eclipse.virgo.medic/.classpath
Diffstat (limited to 'org.eclipse.virgo.medic.integrationtest')
-rw-r--r--org.eclipse.virgo.medic.integrationtest/build.xml2
-rw-r--r--org.eclipse.virgo.medic.integrationtest/ivy.xml2
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties31
3 files changed, 18 insertions, 17 deletions
diff --git a/org.eclipse.virgo.medic.integrationtest/build.xml b/org.eclipse.virgo.medic.integrationtest/build.xml
index 3df23dc..5fed3aa 100644
--- a/org.eclipse.virgo.medic.integrationtest/build.xml
+++ b/org.eclipse.virgo.medic.integrationtest/build.xml
@@ -5,5 +5,5 @@
<property file="${basedir}/../build.versions"/>
<property name="disable.bundlor" value="true" />
<import file="${basedir}/../virgo-build/weaving/default.xml"/>
-
+
</project>
diff --git a/org.eclipse.virgo.medic.integrationtest/ivy.xml b/org.eclipse.virgo.medic.integrationtest/ivy.xml
index 44e3013..e7bace5 100644
--- a/org.eclipse.virgo.medic.integrationtest/ivy.xml
+++ b/org.eclipse.virgo.medic.integrationtest/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.medic" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
index bf74d24..2417599 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
@@ -1,26 +1,27 @@
launcher.bundles=\
- file:../ivy-cache/repository/org.aspectj/com.springsource.org.aspectj.runtime/${org.aspectj}/com.springsource.org.aspectj.runtime-${org.aspectj}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.slf4j.api/${org.slf4j.api}/org.slf4j.api-${org.slf4j.api}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/${org.eclipse.virgo.util}/org.eclipse.virgo.util.common-${org.eclipse.virgo.util}.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi-${org.eclipse.virgo.util}.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.io/${org.eclipse.virgo.util}/org.eclipse.virgo.util.io-${org.eclipse.virgo.util}.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.math/${org.eclipse.virgo.util}/org.eclipse.virgo.util.math-${org.eclipse.virgo.util}.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/${org.eclipse.virgo.util}/org.eclipse.virgo.util.parser.manifest-${org.eclipse.virgo.util}.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.log/${org.eclipse.equinox.log}/org.eclipse.equinox.log-${org.eclipse.equinox.log}.jar@start,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/org.slf4j.jul/${org.slf4j.jul}/org.slf4j.jul-${org.slf4j.jul}.jar,\
+ file:${ivy.cache}/repository/org.aspectj/com.springsource.org.aspectj.runtime/${org.aspectj}/com.springsource.org.aspectj.runtime-${org.aspectj}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.api/${org.slf4j.api}/org.slf4j.api-${org.slf4j.api}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M04/org.eclipse.virgo.util.common-3.5.0.M04.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-3.5.0.M04.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-3.5.0.M04.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.M04/org.eclipse.virgo.util.math-3.5.0.M04.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.M04/org.eclipse.virgo.util.parser.manifest-3.5.0.M04.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.log/${org.eclipse.equinox.log}/org.eclipse.equinox.log-${org.eclipse.equinox.log}.jar@start,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jul/${org.slf4j.jul}/org.slf4j.jul-${org.slf4j.jul}.jar,\
file:../org.eclipse.virgo.medic.logbackcorefragment/target/artifacts/org.eclipse.virgo.medic.logbackcorefragment.jar,\
file:../org.eclipse.virgo.medic.logbackclassicfragment/target/artifacts/org.eclipse.virgo.medic.logbackclassicfragment.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/ch.qos.logback.core/${ch.qos.logback.core}/ch.qos.logback.core-${ch.qos.logback.core}.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/ch.qos.logback.classic/${ch.qos.logback.classic}/ch.qos.logback.classic-${ch.qos.logback.classic}.jar,\
- file:../ivy-cache/repository/org.eclipse.virgo.mirrored/ch.qos.logback.slf4j/${ch.qos.logback.slf4j}/ch.qos.logback.slf4j-${ch.qos.logback.slf4j}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.core/${ch.qos.logback.core}/ch.qos.logback.core-${ch.qos.logback.core}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.classic/${ch.qos.logback.classic}/ch.qos.logback.classic-${ch.qos.logback.classic}.jar,\
+ file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.slf4j/${ch.qos.logback.slf4j}/ch.qos.logback.slf4j-${ch.qos.logback.slf4j}.jar,\
file:../org.eclipse.virgo.medic/target/artifacts/org.eclipse.virgo.medic.jar@start,\
file:../org.eclipse.virgo.medic.core/target/artifacts/org.eclipse.virgo.medic.core.jar@start,\
file:src/test/resources/config-fragment,\
file:src/test/resources/appender-fragment
-org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
+user.home=dummy
+org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties,file:../user-ivy.properties
org.eclipse.virgo.suppress.heap.dumps=false

Back to the top