Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-11-23 11:07:55 -0500
committerGlyn Normington2010-11-23 11:07:55 -0500
commit5e174b28f0aa9dd6fd688f7baac9847d237ff553 (patch)
tree31f9c058c056774d3e6fa273b721d47847db21cd /org.eclipse.virgo.medic.integrationtest
parent873d231b1b89b837a497833e1b3e68919e210ef0 (diff)
downloadorg.eclipse.virgo.medic-5e174b28f0aa9dd6fd688f7baac9847d237ff553.tar.gz
org.eclipse.virgo.medic-5e174b28f0aa9dd6fd688f7baac9847d237ff553.tar.xz
org.eclipse.virgo.medic-5e174b28f0aa9dd6fd688f7baac9847d237ff553.zip
bug 330236: upgrade to Equinox 3.7
Diffstat (limited to 'org.eclipse.virgo.medic.integrationtest')
-rw-r--r--org.eclipse.virgo.medic.integrationtest/.classpath5
-rw-r--r--org.eclipse.virgo.medic.integrationtest/.settings/com.springsource.server.ide.bundlor.core.prefs2
-rw-r--r--org.eclipse.virgo.medic.integrationtest/ivy.xml2
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties6
-rw-r--r--org.eclipse.virgo.medic.integrationtest/template.mf7
6 files changed, 23 insertions, 7 deletions
diff --git a/org.eclipse.virgo.medic.integrationtest/.classpath b/org.eclipse.virgo.medic.integrationtest/.classpath
index 63fffc5..c656142 100644
--- a/org.eclipse.virgo.medic.integrationtest/.classpath
+++ b/org.eclipse.virgo.medic.integrationtest/.classpath
@@ -28,12 +28,15 @@
<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-20101108170027/org.eclipse.virgo.test.framework-2.2.0.D-20101108170027.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.2.0.D-20101108170027/org.eclipse.virgo.test.framework-sources-2.2.0.D-20101108170027.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/MEDIC_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/>
<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.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-sources-2.2.0.D-20101108165433.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="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.2.0.M01/org.eclipse.virgo.osgi.launcher-2.2.0.M01.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.2.0.M01/org.eclipse.virgo.osgi.extensions.equinox-2.2.0.M01.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.medic.integrationtest/.settings/com.springsource.server.ide.bundlor.core.prefs b/org.eclipse.virgo.medic.integrationtest/.settings/com.springsource.server.ide.bundlor.core.prefs
index 0f959ee..b434a3d 100644
--- a/org.eclipse.virgo.medic.integrationtest/.settings/com.springsource.server.ide.bundlor.core.prefs
+++ b/org.eclipse.virgo.medic.integrationtest/.settings/com.springsource.server.ide.bundlor.core.prefs
@@ -1,4 +1,4 @@
-#Thu Nov 12 08:44:20 GMT 2009
+#Tue Nov 23 11:21:55 GMT 2010
com.springsource.server.ide.bundlor.core.bundlor.generated.manifest.autoformatting=true
com.springsource.server.ide.bundlor.core.byte.code.scanning=true
com.springsource.server.ide.bundlor.core.template.properties.files=../build.versions;../build.properties
diff --git a/org.eclipse.virgo.medic.integrationtest/ivy.xml b/org.eclipse.virgo.medic.integrationtest/ivy.xml
index a7c8263..a9b0a16 100644
--- a/org.eclipse.virgo.medic.integrationtest/ivy.xml
+++ b/org.eclipse.virgo.medic.integrationtest/ivy.xml
@@ -28,7 +28,7 @@
<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
<dependency org="ch.qos.logback" name="com.springsource.ch.qos.logback.classic" rev="${ch.qos.logback}" conf="test->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="optional->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="test->runtime"/>
<dependency org="org.eclipse.equinox" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="test->runtime"/>
<!-- Prevent org.eclipse.osgi.services dragging in old Equinox -->
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/MANIFEST.MF
index 697bbdd..73c910b 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/MANIFEST.MF
@@ -5,7 +5,13 @@ Bundle-SymbolicName: org.eclipse.virgo.medic.log.test
Import-Package: ch.qos.logback.classic.spi,
ch.qos.logback.core,
org.eclipse.virgo.medic.log;version="[2.2.0,2.3)",
+ org.eclipse.virgo.medic.log.appender,
+ org.osgi.service.cm,
org.osgi.framework;version=0,
- org.slf4j
+ org.slf4j,
+ org.junit,
+ org.eclipse.virgo.test.framework,
+ org.eclipse.virgo.medic.dump,
+ org.eclipse.virgo.medic.eventlog
Bundle-Version: 1.0.0
Bundle-ManifestVersion: 2
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 be07729..800aac0 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
@@ -4,13 +4,15 @@ file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.6.1/com.spri
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-2.2.0.D-20101108165433.jar,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.2.0.D-20101108165433/org.eclipse.virgo.util.parser.manifest-2.2.0.D-20101108165433.jar,\
-file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/3.1.200.v20071203/org.eclipse.osgi.services-3.1.200.v20071203.jar,\
-file:../ivy-cache/repository/org.eclipse.equinox/org.eclipse.equinox.cm/1.0.200.v20100520/org.eclipse.equinox.cm-1.0.200.v20100520.jar@start,\
+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,\
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
+
org.eclipse.virgo.suppress.heap.dumps=false
osgi.java.profile.bootdelegation=override
diff --git a/org.eclipse.virgo.medic.integrationtest/template.mf b/org.eclipse.virgo.medic.integrationtest/template.mf
index d48f0df..e0502ba 100644
--- a/org.eclipse.virgo.medic.integrationtest/template.mf
+++ b/org.eclipse.virgo.medic.integrationtest/template.mf
@@ -8,7 +8,12 @@ Import-Template:
org.aspectj.*;version="${org.aspectj:[=.=.=, +1)}"
Import-Package:
org.osgi.framework;version="0",
- org.eclipse.virgo.medic.log.appender;version="0"
+ org.osgi.service.cm;version="0",
+ org.eclipse.virgo.medic.log.appender;version="0",
+ org.junit;version="0",
+ org.eclipse.virgo.test.framework;version="0",
+ org.eclipse.virgo.medic.dump;version="0",
+ org.eclipse.virgo.medic.eventlog;version="0"
Excluded-Exports:
*
Excluded-Imports:

Back to the top