Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.jetty-server into 380765-shared-ivycache
diff --git a/build-jetty-server/build.xml b/build-jetty-server/build.xml
index 76488c3..7fbfd32 100644
--- a/build-jetty-server/build.xml
+++ b/build-jetty-server/build.xml
@@ -154,8 +154,8 @@
replace="osgi.console=2401" flags="s"
file="${jetty.server.resources}/configuration/org.eclipse.virgo.kernel.userregion.properties"/>
- <replaceregexp match="initialArtifacts =.*\.springdm"
- replace="initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.springdm, repository:plan/org.eclipse.virgo.jetty.web" flags="s"
+ <replaceregexp match="initialArtifacts =.*\.blueprint"
+ replace="initialArtifacts=repository:plan/org.eclipse.virgo.kernel.userregion.blueprint, repository:plan/org.eclipse.virgo.jetty.web" flags="s"
file="${jetty.server.resources}/configuration/org.eclipse.virgo.kernel.userregion.properties"/>
<replaceregexp match="virgo-kernel" replace="virgo-jetty-server" flags="g"
diff --git a/org.eclipse.virgo.jetty.sample.tags/src/main/webapp/WEB-INF/applicationContext.xml b/org.eclipse.virgo.jetty.sample.tags/src/main/webapp/WEB-INF/applicationContext.xml
index 699518e..87a1816 100644
--- a/org.eclipse.virgo.jetty.sample.tags/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/org.eclipse.virgo.jetty.sample.tags/src/main/webapp/WEB-INF/applicationContext.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
</beans>
+
diff --git a/org.eclipse.virgo.jetty.sample.tags/template.mf b/org.eclipse.virgo.jetty.sample.tags/template.mf
index 602839e..ade5c3d 100644
--- a/org.eclipse.virgo.jetty.sample.tags/template.mf
+++ b/org.eclipse.virgo.jetty.sample.tags/template.mf
@@ -15,4 +15,6 @@
org.springframework.web.servlet;version="${org.springframework:[2.5.6, +1)}",
org.springframework.web.servlet.tags.form;version="${org.springframework:[2.5.6, +1)}",
org.springframework.core;version="${org.springframework:[2.5.6, +1)}"
+Import-Bundle:
+ org.springframework.context;version="${org.springframework:[2.5.6, +1)}"
diff --git a/org.eclipse.virgo.jetty.smoketest/apps/org.eclipse.virgo.jetty.sample.tags.jar b/org.eclipse.virgo.jetty.smoketest/apps/org.eclipse.virgo.jetty.sample.tags.jar
index fc223eb..c2b0d67 100644
--- a/org.eclipse.virgo.jetty.smoketest/apps/org.eclipse.virgo.jetty.sample.tags.jar
+++ b/org.eclipse.virgo.jetty.smoketest/apps/org.eclipse.virgo.jetty.sample.tags.jar
Binary files differ
