Remove long disabled sip2sip account wizard

17 files changed, 1 insertions, 853 deletions

diff --git a/build.xml b/build.xml
index 81e44a2..c273fb8 100644
--- a/build.xml
+++ b/build.xml
@@ -1670,16 +1670,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!-- BUNDLE-PLUGIN-SIP2SIPACCREGWIZZ -->
-    <target name="bundle-plugin-sip2sipaccregwizz">
-        <!-- Creates a bundle for the plugin Sip2Sip Account Registration Wizard.-->
-        <jar compress="false" destfile="${bundles.dest}/sip2sipaccregwizz.jar"
-            manifest="${src}/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/sip2sipaccregwizz"
-                prefix="net/java/sip/communicator/plugin/sip2sipaccregwizz"/>
-        </jar>
-    </target>
-
     <!-- BUNDLE-PLUGIN-IPPIACCREGWIZZ -->
     <target name="bundle-plugin-ippiaccregwizz">
         <!-- Creates a bundle for the plugin ippi Account Registration Wizard.-->
diff --git a/resources/images/images.properties b/resources/images/images.properties
index 643e9ca..b7de44a 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -465,10 +465,6 @@ service.protocol.googletalk.GTALK_64x64=resources/images/protocol/googletalk/log
 service.protocol.iptel.IPTEL_16x16=resources/images/protocol/iptel/sip16x16.png
 service.protocol.iptel.IPTEL_64x64=resources/images/protocol/iptel/sip64x64.png
 
-# sip2sip accregwizz
-service.protocol.sip2sip.SIP2SIP_16x16=resources/images/protocol/sip2sip/sip16x16.png
-service.protocol.sip2sip.SIP2SIP_64x64=resources/images/protocol/sip2sip/sip64x64.png
-
 # ippi accregwizz
 service.protocol.ippi.IPPI_16x16=resources/images/protocol/ippi/sip16x16.png
 service.protocol.ippi.IPPI_64x64=resources/images/protocol/ippi/sip64x64.png
diff --git a/resources/images/protocol/sip2sip/sip16x16-away.png b/resources/images/protocol/sip2sip/sip16x16-away.png
deleted file mode 100644
index cc2d146..0000000
--- a/resources/images/protocol/sip2sip/sip16x16-away.png
+++ /dev/null
diff --git a/resources/images/protocol/sip2sip/sip16x16-busy.png b/resources/images/protocol/sip2sip/sip16x16-busy.png
deleted file mode 100644
index b3e14e2..0000000
--- a/resources/images/protocol/sip2sip/sip16x16-busy.png
+++ /dev/null
diff --git a/resources/images/protocol/sip2sip/sip16x16-meeting.png b/resources/images/protocol/sip2sip/sip16x16-meeting.png
deleted file mode 100644
index 20b191a..0000000
--- a/resources/images/protocol/sip2sip/sip16x16-meeting.png
+++ /dev/null
diff --git a/resources/images/protocol/sip2sip/sip16x16-offline.png b/resources/images/protocol/sip2sip/sip16x16-offline.png
deleted file mode 100644
index ca74f64..0000000
--- a/resources/images/protocol/sip2sip/sip16x16-offline.png
+++ /dev/null
diff --git a/resources/images/protocol/sip2sip/sip16x16-online.png b/resources/images/protocol/sip2sip/sip16x16-online.png
deleted file mode 100644
index cd05e31..0000000
--- a/resources/images/protocol/sip2sip/sip16x16-online.png
+++ /dev/null
diff --git a/resources/images/protocol/sip2sip/sip16x16-phone.png b/resources/images/protocol/sip2sip/sip16x16-phone.png
deleted file mode 100644
index 0babceb..0000000
--- a/resources/images/protocol/sip2sip/sip16x16-phone.png
+++ /dev/null
diff --git a/resources/images/protocol/sip2sip/sip16x16.png b/resources/images/protocol/sip2sip/sip16x16.png
deleted file mode 100644
index cd05e31..0000000
--- a/resources/images/protocol/sip2sip/sip16x16.png
+++ /dev/null
diff --git a/resources/images/protocol/sip2sip/sip32x32.png b/resources/images/protocol/sip2sip/sip32x32.png
deleted file mode 100644
index 2b77182..0000000
--- a/resources/images/protocol/sip2sip/sip32x32.png
+++ /dev/null
diff --git a/resources/images/protocol/sip2sip/sip48x48.png b/resources/images/protocol/sip2sip/sip48x48.png
deleted file mode 100644
index ffcaeeb..0000000
--- a/resources/images/protocol/sip2sip/sip48x48.png
+++ /dev/null
diff --git a/resources/images/protocol/sip2sip/sip64x64.png b/resources/images/protocol/sip2sip/sip64x64.png
deleted file mode 100644
index 9c7babe..0000000
--- a/resources/images/protocol/sip2sip/sip64x64.png
+++ /dev/null
diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 9fcbdbd..2a36c4f 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -1356,19 +1356,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, the IP Telecommunications
 plugin.iptelaccregwizz.USERNAME=User name
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Subscribe to iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP and chat
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Username
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Retype password
 plugin.sip2sipaccregwizz.EMAIL=Email address
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=For help about this service visit<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>The email address is used to send voicemail messages, <br>missed calls notifications and to recover a lost password</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>For help about this service visit <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Existing sip2sip.info account
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Create a free sip2sip.info account
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Instant Messaging
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=For help about this service visit<br>http://ippi.fr
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/CreateSip2SipAccountForm.java b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/CreateSip2SipAccountForm.java
deleted file mode 100644
index aa38c69..0000000
--- a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/CreateSip2SipAccountForm.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Copyright @ 2015 Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.java.sip.communicator.plugin.sip2sipaccregwizz;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.net.*;
-
-import javax.swing.*;
-import javax.swing.text.*;
-
-import net.java.sip.communicator.plugin.ippiaccregwizz.*;
-import net.java.sip.communicator.plugin.sipaccregwizz.*;
-import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.plugin.desktoputil.*;
-
-import org.json.simple.*;
-
-/**
- * @author Yana Stamcheva
- */
-public class CreateSip2SipAccountForm
-    extends TransparentPanel
-    implements SIPAccountCreationFormService
-{
-    /**
-     * Serial version UID.
-     */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * The logger.
-     */
-    private static final Logger logger
-        = Logger.getLogger(CreateSip2SipAccountForm.class);
-
-    /**
-     * The user name text field.
-     */
-    private final JTextField usernameField = new TrimTextField();
-
-    /**
-     * The display name text field.
-     */
-    private final JTextField displayNameField = new JTextField();
-
-    /**
-     * The password field.
-     */
-    private final JPasswordField passField = new JPasswordField();
-
-    /**
-     * The retype password field.
-     */
-    private final JPasswordField retypePassField = new JPasswordField();
-
-    /**
-     * The email field.
-     */
-    private final JTextField emailField = new JTextField();
-
-    /**
-     * The error text pane.
-     */
-    private final JTextPane errorPane = new JTextPane();
-
-    /**
-     * The register link.
-     */
-    private static String registerLink
-        = "https://enrollment.sipthor.net/enrollment.phtml?";
-
-    /**
-     * Creates an instance of <tt>RegisterSip2SipAccountForm</tt>.
-     */
-    public CreateSip2SipAccountForm()
-    {
-        super(new BorderLayout());
-
-        this.init();
-    }
-
-    /**
-     * Initializes this panel.
-     */
-    private void init()
-    {
-        JPanel mainPanel = new TransparentPanel(new BorderLayout());
-
-        mainPanel.setBorder(BorderFactory.createTitledBorder(
-            Sip2SipAccRegWizzActivator.getResources()
-                .getI18NString("plugin.sipaccregwizz.CREATE_ACCOUNT_TITLE")));
-
-        JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1));
-
-        JPanel valuesPanel = new TransparentPanel(new GridLayout(0, 1));
-
-        JLabel usernameLabel
-            = new JLabel(Sip2SipAccRegWizzActivator.getResources()
-                    .getI18NString("plugin.sip2sipaccregwizz.USERNAME"));
-
-        JLabel displayNameLabel
-            = new JLabel(Sip2SipAccRegWizzActivator.getResources()
-                    .getI18NString("plugin.sipaccregwizz.DISPLAY_NAME"));
-
-        JLabel passLabel
-            = new JLabel(Sip2SipAccRegWizzActivator.getResources()
-                .getI18NString("service.gui.PASSWORD"));
-
-        JLabel retypePasswordLabel
-            = new JLabel(Sip2SipAccRegWizzActivator.getResources()
-            .getI18NString("plugin.sip2sipaccregwizz.RETYPE_PASSWORD"));
-
-        JLabel emailLabel
-            = new JLabel(Sip2SipAccRegWizzActivator.getResources()
-                .getI18NString("plugin.sip2sipaccregwizz.EMAIL"));
-
-        labelsPanel.add(displayNameLabel);
-        labelsPanel.add(usernameLabel);
-        labelsPanel.add(passLabel);
-        labelsPanel.add(retypePasswordLabel);
-        labelsPanel.add(emailLabel);
-
-        valuesPanel.add(displayNameField);
-        valuesPanel.add(usernameField);
-        valuesPanel.add(passField);
-        valuesPanel.add(retypePassField);
-        valuesPanel.add(emailField);
-
-        JLabel emailDescriptionLabel
-            = new JLabel(Sip2SipAccRegWizzActivator.getResources()
-                .getI18NString("plugin.sip2sipaccregwizz.EMAIL_NOTE"),
-                SwingConstants.CENTER);
-        emailDescriptionLabel.setForeground(Color.GRAY);
-        emailDescriptionLabel.setFont(emailDescriptionLabel.getFont().deriveFont(8));
-        emailDescriptionLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 8, 10));
-
-        initErrorArea();
-
-        mainPanel.add(labelsPanel, BorderLayout.WEST);
-        mainPanel.add(valuesPanel, BorderLayout.CENTER);
-        mainPanel.add(emailDescriptionLabel, BorderLayout.SOUTH);
-
-        this.add(mainPanel, BorderLayout.CENTER);
-
-        JLabel infoLabel
-            = new JLabel(Sip2SipAccRegWizzActivator.getResources()
-                .getI18NString("plugin.sip2sipaccregwizz.INFO_NOTE"),
-                SwingConstants.RIGHT);
-        infoLabel.setCursor(new Cursor(Cursor.HAND_CURSOR));
-        infoLabel.setForeground(Color.GRAY);
-        infoLabel.setFont(emailDescriptionLabel.getFont().deriveFont(8));
-        infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 8, 0));
-        infoLabel.addMouseListener(new MouseAdapter()
-        {
-            @Override
-            public void mousePressed(MouseEvent e)
-            {
-                Sip2SipAccRegWizzActivator.getBrowserLauncher()
-                    .openURL("http://wiki.sip2sip.info");
-            }
-        });
-
-        this.add(infoLabel, BorderLayout.SOUTH);
-    }
-
-    /**
-     * Creates the error area component.
-     */
-    private void initErrorArea()
-    {
-        SimpleAttributeSet attribs = new SimpleAttributeSet();
-        StyleConstants.setAlignment(attribs, StyleConstants.ALIGN_RIGHT);
-        StyleConstants.setFontFamily(attribs, errorPane.getFont().getFamily());
-        StyleConstants.setForeground(attribs, Color.RED);
-        errorPane.setParagraphAttributes(attribs, true);
-        errorPane.setPreferredSize(new Dimension(100, 50));
-        errorPane.setMinimumSize(new Dimension(100, 50));
-        errorPane.setOpaque(false);
-    }
-
-    /**
-     * Creates this account on the server.
-     * @return the created account
-     */
-    public NewAccount createAccount()
-    {
-        // Check if the two passwords match.
-        String pass1 = new String( passField.getPassword());
-        String pass2 = new String( retypePassField.getPassword());
-        if (!pass1.equals(pass2))
-        {
-            showErrorMessage(
-                IppiAccRegWizzActivator.getResources().getI18NString(
-                    "plugin.sipaccregwizz.NOT_SAME_PASSWORD"));
-
-            return null;
-        }
-
-        NewAccount newAccount = null;
-        try
-        {
-            StringBuilder registerLinkBuilder = new StringBuilder(registerLink);
-            registerLinkBuilder
-                .append(URLEncoder.encode("email", "UTF-8"))
-                .append("=").append(
-                    URLEncoder.encode(emailField.getText(), "UTF-8"))
-                .append("&").append(URLEncoder.encode("password", "UTF-8"))
-                .append("=").append(
-                    URLEncoder.encode(new String(passField.getPassword()), "UTF-8"))
-                .append("&").append(URLEncoder.encode("display_name", "UTF-8"))
-                .append("=").append(
-                    URLEncoder.encode(displayNameField.getText(), "UTF-8"))
-                .append("&").append(URLEncoder.encode("username", "UTF-8"))
-                .append("=").append(
-                    URLEncoder.encode(usernameField.getText(), "UTF-8"))
-                .append("&").append(URLEncoder.encode("user_agent", "UTF-8"))
-                .append("=").append(
-                    URLEncoder.encode("sip-communicator.org", "UTF-8"));
-
-            URL url = new URL(registerLinkBuilder.toString());
-            URLConnection conn = url.openConnection();
-
-            // If this is not an http connection we have nothing to do here.
-            if (!(conn instanceof HttpURLConnection))
-            {
-                return null;
-            }
-
-            HttpURLConnection httpConn = (HttpURLConnection) conn;
-
-            int responseCode = httpConn.getResponseCode();
-
-            if (responseCode == HttpURLConnection.HTTP_OK)
-            {
-                // Read all the text returned by the server
-                BufferedReader in = new BufferedReader(
-                    new InputStreamReader(conn.getInputStream()));
-                String str;
-
-                StringBuffer stringBuffer = new StringBuffer();
-                while ((str = in.readLine()) != null)
-                {
-                    stringBuffer.append(str);
-                }
-
-                if (logger.isInfoEnabled())
-                    logger.info("JSON response to create account request: "
-                        + stringBuffer.toString());
-
-                newAccount = parseHttpResponse(stringBuffer.toString());
-            }
-        }
-        catch (MalformedURLException e1)
-        {
-            if (logger.isInfoEnabled())
-                logger.info("Failed to create URL with string: "
-                        + registerLink, e1);
-        }
-        catch (IOException e1)
-        {
-            if (logger.isInfoEnabled())
-                logger.info("Failed to open connection.", e1);
-        }
-        return newAccount;
-    }
-
-    /**
-     * Returns the form, which would be used by the user to create a new
-     * account.
-     * @return the component of the form
-     */
-    public Component getForm()
-    {
-        return this;
-    }
-
-    /**
-     * Clears all the data previously entered in the form.
-     */
-    public void clear()
-    {
-        usernameField.setText("");
-        displayNameField.setText("");
-        passField.setText("");
-        retypePassField.setText("");
-        emailField.setText("");
-        errorPane.setText("");
-
-        remove(errorPane);
-    }
-
-    /**
-     * Parses the given http response.
-     * @param response the http response to parse
-     * @return the new account
-     */
-    private NewAccount parseHttpResponse(String response)
-    {
-        NewAccount newAccount = null;
-        try
-        {
-            JSONObject jsonObject = (JSONObject)JSONValue
-                .parseWithException(response);
-            boolean isSuccess = (Boolean)jsonObject.get("success");
-
-            if (isSuccess)
-            {
-                newAccount = new NewAccount(
-                    (String)jsonObject.get("sip_address"),
-                    passField.getPassword(),
-                    null,
-                    (String)jsonObject.get("outbound_proxy"));
-
-                String xcapRoot = (String)jsonObject.get("xcap_root");
-
-                // as sip2sip adds @sip2sip.info at the end of the
-                // xcap_uri but doesn't report it in resullt after
-                // creating account, we add it
-                String domain = null;
-                int delimIndex = newAccount.getUserName().indexOf("@");
-                if (delimIndex != -1)
-                {
-                    domain = newAccount.getUserName().substring(delimIndex);
-                }
-                if(domain != null)
-                {
-                    if(xcapRoot.endsWith("/"))
-                        xcapRoot =
-                            xcapRoot.substring(0, xcapRoot.length() - 1)
-                            + domain;
-                    else
-                        xcapRoot += domain;
-                }
-
-                newAccount.setXcapRoot(xcapRoot);
-            }
-            else
-            {
-                showErrorMessage((String)jsonObject.get("error_message"));
-            }
-        }
-        catch (Throwable e1)
-        {
-            if (logger.isInfoEnabled())
-                logger.info("Failed Json parsing.", e1);
-        }
-
-        return newAccount;
-    }
-
-    /**
-     * Shows the given error message.
-     *
-     * @param text the text of the error
-     */
-    private void showErrorMessage(String text)
-    {
-        errorPane.setText(text);
-
-        if (errorPane.getParent() == null)
-            add(errorPane, BorderLayout.NORTH);
-
-        SwingUtilities.getWindowAncestor(CreateSip2SipAccountForm.this).pack();
-    }
-}
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccRegWizzActivator.java
deleted file mode 100644
index bb13f2b..0000000
--- a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccRegWizzActivator.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Copyright @ 2015 Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.java.sip.communicator.plugin.sip2sipaccregwizz;
-
-import java.util.*;
-
-import net.java.sip.communicator.service.browserlauncher.*;
-import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.resources.*;
-
-import org.jitsi.service.resources.*;
-import org.osgi.framework.*;
-
-/**
- * Registers the <tt>GoogleTalkAccountRegistrationWizard</tt> in the UI Service.
- *
- * @author Lubomir Marinov
- * @author Yana Stamcheva
- */
-public class Sip2SipAccRegWizzActivator
-    implements BundleActivator
-{
-    /**
-     * The bundle context.
-     */
-    public static BundleContext bundleContext;
-
-    /**
-     * The browser launcher service.
-     */
-    private static BrowserLauncherService browserLauncherService;
-
-    /**
-     * The resources service.
-     */
-    private static ResourceManagementService resourcesService;
-
-    /**
-     * The ui service.
-     */
-    private static UIService uiService;
-
-    /**
-     * Starts this bundle.
-     * @param bc BundleContext
-     * @throws Exception
-     */
-    public void start(BundleContext bc)
-        throws Exception
-    {
-        bundleContext = bc;
-
-        System.setProperty(
-            "http.agent",
-            System.getProperty("sip-communicator.application.name")
-                + "/"
-                + System.getProperty("sip-communicator.version"));
-
-        uiService =
-            (UIService) bundleContext.getService(bundleContext
-                .getServiceReference(UIService.class.getName()));
-
-        Sip2SipAccountRegistrationWizard wizard
-            = new Sip2SipAccountRegistrationWizard(uiService
-                .getAccountRegWizardContainer());
-
-        Hashtable<String, String> containerFilter
-            = new Hashtable<String, String>();
-        containerFilter.put(
-                ProtocolProviderFactory.PROTOCOL,
-                Sip2SipAccountRegistrationWizard.PROTOCOL);
-
-        bundleContext.registerService(
-            AccountRegistrationWizard.class.getName(),
-            wizard,
-            containerFilter);
-    }
-
-    public void stop(BundleContext bundleContext) throws Exception {}
-
-    /**
-     * Returns the <tt>UIService</tt>.
-     *
-     * @return the <tt>UIService</tt>
-     */
-    public static UIService getUIService()
-    {
-        return uiService;
-    }
-
-    /**
-     * Returns the <tt>BrowserLauncherService</tt> obtained from the bundle
-     * context.
-     * @return the <tt>BrowserLauncherService</tt> obtained from the bundle
-     * context
-     */
-    public static BrowserLauncherService getBrowserLauncher()
-    {
-        if (browserLauncherService == null)
-        {
-            browserLauncherService
-                = (BrowserLauncherService) bundleContext.getService(
-                    bundleContext.getServiceReference(
-                        BrowserLauncherService.class.getName()));
-        }
-        return browserLauncherService;
-    }
-
-    /**
-     * Returns the service giving access to resources.
-     * @return the service giving access to resources
-     */
-    public static ResourceManagementService getResources()
-    {
-        if (resourcesService == null)
-            resourcesService = ResourceManagementServiceUtils
-                .getService(Sip2SipAccRegWizzActivator.bundleContext);
-        return resourcesService;
-    }
-}
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
deleted file mode 100644
index 55e6f36..0000000
--- a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/Sip2SipAccountRegistrationWizard.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Copyright @ 2015 Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package net.java.sip.communicator.plugin.sip2sipaccregwizz;
-
-import java.util.*;
-
-import net.java.sip.communicator.plugin.sipaccregwizz.*;
-import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.protocol.sip.*;
-
-/**
- * The <tt>Sip2SipAccountRegistrationWizard</tt> is an implementation of the
- * <tt>AccountRegistrationWizard</tt> for the SIP protocol. It should allow
- * the user to create and configure a new IP Tel SIP account.
- *
- * @author Yana Stamcheva
- */
-public class Sip2SipAccountRegistrationWizard
-    extends SIPAccountRegistrationWizard
-{
-    /**
-     * A constant pointing to the IP Tel protocol logo image.
-     */
-    private static final String PROTOCOL_ICON
-        = "service.protocol.sip2sip.SIP2SIP_16x16";
-
-    /**
-     * A constant pointing to the IP Tel protocol wizard page image.
-     */
-    private static final String PAGE_IMAGE
-        = "service.protocol.sip2sip.SIP2SIP_64x64";
-
-    /**
-     * The protocol name.
-     */
-    public static final String PROTOCOL = "sip2sip.info";
-
-    /**
-     * The create account form.
-     */
-    CreateSip2SipAccountForm createAccountForm = new CreateSip2SipAccountForm();
-
-    /**
-     * Creates an instance of <tt>IptelAccountRegistrationWizard</tt>.
-     * @param wizardContainer the wizard container
-     */
-    public Sip2SipAccountRegistrationWizard(WizardContainer wizardContainer)
-    {
-        super(wizardContainer);
-    }
-
-    /**
-     * Returns the set of pages contained in this wizard.
-     * @return Iterator
-     */
-    @Override
-    public Iterator<WizardPage> getPages()
-    {
-        SIPAccountRegistration reg = new SIPAccountRegistration();
-
-        setPredefinedProperties(reg);
-
-        return getPages(reg);
-    }
-
-    /**
-     * Returns a simple account registration form that would be the first form
-     * shown to the user. Only if the user needs more settings she'll choose
-     * to open the advanced wizard, consisted by all pages.
-     *
-     * @param isCreateAccount indicates if the simple form should be opened as
-     * a create account form or as a login form
-     * @return a simple account registration form
-     */
-    @Override
-    public Object getSimpleForm(boolean isCreateAccount)
-    {
-        SIPAccountRegistration reg = new SIPAccountRegistration();
-
-        setPredefinedProperties(reg);
-
-        return getSimpleForm(reg, isCreateAccount);
-    }
-
-    /**
-     * Sets all predefined properties specific for this account wizard.
-     *
-     * @param reg the registration object
-     */
-    private void setPredefinedProperties(SIPAccountRegistration reg)
-    {
-        // set properties common for sip2sip
-        reg.setKeepAliveMethod("NONE");
-        reg.setDefaultDomain("sip2sip.info");
-        reg.setXCapEnable(true);
-        reg.setClistOptionServerUri(
-                "https://xcap.sipthor.net/xcap-root@sip2sip.info");
-        reg.setClistOptionUseSipCredentials(true);
-    }
-
-    /**
-     * Implements the <code>AccountRegistrationWizard.getIcon</code> method.
-     * Returns the icon to be used for this wizard.
-     * @return byte[]
-     */
-    @Override
-    public byte[] getIcon()
-    {
-        return Sip2SipAccRegWizzActivator.getResources()
-            .getImageInBytes(PROTOCOL_ICON);
-    }
-
-    /**
-     * Implements the <code>AccountRegistrationWizard.getPageImage</code> method.
-     * Returns the image used to decorate the wizard page
-     *
-     * @return byte[] the image used to decorate the wizard page
-     */
-    @Override
-    public byte[] getPageImage()
-    {
-        return Sip2SipAccRegWizzActivator.getResources()
-            .getImageInBytes(PAGE_IMAGE);
-    }
-
-    /**
-     * Implements the <code>AccountRegistrationWizard.getProtocolName</code>
-     * method. Returns the protocol name for this wizard.
-     * @return String
-     */
-    @Override
-    public String getProtocolName()
-    {
-        return Resources.getString(
-            "plugin.sip2sipaccregwizz.PROTOCOL_NAME");
-    }
-
-    /**
-     * Implements the <code>AccountRegistrationWizard.getProtocolDescription
-     * </code> method. Returns the description of the protocol for this wizard.
-     * @return String
-     */
-    @Override
-    public String getProtocolDescription()
-    {
-        return Resources.getString(
-            "plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION");
-    }
-
-    /**
-     * Returns an example string, which should indicate to the user how the
-     * user name should look like.
-     * @return an example string, which should indicate to the user how the
-     * user name should look like.
-     */
-    @Override
-    public String getUserNameExample()
-    {
-        return "Ex: myusername or myusername@sip2sip.info";
-    }
-
-    /**
-     * Returns the protocol name as listed in "ProtocolNames" or just the name
-     * of the service.
-     * @return the protocol name
-     */
-    @Override
-    public String getProtocol()
-    {
-        return PROTOCOL;
-    }
-
-    /**
-     * Returns the protocol icon path.
-     * @return the protocol icon path
-     */
-    @Override
-    public String getProtocolIconPath()
-    {
-        return "resources/images/protocol/sip2sip";
-    }
-
-    /**
-     * Returns the account icon path.
-     * @return the account icon path
-     */
-    @Override
-    public String getAccountIconPath()
-    {
-        return "resources/images/protocol/sip2sip/sip32x32.png";
-    }
-
-    /**
-     * Opens the browser on the page sign up
-     */
-    @Override
-    public void webSignup()
-    {
-        Sip2SipAccRegWizzActivator.getBrowserLauncher()
-            .openURL("http://wiki.sip2sip.info");
-    }
-
-    /**
-     * Returns the name of the web sign up link.
-     * @return the name of the web sign up link
-     */
-    @Override
-    public String getWebSignupLinkName()
-    {
-        return Resources.getString("plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE");
-    }
-
-    /**
-     * Returns an instance of <tt>CreateAccountService</tt> through which the
-     * user could create an account. This method is meant to be implemented by
-     * specific protocol provider wizards.
-     * @return an instance of <tt>CreateAccountService</tt>
-     */
-    @Override
-    protected SIPAccountCreationFormService getCreateAccountService()
-    {
-        return createAccountForm;
-    }
-
-    /**
-     * Returns the display label used for the sip id field.
-     * @return the sip id display label string.
-     */
-    @Override
-    protected String getUsernameLabel()
-    {
-        return Resources.getString("plugin.sip2sipaccregwizz.USERNAME");
-    }
-
-    /**
-     * Return the string for add existing account button.
-     * @return the string for add existing account button.
-     */
-    @Override
-    protected String getExistingAccountLabel()
-    {
-        return Resources.getString("plugin.sip2sipaccregwizz.EXISTING_ACCOUNT");
-    }
-
-    /**
-     * Return the string for create new account button.
-     * @return the string for create new account button.
-     */
-    @Override
-    protected String getCreateAccountLabel()
-    {
-        return Resources.getString("plugin.sip2sipaccregwizz.CREATE_ACCOUNT");
-    }
-}
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
deleted file mode 100644
index 7ebbd1c..0000000
--- a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
+++ /dev/null
@@ -1,43 +0,0 @@
-Bundle-Activator: net.java.sip.communicator.plugin.sip2sipaccregwizz.Sip2SipAccRegWizzActivator

-Bundle-Name: Sip 2 Sip account registration wizard

-Bundle-Description: Sip 2 Sip account registration wizard.

-Bundle-Vendor: jitsi.org

-Bundle-Version: 0.0.1

-Bundle-SymbolicName: net.java.sip.communicator.plugin.sip2sipaccregwizz

-Import-Package: org.osgi.framework,

- net.java.sip.communicator.service.browserlauncher,

- org.jitsi.service.configuration,

- net.java.sip.communicator.service.contactlist,

- net.java.sip.communicator.service.contactlist.event,

- org.jitsi.service.fileaccess,

- net.java.sip.communicator.service.gui,

- net.java.sip.communicator.service.gui.event,

- net.java.sip.communicator.service.protocol,

- net.java.sip.communicator.service.protocol.event,

- net.java.sip.communicator.service.protocol.icqconstants,

- net.java.sip.communicator.service.protocol.sip,

- org.jitsi.service.resources, net.java.sip.communicator.service.resources,

- net.java.sip.communicator.util,

- net.java.sip.communicator.plugin.desktoputil,

- net.java.sip.communicator.plugin.sipaccregwizz,

- javax.naming,

- javax.naming.directory,

- javax.xml.parsers,

- org.w3c.dom,

- org.xml.sax,

- org.json.simple,

- 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,

- org.jivesoftware.smack