tests ...

This commit is contained in:
2014-01-15 09:05:51 +01:00
parent c01995675e
commit c9ff7ccf2c
5 changed files with 9 additions and 7 deletions

View File

@@ -21,6 +21,7 @@ After checking out the project execute `mvn compile` to create the folder and th
To build project use `mvn clean install`.
To upload the latest version to the central artifact repository use `mvn clean deploy`.
Create Zip file via `mvn clean compile assembly:assembly`
## REST
FDA offers a rest service to execute scans. There are 3 distinct service for fda scan, fdaq and cdump.

View File

@@ -27,19 +27,19 @@
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-grizzly2-http</artifactId>
<version>2.3.1</version>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-sse</artifactId>
<version>2.3.1</version>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>2.3.1</version>
<version>2.5.1</version>
</dependency>

View File

@@ -95,7 +95,9 @@ public class FdaServer {
latch.await();
} catch (InterruptedException e) {
}
server.stop();
server.shutdownNow();
logger.info("Server terminated");
System.exit(0); // TODO need to shutdown ChannelService correctly !!!!
}
}

View File

@@ -25,5 +25,4 @@ public class ResourceBinder extends AbstractBinder {
bind(CdumpEngine.class).to(CdumpEngine.class).in(Singleton.class);
bind(CdumpConfiguration.class).to(CdumpConfiguration.class).in(Singleton.class);
}
}

View File

@@ -1,4 +1,4 @@
# Test properties file
ch.psi.jcae.ContextFactory.addressList=129.129.130.255 129.129.130.37 129.129.145.26 129.129.130.88 129.129.130.142
ch.psi.jcae.ContextFactory.addressList=129.129.130.188 129.129.130.255 129.129.130.37 129.129.145.26 129.129.130.88 129.129.130.142
ch.psi.jcae.ChannelBeanFactory.retries=4