diff --git a/build.gradle b/build.gradle
index 41b4755d225bc28563ea4304e4c93c6397d3af16..fbf8e2b65a5eb6dc4bc293b88627f8c63d1b6838 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,8 @@ def getDate() {
ext {
defaultVersion = '0.3-SNAPSHOT'
isRelease = false
- vagrantDirString = System.properties['user.home'] + '/vagrantboxes/' + project.name.toLowerCase()
+// vagrantDirString = System.properties['user.home'] + '/vagrantboxes/' + project.name.toLowerCase()
+ vagrantDirString = '/media/data/VMs/vagrantboxes/' + project.name.toLowerCase()
vagrantDir = file("$vagrantDirString")
}
@@ -75,7 +76,9 @@ dependencies {
exclude(module: 'jetty-client')
}
compile group: 'org.json', name: 'json', version:'20131018'
- compile group: 'org.postgis', name: 'postgis-jdbc', version:'1.3.3'
+ compile(group: 'org.postgis', name: 'postgis-jdbc', version:'1.3+') {
+ exclude(module: 'postgis-stubs')
+ }
testCompile 'org.testng:testng:6+'
}
@@ -213,7 +216,7 @@ task vagrantPrepare << {
into vagrantDir
filter(FixCrLfFilter)
- filter(ReplaceTokens, tokens: [db_username: 'niko', db_password: 'secretPhdPassword#2013!'])
+ filter(ReplaceTokens, tokens: [db_username: 'niko', db_password: 'secretPhdPassword#2013!', shared_conf_dir: '/vagrant/conf'])
}
}
diff --git a/etc/geoserver_config/styles/StyleEdge.xml b/etc/geoserver_config/styles/StyleEdge.xml
deleted file mode 100644
index 67dda4d3bda1c1548c04a26894c98adeae80ac74..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/styles/StyleEdge.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7fe9</id>
- <name>StyleEdge</name>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>StyleEdge.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/styles/StyleEdgeExpiration.xml b/etc/geoserver_config/styles/StyleEdgeExpiration.xml
deleted file mode 100644
index 73ba129c4eb1f5f5dbba8a184532996da4c61124..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/styles/StyleEdgeExpiration.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
- <id>StyleInfoImpl--2d6a5797:13f61cf1d96:-7a6e</id>
- <name>StyleEdgeExpiration</name>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>StyleEdgeExpiration.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/styles/StyleIsoCoverage.xml b/etc/geoserver_config/styles/StyleIsoCoverage.xml
deleted file mode 100644
index 0bb335cd5b613e902317e05fe00c6d17a61f30d0..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/styles/StyleIsoCoverage.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7fd3</id>
- <name>StyleIsoCoverage</name>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>StyleIsoCoverage.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/styles/StyleTransportationStations.xml b/etc/geoserver_config/styles/StyleTransportationStations.xml
deleted file mode 100644
index 330ec7bf6f07e8fe11436b828c461e554eaa1b26..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/styles/StyleTransportationStations.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7ff1</id>
- <name>StyleTransportationStations</name>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>StyleTransportationStations.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/styles/StyleVertexExpiration.xml b/etc/geoserver_config/styles/StyleVertexExpiration.xml
deleted file mode 100644
index 36d4973fe21893471d4b4bf1ba53c26c399293c3..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/styles/StyleVertexExpiration.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
- <id>StyleInfoImpl--2d6a5797:13f61cf1d96:-7c37</id>
- <name>StyleVertexExpiration</name>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>StyleVertexExpiration.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/styles/poi.png b/etc/geoserver_config/styles/poi.png
deleted file mode 100755
index 45d734f33864b8a3d325907898f885e9c96aeb3b..0000000000000000000000000000000000000000
Binary files a/etc/geoserver_config/styles/poi.png and /dev/null differ
diff --git a/etc/geoserver_config/workspaces/default.xml b/etc/geoserver_config/workspaces/default.xml
deleted file mode 100644
index 416c664e9b687e6258d42e3f7fc488ce49fd8057..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/default.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- <name>iso</name>
-</workspace>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/namespace.xml b/etc/geoserver_config/workspaces/iso/namespace.xml
deleted file mode 100644
index 40d259c86efacf6cd53a77171cc89369eb5d3c3c..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/namespace.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<namespace>
- <id>NamespaceInfoImpl-62a194ec:13f1f1ad116:-7ffe</id>
- <prefix>iso</prefix>
- <uri>http://isochrones.inf.unibz.it</uri>
-</namespace>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/featuretype.xml b/etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/featuretype.xml
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/layer.xml b/etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/layer.xml
deleted file mode 100644
index 7895655566eaae0bd03ee253dc2c0596de2ca291..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/pg/bz_iso_edg_g93nl5/layer.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<layer>
- <name>bz_iso_edg_g93nl5</name>
- <id>LayerInfoImpl--7847af3:13f322305ce:-46e2</id>
- <type>VECTOR</type>
- <defaultStyle>
- <id>StyleInfoImpl--570ae188:124761b8d78:-7fe3</id>
- </defaultStyle>
- <resource class="featureType">
- <id>FeatureTypeInfoImpl--7847af3:13f322305ce:-46e3</id>
- </resource>
- <enabled>true</enabled>
- <advertised>true</advertised>
- <queryable>true</queryable>
- <attribution>
- <logoWidth>0</logoWidth>
- <logoHeight>0</logoHeight>
- </attribution>
-</layer>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/pg/datastore.xml b/etc/geoserver_config/workspaces/iso/pg/datastore.xml
deleted file mode 100644
index ba3e2af62c9ebc56442dc71de3d559c0720a7262..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/pg/datastore.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<dataStore>
- <id>DataStoreInfoImpl--1301da3f:13f1f253a02:-8000</id>
- <name>pg</name>
- <type>PostGIS</type>
- <enabled>true</enabled>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <connectionParameters>
- <entry key="port">5432</entry>
- <entry key="Connection timeout">20</entry>
- <entry key="passwd">crypt1:fonaofqAc1GADe6UeQZXg18VRKYJHnx7</entry>
- <entry key="dbtype">postgis</entry>
- <entry key="host">localhost</entry>
- <entry key="validate connections">true</entry>
- <entry key="encode functions">false</entry>
- <entry key="max connections">10</entry>
- <entry key="database">isochrones</entry>
- <entry key="namespace">http://isochrones.inf.unibz.it</entry>
- <entry key="schema">public</entry>
- <entry key="Loose bbox">true</entry>
- <entry key="Expose primary keys">true</entry>
- <entry key="Max open prepared statements">50</entry>
- <entry key="fetch size">1000</entry>
- <entry key="preparedStatements">true</entry>
- <entry key="Estimated extends">true</entry>
- <entry key="user">postgres</entry>
- <entry key="min connections">1</entry>
- </connectionParameters>
- <__default>false</__default>
-</dataStore>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/Buffer.sld b/etc/geoserver_config/workspaces/iso/styles/Buffer.sld
deleted file mode 100644
index 0fac51af2cc6fe438797afb10cc0acc253a154a3..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/styles/Buffer.sld
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc"
- xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
- <NamedLayer>
- <Name>Default Polygon</Name>
- <UserStyle>
- <Title>Default polygon style</Title>
- <Abstract>A sample style that just draws out a solid gray interior with a black 1px outline</Abstract>
- <FeatureTypeStyle>
- <Rule>
- <Title>Polygon</Title>
- <PolygonSymbolizer>
- <Fill>
- <CssParameter name="fill">#AAAAAA</CssParameter>
- <CssParameter name="fill-opacity">0.3</CssParameter>
- </Fill>
- <!--Stroke>
- <CssParameter name="stroke">#000000</CssParameter>
- <CssParameter name="stroke-width">1</CssParameter>
- <CssParameter name="fill-opacity">0.4</CssParameter>
- </Stroke-->
- </PolygonSymbolizer>
- </Rule>
- </FeatureTypeStyle>
- </UserStyle>
- </NamedLayer>
-</StyledLayerDescriptor>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/Buffer.xml b/etc/geoserver_config/workspaces/iso/styles/Buffer.xml
deleted file mode 100644
index a6fc4ee3e1e3a5913c4e7657e63c0adfa0194953..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/styles/Buffer.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7ff2</id>
- <name>Buffer</name>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>Buffer.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.sld b/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.sld
deleted file mode 100644
index 04ab21d0aa15c88ea62d3fe3590fda82ced987f0..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.sld
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc"
- xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
- <NamedLayer>
- <Name>Default Polygon</Name>
- <UserStyle>
- <Title>Default polygon style</Title>
- <Abstract>A sample style that just draws out a solid gray interior with a black 1px outline</Abstract>
- <FeatureTypeStyle>
- <Rule>
- <Title>Polygon</Title>
- <PolygonSymbolizer>
- <Fill>
- <CssParameter name="fill">#AAAAAA</CssParameter>
- <CssParameter name="fill-opacity">0.5</CssParameter>
- </Fill>
- <Stroke>
- <CssParameter name="stroke">#000000</CssParameter>
- <CssParameter name="stroke-width">1</CssParameter>
- <CssParameter name="stroke-opacity">0.9</CssParameter>
- </Stroke>
- </PolygonSymbolizer>
- </Rule>
-
- </FeatureTypeStyle>
- </UserStyle>
- </NamedLayer>
-</StyledLayerDescriptor>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.xml b/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.xml
deleted file mode 100644
index 98c0495bf341fa26a1cfca92a9aa21dc0bbec487..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/styles/Iso_Area_Polygon.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7ff3</id>
- <name>Iso_Area_Polygon</name>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>Iso_Area_Polygon.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.sld b/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.sld
deleted file mode 100644
index 0da04803a0cfec04770f516e655d2ffa3a409971..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.sld
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
- xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <NamedLayer>
- <Name>STYLE_BLACK_BNODES</Name>
- <UserStyle>
- <Name>STYLE_BNODES</Name>
- <Title>Reached bus nodes</Title>
- <Abstract>Generated by GeoServer</Abstract>
- <FeatureTypeStyle>
- <Rule>
- <Name>Large Zoom</Name>
- <Title>Bus Node</Title>
- <Abstract>Abstract</Abstract>
- <MinScaleDenominator>10000</MinScaleDenominator>
- <MaxScaleDenominator>150000</MaxScaleDenominator>
- <PointSymbolizer>
- <Graphic>
- <Mark>
- <WellKnownName>square</WellKnownName>
- <Stroke>
- <CssParameter name="stroke">#000000</CssParameter>
- <CssParameter name="stroke-width">1</CssParameter>
- </Stroke>
- <Fill>
- <CssParameter name="fill">#FFFFFF</CssParameter>
- <CssParameter name="fill-opacity">0.9</CssParameter>
- </Fill>
- </Mark>
- <Opacity>0.9</Opacity>
- <Size>4</Size>
- </Graphic>
- </PointSymbolizer>
- </Rule>
- <Rule>
- <Name>Small Zoom</Name>
- <Title>Bus Node</Title>
- <Abstract>Abstract</Abstract>
- <MaxScaleDenominator>10000</MaxScaleDenominator>
- <PointSymbolizer>
- <Graphic>
- <Mark>
- <WellKnownName>square</WellKnownName>
- <Stroke>
- <CssParameter name="stroke">#000000</CssParameter>
- <CssParameter name="stroke-width">2</CssParameter>
- </Stroke>
- <Fill>
- <CssParameter name="fill">#FFFFFF</CssParameter>
- <CssParameter name="fill-opacity">0.9</CssParameter>
- </Fill>
- </Mark>
- <Opacity>0.9</Opacity>
- <Size>12</Size>
- </Graphic>
- </PointSymbolizer>
- </Rule>
- </FeatureTypeStyle>
- </UserStyle>
- </NamedLayer>
-</StyledLayerDescriptor>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.xml b/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.xml
deleted file mode 100644
index 0f8f3e2352f5acf61adf87bfd80ac4f7bfd47a54..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/styles/STYLE_BLACK_BNODES.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<style>
- <id>StyleInfoImpl-598c7b7:13f2d06bbb1:-7ff4</id>
- <name>STYLE_BLACK_BNODES</name>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <sldVersion>
- <version>1.0.0</version>
- </sldVersion>
- <filename>STYLE_BLACK_BNODES.sld</filename>
-</style>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/wcs.xml b/etc/geoserver_config/workspaces/iso/wcs.xml
deleted file mode 100644
index bd997301cf9eaf89ce5adf6bc8e42cc332da3757..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/wcs.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<wcs>
- <id>WCSInfoImpl--7847af3:13f322305ce:-4ac9</id>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <enabled>true</enabled>
- <name>WCS</name>
- <title>Web Coverage Service</title>
- <maintainer>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10311</maintainer>
- <abstrct>This server implements the WCS specification 1.0 and 1.1.1, it's reference implementation of WCS 1.1.1. All layers published by this service are available on WMS also.
- </abstrct>
- <accessConstraints>NONE</accessConstraints>
- <fees>NONE</fees>
- <versions>
- <org.geotools.util.Version>
- <version>1.0.0</version>
- </org.geotools.util.Version>
- <org.geotools.util.Version>
- <version>1.1.1</version>
- </org.geotools.util.Version>
- <org.geotools.util.Version>
- <version>2.0.1</version>
- </org.geotools.util.Version>
- </versions>
- <keywords>
- <string>WCS</string>
- <string>WMS</string>
- <string>GEOSERVER</string>
- </keywords>
- <metadataLink>
- <type>undef</type>
- <about>http://geoserver.sourceforge.net/html/index.php</about>
- <metadataType>other</metadataType>
- </metadataLink>
- <citeCompliant>false</citeCompliant>
- <onlineResource>http://geoserver.sourceforge.net/html/index.php</onlineResource>
- <schemaBaseURL>http://schemas.opengis.net</schemaBaseURL>
- <verbose>false</verbose>
- <gmlPrefixing>false</gmlPrefixing>
- <latLon>false</latLon>
- <maxInputMemory>0</maxInputMemory>
- <maxOutputMemory>0</maxOutputMemory>
- <subsamplingEnabled>true</subsamplingEnabled>
- <overviewPolicy>IGNORE</overviewPolicy>
-</wcs>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/wfs.xml b/etc/geoserver_config/workspaces/iso/wfs.xml
deleted file mode 100644
index c0815b7bfea872994476fa10312683c766df1ffe..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/wfs.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<wfs>
- <id>WFSInfoImpl--7847af3:13f322305ce:-4ac7</id>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <enabled>true</enabled>
- <name>WFS</name>
- <title>GeoServer Web Feature Service</title>
- <maintainer>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10311</maintainer>
- <abstrct>This is the reference implementation of WFS 1.0.0 and WFS 1.1.0, supports all WFS operations including Transaction.</abstrct>
- <accessConstraints>NONE</accessConstraints>
- <fees>NONE</fees>
- <versions>
- <org.geotools.util.Version>
- <version>1.0.0</version>
- </org.geotools.util.Version>
- <org.geotools.util.Version>
- <version>1.1.0</version>
- </org.geotools.util.Version>
- <org.geotools.util.Version>
- <version>2.0.0</version>
- </org.geotools.util.Version>
- </versions>
- <keywords>
- <string>WFS</string>
- <string>WMS</string>
- <string>GEOSERVER</string>
- </keywords>
- <metadataLink/>
- <citeCompliant>false</citeCompliant>
- <onlineResource>http://geoserver.sourceforge.net/html/index.php</onlineResource>
- <schemaBaseURL>http://schemas.opengis.net</schemaBaseURL>
- <verbose>false</verbose>
- <gml>
- <entry>
- <version>V_10</version>
- <gml>
- <srsNameStyle>XML</srsNameStyle>
- <overrideGMLAttributes>true</overrideGMLAttributes>
- </gml>
- </entry>
- <entry>
- <version>V_20</version>
- <gml>
- <srsNameStyle>URN2</srsNameStyle>
- <overrideGMLAttributes>false</overrideGMLAttributes>
- </gml>
- </entry>
- <entry>
- <version>V_11</version>
- <gml>
- <srsNameStyle>URN</srsNameStyle>
- <overrideGMLAttributes>false</overrideGMLAttributes>
- </gml>
- </entry>
- </gml>
- <serviceLevel>COMPLETE</serviceLevel>
- <maxFeatures>1000000</maxFeatures>
- <featureBounding>false</featureBounding>
- <canonicalSchemaLocation>false</canonicalSchemaLocation>
- <encodeFeatureMember>false</encodeFeatureMember>
-</wfs>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/wms.xml b/etc/geoserver_config/workspaces/iso/wms.xml
deleted file mode 100644
index 3ec8b3c54a883d2ea2d30723149d7a77d9fa2e62..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/wms.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<wms>
- <id>WMSInfoImpl--7847af3:13f322305ce:-4ac8</id>
- <workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- </workspace>
- <enabled>true</enabled>
- <name>WMS</name>
- <title>GeoServer Web Map Service</title>
- <maintainer>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10311</maintainer>
- <abstrct>A compliant implementation of WMS plus most of the SLD extension (dynamic styling). Can also generate PDF, SVG, KML, GeoRSS</abstrct>
- <accessConstraints>NONE</accessConstraints>
- <fees>NONE</fees>
- <versions>
- <org.geotools.util.Version>
- <version>1.1.1</version>
- </org.geotools.util.Version>
- <org.geotools.util.Version>
- <version>1.3.0</version>
- </org.geotools.util.Version>
- </versions>
- <keywords>
- <string>WFS</string>
- <string>WMS</string>
- <string>GEOSERVER</string>
- </keywords>
- <metadataLink/>
- <citeCompliant>false</citeCompliant>
- <onlineResource>http://geoserver.sourceforge.net/html/index.php</onlineResource>
- <schemaBaseURL>http://schemas.opengis.net</schemaBaseURL>
- <verbose>false</verbose>
- <metadata>
- <entry key="svgAntiAlias">true</entry>
- <entry key="svgRenderer">Batik</entry>
- </metadata>
- <bboxForEachCRS>false</bboxForEachCRS>
- <watermark class="org.geoserver.wms.WatermarkInfoImpl">
- <enabled>false</enabled>
- <position>BOT_RIGHT</position>
- <transparency>0</transparency>
- </watermark>
- <interpolation>Nearest</interpolation>
- <maxBuffer>25</maxBuffer>
- <maxRequestMemory>65536</maxRequestMemory>
- <maxRenderingTime>60</maxRenderingTime>
- <maxRenderingErrors>1000</maxRenderingErrors>
-</wms>
\ No newline at end of file
diff --git a/etc/geoserver_config/workspaces/iso/workspace.xml b/etc/geoserver_config/workspaces/iso/workspace.xml
deleted file mode 100644
index 416c664e9b687e6258d42e3f7fc488ce49fd8057..0000000000000000000000000000000000000000
--- a/etc/geoserver_config/workspaces/iso/workspace.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<workspace>
- <id>WorkspaceInfoImpl-62a194ec:13f1f1ad116:-7fff</id>
- <name>iso</name>
-</workspace>
\ No newline at end of file
diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 46ca5cf74e06ee9716e51779f42c6823da967fa2..172a3d30e800790848291a74806bbd776b1ac0fa 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -40,6 +40,7 @@ CACHE_DIR_REMOTE=http://www.krismer.de/files/PhD
DEPLOY_DIR=/opt
DOWNLOAD_DIR=$CACHE_DIR_LOCAL/wget
SHARED_CONF_DIR=/vagrant/conf
+SHARED_IMG_DIR=/vagrant/img
CMAKE_VERSION=2.8.12.1
CMAKE_VERSION_MAIN=v2.8
@@ -172,7 +173,13 @@ fn_import_data()
cp $DOWNLOAD_DIR/$SCHEDULE_FILE $DEPLOY_DIR/$SCHEDULE_FILE > /dev/null 2>&1
echo " - importing schedule into postgis database"
- gunzip -c $DEPLOY_DIR/$SCHEDULE_FILE | sudo -u postgres psql $PG_DB_NAME >> $WORKING_DIR/import_schedule.log 2>&1
+ gunzip -c $DEPLOY_DIR/$SCHEDULE_FILE | PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost $PG_DB_NAME >> $WORKING_DIR/import_schedule.log 2>&1
+
+ echo " - fixing schedule permissions"
+ tables=`PGPASSWORD=$PG_DB_PASSWORD psql -qAt -U $PG_DB_USER -h localhost -c "SELECT tablename FROM pg_tables WHERE schemaname = 'public' AND tableowner = 'postgres';" $PG_DB_NAME`
+ for tbl in $tables ; do
+ PGPASSWORD=$PG_DB_PASSWORD psql -qAt -U $PG_DB_USER -h localhost -c "ALTER TABLE $tbl OWNER TO $PG_DB_USER" $PG_DB_NAME;
+ done
fi
fi
@@ -181,7 +188,7 @@ fn_import_data()
$DEPLOY_DIR/osm2pgrouting/build/osm2pgrouting -file "$DEPLOY_DIR/$OSM_FILE_FILTERED" -conf "$OSM2PGROUTING_MAPPING_CONF" -dbname $PG_DB_NAME -user $PG_DB_USER -passwd $PG_DB_PASSWORD -clean -prefixtables $TABLE_PREFIX >> import_osm2pgrouting.log 2>&1
echo " - creating pgRouting topology"
- sudo -u postgres psql -d $PG_DB_NAME -c "SELECT pgr_createTopology('${TABLE_PREFIX}_ways', $TOPOLOGY_TOLERANCE, 'the_geom', 'gid');" >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost -d $PG_DB_NAME -c "SELECT pgr_createTopology('${TABLE_PREFIX}_ways', $TOPOLOGY_TOLERANCE, 'the_geom', 'gid');" >> $WORKING_DIR/setup_database.log 2>&1
fi
if $INSTALL_NEO4J_SPATIAL; then
@@ -537,14 +544,22 @@ if $INSTALL_POSTGRES; then
sudo -u postgres psql -d $PG_DB_NAME -c "CREATE USER $PG_DB_USER WITH PASSWORD '$PG_DB_PASSWORD';" >> $WORKING_DIR/setup_database.log 2>&1
sudo -u postgres psql -d $PG_DB_NAME -c "ALTER DATABASE $PG_DB_NAME OWNER TO $PG_DB_USER;" >> $WORKING_DIR/setup_database.log 2>&1
sudo -u postgres psql -d $PG_DB_NAME -c "GRANT ALL PRIVILEGES ON DATABASE $PG_DB_NAME to $PG_DB_USER;" >> $WORKING_DIR/setup_database.log 2>&1
+ sudo -u postgres psql -d $PG_DB_NAME -c "ALTER SCHEMA public OWNER TO $PG_DB_USER;" >> $WORKING_DIR/setup_database.log 2>&1
+ sudo -u postgres psql -d $PG_DB_NAME -c "ALTER ROLE $PG_DB_USER SUPERUSER;" >> $WORKING_DIR/setup_database.log 2>&1
fi
if $INSTALL_POSTGIS; then
- sudo -u postgres psql -d $PG_DB_NAME -c "CREATE EXTENSION postgis;" >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost -d $PG_DB_NAME -c "CREATE EXTENSION postgis;" >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost -d $PG_DB_NAME -f $SHARED_CONF_DIR/pg_procedures.sql >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost -d $PG_DB_NAME -f $SHARED_CONF_DIR/srid_82344_insert.sql >> $WORKING_DIR/setup_database.log 2>&1
fi
if $INSTALL_PGROUTING; then
- sudo -u postgres psql -d $PG_DB_NAME -c "CREATE EXTENSION pgRouting;" >> $WORKING_DIR/setup_database.log 2>&1
+ PGPASSWORD=$PG_DB_PASSWORD psql -U $PG_DB_USER -h localhost -d $PG_DB_NAME -c "CREATE EXTENSION pgRouting;" >> $WORKING_DIR/setup_database.log 2>&1
+fi
+
+if $INSTALL_POSTGIS && $INSTALL_GEOSERVER; then
+ echo "82344=`grep ^[^//,^#] /vagrant/conf/srid_82344_wkt.txt | paste -sd "" | sed 's/ \+ / /g'`" >> $DEPLOY_DIR/geoserver/data/user_projections/epsg.properties
fi
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -564,6 +579,9 @@ if $IMPORT_OSMDATA || $IMPORT_OSMDATA_CACHED; then
echo "Configuring geoserver $GEOSERVER_VERSION using geoserver-shell $GEOSERVER_SHELL_VERSION"
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_ws.gs > setup_geoserver_workspace.log 2>&1
+ sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_styles.gs > setup_geoserver_styles.log 2>&1
+ cp $SHARED_IMG_DIR/* $DEPLOY_DIR/geoserver/data/styles >> setup_geoserver_styles.log 2>&1
+
if $INSTALL_NEO4J_SPATIAL; then
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ds.gs > setup_geoserver_neo4j.log 2>&1
sh $DEPLOY_DIR/gs-shell/bin/gs-shell --cmdfile $SHARED_CONF_DIR/geoserver_setup_neo4j_ft_bz.gs >> setup_geoserver_neo4j.log 2>&1
diff --git a/etc/vagrant/conf/geoserver_setup_styles.gs b/etc/vagrant/conf/geoserver_setup_styles.gs
new file mode 100644
index 0000000000000000000000000000000000000000..6f7c828abbe2db8c8bf50aa6ac285a3771e8194d
--- /dev/null
+++ b/etc/vagrant/conf/geoserver_setup_styles.gs
@@ -0,0 +1,7 @@
+geoserver set --url http://localhost:8080/geoserver --user admin --password geoserver
+
+style create --file @shared_conf_dir@/geoserver_style_edge.sld --name StyleEdge
+style create --file @shared_conf_dir@/geoserver_style_edgeexpiration.sld --name StyleEdgeExpiration
+style create --file @shared_conf_dir@/geoserver_style_isocoverage.sld --name StyleIsoCoverage
+style create --file @shared_conf_dir@/geoserver_style_stations.sld --name StyleTransportationStations
+style create --file @shared_conf_dir@/geoserver_style_vertexexpiration.sld --name StyleVertexExpiration
diff --git a/etc/geoserver_config/styles/StyleEdge.sld b/etc/vagrant/conf/geoserver_style_edge.sld
similarity index 100%
rename from etc/geoserver_config/styles/StyleEdge.sld
rename to etc/vagrant/conf/geoserver_style_edge.sld
diff --git a/etc/geoserver_config/styles/StyleEdgeExpiration.sld b/etc/vagrant/conf/geoserver_style_edgeexpiration.sld
similarity index 100%
rename from etc/geoserver_config/styles/StyleEdgeExpiration.sld
rename to etc/vagrant/conf/geoserver_style_edgeexpiration.sld
diff --git a/etc/geoserver_config/styles/StyleIsoCoverage.sld b/etc/vagrant/conf/geoserver_style_isocoverage.sld
similarity index 100%
rename from etc/geoserver_config/styles/StyleIsoCoverage.sld
rename to etc/vagrant/conf/geoserver_style_isocoverage.sld
diff --git a/etc/geoserver_config/styles/StyleTransportationStations.sld b/etc/vagrant/conf/geoserver_style_stations.sld
similarity index 58%
rename from etc/geoserver_config/styles/StyleTransportationStations.sld
rename to etc/vagrant/conf/geoserver_style_stations.sld
index b7557630665938dd778b4acb4469c228ce06db36..09a83bfab398ffc5b51d53c68a1f847a12dc6bbe 100644
--- a/etc/geoserver_config/styles/StyleTransportationStations.sld
+++ b/etc/vagrant/conf/geoserver_style_stations.sld
@@ -20,7 +20,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="tram.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/tram.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -44,7 +44,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="railway.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/railway.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -69,7 +69,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="bus.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/bus.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -94,7 +94,7 @@
<PointSymbolizer>
<Graphic>
<ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="ferry.png" />
+ <OnlineResource xlink:type="simple" xlink:href="file:///vagrant/img/ferry.png" />
<Format>image/png</Format>
</ExternalGraphic>
<Size>
@@ -109,81 +109,6 @@
</ogc:PropertyIsEqualTo>
</ogc:Filter>
</Rule>
- <Rule>
- <Name>Cablecar station</Name>
- <Title>Cablecar stop station</Title>
- <Abstract>Abstract</Abstract>
- <MinScaleDenominator>1000</MinScaleDenominator>
- <MaxScaleDenominator>50000</MaxScaleDenominator>
- <!--MinScaleDenominator>10000</MinScaleDenominator> <MaxScaleDenominator>12000</MaxScaleDenominator -->
- <PointSymbolizer>
- <Graphic>
- <ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="cablecar.png" />
- <Format>image/png</Format>
- </ExternalGraphic>
- <Size>
- <ogc:Literal>12</ogc:Literal>
- </Size>
- </Graphic>
- </PointSymbolizer>
- <ogc:Filter>
- <ogc:PropertyIsEqualTo>
- <ogc:PropertyName>T_TYPE</ogc:PropertyName>
- <ogc:Literal>5</ogc:Literal>
- </ogc:PropertyIsEqualTo>
- </ogc:Filter>
- </Rule>
- <Rule>
- <Name>Gondola station</Name>
- <Title>Gondola stop station</Title>
- <Abstract>Abstract</Abstract>
- <MinScaleDenominator>1000</MinScaleDenominator>
- <MaxScaleDenominator>50000</MaxScaleDenominator>
- <!--MinScaleDenominator>10000</MinScaleDenominator> <MaxScaleDenominator>12000</MaxScaleDenominator -->
- <PointSymbolizer>
- <Graphic>
- <ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="gondola.png" />
- <Format>image/png</Format>
- </ExternalGraphic>
- <Size>
- <ogc:Literal>12</ogc:Literal>
- </Size>
- </Graphic>
- </PointSymbolizer>
- <ogc:Filter>
- <ogc:PropertyIsEqualTo>
- <ogc:PropertyName>T_TYPE</ogc:PropertyName>
- <ogc:Literal>6</ogc:Literal>
- </ogc:PropertyIsEqualTo>
- </ogc:Filter>
- </Rule>
- <Rule>
- <Name>Funicular station</Name>
- <Title>Funicular stop station</Title>
- <Abstract>Abstract</Abstract>
- <MinScaleDenominator>1000</MinScaleDenominator>
- <MaxScaleDenominator>50000</MaxScaleDenominator>
- <!--MinScaleDenominator>10000</MinScaleDenominator> <MaxScaleDenominator>12000</MaxScaleDenominator -->
- <PointSymbolizer>
- <Graphic>
- <ExternalGraphic>
- <OnlineResource xlink:type="simple" xlink:href="funicular.png" />
- <Format>image/png</Format>
- </ExternalGraphic>
- <Size>
- <ogc:Literal>12</ogc:Literal>
- </Size>
- </Graphic>
- </PointSymbolizer>
- <ogc:Filter>
- <ogc:PropertyIsEqualTo>
- <ogc:PropertyName>T_TYPE</ogc:PropertyName>
- <ogc:Literal>7</ogc:Literal>
- </ogc:PropertyIsEqualTo>
- </ogc:Filter>
- </Rule>
</FeatureTypeStyle>
</UserStyle>
</NamedLayer>
diff --git a/etc/geoserver_config/styles/StyleVertexExpiration.sld b/etc/vagrant/conf/geoserver_style_vertexexpiration.sld
similarity index 100%
rename from etc/geoserver_config/styles/StyleVertexExpiration.sld
rename to etc/vagrant/conf/geoserver_style_vertexexpiration.sld
diff --git a/etc/vagrant/conf/pg_procedures.sql b/etc/vagrant/conf/pg_procedures.sql
new file mode 100644
index 0000000000000000000000000000000000000000..814f0dbd0f755ab51e43d97063c7864da3a7c148
--- /dev/null
+++ b/etc/vagrant/conf/pg_procedures.sql
@@ -0,0 +1,25 @@
+CREATE OR REPLACE FUNCTION dropTables(IN _schema TEXT, IN _regexp TEXT)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+ row record;
+BEGIN
+ FOR row IN
+ SELECT
+ table_schema,
+ table_name
+ FROM
+ information_schema.tables
+ WHERE
+ table_type = 'BASE TABLE'
+ AND
+ table_schema = _schema
+ AND
+ table_name ILIKE (_regexp)
+ LOOP
+ EXECUTE 'DROP TABLE ' || quote_ident(row.table_schema) || '.' || quote_ident(row.table_name);
+ RAISE INFO 'Dropped table: %', quote_ident(row.table_schema) || '.' || quote_ident(row.table_name);
+ END LOOP;
+END;
+$$;
diff --git a/etc/vagrant/conf/srid_82344_insert.sql b/etc/vagrant/conf/srid_82344_insert.sql
new file mode 100644
index 0000000000000000000000000000000000000000..57cd607818d0ac1659ec867d3d75b83fe6df1068
--- /dev/null
+++ b/etc/vagrant/conf/srid_82344_insert.sql
@@ -0,0 +1,9 @@
+INSERT into spatial_ref_sys (
+ srid, auth_name, auth_srid, proj4text, srtext
+) values (
+ 82344,
+ 'epsg',
+ 4258,
+ '+title=ETRF_1989_UTM_Zone_32N +proj=utm +zone=32 +ellps=WGS84 +lat_0=0 +lon_0=21.45233333333333 +k=0.999600 +x_0=500000.0 +y_0=0 +pm=greenwich +units=m',
+ 'PROJCS["UTM Zone 32, Northern Hemisphere (WGS 84)", GEOGCS["GCS_ETRF_1989", DATUM["WGS 84", SPHEROID["WGS_1984", 6378137.0, 298.257223563, AUTHORITY["EPSG","7030"]], AUTHORITY["EPSG","62580"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree",0.0174532925199433] AUTHORITY["EPSG","4258"]], PROJECTION["Transverse_Mercator"], PARAMETER["false_easting", 500000.0], PARAMETER["false_northing", 0.0], PARAMETER["central_meridian", 9.0], PARAMETER["scale_factor", 0.9996], PARAMETER["latitude_of_origin", 0.0], UNIT["m",1.0], AUTHORITY["EPSG","82344"]]'
+);
\ No newline at end of file
diff --git a/etc/vagrant/conf/srid_82344_proj4.txt b/etc/vagrant/conf/srid_82344_proj4.txt
new file mode 100644
index 0000000000000000000000000000000000000000..633936e47765a6ef8ac7f33517b3a8f617f2eeb3
--- /dev/null
+++ b/etc/vagrant/conf/srid_82344_proj4.txt
@@ -0,0 +1,11 @@
++title=ETRF_1989_UTM_Zone_32N
++proj=utm
++zone=32
++ellps=WGS84
++lat_0=0
++lon_0=21.45233333333333
++k=0.999600
++x_0=500000.0
++y_0=0
++pm=greenwich
++units=m
diff --git a/etc/vagrant/conf/srid_82344_wkt.txt b/etc/vagrant/conf/srid_82344_wkt.txt
new file mode 100644
index 0000000000000000000000000000000000000000..17dd5499feb39d032174ff8b5c4af747eef86580
--- /dev/null
+++ b/etc/vagrant/conf/srid_82344_wkt.txt
@@ -0,0 +1,17 @@
+// Taken from https://www.inf.unibz.it/dis/wiki/doku.php?id=data:proj (fixed epsg:42580 to epsg:4258)
+
+PROJCS[
+ "UTM Zone 32, Northern Hemisphere (WGS 84)",
+ GEOGCS [ "WGS 84",
+ DATUM ["WGS 84",
+ SPHEROID ["WGS 84", 6378137, 298.257223563]
+ ],
+ PRIMEM [ "Greenwich", 0.000000 ],
+ UNIT ["Decimal Degree", 0.01745329251994330]
+ ],
+ PROJECTION ["Transverse Mercator"],
+ PARAMETER ["Scale_Factor", 0.999600],
+ PARAMETER ["Central_Meridian", 9.000000],
+ PARAMETER ["False_Easting", 500000.000000],
+ UNIT ["Meter", 1.000000000000]
+]
diff --git a/etc/geoserver_config/styles/bus.png b/etc/vagrant/img/bus.png
similarity index 100%
rename from etc/geoserver_config/styles/bus.png
rename to etc/vagrant/img/bus.png
diff --git a/etc/geoserver_config/styles/car.png b/etc/vagrant/img/car.png
similarity index 100%
rename from etc/geoserver_config/styles/car.png
rename to etc/vagrant/img/car.png
diff --git a/etc/geoserver_config/styles/ferry.png b/etc/vagrant/img/ferry.png
similarity index 100%
rename from etc/geoserver_config/styles/ferry.png
rename to etc/vagrant/img/ferry.png
diff --git a/etc/geoserver_config/styles/tram.png b/etc/vagrant/img/tram.png
similarity index 100%
rename from etc/geoserver_config/styles/tram.png
rename to etc/vagrant/img/tram.png