first untested beta version with new TSL lib

3 files changed, 74 insertions, 2 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/TSLConfiguration.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/TSLConfiguration.java
index 0e0c82c..642c28d 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/TSLConfiguration.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/TSLConfiguration.java
@@ -28,6 +28,7 @@ package at.gv.egovernment.moa.spss.api.common;
 import iaik.xml.crypto.utils.URI;

 

 import java.util.Date;

+import java.util.List;

 

 

 /**

@@ -78,5 +79,9 @@ public interface TSLConfiguration {
    * @return

    */

   public URI getWorkingDirectoryAsURI();

+  

+  public List<java.net.URI> getQualifierForQC();

+

+  public List<java.net.URI> getQualifierForSSCD();

 

 }

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TSLConfigurationImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TSLConfigurationImpl.java
index 4d69ed7..6fa813f 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TSLConfigurationImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TSLConfigurationImpl.java
@@ -26,7 +26,9 @@ package at.gv.egovernment.moa.spss.api.impl;
 

 import iaik.xml.crypto.utils.URI;

 

+import java.util.ArrayList;

 import java.util.Date;

+import java.util.List;

 

 import at.gv.egovernment.moa.spss.api.common.TSLConfiguration;

 

@@ -53,7 +55,10 @@ public class TSLConfigurationImpl implements TSLConfiguration {
 	

 	/** Working directory */

 	private URI workingDirectoryAsURI;

-  

+	

+	private List<java.net.URI> qualifierForQC = new ArrayList<java.net.URI>();

+	private List<java.net.URI> qualifierForSSCD = new ArrayList<java.net.URI>();

+	

   public String getEuTSLUrl() {

 	  return this.euTSLUrl;

   }

@@ -94,7 +99,21 @@ public class TSLConfigurationImpl implements TSLConfiguration {
 		this.workingDirectoryAsURI = workingDirectoryAsURI;

 	}

 

-  

+	public List<java.net.URI> getQualifierForQC() {

+		return qualifierForQC;

+	}

+

+	public List<java.net.URI> getQualifierForSSCD() {

+		return qualifierForSSCD;

+	}

+

+	public void addQualifierForQC(java.net.URI qualifier) {

+		qualifierForQC.add(qualifier);

+	}

+	

+	public void addQualifierForSSCD(java.net.URI qualifier) {

+		qualifierForSSCD.add(qualifier);

+	}

  

 

 }

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TslInfosImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TslInfosImpl.java
new file mode 100644
index 0000000..4c40a5f
--- /dev/null
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TslInfosImpl.java
@@ -0,0 +1,48 @@
+package at.gv.egovernment.moa.spss.api.impl;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import at.gv.egovernment.moa.spss.api.common.TslInfos;
+
+public class TslInfosImpl implements TslInfos {
+
+	private String tslServiceTypeIdentifier;
+	private String tslServiceTypeStatus;
+	private List<String> tslServiceQualifier = new ArrayList<String>();
+	private String tslCountry;
+	
+	public TslInfosImpl(String country, String tslServiceTypeStatus, String tslServiceTypeIdentifier, List<URI> tslCertificateQualifier) {
+		this.tslCountry = country;
+		this.tslServiceTypeStatus = tslServiceTypeStatus;
+		this.tslServiceTypeIdentifier = tslServiceTypeIdentifier;
+		
+		for (URI el : tslCertificateQualifier)
+			this.tslServiceQualifier.add(el.toString());
+			
+		
+	}
+	
+	
+	@Override
+	public String getTslIssuerCountry() {
+		return tslCountry;
+	}
+
+	@Override
+	public String getServiceTypeStatus() {
+		return tslServiceTypeStatus;
+	}
+
+	@Override
+	public String getServiceTypeIdentifier() {
+		return tslServiceTypeIdentifier;
+	}
+
+	@Override
+	public List<String> getQualifiers() {
+		return tslServiceQualifier;
+	}
+
+}