aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Powell2010-09-03 07:21:16 (EDT)
committerSteve Powell2010-09-03 07:21:16 (EDT)
commit69bf74a578694846764c880983ca94d55069a4ed (patch)
tree17da08368abc5dbb782189b28fa7079826d46f17
parentf0d07fd8e04165f87288fbd44613e99068d6173f (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-69bf74a578694846764c880983ca94d55069a4ed.zip
org.eclipse.gemini.web.gemini-web-container-69bf74a578694846764c880983ca94d55069a4ed.tar.gz
org.eclipse.gemini.web.gemini-web-container-69bf74a578694846764c880983ca94d55069a4ed.tar.bz2
Deploy org.eclipse.jdt.core at 3.3.0 level.
-rw-r--r--org.eclipse.gemini.web.test/ivy.xml1
-rw-r--r--org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties1
-rw-r--r--org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF3
3 files changed, 1 insertions, 4 deletions
diff --git a/org.eclipse.gemini.web.test/ivy.xml b/org.eclipse.gemini.web.test/ivy.xml
index 52aa6bc..4b87e4e 100644
--- a/org.eclipse.gemini.web.test/ivy.xml
+++ b/org.eclipse.gemini.web.test/ivy.xml
@@ -25,7 +25,6 @@
<dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.extensions.equinox" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
<dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="latest.integration"/>
<dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.tomcat" rev="latest.integration"/>
diff --git a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
index d0dce51..38e1b49 100644
--- a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
@@ -21,6 +21,7 @@ file:../ivy-cache/repository/org.apache.catalina.springsource/com.springsource.o
file:../ivy-cache/repository/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.29.S2-r1559/com.springsource.org.apache.coyote.springsource-6.0.29.S2-r1559.jar,\
file:../ivy-cache/repository/org.apache.el.springsource/com.springsource.org.apache.el.springsource/6.0.29.S2-r1559/com.springsource.org.apache.el.springsource-6.0.29.S2-r1559.jar@start,\
file:../ivy-cache/repository/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.29.S2-r1559/com.springsource.org.apache.jasper.springsource-6.0.29.S2-r1559.jar,\
+file:../ivy-cache/repository/org.eclipse.jdt/com.springsource.org.eclipse.jdt.core.compiler.batch/3.3.0/com.springsource.org.eclipse.jdt.core.compiler.batch-3.3.0.jar,\
file:../ivy-cache/repository/org.apache.juli.springsource/com.springsource.org.apache.juli.extras.springsource/6.0.29.S2-r1559/com.springsource.org.apache.juli.extras.springsource-6.0.29.S2-r1559.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.slf4j/com.springsource.slf4j.nop/1.6.1/com.springsource.slf4j.nop-1.6.1.jar,\
diff --git a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
index 9822ebe..64c2c90 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
@@ -1,9 +1,6 @@
Manifest-Version: 1.0
Export-Package: org.eclipse.gemini.web.tomcat.spi;version="1";uses:="o
rg.osgi.framework"
-Bundle-ClassPath: .,com.springsource.javax.xml.bind-2.1.7.jar,com.spri
- ngsource.javax.xml.soap-1.3.0.jar,com.springsource.javax.xml.stream-1
- .0.1.jar
Bundle-Version: 1
Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Gemini Web Tomcat Bootstrap (incubation)