BGBM BDI Projects / cdmlib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
additional DAO methods for new REST service & bug fixes e.g. in AbstractBeanInitializer
[cdmlib.git] / cdmlib-persistence / pom.xml
diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index bbf2cb812a1071b20dcd2d4ef4f5eef3c21fcafd..80d796453ae3d7a3d15b79301c381b914218d9f1 100644 (file)
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -1,88 +1,122 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<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"
+<project xmlns="http://maven.apache.org/POM/4.0.0" \r
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+  <!-- \r
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"\r
    -->\r
-  <parent>\r
-    <artifactId>cdmParent</artifactId>\r
-    <groupId>eu.etaxonomy</groupId>\r
-    <version>0.4</version>\r
-    <relativePath>../cdmParent/pom.xml</relativePath>\r
-  </parent>\r
+       <parent>\r
+               <groupId>eu.etaxonomy</groupId>\r
+               <artifactId>cdmlib-parent</artifactId>\r
+               <version>2.1</version>\r
+       </parent>\r
+       \r
   <modelVersion>4.0.0</modelVersion>\r
-  <artifactId>cdmLibrary</artifactId>\r
-  <name>EDIT Common Data Model Library</name>\r
-  <version>0.4.5</version>\r
-  <description>EDIT CDM library</description>\r
+  <artifactId>cdmlib-persistence</artifactId>\r
+  <name>CDM Persistence</name>\r
+  <description>EDIT CDM library persistence layer. Mainly DAOs</description>\r
   <scm>\r
-    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlibrary/</connection>\r
-    <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlibrary/</developerConnection>\r
-    <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlibrary/</url>\r
+    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-persistence/</connection>\r
+    <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-persistence/</developerConnection>\r
+    <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-persistence/</url>\r
   </scm>\r
   <build>\r
-    <plugins>
-<!--           <plugin>
-               <groupId>org.codehaus.mojo</groupId>
-               <artifactId>hibernate3-maven-plugin</artifactId>
-               <version>2.0-alpha-2</version>
-               <configuration>
-                       <components>
-                               <component>
-                                       <name>hbm2cfgxml</name>
-                                       <outputDirectory>src/main/resources</outputDirectory>
-                               </component>
-                       </components>
-                       <componentProperties>
-                               <drop>true</drop>
-                               <configurationfile>/src/main/resources/hibernate.cfg.xml</configurationfile>
-                       </componentProperties>
-               </configuration>
-       </plugin>-->
-       <plugin>\r
-        <artifactId>maven-compiler-plugin</artifactId>\r
+    <plugins>\r
+      <plugin>\r
+        <groupId>org.codehaus.mojo</groupId>\r
+        <artifactId>hibernate3-maven-plugin</artifactId>\r
+        <version>2.1</version>\r
         <configuration>\r
-          <source>1.5</source>\r
-          <target>1.5</target>\r
+          <components>\r
+            <component>\r
+              <name>hbm2ddl</name>\r
+              <implementation>annotationconfiguration</implementation>\r
+            </component>\r
+          </components>\r
+          <componentProperties>\r
+            <namingstrategy>org.hibernate.cfg.DefaultComponentSafeNamingStrategy</namingstrategy>\r
+            <propertyfile>/src/test/resources/dbscripts/hibernate.properties</propertyfile>\r
+            <outputfilename>001_cdm.ddl</outputfilename>\r
+            <configurationfile>/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml</configurationfile>\r
+          </componentProperties>\r
         </configuration>\r
+        <dependencies>\r
+          <dependency>\r
+            <groupId>hsqldb</groupId>\r
+            <artifactId>hsqldb</artifactId>\r
+            <version>1.8.0.4</version> \r
+          </dependency>\r
+          <dependency>\r
+            <groupId>org.hibernate</groupId>\r
+            <artifactId>hibernate-annotations</artifactId>\r
+            <version>3.4.0-SNAPSHOT</version>\r
+          </dependency>\r
+        </dependencies>\r
       </plugin>\r
       <plugin>\r
-        <artifactId>maven-surefire-plugin</artifactId>\r
+        <artifactId>maven-antrun-plugin</artifactId>\r
         <configuration>\r
-          <includes>\r
-            <include>**/*Test.java</include>\r
-          </includes>\r
-               <systemProperties>
-                       <property>
-                               <name>hibernate.connection.driver_class</name>
-                               <value>${hibernate.connection.driver_class}</value>
-                       </property>
-                       <property>
-                               <name>hibernate.connection.url</name>
-                               <value>${hibernate.connection.url}</value>
-                       </property>
-                       <property>
-                               <name>hibernate.connection.username</name>
-                               <value>${hibernate.connection.username}</value>
-                       </property>
-                       <property>
-                               <name>hibernate.connection.password</name>
-                               <value>${hibernate.connection.password}</value>
-                       </property>
-               </systemProperties>
+          <tasks>\r
+            <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.EnversHibernateToolTask">\r
+              <classpath refid="maven.plugin.classpath"/>\r
+            </taskdef>\r
+            <mkdir dir="target/generated-sources/hibernate3"/>\r
+            <hibernatetool destdir=".">  \r
+              <classpath>\r
+                <path refid="maven.plugin.classpath"/>\r
+                <path refid="maven.compile.classpath"/>\r
+                <path refid="maven.test.classpath"/>\r
+              </classpath>\r
+              <jpaconfiguration persistenceunit="cdm"/> \r
+              <hbm2ddl drop="false" \r
+                       create="true"  \r
+                       export="false"  \r
+                       outputfilename="target/generated-sources/hibernate3/001_cdm.ddl"  \r
+                       delimiter=";"  \r
+                       format="true"/>  \r
+              </hibernatetool>\r
+          </tasks>\r
         </configuration>\r
+        <dependencies>\r
+          <dependency>\r
+            <groupId>hsqldb</groupId>\r
+            <artifactId>hsqldb</artifactId>\r
+            <version>1.8.0.4</version>\r
+          </dependency>\r
+          <dependency>\r
+            <groupId>org.hibernate</groupId>\r
+            <artifactId>hibernate-envers</artifactId>\r
+            <version>3.4.0-SNAPSHOT</version>\r
+          </dependency>\r
+          <dependency>\r
+            <groupId>org.hibernate</groupId>\r
+            <artifactId>hibernate-entitymanager</artifactId>\r
+            <version>3.4.0-SNAPSHOT</version>\r
+          </dependency>\r
+          <dependency>\r
+            <groupId>org.hibernate</groupId>\r
+            <artifactId>hibernate-tools</artifactId>\r
+            <version>3.2.3.GA</version>\r
+          </dependency>\r
+          <dependency>\r
+            <groupId>org.slf4j</groupId>\r
+            <artifactId>slf4j-log4j12</artifactId>\r
+            <version>1.5.2</version>\r
+          </dependency>\r
+          <dependency>\r
+            <groupId>commons-logging</groupId>\r
+            <artifactId>commons-logging</artifactId>\r
+              <version>1.1.1</version>\r
+          </dependency>\r
+        </dependencies>\r
       </plugin>\r
       <plugin>\r
-        <artifactId>maven-antrun-plugin</artifactId>\r
+        <groupId>org.apache.maven.plugins</groupId>\r
+        <artifactId>maven-jar-plugin</artifactId>\r
         <executions>\r
           <execution>\r
-            <phase>generate-resources</phase>\r
             <goals>\r
-              <goal>run</goal>\r
+              <goal>test-jar</goal>\r
             </goals>\r
-            <configuration>\r
-              <tasks />\r
-            </configuration>\r
           </execution>\r
         </executions>\r
       </plugin>\r
@@ -92,149 +126,151 @@
         <dependency>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>cdmlib-model</artifactId>\r
-               <version>0.4.5</version>\r
        </dependency>\r
        <dependency>\r
-               <groupId>com.sun.xml.rpc</groupId>\r
-               <artifactId>jaxrpc-impl</artifactId>\r
-               <version>1.1.3_01</version>\r
-       </dependency>\r
+           <groupId>org.slf4j</groupId>\r
+        <artifactId>slf4j-log4j12</artifactId>\r
+    </dependency>\r
        <dependency>\r
                <groupId>javax.persistence</groupId>\r
-               <artifactId>ejb</artifactId>\r
-               <version>3</version>\r
+               <artifactId>persistence-api</artifactId>\r
        </dependency>\r
        <dependency>\r
-               <groupId>javax.xml</groupId>\r
-               <artifactId>jaxrpc-api</artifactId>\r
-               <version>1.1</version>\r
+        <groupId>javassist</groupId>\r
+        <artifactId>javassist</artifactId>\r
        </dependency>\r
        <dependency>\r
-               <groupId>javax.xml.bind</groupId>\r
-               <artifactId>jaxb-api</artifactId>\r
-               <version>2.0</version>\r
+               <groupId>javax.annotation</groupId>\r
+               <artifactId>jsr250-api</artifactId>\r
        </dependency>\r
+    <dependency>\r
+      <groupId>org.aspectj</groupId>\r
+      <artifactId>aspectjweaver</artifactId>\r
+    </dependency>\r
        <dependency>\r
                <groupId>org.hibernate</groupId>\r
                <artifactId>hibernate-commons-annotations</artifactId>\r
-               <version>3.3.0.ga</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>org.hibernate</groupId>\r
                <artifactId>hibernate-annotations</artifactId>\r
-               <version>3.3.0.ga</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>org.hibernate</groupId>\r
-               <artifactId>hibernate</artifactId>\r
-               <version>3.2.5.ga</version>\r
+               <artifactId>hibernate-core</artifactId>\r
+       </dependency>\r
+       <dependency>\r
+               <groupId>org.hibernate</groupId>\r
+               <artifactId>hibernate-envers</artifactId>\r
+       </dependency>\r
+       <dependency>\r
+               <groupId>org.hibernate</groupId>\r
+               <artifactId>hibernate-search</artifactId>\r
+       </dependency>\r
+       <dependency>\r
+               <groupId>org.apache.lucene</groupId>\r
+               <artifactId>lucene-core</artifactId>\r
+       </dependency>\r
+       <dependency>\r
+               <groupId>org.apache.lucene</groupId>\r
+               <artifactId>lucene-spellchecker</artifactId>\r
        </dependency>\r
+       <dependency>\r
+        <groupId>commons-beanutils</groupId>\r
+        <artifactId>commons-beanutils</artifactId>\r
+        <version>1.7.0</version>\r
+     </dependency> \r
+       <dependency>\r
+               <groupId>org.springmodules</groupId>\r
+               <artifactId>spring-modules-lucene</artifactId>\r
+       </dependency>\r
+    <dependency>\r
+        <groupId>org.unitils</groupId>\r
+        <artifactId>unitils</artifactId>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.dbunit</groupId>\r
+      <artifactId>dbunit</artifactId>\r
+    </dependency>\r
        <dependency>\r
                <groupId>org.springframework</groupId>\r
                <artifactId>spring</artifactId>\r
-               <version>2.5</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>org.springframework</groupId>\r
                <artifactId>spring-beans</artifactId>\r
-               <version>2.5</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>org.springframework</groupId>\r
                <artifactId>spring-orm</artifactId>\r
-               <version>2.5</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>org.springframework</groupId>\r
                <artifactId>spring-jdbc</artifactId>\r
-               <version>2.5</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>org.springframework</groupId>\r
                <artifactId>spring-test</artifactId>\r
-               <version>2.5</version>\r
-       </dependency>\r
-       <dependency>\r
-               <groupId>xerces</groupId>\r
-               <artifactId>xercesImpl</artifactId>\r
-               <version>2.7.1</version>\r
        </dependency>\r
-       <dependency>\r
-               <groupId>jdom</groupId>\r
-               <artifactId>jdom</artifactId>\r
-               <version>1.0</version>\r
-       </dependency>\r
-       <dependency>\r
-               <groupId>jaxen</groupId>\r
-               <artifactId>jaxen</artifactId>\r
-               <version>1.1</version>\r
-       </dependency>\r
-       <dependency>
-               <groupId>org.dbunit</groupId>
-               <artifactId>dbunit</artifactId>
-               <version>2.2</version>
-       </dependency>
-       <dependency>\r
-               <groupId>org.eclipse</groupId>\r
-               <artifactId>osgi</artifactId>\r
-               <version>3.2.1-R32x_v20060919</version>\r
+    <dependency>\r
+               <groupId>org.springframework</groupId>\r
+               <artifactId>spring-aop</artifactId>\r
+    </dependency>\r
+    <dependency>\r
+       <groupId>org.springframework.security</groupId>\r
+       <artifactId>spring-security-core</artifactId>\r
+    </dependency>\r
+    <dependency><!-- Required for TestingAuthenticationProvider etc until 2.5.0 [SEC-1010] -->\r
+               <groupId>org.springframework.security</groupId>\r
+       <artifactId>spring-security-core</artifactId>\r
+       <version>2.0.4</version>\r
+               <type>test-jar</type>\r
+               <scope>test</scope>\r
        </dependency>\r
        \r
        \r
        <!-- ******* DATABASES DRIVER ******* -->\r
-       <!-- SQL Server and Sybase -->\r
-       <dependency>\r
-       <groupId>net.sourceforge.jtds</groupId>\r
-       <artifactId>jtds</artifactId>\r
-       <version>1.2.2</version>\r
-       </dependency>\r
-       \r
        <dependency>\r
                <groupId>mysql</groupId>\r
                <artifactId>mysql-connector-java</artifactId>\r
-               <version>5.0.5</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>postgresql</groupId>\r
                <artifactId>postgresql</artifactId>\r
-               <version>8.2-504.jdbc4</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>hsqldb</groupId>\r
                <artifactId>hsqldb</artifactId>\r
-               <version>1.8.0.7</version>\r
        </dependency>\r
-       \r
-<!--   <dependency>-->\r
-<!--           <groupId>oracle</groupId>-->\r
-<!--           <artifactId>ojdbc14</artifactId>-->\r
-<!--           <version>10.2.0.2</version>-->\r
-<!--   </dependency>-->\r
-<!--   <dependency>-->\r
-<!--           <groupId>oracle</groupId>-->\r
-<!--           <artifactId>ojdbc14</artifactId>-->\r
-<!--           <version>9i</version>-->\r
-<!--   </dependency>-->\r
-<!--   <dependency>-->\r
-<!--           <groupId>oracle</groupId>-->\r
-<!--           <artifactId>ojdbc14</artifactId>-->\r
-<!--           <version>9.2.0.5</version>-->\r
-<!--   </dependency>-->\r
+       <!-- SQL Server and Sybase -->\r
+       <dependency>\r
+               <groupId>net.sourceforge.jtds</groupId>\r
+               <artifactId>jtds</artifactId>\r
+       </dependency>\r
+       <dependency>\r
+               <groupId>com.microsoft.sqlserver</groupId>\r
+               <artifactId>jdbc</artifactId>\r
+       </dependency>\r
+<!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)\r
        <dependency>\r
                <groupId>com.microsoft.jdbcdriver</groupId>\r
                <artifactId>mssqlserver</artifactId>\r
-               <version>2000.3</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>com.microsoft.jdbcdriver</groupId>\r
                <artifactId>msutil</artifactId>\r
-               <version>2000.3</version>\r
        </dependency>\r
        <dependency>\r
                <groupId>com.microsoft.jdbcdriver</groupId>\r
                <artifactId>msbase</artifactId>\r
-               <version>2000.3</version>\r
        </dependency>\r
+-->\r
+       <dependency>\r
+               <groupId>com.h2database</groupId>\r
+               <artifactId>h2</artifactId>\r
+       </dependency>\r
+       \r
+       \r
   </dependencies>\r
+  \r
 </project>\r
-\r