Skip to content

Commit

Permalink
Removed default application.conf.
Browse files Browse the repository at this point in the history
  • Loading branch information
noboomu committed Sep 27, 2017
1 parent 8de8ed6 commit d641ead
Show file tree
Hide file tree
Showing 5 changed files with 395 additions and 120 deletions.
118 changes: 0 additions & 118 deletions conf/application.conf

This file was deleted.

19 changes: 18 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.sinistral</groupId>
<artifactId>proteus-core</artifactId>
<version>0.1.7.1-SNAPSHOT</version>
<version>0.1.7.2-SNAPSHOT</version>
<name>proteus core</name>
<description>Proteus is an extremely light, fast, and flexible Java REST API framework built atop Undertow.</description>
<url>http://github.com/noboomu/proteus</url>
Expand Down Expand Up @@ -116,6 +116,21 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>

<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit47</artifactId>
<version>2.20.1</version>
</dependency>
</dependencies>
<configuration>
<argLine>-Dconfig.file=src/main/resources/reference.conf</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down Expand Up @@ -184,6 +199,8 @@
<scope>test</scope>
</dependency>



<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/io/sinistral/proteus/modules/ConfigModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class ConfigModule extends AbstractModule

public ConfigModule()
{
this.configFile = System.getenv("config.file");
this.configFile = System.getProperty("config.file");

if(this.configFile == null)
{
Expand All @@ -57,6 +57,7 @@ public ConfigModule(String configFile)
public ConfigModule(URL configURL)
{
this.configURL = configURL;

}


Expand Down
Loading

0 comments on commit d641ead

Please sign in to comment.