From 99b29024e83e83970bde180b685e29baad8cb102 Mon Sep 17 00:00:00 2001
From: "fabio.sinibaldi" <fabio.sinibaldi@isti.cnr.it>
Date: Tue, 5 Dec 2017 17:15:19 +0000
Subject: [PATCH] git-svn-id:
 http://svn.research-infrastructures.eu/public/d4science/gcube/branches/data-transfer/data-transfer-model/1.2@160090
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .../plugins/ThreddsCatalogDescriptor.java     | 28 -----------
 .../transfer/model/plugins/ThreddsInfo.java   | 46 +++++++++++++++++++
 2 files changed, 46 insertions(+), 28 deletions(-)
 delete mode 100644 src/main/java/org/gcube/data/transfer/model/plugins/ThreddsCatalogDescriptor.java
 create mode 100644 src/main/java/org/gcube/data/transfer/model/plugins/ThreddsInfo.java

diff --git a/src/main/java/org/gcube/data/transfer/model/plugins/ThreddsCatalogDescriptor.java b/src/main/java/org/gcube/data/transfer/model/plugins/ThreddsCatalogDescriptor.java
deleted file mode 100644
index dd6ecf6..0000000
--- a/src/main/java/org/gcube/data/transfer/model/plugins/ThreddsCatalogDescriptor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.gcube.data.transfer.model.plugins;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-
-@Getter
-@Setter
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ThreddsCatalogDescriptor {
-
-	private String ID;
-	private String name;
-	private String title;
-	private String catalogFile;	
-	private String catalogEndpoint;
-	private String catalogConfigurationFileUrl;
-}
diff --git a/src/main/java/org/gcube/data/transfer/model/plugins/ThreddsInfo.java b/src/main/java/org/gcube/data/transfer/model/plugins/ThreddsInfo.java
new file mode 100644
index 0000000..b8daa66
--- /dev/null
+++ b/src/main/java/org/gcube/data/transfer/model/plugins/ThreddsInfo.java
@@ -0,0 +1,46 @@
+package org.gcube.data.transfer.model.plugins;
+
+import java.util.HashSet;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ThreddsInfo {
+
+	@Getter
+	@Setter
+	@ToString
+	@NoArgsConstructor
+	@AllArgsConstructor
+	@XmlRootElement
+	@XmlAccessorType(XmlAccessType.FIELD)
+	public static class ThreddsCatalog{
+		private String ID;
+		private String name;
+		private String title;
+		private String catalogFile;
+		private String localPath;
+		private String catalogUrl;
+		private String catalogFileUrl;
+	}
+	
+	
+	private String hostname;	
+	private String localBasePath;
+	private String instanceBaseUrl;
+	private HashSet<ThreddsCatalog> catalogs;
+}