diff options
| author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2012-06-29 06:55:08 +0000 |
|---|---|---|
| committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2012-06-29 06:55:08 +0000 |
| commit | 89d68994efe8609cff3b1d60033c591d7fe3eb2c (patch) | |
| tree | 8259e439a23e536ffa367f86db4b6b8f2801f9a4 /src/net/java/sip/communicator/impl/certificate | |
| parent | bf0f000911496baab4bef0502db477f7699aeb45 (diff) | |
| download | jitsi-89d68994efe8609cff3b1d60033c591d7fe3eb2c.zip jitsi-89d68994efe8609cff3b1d60033c591d7fe3eb2c.tar.gz jitsi-89d68994efe8609cff3b1d60033c591d7fe3eb2c.tar.bz2 | |
Switches Jitsi trunk to libjitsi.
Diffstat (limited to 'src/net/java/sip/communicator/impl/certificate')
4 files changed, 16 insertions, 13 deletions
diff --git a/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java b/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java index 5068a72..5090f26 100644 --- a/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java +++ b/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java @@ -11,7 +11,7 @@ import java.io.*; import java.lang.reflect.*;
import java.net.*;
import java.security.*;
-import java.security.KeyStore.*;
+import java.security.KeyStore.Builder;
import java.security.cert.*;
import java.security.cert.Certificate;
import java.util.*;
@@ -20,18 +20,19 @@ import javax.net.ssl.*; import javax.security.auth.callback.*;
import javax.swing.*;
-import org.bouncycastle.asn1.*;
-import org.bouncycastle.asn1.x509.*;
-import org.bouncycastle.asn1.x509.X509Extension;
-
import net.java.sip.communicator.service.certificate.*;
-import net.java.sip.communicator.service.configuration.*;
import net.java.sip.communicator.service.credentialsstorage.*;
import net.java.sip.communicator.service.httputil.*;
-import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
import net.java.sip.communicator.util.swing.*;
+import org.bouncycastle.asn1.*;
+import org.bouncycastle.asn1.x509.*;
+import org.bouncycastle.asn1.x509.X509Extension;
+import org.jitsi.service.configuration.*;
+import org.jitsi.service.resources.*;
+import org.jitsi.util.*;
+
/**
* Implementation of the CertificateService. It asks the user to trust a
* certificate when the automatic verification fails.
diff --git a/src/net/java/sip/communicator/impl/certificate/CertificateVerificationActivator.java b/src/net/java/sip/communicator/impl/certificate/CertificateVerificationActivator.java index 2c5bffa..e1a41bc 100644 --- a/src/net/java/sip/communicator/impl/certificate/CertificateVerificationActivator.java +++ b/src/net/java/sip/communicator/impl/certificate/CertificateVerificationActivator.java @@ -7,11 +7,11 @@ package net.java.sip.communicator.impl.certificate; import net.java.sip.communicator.service.certificate.*; -import net.java.sip.communicator.service.configuration.*; +import org.jitsi.service.configuration.*; import net.java.sip.communicator.service.credentialsstorage.*; -import net.java.sip.communicator.service.resources.*; import net.java.sip.communicator.util.*; +import org.jitsi.service.resources.*; import org.osgi.framework.*; /** diff --git a/src/net/java/sip/communicator/impl/certificate/VerifyCertificateDialog.java b/src/net/java/sip/communicator/impl/certificate/VerifyCertificateDialog.java index 0e55dfd..4e855a2 100644 --- a/src/net/java/sip/communicator/impl/certificate/VerifyCertificateDialog.java +++ b/src/net/java/sip/communicator/impl/certificate/VerifyCertificateDialog.java @@ -12,9 +12,10 @@ import java.security.cert.*; import javax.swing.*;
-import net.java.sip.communicator.service.resources.*;
import net.java.sip.communicator.util.swing.*;
+import org.jitsi.service.resources.*;
+
/**
* Dialog that is shown to the user when a certificate verification failed.
*/
diff --git a/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf b/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf index 8699c8d..0c77bbe 100644 --- a/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf +++ b/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf @@ -8,10 +8,11 @@ Export-Package: net.java.sip.communicator.service.certificate Import-Package: org.osgi.framework, net.java.sip.communicator.util, net.java.sip.communicator.util.swing, - net.java.sip.communicator.service.configuration, + org.jitsi.service.configuration, + org.jitsi.util, net.java.sip.communicator.service.credentialsstorage, net.java.sip.communicator.service.httputil, - net.java.sip.communicator.service.resources, + org.jitsi.service.resources, net.java.sip.communicator.service.resources, javax.net.ssl, javax.security.auth.callback, javax.security.auth.x500, |