[changed] version of imapj to v2.2.0

trustathsh · Sep 10, 2014 · a8b91d4 · a8b91d4
1 parent 96efd0b
commit a8b91d4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -155,7 +155,7 @@
 		<dependency>
 			<groupId>de.hshannover.f4.trust</groupId>
 			<artifactId>ifmapj</artifactId>
-			<version>1.0.0</version>
+			<version>2.2.0</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/src/main/java/de/hshannover/f4/trust/irongui/communication/DumpImpl.java b/src/main/java/de/hshannover/f4/trust/irongui/communication/DumpImpl.java
@@ -63,6 +63,8 @@
 import de.hshannover.f4.trust.ifmapj.messages.RequestImpl;
 import de.hshannover.f4.trust.ifmapj.messages.Requests.Helpers;
 import de.hshannover.f4.trust.ifmapj.messages.Result;
+import de.hshannover.f4.trust.irongui.communication.DumpRequest;
+import de.hshannover.f4.trust.irongui.communication.DumpResult;
 
 class DumpRequestHandler implements RequestHandler<DumpRequest> {
 
@@ -81,7 +83,7 @@ public Element toElement(Request req, Document doc) throws MarshalException {
 		String identFilter = ((DumpRequest)req).getIdentifierFilter();
 
 		Element ret = doc.createElementNS(Helpers.baseNsUri(),
-				DomHelpers.makeRequestFQName(DUMP_REQ_EL_NAME));
+				DomHelpers.makeRequestFqName(DUMP_REQ_EL_NAME));
 
 		if (identFilter  != null)
 			DomHelpers.addAttribute(ret, DUMP_REQ_IDENT_FILTER, identFilter);

diff --git a/src/main/java/de/hshannover/f4/trust/irongui/communication/IfmapCommunication.java b/src/main/java/de/hshannover/f4/trust/irongui/communication/IfmapCommunication.java
@@ -52,15 +52,12 @@
 import java.util.Set;
 import java.util.concurrent.Semaphore;
 
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.TrustManager;
-
-import de.hshannover.f4.trust.irongui.util.CryptoUtil;
 import de.hshannover.f4.trust.ifmapj.IfmapJ;
-import de.hshannover.f4.trust.ifmapj.IfmapJHelper;
 import de.hshannover.f4.trust.ifmapj.binding.IfmapStrings;
 import de.hshannover.f4.trust.ifmapj.channel.ARC;
 import de.hshannover.f4.trust.ifmapj.channel.SSRC;
+import de.hshannover.f4.trust.ifmapj.config.BasicAuthConfig;
+import de.hshannover.f4.trust.ifmapj.config.CertAuthConfig;
 import de.hshannover.f4.trust.ifmapj.exception.EndSessionException;
 import de.hshannover.f4.trust.ifmapj.exception.IfmapErrorResult;
 import de.hshannover.f4.trust.ifmapj.exception.IfmapException;
@@ -72,6 +69,9 @@
 import de.hshannover.f4.trust.ifmapj.messages.SubscribeDelete;
 import de.hshannover.f4.trust.ifmapj.messages.SubscribeRequest;
 import de.hshannover.f4.trust.ifmapj.messages.SubscribeUpdate;
+import de.hshannover.f4.trust.irongui.communication.DumpRequest;
+import de.hshannover.f4.trust.irongui.communication.DumpResult;
+import de.hshannover.f4.trust.irongui.util.CryptoUtil;
 
 public class IfmapCommunication {
 
@@ -90,13 +90,12 @@ public class IfmapCommunication {
 			String trustPath, String trustPass, boolean enableBasicAuth,
 			String basicUser, String basicPass, int mp)
 			throws InitializationException {
-		TrustManager[] tms = IfmapJHelper
-				.getTrustManagers(trustPath, trustPass);
 		if (enableBasicAuth) {
-			mSSRC = IfmapJ.createSSRC(url, basicUser, basicPass, tms);
+			BasicAuthConfig basicConfig = new BasicAuthConfig(url, basicUser, basicPass, trustPath, trustPass);
+			mSSRC = IfmapJ.createSsrc(basicConfig);
 		} else {
-			KeyManager[] kms = IfmapJHelper.getKeyManagers(keyPath, keyPass);
-			mSSRC = IfmapJ.createSSRC(url, kms, tms);
+			CertAuthConfig certConfig = new CertAuthConfig(url, trustPath, trustPass, trustPath, trustPass);
+			mSSRC = IfmapJ.createSsrc(certConfig);
 		}
 		mSemaphore = new Semaphore(1);
 		maxPoll = mp;