diff --git a/.classpath b/.classpath index abce7149466c4bdeeedaa5ff1de5103a25f09f4a..fdc7b871114eddec5aa36b968731e07a84572a65 100644 --- a/.classpath +++ b/.classpath @@ -25,6 +25,5 @@ </classpathentry> <classpathentry including="**/*.java" kind="src" path="src/main/resources"/> <classpathentry kind="src" path="src/test/resources"/> - <classpathentry kind="src" path="conf"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/conf/pipe-factories.conf b/src/main/resources/pipe-factories.conf similarity index 100% rename from conf/pipe-factories.conf rename to src/main/resources/pipe-factories.conf diff --git a/src/test/java/teetime/framework/pipe/PipeFactoryLoaderTest.java b/src/test/java/teetime/framework/pipe/PipeFactoryLoaderTest.java index 1c350635e85ddb0317a0aa8cb06c6dea8f335ac3..e7beafb33497981460fc9d170f77719155ddf72f 100644 --- a/src/test/java/teetime/framework/pipe/PipeFactoryLoaderTest.java +++ b/src/test/java/teetime/framework/pipe/PipeFactoryLoaderTest.java @@ -25,15 +25,15 @@ public class PipeFactoryLoaderTest { @Test public void singleConfig() throws IOException { List<IPipeFactory> list = PipeFactoryLoader.loadPipeFactoriesFromClasspath("pipe-factories.conf"); - int lines = Files.readLines(new File("conf/pipe-factories.conf"), Charsets.UTF_8).size(); + int lines = Files.readLines(new File("target/classes/pipe-factories.conf"), Charsets.UTF_8).size(); Assert.assertEquals(lines, list.size()); } @Test public void multipleConfigs() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException { List<URL> files = new ArrayList<URL>(); - File pipeConfig = new File("conf/pipe-factories.conf"); - File testConfig = new File("src/test/resources/data/normal-test.conf"); + File pipeConfig = new File("target/classes/pipe-factories.conf"); + File testConfig = new File("target/test-classes/data/normal-test.conf"); files.add(testConfig.toURI().toURL()); files.add(pipeConfig.toURI().toURL()); List<IPipeFactory> pipeFactories = PipeFactoryLoader.mergeFiles(files);