merge trunk into hibernate4

diff --cc cdmlib-io/pom.xml
index 7373839039f1e754aa394ee4d746a08fedaaec35,4821133d081fb2747c01ea77f7df3d23056b09c8..74e1829bdffd9c4d321fa6f9befea1659f721cb2
--- 1/cdmlib-io/pom.xml
--- 2/cdmlib-io/pom.xml
+++ b/cdmlib-io/pom.xml
@@@ -131,25 -131,25 +131,25 @@@
      <!--  version>10.0.3</version> -->
      <version>9.0.8</version>
    </dependency>
--   <dependency>
--       <groupId>org.springframework.ws</groupId>
--       <artifactId>spring-xml</artifactId>
--       <version>2.1.2.RELEASE</version>
--       <exclusions>
--         <exclusion>
--           <groupId>org.springframework</groupId>
--           <artifactId>spring-core</artifactId>
--         </exclusion>
--         <exclusion>
--           <groupId>org.springframework</groupId>
--           <artifactId>spring-context</artifactId>
--         </exclusion>
--         <exclusion>
--           <groupId>org.springframework</groupId>
--           <artifactId>spring-beans</artifactId>
--         </exclusion>
--       </exclusions>
--     </dependency>
++<!--    <dependency> -->
++<!--        <groupId>org.springframework.ws</groupId> -->
++<!--        <artifactId>spring-xml</artifactId> -->
++<!--        <version>2.1.2.RELEASE</version> -->
++<!--        <exclusions> -->
++<!--          <exclusion> -->
++<!--            <groupId>org.springframework</groupId> -->
++<!--            <artifactId>spring-core</artifactId> -->
++<!--          </exclusion> -->
++<!--          <exclusion> -->
++<!--            <groupId>org.springframework</groupId> -->
++<!--            <artifactId>spring-context</artifactId> -->
++<!--          </exclusion> -->
++<!--          <exclusion> -->
++<!--            <groupId>org.springframework</groupId> -->
++<!--            <artifactId>spring-beans</artifactId> -->
++<!--          </exclusion> -->
++<!--        </exclusions> -->
++<!--      </dependency> -->
       <dependency>
            <groupId>identificationKeyAPI</groupId>
            <artifactId>identificationKeyAPI</artifactId>

diff --cc cdmlib-services/pom.xml
Simple merge