From 9cf06a136488be7df9e495ea0e86bd21779ce558 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Wed, 10 Mar 2010 09:55:15 +0100
Subject: [PATCH 04/15] Pull cglib 2.2

Replaced -nodeps flavour with a clean one, so that it uses the same ASM
as we bundle.
---
 .idea/libraries/CGLIB.xml                          |    6 +++---
 lib/cglib-2.2.jar                                  |  Bin 0 -> 278682 bytes
 lib/cglib-nodep-2.1_3.jar                          |  Bin 324238 -> 0 bytes
 lib/required_for_dist.txt                          |    2 +-
 lib/src/{cglib-src-2.1_3.jar => cglib-src-2.2.jar} |  Bin 1610524 -> 1520971 bytes
 platform/extensions/extensions.iml                 |    1 +
 platform/platform-impl/platform-impl.iml           |    1 +
 xml/dom-impl/dom-impl.iml                          |    1 +
 8 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 lib/cglib-2.2.jar
 delete mode 100644 lib/cglib-nodep-2.1_3.jar
 rename lib/src/{cglib-src-2.1_3.jar => cglib-src-2.2.jar} (66%)

diff --git a/.idea/libraries/CGLIB.xml b/.idea/libraries/CGLIB.xml
index 061f6f2..21e9a8c 100644
--- a/.idea/libraries/CGLIB.xml
+++ b/.idea/libraries/CGLIB.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="CGLIB">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/cglib-nodep-2.1_3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cglib-2.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/cglib-src-2.1_3.jar!/src/proxy" />
+      <root url="jar://$PROJECT_DIR$/lib/src/cglib-src-2.2.jar!/src/proxy" />
     </SOURCES>
   </library>
-</component>
\ No newline at end of file
+</component>
diff --git a/lib/cglib-2.2.jar b/lib/cglib-2.2.jar
new file mode 100644
index 0000000..084ef6e
Binary files /dev/null and b/lib/cglib-2.2.jar differ
diff --git a/lib/cglib-nodep-2.1_3.jar b/lib/cglib-nodep-2.1_3.jar
deleted file mode 100644
index e9b17eb..0000000
Binary files a/lib/cglib-nodep-2.1_3.jar and /dev/null differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index efa13ba..b347e1a 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -4,7 +4,7 @@ asm-commons-3.2.jar
 asm-3.2.jar
 asm-tree-3.0.jar
 bcel.jar
-cglib-nodep-2.1_3.jar
+cglib-2.2.jar
 coverage-agent.jar
 coverage-report.jar
 coverage-report-idea.jar
diff --git a/lib/src/cglib-src-2.1_3.jar b/lib/src/cglib-src-2.2.jar
similarity index 66%
rename from lib/src/cglib-src-2.1_3.jar
rename to lib/src/cglib-src-2.2.jar
index cd4e57a..4a32ba9 100644
Binary files a/lib/src/cglib-src-2.1_3.jar and b/lib/src/cglib-src-2.2.jar differ
diff --git a/platform/extensions/extensions.iml b/platform/extensions/extensions.iml
index 86d5a5d..8648132 100644
--- a/platform/extensions/extensions.iml
+++ b/platform/extensions/extensions.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" scope="TEST" name="JMock1" level="project" />
+    <orderEntry type="library" scope="TEST" name="asm" level="project" />
     <orderEntry type="library" scope="TEST" name="CGLIB" level="project" />
     <orderEntry type="library" name="Mocks" level="project" />
   </component>
diff --git a/platform/platform-impl/platform-impl.iml b/platform/platform-impl/platform-impl.iml
index dd72340..82b6640 100644
--- a/platform/platform-impl/platform-impl.iml
+++ b/platform/platform-impl/platform-impl.iml
@@ -19,6 +19,7 @@
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" name="XmlRPC" level="project" />
     <orderEntry type="library" name="commons-net" level="project" />
+    <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="library" name="CGLIB" level="project" />
     <orderEntry type="module" module-name="lvcs-api" exported="" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
diff --git a/xml/dom-impl/dom-impl.iml b/xml/dom-impl/dom-impl.iml
index 0e93e87..f244459 100644
--- a/xml/dom-impl/dom-impl.iml
+++ b/xml/dom-impl/dom-impl.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="dom-openapi" exported="" />
+    <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="library" name="CGLIB" level="project" />
     <orderEntry type="module" module-name="resources" />
     <orderEntry type="library" name="Xerces" level="project" />
-- 
1.7.0.1