#ignite-164: remove gridgain from comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46eecdd0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46eecdd0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46eecdd0 Branch: refs/heads/ignite-111 Commit: 46eecdd09f82cf89c58c6c6338d6389efce2ad12 Parents: 4fc2b25 Author: ivasilinets <[email protected]> Authored: Thu Feb 5 14:29:03 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Thu Feb 5 14:29:03 2015 +0300 ---------------------------------------------------------------------- .../ignite/gridify/NonSpringAopSelfTest.java | 2 +- .../processors/rest/RestProcessorTest.java | 22 ++++++++++---------- .../src/test/resources/spring-router-ssl.xml | 2 +- .../GridTaskCancelSingleNodeSelfTest.java | 2 -- .../GridCacheQueryInternalKeysSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 3 --- .../GridCacheDhtPreloadMessageCountTest.java | 4 ---- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 ---- .../GridCacheDistributedEvictionsSelfTest.java | 2 -- .../jvmtest/ServerSocketMultiThreadedTest.java | 4 +--- .../cacheget/GridBenchmarkCacheGetLoadTest.java | 2 +- .../startup/servlet/GridServletLoaderTest.java | 6 +++--- .../util/GridConcurrentLinkedDequeSelfTest.java | 2 -- .../hibernate/CacheHibernateBlobStore.java | 2 +- .../spi/deployment/uri/UriDeploymentSpi.java | 18 ++++++++-------- 15 files changed, 29 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java index aa58118..d429e06 100644 --- a/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/apache/ignite/gridify/NonSpringAopSelfTest.java @@ -39,7 +39,7 @@ import org.apache.ignite.testframework.junits.common.*; * * 1. The JVM is started with following parameters for enable AspectJ online weaving * (replace ${IGNITE_HOME} to you $IGNITE_HOME): - * -javaagent:${IGNITE_HOME}/libs/optional/gridgain-aop/aspectjweaver-1.7.2.jar + * -javaagent:${IGNITE_HOME}/libs/optional/ignite-aop/aspectjweaver-1.7.2.jar * * 2. Classpath should contains the ${IGNITE_HOME}/modules/tests/config/aop/aspectj folder. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java index e096f1e..658e6e8 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorTest.java @@ -35,17 +35,17 @@ import java.util.*; * <p> * URLs to test: * <ul> - * <li>http://localhost:8080/gridgain?cmd=get&key=simpleBean</li> - * <li>http://localhost:8080/gridgain?cmd=get&key=complexBean</li> - * <li>http://localhost:8080/gridgain?cmd=get&key=list</li> - * <li>http://localhost:8080/gridgain?cmd=get&key=map</li> - * <li>http://localhost:8080/gridgain?cmd=get&key=int</li> - * <li>http://localhost:8080/gridgain?cmd=get&key=string</li> - * <li>http://localhost:8080/gridgain?cmd=get&key=date</li> - * <li>http://localhost:8080/gridgain?cmd=top</li> - * <li>http://localhost:8080/gridgain?cmd=exe&name=org.apache.ignite.internal.processors.rest.TestTask2</li> - * <li>http://localhost:8080/gridgain?cmd=exe&name=org.apache.ignite.internal.processors.rest.TestTask2&async=true</li> - * <li>http://localhost:8080/gridgain?cmd=res&id=XXXX</li> + * <li>http://localhost:8080/ignite?cmd=get&key=simpleBean</li> + * <li>http://localhost:8080/ignite?cmd=get&key=complexBean</li> + * <li>http://localhost:8080/ignite?cmd=get&key=list</li> + * <li>http://localhost:8080/ignite?cmd=get&key=map</li> + * <li>http://localhost:8080/ignite?cmd=get&key=int</li> + * <li>http://localhost:8080/ignite?cmd=get&key=string</li> + * <li>http://localhost:8080/ignite?cmd=get&key=date</li> + * <li>http://localhost:8080/ignite?cmd=top</li> + * <li>http://localhost:8080/ignite?cmd=exe&name=org.apache.ignite.internal.processors.rest.TestTask2</li> + * <li>http://localhost:8080/ignite?cmd=exe&name=org.apache.ignite.internal.processors.rest.TestTask2&async=true</li> + * <li>http://localhost:8080/ignite?cmd=res&id=XXXX</li> * </ul> */ public class RestProcessorTest extends GridCommonAbstractTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/clients/src/test/resources/spring-router-ssl.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-router-ssl.xml b/modules/clients/src/test/resources/spring-router-ssl.xml index e27b360..65ba792 100644 --- a/modules/clients/src/test/resources/spring-router-ssl.xml +++ b/modules/clients/src/test/resources/spring-router-ssl.xml @@ -26,7 +26,7 @@ org.apache.ignite.client.router.GridHttpRestRouterConfiguration bean definitions. First found are used to start corresponding router instances. - You can also use org.gridgain.client.router.GridRouterFactory to + You can also use org.apache.ignite.client.router.GridRouterFactory to programmatically start and stop router instances inside your application. Please refer to javadoc for more details. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java index f98ab0b..b885e0a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskCancelSingleNodeSelfTest.java @@ -34,8 +34,6 @@ import static org.apache.ignite.events.IgniteEventType.*; /** * Test for task cancellation issue. - * <p/> - * http://www.gridgainsystems.com/jiveforums/thread.jspa?messageID=8034 */ public class GridTaskCancelSingleNodeSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java index ade174f..26e4bc2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryInternalKeysSelfTest.java @@ -32,7 +32,7 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; /** - * Test for http://gridgain.jira.com/browse/GG-3979. + * Cache query internal keys self test. */ public class GridCacheQueryInternalKeysSelfTest extends GridCacheAbstractSelfTest { /** Grid count. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java index 2434ee3..5406614 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java @@ -46,9 +46,6 @@ import static org.apache.ignite.cache.CachePreloadMode.*; /** * Test cases for partitioned cache {@link GridDhtPreloader preloader}. - * - * Forum example <a href="http://www.gridgainsystems.com/jiveforums/thread.jspa?threadID=1449";> - * http://www.gridgainsystems.com/jiveforums/thread.jspa?threadID=1449</a> */ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { /** Key count. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java index 61d9a3d..5398701 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java @@ -41,10 +41,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test cases for partitioned cache {@link GridDhtPreloader preloader}. - * - * Forum example <a - * href="http://www.gridgainsystems.com/jiveforums/thread.jspa?threadID=1449";> - * http://www.gridgainsystems.com/jiveforums/thread.jspa?threadID=1449</a> */ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest { /** Key count. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java index c48e353..229fc60 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java @@ -38,10 +38,6 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Test cases for partitioned cache {@link GridDhtPreloader preloader}. - * - * Forum example <a - * href="http://www.gridgainsystems.com/jiveforums/thread.jspa?threadID=1449";> - * http://www.gridgainsystems.com/jiveforums/thread.jspa?threadID=1449</a> */ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { /** Key count. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index a5fc5b4..4b8522f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -154,8 +154,6 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes } /** - * http://atlassian.gridgain.com/jira/browse/GG-9002 - * * @throws Throwable If failed. */ public void testLocalSync() throws Throwable { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/core/src/test/java/org/apache/ignite/jvmtest/ServerSocketMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/jvmtest/ServerSocketMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/jvmtest/ServerSocketMultiThreadedTest.java index f888d03..205b240 100644 --- a/modules/core/src/test/java/org/apache/ignite/jvmtest/ServerSocketMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/jvmtest/ServerSocketMultiThreadedTest.java @@ -29,9 +29,7 @@ import java.util.concurrent.atomic.*; /** * Java server socket test. - * <p> - * http://gridgain.jira.com/browse/GG-2068 - * <p> + * * When binding server socket to the same port in multiple threads, either * BindException or SocketException may be thrown. Purpose of this test is * to find some explanation to that. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java index a05b23b..ce2a0ea 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.cache.*; import java.util.concurrent.atomic.*; /** - * This is an adapted test case from DSI-49 (http://www.gridgainsystems.com/jira/browse/DSI-49). + * Benchmark cache get load test. */ public class GridBenchmarkCacheGetLoadTest { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java index 4a75ffe..a7e532c 100644 --- a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java +++ b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java @@ -29,11 +29,11 @@ import java.util.*; * Servlet loader test. * * 1. Create folder where all Ignite jar files will be placed. - * For example: /home/ggdev/apache-tomcat-6.0.14/gridgain + * For example: /home/ggdev/apache-tomcat-6.0.14/ignite * * 2. Add in {@code $TOMCAT_HOME/conf/catalina.properties} for property {@code common.loader} - * value {@code ,${catalina.home}/gridgain/*.jar} - * For example, {@code common.loader=${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.home}/gridgain/*.jar} + * value {@code ,${catalina.home}/ignite/*.jar} + * For example, {@code common.loader=${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.home}/ignite/*.jar} * * 3. Add in {@code $TOMCAT_HOME/conf/web.xml} * <pre class="snippet"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeSelfTest.java index d4c0fdc..7dab6e3 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeSelfTest.java @@ -26,8 +26,6 @@ import static org.jdk8.backport.ConcurrentLinkedDeque8.*; /** * Tests for {@link ConcurrentLinkedDeque8}. - * - * TODO: add more tests http://gridgain.jira.com/browse/GG-2153 */ public class GridConcurrentLinkedDequeSelfTest extends GridCommonAbstractTest { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java index ac54a79..c48d63e 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java @@ -86,7 +86,7 @@ import java.util.concurrent.atomic.*; * <property name="mappingResources"> * <list> * <value> - * org/gridgain/grid/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml + * org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStoreEntry.hbm.xml * </value> * </list> * </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eecdd0/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java index 34392d1..7896040 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/UriDeploymentSpi.java @@ -171,12 +171,12 @@ import java.util.Map.*; * </tr> * </table> * <h2 class="header">File URI Example</h2> - * The following example will scan {@code 'c:/Program files/gridgain/deployment'} + * The following example will scan {@code 'c:/Program files/ignite/deployment'} * folder on local box every {@code '5000'} milliseconds. Note that since path * has spaces, {@link #setEncodeUri(boolean) setEncodeUri(boolean)} parameter must * be set to {@code true} (which is default behavior). * <blockquote class="snippet"> - * {@code file://freq=5000@localhost/c:/Program files/gridgain/deployment} + * {@code file://freq=5000@localhost/c:/Program files/ignite/deployment} * </blockquote> * <a name="classes"></a> * <h1 class="header">Classes</h1> @@ -202,12 +202,12 @@ import java.util.Map.*; * </tr> * </table> * <h2 class="header">Classes URI Example</h2> - * The following example will scan {@code 'c:/Program files/gridgain/deployment'} + * The following example will scan {@code 'c:/Program files/ignite/deployment'} * folder on local box every {@code '5000'} milliseconds. Note that since path * has spaces, {@link #setEncodeUri(boolean) setEncodeUri(boolean)} parameter must * be set to {@code true} (which is default behavior). * <blockquote class="snippet"> - * {@code classes://freq=5000@localhost/c:/Program files/gridgain/deployment} + * {@code classes://freq=5000@localhost/c:/Program files/ignite/deployment} * </blockquote> * <a name="ftp"></a> * <h1 class="header">FTP</h1> @@ -240,17 +240,17 @@ import java.util.Map.*; * <h2 class="header">FTP URI Example</h2> * Here is an example of an FTP URI that connects identified as * {@code username:password} to {@code 'localhost'} on port {@code '21'}, - * with initial path set to {@code 'gridgain/deployment'} + * with initial path set to {@code 'ignite/deployment'} * <blockquote class="snippet"> - * ftp://username:password;freq=10000@localhost:21/gridgain/deployment + * ftp://username:password;freq=10000@localhost:21/ignite/deployment * </blockquote> * <p> * <h2 class="header">HTTP URI Example</h2> - * The following example will scan {@code 'gridgain/deployment'} folder with + * The following example will scan {@code 'ignite/deployment'} folder with * on site {@code 'www.mysite.com'} using authentication * {@code 'username:password'} every {@code '10000'} milliseconds. * <blockquote class="snippet"> - * {@code http://username:password;[email protected]:110/gridgain/deployment} + * {@code http://username:password;[email protected]:110/ignite/deployment} * </blockquote> * <h2 class="header">Java Example</h2> * UriDeploymentSpi needs to be explicitly configured to override default local deployment SPI. @@ -285,7 +285,7 @@ import java.util.Map.*; * <bean id="grid.custom.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> * ... * <property name="deploymentSpi"> - * <bean class="org.gridgain.grid.spi.deployment.uri.UriDeploymentSpi"> + * <bean class="org.apache.ignite.grid.spi.deployment.uri.UriDeploymentSpi"> * <property name="temporaryDirectoryPath" value="c:/tmp/grid"/> * <property name="uriList"> * <list>
