Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2011-02-02 11:58:22 -0500
committerChristopher Frost2011-02-02 11:58:22 -0500
commit2266b0571afa8ae495e5d6abf623d5e924a16180 (patch)
treea1307ab39dd2987e88464413a9f68f48004786db
parent05eedcc8a9221222d1521f7660df192a57d1ac0e (diff)
parentfc17424af741b99cb067ddf8e6c617daa7e83761 (diff)
downloadorg.eclipse.virgo.medic-2266b0571afa8ae495e5d6abf623d5e924a16180.tar.gz
org.eclipse.virgo.medic-2266b0571afa8ae495e5d6abf623d5e924a16180.tar.xz
org.eclipse.virgo.medic-2266b0571afa8ae495e5d6abf623d5e924a16180.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.medic
-rw-r--r--build.versions8
-rw-r--r--org.eclipse.virgo.medic.core/.classpath4
-rw-r--r--org.eclipse.virgo.medic.integrationtest/.classpath8
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties6
4 files changed, 13 insertions, 13 deletions
diff --git a/build.versions b/build.versions
index dafa14f..ea4f4a7 100644
--- a/build.versions
+++ b/build.versions
@@ -9,7 +9,7 @@ org.aspectj=1.6.6.RELEASE
# Test
org.junit=4.7.0
org.easymock=2.3.0
-org.eclipse.virgo.test=2.2.0.D-20110129173228
-org.eclipse.virgo.teststubs=2.2.0.D-20110128104019
-org.eclipse.virgo.util=2.2.0.D-20110129172745
-org.eclipse.virgo.osgi=2.2.0.D-20110129172447
+org.eclipse.virgo.test=3.0.0.D-20110201141918
+org.eclipse.virgo.teststubs=3.0.0.D-20110201140958
+org.eclipse.virgo.util=3.0.0.D-20110201141522
+org.eclipse.virgo.osgi=3.0.0.D-20110201141222
diff --git a/org.eclipse.virgo.medic.core/.classpath b/org.eclipse.virgo.medic.core/.classpath
index 9fe67a2..5157408 100644
--- a/org.eclipse.virgo.medic.core/.classpath
+++ b/org.eclipse.virgo.medic.core/.classpath
@@ -25,12 +25,12 @@
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/MEDIC_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.medic"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.2.0.D-20110128104019/org.eclipse.virgo.teststubs.osgi-2.2.0.D-20110128104019.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.2.0.D-20110128104019/org.eclipse.virgo.teststubs.osgi-sources-2.2.0.D-20110128104019.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.0.0.D-20110201140958/org.eclipse.virgo.teststubs.osgi-3.0.0.D-20110201140958.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.0.0.D-20110201140958/org.eclipse.virgo.teststubs.osgi-sources-3.0.0.D-20110201140958.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/MEDIC_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.6.RELEASE.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-0.9.24.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-sources-0.9.24.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-0.9.24.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-sources-0.9.24.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20110129172745/org.eclipse.virgo.util.osgi-2.2.0.D-20110129172745.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20110129172745/org.eclipse.virgo.util.osgi-sources-2.2.0.D-20110129172745.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.D-20110201141522/org.eclipse.virgo.util.osgi-3.0.0.D-20110201141522.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.D-20110201141522/org.eclipse.virgo.util.osgi-sources-3.0.0.D-20110201141522.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.equinox/org.eclipse.equinox.cm/1.0.200.v20100520/org.eclipse.equinox.cm-1.0.200.v20100520.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-3.3.0.v20101018.jar"/>
diff --git a/org.eclipse.virgo.medic.integrationtest/.classpath b/org.eclipse.virgo.medic.integrationtest/.classpath
index cca1c02..c1920d5 100644
--- a/org.eclipse.virgo.medic.integrationtest/.classpath
+++ b/org.eclipse.virgo.medic.integrationtest/.classpath
@@ -26,16 +26,16 @@
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-0.9.24.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-sources-0.9.24.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-0.9.24.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-sources-0.9.24.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.2.0.D-20110129173228/org.eclipse.virgo.test.framework-2.2.0.D-20110129173228.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.2.0.D-20110129173228/org.eclipse.virgo.test.framework-sources-2.2.0.D-20110129173228.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.0.0.D-20110201141918/org.eclipse.virgo.test.framework-3.0.0.D-20110201141918.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.0.0.D-20110201141918/org.eclipse.virgo.test.framework-sources-3.0.0.D-20110201141918.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="src" path="/org.eclipse.virgo.medic">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.2.0.D-20110129172447/org.eclipse.virgo.osgi.extensions.equinox-2.2.0.D-20110129172447.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.2.0.D-20110129172447/org.eclipse.virgo.osgi.extensions.equinox-sources-2.2.0.D-20110129172447.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.2.0.D-20110129172447/org.eclipse.virgo.osgi.launcher-2.2.0.D-20110129172447.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.2.0.D-20110129172447/org.eclipse.virgo.osgi.launcher-sources-2.2.0.D-20110129172447.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20110129172745/org.eclipse.virgo.util.common-2.2.0.D-20110129172745.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20110129172745/org.eclipse.virgo.util.common-sources-2.2.0.D-20110129172745.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.D-20110201141222/org.eclipse.virgo.osgi.extensions.equinox-3.0.0.D-20110201141222.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.0.0.D-20110201141222/org.eclipse.virgo.osgi.extensions.equinox-sources-3.0.0.D-20110201141222.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.0.0.D-20110201141222/org.eclipse.virgo.osgi.launcher-3.0.0.D-20110201141222.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.0.0.D-20110201141222/org.eclipse.virgo.osgi.launcher-sources-3.0.0.D-20110201141222.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.D-20110201141522/org.eclipse.virgo.util.common-3.0.0.D-20110201141522.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.D-20110201141522/org.eclipse.virgo.util.common-sources-3.0.0.D-20110201141522.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.equinox/org.eclipse.equinox.cm/1.0.200.v20100520/org.eclipse.equinox.cm-1.0.200.v20100520.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-3.3.0.v20101018.jar"/>
<classpathentry kind="output" path="target/classes"/>
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 d3baf8c..240df6f 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,9 +1,9 @@
launcher.bundles=\
file:../ivy-cache/repository/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar@start,\
file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar@start,\
-file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20110129172745/org.eclipse.virgo.util.common-2.2.0.D-20110129172745.jar,\
-file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20110129172745/org.eclipse.virgo.util.osgi-2.2.0.D-20110129172745.jar,\
-file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.2.0.D-20110129172745/org.eclipse.virgo.util.parser.manifest-2.2.0.D-20110129172745.jar,\
+file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.0.0.D-20110201141522/org.eclipse.virgo.util.common-3.0.0.D-20110201141522.jar,\
+file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.0.0.D-20110201141522/org.eclipse.virgo.util.osgi-3.0.0.D-20110201141522.jar,\
+file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.0.0.D-20110201141522/org.eclipse.virgo.util.parser.manifest-3.0.0.D-20110201141522.jar,\
file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
file:../ivy-cache/repository/org.eclipse.equinox/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
file:../org.eclipse.virgo.medic/target/artifacts/org.eclipse.virgo.medic.jar@start,\

Back to the top