implementing tests for the pathmatchers and fixing a bug in the CdmAntPathMatcher
[cdmlib.git] / cdmlib-remote / pom.xml
index c1950e87787838e7b88a9517e1ce845e99befe75..2650f7c01d7852df2c6863266b903f2210dc9305 100644 (file)
 <?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"
-   -->
-       <parent>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>cdmlib-parent</artifactId>
-               <version>2.3</version>
-       </parent>
-       
+<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.7-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-remote</artifactId>
-  <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>
+  <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>
-                       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>
-               <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>org.mortbay.jetty</groupId>
-                       <artifactId>jetty</artifactId>
-                       <version>6.1.16</version>
-               </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>org.springframework.web.servlet</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.easymock</groupId>
-                       <artifactId>easymock</artifactId>
-               </dependency>
-               <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.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>
+    </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>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.springframework</groupId>
-                       <artifactId>org.springframework.test</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>net.sf.dozer</groupId>
-                       <artifactId>dozer</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>joda-time</groupId>
-                       <artifactId>joda-time</artifactId>    
-               </dependency>
-               <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>
+    </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-core</artifactId>
-       </dependency>
-       <dependency>
-         <groupId>org.hibernate</groupId>
-         <artifactId>hibernate-ehcache</artifactId>
-       </dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-ehcache</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-               <!-- JsonView -->
     <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>3.0.0.RC1</version>
-       </dependency>
+      <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>
+    <!-- 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>
 
-               <!-- JSP TAG LIBS -->
-               <dependency>
-                       <groupId>taglibs</groupId>
-                       <artifactId>standard</artifactId>
-                       <version>1.1.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>taglibs</groupId>
-                       <artifactId>x</artifactId>
-                       <version>1.1.2</version>
-                       <type>tld</type>
-               </dependency>
+    <!-- JsonView -->
+    <dependency>
+      <!-- for xml serialization (net.sf.json.xml.XMLSerializer) -->
+      <groupId>xom</groupId>
+      <artifactId>xom</artifactId>
+    </dependency>
 
-               <!--  SQL Profiling  -->\r
-               <dependency>\r
-                   <groupId>p6spy</groupId>\r
-                   <artifactId>p6spy</artifactId>\r
-                   <version>1.3</version>\r
-               </dependency>
-       </dependencies>
 
-       <build>
-       <!-- Configure the webapp -->\r
-       <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>
--->
-               <plugins>
-                       <plugin>
-                           <groupId>net.sf.alchim</groupId>
-                           <artifactId>winstone-maven-plugin</artifactId>
-                           <executions>
-                               <execution>
-                                   <goals>
-                                       <goal>embed</goal>
-                                   </goals>
-                                   <phase>package</phase>
-                               </execution>
-                           </executions>
-                       </plugin>
-                       <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                       <executions>
-                         <execution>
-                           <phase>package</phase><!-- must run after winstone-maven-plugin -->
-                           <configuration>
-                             <tasks>
-                               <ant antfile="${project.basedir}/src/main/installer/linux/build-deb.xml"/>
-                             </tasks>
-                           </configuration>
-                           <goals>
-                             <goal>run</goal><!-- must run after winstone-maven-plugin -->
-                           </goals>
-                         </execution>
-                       </executions>
 
-            </plugin>
-                               
-                       <!--<plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-war-plugin</artifactId>
-                               <version>2.0</version>
-                               <configuration>
-                                       <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>
-                       <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeTypes>jar</includeTypes>
-                                                       <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-                       
+    <!-- Connection Pooling -->
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-c3p0</artifactId>
+    </dependency>
 
-                       --><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>
+    <!-- SQL Debugging -->
+    <dependency>
+      <groupId>p6spy</groupId>
+      <artifactId>p6spy</artifactId>
+    </dependency>
+  </dependencies>
 
-                       <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>
-                               <configuration>
-                                       <!-- Configure the webapp -->
-                                       <contextPath>/cdmserver-cichorieae/
-                                       </contextPath>\r
-                                       <!--\r
-                                               <contextPath>/cdmserver-palmae/</contextPath>\r
-                                               <contextPath>/cdmserver-diptera/</contextPath>\r
-                                               <contextPath>/cdmserver/</contextPath>\r
-                                               <contextPath>/cdmserver-elsalvador/</contextPath>\r
-                                       <contextPath>/cdmserver-erms/</contextPath>\r
--->
-                                       <!-- 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>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </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>