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

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index 629deeb5ae..c5b7a5154c 100644
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -4,8 +4,8 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.2.3</version>
-	<relativePath>../pom.xml</relativePath>
+    <version>3.3.7-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>eu.etaxonomy</groupId>
@@ -19,67 +19,282 @@
 
   <scm>
     <connection>
-      scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.2.3/cdmlib-remote
+      scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
     </connection>
     <developerConnection>
-      scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.2.3/cdmlib-remote
+      scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
     </developerConnection>
     <url>
-      scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.2.3/cdmlib-remote
+      http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-remote/
     </url>
   </scm>
 
+    <profiles>
+    <profile>
+      <id>local-repository</id>
+      <activation>
+        <property>
+          <name>localrepo</name>
+        </property>
+      </activation>
+      <repositories>
+        <repository>
+          <id>EditLocalRepository</id>
+          <url>file://${localrepo}/eu/etaxonomy/</url>
+          <releases>
+            <enabled>false</enabled>
+            <updatePolicy>always</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+
   <dependencies>
     <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-remote</artifactId>
     </dependency>
-      <dependency>
-      	<!-- TODO this is also offered by cdmlib-remote, can it be removed? What does provided mean? -->
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.easymock</groupId>
-        <artifactId>easymock</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>xmlunit</groupId>
-        <artifactId>xmlunit</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-      </dependency>
-      <!-- JsonView -->
-      <dependency>
-        <!--  TODO can this be removed, it already exists in cdmlib-remote -->
-        <groupId>net.sf.json-lib</groupId>
-        <artifactId>json-lib</artifactId>
-        <classifier>jdk15</classifier>
-      </dependency>
-
-      <!-- Profiling -->
-      <dependency>
-        <groupId>com.yourkit</groupId>
-        <artifactId>yjp-controller-api-redist</artifactId>
-        <scope>test</scope>
+    <dependency>
+      <!-- TODO this is also offered by cdmlib-remote, can it be removed?
+        What does provided mean? -->
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <!-- JsonView -->
+    <dependency>
+      <!-- TODO can this be removed, it already exists in cdmlib-remote -->
+      <groupId>net.sf.json-lib</groupId>
+      <artifactId>json-lib</artifactId>
+      <classifier>jdk15</classifier>
+    </dependency>
+
+    <!-- Profiling -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.oxm</artifactId>
+      <version>${spring.version}</version>
+    </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>
+    <!-- Connection Pooling -->
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-c3p0</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.vaadin.addons</groupId>
+      <artifactId>exporter</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.vaadin.addons</groupId>
+      <artifactId>wizards-for-vaadin</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.yourkit</groupId>
+      <artifactId>yjp-controller-api-redist</artifactId>
+      <scope>test</scope>
     </dependency>
 
   </dependencies>
 
-    <build>
-      <!-- Configure the webapp -->
-      <finalName>cdmserver</finalName>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>2.1-beta-1</version>
-        </plugin>
-      </plugins>
-    </build>
+  <build>
+   <resources>
+      <!-- ${basedir}/src/test/resources -->
+      <resource>
+        <!-- replace the place holders like ${basedir} in the resource files -->
+        <targetPath>${project.build.directory}/test-classes</targetPath>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/test/resources</directory>
+        <includes>
+            <include>datasources.xml</include>
+        </includes>
+      </resource>
+      <resource>
+       <!-- all other files without filtering -->
+        <targetPath>${project.build.directory}/test-classes</targetPath>
+        <directory>${basedir}/src/test/resources</directory>
+        <excludes>
+            <exclude>datasources.xml</exclude>
+        </excludes>
+      </resource>
+     </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+      </plugin>
+      <plugin>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-maven-plugin</artifactId>
+        <version>7.1.11</version>
+        <executions>
+          <execution>
+            <configuration>
+              <!--
+                if you don't specify any modules, the plugin will find them
+              -->
+              <modules>
+                <module>${cdm-remote}.vaadin.redlist.widgetset</module>
+              </modules>
+            </configuration>
+            <goals>
+              <goal>update-widgetset</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <strict>true</strict>
+          <force>true</force>
+          <webappDirectory>src/main/webapp/VAADIN/widgetsets</webappDirectory>
+          <module>eu.etaxonomy.cdm.remote.vaadin.redlist.wigetset.AppWidgetSet</module>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.16</version>
+        <configuration>
+          <forkCount>3</forkCount>
+          <reuseForks>true</reuseForks>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>9.1.3.v20140225</version>
+        <configuration>
+            <stopKey>stop</stopKey>
+            <stopPort>9199</stopPort>
+            <scanIntervalSeconds>10</scanIntervalSeconds>
+            <jettyXml>${basedir}/src/test/resources/etc/jetty/jetty.xml,${basedir}/src/test/resources/etc/jetty/jetty-http.xml</jettyXml>
+            <!--
+                <jettyXml>./src/test/resources/etc/jetty/jetty.xml,./src/test/resources/etc/jetty/jetty-http.xml,./src/test/resources/etc/jetty/jetty-ssl.xml,./src/test/resources/etc/jetty/jetty-https.xml</jettyXml>
+             -->
+            <systemProperties>
+              <systemProperty>
+                <name>cdm.datasource</name>
+                <value>h2_cdmTest</value>
+              </systemProperty>
+              <systemProperty>
+                <!-- datasources.xml is prepared by <plugins><resources>..</resources> above -->
+                <name>cdm.beanDefinitionFile</name>
+                <value>${project.build.directory}/test-classes/datasources.xml</value>
+              </systemProperty>
+            </systemProperties>
+        </configuration>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+            <configuration>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+              <daemon>true</daemon>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>