From b89780bddb7315eb4b90c5964ab681880b3d37b8 Mon Sep 17 00:00:00 2001
From: "R.W.Majeed" <raphael@majeed.de>
Date: Wed, 24 Jun 2015 22:37:31 +0200
Subject: [PATCH] Moved examples directories to top level of modules
---
HIStream-SKOS/{src/main => }/examples/euripfnet.ttl | 0
HIStream-SKOS/{src/main => }/examples/skos-cda.ttl | 0
HIStream-SKOS/{src/main => }/examples/skos-i2b2.ttl | 0
HIStream-SKOS/{src/main => }/examples/skos-i2b2.txt | 0
HIStream-SKOS/{src/main => }/examples/test-ontology.ttl | 0
.../java/de/sekmi/histream/ontology/skos/OntologyTest.java | 4 ++--
.../{src/main => }/examples/i2b2-ont-import.properties | 0
HIStream-i2b2/examples/skos-ontology.properties | 2 ++
HIStream-i2b2/src/main/examples/skos-ontology.properties | 2 --
HIStream-i2b2/src/test/java/de/sekmi/histream/i2b2/Demo.java | 2 +-
.../src/test/java/de/sekmi/histream/i2b2/DemoInsert.java | 2 +-
distribution/src/assembly/full.xml | 2 +-
distribution/src/assembly/i2b2.xml | 2 +-
histream-core/{src/main => }/examples/dwh-eav.xml | 0
histream-core/{src/main => }/examples/dwh-flat.txt | 0
histream-core/{src/main => }/examples/histream.xml | 0
.../src/test/java/de/sekmi/histream/TestLoadConfig.java | 2 +-
.../de/sekmi/histream/impl/FileObservationProviderTest.java | 4 ++--
18 files changed, 11 insertions(+), 11 deletions(-)
rename HIStream-SKOS/{src/main => }/examples/euripfnet.ttl (100%)
rename HIStream-SKOS/{src/main => }/examples/skos-cda.ttl (100%)
rename HIStream-SKOS/{src/main => }/examples/skos-i2b2.ttl (100%)
rename HIStream-SKOS/{src/main => }/examples/skos-i2b2.txt (100%)
rename HIStream-SKOS/{src/main => }/examples/test-ontology.ttl (100%)
rename HIStream-i2b2/{src/main => }/examples/i2b2-ont-import.properties (100%)
create mode 100644 HIStream-i2b2/examples/skos-ontology.properties
delete mode 100644 HIStream-i2b2/src/main/examples/skos-ontology.properties
rename histream-core/{src/main => }/examples/dwh-eav.xml (100%)
rename histream-core/{src/main => }/examples/dwh-flat.txt (100%)
rename histream-core/{src/main => }/examples/histream.xml (100%)
diff --git a/HIStream-SKOS/src/main/examples/euripfnet.ttl b/HIStream-SKOS/examples/euripfnet.ttl
similarity index 100%
rename from HIStream-SKOS/src/main/examples/euripfnet.ttl
rename to HIStream-SKOS/examples/euripfnet.ttl
diff --git a/HIStream-SKOS/src/main/examples/skos-cda.ttl b/HIStream-SKOS/examples/skos-cda.ttl
similarity index 100%
rename from HIStream-SKOS/src/main/examples/skos-cda.ttl
rename to HIStream-SKOS/examples/skos-cda.ttl
diff --git a/HIStream-SKOS/src/main/examples/skos-i2b2.ttl b/HIStream-SKOS/examples/skos-i2b2.ttl
similarity index 100%
rename from HIStream-SKOS/src/main/examples/skos-i2b2.ttl
rename to HIStream-SKOS/examples/skos-i2b2.ttl
diff --git a/HIStream-SKOS/src/main/examples/skos-i2b2.txt b/HIStream-SKOS/examples/skos-i2b2.txt
similarity index 100%
rename from HIStream-SKOS/src/main/examples/skos-i2b2.txt
rename to HIStream-SKOS/examples/skos-i2b2.txt
diff --git a/HIStream-SKOS/src/main/examples/test-ontology.ttl b/HIStream-SKOS/examples/test-ontology.ttl
similarity index 100%
rename from HIStream-SKOS/src/main/examples/test-ontology.ttl
rename to HIStream-SKOS/examples/test-ontology.ttl
diff --git a/HIStream-SKOS/src/test/java/de/sekmi/histream/ontology/skos/OntologyTest.java b/HIStream-SKOS/src/test/java/de/sekmi/histream/ontology/skos/OntologyTest.java
index ea995c52..e4438898 100644
--- a/HIStream-SKOS/src/test/java/de/sekmi/histream/ontology/skos/OntologyTest.java
+++ b/HIStream-SKOS/src/test/java/de/sekmi/histream/ontology/skos/OntologyTest.java
@@ -20,7 +20,7 @@ public class OntologyTest {
@Before
public void setupOntology()throws Exception{
- store = new Store(new File("src/main/examples/test-ontology.ttl"));
+ store = new Store(new File("examples/test-ontology.ttl"));
}
@Test
@@ -84,7 +84,7 @@ public class OntologyTest {
}
public static void main(String[] args) throws Exception{
- try( Store store = new Store(new File("src/main/examples/test-ontology.n3")) ){
+ try( Store store = new Store(new File("examples/test-ontology.ttl")) ){
store.printConceptHierarchy();
Concept c = store.getConceptByNotation("Type");
diff --git a/HIStream-i2b2/src/main/examples/i2b2-ont-import.properties b/HIStream-i2b2/examples/i2b2-ont-import.properties
similarity index 100%
rename from HIStream-i2b2/src/main/examples/i2b2-ont-import.properties
rename to HIStream-i2b2/examples/i2b2-ont-import.properties
diff --git a/HIStream-i2b2/examples/skos-ontology.properties b/HIStream-i2b2/examples/skos-ontology.properties
new file mode 100644
index 00000000..648d8e92
--- /dev/null
+++ b/HIStream-i2b2/examples/skos-ontology.properties
@@ -0,0 +1,2 @@
+ontology.class = de.sekmi.histream.ontology.skos.Store
+rdf.file.1 = ../histream-skos/examples/test-ontology.ttl
diff --git a/HIStream-i2b2/src/main/examples/skos-ontology.properties b/HIStream-i2b2/src/main/examples/skos-ontology.properties
deleted file mode 100644
index db81411e..00000000
--- a/HIStream-i2b2/src/main/examples/skos-ontology.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-ontology.class = de.sekmi.histream.ontology.skos.Store
-rdf.file.1 = ../histream-skos/src/main/examples/test-ontology.ttl
diff --git a/HIStream-i2b2/src/test/java/de/sekmi/histream/i2b2/Demo.java b/HIStream-i2b2/src/test/java/de/sekmi/histream/i2b2/Demo.java
index c1352ba1..829f4224 100644
--- a/HIStream-i2b2/src/test/java/de/sekmi/histream/i2b2/Demo.java
+++ b/HIStream-i2b2/src/test/java/de/sekmi/histream/i2b2/Demo.java
@@ -12,6 +12,6 @@ public class Demo {
public static void main(String args[]) throws Exception{
- Import.main(new String[]{"../HIStream-i2b2/src/main/examples/skos-ontology.properties","../HIStream-i2b2/src/main/examples/i2b2-ont-import.properties"});
+ Import.main(new String[]{"../HIStream-i2b2/examples/skos-ontology.properties","../HIStream-i2b2/examples/i2b2-ont-import.properties"});
}
}
diff --git a/HIStream-i2b2/src/test/java/de/sekmi/histream/i2b2/DemoInsert.java b/HIStream-i2b2/src/test/java/de/sekmi/histream/i2b2/DemoInsert.java
index 975a55c1..724d6533 100644
--- a/HIStream-i2b2/src/test/java/de/sekmi/histream/i2b2/DemoInsert.java
+++ b/HIStream-i2b2/src/test/java/de/sekmi/histream/i2b2/DemoInsert.java
@@ -15,7 +15,7 @@ public class DemoInsert {
public static void main(String[] args) throws Exception {
String[] files = new String[1];
files[0] = "c:/temp/dzl/eurIPF.txt";
- files[0] = "../histream-core/src/main/examples/dwh-flat.txt";
+ files[0] = "../histream-core/examples/dwh-flat.txt";
RunConfiguration.readFiles(new File("c:/temp/dzl/histream.xml"),files);
}
diff --git a/distribution/src/assembly/full.xml b/distribution/src/assembly/full.xml
index 9e903b61..397d2426 100644
--- a/distribution/src/assembly/full.xml
+++ b/distribution/src/assembly/full.xml
@@ -28,7 +28,7 @@
<fileSets>
<fileSet>
<outputDirectory>examples</outputDirectory>
- <directory>src/main/examples</directory>
+ <directory>examples</directory>
</fileSet>
</fileSets>
</sources>
diff --git a/distribution/src/assembly/i2b2.xml b/distribution/src/assembly/i2b2.xml
index ebba33ab..37b91b7a 100644
--- a/distribution/src/assembly/i2b2.xml
+++ b/distribution/src/assembly/i2b2.xml
@@ -26,7 +26,7 @@
<fileSets>
<fileSet>
<outputDirectory>examples</outputDirectory>
- <directory>src/main/examples</directory>
+ <directory>examples</directory>
</fileSet>
</fileSets>
</sources>
diff --git a/histream-core/src/main/examples/dwh-eav.xml b/histream-core/examples/dwh-eav.xml
similarity index 100%
rename from histream-core/src/main/examples/dwh-eav.xml
rename to histream-core/examples/dwh-eav.xml
diff --git a/histream-core/src/main/examples/dwh-flat.txt b/histream-core/examples/dwh-flat.txt
similarity index 100%
rename from histream-core/src/main/examples/dwh-flat.txt
rename to histream-core/examples/dwh-flat.txt
diff --git a/histream-core/src/main/examples/histream.xml b/histream-core/examples/histream.xml
similarity index 100%
rename from histream-core/src/main/examples/histream.xml
rename to histream-core/examples/histream.xml
diff --git a/histream-core/src/test/java/de/sekmi/histream/TestLoadConfig.java b/histream-core/src/test/java/de/sekmi/histream/TestLoadConfig.java
index da74a487..75f9996a 100644
--- a/histream-core/src/test/java/de/sekmi/histream/TestLoadConfig.java
+++ b/histream-core/src/test/java/de/sekmi/histream/TestLoadConfig.java
@@ -33,7 +33,7 @@ public class TestLoadConfig {
@Test
public void loadNewConfig(){
- Configuration config = Configuration.fromFile(new File("src/main/examples/histream.xml"));
+ Configuration config = Configuration.fromFile(new File("examples/histream.xml"));
Assert.assertNotNull(config);
Assert.assertEquals(5, config.getPlugins().length);
Assert.assertEquals(1, config.getDestinations().length);
diff --git a/histream-core/src/test/java/de/sekmi/histream/impl/FileObservationProviderTest.java b/histream-core/src/test/java/de/sekmi/histream/impl/FileObservationProviderTest.java
index beeaf86d..bb3aeb41 100644
--- a/histream-core/src/test/java/de/sekmi/histream/impl/FileObservationProviderTest.java
+++ b/histream-core/src/test/java/de/sekmi/histream/impl/FileObservationProviderTest.java
@@ -155,14 +155,14 @@ public class FileObservationProviderTest {
@Test
public void testStAXReader() throws Exception {
- ObservationSupplier xos = new XMLObservationSupplier(factory, new FileInputStream("src/main/examples/dwh-eav.xml"));
+ ObservationSupplier xos = new XMLObservationSupplier(factory, new FileInputStream("examples/dwh-eav.xml"));
StreamSupport.stream(AbstractObservationParser.nonNullSpliterator(xos), false).forEach(handler);
handler.finish();
}
@Test
public void testFlatReader() throws Exception {
- ObservationSupplier s = new FlatObservationSupplier(factory, new FileInputStream("src/main/examples/dwh-flat.txt"));
+ ObservationSupplier s = new FlatObservationSupplier(factory, new FileInputStream("examples/dwh-flat.txt"));
StreamSupport.stream(AbstractObservationParser.nonNullSpliterator(s), false).forEach(handler);
handler.finish();
}
--
GitLab