merged trunk to cdm-3.3

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

diff --cc cdmlib-remote-webapp/pom.xml
Simple merge

diff --cc cdmlib-remote/pom.xml
index 68ba2266690e96bc20ebd5b23e6f4ff6bb810298,03e5109bc2e684d910726fd69996ad4bbd69ec4f..be3e2d81f7ea398d528390580960d0b57b2c1758
--- 1/cdmlib-remote/pom.xml
--- 2/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@@ -1,226 -1,229 +1,229 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <!--
-     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-     http://maven.apache.org/maven-v4_0_0.xsd"
-    -->
-   <parent>
-     <groupId>eu.etaxonomy</groupId>
-     <artifactId>cdmlib-parent</artifactId>
-     <version>3.3.0-SNAPSHOT</version>
-     <relativePath>../pom.xml</relativePath>
-   </parent>
+       <!-- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" -->
+       <parent>
+               <groupId>eu.etaxonomy</groupId>
+               <artifactId>cdmlib-parent</artifactId>
 -              <version>3.2.1-SNAPSHOT</version>
++              <version>3.3.0-SNAPSHOT</version>
+               <relativePath>../pom.xml</relativePath>
+       </parent>
  
-   <modelVersion>4.0.0</modelVersion>
-   <artifactId>cdmlib-remote</artifactId>
-   <properties>
-     <!--
-       custom property to hold the patch version number
-       shouldn't this be set in the parent pom?
-      -->
-     <project.patchversion>0</project.patchversion>
-   </properties>
-   <name>CDM Remote</name>
-   <description>The EDIT CDM Remote package allows remote access to
+       <modelVersion>4.0.0</modelVersion>
+       <artifactId>cdmlib-remote</artifactId>
+       <properties>
+               <!-- custom property to hold the patch version number shouldn't this be
+                       set in the parent pom? -->
+               <project.patchversion>0</project.patchversion>
+       </properties>
+       <name>CDM Remote</name>
+       <description>The EDIT CDM Remote package allows remote access to
      the common data model via webservices in the wider sense</description>
-   <!-- Revert this back to "war" before committing  -->
-   <packaging>jar</packaging>
-   <scm>
-     <connection>
+       <!-- Revert this back to "war" before committing -->
+       <packaging>jar</packaging>
+       <scm>
+               <connection>
        scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
      </connection>
-     <developerConnection>
+               <developerConnection>
        scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
      </developerConnection>
-     <url>
+               <url>
        http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-remote/
      </url>
-   </scm>
+       </scm>
  
-   <dependencies>
-    <dependency>
-       <groupId>eu.etaxonomy</groupId>
-       <artifactId>cdmlib-io</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>javax.servlet</groupId>
-       <artifactId>servlet-api</artifactId>
-       <scope>provided</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.springframework</groupId>
-       <artifactId>org.springframework.web</artifactId>
-     </dependency>
-     <dependency>
-         <groupId>org.springframework</groupId>
-         <artifactId>spring-context-support</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.springframework</groupId>
-       <artifactId>org.springframework.web.servlet</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.springmodules</groupId>
-         <artifactId>spring-modules-cache</artifactId>
-         <version>0.7</version>
-         <exclusions>
-               <exclusion>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring</artifactId>
-             </exclusion>
-             <exclusion>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-mock</artifactId>
-             </exclusion>
-               </exclusions>
-       </dependency>
-       <dependency>
-             <groupId>org.unitils</groupId>
-             <artifactId>unitils-core</artifactId>
-             <scope>test</scope>
-           </dependency>
-           <dependency>
-             <groupId>org.unitils</groupId>
-             <artifactId>unitils-database</artifactId>
-             <scope>test</scope>
-           </dependency>
-           <dependency>
-             <groupId>org.unitils</groupId>
-             <artifactId>unitils-dbmaintainer</artifactId>
-             <scope>test</scope>
-           </dependency>
-           <dependency>
-             <groupId>org.unitils</groupId>
-             <artifactId>unitils-dbunit</artifactId>
-             <scope>test</scope>
-           </dependency>
-            <dependency>
-             <groupId>org.unitils</groupId>
-             <artifactId>unitils-easymock</artifactId>
-             <scope>test</scope>
-           </dependency>
-           <dependency>
-             <groupId>org.unitils</groupId>
-             <artifactId>unitils-mock</artifactId>
-             <scope>test</scope>
-           </dependency>
-           <dependency>
-             <groupId>org.unitils</groupId>
-             <artifactId>unitils-inject</artifactId>
-             <scope>test</scope>
-           </dependency>
-            <dependency>
-             <groupId>org.unitils</groupId>
-             <artifactId>unitils-orm</artifactId>
-             <scope>test</scope>
-           </dependency>
-            <dependency>
-             <groupId>org.unitils</groupId>
-             <artifactId>unitils-spring</artifactId>
-             <scope>test</scope>
-           </dependency>
-           <dependency>
-             <groupId>xmlunit</groupId>
-             <artifactId>xmlunit</artifactId>
-           </dependency>
-           <dependency>
-             <groupId>org.easymock</groupId>
-             <artifactId>easymock</artifactId>
-           </dependency>           
-           
-           <dependency>
-             <groupId>com.ibm.lsid</groupId>
-             <artifactId>lsid-server</artifactId>
-           </dependency>
-           <dependency>
-             <groupId>com.ibm.lsid</groupId>
-             <artifactId>lsid-client</artifactId>
-           </dependency>
+       <dependencies>
+               <dependency>
+                       <groupId>eu.etaxonomy</groupId>
+                       <artifactId>cdmlib-io</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.servlet</groupId>
+                       <artifactId>servlet-api</artifactId>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>org.springframework.web</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context-support</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>org.springframework.web.servlet</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springmodules</groupId>
+                       <artifactId>spring-modules-cache</artifactId>
+                       <version>0.7</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.springframework</groupId>
+                                       <artifactId>spring</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.springframework</groupId>
+                                       <artifactId>spring-mock</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.unitils</groupId>
+                       <artifactId>unitils-core</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.unitils</groupId>
+                       <artifactId>unitils-database</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.unitils</groupId>
+                       <artifactId>unitils-dbmaintainer</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.unitils</groupId>
+                       <artifactId>unitils-dbunit</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.unitils</groupId>
+                       <artifactId>unitils-easymock</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.unitils</groupId>
+                       <artifactId>unitils-mock</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.unitils</groupId>
+                       <artifactId>unitils-inject</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.unitils</groupId>
+                       <artifactId>unitils-orm</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.unitils</groupId>
+                       <artifactId>unitils-spring</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>xmlunit</groupId>
+                       <artifactId>xmlunit</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.easymock</groupId>
+                       <artifactId>easymock</artifactId>
+               </dependency>
  
+               <dependency>
+                       <groupId>com.ibm.lsid</groupId>
+                       <artifactId>lsid-server</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>com.ibm.lsid</groupId>
+                       <artifactId>lsid-client</artifactId>
+               </dependency>
  
-     <dependency>
-       <groupId>org.springframework</groupId>
-       <artifactId>org.springframework.test</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>net.sf.dozer</groupId>
-       <artifactId>dozer</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.hibernate</groupId>
-       <artifactId>hibernate-cglib-repack</artifactId>
-     </dependency>
-       <dependency>
-       <groupId>org.hibernate</groupId>
-       <artifactId>hibernate-ehcache</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>commons-io</groupId>
-       <artifactId>commons-io</artifactId>
-     </dependency>
-     <dependency>
-         <groupId>net.sf.json-lib</groupId>
-         <artifactId>json-lib</artifactId>
-         <classifier>jdk15</classifier>
-     </dependency>
-   <dependency>
-     <groupId>org.springframework</groupId>
-     <artifactId>org.springframework.oxm</artifactId>
-   </dependency>
  
-     <!-- XmlView -->
-     <dependency>
-       <groupId>com.thoughtworks.xstream</groupId>
-       <artifactId>xstream</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>xpp3</groupId>
-       <artifactId>xpp3</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>stax</groupId>
-       <artifactId>stax</artifactId>
-     </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>org.springframework.test</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>net.sf.dozer</groupId>
+                       <artifactId>dozer</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.hibernate</groupId>
+                       <artifactId>hibernate-cglib-repack</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.hibernate</groupId>
+                       <artifactId>hibernate-ehcache</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>commons-io</groupId>
+                       <artifactId>commons-io</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>net.sf.json-lib</groupId>
+                       <artifactId>json-lib</artifactId>
+                       <classifier>jdk15</classifier>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>org.springframework.oxm</artifactId>
+               </dependency>
  
+               <!-- XmlView -->
+               <dependency>
+                       <groupId>com.thoughtworks.xstream</groupId>
+                       <artifactId>xstream</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>xpp3</groupId>
+                       <artifactId>xpp3</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>stax</groupId>
+                       <artifactId>stax</artifactId>
+               </dependency>
  
-     <!--  Connection Pooling  -->
-         <dependency>
-             <groupId>org.hibernate</groupId>
-             <artifactId>hibernate-c3p0</artifactId>
-      </dependency>
+               <!-- JsonView -->
+               <dependency>
+                       <!-- for xml serialization (net.sf.json.xml.XMLSerializer) -->
+                       <groupId>xom</groupId>
+                       <artifactId>xom</artifactId>
+               </dependency>
  
-     <!--  SQL Debugging  -->
-     <dependency>
-         <groupId>p6spy</groupId>
-         <artifactId>p6spy</artifactId>
-     </dependency>
-   </dependencies>
  
-     <build>
-      <plugins>
-       <plugin>
-         <artifactId>maven-resources-plugin</artifactId>
-         <version>2.5</version>
-         <executions>
-           <execution>
-             <id>copy-resources</id>
-             <phase>validate</phase>
-             <goals>
-               <goal>copy-resources</goal>
-             </goals>
-             <configuration>
-               <outputDirectory>${project.build.outputDirectory}/eu/etaxonomy/cdm/doc/remote/apt</outputDirectory>
-               <resources>
-                 <resource>
-                   <directory>../src/site/apt/remote</directory>
-                   <filtering>true</filtering>
-                 </resource>
-               </resources>
-             </configuration>
-           </execution>
-         </executions>
-       </plugin>
-     </plugins>
-    </build>
+ 
+               <!-- Connection Pooling -->
+               <dependency>
+                       <groupId>org.hibernate</groupId>
+                       <artifactId>hibernate-c3p0</artifactId>
+               </dependency>
+ 
+               <!-- SQL Debugging -->
+               <dependency>
+                       <groupId>p6spy</groupId>
+                       <artifactId>p6spy</artifactId>
+               </dependency>
+       </dependencies>
+ 
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <version>2.5</version>
+                               <executions>
+                                       <execution>
+                                               <id>copy-resources</id>
+                                               <phase>validate</phase>
+                                               <goals>
+                                                       <goal>copy-resources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <outputDirectory>${project.build.outputDirectory}/eu/etaxonomy/cdm/doc/remote/apt</outputDirectory>
+                                                       <resources>
+                                                               <resource>
+                                                                       <directory>../src/site/apt/remote</directory>
+                                                                       <filtering>true</filtering>
+                                                               </resource>
+                                                       </resources>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
  </project>