X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/beb43d93f2b3feef25ad6ddf931db15779202a9f..2ce08010bc810fd00756d36f7bfcf08271e7f21e:/cdmlib-remote/pom.xml

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 30124b982d..00c8757618 100644
--- a/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@ -1,24 +1,38 @@
 <?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">
+<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>2.2</version>
+		<version>2.4</version>
 	</parent>
 	
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-remote</artifactId>
+  <properties>
+    <!--  
+      custom property to hold the patch version number     
+      should'nt 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>
   <packaging>war</packaging>
-  <name>CDM Community Server</name>
-  <description>The EDIT CDM Community Server allows remote access to the common data model via webservices in the wider sense</description>
   <scm>
-    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/</connection>
-  	<developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/</developerConnection>
-  	<url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-remote/</url>
+		<connection>
+			scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
+		</connection>
+		<developerConnection>
+			scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
+		</developerConnection>
+		<url>
+			http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-remote/
+		</url>
   </scm>
 
 	<dependencies>
@@ -38,6 +52,10 @@
 			<groupId>eu.etaxonomy</groupId>
 			<artifactId>cdmlib-services</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>eu.etaxonomy</groupId>
+			<artifactId>cdmlib-io</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -45,12 +63,31 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
+			<artifactId>org.springframework.web</artifactId>
 		</dependency>
+		<dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>org.springframework.context.support</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-		</dependency>
+			<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>
@@ -69,7 +106,7 @@
       </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
+			<artifactId>org.springframework.test</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.dozer</groupId>
@@ -83,10 +120,14 @@
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-cglib-repack</artifactId>
     </dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-		</dependency>
+    <dependency>
+	  <groupId>org.hibernate</groupId>
+	  <artifactId>hibernate-core</artifactId>
+	</dependency>
+	<dependency>
+  	  <groupId>org.hibernate</groupId>
+  	  <artifactId>hibernate-ehcache</artifactId>
+  	</dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -99,9 +140,9 @@
       <classifier>jdk15</classifier>   
     </dependency>
 	<dependency>
-	  <groupId>org.springframework.ws</groupId>
-	  <artifactId>spring-oxm-tiger</artifactId>
-	  <version>1.5.0</version>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>org.springframework.oxm</artifactId>
+	  <version>3.0.0.RC1</version>
 	</dependency>
 
 		<!-- XmlView -->
@@ -129,97 +170,75 @@
 			<artifactId>x</artifactId>
 			<version>1.1.2</version>
 			<type>tld</type>
-		</dependency>		
-		
+		</dependency>
+		<!--  Connection Pooling  -->
+        <dependency> 
+            <groupId>org.hibernate</groupId> 
+            <artifactId>hibernate-c3p0</artifactId>         
+ 		</dependency>
+
 		<!--  SQL Profiling  -->
 		<dependency>
-    <groupId>p6spy</groupId>
-    <artifactId>p6spy</artifactId>
-    <version>1.3</version>
-</dependency>
+		    <groupId>p6spy</groupId>
+		    <artifactId>p6spy</artifactId>
+		    <version>1.3</version>
+		</dependency>
 	</dependencies>
-
 	<build>
-	<!-- Configure the webapp -->
- 	<finalName>cdmserver</finalName> 
-<!--		
- 		<finalName>cdmserver-cichorieae</finalName> 
-		<finalName>cdmserver-palmae</finalName>
-		<finalName>cdmserver-diptera</finalName>
-		<finalName>cdmserver</finalName>
-		<finalName>cdmserver-elsalvador</finalName>
-		<finalName>cdmserver-erms</finalName>
--->
+		<!-- Configure the webapp -->
+	 	<finalName>cdmserver</finalName> 
 		<plugins>
-			<plugin><!--use mvn tomcat:deploy -->
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>tomcat-maven-plugin</artifactId>
-				<configuration>
-					 					  
-				<!--Uncomment tomcat to deploy to-->
-					<!-- current production -->
-<!--					<update>true</update>-->
-<!--					<server>tomcat-edit</server>-->
-<!--					<url>http://search.biocase.org:8080/manager</url>-->
-					
-					<!-- remote testing-->
-					<update>true</update>
-					<server>tomcat-cdm</server>
-					<url>http://160.45.63.201:8080/manager</url>			
-					
-<!--				<server>tomcat-local</server>-->
-				</configuration>
+		<!-- 
+			<plugin>
+			    <groupId>net.sf.alchim</groupId>
+			    <artifactId>winstone-maven-plugin</artifactId>
+			    <executions>
+			        <execution>
+			            <goals>
+			                <goal>embed</goal>
+			            </goals>
+			            <phase>deploy</phase>
+			        </execution>
+			    </executions>
 			</plugin>
-
-			<plugin><!-- 
-			  to run use:
-			    mvn jetty:run
-			   
-			  for debugging: 
-			    export MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=4000,server=y,suspend=n"
-          mvn jetty:run
-         
-        for faster startup offline mode & skip tests:
-          mvn -o -Dmaven.test.skip=true jetty:run-war
-        
-        an eclipse plugin to start/restart/stop jetty6
-          http://dbpowder.sourceforge.net/etc/jettylauncher6/updates/
-          
-        see also: 
-          http://docs.codehaus.org/display/JETTY/Debugging+with+the+Maven+Jetty+Plugin+inside+Eclipse
-          http://mahertb.blogspot.com/2006/08/debugging-maven-web-application-with.html
-			  -->
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
+		 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.1-beta-1</version>
+				<!-- 
 				<configuration>
-					<!-- Configure the webapp -->
-					<contextPath>/cdmserver-cichorieae/</contextPath>
-<!--					
-					<contextPath>/cdmserver-palmae/</contextPath>
-					<contextPath>/cdmserver-diptera/</contextPath>
-					<contextPath>/cdmserver/</contextPath>
-					<contextPath>/cdmserver-elsalvador/</contextPath>
-					<contextPath>/cdmserver-erms/</contextPath>
--->
-					<!-- configure the container -->
-					<scanIntervalSeconds>0</scanIntervalSeconds>
-					<connectors>
-						<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-							<port>8080</port>
-							<maxIdleTime>60000</maxIdleTime>
-						</connector>
-					</connectors>
-					<requestLog implementation="org.mortbay.jetty.NCSARequestLog">
-						<filename>target/request.log</filename>
-						<retainDays>30</retainDays>
-						<append>true</append>
-						<extended>false</extended>
-						<logTimeZone>GMT</logTimeZone>
-					</requestLog>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<mainClass>eu.etaxonomy.cdm.server.CdmServer
+							</mainClass>
+						</manifest>
+					</archive>
 				</configuration>
+				<executions>
+					<execution>
+						<id>move-main-class</id>
+						<phase>compile</phase>
+						<configuration>
+							<tasks>
+								  Ant tasks 
+								<echo>Moving CdmServer.class to ${project.build.directory}/${project.artifactId}</echo>
+								<move todir="${project.build.directory}/${project.artifactId}">
+									<fileset dir="${project.build.directory}/classes/">
+										<include name="**/CdmServer.class" />
+									</fileset>
+								</move>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>war</goal>
+						</goals>
+					</execution>
+				</executions>
+				 -->
 			</plugin>
 		</plugins>
 	</build>
-	
 </project>