From c08b4d7f8a40bc6c46baa06effdda4e93441da2a Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 24 Mar 2010 09:01:55 +0000
Subject: [PATCH] updated to Jackson 1.4.2

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3149 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../web-servlet.iml                           | 27 ++++++++++++++++---
 org.springframework.web/web.iml               |  8 +++---
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/org.springframework.web.servlet/web-servlet.iml b/org.springframework.web.servlet/web-servlet.iml
index 9d2fef15644..a042eb3cc12 100644
--- a/org.springframework.web.servlet/web-servlet.iml
+++ b/org.springframework.web.servlet/web-servlet.iml
@@ -16,6 +16,7 @@
     <orderEntry type="module" module-name="context" />
     <orderEntry type="module" module-name="context-support" />
     <orderEntry type="module" module-name="core" />
+    <orderEntry type="module" module-name="expression" />
     <orderEntry type="module" module-name="orm" />
     <orderEntry type="module" module-name="oxm" />
     <orderEntry type="module" module-name="transaction" />
@@ -26,6 +27,24 @@
     <orderEntry type="library" name="javax.el" level="project" />
     <orderEntry type="library" name="javax.validation" level="project" />
     <orderEntry type="library" name="JUnit" level="project" />
+    <orderEntry type="module-library">
+      <library name="Tiles 2.2.1">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../../../java/tiles-2.2.1" />
+          <root url="jar://$MODULE_DIR$/../../../java/tiles-2.2.1/lib/optional/ognl-2.7.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../java/tiles-2.2.1/lib/optional/mvel2-2.0.11.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../../../java/tiles-2.2.1/src/tiles-api/src/main/java" />
+          <root url="file://$MODULE_DIR$/../../../java/tiles-2.2.1/src/tiles-core/src/main/java" />
+          <root url="file://$MODULE_DIR$/../../../java/tiles-2.2.1/src/tiles-extras/src/main/java" />
+          <root url="file://$MODULE_DIR$/../../../java/tiles-2.2.1/src/tiles-servlet/src/main/java" />
+          <root url="file://$MODULE_DIR$/../../../java/tiles-2.2.1/src/tiles-el/src/main/java" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/../../../java/tiles-2.2.1" recursive="false" />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -247,22 +266,22 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson/1.0.0/com.springsource.org.codehaus.jackson-1.0.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson/1.4.2/com.springsource.org.codehaus.jackson-1.4.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson/1.0.0/com.springsource.org.codehaus.jackson-sources-1.0.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson/1.4.2/com.springsource.org.codehaus.jackson-sources-1.4.2.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson.mapper/1.0.0/com.springsource.org.codehaus.jackson.mapper-1.0.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson.mapper/1.4.2/com.springsource.org.codehaus.jackson.mapper-1.4.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson.mapper/1.0.0/com.springsource.org.codehaus.jackson.mapper-sources-1.0.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson.mapper/1.4.2/com.springsource.org.codehaus.jackson.mapper-sources-1.4.2.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/org.springframework.web/web.iml b/org.springframework.web/web.iml
index 1143a4a4e78..ebd7a059f0f 100644
--- a/org.springframework.web/web.iml
+++ b/org.springframework.web/web.iml
@@ -133,22 +133,22 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson/1.0.0/com.springsource.org.codehaus.jackson-1.0.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson/1.4.2/com.springsource.org.codehaus.jackson-1.4.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson/1.0.0/com.springsource.org.codehaus.jackson-sources-1.0.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson/1.4.2/com.springsource.org.codehaus.jackson-sources-1.4.2.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson.mapper/1.0.0/com.springsource.org.codehaus.jackson.mapper-1.0.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson.mapper/1.4.2/com.springsource.org.codehaus.jackson.mapper-1.4.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson.mapper/1.0.0/com.springsource.org.codehaus.jackson.mapper-sources-1.0.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.codehaus.jackson/com.springsource.org.codehaus.jackson.mapper/1.4.2/com.springsource.org.codehaus.jackson.mapper-sources-1.4.2.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>