From 05e909ec9d0ed8709aea177257a90d73db982c5a Mon Sep 17 00:00:00 2001 From: Werner Dittmann Date: Wed, 23 Dec 2009 11:52:46 +0000 Subject: [PATCH] Remove the ZrtpConfigure plugin and move its functions into the neomedia package. The neomedia activator registers the ZrtpConfigurePanel. --- build.xml | 12 +- lib/felix.client.run.properties | 3 +- lib/felix.unit.test.properties | 3 +- .../impl/media/CallSessionImpl.java | 4 +- .../communicator/impl/media/media.manifest.mf | 1 - .../impl/neomedia/NeomediaActivator.java | 12 ++ .../neomedia}/ZrtpConfigurePanel.java | 54 +++---- .../neomedia}/ZrtpConfigureTableModel.java | 2 +- .../neomedia}/ZrtpConfigureUtils.java | 4 +- .../impl/neomedia/ZrtpControlImpl.java | 9 +- .../impl/neomedia/neomedia.manifest.mf | 1 - .../zrtpconfigure/ZrtpConfigureActivator.java | 153 ------------------ .../plugin/zrtpconfigure/zrtp.manifest.mf | 29 ---- 13 files changed, 52 insertions(+), 235 deletions(-) rename src/net/java/sip/communicator/{plugin/zrtpconfigure => impl/neomedia}/ZrtpConfigurePanel.java (86%) rename src/net/java/sip/communicator/{plugin/zrtpconfigure => impl/neomedia}/ZrtpConfigureTableModel.java (99%) rename src/net/java/sip/communicator/{plugin/zrtpconfigure => impl/neomedia}/ZrtpConfigureUtils.java (91%) delete mode 100644 src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigureActivator.java delete mode 100755 src/net/java/sip/communicator/plugin/zrtpconfigure/zrtp.manifest.mf diff --git a/build.xml b/build.xml index 54a9e38a5..38817bbf5 100644 --- a/build.xml +++ b/build.xml @@ -839,7 +839,7 @@ bundle-argdelegation,bundle-zrtp4j, bundle-filehistory,bundle-metahistory,bundle-metahistory-slick, bundle-facebook,bundle-plugin-facebookaccregwizz, - bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-zrtpconfigure"/> + bundle-bouncycastle,bundle-plugin-otr"/> @@ -2216,14 +2216,6 @@ org.apache.http.util"/> - - - - - - - + diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties index 613ad1b89..66ad37c7b 100644 --- a/lib/felix.client.run.properties +++ b/lib/felix.client.run.properties @@ -167,8 +167,7 @@ felix.auto.start.67= \ reference:file:sc-bundles/generalconfig.jar \ reference:file:sc-bundles/dictaccregwizz.jar \ reference:file:sc-bundles/otr.jar \ - reference:file:sc-bundles/facebookaccregwizz.jar \ - reference:file:sc-bundles/zrtpconfigure.jar + reference:file:sc-bundles/facebookaccregwizz.jar #level 68 is for profiler, don't use it or change the build.xml file accordingly diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties index 8800cd3f4..e78e770cf 100644 --- a/lib/felix.unit.test.properties +++ b/lib/felix.unit.test.properties @@ -119,8 +119,7 @@ felix.auto.start.6= \ reference:file:sc-bundles/filehistory.jar \ reference:file:sc-bundles/metahistory.jar \ reference:file:sc-bundles/notification.jar \ - reference:file:sc-bundles/osdependent.jar \ - reference:file:sc-bundles/zrtpconfigure.jar + reference:file:sc-bundles/osdependent.jar felix.auto.start.7= \ reference:file:sc-bundles/slickless.jar \ diff --git a/src/net/java/sip/communicator/impl/media/CallSessionImpl.java b/src/net/java/sip/communicator/impl/media/CallSessionImpl.java index 3fe8ec6fe..da56b05b2 100644 --- a/src/net/java/sip/communicator/impl/media/CallSessionImpl.java +++ b/src/net/java/sip/communicator/impl/media/CallSessionImpl.java @@ -27,7 +27,6 @@ import net.java.sip.communicator.impl.media.keyshare.*; import net.java.sip.communicator.impl.media.transform.*; import net.java.sip.communicator.impl.media.transform.zrtp.*; -import net.java.sip.communicator.plugin.zrtpconfigure.ZrtpConfigureUtils; import net.java.sip.communicator.service.media.*; import net.java.sip.communicator.service.media.MediaException; import net.java.sip.communicator.service.media.event.*; @@ -2375,8 +2374,7 @@ else if (rtpManager.equals(videoRtpManager)) // the account registration wizard if (this.getCall().isDefaultEncrypted()) { - ZrtpConfigure config = ZrtpConfigureUtils.getZrtpConfiguration(); - if (engine.initialize("GNUZRTP4J.zid", zrtpAutoStart, config)) + if (engine.initialize("GNUZRTP4J.zid", zrtpAutoStart)) { usingZRTP = true; engine.sendInfo( diff --git a/src/net/java/sip/communicator/impl/media/media.manifest.mf b/src/net/java/sip/communicator/impl/media/media.manifest.mf index fc936a55f..4d625ab6a 100644 --- a/src/net/java/sip/communicator/impl/media/media.manifest.mf +++ b/src/net/java/sip/communicator/impl/media/media.manifest.mf @@ -28,7 +28,6 @@ Import-Package: org.osgi.framework, net.java.sip.communicator.service.resources, net.java.sip.communicator.util, net.java.sip.communicator.util.swing, - net.java.sip.communicator.plugin.zrtpconfigure, quicktime, quicktime.std.sg, quicktime.qd, diff --git a/src/net/java/sip/communicator/impl/neomedia/NeomediaActivator.java b/src/net/java/sip/communicator/impl/neomedia/NeomediaActivator.java index 4926e0c1c..4858b5eaa 100644 --- a/src/net/java/sip/communicator/impl/neomedia/NeomediaActivator.java +++ b/src/net/java/sip/communicator/impl/neomedia/NeomediaActivator.java @@ -122,6 +122,18 @@ public void start(BundleContext bundleContext) 41), null); + // ZRTPConfiguration panel + bundleContext + .registerService( + ConfigurationForm.class.getName(), + new LazyConfigurationForm( + "net.java.sip.communicator.impl.neomedia.ZrtpConfigurePanel", + getClass().getClassLoader(), + "impl.media.security.zrtp.CONF_ICON", + "impl.media.security.zrtp.TITLE", + 1100), + null); + //we use the nist-sdp stack to make parse sdp and we need to set the //following property to make sure that it would accept java generated //IPv6 addresses that contain address scope zones. diff --git a/src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigurePanel.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java similarity index 86% rename from src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigurePanel.java rename to src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java index d413b6587..dce26741e 100644 --- a/src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigurePanel.java +++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigurePanel.java @@ -3,7 +3,7 @@ * * Distributable under LGPL license. See terms of license at gnu.org. */ -package net.java.sip.communicator.plugin.zrtpconfigure; +package net.java.sip.communicator.impl.neomedia; import gnu.java.zrtp.ZrtpConfigure; import gnu.java.zrtp.ZrtpConstants; @@ -48,15 +48,15 @@ public ZrtpConfigurePanel() { panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); panel.setLayout(new GridLayout(5, 1)); - final JButton stdButton = new JButton(ZrtpConfigureActivator.resourceService + final JButton stdButton = new JButton(NeomediaActivator.getResources() .getI18NString("impl.media.security.zrtp.STANDARD")); stdButton.setOpaque(false); - final JButton mandButton = new JButton(ZrtpConfigureActivator.resourceService + final JButton mandButton = new JButton(NeomediaActivator.getResources() .getI18NString("impl.media.security.zrtp.MANDATORY")); mandButton.setOpaque(false); - final JButton saveButton = new JButton(ZrtpConfigureActivator.resourceService + final JButton saveButton = new JButton(NeomediaActivator.getResources() .getI18NString("service.gui.SAVE")); saveButton.setOpaque(false); @@ -68,13 +68,13 @@ public ZrtpConfigurePanel() { mainPanel.add(buttonBar); mainPanel.add(Box.createVerticalStrut(7)); - boolean trusted = ZrtpConfigureActivator.configService.getBoolean(TRUSTED_PROP, false); - boolean sasSign = ZrtpConfigureActivator.configService.getBoolean(SASSIGN_PROP, false); + boolean trusted = NeomediaActivator.getConfigurationService().getBoolean(TRUSTED_PROP, false); + boolean sasSign = NeomediaActivator.getConfigurationService().getBoolean(SASSIGN_PROP, false); JPanel checkBar = new JPanel(new GridLayout(1,2)); - final JCheckBox trustedMitM = new JCheckBox(ZrtpConfigureActivator.resourceService + final JCheckBox trustedMitM = new JCheckBox(NeomediaActivator.getResources() .getI18NString("impl.media.security.zrtp.TRUSTED"), trusted); - final JCheckBox sasSignature = new JCheckBox(ZrtpConfigureActivator.resourceService + final JCheckBox sasSignature = new JCheckBox(NeomediaActivator.getResources() .getI18NString("impl.media.security.zrtp.SASSIGNATURE"), sasSign); checkBar.add(trustedMitM); checkBar.add(sasSignature); @@ -106,8 +106,8 @@ else if (source == mandButton) { else if (source == saveButton) { Boolean t = new Boolean(active.isTrustedMitM()); Boolean s = new Boolean(active.isSasSignature()); - ZrtpConfigureActivator.configService.setProperty(TRUSTED_PROP, t); - ZrtpConfigureActivator.configService.setProperty(SASSIGN_PROP, s); + NeomediaActivator.getConfigurationService().setProperty(TRUSTED_PROP, t); + NeomediaActivator.getConfigurationService().setProperty(SASSIGN_PROP, s); pkc.saveConfig(); hc.saveConfig(); sc.saveConfig(); @@ -166,13 +166,13 @@ class PublicKeyControls extends JPanel { PublicKeyControls() { String id = ZrtpConfigureUtils.getPropertyID(ZrtpConstants.SupportedPubKeys.DH2K); - String savedConf = ZrtpConfigureActivator.configService.getString(id); + String savedConf = NeomediaActivator.getConfigurationService().getString(id); if (savedConf == null) savedConf = ""; dataModel = new ZrtpConfigureTableModel( ZrtpConstants.SupportedPubKeys.DH2K, active, inActive, savedConf); - createControls(this, dataModel, ZrtpConfigureActivator.resourceService + createControls(this, dataModel, NeomediaActivator.getResources() .getI18NString("impl.media.security.zrtp.PUB_KEYS")); } @@ -183,7 +183,7 @@ void setStandard() { void saveConfig() { String value = getPropertyValue(ZrtpConstants.SupportedPubKeys.DH2K); String id = ZrtpConfigureUtils.getPropertyID(ZrtpConstants.SupportedPubKeys.DH2K); - ZrtpConfigureActivator.configService.setProperty(id, value); + NeomediaActivator.getConfigurationService().setProperty(id, value); } } @@ -193,13 +193,13 @@ class HashControls extends JPanel { HashControls() { String id = ZrtpConfigureUtils.getPropertyID(ZrtpConstants.SupportedHashes.S256); - String savedConf = ZrtpConfigureActivator.configService.getString(id); + String savedConf = NeomediaActivator.getConfigurationService().getString(id); if (savedConf == null) savedConf = ""; dataModel = new ZrtpConfigureTableModel( ZrtpConstants.SupportedHashes.S256, active, inActive, savedConf); - createControls(this, dataModel, ZrtpConfigureActivator.resourceService + createControls(this, dataModel, NeomediaActivator.getResources() .getI18NString("impl.media.security.zrtp.HASHES")); } @@ -210,7 +210,7 @@ void setStandard() { void saveConfig() { String value = getPropertyValue(ZrtpConstants.SupportedHashes.S256); String id = ZrtpConfigureUtils.getPropertyID(ZrtpConstants.SupportedHashes.S256); - ZrtpConfigureActivator.configService.setProperty(id, value); + NeomediaActivator.getConfigurationService().setProperty(id, value); } } @@ -220,13 +220,13 @@ class CipherControls extends JPanel { CipherControls() { String id = ZrtpConfigureUtils.getPropertyID(ZrtpConstants.SupportedSymCiphers.AES1); - String savedConf = ZrtpConfigureActivator.configService.getString(id); + String savedConf = NeomediaActivator.getConfigurationService().getString(id); if (savedConf == null) savedConf = ""; dataModel = new ZrtpConfigureTableModel( ZrtpConstants.SupportedSymCiphers.AES1, active, inActive, savedConf); - createControls(this, dataModel, ZrtpConfigureActivator.resourceService + createControls(this, dataModel, NeomediaActivator.getResources() .getI18NString("impl.media.security.zrtp.SYM_CIPHERS")); } @@ -237,7 +237,7 @@ void setStandard() { void saveConfig() { String value = getPropertyValue(ZrtpConstants.SupportedSymCiphers.AES1); String id = ZrtpConfigureUtils.getPropertyID(ZrtpConstants.SupportedSymCiphers.AES1); - ZrtpConfigureActivator.configService.setProperty(id, value); + NeomediaActivator.getConfigurationService().setProperty(id, value); } } @@ -247,13 +247,13 @@ class SasControls extends JPanel { SasControls() { String id = ZrtpConfigureUtils.getPropertyID(ZrtpConstants.SupportedSASTypes.B32); - String savedConf = ZrtpConfigureActivator.configService.getString(id); + String savedConf = NeomediaActivator.getConfigurationService().getString(id); if (savedConf == null) savedConf = ""; dataModel = new ZrtpConfigureTableModel( ZrtpConstants.SupportedSASTypes.B32, active, inActive, savedConf); - createControls(this, dataModel, ZrtpConfigureActivator.resourceService + createControls(this, dataModel, NeomediaActivator.getResources() .getI18NString("impl.media.security.zrtp.SAS_TYPES")); } @@ -264,7 +264,7 @@ void setStandard() { void saveConfig() { String value = getPropertyValue(ZrtpConstants.SupportedSASTypes.B32); String id = ZrtpConfigureUtils.getPropertyID(ZrtpConstants.SupportedSASTypes.B32); - ZrtpConfigureActivator.configService.setProperty(id, value); + NeomediaActivator.getConfigurationService().setProperty(id, value); } } @@ -274,13 +274,13 @@ class LengthControls extends JPanel { LengthControls() { String id = ZrtpConfigureUtils.getPropertyID(ZrtpConstants.SupportedAuthLengths.HS32); - String savedConf = ZrtpConfigureActivator.configService.getString(id); + String savedConf = NeomediaActivator.getConfigurationService().getString(id); if (savedConf == null) savedConf = ""; dataModel = new ZrtpConfigureTableModel( ZrtpConstants.SupportedAuthLengths.HS32, active, inActive, savedConf); - createControls(this, dataModel, ZrtpConfigureActivator.resourceService + createControls(this, dataModel, NeomediaActivator.getResources() .getI18NString("impl.media.security.zrtp.SRTP_LENGTHS")); } @@ -291,18 +291,18 @@ void setStandard() { void saveConfig() { String value = getPropertyValue(ZrtpConstants.SupportedAuthLengths.HS32); String id = ZrtpConfigureUtils.getPropertyID(ZrtpConstants.SupportedAuthLengths.HS32); - ZrtpConfigureActivator.configService.setProperty(id, value); + NeomediaActivator.getConfigurationService().setProperty(id, value); } } private > void createControls(JPanel panel, ZrtpConfigureTableModel model, String title) { - final JButton upButton = new JButton(ZrtpConfigureActivator.resourceService + final JButton upButton = new JButton(NeomediaActivator.getResources() .getI18NString("impl.media.configform.UP")); upButton.setOpaque(false); - final JButton downButton = new JButton(ZrtpConfigureActivator.resourceService + final JButton downButton = new JButton(NeomediaActivator.getResources() .getI18NString("impl.media.configform.DOWN")); downButton.setOpaque(false); diff --git a/src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigureTableModel.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigureTableModel.java similarity index 99% rename from src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigureTableModel.java rename to src/net/java/sip/communicator/impl/neomedia/ZrtpConfigureTableModel.java index c35c331ed..84594c24a 100644 --- a/src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigureTableModel.java +++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigureTableModel.java @@ -1,4 +1,4 @@ -package net.java.sip.communicator.plugin.zrtpconfigure; +package net.java.sip.communicator.impl.neomedia; import java.util.ArrayList; diff --git a/src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigureUtils.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigureUtils.java similarity index 91% rename from src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigureUtils.java rename to src/net/java/sip/communicator/impl/neomedia/ZrtpConfigureUtils.java index 970c34977..df7278a05 100644 --- a/src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigureUtils.java +++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpConfigureUtils.java @@ -1,4 +1,4 @@ -package net.java.sip.communicator.plugin.zrtpconfigure; +package net.java.sip.communicator.impl.neomedia; import gnu.java.zrtp.ZrtpConfigure; import gnu.java.zrtp.ZrtpConstants; @@ -24,7 +24,7 @@ private static > void setupConfigure(T algo, ZrtpConfigure act String id = ZrtpConfigureUtils.getPropertyID(algo); - String savedConf = ZrtpConfigureActivator.configService.getString(id); + String savedConf = NeomediaActivator.getConfigurationService().getString(id); if (savedConf == null) savedConf = ""; diff --git a/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java b/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java index f6cedd1eb..918d3ea86 100644 --- a/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java +++ b/src/net/java/sip/communicator/impl/neomedia/ZrtpControlImpl.java @@ -123,7 +123,8 @@ public ZRTPTransformEngine getZrtpEngine() if(zrtpEngine == null) { zrtpEngine = new ZRTPTransformEngine(); - zrtpEngine.initialize("GNUZRTP4J.zid", false); + ZrtpConfigure config = ZrtpConfigureUtils.getZrtpConfiguration(); + zrtpEngine.initialize("GNUZRTP4J.zid", false, config); } return zrtpEngine; @@ -159,8 +160,8 @@ public void start(boolean masterSession) zrtpAutoStart = true; securityEventManager.setDHSession(true); - // we now that audio is considered as master for zrtp - securityEventManager.setSessionType( + // we know that audio is considered as master for zrtp + securityEventManager.setSessionType( SecurityEventManager.AUDIO_SESSION); } else @@ -168,7 +169,7 @@ public void start(boolean masterSession) // check whether video was not already started // it may happen when using multistreams, audio has inited // and started video - // initially engins has value enableZrtp = false + // initially engine has value enableZrtp = false zrtpAutoStart = zrtpEngine.isEnableZrtp(); securityEventManager.setSessionType( SecurityEventManager.VIDEO_SESSION); diff --git a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf index d3f627857..dac67e991 100644 --- a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf +++ b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf @@ -28,7 +28,6 @@ Import-Package: org.osgi.framework, net.java.sip.communicator.service.resources, net.java.sip.communicator.util, net.java.sip.communicator.util.swing, - net.java.sip.communicator.plugin.zrtpconfigure, quicktime, quicktime.std.sg, quicktime.qd, diff --git a/src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigureActivator.java b/src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigureActivator.java deleted file mode 100644 index 0a3d2ee74..000000000 --- a/src/net/java/sip/communicator/plugin/zrtpconfigure/ZrtpConfigureActivator.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client. - * - * Distributable under LGPL license. See terms of license at gnu.org. - */ -package net.java.sip.communicator.plugin.zrtpconfigure; - -import net.java.sip.communicator.service.configuration.*; -import net.java.sip.communicator.service.gui.*; -import net.java.sip.communicator.service.resources.ResourceManagementService; -import net.java.sip.communicator.service.resources.ResourceManagementServiceUtils; - -import org.osgi.framework.*; - -/** - * The BundleActivator for ZrtpConfigure. - * - * @author Werner Dittmann - */ -public class ZrtpConfigureActivator - implements BundleActivator -{ - public static BundleContext bundleContext; - - /** - * The {@link ResourceManagementService} of the {@link ZrtpConfigureActivator}. - */ - public static ResourceManagementService resourceService; - - /** - * The {@link UIService} of the {@link ZrtpConfigureActivator}. - */ - private static UIService uiService; - - /** - * The {@link ConfigurationService} of the {@link ZrtpConfigureActivator}. - */ - protected static ConfigurationService configService; - - /** - * Starts this bundle and adds the ZrtpConfigurePanel. - */ - public void start(BundleContext bc) throws Exception - { - bundleContext = bc; - - bundleContext - .registerService( - ConfigurationForm.class.getName(), - new LazyConfigurationForm( - "net.java.sip.communicator.plugin.zrtpconfigure.ZrtpConfigurePanel", - getClass().getClassLoader(), - "impl.media.security.zrtp.CONF_ICON", - "impl.media.security.zrtp.TITLE", - 1100), - null); - - resourceService = - ResourceManagementServiceUtils - .getService(bundleContext); - if (resourceService == null) - return; - - ServiceReference refConfigService = - bundleContext - .getServiceReference(ConfigurationService.class.getName()); - - if (refConfigService == null) - return; - - configService = - (ConfigurationService)bundleContext - .getService(refConfigService); - - } - - /** - * Stops this bundles. - */ - public void stop(BundleContext arg0) throws Exception - { - resourceService = null; - configService = null; - uiService = null; - } - - /** - * Returns the UIService obtained from the bundle context. - * - * @return the UIService obtained from the bundle context - */ - public static UIService getUIService() - { - if (uiService == null) - { - ServiceReference uiReference = - bundleContext.getServiceReference(UIService.class.getName()); - - uiService = - (UIService) bundleContext - .getService(uiReference); - } - - return uiService; - } - - /** - * Returns the ConfigurationService obtained from the bundle - * context. - * - * @return the ConfigurationService obtained from the bundle - * context - */ - public static ConfigurationService getConfigurationService() - { - if (configService == null) - { - ServiceReference configReference = - bundleContext.getServiceReference(ConfigurationService.class - .getName()); - - configService = - (ConfigurationService) bundleContext - .getService(configReference); - } - - return configService; - } - - /** - * Determines whether bundle is system or not. We consider system - * bundles those that we have explicitly marked as such with the - * System-Bundle manifest property or those that belong to the - * Apache framework itself. - * - * @param bundle the bundle that we need to determine as system or not. - * @return true if bundle is a system bundle and false - * otherwise. - */ - public static boolean isSystemBundle(Bundle bundle) - { - if (bundle.getBundleId() <= 1) - { - //this is one of the felix bundles - return true; - } - - Object sysBundleProp = bundle.getHeaders().get("System-Bundle"); - - //ignore if this is a system bundle - return (sysBundleProp != null && sysBundleProp.equals("yes")); - } -} diff --git a/src/net/java/sip/communicator/plugin/zrtpconfigure/zrtp.manifest.mf b/src/net/java/sip/communicator/plugin/zrtpconfigure/zrtp.manifest.mf deleted file mode 100755 index 47df2bccc..000000000 --- a/src/net/java/sip/communicator/plugin/zrtpconfigure/zrtp.manifest.mf +++ /dev/null @@ -1,29 +0,0 @@ -Bundle-Activator: net.java.sip.communicator.plugin.zrtpconfigure.ZrtpConfigureActivator -Bundle-Name: ZRTP configuration plugin -Bundle-Description: Provides ZRTP configuration functions. -Bundle-Vendor: sip-communicator.org -Bundle-Version: 0.0.1 -System-Bundle: yes -Import-Package: org.osgi.framework, - net.java.sip.communicator.service.configuration, - net.java.sip.communicator.service.gui, - net.java.sip.communicator.service.gui.event, - net.java.sip.communicator.service.resources, - net.java.sip.communicator.util, - net.java.sip.communicator.util.swing, - javax.swing, - javax.swing.event, - javax.swing.table, - javax.swing.text, - javax.swing.text.html, - javax.accessibility, - javax.swing.plaf, - javax.swing.plaf.metal, - javax.swing.plaf.basic, - javax.imageio, - javax.swing.filechooser, - javax.swing.tree, - javax.swing.undo, - javax.swing.border, - gnu.java.zrtp -Export-Package: net.java.sip.communicator.plugin.zrtpconfigure