simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-19 18:46:43 +00:00
Code Issues Projects Releases Wiki Activity

Moved config file and fixed some warnings

Browse Source
This commit is contained in:
Jacob Swehla 2017-12-29 11:25:31 -06:00
parent fde79ed97e
commit b43cf9ac33
3 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Server/pom.xml
View File

@ -4,13 +4,23 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.simon987.server</groupId>
<artifactId>server_root</artifactId>
<version>1.2a</version>
</parent>
<build> <build>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>default-resources</id>
<!-- here the phase you need -->
<phase>prepare-package</phase>
<goals>
<goal>resources</goal>
</goals>
<configuration>
<outputDirectory>../target/</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>../Server/src/main/resources</directory> <directory>../Server/src/main/resources</directory>
@ -20,7 +30,10 @@
</includes> </includes>
</resource> </resource>
</resources> </resources>
<plugins> </configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<version>3.6.2</version> <version>3.6.2</version>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -50,6 +63,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration> <configuration>
<outputDirectory>../target</outputDirectory> <outputDirectory>../target</outputDirectory>
<archive> <archive>
@ -93,4 +107,9 @@
</dependencies> </dependencies>
<properties>
<!-- explicitly set build encoding so not altered by build platform defaults -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project> </project>

2
Server/src/main/java/net/simon987/server/ServerConfiguration.java
View File

@ -22,7 +22,7 @@ public class ServerConfiguration {
public ServerConfiguration(String file) { public ServerConfiguration(String file) {
try { try {
properties = new Properties(); properties = new Properties();
InputStream is = ServerConfiguration.class.getClassLoader().getResourceAsStream("config.properties"); InputStream is = new FileInputStream("config.properties");
properties.load(is); properties.load(is);
} catch (IOException e) { } catch (IOException e) {

10
pom.xml
View File

@ -13,17 +13,8 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<version>3.6.2</version>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<version>3.6.2</version> <version>3.6.2</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
@ -33,6 +24,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration> <configuration>
<outputDirectory>../target/plugins</outputDirectory> <outputDirectory>../target/plugins</outputDirectory>
<archive> <archive>