merge trunk into hibernate4

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index d0e11b9a7cfb4289979b48e409fd46e074cebda9..001c89542fda29cfd125f93f166c6ef7ef930d57 100644 (file)
--- a/cdmlib-commons/pom.xml
+++ b/cdmlib-commons/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.1.4-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   
@@ -66,13 +66,10 @@
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-module-apt</artifactId>
-      <version>1.2</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-module-xhtml</artifactId>
-      <version>1.2</version>
     </dependency>
 
   </dependencies>

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 2c820e32753c72b2c2bf695e87ef19f5d84d3f21..08384dec85417a667633c5c2474209c26b1566de 100644 (file)
--- a/cdmlib-ext/pom.xml
+++ b/cdmlib-ext/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>cdmlib-parent</artifactId>
-           <version>3.2.0-SNAPSHOT</version>
+           <version>3.1.4-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index 4821133d081fb2747c01ea77f7df3d23056b09c8..74e1829bdffd9c4d321fa6f9befea1659f721cb2 100644 (file)
--- a/cdmlib-io/pom.xml
+++ b/cdmlib-io/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.1.4-SNAPSHOT</version>
   <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -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 --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
index 8eb4494a8ab0261cc046d8c590217504c226a95f..df7ad89bf218951026d489cfcf6436afe6b7a32c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
@@ -283,7 +283,7 @@ public class SDDDocumentBuilder {
                Iterator<Reference> iterator = references.iterator();\r
                IDatabase d = ReferenceFactory.newDatabase();\r
                while (iterator.hasNext()) {\r
-                       Reference reference = iterator.next();\r
+                       Reference<?> reference = iterator.next();\r
                        if (reference.getType().equals(ReferenceType.Database)) {\r
                                buildDataset(baselement, reference);\r
                        }\r

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index 6efcb314884100bfed980dcd06d911877f420862..98efe8eac7a2fd5bc1eff10a117b7fd26c6c9dc0 100644 (file)
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.1.4-SNAPSHOT</version>
   <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -214,31 +214,7 @@
     <dependency>
                <groupId>org.jadira.usertype</groupId>
                <artifactId>usertype.jodatime</artifactId>
-               <version>2.0.1</version>
        </dependency>
-    
-<!--     <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time-hibernate</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>ehcache</artifactId>
-          <groupId>ehcache</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>cglib-full</artifactId>
-          <groupId>cglib</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>hibernate</artifactId>
-          <groupId>org.hibernate</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>hibernate</artifactId>
-          <groupId>hibernate</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency> -->
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index ff4ea881f69de482a6a0f3801f5acd8ef538beab..040cd93e44530cefa68401df1ff2180888d4cf3b 100644 (file)
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-               <version>3.2.0-SNAPSHOT</version>
+               <version>3.1.4-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -169,12 +169,12 @@
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-c3p0</artifactId>
     </dependency>
-        <!-- only needed as long as hibernate-c3p0 is still dependend on c3p0/c3p0/0.9.1 -->
-        <dependency>
-                               <groupId>com.mchange</groupId>
-                               <artifactId>c3p0</artifactId>
-                               <version>0.9.2</version>
-                       </dependency>
+       <!-- only needed as long as hibernate-c3p0 is still dependend on c3p0/c3p0/0.9.1 -->
+       <dependency>
+               <groupId>com.mchange</groupId>
+               <artifactId>c3p0</artifactId>
+               <version>0.9.2</version>
+       </dependency>
     
     <dependency>
       <groupId>org.apache.lucene</groupId>
@@ -187,7 +187,6 @@
     <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>1.8.2</version>
      </dependency>
      <dependency>
           <groupId>commons-lang</groupId>
@@ -291,10 +290,12 @@
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
     </dependency>
-<!--     <dependency>
-     <groupId>org.springmodules</groupId>
-     <artifactId>spring-modules-lucene</artifactId>
-    </dependency> -->
+         <!-- required by Xerces 2.11.0 -->
+         <dependency>
+               <groupId>org.apache.xmlgraphics</groupId>
+               <artifactId>batik-ext</artifactId>
+         </dependency>
+
     <!-- ******* DATABASES DRIVER ******* -->
     <dependency>
       <groupId>mysql</groupId>
@@ -313,28 +314,11 @@
       <groupId>net.sourceforge.jtds</groupId>
       <artifactId>jtds</artifactId>
     </dependency>
-    <!--<dependency>
-      <groupId>com.microsoft.sqlserver</groupId>
-      <artifactId>jdbc4</artifactId>
-    </dependency>-->
-  <dependency>
+    <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>jdbc4</artifactId>
     </dependency>
-<!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)
-    <dependency>
-      <groupId>com.microsoft.jdbcdriver</groupId>
-      <artifactId>mssqlserver</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.jdbcdriver</groupId>
-      <artifactId>msutil</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.jdbcdriver</groupId>
-      <artifactId>msbase</artifactId>
-    </dependency>
--->
+
     <dependency>
     <groupId>com.h2database</groupId>
     <artifactId>h2</artifactId>

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
index 3f832380f91169541a02ee523900037455ed9713..04f652087de94cb9f3ff18e87e20c63b45995d4c 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
@@ -697,7 +697,7 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
                        if (xmlBean == null){\r
                                //TODO warn or info\r
                                logger.debug("Unknown Element 'bean id=" +strDataSourceName + "' ");\r
-                       };\r
+                       }\r
                        return xmlBean;\r
                }\r
        }\r

diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index 2c7e3194ed1f1ab88e6ed657f4e5f97feb51635f..996b3feda6a89db522e5738aa51ba825559c43a3 100644 (file)
--- a/cdmlib-print/pom.xml
+++ b/cdmlib-print/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>cdmlib-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.2.0-SNAPSHOT</version>
+               <version>3.1.4-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
        <modelVersion>4.0.0</modelVersion>
@@ -44,33 +44,22 @@
                <dependency>
                        <groupId>xerces</groupId>
                        <artifactId>xercesImpl</artifactId>
-                       <version>2.9.1</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.xmlgraphics</groupId>
                        <artifactId>fop</artifactId>
-                       <version>1.0</version>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>servlet-api</artifactId>
-                       <version>2.5</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.odftoolkit</groupId>
-                       <artifactId>odfdom</artifactId> <!-- isn't this odfdom-java ?? -->
-                       <version>0.8.6</version>
+                       <artifactId>odfdom-java</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.jdom</groupId>
                        <artifactId>jdom</artifactId>
-                       <version>1.1.3</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/out/odf/DocumentCreator.java b/cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/out/odf/DocumentCreator.java
index 92b659b4c509b975a60d9e06c38c408977160f0b..507d0f5e6d0e4b77190fd3857b88efb533a8faf6 100644 (file)
--- a/cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/out/odf/DocumentCreator.java
+++ b/cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/out/odf/DocumentCreator.java
@@ -4,10 +4,10 @@ import org.apache.log4j.Logger;
 import org.jdom.Document;
 import org.jdom.JDOMException;
 import org.jdom.output.DOMOutputter;
-import org.odftoolkit.odfdom.OdfFileDom;
+import org.odftoolkit.odfdom.pkg.OdfFileDom;
 import org.odftoolkit.odfdom.doc.OdfTextDocument;
-import org.odftoolkit.odfdom.doc.office.OdfOfficeAutomaticStyles;
-import org.odftoolkit.odfdom.doc.office.OdfOfficeText;
+import org.odftoolkit.odfdom.dom.element.office.OfficeTextElement;
+import org.odftoolkit.odfdom.incubator.doc.office.OdfOfficeAutomaticStyles;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -33,7 +33,7 @@ public class DocumentCreator {
        private StylesFactory stylesFactory;
 
        // the office:text element in the content.xml file
-       private OdfOfficeText officeText;
+       private OfficeTextElement officeText;
 
        public OdfTextDocument create(Document document) throws JDOMException {
                if (setupOutputDocument()) {

diff --git a/cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/out/odf/StylesFactory.java b/cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/out/odf/StylesFactory.java
index 024ed59978cc296f3f78054d98503c5dcc98cc4e..540ff08ead5ed68b8594020f720e46215703f30b 100644 (file)
--- a/cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/out/odf/StylesFactory.java
+++ b/cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/out/odf/StylesFactory.java
@@ -12,15 +12,16 @@ package eu.etaxonomy.cdm.print.out.odf;
 
 import org.apache.log4j.Logger;
 import org.odftoolkit.odfdom.doc.OdfTextDocument;
-import org.odftoolkit.odfdom.doc.office.OdfOfficeStyles;
-import org.odftoolkit.odfdom.doc.style.OdfDefaultStyle;
-import org.odftoolkit.odfdom.doc.style.OdfStyle;
-import org.odftoolkit.odfdom.doc.style.OdfStyleParagraphProperties;
-import org.odftoolkit.odfdom.doc.style.OdfStyleTabStop;
-import org.odftoolkit.odfdom.doc.style.OdfStyleTabStops;
-import org.odftoolkit.odfdom.doc.style.OdfStyleTextProperties;
 import org.odftoolkit.odfdom.dom.element.OdfStyleBase;
+import org.odftoolkit.odfdom.dom.element.style.StyleParagraphPropertiesElement;
+import org.odftoolkit.odfdom.dom.element.style.StyleTabStopElement;
+import org.odftoolkit.odfdom.dom.element.style.StyleTabStopsElement;
+import org.odftoolkit.odfdom.dom.element.style.StyleTextPropertiesElement;
 import org.odftoolkit.odfdom.dom.style.OdfStyleFamily;
+import org.odftoolkit.odfdom.dom.style.props.OdfStyleProperty;
+import org.odftoolkit.odfdom.incubator.doc.office.OdfOfficeStyles;
+import org.odftoolkit.odfdom.incubator.doc.style.OdfDefaultStyle;
+import org.odftoolkit.odfdom.incubator.doc.style.OdfStyle;
 
 /**
  * @author n.hoffmann
@@ -28,14 +29,15 @@ import org.odftoolkit.odfdom.dom.style.OdfStyleFamily;
  * @version 1.0
  */
 public class StylesFactory implements IStyleNames{
+       @SuppressWarnings("unused")
        private static final Logger logger = Logger.getLogger(StylesFactory.class);
        
        OdfOfficeStyles officeStyles;
        OdfDefaultStyle defaultStyle;
-       OdfStyleParagraphProperties paragraphProperties;
+       StyleParagraphPropertiesElement paragraphProperties;
 
-       OdfStyleTabStops tabStops;
-       OdfStyleTabStop tabStop;
+       StyleTabStopsElement tabStops;
+       StyleTabStopElement tabStop;
 
 
        public StylesFactory(OdfTextDocument outputDocument) {
@@ -63,16 +65,16 @@ public class StylesFactory implements IStyleNames{
                style = officeStyles.newStyle(HEADING_ACCEPTED_TAXON,
                                OdfStyleFamily.Paragraph);
                style.setStyleDisplayNameAttribute("Accepted Taxon Heading");
-               style.setProperty(OdfStyleParagraphProperties.MarginTop, "0.25cm");
-               style.setProperty(OdfStyleParagraphProperties.MarginBottom, "0.25cm");
+               style.setProperty(StyleParagraphPropertiesElement.MarginTop, "0.25cm");
+               style.setProperty(StyleParagraphPropertiesElement.MarginBottom, "0.25cm");
                setFontWeight(style, "bold");
                setFontSize(style, "20pt");
                
                style = officeStyles.newStyle(HEADING_FEATURE,
                                OdfStyleFamily.Paragraph);
                style.setStyleDisplayNameAttribute("Feature Heading");
-               style.setProperty(OdfStyleParagraphProperties.MarginTop, "0.25cm");
-               style.setProperty(OdfStyleParagraphProperties.MarginBottom, "0.25cm");
+               style.setProperty(StyleParagraphPropertiesElement.MarginTop, "0.25cm");
+               style.setProperty(StyleParagraphPropertiesElement.MarginBottom, "0.25cm");
                setFontWeight(style, "bold");
                setFontSize(style, "14pt");
        }
@@ -153,20 +155,20 @@ public class StylesFactory implements IStyleNames{
        
 
        private void setFontWeight(OdfStyleBase style, String value) {
-               style.setProperty(OdfStyleTextProperties.FontWeight, value);
-               style.setProperty(OdfStyleTextProperties.FontWeightAsian, value);
-               style.setProperty(OdfStyleTextProperties.FontWeightComplex, value);
+               style.setProperty(StyleTextPropertiesElement.FontWeight, value);
+               style.setProperty(StyleTextPropertiesElement.FontWeightAsian, value);
+               style.setProperty(StyleTextPropertiesElement.FontWeightComplex, value);
        }
 
        private void setFontStyle(OdfStyleBase style, String value) {
-               style.setProperty(OdfStyleTextProperties.FontStyle, value);
-               style.setProperty(OdfStyleTextProperties.FontStyleAsian, value);
-               style.setProperty(OdfStyleTextProperties.FontStyleComplex, value);
+               style.setProperty(StyleTextPropertiesElement.FontStyle, value);
+               style.setProperty(StyleTextPropertiesElement.FontStyleAsian, value);
+               style.setProperty(StyleTextPropertiesElement.FontStyleComplex, value);
        }
 
        private void setFontSize(OdfStyleBase style, String value) {
-               style.setProperty(OdfStyleTextProperties.FontSize, value);
-               style.setProperty(OdfStyleTextProperties.FontSizeAsian, value);
-               style.setProperty(OdfStyleTextProperties.FontSizeComplex, value);
+               style.setProperty(StyleTextPropertiesElement.FontSize, value);
+               style.setProperty(StyleTextPropertiesElement.FontSizeAsian, value);
+               style.setProperty(StyleTextPropertiesElement.FontSizeComplex, value);
        }
 }

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index 7c77b378b1ddb248b2147ccd1948b5a32ee752cf..19cf1a9a36243f5be2df803e0f0bc5c80a51818d 100644 (file)
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.1.4-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   
@@ -67,21 +67,6 @@
         <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>com.ibm.lsid</groupId>
         <artifactId>lsid-server</artifactId>

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index b08a0cfd5cd586c5e414178aeef253817484b689..0078c48b9150ce00fc6d7452fb4205422c32a48b 100644 (file)
--- a/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.1.4-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -60,11 +60,11 @@
       <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.springmodules</groupId>
+        <artifactId>spring-modules-cache</artifactId>
+        <version>0.7</version>
+        <exclusions>
+               <exclusion>
               <groupId>org.springframework</groupId>
               <artifactId>spring</artifactId>
             </exclusion>
@@ -72,7 +72,7 @@
               <groupId>org.springframework</groupId>
               <artifactId>spring-mock</artifactId>
             </exclusion>
-          </exclusions>
+       </exclusions>
       </dependency>
       <dependency>
       <groupId>org.unitils</groupId>
@@ -171,7 +171,6 @@
   <dependency>
     <groupId>org.springframework</groupId>
     <artifactId>org.springframework.oxm</artifactId>
-    <version>${spring.version}</version>
   </dependency>
 
     <!-- XmlView -->

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index 7b6db3c1f42e4d14341cfc7d5c137adda34d975d..8e6fe3d8c6f5f09bb2694f158acc9d8c5de6732f 100644 (file)
--- a/cdmlib-services/pom.xml
+++ b/cdmlib-services/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.1.4-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -89,33 +89,7 @@
       <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> -->
-<!--       <exclusions> -->
-<!--           <exclusion> -->
-<!--                   <groupId>javax.persistence</groupId> -->
-<!--           <artifactId>persistence-api</artifactId> -->
-<!--           </exclusion> -->
-<!--       </exclusions> -->
-<!--       <scope>test</scope> -->
-<!--     </dependency> -->
-     <dependency>
+    <dependency>
       <groupId>org.unitils</groupId>
       <artifactId>unitils-spring</artifactId>
       <scope>test</scope>
@@ -158,7 +132,6 @@
     <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-config</artifactId>
-    <version>3.0.5.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.lsid</groupId>

diff --git a/pom.xml b/pom.xml
index cfbf14586b3656a478db47bd1c2674d2402d9222..95f140e8a671fd865424bfd2cf8f038fbfbb6a15 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-       <version>3.2.0-SNAPSHOT</version>
+       <version>3.1.4-SNAPSHOT</version>
     <name>CDM Library</name>
     <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
     <url>http://wp5.e-taxonomy.eu/cdmlib/</url>
@@ -30,6 +30,7 @@
         <lucene.version>3.6.2</lucene.version>
         <hsqldb.version>1.8.0.10</hsqldb.version><!-- 1.8.0.10, 1.9.0-rc6 (manualy build only for debugging) -->
                <httpcomponents.version>4.2.3</httpcomponents.version>
+               <doxia.version>1.3</doxia.version>
     </properties>
     <scm>
         <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</connection>
@@ -879,11 +880,6 @@
                 <artifactId>commons-beanutils</artifactId>
                 <version>1.8.3</version>
             </dependency>
-<!--                   <dependency> -->
-<!--                           <groupId>net.sf.sojo</groupId> -->
-<!--                           <artifactId>sojo</artifactId> -->
-<!--                           <version>1.0.5</version> -->
-<!--                   </dependency> -->
             <dependency>
                 <groupId>net.sf.json-lib</groupId>
                 <artifactId>json-lib</artifactId>
@@ -917,31 +913,6 @@
                                <version>2.0.1</version>
                        </dependency>
             
-            <!-- <dependency>
-                <groupId>joda-time</groupId>
-                <artifactId>joda-time-hibernate</artifactId>
-                <version>1.0</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>ehcache</artifactId>
-                        <groupId>ehcache</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>cglib</groupId>
-                        <artifactId>cglib-full</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.hibernate</groupId>
-                        <artifactId>hibernate</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>hibernate</groupId>
-                        <artifactId>hibernate</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency> -->
-            
-            
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-core</artifactId>
@@ -992,8 +963,46 @@
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xercesImpl</artifactId>
-                <version>2.7.1</version>
-            </dependency>
+                <version>2.11.0</version>
+            </dependency>
+              <!-- >batik-ext required by Xerces 2.11.0 for class ElementTraversal, as this is not included anymore in xml-apis 2.x-->
+                         <dependency>
+                               <groupId>org.apache.xmlgraphics</groupId>
+                               <artifactId>batik-ext</artifactId>
+                               <version>1.7</version>
+                         </dependency>
+               <dependency> <!-- required by cdmlib-print -->
+                               <groupId>org.apache.xmlgraphics</groupId>
+                               <artifactId>fop</artifactId>
+                               <!-- version 1.1 does NOT work, because it depends on avalon-framework-api 4.2.0 which is not available in central maven repository under the given groupID  -->
+                               <version>1.1</version>
+                               <exclusions>
+                                       <!-- 1.1 depends on an old version of avalon-framework which does not exist in mvn repository under this groupId (has old groupId) -->
+                                       <exclusion>
+                                               <groupId>org.apache.avalon.framework</groupId>
+                                               <artifactId>avalon-framework-api</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>org.apache.avalon.framework</groupId>
+                                               <artifactId>avalon-framework-impl</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+            <!-- not directly required, but fix mentioned to force 
+              correct version number 4.3.1. Required by org.apache.xmlgraphics/fop 1.1 
+              Remove when dependency in fop in corrected.
+              --> 
+            <dependency>
+                               <groupId>org.apache.avalon.framework</groupId>
+                               <artifactId>avalon-framework-api</artifactId>
+                               <version>4.3.1</version>
+                       </dependency>
+                       <dependency>
+                       <groupId>org.odftoolkit</groupId>
+                               <artifactId>odfdom-java</artifactId>
+                               <version>0.8.7</version>
+                       </dependency>
+            
             <dependency>
                 <groupId>jaxen</groupId>
                 <artifactId>jaxen</artifactId>
@@ -1236,57 +1245,11 @@
                 <artifactId>spring-security-context</artifactId>  <!-- could not find this on http://mvnrepository.com/ -->
                 <version>${spring-security.version}</version>
             </dependency>
-            <dependency>  <!-- needed for the FSDirectoryFactoryBean -->
-                <groupId>org.springmodules</groupId>
-                <artifactId>spring-modules-lucene</artifactId>
-                <version>0.8</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.lucene</groupId>
-                        <artifactId>lucene-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache</groupId>
-                        <artifactId>poi</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache</groupId>
-                        <artifactId>poi-scratchpad</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-dao</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-jca</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-support</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-beans</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-aop</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-jdbc</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
+                   <dependency>
+                       <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-config</artifactId>
+                       <version>${spring-security.version}</version>
+            </dependency>            
             
             <!-- ******* SERVLET/JSP/JSF ******* -->
             <dependency>
@@ -1323,38 +1286,12 @@
                 <artifactId>jdbc4</artifactId>
                 <version>2.0</version>
             </dependency>
-            <!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)
-        <dependency>
-            <groupId>com.microsoft.jdbcdriver</groupId>
-            <artifactId>mssqlserver</artifactId>
-            <version>2000.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.jdbcdriver</groupId>
-            <artifactId>msutil</artifactId>
-            <version>2000.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.jdbcdriver</groupId>
-            <artifactId>msbase</artifactId>
-            <version>2000.3</version>
-        </dependency>
--->
+
             <dependency>
                 <groupId>oracle</groupId>
                 <artifactId>ojdbc14</artifactId>
                 <version>10.2.0.4.0</version>
             </dependency>
-            <!--dependency>
-                <groupId>oracle</groupId>
-                <artifactId>ojdbc14</artifactId>
-                <version>9i</version>
-            </dependency>
-            <dependency>
-                <groupId>oracle</groupId>
-                <artifactId>ojdbc14</artifactId>
-                <version>9.2.0.5</version>
-            </dependency-->
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
@@ -1395,6 +1332,17 @@
             <version>5.4.0</version>
             <scope>compile</scope>
           </dependency>
+              <!-- AptView -->
+                   <dependency>
+                       <groupId>org.apache.maven.doxia</groupId>
+                       <artifactId>doxia-module-apt</artifactId>
+                       <version>${doxia.version}</version>
+                   </dependency>
+                   <dependency>
+                       <groupId>org.apache.maven.doxia</groupId>
+                       <artifactId>doxia-module-xhtml</artifactId>
+                       <version>${doxia.version}</version>
+                   </dependency>
         </dependencies>
     </dependencyManagement>
 </project>