Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Put tomcat in a profile (tomcat)

  • Loading branch information...
commit 6bab6c9a3df62f8cdad88f9ab64d081741981d4d 1 parent 800b36a
@dsyer dsyer authored
Showing with 56 additions and 1 deletion.
  1. +12 −0 README.md
  2. +22 −0 api/pom.xml
  3. +1 −1  pom.xml
  4. +21 −0 uaa/pom.xml
View
12 README.md
@@ -46,6 +46,18 @@ And then (from the base directory) execute:
which should return a JSON array of (pretend) running applications.
+## Integration tests
+
+With all apps deployed into a running server on port 8080 the tests
+will include integration tests (a check is done before each test that
+the app is running). You can deploy them in your IDE or using the
+command line with `mvn tomcat:deploy`.
+
+For individual modules you can also run integration tests from the
+command line in one go with
+
+ $ mvn tomcat:run -Dmaven.tomcat.fork=true test
+
## Inventory
There are actually several projects here:
View
22 api/pom.xml
@@ -94,6 +94,20 @@
<artifactId>tomcat-maven-plugin</artifactId>
<configuration>
<path>/api</path>
+ <addContextWarDependencies>true</addContextWarDependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>${skipTests}</skip>
+ <includes>
+ <include>**/*Tests.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
@@ -103,6 +117,14 @@
<dependencies>
<dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>uaa</artifactId>
+ <version>${pom.version}</version>
+ <type>war</type>
+ <scope>tomcat</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
<version>${spring.security.oauth.version}</version>
View
2  pom.xml
@@ -8,8 +8,8 @@
<version>1.0.0.BUILD-SNAPSHOT</version>
<modules>
- <module>api</module>
<module>uaa</module>
+ <module>api</module>
<module>app</module>
</modules>
View
21 uaa/pom.xml
@@ -109,6 +109,27 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id></id>
+ <phase>install</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <file>target/${pom.artifactId}-${pom.version}.war</file>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>uaa</artifactId>
+ <version>${pom.version}</version>
+ <packaging>war</packaging>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Please sign in to comment.
Something went wrong with that request. Please try again.