Upgrade to Spring 3 final

zentuit · Dec 16, 2009 · 31bb69e · 31bb69e
1 parent 31b73a6
commit 31bb69e
Show file tree

Hide file tree

Showing 27 changed files with 113 additions and 143 deletions.
diff --git a/.classpath b/.classpath
@@ -4,23 +4,23 @@
 	<classpathentry kind="src" path="scripts"/>
 	<classpathentry kind="src" output="target/eclipse/test-output" path="src/test"/>
 	<classpathentry kind="src" path="src/jar"/>
-	<classpathentry kind="lib" path="lib/hibernate-core-3.3.1.GA.jar" sourcepath="/HIBERNATE_HOME/src"/>
-	<classpathentry kind="lib" path="lib/org.springframework.aop-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.aop-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.asm-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.asm-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.aspects-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.beans-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.beans-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.context-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.context-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.context.support-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.core-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.core-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.expression-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.expression-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.instrument-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.jdbc-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.jms-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.jms-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.orm-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.orm-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.test-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.test-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.transaction-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.web-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.web-sources-3.0.0.RC3.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.web.servlet-sources-3.0.0.RC3.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate-core-3.3.1.GA.jar" sourcepath="/Developer/hibernate-distribution-3.3.1.GA/project/core/src/main/java"/>
+	<classpathentry kind="lib" path="lib/org.springframework.aop-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.aop-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.asm-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.asm-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.aspects-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.beans-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.beans-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.context-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.context-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.context.support-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.expression-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.expression-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.instrument-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.jdbc-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.jms-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.jms-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.orm-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.orm-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.test-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.test-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.transaction-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.web-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.web-sources-3.0.0.RELEASE.jar"/>
+	<classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.0.RELEASE.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RELEASE/src/org.springframework.web.servlet-sources-3.0.0.RELEASE.jar"/>
 	<classpathentry kind="lib" path="lib/ant-junit-1.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/ant-nodeps-1.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/ant-1.7.1.jar"/>
@@ -74,5 +74,6 @@
 	<classpathentry kind="lib" path="lib/GParallelizer-0.8.3.jar"/>
 	<classpathentry kind="lib" path="lib/aspectjrt-1.6.6.jar"/>
 	<classpathentry kind="lib" path="lib/aspectjweaver-1.6.6.jar"/>
+	<classpathentry kind="var" path="ASPECTJRT_LIB"/>
 	<classpathentry kind="output" path="target/eclipse/bin-output"/>
 </classpath>
diff --git a/Grails.iml b/Grails.iml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Groovy" name="Groovy">
-      <configuration />
-    </facet>
-  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/idea-target/classes" />
     <output-test url="file://$MODULE_DIR$/idea-target/test-classes" />
@@ -13,7 +8,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/jsp21" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/META-INF" />
       <excludeFolder url="file://$MODULE_DIR$/cruise" />
       <excludeFolder url="file://$MODULE_DIR$/doc" />
       <excludeFolder url="file://$MODULE_DIR$/downloads" />
@@ -105,15 +99,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/src/jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="library" name="GParallelizer" level="project" />
     <orderEntry type="library" name="DOM4J" level="project" />
     <orderEntry type="library" name="JPA" level="project" />
@@ -141,6 +126,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/src/jar" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <javadoc-paths>
       <root url="file://$MODULE_DIR$/../spring-framework-2.0/docs/api" />
       <root url="file://$MODULE_DIR$/../hibernate-3.2/doc/api" />

diff --git a/JSP21.iml b/JSP21.iml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Groovy" name="Groovy">
-      <configuration />
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/src/jsp21">

diff --git a/build.properties b/build.properties
@@ -15,7 +15,7 @@ bundlor.svnkit.version=1.3.1
 bundlor.servlet.version=2.5.0
 bundlor.radeox.version=1.0.0.b2
 bundlor.groovy.version=1.6.7
-bundlor.spring.version=3.0.0.RC3
+bundlor.spring.version=3.0.0.RELEASE
 bundlor.ant.version=1.7.1
 bundlor.ivy.version=2.0.0
 bundlor.gant.version=1.6.0