Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Maurizio Turatti committed Dec 18, 2014
2 parents 45cd279 + 1df25ca commit 0ed5bdf
Show file tree
Hide file tree
Showing 101 changed files with 757 additions and 780 deletions.
1 change: 1 addition & 0 deletions assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<include>NOTICE*</include>
<include>etc/restheart.yml</include>
<include>etc/security.yml</include>
<include>etc/restheartd.conf</include>
</includes>
</fileSet>
<fileSet>
Expand Down
8 changes: 4 additions & 4 deletions etc/restheart-integrationtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ mongo-servers:
port: 27017

# Provide mongodb users credentials with mongo-credentials.
mongo-credentials:
- auth-db: admin
user: admin
password: adminadmin
# mongo-credentials:
# - auth-db: admin
# user: admin
# password: adminadmin

# Use mongo-mounts to bind URls to mongodb resources using the out-of-the-box URL rewrite feature.
mongo-mounts:
Expand Down
10 changes: 10 additions & 0 deletions etc/restheartd.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
description "restheart deamon - REST interface for mongodb"
author "Andrea Di Cesare <[email protected]>"

start on runlevel [2345]
stop on runlevel [!2345]

script
exec java -server -jar /vagrant/restheart-0.9.3/restheart.jar /vagrant/restheart-0.9.3/etc/restheart.yml
end script

89 changes: 44 additions & 45 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.softinstigate</groupId>
<artifactId>restheart</artifactId>
<version>0.9.3</version>
<version>0.9.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Restheart</name>
<description>
RESTHeart is the REST API server for mongodb.
Open your data, quickly build HATEOAS applications, use it as your mobile apps back-end,...
RESTHeart is the REST API data server for MongoDB.
</description>
<url>http://www.restheart.org</url>
<inceptionYear>2014</inceptionYear>
Expand Down Expand Up @@ -80,13 +79,13 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>2.12.1</version>
<version>2.12.4</version>
</dependency>

<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>1.0.15.Final</version>
<version>1.0.17.Final</version>
</dependency>

<dependency>
Expand All @@ -98,7 +97,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.13</version>
<version>1.14</version>
</dependency>

<dependency>
Expand All @@ -110,7 +109,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<version>4.12</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -142,7 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<version>2.5.2</version>
<executions>
<execution>
<id>assemble-all</id>
Expand Down Expand Up @@ -183,42 +182,37 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.2</version>
<configuration>
<debug>true</debug>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.17</version>
<version>2.18</version>
<executions>
<execution>
<id>############## integration test ################</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>2.17</version>
</dependency>
</dependencies>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>############## start rh ################</id>
<id>start-server</id>
<phase>pre-integration-test</phase>
<configuration>
<target>
Expand All @@ -232,7 +226,7 @@
</goals>
</execution>
<execution>
<id>############## stop rh ################</id>
<id>stop-server</id>
<phase>post-integration-test</phase>
<configuration>
<target>
Expand All @@ -246,29 +240,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<executions>
<execution>
<id>############## recreate test data ################</id>
<phase>pre-integration-test</phase>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>com.softinstigate.restheart.integrationtest.TestDataInitializer</mainClass>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
<classpathScope>test</classpathScope>
<arguments>
<argument>${basedir}/etc/restheart.yml</argument>
</arguments>
</configuration>
</plugin>


<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
Expand All @@ -279,6 +251,33 @@

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.18</version>
<reportSets>
<reportSet>
<id>integration-tests</id>
<reports>
<report>failsafe-report-only</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.1</version>
<reportSets>
<reportSet>
<reports>
<report>dependency-updates-report</report>
<report>plugin-updates-report</report>
<report>property-updates-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand All @@ -304,7 +303,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.2</version>
<version>3.3</version>
</plugin>
</plugins>
</reporting>
Expand Down
Loading

0 comments on commit 0ed5bdf

Please sign in to comment.