diff --git a/data-discovery/src/main/java/search/DbConnArgs.java b/data-discovery/src/main/java/search/DbConnArgs.java index 2063db26af89fc2bceda9fd89504311a146af0f3..df268896849634edbfd21be9d83c3f67970ad116 100644 --- a/data-discovery/src/main/java/search/DbConnArgs.java +++ b/data-discovery/src/main/java/search/DbConnArgs.java @@ -2,18 +2,16 @@ class DbConnArgs { public String uri; - public String schema; public String user_name; public String password; public String uri() {return uri;} - public String schema() {return schema;} public String userName() {return user_name;} public String password() {return password;} public String toString() { - return uri + " schema[" + schema + "] " + user_name; + return uri + " " + user_name; } } diff --git a/data-discovery/src/main/java/webapi/SearchSettings.java b/data-discovery/src/main/java/webapi/SearchSettings.java index cff18dc2786fa56fbb6a48d11525d3201f0285a9..ebc40528a9b276e9737fee931bda006ecc2d322d 100644 --- a/data-discovery/src/main/java/webapi/SearchSettings.java +++ b/data-discovery/src/main/java/webapi/SearchSettings.java @@ -37,7 +37,6 @@ class SearchSettings { DbConnArgs dbConnArgs = new DbConnArgs(); dbConnArgs.uri = properties.getProperty("db_uri","jdbc:postgresql://localhost:5432/vialactea").strip(); - dbConnArgs.schema = properties.getProperty("db_schema","ivoa").strip(); dbConnArgs.user_name = properties.getProperty("db_user_name","").strip(); dbConnArgs.password = properties.getProperty("db_password","").strip(); diff --git a/data-discovery/src/main/resources/search.properties b/data-discovery/src/main/resources/search.properties index 6828d84522995a0fe3dfc71eda6184390c1ce2b6..5452506862e9e1595b07a5d06695fefed7e43038 100644 --- a/data-discovery/src/main/resources/search.properties +++ b/data-discovery/src/main/resources/search.properties @@ -1,7 +1,6 @@ # database with 'obscore' table # db_uri=jdbc:postgresql://localhost:5432/vialactea -# db_schema=ivoa db_user_name= db_password= diff --git a/docker/start-siav2.sh b/docker/start-siav2.sh index fcf8e4922d8232176bcf8ed3d42cbcada5620bb2..8d8da23fda4b01b3c62e1d46e69efc486f597ec3 100755 --- a/docker/start-siav2.sh +++ b/docker/start-siav2.sh @@ -21,7 +21,6 @@ echo "<Context docBase=\"$WEBAPP_DIR\"/>" > $CATALINA_BASE/conf/Catalina/localho # configure DB with ObsTAP { echo "db_uri=$DB_URI" - echo "db_schema=$DB_SCHEMA" echo "db_user_name=$DB_USERNAME" echo "db_password=$DB_PASSWORD" } > $WEBAPP_DIR/WEB-INF/classes/search.properties