# sprint-2 - removing gridgain.com.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c4030f92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c4030f92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c4030f92 Branch: refs/heads/ignite-185 Commit: c4030f926a7339cfcae14e19cec22d9d37cd94dd Parents: 6909cc4 Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Tue Mar 3 18:58:18 2015 -0800 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Tue Mar 3 18:58:18 2015 -0800 ---------------------------------------------------------------------- .../spi/checkpoint/s3/S3CheckpointSpi.java | 2 +- modules/clients/readme.md | 4 +- modules/clients/readme.pdf | Bin 52230 -> 47887 bytes .../integration/ClientAbstractSelfTest.java | 3 - .../apache/ignite/cache/store/CacheStore.java | 49 - .../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +- .../apache/ignite/internal/GridDiagnostic.java | 15 +- .../ignite/internal/GridUpdateNotifier.java | 8 +- .../apache/ignite/internal/IgniteKernal.java | 23 +- .../apache/ignite/marshaller/Marshaller.java | 2 +- .../ignite/marshaller/jdk/JdkMarshaller.java | 2 +- .../optimized/OptimizedMarshaller.java | 2 +- .../SpringApplicationContextResource.java | 2 +- .../checkpoint/cache/CacheCheckpointSpi.java | 2 +- .../spi/checkpoint/jdbc/JdbcCheckpointSpi.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 2 +- .../jobstealing/JobStealingCollisionSpi.java | 4 +- .../PriorityQueueCollisionSpi.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 16 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../memory/MemoryEventStorageSpi.java | 2 +- .../spi/failover/always/AlwaysFailoverSpi.java | 2 +- .../jobstealing/JobStealingFailoverSpi.java | 2 +- .../spi/failover/never/NeverFailoverSpi.java | 2 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 2 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +- .../WeightedRandomLoadBalancingSpi.java | 2 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../startup/cmdline/CommandLineStartup.java | 4 +- .../startup/cmdline/ggcube_node_128x128.png | Bin 4679 -> 0 bytes .../startup/cmdline/ggcube_node_48x48.png | Bin 2355 -> 0 bytes .../startup/cmdline/logo_ignite_128x128.png | Bin 0 -> 18667 bytes .../startup/cmdline/logo_ignite_48x48.png | Bin 0 -> 16572 bytes .../internal/GridUpdateNotifierSelfTest.java | 2 +- .../core/src/test/resources/log/ignite.log.tst | 13706 ----------------- .../hibernate/CacheHibernateBlobStore.java | 2 +- .../rest/protocols/http/jetty/rest.html | 19 +- .../spi/deployment/uri/UriDeploymentSpi.java | 2 +- .../ignite/visor/commands/VisorConsole.scala | 16 +- .../ignite/visor/commands/ggcube_128x128.png | Bin 11444 -> 0 bytes .../ignite/visor/commands/ggcube_48x48.png | Bin 3365 -> 0 bytes .../visor/commands/logo_ignite_128x128.png | Bin 0 -> 18667 bytes .../ignite/visor/commands/logo_ignite_48x48.png | Bin 0 -> 16572 bytes pom.xml | 1 - 45 files changed, 57 insertions(+), 13857 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java index 9cfbca3..b5198f6 100644 --- a/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java +++ b/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java @@ -94,7 +94,7 @@ import java.util.*; * Choose another implementation of {@link org.apache.ignite.spi.checkpoint.CheckpointSpi} for local or * home network tests. * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> * @see org.apache.ignite.spi.checkpoint.CheckpointSpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/clients/readme.md ---------------------------------------------------------------------- diff --git a/modules/clients/readme.md b/modules/clients/readme.md index e64c123..0208c51 100644 --- a/modules/clients/readme.md +++ b/modules/clients/readme.md @@ -1,5 +1,5 @@ <center> - + </center> ## Java Client README @@ -13,5 +13,5 @@ could not (*or should not*) be started. ## Client vs Grid Node Note that for performance and ease-of-use reasons, you should always prefer to start grid node in your cluster instead of remote client. Grid node will generally perform a lot faster and can easily exhibit client-only functionality by excluding it from task/job execution and from caching data. -For example, you can prevent a grid node from participating in caching by setting `GridCacheConfiguration.setDistributionMode(...)` value to either `CLIENT_ONLY` or `NEAR_ONLY`. +For example, you can prevent a grid node from participating in caching by setting `CacheConfiguration.setDistributionMode(...)` value to either `CLIENT_ONLY` or `NEAR_ONLY`. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/clients/readme.pdf ---------------------------------------------------------------------- diff --git a/modules/clients/readme.pdf b/modules/clients/readme.pdf index 4334aaa..5ecb8d8 100644 Binary files a/modules/clients/readme.pdf and b/modules/clients/readme.pdf differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java index 8011945..0173da6 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java @@ -74,9 +74,6 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest { /** */ private static final Map<String, HashMapStore> cacheStores = new HashMap<>(); - /** Path to test log. */ - private static final String TEST_LOG_PATH = "modules/core/src/test/resources/log/ignite.log.tst"; - /** */ public static final String ROUTER_LOG_CFG = "modules/core/src/test/config/log4j-test.xml"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java index eefcfb3..c0c95c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java @@ -23,9 +23,7 @@ import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; import javax.cache.integration.*; -import java.sql.*; import java.util.*; -import java.util.Date; import static javax.cache.Cache.*; @@ -65,53 +63,6 @@ import static javax.cache.Cache.*; * tx.addMeta("some.name", conn); * } * </pre> - * <h1 class="header">Working With Portable Objects</h1> - * When portables are enabled for cache by setting {@code org.apache.ignite.configuration.CacheConfiguration#isPortableEnabled()} to - * {@code true}), all portable keys and values are converted to instances of {@code PortableObject}. - * Therefore, all cache store methods will take parameters in portable format. To avoid class - * cast exceptions, store must have signature compatible with portables. E.g., if you use {@link Integer} - * as a key and {@code Value} class as a value (which will be converted to portable format), cache store - * signature should be the following: - * <pre name="code" class="java"> - * public class PortableCacheStore implements GridCacheStore<Integer, GridPortableObject> { - * public void put(@Nullable GridCacheTx tx, Integer key, GridPortableObject val) throws IgniteCheckedException { - * ... - * } - * - * ... - * } - * </pre> - * This behavior can be overridden by setting {@code org.apache.ignite.configuration.CacheConfiguration#setKeepPortableInStore(boolean)} - * flag value to {@code false}. In this case, Ignite will deserialize keys and values stored in portable - * format before they are passed to cache store, so that you can use the following cache store signature instead: - * <pre name="code" class="java"> - * public class ObjectsCacheStore implements GridCacheStore<Integer, Person> { - * public void put(@Nullable GridCacheTx tx, Integer key, Person val) throws GridException { - * ... - * } - * - * ... - * } - * </pre> - * Note that while this can simplify store implementation in some cases, it will cause performance degradation - * due to additional serializations and deserializations of portable objects. You will also need to have key - * and value classes on all nodes since portables will be deserialized when store is invoked. - * <p> - * Note that only portable classes are converted to {@code PortableObject} format. Following - * types are stored in cache without changes and therefore should not affect cache store signature: - * <ul> - * <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li> - * <li>Arrays of primitives (byte[], int[], ...)</li> - * <li>{@link String} and array of {@link String}s</li> - * <li>{@link UUID} and array of {@link UUID}s</li> - * <li>{@link Date} and array of {@link Date}s</li> - * <li>{@link Timestamp} and array of {@link Timestamp}s</li> - * <li>Enums and array of enums</li> - * <li> - * Maps, collections and array of objects (but objects inside - * them will still be converted if they are portable) - * </li> - * </ul> * * @see CacheStoreSession */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java index 90d62b7..08ad789 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java @@ -81,7 +81,7 @@ import java.util.concurrent.atomic.*; * ... * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java index 2ed3e14..f8b8d64 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java @@ -92,26 +92,13 @@ final class GridDiagnostic { } }); - exec.execute(new GridWorker(gridName, "grid-diagnostic-3", log) { - @Override public void body() { - String jdkStrLow = U.jdkString().toLowerCase(); - - if (jdkStrLow.contains("jrockit") && jdkStrLow.contains("1.5.")) { - U.warn(log, "BEA JRockit VM ver. 1.5.x has shown problems with NIO functionality in our " + - "tests that were not reproducible in other VMs. We recommend using Sun VM. Should you " + - "have further questions please contact us at supp...@gridgain.com", - "BEA JRockit VM ver. 1.5.x is not supported."); - } - } - }); - exec.execute(new GridWorker(gridName, "grid-diagnostic-4", log) { @Override public void body() { // Sufficiently tested OS. if (!U.isSufficientlyTestedOs()) { U.warn(log, "This operating system has been tested less rigorously: " + U.osString() + ". Our team will appreciate the feedback if you experience any problems running " + - "ignite in this environment. You can always send your feedback to supp...@gridgain.com", + "ignite in this environment.", "This OS is tested less rigorously: " + U.osString()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java index 830481f..3d491ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java @@ -33,9 +33,7 @@ import java.util.concurrent.*; import static java.net.URLEncoder.*; /** - * This class is responsible for notification about new version availability. Note that this class - * does not send any information and merely accesses the {@code www.gridgain.com} web site for the - * latest version data. + * This class is responsible for notification about new version availability. * <p> * Note also that this connectivity is not necessary to successfully start the system as it will * gracefully ignore any errors occurred during notification and verification process. @@ -90,7 +88,7 @@ class GridUpdateNotifier { * @param gw Kernal gateway. * @throws IgniteCheckedException If failed. */ - GridUpdateNotifier(String gridName, String ver, String site, GridKernalGateway gw, boolean reportOnlyNew) + GridUpdateNotifier(String gridName, String ver, GridKernalGateway gw, boolean reportOnlyNew) throws IgniteCheckedException { try { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); @@ -108,7 +106,7 @@ class GridUpdateNotifier { this.ver = ver; - url = "http://"; + site + "/update_status.php"; + url = "http://tiny.cc/updater/update_status.php";; this.gridName = gridName == null ? "null" : gridName; this.reportOnlyNew = reportOnlyNew; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index f46d071..cc4efa6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -104,7 +104,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { private static final String COMPATIBLE_VERS = IgniteProperties.get("ignite.compatible.vers"); /** Ignite site that is shown in log messages. */ - static final String SITE = "www.gridgain.com"; + static final String SITE = "ignite.incubator.apache.org"; /** System line separator. */ private static final String NL = U.nl(); @@ -271,7 +271,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { /** {@inheritDoc} */ @Override public final IgniteEvents events(ClusterGroup grp) { - return ((ClusterGroupAdapter)grp).events(); + return ((ClusterGroupAdapter) grp).events(); } /** {@inheritDoc} */ @@ -452,8 +452,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { @Override public Collection<String> getUserAttributesFormatted() { assert cfg != null; - return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String,?>,String>() { - @Override public String apply(Map.Entry<String,?> e) { + return F.transform(cfg.getUserAttributes().entrySet(), new C1<Map.Entry<String, ?>, String>() { + @Override + public String apply(Map.Entry<String, ?> e) { return e.getKey() + ", " + e.getValue().toString(); } }); @@ -628,7 +629,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { if (notifyEnabled) { try { - verChecker = new GridUpdateNotifier(gridName, VER_STR, SITE, gw, false); + verChecker = new GridUpdateNotifier(gridName, VER_STR, gw, false); verChecker.checkForNewVersion(execSvc, log); } @@ -997,8 +998,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { ctx.performance().logSuggestions(log, gridName); - ackBenchmarks(); - U.quietAndInfo(log, "To start Console Management & Monitoring run ignitevisorcmd.{sh|bat}"); ackStart(rtBean); @@ -1511,14 +1510,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { } /** - * Acks benchmarking instructions. - */ - private void ackBenchmarks() { - if (!isDaemon()) - U.quietAndInfo(log, "If running benchmarks, see http://bit.ly/GridGain-Benchmarking";); - } - - /** * Acks ASCII-logo. Thanks to http://patorjk.com/software/taag */ private void ackAsciiLogo() { @@ -1608,7 +1599,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { ">>> Local node addresses: " + U.addressesAsString(locNode) + NL + ">>> Local ports: " + sb + NL; - str += ">>> Ignite documentation: http://"; + SITE + "/documentation" + NL; + str += ">>> Ignite documentation: http://"; + SITE + NL; log.info(str); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java index e2956dd..1e6dc47 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java @@ -60,7 +60,7 @@ import java.io.*; * </bean> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java index f03a4f5..a76bb5f 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/JdkMarshaller.java @@ -55,7 +55,7 @@ import java.io.*; * </bean> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java index 57d0506..c18d545 100644 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshaller.java @@ -72,7 +72,7 @@ import java.util.*; * </bean> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java index 8b8f9b9..93c9a30 100644 --- a/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java +++ b/modules/core/src/main/java/org/apache/ignite/resources/SpringApplicationContextResource.java @@ -56,7 +56,7 @@ import java.lang.annotation.*; * } * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java index 15908c6..5f76b33 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/cache/CacheCheckpointSpi.java @@ -88,7 +88,7 @@ import static org.apache.ignite.events.EventType.*; * </bean> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> * @see org.apache.ignite.spi.checkpoint.CheckpointSpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java index 6a77caa..158d530 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpi.java @@ -97,7 +97,7 @@ import java.text.*; * </bean> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java index 7ab8c1f..c244e49 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/checkpoint/sharedfs/SharedFsCheckpointSpi.java @@ -93,7 +93,7 @@ import java.util.*; * </bean> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> * @see org.apache.ignite.spi.checkpoint.CheckpointSpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java index 7e31076..ddb73a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java @@ -58,7 +58,7 @@ import static org.apache.ignite.events.EventType.*; * when Node<sub>3</sub> becomes free, it steals Job<sub>13</sub> and Job<sub>23</sub> * from Node<sub>1</sub> and Node<sub>2</sub> respectively. * <p> - * <center><img src="http://www.gridgain.com/images/job_stealing_white.gif";></center> + * <center><img src="http://http://ignite.incubator.apache.org/images/job_stealing_white.gif";></center> * <p> * <i> * Note that this SPI must always be used in conjunction with @@ -156,7 +156,7 @@ import static org.apache.ignite.events.EventType.*; * </property> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java index e423665..4ad15fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/priorityqueue/PriorityQueueCollisionSpi.java @@ -153,7 +153,7 @@ import java.util.*; * } * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index eacd742..19fe5c5 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -22,14 +22,8 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.util.*; -import org.apache.ignite.lang.*; -import org.apache.ignite.plugin.extensions.communication.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.spi.*; -import org.apache.ignite.spi.communication.*; -import org.apache.ignite.thread.*; import org.apache.ignite.internal.managers.eventstorage.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.future.*; import org.apache.ignite.internal.util.ipc.*; import org.apache.ignite.internal.util.ipc.shmem.*; @@ -38,6 +32,12 @@ import org.apache.ignite.internal.util.nio.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.util.worker.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.plugin.extensions.communication.*; +import org.apache.ignite.resources.*; +import org.apache.ignite.spi.*; +import org.apache.ignite.spi.communication.*; +import org.apache.ignite.thread.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; @@ -136,7 +136,7 @@ import static org.apache.ignite.events.EventType.*; * </bean> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> * @see CommunicationSpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index df39d6b..e52fcaa 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -133,7 +133,7 @@ import static org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusChe * </bean> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> * @see org.apache.ignite.spi.discovery.DiscoverySpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java index c4ae597..da65036 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java @@ -84,7 +84,7 @@ import static org.apache.ignite.events.EventType.*; * </bean> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> * @see org.apache.ignite.spi.eventstorage.EventStorageSpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java index 0788b34..68f212e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/always/AlwaysFailoverSpi.java @@ -74,7 +74,7 @@ import java.util.*; * </property> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> * @see org.apache.ignite.spi.failover.FailoverSpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java index f6121d8..6c7749f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/jobstealing/JobStealingFailoverSpi.java @@ -80,7 +80,7 @@ import static org.apache.ignite.spi.collision.jobstealing.JobStealingCollisionSp * </property> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> * @see org.apache.ignite.spi.failover.FailoverSpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java index 132060b..ee31d64 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/failover/never/NeverFailoverSpi.java @@ -55,7 +55,7 @@ import java.util.*; * </property> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> * @see org.apache.ignite.spi.failover.FailoverSpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java index 43ee43b..d148fbe 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingSpi.java @@ -54,7 +54,7 @@ import java.util.*; * </property> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java index 3aec11a..3f4ad9d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/adaptive/AdaptiveLoadBalancingSpi.java @@ -224,7 +224,7 @@ import static org.apache.ignite.events.EventType.*; * </property> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java index 74cd8fc..1dfed68 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/roundrobin/RoundRobinLoadBalancingSpi.java @@ -155,7 +155,7 @@ import static org.apache.ignite.events.EventType.*; * </property> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java index 9fab9b0..4be2add 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/loadbalancing/weightedrandom/WeightedRandomLoadBalancingSpi.java @@ -153,7 +153,7 @@ import static org.apache.ignite.events.EventType.*; * </property> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java index 122d0ed..5eec025 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/swapspace/file/FileSwapSpaceSpi.java @@ -94,7 +94,7 @@ import static org.apache.ignite.events.EventType.*; * </bean> * </pre> * <p> - * <img src="http://www.gridgain.com/images/spring-small.png";> + * <img src="http://ignite.incubator.apache.org/images/spring-small.png";> * <br> * For information about Spring framework visit <a href="http://www.springframework.org/";>www.springframework.org</a> * @see org.apache.ignite.spi.swapspace.SwapSpaceSpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/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 index 5189cfd..6a0709d 100644 --- 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 @@ -90,7 +90,7 @@ public final class CommandLineStartup { Object osxApp = appCls.getDeclaredMethod("getApplication").invoke(null); - String icoPath = "ggcube_node_128x128.png"; + String icoPath = "logo_ignite_128x128.png"; URL url = CommandLineStartup.class.getResource(icoPath); @@ -103,7 +103,7 @@ public final class CommandLineStartup { // Setting Up about dialog Class<?> aboutHndCls = Class.forName("com.apple.eawt.AboutHandler"); - final URL bannerUrl = CommandLineStartup.class.getResource("ggcube_node_48x48.png"); + final URL bannerUrl = CommandLineStartup.class.getResource("logo_ignite_48x48.png"); Object aboutHndProxy = Proxy.newProxyInstance( appCls.getClassLoader(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_128x128.png ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_128x128.png b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_128x128.png deleted file mode 100644 index 88dcd60..0000000 Binary files a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_128x128.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_48x48.png ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_48x48.png b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_48x48.png deleted file mode 100644 index 7f6c967..0000000 Binary files a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/ggcube_node_48x48.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_128x128.png ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_128x128.png b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_128x128.png new file mode 100644 index 0000000..046e381 Binary files /dev/null and b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_128x128.png differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_48x48.png ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_48x48.png b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_48x48.png new file mode 100644 index 0000000..d4836ef Binary files /dev/null and b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/logo_ignite_48x48.png differ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4030f92/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java index 07bcf48..78a7a9c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java @@ -37,7 +37,7 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest { */ public void testNotifier() throws Exception { GridUpdateNotifier ntf = new GridUpdateNotifier(null, IgniteProperties.get("ignite.version"), - IgniteKernal.SITE, TEST_GATEWAY, false); + TEST_GATEWAY, false); ntf.checkForNewVersion(new SelfExecutor(), log);
![http://www.gridgain.com/images/spring-small.png"](http://www.gridgain.com/images/spring-small.png"){kind=link}
![http://ignite.incubator.apache.org/images/spring-small.png"](http://ignite.incubator.apache.org/images/spring-small.png"){kind=link}
![http://www.gridgain.com/images/job_stealing_white.gif"](http://www.gridgain.com/images/job_stealing_white.gif"){kind=link}
![http://http://ignite.incubator.apache.org/images/job_stealing_white.gif"](http://http://ignite.incubator.apache.org/images/job_stealing_white.gif"){kind=link}
