diff --git a/.project b/.project index 9b52a5e..e3b4e41 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - DataHarvesterPlugin + accounting-dashboard-harvester-se-plugin diff --git a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java index 6f16596..a09f9e7 100644 --- a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java +++ b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java @@ -131,7 +131,6 @@ public class AccountingDataHarvesterPlugin extends Plugin contexts = contextAuthorization.getContexts(); - ArrayList data = new ArrayList(); for(String context : contexts) { diff --git a/src/main/java/org/gcube/dataharvest/dao/DatabaseParameterRetriever.java b/src/main/java/org/gcube/dataharvest/dao/DatabaseParameterRetriever.java index 7edd6b4..98bdf6c 100644 --- a/src/main/java/org/gcube/dataharvest/dao/DatabaseParameterRetriever.java +++ b/src/main/java/org/gcube/dataharvest/dao/DatabaseParameterRetriever.java @@ -25,7 +25,7 @@ public class DatabaseParameterRetriever { public static final String LOCAL_DB = "LOCAL_DB"; public static final String SERVICE_ENDPOINT_CATEGORY = "Database"; - public static final String SERVICE_ENDPOINT_NAME = "Analytics Board"; + public static final String SERVICE_ENDPOINT_NAME = "AccountingDashboard"; public static final String DB_URI = "DB_URI"; public static final String DB_USERNAME = "DB_USERNAME"; diff --git a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java index d6614c7..c16256b 100644 --- a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java +++ b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java @@ -17,7 +17,7 @@ public class AccountingDataHarvesterPluginTest extends ContextTest { public void test() { try { - // org.gcube.dataharvest.utils.Utils.setContext(ROOT); + org.gcube.dataharvest.utils.Utils.setContext(ROOT); DataHarvestPluginDeclaration dataHarvestPluginDeclaration = new DataHarvestPluginDeclaration(); AccountingDataHarvesterPlugin accountingDataHarvesterPlugin = new AccountingDataHarvesterPlugin(dataHarvestPluginDeclaration); diff --git a/src/test/resources/config.properties b/src/test/resources/config.properties index bb55497..fdb4fe6 100644 --- a/src/test/resources/config.properties +++ b/src/test/resources/config.properties @@ -2,4 +2,7 @@ VO_FILE=scopedata.xml USERNAME=luca.frosini SERVICE_NAME=accounting-harvester -LOCAL_DB=true \ No newline at end of file +LOCAL_DB=true +DB_URI=jdbc:postgresql://postgresql-srv-dev.d4science.org:5432/analytics_b_dev +DB_USERNAME=analytics_b_dev_u +DB_PASSWORD=78cb625303be21b \ No newline at end of file