Skip to content

Commit

Permalink
Fixed #6
Browse files Browse the repository at this point in the history
  • Loading branch information
drmalex07 committed Jun 14, 2014
1 parent 8f6b5ea commit 04f2b35
Show file tree
Hide file tree
Showing 11 changed files with 148 additions and 69 deletions.
20 changes: 15 additions & 5 deletions debian/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,28 @@ If the command fails, complaining about missing dependencies, install them throu

apt-get install -f

We can see the full package description (along with all its dependencies):

dpkg -I triplegeo_1.0-3_amd64.deb

### Run triplegeo from shell

All methods to invoke _triplegeo_ that are described in the generic case, also apply here. Additionaly,
the .deb package ships with a wrapper shell (bash) script that hides some of the impractical java details.
the .deb package ships with a wrapper shell (bash) script that hides some of the java implementation details.

For example:
For example, invoke _triplegeo_ on a shapefile (SHP):

triplegeo.sh run-on-shp path/to/shp-options.conf
triplegeo.sh shp path/to/shp-options.conf

or on KML file:

triplegeo.sh kml path/to/sample.kml

Get the description of recognized arguments:
Get help on supported sub-commands (call without arguments):

triplegeo.sh help
triplegeo.sh

Get help on a specific command:

triplegeo.sh gml

87 changes: 72 additions & 15 deletions debian/additions/triplegeo.sh
Original file line number Diff line number Diff line change
@@ -1,23 +1,80 @@
#!/bin/bash

cd /usr/lib/triplegeo

command=${1}
config_file=${2}

if test "${command}" == "run-on-shp"
then
runnable_class=eu.geoknow.athenarc.triplegeo.ShpToRdf
elif test "${command}" == "run-on-rdb"
then
runnable_class=eu.geoknow.athenarc.triplegeo.wkt.RdbToRdf
else
echo "Usage: ${0} <command> <config-file>"
echo " <command> one of {help,run-on-shp,run-on-rdb}"
echo " <config-file> ini-style configuration file"
exit 0
fi
classpath='./lib/triplegeo.jar:/usr/share/java/*:./lib/vendor/*'

classpath='/usr/share/java/triplegeo.jar:/usr/share/java/*:/usr/share/java/triplegeo/vendor/lib/*'
jvm_args='-Xms2048m'

java -Xms2048m -cp "${classpath}" ${runnable_class} ${config_file}
case "${command}" in
shp)
main_class=eu.geoknow.athenarc.triplegeo.ShpToRdf
config_file=${2}
if test -z "${config_file}"; then
echo "Convert a shapefile (SHP) into RDF"
echo
echo "Usage: ${0} ${command} <config-file>"
else
java ${jvm_args} -cp "${classpath}" ${main_class} ${config_file}
fi
;;
rdb)
main_class=eu.geoknow.athenarc.triplegeo.wkt.RdbToRdf
config_file=${2}
if test -z "${config_file}"; then
echo "Convert a relational table (RDB) into RDF"
echo
echo "Usage: ${0} ${command} <config-file>"
else
java ${jvm_args} -cp "${classpath}" ${main_class} ${config_file}
fi
;;
gml)
main_class=eu.geoknow.athenarc.triplegeo.GmlToRdf
input_file=${2}
output_file=${3}
if test -z "${input_file}"; then
echo "Convert a GML file into RDF"
echo
echo "Usage: ${0} ${command} <input-file> [<output-file>]"
else
test -z "${output_file}" && output_file=/tmp/$(basename ${input_file}).rdf
java ${jvm_args} -cp "${classpath}" ${main_class} ${input_file} ${output_file}
fi
;;
kml)
main_class=eu.geoknow.athenarc.triplegeo.KmlToRdf
input_file=${2}
output_file=${3}
if test -z "${input_file}"; then
echo "Convert a KML file into RDF"
echo
echo "Usage: ${0} ${command} <input-file> [<output-file>]"
else
test -z "${output_file}" && output_file=/tmp/$(basename ${input_file}).rdf
java ${jvm_args} -cp "${classpath}" ${main_class} ${input_file} ${output_file}
fi
;;
inspire)
main_class=eu.geoknow.athenarc.triplegeo.InspireToRdf
input_file=${2}
output_file=${3}
if test -z "${input_file}"; then
echo "Convert an INSPIRE-aligned XML file into RDF"
echo
echo "Usage: ${0} ${command} <input-file> [<output-file>]"
else
test -z "${output_file}" && output_file=/tmp/$(basename ${input_file}).rdf
java ${jvm_args} -cp "${classpath}" ${main_class} ${input_file} ${output_file}
fi
;;
*)
echo "Usage: ${0} <command> <args>"
echo " <command> one of {shp,rdb,gml,kml,inspire}"
echo " <args> command-specific args"
;;
esac

exit 0
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
triplegeo (1.1-1) UNRELEASED; urgency=low

* Packaged new upstream release (1.1)
* Changed install prefix (/usr/lib/triplegeo)

-- Michail Alexakis <[email protected]> Sat, 14 Jun 2014 18:02:15 +0300

triplegeo (1.0-3.2) ldstack-nightly; urgency=low

* Minor configuration changes before upload
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8), default-jdk, ant, libjts-java

Package: triplegeo
Architecture: any
Depends: default-jdk, libhsqldb-java, liblog4j1.2-java, libcommons-pool-java, libcommons-lang-java, libcommons-httpclient-java, libcommons-logging-java, libcommons-io-java, libcommons-jxpath-java, libcommons-dbcp-java, libcommons-collections-java, libcommons-beanutils-java, libcommons-codec-java, libxpp3-java, libicu4j-java, liblucene2-java, libmysql-java, libxalan2-java, libjaxp1.3-java, libbsf-java, libxsltc-java, libxerces2-java, libjcommon-java, libstax-java, libjdom1-java, libvecmath-java, libjfreechart-java, libavalon-framework-java, libbatik-java, libxmlgraphics-commons-java, libmiglayout-java, libjts-java, libslf4j-java, ${misc:Depends}
Depends: default-jdk, libhsqldb-java, liblog4j1.2-java, libcommons-pool-java, libcommons-lang-java, libcommons-httpclient-java, libcommons-logging-java, libcommons-io-java, libcommons-jxpath-java, libcommons-dbcp-java, libcommons-collections-java, libcommons-beanutils-java, libcommons-codec-java, libxpp3-java, libicu4j-java, liblucene2-java, libmysql-java, libxalan2-java, libjaxp1.3-java, libbsf-java, libxsltc-java, libxerces2-java, libjcommon-java, libstax-java, libjdom1-java, libvecmath-java, libjfreechart-java, libavalon-framework-java, libbatik-java, libxmlgraphics-commons-java, libmiglayout-java, libjts-java, ${misc:Depends}
Description: An open-source tool for extracting geospatial features into RDF triples
TripleGeo is a utility developed by the Institute for the Management of Information Systems at Athena Research Center under the EU/FP7 project GeoKnow:
Making the Web an Exploratory for Geospatial Knowledge.
Expand Down
2 changes: 1 addition & 1 deletion debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

echo " == Running post-install hooks on triplegeo (command=${1}) == "
echo "Running post-install hooks on triplegeo"

#DEBHELPER#

Expand Down
2 changes: 1 addition & 1 deletion debian/postrm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

echo " == Running post-remove hooks on triplegeo (command=${1}) == "
echo "Running post-remove hooks on triplegeo"

#DEBHELPER#

Expand Down
2 changes: 1 addition & 1 deletion debian/preinst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

echo " == Running pre-install hooks on triplegeo (command=${1}) == "
echo "Running pre-install hooks on triplegeo"

#DEBHELPER#

Expand Down
2 changes: 1 addition & 1 deletion debian/prerm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

echo " == Running pre-remove hooks on triplegeo (command=${1}) == "
echo "Running pre-remove hooks on triplegeo"

#DEBHELPER#

Expand Down
75 changes: 39 additions & 36 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,44 @@ override_dh_auto_build:
# The subtree under $$(pwd)/debian/triplegeo will be verbatim copied to the target system
#

override_dh_auto_install:
install -m 0644 $$(pwd)/build/jars/triplegeo.jar $$(pwd)/debian/triplegeo/usr/share/java/
install -m 0644 $$(pwd)/lib/picocontainer-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/arq-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/imageio-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/gt-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/jena-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/geoapi-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/geodb-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/net.opengis*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/jai_*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/iri-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/mysql-connector-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/tdb-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/postgis-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/postgresql-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/junit-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/eastwood-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/ecore-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/fop-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/h2-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/hatbox-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/json-simple-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/jsqlparser-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/jsr-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/ojdbc6.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/orai18n.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/org.w3.*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/sqlite-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/wstx-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/xsd-*.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0644 $$(pwd)/lib/saxon9he.jar $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/vendor/lib
install -m 0755 $$(pwd)/debian/additions/triplegeo.sh $$(pwd)/debian/triplegeo/usr/bin
install -m 0644 $$(pwd)/test/data/* $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/test/data
install -m 0644 $$(pwd)/test/conf/* $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/test/conf
install -m 0644 $$(pwd)/xslt/* $$(pwd)/debian/triplegeo/usr/share/java/triplegeo/xslt
STAGE_DIR := $$(pwd)/debian/triplegeo/usr/lib/triplegeo

override_dh_auto_install:
install -m 0644 $$(pwd)/build/jars/triplegeo.jar $(STAGE_DIR)/lib/triplegeo.jar
install -m 0644 $$(pwd)/lib/slf4j-log4j12-1.5.8.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/slf4j-api-1.5.8.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/picocontainer-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/arq-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/imageio-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/gt-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/jena-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/geoapi-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/geodb-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/net.opengis*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/jai_*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/iri-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/mysql-connector-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/tdb-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/postgis-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/postgresql-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/junit-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/eastwood-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/ecore-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/fop-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/h2-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/hatbox-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/json-simple-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/jsqlparser-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/jsr-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/ojdbc6.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/orai18n.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/org.w3.*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/sqlite-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/wstx-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/xsd-*.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/lib/saxon9he.jar $(STAGE_DIR)/lib/vendor
install -m 0644 $$(pwd)/test/data/* $(STAGE_DIR)/test/data
install -m 0644 $$(pwd)/test/conf/* $(STAGE_DIR)/test/conf
install -m 0644 $$(pwd)/xslt/* $(STAGE_DIR)/xslt
install -m 0755 $$(pwd)/debian/additions/triplegeo.sh $(STAGE_DIR)/bin/triplegeo.sh

17 changes: 9 additions & 8 deletions debian/triplegeo.dirs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
usr/bin
usr/share
usr/share/java
usr/share/java/triplegeo/xslt
usr/share/java/triplegeo/vendor/lib
usr/share/java/triplegeo/test/conf
usr/share/java/triplegeo/test/data

usr/lib/
usr/lib/triplegeo
usr/lib/triplegeo/bin
usr/lib/triplegeo/xslt
usr/lib/triplegeo/lib
usr/lib/triplegeo/lib/vendor
usr/lib/triplegeo/test
usr/lib/triplegeo/test/data
usr/lib/triplegeo/test/conf
1 change: 1 addition & 0 deletions debian/triplegeo.links
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/usr/lib/triplegeo/bin/triplegeo.sh /usr/bin/triplegeo.sh

0 comments on commit 04f2b35

Please sign in to comment.