Merge branch 'ignite-213' into sprint-1
Conflicts:
modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedIgniteHomeSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/faf3f2bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/faf3f2bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/faf3f2bd
Branch: refs/heads/ignite-189
Commit: faf3f2bd12e4b987cccec984daa6307e172f5d2e
Parents: 88d24cc 1ccfda7
Author: Artem Shutak <[email protected]>
Authored: Tue Feb 10 19:23:37 2015 +0300
Committer: Artem Shutak <[email protected]>
Committed: Tue Feb 10 19:23:37 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/Ignition.java | 6 --
.../configuration/IgniteConfiguration.java | 27 +----
.../apache/ignite/internal/IgniteKernal.java | 9 +-
.../org/apache/ignite/internal/IgnitionEx.java | 1 -
.../visor/node/VisorBasicConfiguration.java | 18 ----
.../org/apache/ignite/mxbean/IgniteMXBean.java | 8 --
...dStartupWithUndefinedIgniteHomeSelfTest.java | 106 -------------------
.../testsuites/IgniteKernalSelfTestSuite.java | 1 -
.../config/VisorConfigurationCommand.scala | 13 +--
9 files changed, 8 insertions(+), 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faf3f2bd/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 1b2746c,e597520..b694d5b
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -473,7 -542,7 +470,6 @@@ public class IgniteConfiguration
hadoopCfg = cfg.getHadoopConfiguration();
inclEvtTypes = cfg.getIncludeEventTypes();
includeProps = cfg.getIncludeProperties();
- licUrl = cfg.getLicenseUrl();
- jettyPath = cfg.getRestJettyPath();
lifecycleBeans = cfg.getLifecycleBeans();
lifeCycleEmailNtf = cfg.isLifeCycleEmailNotification();
locHost = cfg.getLocalHost();
@@@ -2038,8 -2103,391 +2015,8 @@@
}
/**
- * Sets system-wide local address or host for all GridGain components to
bind to. If provided it will
- * override all default local bind settings within GridGain or any of its
SPIs.
- * Sets path, either absolute or relative to {@code IGNITE_HOME}, to
{@code JETTY}
- * XML configuration file. {@code JETTY} is used to support REST over
HTTP protocol for
- * accessing Ignite APIs remotely.
- *
- * @param jettyPath Path to {@code JETTY} XML configuration file.
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestJettyPath(String)}.
- */
- @Deprecated
- public void setRestJettyPath(String jettyPath) {
- this.jettyPath = jettyPath;
- }
-
- /**
- * Gets path, either absolute or relative to {@code IGNITE_HOME}, to
{@code Jetty}
- * XML configuration file. {@code Jetty} is used to support REST over
HTTP protocol for
- * accessing Ignite APIs remotely.
- * <p>
- * If not provided, Jetty instance with default configuration will be
started picking
- * {@link org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST} and
{@link org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT}
- * as host and port respectively.
- *
- * @return Path to {@code JETTY} XML configuration file.
- * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_HOST
- * @see org.apache.ignite.IgniteSystemProperties#IGNITE_JETTY_PORT
- * @deprecated Use {@link
ClientConnectionConfiguration#getRestJettyPath()}.
- */
- @Deprecated
- public String getRestJettyPath() {
- return jettyPath;
- }
-
- /**
- * Gets host for TCP binary protocol server. This can be either an
- * IP address or a domain name.
- * <p>
- * If not defined, system-wide local address will be used
- * (see {@link #getLocalHost()}.
- * <p>
- * You can also use {@code 0.0.0.0} value to bind to all
- * locally-available IP addresses.
- *
- * @return TCP host.
- * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpHost()}.
- */
- @Deprecated
- public String getRestTcpHost() {
- return restTcpHost;
- }
-
- /**
- * Sets host for TCP binary protocol server.
- *
- * @param restTcpHost TCP host.
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpHost(String)}.
- */
- @Deprecated
- public void setRestTcpHost(String restTcpHost) {
- this.restTcpHost = restTcpHost;
- }
-
- /**
- * Gets port for TCP binary protocol server.
- * <p>
- * Default is {@link #DFLT_TCP_PORT}.
- *
- * @return TCP port.
- * @deprecated Use {@link ClientConnectionConfiguration#getRestTcpPort()}.
- */
- @Deprecated
- public int getRestTcpPort() {
- return restTcpPort;
- }
-
- /**
- * Sets port for TCP binary protocol server.
- *
- * @param restTcpPort TCP port.
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpPort(int)}.
- */
- @Deprecated
- public void setRestTcpPort(int restTcpPort) {
- this.restTcpPort = restTcpPort;
- }
-
- /**
- * Gets flag indicating whether {@code TCP_NODELAY} option should be set
for accepted client connections.
- * Setting this option reduces network latency and should be set to
{@code true} in majority of cases.
- * For more information, see {@link Socket#setTcpNoDelay(boolean)}
- * <p/>
- * If not specified, default value is {@link #DFLT_TCP_NODELAY}.
- *
- * @return Whether {@code TCP_NODELAY} option should be enabled.
- * @deprecated Use {@link
ClientConnectionConfiguration#isRestTcpNoDelay()}.
- */
- @Deprecated
- public boolean isRestTcpNoDelay() {
- return restTcpNoDelay;
- }
-
- /**
- * Sets whether {@code TCP_NODELAY} option should be set for all accepted
client connections.
- *
- * @param restTcpNoDelay {@code True} if option should be enabled.
- * @see #isRestTcpNoDelay()
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpNoDelay(boolean)}.
- */
- @Deprecated
- public void setRestTcpNoDelay(boolean restTcpNoDelay) {
- this.restTcpNoDelay = restTcpNoDelay;
- }
-
- /**
- * Gets flag indicating whether REST TCP server should use direct
buffers. A direct buffer is a buffer
- * that is allocated and accessed using native system calls, without
using JVM heap. Enabling direct
- * buffer <em>may</em> improve performance and avoid memory issues (long
GC pauses due to huge buffer
- * size).
- *
- * @return Whether direct buffer should be used.
- * @deprecated Use {@link
ClientConnectionConfiguration#isRestTcpDirectBuffer()}.
- */
- @Deprecated
- public boolean isRestTcpDirectBuffer() {
- return restTcpDirectBuf;
- }
-
- /**
- * Sets whether to use direct buffer for REST TCP server.
- *
- * @param restTcpDirectBuf {@code True} if option should be enabled.
- * @see #isRestTcpDirectBuffer()
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpDirectBuffer(boolean)}.
- */
- @Deprecated
- public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
- this.restTcpDirectBuf = restTcpDirectBuf;
- }
-
- /**
- * Gets REST TCP server send buffer size.
- *
- * @return REST TCP server send buffer size (0 for default).
- * @deprecated Use {@link
ClientConnectionConfiguration#getRestTcpSendBufferSize()}.
- */
- @Deprecated
- public int getRestTcpSendBufferSize() {
- return restTcpSndBufSize;
- }
-
- /**
- * Sets REST TCP server send buffer size.
- *
- * @param restTcpSndBufSize Send buffer size.
- * @see #getRestTcpSendBufferSize()
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpSendBufferSize(int)}.
- */
- @Deprecated
- public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
- this.restTcpSndBufSize = restTcpSndBufSize;
- }
-
- /**
- * Gets REST TCP server receive buffer size.
- *
- * @return REST TCP server receive buffer size (0 for default).
- * @deprecated Use {@link
ClientConnectionConfiguration#getRestTcpReceiveBufferSize()}.
- */
- @Deprecated
- public int getRestTcpReceiveBufferSize() {
- return restTcpRcvBufSize;
- }
-
- /**
- * Sets REST TCP server receive buffer size.
- *
- * @param restTcpRcvBufSize Receive buffer size.
- * @see #getRestTcpReceiveBufferSize()
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpReceiveBufferSize(int)}.
- */
- @Deprecated
- public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
- this.restTcpRcvBufSize = restTcpRcvBufSize;
- }
-
- /**
- * Gets REST TCP server send queue limit. If the limit exceeds, all
successive writes will
- * block until the queue has enough capacity.
- *
- * @return REST TCP server send queue limit (0 for unlimited).
- * @deprecated Use {@link
ClientConnectionConfiguration#getRestTcpSendQueueLimit()}.
- */
- @Deprecated
- public int getRestTcpSendQueueLimit() {
- return restTcpSndQueueLimit;
- }
-
- /**
- * Sets REST TCP server send queue limit.
- *
- * @param restTcpSndQueueLimit REST TCP server send queue limit (0 for
unlimited).
- * @see #getRestTcpSendQueueLimit()
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpSendQueueLimit(int)}.
- */
- @Deprecated
- public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
- this.restTcpSndQueueLimit = restTcpSndQueueLimit;
- }
-
- /**
- * Gets number of selector threads in REST TCP server. Higher value for
this parameter
- * may increase throughput, but also increases context switching.
- *
- * @return Number of selector threads for REST TCP server.
- * @deprecated Use {@link
ClientConnectionConfiguration#getRestTcpSelectorCount()}.
- */
- @Deprecated
- public int getRestTcpSelectorCount() {
- return restTcpSelectorCnt;
- }
-
- /**
- * Sets number of selector threads for REST TCP server.
- *
- * @param restTcpSelectorCnt Number of selector threads for REST TCP
server.
- * @see #getRestTcpSelectorCount()
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpSelectorCount(int)}.
- */
- @Deprecated
- public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
- this.restTcpSelectorCnt = restTcpSelectorCnt;
- }
-
- /**
- * Gets idle timeout for REST server.
- * <p>
- * This setting is used to reject half-opened sockets. If no packets
- * come within idle timeout, the connection is closed.
- *
- * @return Idle timeout in milliseconds.
- * @deprecated Use {@link
ClientConnectionConfiguration#getRestIdleTimeout()}.
- */
- @Deprecated
- public long getRestIdleTimeout() {
- return restIdleTimeout;
- }
-
- /**
- * Sets idle timeout for REST server.
- *
- * @param restIdleTimeout Idle timeout in milliseconds.
- * @see #getRestIdleTimeout()
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestIdleTimeout(long)}.
- */
- @Deprecated
- public void setRestIdleTimeout(long restIdleTimeout) {
- this.restIdleTimeout = restIdleTimeout;
- }
-
- /**
- * Whether secure socket layer should be enabled on binary rest server.
- * <p>
- * Note that if this flag is set to {@code true}, an instance of {@link
GridSslContextFactory}
- * should be provided, otherwise binary rest protocol will fail to start.
- *
- * @return {@code True} if SSL should be enabled.
- * @deprecated Use {@link
ClientConnectionConfiguration#isRestTcpSslEnabled()}.
- */
- @Deprecated
- public boolean isRestTcpSslEnabled() {
- return restTcpSslEnabled;
- }
-
- /**
- * Sets whether Secure Socket Layer should be enabled for REST TCP binary
protocol.
- * <p/>
- * Note that if this flag is set to {@code true}, then a valid instance
of {@link GridSslContextFactory}
- * should be provided in {@code GridConfiguration}. Otherwise, TCP binary
protocol will fail to start.
- *
- * @param restTcpSslEnabled {@code True} if SSL should be enabled.
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpSslEnabled(boolean)}.
- */
- @Deprecated
- public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
- this.restTcpSslEnabled = restTcpSslEnabled;
- }
-
- /**
- * Gets a flag indicating whether or not remote clients will be required
to have a valid SSL certificate which
- * validity will be verified with trust manager.
- *
- * @return Whether or not client authentication is required.
- * @deprecated Use {@link
ClientConnectionConfiguration#isRestTcpSslClientAuth()}.
- */
- @Deprecated
- public boolean isRestTcpSslClientAuth() {
- return restTcpSslClientAuth;
- }
-
- /**
- * Sets flag indicating whether or not SSL client authentication is
required.
- *
- * @param needClientAuth Whether or not client authentication is required.
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpSslClientAuth(boolean)}.
- */
- @Deprecated
- public void setRestTcpSslClientAuth(boolean needClientAuth) {
- restTcpSslClientAuth = needClientAuth;
- }
-
- /**
- * Gets context factory that will be used for creating a secure socket
layer of rest binary server.
- *
- * @return SslContextFactory instance.
- * @see GridSslContextFactory
- * @deprecated Use {@link
ClientConnectionConfiguration#getRestTcpSslContextFactory()}.
- */
- @Deprecated
- public GridSslContextFactory getRestTcpSslContextFactory() {
- return restTcpSslCtxFactory;
- }
-
- /**
- * Sets instance of {@link GridSslContextFactory} that will be used to
create an instance of {@code SSLContext}
- * for Secure Socket Layer on TCP binary protocol. This factory will only
be used if
- * {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
- *
- * @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestTcpSslContextFactory(GridSslContextFactory)}.
- */
- @Deprecated
- public void setRestTcpSslContextFactory(GridSslContextFactory
restTcpSslCtxFactory) {
- this.restTcpSslCtxFactory = restTcpSslCtxFactory;
- }
-
- /**
- * Gets number of ports to try if configured port is already in use.
- *
- * @return Number of ports to try.
- * @deprecated Use {@link
ClientConnectionConfiguration#getRestPortRange()}.
- */
- @Deprecated
- public int getRestPortRange() {
- return restPortRange;
- }
-
- /**
- * Sets number of ports to try if configured one is in use.
- *
- * @param restPortRange Port range.
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestPortRange(int)}.
- */
- @Deprecated
- public void setRestPortRange(int restPortRange) {
- this.restPortRange = restPortRange;
- }
-
- /**
- * Gets list of folders that are accessible for log reading command. When
remote client requests
- * a log file, file path is checked against this list. If requested file
is not located in any
- * sub-folder of these folders, request is not processed.
- * <p>
- * By default, list consists of a single {@code IGNITE_HOME} folder. If
{@code IGNITE_HOME}
- * could not be detected and property is not specified, no restrictions
applied.
- *
- * @return Array of folders that are allowed be read by remote clients.
- * @deprecated Use {@link
ClientConnectionConfiguration#getRestAccessibleFolders()}.
- */
- @Deprecated
- public String[] getRestAccessibleFolders() {
- return restAccessibleFolders;
- }
-
- /**
- * Sets array of folders accessible by REST processor for log reading
command.
- *
- * @param restAccessibleFolders Array of folder paths.
- * @deprecated Use {@link
ClientConnectionConfiguration#setRestAccessibleFolders(String...)}.
- */
- @Deprecated
- public void setRestAccessibleFolders(String... restAccessibleFolders) {
- this.restAccessibleFolders = restAccessibleFolders;
- }
-
- /**
+ * Sets system-wide local address or host for all Ignite components to
bind to. If provided it will
+ * override all default local bind settings within Ignite or any of its
SPIs.
*
* @param locHost Local IP address or host to bind to.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faf3f2bd/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/faf3f2bd/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
