Remove integration tests from WEBapp

git-svn-id: https://svn.argeo.org/slc/trunk@2019 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.webapp/.classpath b/org.argeo.slc.webapp/.classpath
index c06db5ab6d669f4a0fd8e19353b62d3516a52fd3..d0bec0f7611fdaeecb07a8dfbcc32e06ccda11cb 100644 (file)
--- a/org.argeo.slc.webapp/.classpath
+++ b/org.argeo.slc.webapp/.classpath
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index ad5d0ec6d0c0dd0fd67f727aa8d964b789fbd0b3..71c85784f7a6e1cb3ea05fa471e1b06609cb6fac 100644 (file)
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -109,54 +109,6 @@
                                        </execution>
                                </executions>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <configuration>
-                                       <skipTests>true</skipTests>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>surefire-it</id>
-                                               <phase>integration-test</phase>
-                                               <goals>
-                                                       <goal>test</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.mortbay.jetty</groupId>
-                               <artifactId>maven-jetty-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>start-jetty</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>run-war</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <daemon>true</daemon>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>stop-jetty</id>
-                                               <phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>stop</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <webApp>${project.build.directory}/${artifactId}.war</webApp>
-                                       <scanIntervalSeconds>0</scanIntervalSeconds>
-                                       <webDefaultXml>src/main/config/jetty/webdefault.xml</webDefaultXml>
-                                       <jettyConfig>src/main/config/jetty/jetty-test.xml</jettyConfig>
-                               </configuration>
-                       </plugin>
                </plugins>
        </build>
        <dependencies>
@@ -165,30 +117,6 @@
                        <artifactId>org.argeo.slc.server</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.launcher</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.ant</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.ws.client</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
-                       <scope>test</scope>
-               </dependency>
 
                <!-- Required in JDK 1.5 -->
                <dependency>