ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/3] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 09:02:23 GMT
# Renaming


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d128011c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d128011c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d128011c

Branch: refs/heads/master
Commit: d128011cf6e6aacd60d69a481fc341ba72968928
Parents: f0157bc
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 5 12:02:11 2014 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 5 12:02:11 2014 +0300

----------------------------------------------------------------------
 bin/ggstart.bat                                 |   4 +-
 bin/ggstart.sh                                  |   4 +-
 bin/include/parseargs.bat                       |   4 +-
 bin/include/service.sh                          |   2 +-
 .../main/java/org/apache/ignite/Ignition.java   |   2 +-
 .../ignite/startup/cmdline/AboutDialog.java     | 324 ++++++++++++++++++
 .../CommandLineRandomNumberGenerator.java       |  26 ++
 .../startup/cmdline/CommandLineStartup.java     | 328 +++++++++++++++++++
 .../startup/cmdline/CommandLineTransformer.java | 215 ++++++++++++
 .../startup/cmdline/IgniteAboutDialog.java      | 324 ------------------
 .../IgniteCommandLineRandomNumberGenerator.java |  26 --
 .../cmdline/IgniteCommandLineStartup.java       | 328 -------------------
 .../cmdline/IgniteCommandLineTransformer.java   | 215 ------------
 .../segmentation/GridSegmentationPolicy.java    |   2 +-
 .../cmdline/GridCommandLineLoaderTest.java      |   3 +-
 .../GridCommandLineTransformerSelfTest.java     |  21 +-
 .../gridgain/visor/commands/VisorConsole.scala  |   4 +-
 17 files changed, 915 insertions(+), 917 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/bin/ggstart.bat
----------------------------------------------------------------------
diff --git a/bin/ggstart.bat b/bin/ggstart.bat
index 59f196d..fb233e0 100644
--- a/bin/ggstart.bat
+++ b/bin/ggstart.bat
@@ -112,7 +112,7 @@ if %ERRORLEVEL% neq 0 (
 ::
 :: Process 'restart'.
 ::
-set RANDOM_NUMBER_COMMAND="%JAVA_HOME%\bin\java.exe" -cp %CP% org.gridgain.grid.startup.cmdline.GridCommandLineRandomNumberGenerator
+set RANDOM_NUMBER_COMMAND="%JAVA_HOME%\bin\java.exe" -cp %CP% org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator
 for /f "usebackq tokens=*" %%i in (`"%RANDOM_NUMBER_COMMAND%"`) do set RANDOM_NUMBER=%%i
 
 set RESTART_SUCCESS_FILE="%GRIDGAIN_HOME%\work\gridgain_success_%RANDOM_NUMBER%"
@@ -184,7 +184,7 @@ if %ENABLE_ASSERTIONS% == 1 set JVM_OPTS=%JVM_OPTS% -ea
 :: Set main class to start service (grid node by default).
 ::
 
-if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.gridgain.grid.startup.cmdline.GridCommandLineStartup
+if "%MAIN_CLASS%" == "" set MAIN_CLASS=org.apache.ignite.startup.cmdline.CommandLineStartup
 
 ::
 :: Remote debugging (JPDA).

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/bin/ggstart.sh
----------------------------------------------------------------------
diff --git a/bin/ggstart.sh b/bin/ggstart.sh
index 2ff497a..5aa65f1 100755
--- a/bin/ggstart.sh
+++ b/bin/ggstart.sh
@@ -55,7 +55,7 @@ fi
 . "${SCRIPTS_HOME}"/include/target-classpath.sh # Will be removed in release.
 CP="${GRIDGAIN_LIBS}"
 
-RANDOM_NUMBER=$("$JAVA" -cp "${CP}" org.gridgain.grid.startup.cmdline.GridCommandLineRandomNumberGenerator)
+RANDOM_NUMBER=$("$JAVA" -cp "${CP}" org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator)
 
 RESTART_SUCCESS_FILE="${GRIDGAIN_HOME}/work/gridgain_success_${RANDOM_NUMBER}"
 RESTART_SUCCESS_OPT="-DGRIDGAIN_SUCCESS_FILE=${RESTART_SUCCESS_FILE}"
@@ -117,7 +117,7 @@ fi
 # Set main class to start service (grid node by default).
 #
 if [ "${MAIN_CLASS}" = "" ]; then
-    MAIN_CLASS=org.gridgain.grid.startup.cmdline.GridCommandLineStartup
+    MAIN_CLASS=org.apache.ignite.startup.cmdline.CommandLineStartup
 fi
 
 #

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/bin/include/parseargs.bat
----------------------------------------------------------------------
diff --git a/bin/include/parseargs.bat b/bin/include/parseargs.bat
index 7497869..6a93b1a 100644
--- a/bin/include/parseargs.bat
+++ b/bin/include/parseargs.bat
@@ -33,11 +33,11 @@
 :: )
 :: in other scripts to parse common command lines parameters.
 
-set convertArgsCmd="%JAVA_HOME%\bin\java.exe" -cp %CP% org.gridgain.grid.startup.cmdline.GridCommandLineTransformer %*
+set convertArgsCmd="%JAVA_HOME%\bin\java.exe" -cp %CP% org.apache.ignite.startup.cmdline.CommandLineTransformer %*
 for /f "usebackq tokens=*" %%i in (`"%convertArgsCmd%"`) do set reformattedArgs=%%i
 
 for %%i in (%reformattedArgs%) do (
-    if "%%i" == "GridCommandLineTransformerError" exit /b 1
+    if "%%i" == "CommandLineTransformerError" exit /b 1
     set %%i
 )
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/bin/include/service.sh
----------------------------------------------------------------------
diff --git a/bin/include/service.sh b/bin/include/service.sh
index 9627e25..3ea105f 100755
--- a/bin/include/service.sh
+++ b/bin/include/service.sh
@@ -33,7 +33,7 @@ case "$1" in
         #
         # Resolve parameters.
         #
-        MAIN_CLASS="org.gridgain.grid.startup.cmdline.GridCommandLineStartup"
+        MAIN_CLASS="org.apache.ignite.startup.cmdline.CommandLineStartup"
         DEFAULT_CONFIG="default-config.xml"
 
         # Is needed for setenv

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/main/java/org/apache/ignite/Ignition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index 3ddf8d4..55bcd52 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -25,7 +25,7 @@ import java.util.*;
  * often started and stopped by grid loaders. Grid loaders can be found in
  * {@link org.gridgain.grid.startup} package, for example:
  * <ul>
- * <li>{@link org.apache.ignite.startup.cmdline.IgniteCommandLineStartup}</li>
+ * <li>{@link org.apache.ignite.startup.cmdline.CommandLineStartup}</li>
  * <li>{@gglink org.gridgain.grid.startup.servlet.GridServletStartup}</li>
  * </ul>
  * <h1 class="header">Examples</h1>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
new file mode 100644
index 0000000..8efaa50
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/AboutDialog.java
@@ -0,0 +1,324 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.startup.cmdline;
+
+import javax.imageio.*;
+import javax.swing.*;
+import javax.swing.border.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.*;
+import java.io.*;
+import java.net.*;
+import java.text.*;
+import java.util.*;
+
+/**
+ * About dialog.
+ */
+public class AboutDialog extends JDialog {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Border color. */
+    private static final Color VALUE_BORDER_COLOR = new Color(0xcdcdcd);
+
+    /** Global reference to about dialog to prevent double open. */
+    private static AboutDialog aboutDlg;
+
+    /** Application name */
+    private final String appName;
+
+    /** Banner icon url spec */
+    private final String bannerSpec;
+
+    /** Version. */
+    private final String ver;
+
+    /** Release date. */
+    private final Date release;
+
+    /** Copyright. */
+    private final String copyright;
+
+    /** Grid bag constraints. */
+    private final GridBagConstraints gbc;
+
+    /**
+     * @param appName Application name.
+     * @param bannerSpec Banner icon url spec.
+     * @param ver Version.
+     * @param release Release date.
+     * @param copyright Copyright.
+     */
+    AboutDialog(String appName, String bannerSpec, String ver, Date release, String copyright) {
+        this.appName = appName;
+
+        this.bannerSpec = bannerSpec;
+
+        this.ver = ver;
+        this.release = release;
+        this.copyright = copyright;
+
+        gbc = new GridBagConstraints();
+        gbc.fill = GridBagConstraints.HORIZONTAL;
+
+        initDialog();
+    }
+
+    /** Close action. */
+    private Action closeAct = new AbstractAction("Close") {
+        @Override public void actionPerformed(ActionEvent e) {
+            assert SwingUtilities.isEventDispatchThread();
+
+            dispose();
+        }
+    };
+
+    /** Close button. */
+    private JButton closeBtn = new JButton(closeAct);
+
+    /**
+     * Create and initialize dialog controls.
+     *
+     * @return Panel with dialog controls.
+     */
+    private JPanel initComponents() {
+        JPanel content = new JPanel(new BorderLayout(0, 5));
+
+        content.add(createBannerPanel(), BorderLayout.NORTH);
+        content.add(createLicensePanel(), BorderLayout.CENTER);
+        content.add(createButtonPanel(), BorderLayout.SOUTH);
+
+        return content;
+    }
+
+    /**
+     * @return Panel with banner.
+     */
+    private JPanel createBannerPanel() {
+        JPanel bannerPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 5));
+
+        bannerPanel.setBackground(Color.WHITE);
+
+        try {
+            URL url = new URL(bannerSpec);
+
+            BufferedImage image = ImageIO.read(url);
+
+            bannerPanel.add(new JLabel(new ImageIcon(image)));
+        }
+        catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+
+        JPanel msgPanel = new JPanel();
+        msgPanel.setLayout(new BoxLayout(msgPanel, BoxLayout.Y_AXIS));
+        msgPanel.setBackground(Color.WHITE);
+
+        msgPanel.add(new JLabel("<html><b>About GridGain</b></html>"));
+        msgPanel.add(Box.createVerticalStrut(5));
+        msgPanel.add(new JLabel(appName));
+
+        bannerPanel.add(msgPanel);
+
+        return bannerPanel;
+    }
+
+    /**
+     * Creates strut.
+     *
+     * @return Grid bag constraints.
+     */
+    private GridBagConstraints gbcStrut() {
+        gbc.gridx = 0;
+        gbc.gridwidth = GridBagConstraints.REMAINDER;
+
+        gbc.insets = new Insets(5, 0, 0, 0);
+
+        return gbc;
+    }
+
+    /**
+     * @return Grid bag constraints.
+     */
+    private GridBagConstraints gbcSeparator() {
+        gbc.gridx = 0;
+        gbc.gridwidth = GridBagConstraints.REMAINDER;
+
+        gbc.insets = new Insets(5, 10, 10, 10);
+
+        return gbc;
+    }
+
+    /**
+     * License label.
+     *
+     * @return Grid bag constraints.
+     */
+    private GridBagConstraints gbcLicenseLabel() {
+        gbc.gridx = 0;
+        gbc.gridwidth = GridBagConstraints.RELATIVE;
+        gbc.anchor = GridBagConstraints.WEST;
+
+        gbc.insets = new Insets(0, 10, 5, 0);
+
+        return gbc;
+    }
+
+    /**
+     * License field.
+     *
+     * @return Grid bag constraints.
+     */
+    private GridBagConstraints gbcLicenseField() {
+        gbc.gridx = 1;
+        gbc.gridwidth = GridBagConstraints.RELATIVE;
+        gbc.weightx = 400;
+
+        gbc.insets = new Insets(0, 10, 5, 10);
+
+        return gbc;
+    }
+
+    /**
+     * @return Panel with controls to display license.
+     */
+    private JPanel createLicensePanel() {
+        JPanel licPanel = new JPanel(new GridBagLayout());
+
+        licPanel.add(Box.createVerticalGlue(), gbcStrut());
+
+        addAboutItem(licPanel, "Version:", ver);
+        addAboutItem(licPanel, "Release Date:", new SimpleDateFormat("dd MMM yyyy").format(release));
+        addAboutItem(licPanel, "Copyright:", copyright);
+
+        return licPanel;
+    }
+
+    /**
+     * @return Panel with close button.
+     */
+    private JPanel createButtonPanel() {
+        closeBtn.setAction(closeAct);
+        closeBtn.setToolTipText("<html><b>Closes</b> Dialog</html>");
+
+        JPanel btnPanel = new JPanel();
+        btnPanel.add(closeBtn);
+
+        return btnPanel;
+    }
+
+    /**
+     * Initialize dialog.
+     */
+    private void initDialog() {
+        setContentPane(initComponents());
+
+        pack();
+
+        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+
+        getRootPane().setDefaultButton(closeBtn);
+        setEscAction(closeAct);
+
+        setModal(true);
+
+        setResizable(false);
+    }
+
+    /**
+     * Add name and value labels.
+     *
+     * @param c Component.
+     * @param name Name.
+     * @param val Value.
+     */
+    private void addAboutItem(JComponent c, String name, Object val) {
+        addAboutItem(c, name, val, null);
+    }
+
+    /**
+     * Add name and value labels.
+     *
+     * @param c Component.
+     * @param name Name.
+     * @param val Value.
+     * @param border Border.
+     */
+    private void addAboutItem(JComponent c, String name, Object val, Border border) {
+        String v = val != null ? val.toString() : "n/a";
+        String tip = String.format("<html><b>%s</b> &#10159; %s</html>", name, val);
+
+        JLabel lb = new JLabel(name);
+        lb.setToolTipText(tip);
+
+        JLabel field = new JLabel(v);
+        field.setOpaque(true);
+        field.setBackground(Color.WHITE);
+        field.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(VALUE_BORDER_COLOR, 1),
+            BorderFactory.createEmptyBorder(0, 3, 0, 3)));
+
+        field.setToolTipText(tip);
+
+        if (border != null)
+            field.setBorder(border);
+
+        c.add(lb, gbcLicenseLabel());
+        c.add(field, gbcLicenseField());
+    }
+
+    /**
+     * Registers ESC button click with given action.
+     *
+     * @param act Escape button action.
+     */
+    private void setEscAction(ActionListener act) {
+        assert(act != null);
+
+        getRootPane().registerKeyboardAction(act,
+            KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0x0),
+            JComponent.WHEN_IN_FOCUSED_WINDOW
+        );
+    }
+
+    /**
+     * Show about dialog.
+     *
+     * @param appName Application name.
+     * @param bannerSpec Banner icon url spec.
+     * @param ver Version number.
+     * @param release Release date.
+     * @param copyright Copyright blurb.
+     */
+    public static void centerShow(final String appName, final String bannerSpec,
+        final String ver, final Date release, final String copyright) {
+        SwingUtilities.invokeLater(new Runnable() {
+            @SuppressWarnings("NonThreadSafeLazyInitialization")
+            @Override public void run() {
+                if (aboutDlg == null) {
+                    try {
+                        aboutDlg = new AboutDialog(appName, bannerSpec, ver, release, copyright);
+
+                        aboutDlg.setLocationRelativeTo(null);
+                        aboutDlg.setVisible(true);
+                    }
+                    finally {
+                        aboutDlg = null;
+                    }
+                }
+                else {
+                    aboutDlg.setLocationRelativeTo(null);
+                    aboutDlg.toFront();
+                }
+            }
+        });
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineRandomNumberGenerator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineRandomNumberGenerator.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineRandomNumberGenerator.java
new file mode 100644
index 0000000..c36de8c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineRandomNumberGenerator.java
@@ -0,0 +1,26 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.startup.cmdline;
+
+import java.util.*;
+
+/**
+ * Generates a random number and prints it to the console.
+ */
+public class CommandLineRandomNumberGenerator {
+    /**
+     * Main method.
+     *
+     * @param args Command line arguments.
+     */
+    public static void main(String[] args) {
+        System.out.println(UUID.randomUUID());
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
new file mode 100644
index 0000000..6b52625
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
@@ -0,0 +1,328 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.startup.cmdline;
+
+import org.apache.ignite.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.lang.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.io.*;
+import java.lang.reflect.*;
+import java.lang.reflect.Proxy;
+import java.net.*;
+import java.text.*;
+import java.util.*;
+import java.util.List;
+import java.util.concurrent.*;
+
+import static org.apache.ignite.IgniteState.*;
+import static org.gridgain.grid.GridSystemProperties.*;
+import static org.gridgain.grid.kernal.GridProductImpl.*;
+
+/**
+ * This class defines command-line GridGain startup. This startup can be used to start GridGain
+ * outside of any hosting environment from command line. This startup is a Java application with
+ * {@link #main(String[])} method that accepts command line arguments. It accepts just one
+ * parameter which is Spring XML configuration file path. You can run this class from command
+ * line without parameters to get help message.
+ * <p>
+ * Note that scripts {@code ${GRIDGAIN_HOME}/bin/ggstart.{sh|bat}} shipped with GridGain use
+ * this startup and you can use them as an example.
+ */
+@SuppressWarnings({"CallToSystemExit"})
+public final class CommandLineStartup {
+    /** Quite log flag. */
+    private static final boolean QUITE;
+
+    /** Build date. */
+    private static Date releaseDate;
+
+    /**
+     * Static initializer.
+     */
+    static {
+        String quiteStr = System.getProperty(GridSystemProperties.GG_QUIET);
+
+        boolean quite = true;
+
+        if (quiteStr != null) {
+            quiteStr = quiteStr.trim();
+
+            if (!quiteStr.isEmpty()) {
+                if ("false".equalsIgnoreCase(quiteStr))
+                    quite = false;
+                else if (!"true".equalsIgnoreCase(quiteStr)) {
+                    System.err.println("Invalid value for '" + GridSystemProperties.GG_QUIET +
+                        "' VM parameter (must be {true|false}): " + quiteStr);
+
+                    quite = false;
+                }
+            }
+        }
+
+        QUITE = quite;
+
+        // Mac OS specific customizations: app icon and about dialog.
+        try {
+            releaseDate = new SimpleDateFormat("ddMMyyyy", Locale.US).parse(RELEASE_DATE);
+
+            Class<?> appCls = Class.forName("com.apple.eawt.Application");
+
+            Object osxApp = appCls.getDeclaredMethod("getApplication").invoke(null);
+
+            String icoPath = "ggcube_node_128x128.png";
+
+            URL url = CommandLineStartup.class.getResource(icoPath);
+
+            assert url != null : "Unknown icon path: " + icoPath;
+
+            ImageIcon ico = new ImageIcon(url);
+
+            appCls.getDeclaredMethod("setDockIconImage", Image.class).invoke(osxApp, ico.getImage());
+
+            // Setting Up about dialog
+            Class<?> aboutHndCls = Class.forName("com.apple.eawt.AboutHandler");
+
+            final URL bannerUrl = CommandLineStartup.class.getResource("ggcube_node_48x48.png");
+
+            Object aboutHndProxy = Proxy.newProxyInstance(
+                appCls.getClassLoader(),
+                new Class<?>[] {aboutHndCls},
+                new InvocationHandler() {
+                    @Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable {
+                        AboutDialog.centerShow("GridGain Node", bannerUrl.toExternalForm(), VER,
+                            releaseDate, COPYRIGHT);
+
+                        return null;
+                    }
+                }
+            );
+
+            appCls.getDeclaredMethod("setAboutHandler", aboutHndCls).invoke(osxApp, aboutHndProxy);
+        }
+        catch (Throwable ignore) {
+            // Ignore.
+        }
+    }
+
+    /**
+     * Enforces singleton.
+     */
+    private CommandLineStartup() {
+        // No-op.
+    }
+
+    /**
+     * Exists with optional error message, usage show and exit code.
+     *
+     * @param errMsg Optional error message.
+     * @param showUsage Whether or not to show usage information.
+     * @param exitCode Exit code.
+     */
+    private static void exit(@Nullable String errMsg, boolean showUsage, int exitCode) {
+        if (errMsg != null)
+            X.error(errMsg);
+
+        String runner = System.getProperty(GG_PROG_NAME, "ggstart.{sh|bat}");
+
+        int space = runner.indexOf(' ');
+
+        runner = runner.substring(0, space == -1 ? runner.length() : space);
+
+        if (showUsage) {
+            boolean ggstart = runner.contains("ggstart.");
+
+            X.error(
+                "Usage:",
+                "    " + runner + (ggstart ? " [?]|[path {-v}]|[-i]" : " [?]|[-v]"),
+                "    Where:",
+                "    ?, /help, -help - show this message.",
+                "    -v              - verbose mode (quiet by default).");
+
+            if (ggstart) {
+                X.error(
+                    "    -i              - interactive mode (choose configuration file from list).",
+                    "    path            - path to Spring XML configuration file.",
+                    "                      Path can be absolute or relative to GRIDGAIN_HOME.",
+                    " ",
+                    "Spring file should contain one bean definition of Java type",
+                    "'org.gridgain.grid.GridConfiguration'. Note that bean will be",
+                    "fetched by the type and its ID is not used.");
+            }
+        }
+
+        System.exit(exitCode);
+    }
+
+    /**
+     * Tests whether argument is help argument.
+     *
+     * @param arg Command line argument.
+     * @return {@code true} if given argument is a help argument, {@code false} otherwise.
+     */
+    @SuppressWarnings({"IfMayBeConditional"})
+    private static boolean isHelp(String arg) {
+        String s;
+
+        if (arg.startsWith("--"))
+            s = arg.substring(2);
+        else if (arg.startsWith("-") || arg.startsWith("/") || arg.startsWith("\\"))
+            s = arg.substring(1);
+        else
+            s = arg;
+
+        return "?".equals(s) || "help".equalsIgnoreCase(s) || "h".equalsIgnoreCase(s);
+    }
+
+    /**
+     * Interactively asks for configuration file path.
+     *
+     * @return Configuration file path. {@code null} if operation  was cancelled.
+     * @throws IOException In case of error.
+     */
+    @Nullable private static String askConfigFile() throws IOException {
+        List<GridTuple3<String, Long, File>> files = GridConfigurationFinder.getConfigFiles();
+
+        String title = "Available configuration files:";
+
+        X.println(title);
+        X.println(U.dash(title.length()));
+
+        for (int i = 0; i < files.size(); i++)
+            System.out.println(i + ":\t" + files.get(i).get1());
+
+        X.print("\nChoose configuration file ('c' to cancel) [0]: ");
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+
+        String line = reader.readLine();
+
+        if ("c".equalsIgnoreCase(line)) {
+            System.out.println("\nOperation cancelled.");
+
+            return null;
+        }
+
+        if (line != null && line.isEmpty())
+            line = "0";
+
+        try {
+            GridTuple3<String, Long, File> file = files.get(Integer.valueOf(line));
+
+            X.println("\nUsing configuration: " + file.get1() + "\n");
+
+            return file.get3().getAbsolutePath();
+        }
+        catch (Exception ignored) {
+            X.error("\nInvalid selection: " + line);
+
+            return null;
+        }
+    }
+
+    /**
+     * Main entry point.
+     *
+     * @param args Command line arguments.
+     */
+    public static void main(String[] args) {
+        if (!QUITE) {
+            X.println("GridGain Command Line Startup, ver. " + ACK_VER);
+            X.println(COPYRIGHT);
+            X.println();
+        }
+
+        if (args.length > 1)
+            exit("Too many arguments.", true, -1);
+
+        if (args.length > 0 && isHelp(args[0]))
+            exit(null, true, 0);
+
+        if (args.length > 0 && args[0].isEmpty())
+            exit("Empty argument.", true, 1);
+
+        if (args.length > 0 && args[0].charAt(0) == '-')
+            exit("Invalid arguments: " + args[0], true, -1);
+
+        String cfg = null;
+
+        if (args.length > 0)
+            cfg = args[0];
+        else {
+            try {
+                cfg = askConfigFile();
+
+                if (cfg == null)
+                    exit(null, false, 0);
+            }
+            catch (IOException e) {
+                exit("Failed to run interactive mode: " + e.getMessage(), false, -1);
+            }
+        }
+
+        // Name of the grid loaded from the command line (unique in JVM).
+        final String gridName;
+
+        try {
+            gridName = G.start(cfg).name();
+        }
+        catch (Throwable e) {
+            e.printStackTrace();
+
+            String note = "";
+
+            if (X.hasCause(e, ClassNotFoundException.class))
+                note = "\nNote! You may use 'USER_LIBS' environment variable to specify your classpath.";
+
+            exit("Failed to start grid: " + e.getMessage() + note, false, -1);
+
+            return;
+        }
+
+        // Exit latch for the grid loaded from the command line.
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        G.addListener(new GridGainListener() {
+            @Override public void onStateChange(String name, IgniteState state) {
+                // Skip all grids except loaded from the command line.
+                if (!F.eq(gridName, name))
+                    return;
+
+                if (state == STOPPED || state == STOPPED_ON_SEGMENTATION)
+                    latch.countDown();
+            }
+        });
+
+        try {
+            latch.await();
+        }
+        catch (InterruptedException e) {
+            X.error("Start was interrupted (exiting): " + e.getMessage());
+        }
+
+        String code = System.getProperty(GG_RESTART_CODE);
+
+        if (code != null)
+            try {
+                System.exit(Integer.parseInt(code));
+            }
+            catch (NumberFormatException ignore) {
+                System.exit(0);
+            }
+        else
+            System.exit(0);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
new file mode 100644
index 0000000..aeb6274
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineTransformer.java
@@ -0,0 +1,215 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.startup.cmdline;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * This class is a workaround for a versatile problems with passing arguments to the GridGain Windows batch launcher
+ * scripts. It transforms command line options passed to the *.bat launcher scripts into a reformatted, adapted for
+ * Windows batch usage variables.
+ * <p>
+ * The idea behind the workaround is:<br>
+ * 1. User runs ggstart.bat with some args.<br>
+ * 2. ggstart.bat calls parseargs.bat with all that args.<br>
+ * 3. parsearg.bat runs this class with all that args.<br>
+ * 4. This class transforms the args and prints them out.<br>
+ * 5. parseargs.bat splits the output of this class and sets each variable it found.<br>
+ * 6. ggstart.bat uses environment variables as if they were defined by a user.
+ * <p>
+ *
+ * @see <a href="http://jcommander.org/">JCommander command line parameters parsing library</a>
+ */
+@SuppressWarnings("FieldCanBeLocal")
+public class CommandLineTransformer {
+    /** Prefix for every custom JVM option. */
+    static final String JVM_OPTION_PREFIX = "-J";
+
+    /** Flag to check in step 5 of the Workaround before splitting the output. */
+    private static final String TRANSFORMATION_FAILED_FLAG = "CommandLineTransformerError";
+
+    /** Delimiter used in step 5 of the Workaround. */
+    private static final String ARGS_DELIMITER = " ";
+
+    /** Interactive mode. */
+    private boolean interactive;
+
+    /** Verbose mode. */
+    private boolean verbose;
+
+    /** No pause mode. */
+    private boolean noPause;
+
+    /** Supported parameter, parsed manually. */
+    private String jvmOptions = "";
+
+    /** Supported parameter, parsed manually. */
+    private String springCfgPath = "";
+
+    /**
+     * Private constructor to promote usage of a factory method {@link #transform(String...)}.
+     */
+    private CommandLineTransformer() {
+        // No-op
+    }
+
+    /**
+     * Main method being triggered in step 3 of the Workaround.
+     * <p>
+     * Method prints out TRANSFORMATION_FAILED_FLAG if something went wrong.
+     *
+     * @param args Command line arguments passed by a user in step 1 of the Workaround.
+     */
+    public static void main(String[] args) {
+        PrintStream ps = null;
+
+        try {
+            // Intentionality configure output stream with UTF-8 encoding to support  non-ASCII named parameter values.
+            ps = new PrintStream(System.out, true, "UTF-8");
+
+            ps.println(transform(args));
+        }
+        catch (Throwable t) {
+            t.printStackTrace();
+
+            if (ps != null)
+                ps.println(TRANSFORMATION_FAILED_FLAG);
+        }
+    }
+
+    /**
+     * @param args Arguments.
+     * @return Transformed arguments.
+     */
+    public static String transform(String... args) {
+        assert args != null;
+
+        return new CommandLineTransformer().doTransformation(args);
+    }
+
+    /**
+     * Actually does arguments transformation.
+     *
+     * @param args Arguments.
+     * @return Transformed arguments.
+     */
+    private String doTransformation(String[] args) {
+        List<String> argsList = new ArrayList<>();
+
+        for (String arg : args) {
+            switch (arg) {
+                case "-i":
+                    interactive = true;
+
+                    break;
+
+                case "-v":
+                    verbose = true;
+
+                    break;
+
+                case "-np":
+                    noPause = true;
+
+                    break;
+
+                default:
+                    argsList.add(arg);
+            }
+        }
+
+        return reformatArguments(argsList);
+    }
+
+    /**
+     * Transforms parsed arguments into a string.
+     *
+     * @param args Non-standard arguments.
+     * @return Transformed arguments.
+     */
+    private String reformatArguments(List<String> args) {
+        StringBuilder sb = new StringBuilder();
+
+        addArgWithValue(sb, "INTERACTIVE", formatBooleanValue(interactive));
+        addArgWithValue(sb, "QUIET", "-DGRIDGAIN_QUIET=" + !verbose);
+        addArgWithValue(sb, "NO_PAUSE", formatBooleanValue(noPause));
+
+        parseJvmOptionsAndSpringConfig(args);
+
+        addArgWithValue(sb, "JVM_XOPTS", jvmOptions);
+        addArgWithValue(sb, "CONFIG", springCfgPath);
+
+        return sb.toString().trim();
+    }
+
+    /**
+     * Formats boolean value into a string one.
+     *
+     * @param val Boolean value to be formatted.
+     * @return 1 if val is true 0 otherwise.
+     */
+    private String formatBooleanValue(boolean val) {
+        return String.valueOf(val ? 1 : 0);
+    }
+
+    /**
+     * Transforms one argument.
+     *
+     * @param sb StringBuilder where transformation result will be written.
+     * @param arg Argument's name.
+     * @param val Argument's value.
+     */
+    private void addArgWithValue(StringBuilder sb, String arg, Object val) {
+        sb.append("\"");
+        sb.append(arg);
+        sb.append("=");
+        sb.append(val);
+        sb.append("\"");
+        sb.append(ARGS_DELIMITER);
+    }
+
+    /**
+     * Manually parses non-trivial (from JCommander point of view) arguments.
+     *
+     * @param args Collection of unknown (from JCommander point of view) arguments.
+     */
+    private void parseJvmOptionsAndSpringConfig(Iterable<String> args) {
+        for (String arg : args) {
+            if (arg.startsWith(JVM_OPTION_PREFIX)) {
+                String jvmOpt = arg.substring(JVM_OPTION_PREFIX.length());
+
+                if (!checkJVMOptionIsSupported(jvmOpt))
+                    throw new RuntimeException(JVM_OPTION_PREFIX + " JVM parameters for GridGain batch scripts " +
+                        "with double quotes are not supported. " +
+                        "Use JVM_OPTS environment variable to pass any custom JVM option.");
+
+                jvmOptions = jvmOptions.isEmpty() ? jvmOpt : jvmOptions + " " + jvmOpt;
+            }
+            else {
+                if (springCfgPath.isEmpty())
+                    springCfgPath = arg;
+                else
+                    throw new RuntimeException("Unrecognised parameter has been found: " + arg);
+            }
+        }
+    }
+
+    /**
+     * Check if a JVM option is supported. Unsupported options are those who
+     * need double quotes in the declaration. It's a limitation of a current Workaround
+     *
+     * @param jvmOpt JVM option to check.
+     * @return true if option is supported false otherwise.
+     */
+    private boolean checkJVMOptionIsSupported(String jvmOpt) {
+        return !(jvmOpt.contains("-XX:OnError") || jvmOpt.contains("-XX:OnOutOfMemoryError"));
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteAboutDialog.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteAboutDialog.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteAboutDialog.java
deleted file mode 100644
index 300a27c..0000000
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteAboutDialog.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.startup.cmdline;
-
-import javax.imageio.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.io.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-
-/**
- * About dialog.
- */
-public class IgniteAboutDialog extends JDialog {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Border color. */
-    private static final Color VALUE_BORDER_COLOR = new Color(0xcdcdcd);
-
-    /** Global reference to about dialog to prevent double open. */
-    private static IgniteAboutDialog aboutDlg;
-
-    /** Application name */
-    private final String appName;
-
-    /** Banner icon url spec */
-    private final String bannerSpec;
-
-    /** Version. */
-    private final String ver;
-
-    /** Release date. */
-    private final Date release;
-
-    /** Copyright. */
-    private final String copyright;
-
-    /** Grid bag constraints. */
-    private final GridBagConstraints gbc;
-
-    /**
-     * @param appName Application name.
-     * @param bannerSpec Banner icon url spec.
-     * @param ver Version.
-     * @param release Release date.
-     * @param copyright Copyright.
-     */
-    IgniteAboutDialog(String appName, String bannerSpec, String ver, Date release, String copyright) {
-        this.appName = appName;
-
-        this.bannerSpec = bannerSpec;
-
-        this.ver = ver;
-        this.release = release;
-        this.copyright = copyright;
-
-        gbc = new GridBagConstraints();
-        gbc.fill = GridBagConstraints.HORIZONTAL;
-
-        initDialog();
-    }
-
-    /** Close action. */
-    private Action closeAct = new AbstractAction("Close") {
-        @Override public void actionPerformed(ActionEvent e) {
-            assert SwingUtilities.isEventDispatchThread();
-
-            dispose();
-        }
-    };
-
-    /** Close button. */
-    private JButton closeBtn = new JButton(closeAct);
-
-    /**
-     * Create and initialize dialog controls.
-     *
-     * @return Panel with dialog controls.
-     */
-    private JPanel initComponents() {
-        JPanel content = new JPanel(new BorderLayout(0, 5));
-
-        content.add(createBannerPanel(), BorderLayout.NORTH);
-        content.add(createLicensePanel(), BorderLayout.CENTER);
-        content.add(createButtonPanel(), BorderLayout.SOUTH);
-
-        return content;
-    }
-
-    /**
-     * @return Panel with banner.
-     */
-    private JPanel createBannerPanel() {
-        JPanel bannerPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 5));
-
-        bannerPanel.setBackground(Color.WHITE);
-
-        try {
-            URL url = new URL(bannerSpec);
-
-            BufferedImage image = ImageIO.read(url);
-
-            bannerPanel.add(new JLabel(new ImageIcon(image)));
-        }
-        catch (IOException ioe) {
-            ioe.printStackTrace();
-        }
-
-        JPanel msgPanel = new JPanel();
-        msgPanel.setLayout(new BoxLayout(msgPanel, BoxLayout.Y_AXIS));
-        msgPanel.setBackground(Color.WHITE);
-
-        msgPanel.add(new JLabel("<html><b>About GridGain</b></html>"));
-        msgPanel.add(Box.createVerticalStrut(5));
-        msgPanel.add(new JLabel(appName));
-
-        bannerPanel.add(msgPanel);
-
-        return bannerPanel;
-    }
-
-    /**
-     * Creates strut.
-     *
-     * @return Grid bag constraints.
-     */
-    private GridBagConstraints gbcStrut() {
-        gbc.gridx = 0;
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-
-        gbc.insets = new Insets(5, 0, 0, 0);
-
-        return gbc;
-    }
-
-    /**
-     * @return Grid bag constraints.
-     */
-    private GridBagConstraints gbcSeparator() {
-        gbc.gridx = 0;
-        gbc.gridwidth = GridBagConstraints.REMAINDER;
-
-        gbc.insets = new Insets(5, 10, 10, 10);
-
-        return gbc;
-    }
-
-    /**
-     * License label.
-     *
-     * @return Grid bag constraints.
-     */
-    private GridBagConstraints gbcLicenseLabel() {
-        gbc.gridx = 0;
-        gbc.gridwidth = GridBagConstraints.RELATIVE;
-        gbc.anchor = GridBagConstraints.WEST;
-
-        gbc.insets = new Insets(0, 10, 5, 0);
-
-        return gbc;
-    }
-
-    /**
-     * License field.
-     *
-     * @return Grid bag constraints.
-     */
-    private GridBagConstraints gbcLicenseField() {
-        gbc.gridx = 1;
-        gbc.gridwidth = GridBagConstraints.RELATIVE;
-        gbc.weightx = 400;
-
-        gbc.insets = new Insets(0, 10, 5, 10);
-
-        return gbc;
-    }
-
-    /**
-     * @return Panel with controls to display license.
-     */
-    private JPanel createLicensePanel() {
-        JPanel licPanel = new JPanel(new GridBagLayout());
-
-        licPanel.add(Box.createVerticalGlue(), gbcStrut());
-
-        addAboutItem(licPanel, "Version:", ver);
-        addAboutItem(licPanel, "Release Date:", new SimpleDateFormat("dd MMM yyyy").format(release));
-        addAboutItem(licPanel, "Copyright:", copyright);
-
-        return licPanel;
-    }
-
-    /**
-     * @return Panel with close button.
-     */
-    private JPanel createButtonPanel() {
-        closeBtn.setAction(closeAct);
-        closeBtn.setToolTipText("<html><b>Closes</b> Dialog</html>");
-
-        JPanel btnPanel = new JPanel();
-        btnPanel.add(closeBtn);
-
-        return btnPanel;
-    }
-
-    /**
-     * Initialize dialog.
-     */
-    private void initDialog() {
-        setContentPane(initComponents());
-
-        pack();
-
-        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-
-        getRootPane().setDefaultButton(closeBtn);
-        setEscAction(closeAct);
-
-        setModal(true);
-
-        setResizable(false);
-    }
-
-    /**
-     * Add name and value labels.
-     *
-     * @param c Component.
-     * @param name Name.
-     * @param val Value.
-     */
-    private void addAboutItem(JComponent c, String name, Object val) {
-        addAboutItem(c, name, val, null);
-    }
-
-    /**
-     * Add name and value labels.
-     *
-     * @param c Component.
-     * @param name Name.
-     * @param val Value.
-     * @param border Border.
-     */
-    private void addAboutItem(JComponent c, String name, Object val, Border border) {
-        String v = val != null ? val.toString() : "n/a";
-        String tip = String.format("<html><b>%s</b> &#10159; %s</html>", name, val);
-
-        JLabel lb = new JLabel(name);
-        lb.setToolTipText(tip);
-
-        JLabel field = new JLabel(v);
-        field.setOpaque(true);
-        field.setBackground(Color.WHITE);
-        field.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(VALUE_BORDER_COLOR, 1),
-            BorderFactory.createEmptyBorder(0, 3, 0, 3)));
-
-        field.setToolTipText(tip);
-
-        if (border != null)
-            field.setBorder(border);
-
-        c.add(lb, gbcLicenseLabel());
-        c.add(field, gbcLicenseField());
-    }
-
-    /**
-     * Registers ESC button click with given action.
-     *
-     * @param act Escape button action.
-     */
-    private void setEscAction(ActionListener act) {
-        assert(act != null);
-
-        getRootPane().registerKeyboardAction(act,
-            KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0x0),
-            JComponent.WHEN_IN_FOCUSED_WINDOW
-        );
-    }
-
-    /**
-     * Show about dialog.
-     *
-     * @param appName Application name.
-     * @param bannerSpec Banner icon url spec.
-     * @param ver Version number.
-     * @param release Release date.
-     * @param copyright Copyright blurb.
-     */
-    public static void centerShow(final String appName, final String bannerSpec,
-        final String ver, final Date release, final String copyright) {
-        SwingUtilities.invokeLater(new Runnable() {
-            @SuppressWarnings("NonThreadSafeLazyInitialization")
-            @Override public void run() {
-                if (aboutDlg == null) {
-                    try {
-                        aboutDlg = new IgniteAboutDialog(appName, bannerSpec, ver, release, copyright);
-
-                        aboutDlg.setLocationRelativeTo(null);
-                        aboutDlg.setVisible(true);
-                    }
-                    finally {
-                        aboutDlg = null;
-                    }
-                }
-                else {
-                    aboutDlg.setLocationRelativeTo(null);
-                    aboutDlg.toFront();
-                }
-            }
-        });
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineRandomNumberGenerator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineRandomNumberGenerator.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineRandomNumberGenerator.java
deleted file mode 100644
index 38d6886..0000000
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineRandomNumberGenerator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.startup.cmdline;
-
-import java.util.*;
-
-/**
- * Generates a random number and prints it to the console.
- */
-public class IgniteCommandLineRandomNumberGenerator {
-    /**
-     * Main method.
-     *
-     * @param args Command line arguments.
-     */
-    public static void main(String[] args) {
-        System.out.println(UUID.randomUUID());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineStartup.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineStartup.java
deleted file mode 100644
index 5a892cf..0000000
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineStartup.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.startup.cmdline;
-
-import org.apache.ignite.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.lang.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.swing.*;
-import java.awt.*;
-import java.io.*;
-import java.lang.reflect.*;
-import java.lang.reflect.Proxy;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import java.util.List;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.IgniteState.*;
-import static org.gridgain.grid.GridSystemProperties.*;
-import static org.gridgain.grid.kernal.GridProductImpl.*;
-
-/**
- * This class defines command-line GridGain startup. This startup can be used to start GridGain
- * outside of any hosting environment from command line. This startup is a Java application with
- * {@link #main(String[])} method that accepts command line arguments. It accepts just one
- * parameter which is Spring XML configuration file path. You can run this class from command
- * line without parameters to get help message.
- * <p>
- * Note that scripts {@code ${GRIDGAIN_HOME}/bin/ggstart.{sh|bat}} shipped with GridGain use
- * this startup and you can use them as an example.
- */
-@SuppressWarnings({"CallToSystemExit"})
-public final class IgniteCommandLineStartup {
-    /** Quite log flag. */
-    private static final boolean QUITE;
-
-    /** Build date. */
-    private static Date releaseDate;
-
-    /**
-     * Static initializer.
-     */
-    static {
-        String quiteStr = System.getProperty(GridSystemProperties.GG_QUIET);
-
-        boolean quite = true;
-
-        if (quiteStr != null) {
-            quiteStr = quiteStr.trim();
-
-            if (!quiteStr.isEmpty()) {
-                if ("false".equalsIgnoreCase(quiteStr))
-                    quite = false;
-                else if (!"true".equalsIgnoreCase(quiteStr)) {
-                    System.err.println("Invalid value for '" + GridSystemProperties.GG_QUIET +
-                        "' VM parameter (must be {true|false}): " + quiteStr);
-
-                    quite = false;
-                }
-            }
-        }
-
-        QUITE = quite;
-
-        // Mac OS specific customizations: app icon and about dialog.
-        try {
-            releaseDate = new SimpleDateFormat("ddMMyyyy", Locale.US).parse(RELEASE_DATE);
-
-            Class<?> appCls = Class.forName("com.apple.eawt.Application");
-
-            Object osxApp = appCls.getDeclaredMethod("getApplication").invoke(null);
-
-            String icoPath = "ggcube_node_128x128.png";
-
-            URL url = IgniteCommandLineStartup.class.getResource(icoPath);
-
-            assert url != null : "Unknown icon path: " + icoPath;
-
-            ImageIcon ico = new ImageIcon(url);
-
-            appCls.getDeclaredMethod("setDockIconImage", Image.class).invoke(osxApp, ico.getImage());
-
-            // Setting Up about dialog
-            Class<?> aboutHndCls = Class.forName("com.apple.eawt.AboutHandler");
-
-            final URL bannerUrl = IgniteCommandLineStartup.class.getResource("ggcube_node_48x48.png");
-
-            Object aboutHndProxy = Proxy.newProxyInstance(
-                appCls.getClassLoader(),
-                new Class<?>[] {aboutHndCls},
-                new InvocationHandler() {
-                    @Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable {
-                        IgniteAboutDialog.centerShow("GridGain Node", bannerUrl.toExternalForm(), VER,
-                            releaseDate, COPYRIGHT);
-
-                        return null;
-                    }
-                }
-            );
-
-            appCls.getDeclaredMethod("setAboutHandler", aboutHndCls).invoke(osxApp, aboutHndProxy);
-        }
-        catch (Throwable ignore) {
-            // Ignore.
-        }
-    }
-
-    /**
-     * Enforces singleton.
-     */
-    private IgniteCommandLineStartup() {
-        // No-op.
-    }
-
-    /**
-     * Exists with optional error message, usage show and exit code.
-     *
-     * @param errMsg Optional error message.
-     * @param showUsage Whether or not to show usage information.
-     * @param exitCode Exit code.
-     */
-    private static void exit(@Nullable String errMsg, boolean showUsage, int exitCode) {
-        if (errMsg != null)
-            X.error(errMsg);
-
-        String runner = System.getProperty(GG_PROG_NAME, "ggstart.{sh|bat}");
-
-        int space = runner.indexOf(' ');
-
-        runner = runner.substring(0, space == -1 ? runner.length() : space);
-
-        if (showUsage) {
-            boolean ggstart = runner.contains("ggstart.");
-
-            X.error(
-                "Usage:",
-                "    " + runner + (ggstart ? " [?]|[path {-v}]|[-i]" : " [?]|[-v]"),
-                "    Where:",
-                "    ?, /help, -help - show this message.",
-                "    -v              - verbose mode (quiet by default).");
-
-            if (ggstart) {
-                X.error(
-                    "    -i              - interactive mode (choose configuration file from list).",
-                    "    path            - path to Spring XML configuration file.",
-                    "                      Path can be absolute or relative to GRIDGAIN_HOME.",
-                    " ",
-                    "Spring file should contain one bean definition of Java type",
-                    "'org.gridgain.grid.GridConfiguration'. Note that bean will be",
-                    "fetched by the type and its ID is not used.");
-            }
-        }
-
-        System.exit(exitCode);
-    }
-
-    /**
-     * Tests whether argument is help argument.
-     *
-     * @param arg Command line argument.
-     * @return {@code true} if given argument is a help argument, {@code false} otherwise.
-     */
-    @SuppressWarnings({"IfMayBeConditional"})
-    private static boolean isHelp(String arg) {
-        String s;
-
-        if (arg.startsWith("--"))
-            s = arg.substring(2);
-        else if (arg.startsWith("-") || arg.startsWith("/") || arg.startsWith("\\"))
-            s = arg.substring(1);
-        else
-            s = arg;
-
-        return "?".equals(s) || "help".equalsIgnoreCase(s) || "h".equalsIgnoreCase(s);
-    }
-
-    /**
-     * Interactively asks for configuration file path.
-     *
-     * @return Configuration file path. {@code null} if operation  was cancelled.
-     * @throws IOException In case of error.
-     */
-    @Nullable private static String askConfigFile() throws IOException {
-        List<GridTuple3<String, Long, File>> files = GridConfigurationFinder.getConfigFiles();
-
-        String title = "Available configuration files:";
-
-        X.println(title);
-        X.println(U.dash(title.length()));
-
-        for (int i = 0; i < files.size(); i++)
-            System.out.println(i + ":\t" + files.get(i).get1());
-
-        X.print("\nChoose configuration file ('c' to cancel) [0]: ");
-
-        BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
-
-        String line = reader.readLine();
-
-        if ("c".equalsIgnoreCase(line)) {
-            System.out.println("\nOperation cancelled.");
-
-            return null;
-        }
-
-        if (line != null && line.isEmpty())
-            line = "0";
-
-        try {
-            GridTuple3<String, Long, File> file = files.get(Integer.valueOf(line));
-
-            X.println("\nUsing configuration: " + file.get1() + "\n");
-
-            return file.get3().getAbsolutePath();
-        }
-        catch (Exception ignored) {
-            X.error("\nInvalid selection: " + line);
-
-            return null;
-        }
-    }
-
-    /**
-     * Main entry point.
-     *
-     * @param args Command line arguments.
-     */
-    public static void main(String[] args) {
-        if (!QUITE) {
-            X.println("GridGain Command Line Startup, ver. " + ACK_VER);
-            X.println(COPYRIGHT);
-            X.println();
-        }
-
-        if (args.length > 1)
-            exit("Too many arguments.", true, -1);
-
-        if (args.length > 0 && isHelp(args[0]))
-            exit(null, true, 0);
-
-        if (args.length > 0 && args[0].isEmpty())
-            exit("Empty argument.", true, 1);
-
-        if (args.length > 0 && args[0].charAt(0) == '-')
-            exit("Invalid arguments: " + args[0], true, -1);
-
-        String cfg = null;
-
-        if (args.length > 0)
-            cfg = args[0];
-        else {
-            try {
-                cfg = askConfigFile();
-
-                if (cfg == null)
-                    exit(null, false, 0);
-            }
-            catch (IOException e) {
-                exit("Failed to run interactive mode: " + e.getMessage(), false, -1);
-            }
-        }
-
-        // Name of the grid loaded from the command line (unique in JVM).
-        final String gridName;
-
-        try {
-            gridName = G.start(cfg).name();
-        }
-        catch (Throwable e) {
-            e.printStackTrace();
-
-            String note = "";
-
-            if (X.hasCause(e, ClassNotFoundException.class))
-                note = "\nNote! You may use 'USER_LIBS' environment variable to specify your classpath.";
-
-            exit("Failed to start grid: " + e.getMessage() + note, false, -1);
-
-            return;
-        }
-
-        // Exit latch for the grid loaded from the command line.
-        final CountDownLatch latch = new CountDownLatch(1);
-
-        G.addListener(new GridGainListener() {
-            @Override public void onStateChange(String name, IgniteState state) {
-                // Skip all grids except loaded from the command line.
-                if (!F.eq(gridName, name))
-                    return;
-
-                if (state == STOPPED || state == STOPPED_ON_SEGMENTATION)
-                    latch.countDown();
-            }
-        });
-
-        try {
-            latch.await();
-        }
-        catch (InterruptedException e) {
-            X.error("Start was interrupted (exiting): " + e.getMessage());
-        }
-
-        String code = System.getProperty(GG_RESTART_CODE);
-
-        if (code != null)
-            try {
-                System.exit(Integer.parseInt(code));
-            }
-            catch (NumberFormatException ignore) {
-                System.exit(0);
-            }
-        else
-            System.exit(0);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineTransformer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineTransformer.java b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineTransformer.java
deleted file mode 100644
index 9a72be7..0000000
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/IgniteCommandLineTransformer.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.startup.cmdline;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * This class is a workaround for a versatile problems with passing arguments to the GridGain Windows batch launcher
- * scripts. It transforms command line options passed to the *.bat launcher scripts into a reformatted, adapted for
- * Windows batch usage variables.
- * <p>
- * The idea behind the workaround is:<br>
- * 1. User runs ggstart.bat with some args.<br>
- * 2. ggstart.bat calls parseargs.bat with all that args.<br>
- * 3. parsearg.bat runs this class with all that args.<br>
- * 4. This class transforms the args and prints them out.<br>
- * 5. parseargs.bat splits the output of this class and sets each variable it found.<br>
- * 6. ggstart.bat uses environment variables as if they were defined by a user.
- * <p>
- *
- * @see <a href="http://jcommander.org/">JCommander command line parameters parsing library</a>
- */
-@SuppressWarnings("FieldCanBeLocal")
-public class IgniteCommandLineTransformer {
-    /** Prefix for every custom JVM option. */
-    static final String JVM_OPTION_PREFIX = "-J";
-
-    /** Flag to check in step 5 of the Workaround before splitting the output. */
-    private static final String TRANSFORMATION_FAILED_FLAG = "GridCommandLineTransformerError";
-
-    /** Delimiter used in step 5 of the Workaround. */
-    private static final String ARGS_DELIMITER = " ";
-
-    /** Interactive mode. */
-    private boolean interactive;
-
-    /** Verbose mode. */
-    private boolean verbose;
-
-    /** No pause mode. */
-    private boolean noPause;
-
-    /** Supported parameter, parsed manually. */
-    private String jvmOptions = "";
-
-    /** Supported parameter, parsed manually. */
-    private String springCfgPath = "";
-
-    /**
-     * Private constructor to promote usage of a factory method {@link #transform(String...)}.
-     */
-    private IgniteCommandLineTransformer() {
-        // No-op
-    }
-
-    /**
-     * Main method being triggered in step 3 of the Workaround.
-     * <p>
-     * Method prints out TRANSFORMATION_FAILED_FLAG if something went wrong.
-     *
-     * @param args Command line arguments passed by a user in step 1 of the Workaround.
-     */
-    public static void main(String[] args) {
-        PrintStream ps = null;
-
-        try {
-            // Intentionality configure output stream with UTF-8 encoding to support  non-ASCII named parameter values.
-            ps = new PrintStream(System.out, true, "UTF-8");
-
-            ps.println(transform(args));
-        }
-        catch (Throwable t) {
-            t.printStackTrace();
-
-            if (ps != null)
-                ps.println(TRANSFORMATION_FAILED_FLAG);
-        }
-    }
-
-    /**
-     * @param args Arguments.
-     * @return Transformed arguments.
-     */
-    public static String transform(String... args) {
-        assert args != null;
-
-        return new IgniteCommandLineTransformer().doTransformation(args);
-    }
-
-    /**
-     * Actually does arguments transformation.
-     *
-     * @param args Arguments.
-     * @return Transformed arguments.
-     */
-    private String doTransformation(String[] args) {
-        List<String> argsList = new ArrayList<>();
-
-        for (String arg : args) {
-            switch (arg) {
-                case "-i":
-                    interactive = true;
-
-                    break;
-
-                case "-v":
-                    verbose = true;
-
-                    break;
-
-                case "-np":
-                    noPause = true;
-
-                    break;
-
-                default:
-                    argsList.add(arg);
-            }
-        }
-
-        return reformatArguments(argsList);
-    }
-
-    /**
-     * Transforms parsed arguments into a string.
-     *
-     * @param args Non-standard arguments.
-     * @return Transformed arguments.
-     */
-    private String reformatArguments(List<String> args) {
-        StringBuilder sb = new StringBuilder();
-
-        addArgWithValue(sb, "INTERACTIVE", formatBooleanValue(interactive));
-        addArgWithValue(sb, "QUIET", "-DGRIDGAIN_QUIET=" + !verbose);
-        addArgWithValue(sb, "NO_PAUSE", formatBooleanValue(noPause));
-
-        parseJvmOptionsAndSpringConfig(args);
-
-        addArgWithValue(sb, "JVM_XOPTS", jvmOptions);
-        addArgWithValue(sb, "CONFIG", springCfgPath);
-
-        return sb.toString().trim();
-    }
-
-    /**
-     * Formats boolean value into a string one.
-     *
-     * @param val Boolean value to be formatted.
-     * @return 1 if val is true 0 otherwise.
-     */
-    private String formatBooleanValue(boolean val) {
-        return String.valueOf(val ? 1 : 0);
-    }
-
-    /**
-     * Transforms one argument.
-     *
-     * @param sb StringBuilder where transformation result will be written.
-     * @param arg Argument's name.
-     * @param val Argument's value.
-     */
-    private void addArgWithValue(StringBuilder sb, String arg, Object val) {
-        sb.append("\"");
-        sb.append(arg);
-        sb.append("=");
-        sb.append(val);
-        sb.append("\"");
-        sb.append(ARGS_DELIMITER);
-    }
-
-    /**
-     * Manually parses non-trivial (from JCommander point of view) arguments.
-     *
-     * @param args Collection of unknown (from JCommander point of view) arguments.
-     */
-    private void parseJvmOptionsAndSpringConfig(Iterable<String> args) {
-        for (String arg : args) {
-            if (arg.startsWith(JVM_OPTION_PREFIX)) {
-                String jvmOpt = arg.substring(JVM_OPTION_PREFIX.length());
-
-                if (!checkJVMOptionIsSupported(jvmOpt))
-                    throw new RuntimeException(JVM_OPTION_PREFIX + " JVM parameters for GridGain batch scripts " +
-                        "with double quotes are not supported. " +
-                        "Use JVM_OPTS environment variable to pass any custom JVM option.");
-
-                jvmOptions = jvmOptions.isEmpty() ? jvmOpt : jvmOptions + " " + jvmOpt;
-            }
-            else {
-                if (springCfgPath.isEmpty())
-                    springCfgPath = arg;
-                else
-                    throw new RuntimeException("Unrecognised parameter has been found: " + arg);
-            }
-        }
-    }
-
-    /**
-     * Check if a JVM option is supported. Unsupported options are those who
-     * need double quotes in the declaration. It's a limitation of a current Workaround
-     *
-     * @param jvmOpt JVM option to check.
-     * @return true if option is supported false otherwise.
-     */
-    private boolean checkJVMOptionIsSupported(String jvmOpt) {
-        return !(jvmOpt.contains("-XX:OnError") || jvmOpt.contains("-XX:OnOutOfMemoryError"));
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/main/java/org/gridgain/grid/segmentation/GridSegmentationPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/segmentation/GridSegmentationPolicy.java b/modules/core/src/main/java/org/gridgain/grid/segmentation/GridSegmentationPolicy.java
index f64b1b9..21c6d14 100644
--- a/modules/core/src/main/java/org/gridgain/grid/segmentation/GridSegmentationPolicy.java
+++ b/modules/core/src/main/java/org/gridgain/grid/segmentation/GridSegmentationPolicy.java
@@ -18,7 +18,7 @@ public enum GridSegmentationPolicy {
     /**
      * When segmentation policy is {@code RESTART_JVM}, all listeners will receive
      * {@link org.apache.ignite.events.IgniteEventType#EVT_NODE_SEGMENTED} event and then JVM will be restarted.
-     * Note, that this will work <b>only</b> if GridGain is started with {@link org.apache.ignite.startup.cmdline.IgniteCommandLineStartup}
+     * Note, that this will work <b>only</b> if GridGain is started with {@link org.apache.ignite.startup.cmdline.CommandLineStartup}
      * via standard {@code ggstart.{sh|bat}} shell script.
      */
     RESTART_JVM,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
index 90617d6..acae15b 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineLoaderTest.java
@@ -10,7 +10,6 @@
 package org.apache.ignite.startup.cmdline;
 
 import org.apache.ignite.*;
-import org.apache.ignite.startup.cmdline.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -55,6 +54,6 @@ public class GridCommandLineLoaderTest extends GridCommonAbstractTest {
             }
         });
 
-        IgniteCommandLineStartup.main(new String[]{path});
+        CommandLineStartup.main(new String[]{path});
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java
index bbcae9f..4ad1e20 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/cmdline/GridCommandLineTransformerSelfTest.java
@@ -9,7 +9,6 @@
 
 package org.apache.ignite.startup.cmdline;
 
-import org.apache.ignite.startup.cmdline.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 
@@ -26,7 +25,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest {
         assertEquals(
             "\"INTERACTIVE=0\" \"QUIET=-DGRIDGAIN_QUIET=true\" \"NO_PAUSE=0\" " +
             "\"JVM_XOPTS=\" \"CONFIG=\"",
-            IgniteCommandLineTransformer.transform());
+            CommandLineTransformer.transform());
     }
 
     /**
@@ -36,7 +35,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest {
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @SuppressWarnings("NullArgumentToVariableArgMethod")
             @Override public Object call() throws Exception {
-                return IgniteCommandLineTransformer.transform(null);
+                return CommandLineTransformer.transform(null);
             }
         }, AssertionError.class, null);
     }
@@ -50,7 +49,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest {
     public void testTransformIfUnsupportedOptions() throws Exception {
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                return IgniteCommandLineTransformer.transform("-z", "qwerty", "asd");
+                return CommandLineTransformer.transform("-z", "qwerty", "asd");
             }
         }, RuntimeException.class, "Unrecognised parameter has been found: qwerty");
     }
@@ -61,18 +60,18 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest {
     public void testTransformIfUnsupportedJvmOptions() throws Exception {
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                return IgniteCommandLineTransformer.transform("-J-Xmx1g", "-J-XX:OnError=\"dir c:\\\"");
+                return CommandLineTransformer.transform("-J-Xmx1g", "-J-XX:OnError=\"dir c:\\\"");
             }
-        }, RuntimeException.class, IgniteCommandLineTransformer.JVM_OPTION_PREFIX +
+        }, RuntimeException.class, CommandLineTransformer.JVM_OPTION_PREFIX +
             " JVM parameters for GridGain batch scripts " +
             "with double quotes are not supported. " +
             "Use JVM_OPTS environment variable to pass any custom JVM option.");
 
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                return IgniteCommandLineTransformer.transform("-J-Xmx1g", "-J-XX:OnOutOfMemoryError=\"dir c:\\\"");
+                return CommandLineTransformer.transform("-J-Xmx1g", "-J-XX:OnOutOfMemoryError=\"dir c:\\\"");
             }
-        }, RuntimeException.class, IgniteCommandLineTransformer.JVM_OPTION_PREFIX +
+        }, RuntimeException.class, CommandLineTransformer.JVM_OPTION_PREFIX +
             " JVM parameters for GridGain batch scripts " +
             "with double quotes are not supported. " +
             "Use JVM_OPTS environment variable to pass any custom JVM option.");
@@ -84,7 +83,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest {
     public void testTransformIfSeveralArgumentsWithoutDashPrefix() throws Exception {
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                return IgniteCommandLineTransformer.transform("c:\\qw.xml", "abc", "d");
+                return CommandLineTransformer.transform("c:\\qw.xml", "abc", "d");
             }
         }, RuntimeException.class, "Unrecognised parameter has been found: abc");
     }
@@ -96,7 +95,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest {
         assertEquals(
             "\"INTERACTIVE=0\" \"QUIET=-DGRIDGAIN_QUIET=true\" \"NO_PAUSE=0\" " +
             "\"JVM_XOPTS=\" \"CONFIG=c:\\qw.xml\"",
-            IgniteCommandLineTransformer.transform("c:\\qw.xml"));
+            CommandLineTransformer.transform("c:\\qw.xml"));
     }
 
     /**
@@ -107,7 +106,7 @@ public class GridCommandLineTransformerSelfTest extends GridCommonAbstractTest {
             "\"INTERACTIVE=1\" \"QUIET=-DGRIDGAIN_QUIET=false\" \"NO_PAUSE=1\" " +
             "\"JVM_XOPTS=-Xmx1g -Xms1m\" " +
             "\"CONFIG=\"c:\\path to\\русский каталог\"\"",
-            IgniteCommandLineTransformer.transform("-i", "-np", "-v", "-J-Xmx1g", "-J-Xms1m",
+            CommandLineTransformer.transform("-i", "-np", "-v", "-J-Xmx1g", "-J-Xms1m",
                 "\"c:\\path to\\русский каталог\""));
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d128011c/modules/visor-console/src/main/scala/org/gridgain/visor/commands/VisorConsole.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/VisorConsole.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/VisorConsole.scala
index cee85f9..358fc3a 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/VisorConsole.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/VisorConsole.scala
@@ -16,7 +16,7 @@ import java.io.File
 import java.text.SimpleDateFormat
 import java.util
 import javax.swing.ImageIcon
-import org.apache.ignite.startup.cmdline.IgniteAboutDialog
+import org.apache.ignite.startup.cmdline.AboutDialog
 import org.gridgain.grid.util.{GridUtils => U}
 import org.gridgain.grid.util.scala.impl
 import org.gridgain.visor.visor
@@ -197,7 +197,7 @@ object VisorConsole extends App {
                 Array[Class[_]](aboutHndCls),
                 new java.lang.reflect.InvocationHandler {
                     def invoke(proxy: Any, mth: java.lang.reflect.Method, args: Array[Object]) = {
-                        IgniteAboutDialog.centerShow("Visor - GridGain Shell Console", bannerIconUrl.toExternalForm,
+                        AboutDialog.centerShow("Visor - GridGain Shell Console", bannerIconUrl.toExternalForm,
                             VISOR_VER, releaseDate, VISOR_COPYRIGHT)
 
                         null


Mime
View raw message