Skip to content
Snippets Groups Projects
Commit bc6e7ec4 authored by Nikolaus Krismer's avatar Nikolaus Krismer
Browse files

moved tablePrefix configuration value to isochrone-web project

parent df19ef4b
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory; ...@@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory;
@PropertySuffixes(extraSuffixes = { }, hostNames = false) @PropertySuffixes(extraSuffixes = { }, hostNames = false)
public final class ConfigIsochrone { public final class ConfigIsochrone {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigIsochrone.class); private static final Logger LOGGER = LoggerFactory.getLogger(ConfigIsochrone.class);
private static final int PREFIX_MAX_LENGTH = 4;
private static ConfigIsochrone instance = null; private static ConfigIsochrone instance = null;
private ConnectionFactory factory; private ConnectionFactory factory;
...@@ -71,11 +70,6 @@ public final class ConfigIsochrone { ...@@ -71,11 +70,6 @@ public final class ConfigIsochrone {
@PropertyValue("org.postgresql.port") @PropertyValue("org.postgresql.port")
private Integer port; private Integer port;
@NotNull
@DefaultValue("")
@PropertyValue("prefix")
private String prefix;
@NotNull @NotNull
@PropertyValue("org.postgresql.username") @PropertyValue("org.postgresql.username")
private String user; private String user;
...@@ -144,18 +138,6 @@ public final class ConfigIsochrone { ...@@ -144,18 +138,6 @@ public final class ConfigIsochrone {
return maxConnections; return maxConnections;
} }
public String getPrefix() {
if (prefix == null) {
return null;
}
if (prefix.length() > PREFIX_MAX_LENGTH) {
return prefix.substring(0, PREFIX_MAX_LENGTH);
}
return prefix;
}
public boolean isPooling() { public boolean isPooling() {
return pooling; return pooling;
} }
......
...@@ -11,7 +11,4 @@ ...@@ -11,7 +11,4 @@
<entry key="org.postgresql.username">niko</entry> <entry key="org.postgresql.username">niko</entry>
<entry key="org.postgresql.password">secretPhdPassword#2014!</entry> <entry key="org.postgresql.password">secretPhdPassword#2014!</entry>
<entry key="org.postgresql.port">5432</entry> <entry key="org.postgresql.port">5432</entry>
<!-- Postgres/Geoserver prefix -->
<entry key="tablePrefix"></entry>
</properties> </properties>
...@@ -3,7 +3,4 @@ ...@@ -3,7 +3,4 @@
<properties> <properties>
<!-- Postgres database --> <!-- Postgres database -->
<entry key="org.postgresql.servername">dbis-isochrone.uibk.ac.at</entry> <entry key="org.postgresql.servername">dbis-isochrone.uibk.ac.at</entry>
<!-- Postgres/Geoserver prefix -->
<entry key="prefix">test</entry>
</properties> </properties>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment