diff --git a/pom.xml b/pom.xml
index 3b08850..fed439c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
org.gcube.contentmanagement
storage-manager-trigger
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
scm:svn:http://svn.d4science.research-infrastructures.eu/gcube/trunk/content-management/${project.artifactId}
scm:svn:https://svn.d4science.research-infrastructures.eu/gcube/trunk/content-management/${project.artifactId}
@@ -21,7 +21,6 @@
org.mongodb
mongo-java-driver
-
[3.0.0, 3.1.0)
@@ -35,11 +34,6 @@
4.11
test
-
-
-
-
-
org.gcube.core
common-scope
@@ -66,14 +60,19 @@
[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
- org.gcube.accounting
- accounting-lib
- [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ org.gcube.data.publishing
+ document-store-lib
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
- org.gcube.accounting
- accounting-lib-persistence-couchdb
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ org.gcube.data.publishing
+ document-store-lib-couchdb
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+
+
+ org.gcube.accounting
+ accounting-lib
+ [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
diff --git a/src/main/java/org/gcube/contentmanager/storageserver/accounting/Report.java b/src/main/java/org/gcube/contentmanager/storageserver/accounting/Report.java
index a252636..a328546 100644
--- a/src/main/java/org/gcube/contentmanager/storageserver/accounting/Report.java
+++ b/src/main/java/org/gcube/contentmanager/storageserver/accounting/Report.java
@@ -1,6 +1,6 @@
package org.gcube.contentmanager.storageserver.accounting;
-//import org.gcube.accounting.datamodel.RawUsageRecord;
+
import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;
public interface Report {
diff --git a/src/main/java/org/gcube/contentmanager/storageserver/accounting/ReportAccountingImpl.java b/src/main/java/org/gcube/contentmanager/storageserver/accounting/ReportAccountingImpl.java
index c9e35c5..a7b3827 100644
--- a/src/main/java/org/gcube/contentmanager/storageserver/accounting/ReportAccountingImpl.java
+++ b/src/main/java/org/gcube/contentmanager/storageserver/accounting/ReportAccountingImpl.java
@@ -2,12 +2,10 @@ package org.gcube.contentmanager.storageserver.accounting;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Date;
-
import org.gcube.accounting.datamodel.UsageRecord.OperationResult;
import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord.OperationType;
import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;
-import org.gcube.accounting.exception.InvalidValueException;
+import org.gcube.documentstore.exception.InvalidValueException;
import org.gcube.accounting.persistence.AccountingPersistence;
import org.gcube.accounting.persistence.AccountingPersistenceFactory;
import org.gcube.contentmanager.storageserver.parse.utils.DateUtils;
@@ -59,7 +57,7 @@ import org.slf4j.LoggerFactory;
}
if(size!= null) sur.setDataVolume(Long.parseLong(size));
- } catch (InvalidValueException e1) {
+ } catch (org.gcube.documentstore.exception.InvalidValueException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
} catch (URISyntaxException e) {
diff --git a/src/main/java/org/gcube/contentmanager/storageserver/consumer/FolderAccountingConsumer.java b/src/main/java/org/gcube/contentmanager/storageserver/consumer/FolderAccountingConsumer.java
index 4d19eeb..73e212c 100644
--- a/src/main/java/org/gcube/contentmanager/storageserver/consumer/FolderAccountingConsumer.java
+++ b/src/main/java/org/gcube/contentmanager/storageserver/consumer/FolderAccountingConsumer.java
@@ -1,6 +1,5 @@
package org.gcube.contentmanager.storageserver.consumer;
-import org.gcube.accounting.datamodel.RawUsageRecord;
import org.gcube.contentmanager.storageserver.accounting.Report;
import org.gcube.contentmanager.storageserver.accounting.ReportConfig;
import org.gcube.contentmanager.storageserver.accounting.ReportException;
diff --git a/src/main/java/org/gcube/contentmanager/storageserver/consumer/UserAccountingConsumer.java b/src/main/java/org/gcube/contentmanager/storageserver/consumer/UserAccountingConsumer.java
index c07c77b..28e4659 100644
--- a/src/main/java/org/gcube/contentmanager/storageserver/consumer/UserAccountingConsumer.java
+++ b/src/main/java/org/gcube/contentmanager/storageserver/consumer/UserAccountingConsumer.java
@@ -3,7 +3,6 @@ package org.gcube.contentmanager.storageserver.consumer;
import java.util.List;
import org.bson.types.ObjectId;
-import org.gcube.accounting.datamodel.RawUsageRecord;
import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.contentmanager.storageserver.accounting.Report;
diff --git a/src/main/java/org/gcube/contentmanager/storageserver/startup/Startup.java b/src/main/java/org/gcube/contentmanager/storageserver/startup/Startup.java
index 8a0254d..6db7fdd 100644
--- a/src/main/java/org/gcube/contentmanager/storageserver/startup/Startup.java
+++ b/src/main/java/org/gcube/contentmanager/storageserver/startup/Startup.java
@@ -77,7 +77,7 @@ public class Startup {
private static void startProducer(String[] args, String oplogServer,
String[] server, CubbyHole c1, CubbyHole c2) {
ReadingMongoOplog producer=null;
- if(args[2]!=null && args[3]!= null)
+ if((args.length == 4 )&& (args[2]!=null) && (args[3]!= null))
producer=new ReadingMongoOplog( Arrays.asList(oplogServer), args[2], args[3], c1, c2, 1 );
else //if(args.length == 2)
producer=new ReadingMongoOplog( Arrays.asList(server), c1, c2, 1 );
diff --git a/src/test/java/org/gcube/contentmanager/storageserver/accounting/ProviderUriTest.java b/src/test/java/org/gcube/contentmanager/storageserver/accounting/ProviderUriTest.java
index 560f816..598445f 100644
--- a/src/test/java/org/gcube/contentmanager/storageserver/accounting/ProviderUriTest.java
+++ b/src/test/java/org/gcube/contentmanager/storageserver/accounting/ProviderUriTest.java
@@ -2,10 +2,6 @@ package org.gcube.contentmanager.storageserver.accounting;
import static org.junit.Assert.*;
-import java.net.URISyntaxException;
-
-import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;
-import org.gcube.accounting.exception.InvalidValueException;
import org.gcube.common.scope.api.ScopeProvider;
import org.junit.Before;
import org.junit.Test;