X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/e52561f0b0a92d16a57886f1e063a971e2f0d830..48bf6bcf12bcffa5aa81400d1ff3a90598eb9839:/cdmlib-remote/pom.xml?ds=sidebyside

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index cb5709b6ee..ae444ec6f8 100644
--- a/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@ -1,59 +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" 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"
-   -->
+  <!-- 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.0.13-SNAPSHOT</version>
+    <version>3.3.2</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?
-     -->
+    <!-- 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  -->
+  <!-- Revert this back to "war" before committing -->
   <packaging>jar</packaging>
   <scm>
     <connection>
-      scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
+      scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.3.2/cdmlib-remote
     </connection>
     <developerConnection>
-      scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
+      scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.3.2/cdmlib-remote
     </developerConnection>
     <url>
-      http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-remote/
+      scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.3.2/cdmlib-remote
     </url>
   </scm>
 
   <dependencies>
-    <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-ext</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-persistence</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-model</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>eu.etaxonomy</groupId>
-      <artifactId>cdmlib-services</artifactId>
-    </dependency>
     <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-io</artifactId>
@@ -68,29 +47,114 @@
       <artifactId>org.springframework.web</artifactId>
     </dependency>
     <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>org.springframework.context.support</artifactId>
-        </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.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.springframework.security</groupId>
+                <artifactId>spring-security-core</artifactId>
+                <version>${spring-security.version}</version>
+                <exclusions>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-aop</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</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-expression</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-tx</artifactId>
+                  </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-config</artifactId>
+                <version>${spring-security.version}</version>
+                <exclusions>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-aop</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</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-web</artifactId>
+                  </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-web</artifactId>
+                <version>${spring-security.version}</version>
+                 <exclusions>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-aop</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</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-web</artifactId>
+                  </exclusion>
+                </exclusions>
+            </dependency>
+    <dependency>
       <groupId>org.unitils</groupId>
       <artifactId>unitils-core</artifactId>
       <scope>test</scope>
@@ -110,7 +174,7 @@
       <artifactId>unitils-dbunit</artifactId>
       <scope>test</scope>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>org.unitils</groupId>
       <artifactId>unitils-easymock</artifactId>
       <scope>test</scope>
@@ -125,16 +189,25 @@
       <artifactId>unitils-inject</artifactId>
       <scope>test</scope>
     </dependency>
-     <dependency>
+    <dependency>
       <groupId>org.unitils</groupId>
       <artifactId>unitils-orm</artifactId>
       <scope>test</scope>
     </dependency>
-     <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>
@@ -143,14 +216,50 @@
       <groupId>com.ibm.lsid</groupId>
       <artifactId>lsid-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
+
+
+      <dependency>
+  <groupId>com.vaadin</groupId>
+  <artifactId>vaadin-server</artifactId>
+      </dependency>
+      <dependency>
+  <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-shared</artifactId>
+      </dependency>
+      <dependency>
+  <groupId>com.vaadin</groupId>
+  <artifactId>vaadin-client-compiled</artifactId>
+      </dependency>
+      <dependency>
+  <groupId>com.vaadin</groupId>
+  <artifactId>vaadin-client</artifactId>
+  <scope>provided</scope>
+      </dependency>
+      <dependency>
+  <groupId>com.vaadin</groupId>
+  <artifactId>vaadin-themes</artifactId>
+      </dependency>
+      <dependency>
+  <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-client-compiler</artifactId>
+      </dependency>
+
+      <dependency>
+  <groupId>ru.xpoft.vaadin</groupId>
+  <artifactId>spring-vaadin-integration</artifactId>
       </dependency>
+
+      <dependency>
+     <groupId>org.vaadin.addons</groupId>
+     <artifactId>exporter</artifactId>
+      </dependency>
+
+      <dependency>
+     <groupId>org.vaadin.addons</groupId>
+     <artifactId>wizards-for-vaadin</artifactId>
+      </dependency>
+
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>org.springframework.test</artifactId>
@@ -159,19 +268,11 @@
       <groupId>net.sf.dozer</groupId>
       <artifactId>dozer</artifactId>
     </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-    </dependency>
     <dependency>
       <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-ehcache</artifactId>
     </dependency>
@@ -182,14 +283,12 @@
     <dependency>
       <groupId>net.sf.json-lib</groupId>
       <artifactId>json-lib</artifactId>
-      <version>2.2.3</version>
       <classifier>jdk15</classifier>
     </dependency>
-  <dependency>
-    <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.oxm</artifactId>
-    <version>${spring.version}</version>
-  </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.oxm</artifactId>
+    </dependency>
 
     <!-- XmlView -->
     <dependency>
@@ -205,42 +304,68 @@
       <artifactId>stax</artifactId>
     </dependency>
 
-    <!-- JSP TAG LIBS -->
+    <!-- JsonView -->
     <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <version>1.1.2</version>
+      <!-- for xml serialization (net.sf.json.xml.XMLSerializer) -->
+      <groupId>xom</groupId>
+      <artifactId>xom</artifactId>
     </dependency>
+
+
+
+    <!-- Connection Pooling -->
     <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>x</artifactId>
-      <version>1.1.2</version>
-      <type>tld</type>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-c3p0</artifactId>
     </dependency>
-    <!--  Connection Pooling  -->
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-c3p0</artifactId>
-     </dependency>
 
-    <!--  SQL Debugging  -->
+    <!-- SQL Debugging -->
     <dependency>
-        <groupId>p6spy</groupId>
-        <artifactId>p6spy</artifactId>
+      <groupId>p6spy</groupId>
+      <artifactId>p6spy</artifactId>
     </dependency>
   </dependencies>
-    
-     <build>    
-      <resources>
-        <resource>
-          <targetPath>eu/etaxonomy/cdm/doc/remote/apt</targetPath>
-          <directory>../src/site/apt/remote</directory>
-           <includes>
-             <include>*.apt</include>
-           </includes>
-        </resource>
-      </resources>
-    </build>
 
+  <build>
+  <plugins>
+          <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.1-beta-1</version>
+        </plugin>
+        <plugin>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-maven-plugin</artifactId>
+          <version>7.1.11</version>
+        <configuration>
+          <strict>true</strict>
+          <force>true</force>
+        <webappDirectory>../cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets</webappDirectory>
+        </configuration>
+    </plugin>
+  <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>