From caf1a0875ac51544aec99129e29e3bbfa94f9b12 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Fri, 29 Oct 2010 17:17:38 +0000
Subject: [PATCH] SPR-7308 + add updated IDE classpath + add updated OSGi
 manifest

---
 org.springframework.aspects/ivy.xml     | 3 ++-
 org.springframework.aspects/template.mf | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/org.springframework.aspects/ivy.xml b/org.springframework.aspects/ivy.xml
index 90b144245c..a28137f51e 100644
--- a/org.springframework.aspects/ivy.xml
+++ b/org.springframework.aspects/ivy.xml
@@ -15,6 +15,7 @@
 		<conf name="aspectj" extends="runtime" description="JARs needed to run with AspectJ"/>
 		<conf name="tx" extends="runtime" description="JARs needed to run transactional aspects"/>
 		<conf name="orm" extends="runtime" description="JARs needed to compile JPA aspects"/>
+		<conf name="cache" extends="runtime" description="JARs needed to compile caching aspects"/>
 	</configurations>
 
 	<publications>
@@ -32,7 +33,7 @@
 		<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional, orm->compile"/>
 		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
-		<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
+		<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="optional, cache->compile"/>
 		<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="optional, orm->compile"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
 		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="optional, test->compile"/>
diff --git a/org.springframework.aspects/template.mf b/org.springframework.aspects/template.mf
index eafca007d0..5be0f74431 100644
--- a/org.springframework.aspects/template.mf
+++ b/org.springframework.aspects/template.mf
@@ -6,6 +6,7 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.aspectj.*;version=${aj.osgi.range};resolution:=optional,
  org.springframework.beans.*;version=${spring.osgi.range},
+ org.springframework.cache.*;version=${spring.osgi.range};resolution:=optional,
  org.springframework.transaction.*;version=${spring.osgi.range};resolution:=optional,
  org.springframework.core.task.*;version=${spring.osgi.range};resolution:=optional,
  org.springframework.orm.jpa.*;version=${spring.osgi.range};resolution:=optional,