Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
jetty-maven-plugin configuration now only uses the build-helper:reser…
…ve-ports goal for integration tests.

So mvn jetty:run now operates as it did before (defaulting to port 8080, etc)
  • Loading branch information
Edwin Shin committed Apr 11, 2013
1 parent 1bde722 commit 7ea33c5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
23 changes: 13 additions & 10 deletions fcrepo-webapp/pom.xml
Expand Up @@ -10,10 +10,10 @@
<artifactId>fcrepo-webapp</artifactId>
<packaging>war</packaging>
<name>fcrepo webapp</name>

<properties>
<!-- integration test properties -->
<test.context.path>/rest</test.context.path>
<test.context.path>/</test.context.path>
</properties>

<dependencies>
Expand Down Expand Up @@ -98,7 +98,7 @@
<artifactId>maven-war-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<test.port>${jetty.port}</test.port>
Expand Down Expand Up @@ -129,12 +129,6 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>${jetty.port}</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
<loginServices>
<loginService implementation="org.eclipse.jetty.security.HashLoginService">
<name>fcrepo</name>
Expand All @@ -143,7 +137,6 @@
</loginServices>
<scanIntervalSeconds>2</scanIntervalSeconds>
<stopKey>STOP</stopKey>
<stopPort>${jetty.port.stop}</stopPort>
<webApp>
<contextPath>${test.context.path}</contextPath>
</webApp>
Expand All @@ -157,7 +150,14 @@
<goal>start</goal>
</goals>
<configuration>
<connectors>
<connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>${jetty.port}</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
<daemon>true</daemon>
<stopPort>${jetty.port.stop}</stopPort>
<webAppSourceDirectory>${project.build.directory}/test-classes</webAppSourceDirectory>
</configuration>
</execution>
Expand All @@ -167,6 +167,9 @@
<goals>
<goal>stop</goal>
</goals>
<configuration>
<stopPort>${jetty.port.stop}</stopPort>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
Expand Up @@ -64,7 +64,7 @@ public void setLogger() {
@Test
public void doASanityCheck() throws IOException {
assertEquals(200, getStatus(new HttpGet(serverAddress +
"/describe")));
"/rest/describe")));
}


Expand Down

0 comments on commit 7ea33c5

Please sign in to comment.