Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-07-29 22:24:00 +0000
committerBorislav Kapukaranov2012-07-29 22:24:00 +0000
commit313876dd6a4ae133c3cd4262e5906c497c2fc134 (patch)
tree211e0c4fa9fe8700f4c1bcdd6b41f87f7086fff7 /org.eclipse.virgo.medic.testfragment
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.testfragment')
-rw-r--r--org.eclipse.virgo.medic.testfragment/ivy.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.virgo.medic.testfragment/ivy.xml b/org.eclipse.virgo.medic.testfragment/ivy.xml
index 5c3b7c2..d546393 100644
--- a/org.eclipse.virgo.medic.testfragment/ivy.xml
+++ b/org.eclipse.virgo.medic.testfragment/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"/>

Back to the top