Set distinct names for deployed matcher and tracker jar-with-dependencies files

README.md

@@ -338,17 +338,17 @@ limitations under the License.
 _The following dependencies are linked only dynamically in the Java source of Barefoot. They can be resolved usually automatically with Maven. For details, see [NOTICE.txt](NOTICE.txt)._
 
 * ESRI Geometry API, 1.1, Apache-2.0 ([https://github.com/Esri/geometry-api-java](https://github.com/Esri/geometry-api-java))
- * Java, JSON 20090211 (see below)
- * Jackson, 1.9.12, Apache-2.0 ([https://github.com/FasterXML/jackson-core](https://github.com/FasterXML/jackson-core))
+  * Java, JSON 20090211 (see below)
+  * Jackson, 1.9.12, Apache-2.0 ([https://github.com/FasterXML/jackson-core](https://github.com/FasterXML/jackson-core))
 * GeographicLib-Java, 1.46, MIT License ([http://geographiclib.sourceforge.net/](http://geographiclib.sourceforge.net/))
 * Java JSON, 20090211, MIT License with extra clause "The Software shall be used for Good, not Evil." ([http://www.json.org](http://www.json.org))
 * PostgreSQL JDBC, 9.2-1003-jdbc4, BSD 3-Clause ([http://jdbc.postgresql.org/about/license.html](http://jdbc.postgresql.org/about/license.html))
 * JUnit, 4.11, CPL-1.0 ([https://github.com/junit-team/junit](https://github.com/junit-team/junit))
- * Hamcrest, 1.3, BSD 3-Clause ([https://github.com/hamcrest/JavaHamcrest](https://github.com/hamcrest/JavaHamcrest))
+  * Hamcrest, 1.3, BSD 3-Clause ([https://github.com/hamcrest/JavaHamcrest](https://github.com/hamcrest/JavaHamcrest))
 * SLF4J, 1.7.10, MIT License ([http://slf4j.org](http://slf4j.org))
 * Logback, 1.0.9, LGPL-2.1 ([http://logback.qos.ch](http://logback.qos.ch/))
- * SLF4J, 1.7.10 (see above)
- * Logback core, 1.0.9, LGPL-2.1 ([http://logback.qos.ch](http://logback.qos.ch/))
+  * SLF4J, 1.7.10 (see above)
+  * Logback core, 1.0.9, LGPL-2.1 ([http://logback.qos.ch](http://logback.qos.ch/))
 * JeroMQ, 0.3.5, LGPL-3.0 ([https://github.com/zeromq/jeromq](https://github.com/zeromq/jeromq))
 
 #### Barefoot map
@@ -372,12 +372,12 @@ _The following dependencies are linked only dynamically in the Python source of
 * NumPy 'numpy', BSD 3-Clause ([http://www.numpy.org/](http://www.numpy.org/))
 * GDAL OGR 'osgeo.ogr' 1.10, MIT License ([http://trac.osgeo.org/gdal/wiki/GdalOgrInPython](http://trac.osgeo.org/gdal/wiki/GdalOgrInPython))
 * Python Standard Library 2.7.3, Python License ([https://docs.python.org/2/license.html](https://docs.python.org/2/license.html))
- * 'os' ([https://docs.python.org/2/library/os.html](https://docs.python.org/2/library/os.html))
- * 'optparse' ([https://docs.python.org/2/library/optparse.html](https://docs.python.org/2/library/optparse.html))
- * 'getpass' ([https://docs.python.org/2/library/getpass.html](https://docs.python.org/2/library/getpass.html))
- * 'binascii' ([https://docs.python.org/2/library/binascii.html](https://docs.python.org/2/library/binascii.html))
- * 'json' ([https://docs.python.org/2/library/json.html](https://docs.python.org/2/library/json.html))
- * 'unittest' ([https://docs.python.org/2/library/unittest.html](https://docs.python.org/2/library/unittest.html))
+  * 'os' ([https://docs.python.org/2/library/os.html](https://docs.python.org/2/library/os.html))
+  * 'optparse' ([https://docs.python.org/2/library/optparse.html](https://docs.python.org/2/library/optparse.html))
+  * 'getpass' ([https://docs.python.org/2/library/getpass.html](https://docs.python.org/2/library/getpass.html))
+  * 'binascii' ([https://docs.python.org/2/library/binascii.html](https://docs.python.org/2/library/binascii.html))
+  * 'json' ([https://docs.python.org/2/library/json.html](https://docs.python.org/2/library/json.html))
+  * 'unittest' ([https://docs.python.org/2/library/unittest.html](https://docs.python.org/2/library/unittest.html))
 
 #### Barefoot utilities
 

misc/tudd/sachsen.properties

@@ -0,0 +1,7 @@
+host=localhost
+port=5432
+database=sachsen
+table=bfmap_ways
+user=osmuser
+password=pass
+road-types=./map/tools/road-types.json

misc/tuwien/trace.csv

@@ -0,0 +1,39 @@
+lat, lng, time,
+48.2805491, 16.4110448, 1403187984,
+48.2802468, 16.411629, 1403187994,
+48.2801251, 16.4130299, 1403188004,
+48.2800455, 16.4143727, 1403188014,
+48.2799683, 16.4154973, 1403188024,
+48.2796712, 16.4157352, 1403188034,
+48.2794168, 16.4158302, 1403188044,
+48.2793761, 16.4159371, 1403188054,
+48.2793385, 16.4162423, 1403188074,
+48.2792753, 16.4174071, 1403188084,
+48.2792105, 16.418744, 1403188094,
+48.2791001, 16.4195392, 1403188104,
+48.2787969, 16.4202128, 1403188114,
+48.2788872, 16.4212985, 1403188124,
+48.2795023, 16.4215505, 1403188134,
+48.2797339, 16.4220613, 1403188144,
+48.2796957, 16.4235123, 1403188154,
+48.2796373, 16.42482, 1403188164,
+48.2790854, 16.4245696, 1403188174,
+48.2783451, 16.4239898, 1403188184,
+48.2775289, 16.4232629, 1403188194,
+48.2766941, 16.4225776, 1403188204,
+48.275991, 16.4218388, 1403188214,
+48.2761468, 16.4205997, 1403188224,
+48.2763509, 16.4190553, 1403188235,
+48.2764846, 16.417606, 1403188245,
+48.2766317, 16.4163046, 1403188255,
+48.2767482, 16.4154751, 1403188265,
+48.2773926, 16.4155935, 1403188275,
+48.2776679, 16.4156256, 1403188285,
+48.277687, 16.4156105, 1403188295,
+48.2777399, 16.415627, 1403188345,
+48.2778332, 16.4156264, 1403188355,
+48.2779843, 16.4157265, 1403188365,
+48.2781168, 16.4157174, 1403188375,
+48.2782739, 16.4157628, 1403188385,
+48.2782874, 16.4157274, 1403188395,
+48.2783682, 16.4156959, 1403188405,

pom.xml

@@ -16,16 +16,6 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<mainClass>com.bmwcarit.barefoot.matcher.ServerControl</mainClass>
-						</manifest>
-					</archive>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
-				</configuration>
 				<executions>
 					<execution>
 						<id>barefoot-matcher</id>
@@ -34,7 +24,9 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<finalName>${project.build.finalName}-matcher</finalName>
+							<descriptors>
+								<descriptor>src/assembly/matcher.xml</descriptor>
+							</descriptors>
 							<archive>
 								<manifest>
 									<mainClass>com.bmwcarit.barefoot.matcher.ServerControl</mainClass>
@@ -49,7 +41,9 @@
 							<goal>single</goal>
 						</goals>
 						<configuration>
-							<finalName>${project.build.finalName}-tracker</finalName>
+							<descriptors>
+								<descriptor>src/assembly/tracker.xml</descriptor>
+							</descriptors>
 							<archive>
 								<manifest>
 									<mainClass>com.bmwcarit.barefoot.tracker.TrackerControl</mainClass>

src/assembly/matcher.xml

@@ -0,0 +1,12 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>matcher-jar-with-dependencies</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <componentDescriptors>
+        <componentDescriptor>src/assembly/with-dependencies.xml</componentDescriptor>
+    </componentDescriptors>
+</assembly>

src/assembly/tracker.xml

@@ -0,0 +1,12 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>tracker-jar-with-dependencies</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <componentDescriptors>
+        <componentDescriptor>src/assembly/with-dependencies.xml</componentDescriptor>
+    </componentDescriptors>
+</assembly>

src/assembly/with-dependencies.xml

@@ -0,0 +1,10 @@
+<component>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+</component>