Included new spring packages in cdmlib plugin

diff --git a/.gitattributes b/.gitattributes
index f8ca396de6218392c85bea149a06f2f2da4aafc9..b19a0e904dc60e371ba7dcd682323163820837be 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -2803,12 +2803,14 @@ eclipse-plugin/spring-aop-2.5.6.jar -text
 eclipse-plugin/spring-aop-2.5.6src.zip -text
 eclipse-plugin/spring-aspects-2.5.6.jar -text
 eclipse-plugin/spring-aspects-2.5.6src.zip -text
-eclipse-plugin/spring-beans-2.5.6.jar -text
-eclipse-plugin/spring-beans-2.5.6src.zip -text
+eclipse-plugin/spring-beans-3.0.0.RELEASE.jar -text
+eclipse-plugin/spring-beans-3.0.0.RELEASEsrc.zip -text
 eclipse-plugin/spring-context-2.5.6.jar -text
 eclipse-plugin/spring-context-2.5.6src.zip -text
 eclipse-plugin/spring-core-2.5.6.jar -text
 eclipse-plugin/spring-core-2.5.6src.zip -text
+eclipse-plugin/spring-expression-3.0.0.RELEASE.jar -text
+eclipse-plugin/spring-expression-3.0.0.RELEASEsrc.zip -text
 eclipse-plugin/spring-jdbc-2.5.6.jar -text
 eclipse-plugin/spring-jdbc-2.5.6src.zip -text
 eclipse-plugin/spring-modules-lucene-0.8a.jar -text
@@ -2818,10 +2820,12 @@ eclipse-plugin/spring-orm-2.5.6src.zip -text
 eclipse-plugin/spring-security-core-2.0.4-tests.jar -text
 eclipse-plugin/spring-security-core-2.0.4.jar -text
 eclipse-plugin/spring-security-core-2.0.4src.zip -text
+eclipse-plugin/spring-security-core-3.0.0.RELEASE.jar -text
+eclipse-plugin/spring-security-core-3.0.0.RELEASEsrc.zip -text
 eclipse-plugin/spring-test-2.5.6.jar -text
 eclipse-plugin/spring-test-2.5.6src.zip -text
-eclipse-plugin/spring-tx-2.5.6.jar -text
-eclipse-plugin/spring-tx-2.5.6src.zip -text
+eclipse-plugin/spring-tx-3.0.0.RELEASE.jar -text
+eclipse-plugin/spring-tx-3.0.0.RELEASEsrc.zip -text
 eclipse-plugin/spring-web-2.5.6.jar -text
 eclipse-plugin/spring-web-2.5.6src.zip -text
 eclipse-plugin/spring-webmvc-2.5.6.jar -text

diff --git a/eclipse-plugin/.classpath b/eclipse-plugin/.classpath
index 633ea7f559a3c9e857cb36d826d58f39edc98d09..414773749b7e2237da06c10c47e72f8545cacff4 100644 (file)
--- a/eclipse-plugin/.classpath
+++ b/eclipse-plugin/.classpath
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry exported="true" kind="lib" path="spring-tx-3.0.0.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="spring-security-core-3.0.0.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="spring-expression-3.0.0.RELEASE.jar"/>
+       <classpathentry exported="true" kind="lib" path="spring-beans-3.0.0.RELEASE.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
@@ -73,7 +77,6 @@
        <classpathentry exported="true" kind="lib" path="commons-dbcp-1.2.2.jar" sourcepath="commons-dbcp-1.2.2src.zip"/>
        <classpathentry exported="true" kind="lib" path="org.springframework.aop-3.0.0.RC1.jar" sourcepath="org.springframework.aop-3.0.0.RC1src.zip"/>
        <classpathentry exported="true" kind="lib" path="org.springframework.aspects-3.0.0.RC1.jar" sourcepath="org.springframework.aspects-3.0.0.RC1src.zip"/>
-       <classpathentry exported="true" kind="lib" path="org.springframework.beans-3.0.0.RC1.jar" sourcepath="org.springframework.beans-3.0.0.RC1src.zip"/>
        <classpathentry exported="true" kind="lib" path="org.springframework.context-3.0.0.RC1.jar" sourcepath="org.springframework.context-3.0.0.RC1src.zip"/>
        <classpathentry exported="true" kind="lib" path="org.springframework.core-3.0.0.RC1.jar" sourcepath="org.springframework.core-3.0.0.RC1src.zip"/>
        <classpathentry exported="true" kind="lib" path="org.springframework.jdbc-3.0.0.RC1.jar" sourcepath="org.springframework.jdbc-3.0.0.RC1src.zip"/>

diff --git a/eclipse-plugin/META-INF/MANIFEST.MF b/eclipse-plugin/META-INF/MANIFEST.MF
index 2120f130f43c7e8570d2982481eb397be748ad25..148608d13b4ca3edfa26df82ef840a5e4e2a2609 100644 (file)
--- a/eclipse-plugin/META-INF/MANIFEST.MF
+++ b/eclipse-plugin/META-INF/MANIFEST.MF
@@ -72,9 +72,11 @@ Bundle-ClassPath: activation-1.1.jar,
  commons-dbcp-1.2.2.jar,
  org.springframework.aop-3.0.0.RC1.jar,
  org.springframework.aspects-3.0.0.RC1.jar,
- org.springframework.beans-3.0.0.RC1.jar,
+ spring-beans-3.0.0.RELEASE.jar,
+ spring-security-core-3.0.0.RELEASE.jar,
  org.springframework.context-3.0.0.RC1.jar,
  org.springframework.core-3.0.0.RC1.jar,
+ spring-expression-3.0.0.RELEASE.jar,
  org.springframework.jdbc-3.0.0.RC1.jar,
  org.springframework.orm-3.0.0.RC1.jar,
  org.springframework.test-3.0.0.RC1.jar,
@@ -83,7 +85,8 @@ Bundle-ClassPath: activation-1.1.jar,
  org.springframework.expression-3.0.0.RC1.jar,
  commons-pool-1.3.jar,
  hibernate-validator-4.0.0.CR1.jar,
- xml-resolver-1.2.jar
+ xml-resolver-1.2.jar,
+ spring-tx-3.0.0.RELEASE.jar
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.cdm.api.application;
   uses:="org.springframework.transaction,

diff --git a/eclipse-plugin/build.properties b/eclipse-plugin/build.properties
index e9c18382c1bb8f711d9d65f1f1acd73431fd6dd3..951a858eb88080ac1fe506d9d52253fade9c2dc9 100644 (file)
--- a/eclipse-plugin/build.properties
+++ b/eclipse-plugin/build.properties
@@ -26,7 +26,6 @@ bin.includes = META-INF/,\
                joda-time-hibernate-1.0.jar,\\r
                sanselan-0.94-incubator.jar,\\r
                poi-3.1-FINAL.jar,\\r
-               spring-security-core-2.0.4.jar,\\r
                aspectjweaver-1.5.4.jar,\\r
                lucene-core-2.4.0.jar,\\r
                lucene-spellchecker-2.4.0.jar,\\r
@@ -73,7 +72,6 @@ bin.includes = META-INF/,\
                org.springframework.aop-3.0.0.RC1.jar,\\r
                org.springframework.asm-3.0.0.RC1.jar,\\r
                org.springframework.aspects-3.0.0.RC1.jar,\\r
-               org.springframework.beans-3.0.0.RC1.jar,\\r
                org.springframework.context-3.0.0.RC1.jar,\\r
                org.springframework.core-3.0.0.RC1.jar,\\r
                org.springframework.expression-3.0.0.RC1.jar,\\r
@@ -87,7 +85,12 @@ bin.includes = META-INF/,\
                xml-resolver-1.2.jar,\\r
                activation-1.1.jar,\\r
                jaxb-api-2.1.6.jar,\\r
-               jaxb-impl-2.1.6.jar\r
+               jaxb-impl-2.1.6.jar,\\r
+               spring-beans-3.0.0.RELEASE.jar,\\r
+               spring-expression-3.0.0.RELEASE.jar,\\r
+               spring-security-core-3.0.0.RELEASE.jar,\\r
+               spring-tx-3.0.0.RELEASE.jar,\\r
+               org.springframework.beans-3.0.0.RC1.jar\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = spring-context-support-2.5src.zip,\\r
                spring-jdbc-2.5src.zip,\\r
@@ -139,5 +142,9 @@ src.includes = spring-context-support-2.5src.zip,\
                activation-1.1src.zip,\\r
                commons-pool-1.3src.zip,\\r
                commons-dbcp-1.2.2src.zip,\\r
-               jaxb-impl-2.1.6-sources.jar\r
+               jaxb-impl-2.1.6-sources.jar,\\r
+               spring-beans-3.0.0.RELEASEsrc.zip,\\r
+               spring-security-core-3.0.0.RELEASEsrc.zip,\\r
+               spring-tx-3.0.0.RELEASEsrc.zip,\\r
+               spring-expression-3.0.0.RELEASEsrc.zip\r
 \r

diff --git a/eclipse-plugin/spring-beans-2.5.6.jar b/eclipse-plugin/spring-beans-2.5.6.jar
deleted file mode 100644 (file)
index 3f306b6..0000000
Binary files a/eclipse-plugin/spring-beans-2.5.6.jar and /dev/null differ

diff --git a/eclipse-plugin/spring-beans-2.5.6src.zip b/eclipse-plugin/spring-beans-2.5.6src.zip
deleted file mode 100644 (file)
index 034937d..0000000
Binary files a/eclipse-plugin/spring-beans-2.5.6src.zip and /dev/null differ

diff --git a/eclipse-plugin/spring-beans-3.0.0.RELEASE.jar b/eclipse-plugin/spring-beans-3.0.0.RELEASE.jar
new file mode 100644 (file)
index 0000000..49f3011
Binary files /dev/null and b/eclipse-plugin/spring-beans-3.0.0.RELEASE.jar differ

diff --git a/eclipse-plugin/spring-beans-3.0.0.RELEASEsrc.zip b/eclipse-plugin/spring-beans-3.0.0.RELEASEsrc.zip
new file mode 100644 (file)
index 0000000..a43a8b4
Binary files /dev/null and b/eclipse-plugin/spring-beans-3.0.0.RELEASEsrc.zip differ

diff --git a/eclipse-plugin/spring-expression-3.0.0.RELEASE.jar b/eclipse-plugin/spring-expression-3.0.0.RELEASE.jar
new file mode 100644 (file)
index 0000000..459ad31
Binary files /dev/null and b/eclipse-plugin/spring-expression-3.0.0.RELEASE.jar differ

diff --git a/eclipse-plugin/spring-expression-3.0.0.RELEASEsrc.zip b/eclipse-plugin/spring-expression-3.0.0.RELEASEsrc.zip
new file mode 100644 (file)
index 0000000..bd1fc4b
Binary files /dev/null and b/eclipse-plugin/spring-expression-3.0.0.RELEASEsrc.zip differ

diff --git a/eclipse-plugin/spring-security-core-3.0.0.RELEASE.jar b/eclipse-plugin/spring-security-core-3.0.0.RELEASE.jar
new file mode 100644 (file)
index 0000000..ae79105
Binary files /dev/null and b/eclipse-plugin/spring-security-core-3.0.0.RELEASE.jar differ

diff --git a/eclipse-plugin/spring-security-core-3.0.0.RELEASEsrc.zip b/eclipse-plugin/spring-security-core-3.0.0.RELEASEsrc.zip
new file mode 100644 (file)
index 0000000..577cb68
Binary files /dev/null and b/eclipse-plugin/spring-security-core-3.0.0.RELEASEsrc.zip differ

diff --git a/eclipse-plugin/spring-tx-2.5.6.jar b/eclipse-plugin/spring-tx-2.5.6.jar
deleted file mode 100644 (file)
index 1a19297..0000000
Binary files a/eclipse-plugin/spring-tx-2.5.6.jar and /dev/null differ

diff --git a/eclipse-plugin/spring-tx-2.5.6src.zip b/eclipse-plugin/spring-tx-2.5.6src.zip
deleted file mode 100644 (file)
index 4f5d123..0000000
Binary files a/eclipse-plugin/spring-tx-2.5.6src.zip and /dev/null differ

diff --git a/eclipse-plugin/spring-tx-3.0.0.RELEASE.jar b/eclipse-plugin/spring-tx-3.0.0.RELEASE.jar
new file mode 100644 (file)
index 0000000..b4a69e4
Binary files /dev/null and b/eclipse-plugin/spring-tx-3.0.0.RELEASE.jar differ

diff --git a/eclipse-plugin/spring-tx-3.0.0.RELEASEsrc.zip b/eclipse-plugin/spring-tx-3.0.0.RELEASEsrc.zip
new file mode 100644 (file)
index 0000000..955c2ff
Binary files /dev/null and b/eclipse-plugin/spring-tx-3.0.0.RELEASEsrc.zip differ