ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject incubator-ignite git commit: minor renaming
Date Fri, 20 Mar 2015 16:27:29 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-45 b57e47ed3 -> e99a52bc5


minor 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/e99a52bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e99a52bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e99a52bc

Branch: refs/heads/ignite-45
Commit: e99a52bc55908f39bb43ddc6ca5592e4aef728aa
Parents: b57e47e
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Fri Mar 20 19:27:21 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Fri Mar 20 19:27:21 2015 +0300

----------------------------------------------------------------------
 examples/config/servlet/WEB-INF/web.xml                   |  2 +-
 .../main/java/org/apache/ignite/IgniteDataStreamer.java   |  4 ++--
 .../internal/processors/igfs/IgfsCacheSelfTest.java       | 10 ++++++++--
 modules/core/src/test/webapp/WEB-INF/web.xml              |  2 +-
 .../apache/ignite/cache/spring/SpringCacheManager.java    |  2 +-
 .../apache/ignite/cache/websession/WebSessionFilter.java  |  2 +-
 .../startup/servlet/ServletContextListenerStartup.java    |  4 ++--
 7 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99a52bc/examples/config/servlet/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/config/servlet/WEB-INF/web.xml b/examples/config/servlet/WEB-INF/web.xml
index 239da04..f6567da 100644
--- a/examples/config/servlet/WEB-INF/web.xml
+++ b/examples/config/servlet/WEB-INF/web.xml
@@ -31,6 +31,6 @@
     </context-param>
 
     <listener>
-        <listener-class>org.apache.ignite.startup.servlet.IgniteServletContextListenerStartup</listener-class>
+        <listener-class>org.apache.ignite.startup.servlet.ServletContextListenerStartup</listener-class>
     </listener>
 </web-app>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99a52bc/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
index 46b9598..8e81124 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteDataStreamer.java
@@ -75,7 +75,7 @@ import java.util.*;
  *      updates and allow data streamer choose most optimal concurrent implementation.
  *  </li>
  *  <li>
- *      {@link #updater(IgniteDataStreamer.Updater)} - defines how cache will be updated
with added entries.
+ *      {@link #receiver(StreamReceiver)} - defines how cache will be updated with added
entries.
  *      It allows to provide user-defined custom logic to update the cache in the most effective
and flexible way.
  *  </li>
  *  <li>
@@ -114,7 +114,7 @@ public interface IgniteDataStreamer<K, V> extends AutoCloseable
{
     /**
      * Sets flag indicating that this data streamer should assume
      * that there are no other concurrent updates to the cache.
-     * Should not be used when custom cache receiver set using {@link #updater(IgniteDataStreamer.Updater)}
method.
+     * Should not be used when custom cache receiver set using {@link #receiver(StreamReceiver)}
method.
      * Default is {@code false}. When this flag is set, updates will not be propagated to
the cache store.
      *
      * @param allowOverwrite Flag value.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99a52bc/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
index dd95a2d..65c6c7d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
@@ -22,10 +22,12 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.igfs.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.testframework.*;
 
+import java.util.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
@@ -108,9 +110,13 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
     public void testCache() throws Exception {
         final Ignite g = grid();
 
-        assert ((IgniteKernal)g).caches().size() == 1;
+        Collection<IgniteCacheProxy<?, ?>> caches = ((IgniteKernal)g).caches();
 
-        assert CACHE_NAME.equals(((IgniteKernal)g).caches().iterator().next().getName());
+        info("Caches: " + caches);
+
+        assertEquals(1, caches.size());
+
+        assert CACHE_NAME.equals(caches.iterator().next().getName());
 
         GridTestUtils.assertThrows(log(), new Callable<Object>() {
             @Override public Object call() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99a52bc/modules/core/src/test/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/webapp/WEB-INF/web.xml b/modules/core/src/test/webapp/WEB-INF/web.xml
index e9969dc..e3523c7 100644
--- a/modules/core/src/test/webapp/WEB-INF/web.xml
+++ b/modules/core/src/test/webapp/WEB-INF/web.xml
@@ -25,7 +25,7 @@
 
     <!-- Declare listener for web sessions caching. -->
     <listener>
-        <listener-class>org.apache.ignite.startup.servlet.IgniteServletContextListenerStartup</listener-class>
+        <listener-class>org.apache.ignite.startup.servlet.ServletContextListenerStartup</listener-class>
     </listener>
 
     <!-- Declare filter for web sessions caching. -->

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99a52bc/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
index c77c21f..b8e21ff 100644
--- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
+++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
@@ -115,7 +115,7 @@ import java.util.*;
  * &lt;/beans&gt;
  * </pre>
  * This can be used, for example, when you are running your application
- * in a J2EE Web container and use {@ignitelink org.apache.ignite.startup.servlet.IgniteServletContextListenerStartup}
+ * in a J2EE Web container and use {@ignitelink org.apache.ignite.startup.servlet.ServletContextListenerStartup}
  * for node startup.
  * <p>
  * If neither {@link #setConfigurationPath(String) configurationPath},

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99a52bc/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
index 896c987..dab2053 100644
--- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
+++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
@@ -47,7 +47,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.*;
  * with {@link ServletContextListenerStartup} to enable web sessions caching:
  * <pre name="code" class="xml">
  * &lt;listener&gt;
- *     &lt;listener-class&gt;org.apache.ignite.startup.servlet.IgniteServletContextListenerStartup&lt;/listener-class&gt;
+ *     &lt;listener-class&gt;org.apache.ignite.startup.servlet.ServletContextListenerStartup&lt;/listener-class&gt;
  * &lt;/listener&gt;
  *
  * &lt;filter&gt;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99a52bc/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
b/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
index ed3c78f..e1de7bc 100644
--- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
+++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
@@ -36,7 +36,7 @@ import java.util.*;
  * This startup must be defined in {@code web.xml} file.
  * <pre name="code" class="xml">
  * &lt;listener&gt;
- *     &lt;listener-class&gt;org.apache.ignite.startup.servlet.IgniteServletContextListenerStartup&lt;/listener-class&gt;
+ *     &lt;listener-class&gt;org.apache.ignite.startup.servlet.ServletContextListenerStartup&lt;/listener-class&gt;
  * &lt;/listener&gt;
  *
  * &lt;context-param&gt;
@@ -66,7 +66,7 @@ import java.util.*;
  *     <li>Configure this startup in {@code $TOMCAT_HOME/conf/web.xml}
  *         <pre name="code" class="xml">
  *         &lt;listener&gt;
- *             &lt;listener-class&gt;org.apache.ignite.startup.servlet.IgniteServletContextListenerStartup&lt;/listener-class&gt;
+ *             &lt;listener-class&gt;org.apache.ignite.startup.servlet.ServletContextListenerStartup&lt;/listener-class&gt;
  *         &lt;/listener&gt;
  *
  *         &lt;context-param&gt;


Mime
View raw message