Skip to content

Commit

Permalink
Added maven target directories to ignore list
Browse files Browse the repository at this point in the history
  • Loading branch information
Marius Kleiner committed Apr 28, 2012
1 parent 27e02d8 commit eee3844
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 21 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Compiled sources
*.class
target

# Application runtime files
*.log
Expand Down
32 changes: 18 additions & 14 deletions beowulf-webservice-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>ch.hotstuff</groupId>
<artifactId>beowulf-masterbuild</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../beowulf-masterbuild/pom.xml</relativePath>
</parent>
<parent>
<groupId>ch.hotstuff</groupId>
<artifactId>beowulf-masterbuild</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../beowulf-masterbuild/pom.xml</relativePath>
</parent>
<artifactId>beowulf-webservice-app</artifactId>
<packaging>war</packaging>

<name>beowulf-webservice-app Maven Webapp</name>
<properties>
<webservice.path>/webservice</webservice.path>
</properties>

<url>http://maven.apache.org</url>
<dependencies>
<dependency>
Expand All @@ -22,7 +26,7 @@
<dependency>
<groupId>ch.hotstuff</groupId>
<artifactId>beowulf-business-svc</artifactId>
<scope>test</scope>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -57,7 +61,7 @@
</goals>
<configuration>
<port>12345</port>
<path>/webservice</path>
<path>${webservice.path}</path>
<useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
</configuration>
</execution>
Expand Down Expand Up @@ -112,7 +116,7 @@
<phase>process-test-resources</phase>
<configuration>
<portNames>
<portName>test.server.portli</portName>
<portName>test.server.port</portName>
</portNames>
</configuration>
</execution>
Expand All @@ -131,8 +135,8 @@
</goals>
<phase>pre-integration-test</phase>
<configuration>
<port>${test.server.portli}</port>
<path>/jaxrs-service</path>
<port>${test.server.port}</port>
<path>${webservice.path}</path>
<fork>true</fork>
<useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
</configuration>
Expand All @@ -146,7 +150,7 @@
</goals>
<phase>post-integration-test</phase>
<configuration>
<path>/jaxrs-service</path>
<path>${webservice.path}</path>
</configuration>
</execution>
</executions>
Expand All @@ -163,7 +167,7 @@
</goals>
<configuration>
<systemPropertyVariables>
<service.url>http://localhost:${test.server.portli}/jaxrs-service</service.url>
<service.url>http://localhost:${test.server.port}${webservice.path}</service.url>
</systemPropertyVariables>
</configuration>
</execution>
Expand Down
6 changes: 0 additions & 6 deletions beowulf-webservice-app/src/main/resources/log4j.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
</appender>

<!-- for all other loggers log only info and above log messages -->
<logger name="ch.hotstuff.webapp.servlet" additivity="false">
<level value="DEBUG"/>
<appender-ref ref="STDOUT"/>
<appender-ref ref="FILE"/>
</logger>

<logger name="org.springframework" additivity="false">
<level value="INFO"/>
<appender-ref ref="STDOUT"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static org.junit.Assert.assertEquals;

import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
Expand All @@ -11,6 +12,8 @@

public class UpAndRunningIT
{
private Logger LOG = Logger.getLogger(this.getClass());

private static String endpointUrl;
private HelloWorld soapService;

Expand All @@ -31,6 +34,9 @@ public void before() {
@Test
public void testWebServiceIsRunning()
{
assertEquals("Hello, world!", soapService.sayHello());
LOG.info("endpointURL = " + endpointUrl);

final String answer = soapService.sayHello();
assertEquals("Hello, world!", answer);
}
}

0 comments on commit eee3844

Please sign in to comment.