ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [42/50] [abbrv] incubator-ignite git commit: #ignite-556: Move configs.
Date Mon, 23 Mar 2015 15:38:50 GMT
#ignite-556: Move configs.


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

Branch: refs/heads/ignite-45-gridcache
Commit: 04a22f104499e0762153eb913547da16dd2b88f4
Parents: 32af4a6
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Mar 23 17:29:16 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Mar 23 17:29:16 2015 +0300

----------------------------------------------------------------------
 modules/core/src/test/config/cache.xml          | 58 ---------------
 modules/core/src/test/config/invalid-cache.xml  | 78 --------------------
 .../internal/IgniteDynamicCacheConfigTest.java  | 25 ++++---
 .../java/org/apache/ignite/internal/cache.xml   | 58 +++++++++++++++
 .../apache/ignite/internal/invalid-cache.xml    | 78 ++++++++++++++++++++
 5 files changed, 149 insertions(+), 148 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04a22f10/modules/core/src/test/config/cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/cache.xml b/modules/core/src/test/config/cache.xml
deleted file mode 100644
index ddd3b48..0000000
--- a/modules/core/src/test/config/cache.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
-    Ignite Spring configuration file to startup grid cache.
-
-    When starting a standalone Ignite node, you need to execute the following command:
-    {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
-
-    When starting Ignite from Java IDE, pass path to this file to Ignite:
-    Ignition.start("examples/config/example-cache.xml");
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
-    <bean id="cache-configuration" class="org.apache.ignite.configuration.CacheConfiguration">
-        <!-- Initial cache size. -->
-        <property name="startSize" value="3000000"/>
-
-        <!-- Set synchronous rebalancing (default is asynchronous). -->
-        <property name="rebalanceMode" value="SYNC"/>
-
-        <!-- Set to FULL_SYNC for examples, default is PRIMARY_SYNC. -->
-        <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
-        <property name="name" value="TestDynamicCache"/>
-
-        <property name="cacheMode" value="PARTITIONED"/>
-
-        <property name="atomicityMode" value="ATOMIC"/>
-
-        <property name="backups" value="1"/>
-    </bean>
-    <bean id="nearCache-configuration" class="org.apache.ignite.configuration.NearCacheConfiguration">
-    </bean>
-</beans>
-

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04a22f10/modules/core/src/test/config/invalid-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/invalid-cache.xml b/modules/core/src/test/config/invalid-cache.xml
deleted file mode 100644
index 13a0b75..0000000
--- a/modules/core/src/test/config/invalid-cache.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
-    Ignite Spring configuration file to startup grid cache.
-
-    When starting a standalone Ignite node, you need to execute the following command:
-    {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
-
-    When starting Ignite from Java IDE, pass path to this file to Ignite:
-    Ignition.start("examples/config/example-cache.xml");
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
-    <bean id="cache-configuration" class="org.apache.ignite.configuration.CacheConfiguration">
-        <!-- Initial cache size. -->
-        <property name="startSize" value="3000000"/>
-
-        <!-- Set synchronous rebalancing (default is asynchronous). -->
-        <property name="rebalanceMode" value="SYNC"/>
-
-        <!-- Set to FULL_SYNC for examples, default is PRIMARY_SYNC. -->
-        <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
-        <property name="name" value="TestDynamicCache"/>
-
-        <property name="cacheMode" value="PARTITIONED"/>
-
-        <property name="atomicityMode" value="ATOMIC"/>
-
-        <property name="backups" value="1"/>
-    </bean>
-
-    <bean id="cache-configuration1" class="org.apache.ignite.configuration.CacheConfiguration">
-        <!-- Initial cache size. -->
-        <property name="startSize" value="3000000"/>
-
-        <!-- Set synchronous rebalancing (default is asynchronous). -->
-        <property name="rebalanceMode" value="SYNC"/>
-
-        <!-- Set to FULL_SYNC for examples, default is PRIMARY_SYNC. -->
-        <property name="writeSynchronizationMode" value="FULL_SYNC"/>
-
-        <property name="name" value="TestDynamicCache1"/>
-
-        <property name="cacheMode" value="PARTITIONED"/>
-
-        <property name="atomicityMode" value="ATOMIC"/>
-
-        <property name="backups" value="1"/>
-    </bean>
-
-    <bean id="nearCache-configuration" class="org.apache.ignite.configuration.NearCacheConfiguration">
-    </bean>
-</beans>
-

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04a22f10/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
b/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
index db91d76..b5424df 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/IgniteDynamicCacheConfigTest.java
@@ -86,11 +86,12 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest
{
      * @throws Exception If failed.
      */
     public void testDynamicCacheStartFromConfig() throws Exception {
-        IgniteCache cache = ignite(0).createCache("modules/core/src/test/config/cache.xml");
+        IgniteCache cache = ignite(0).createCache("modules/spring/src/test/java/org/apache/ignite/internal/cache.xml");
 
         assertEquals("TestDynamicCache", cache.getName());
 
-        IgniteCache cache1 = ignite(0).getOrCreateCache("modules/core/src/test/config/cache.xml");
+        IgniteCache cache1 = ignite(0).getOrCreateCache(
+            "modules/spring/src/test/java/org/apache/ignite/internal/cache.xml");
 
         assertEquals(cache, cache1);
     }
@@ -110,10 +111,10 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest
{
             assertEquals(CACHE_NAME, cache.getName());
 
             IgniteCache<Integer, Integer> clientCache1 = ignite(nodeCount() + 1).createNearCache(CACHE_NAME,
-                "modules/core/src/test/config/cache.xml");
+                "modules/spring/src/test/java/org/apache/ignite/internal/cache.xml");
 
             IgniteCache clientCache2 = ignite(nodeCount() + 1).getOrCreateNearCache(CACHE_NAME,
-                "modules/core/src/test/config/cache.xml");
+                "modules/spring/src/test/java/org/apache/ignite/internal/cache.xml");
 
             assertEquals(clientCache1, clientCache2);
 
@@ -137,15 +138,15 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest
{
 
             IgniteCache cache = ignite(clientNode).createCache(
                 "modules/spring/src/test/java/org/apache/ignite/internal/filtered-cache.xml",
-                "modules/core/src/test/config/cache.xml");
+                "modules/spring/src/test/java/org/apache/ignite/internal/cache.xml");
 
             assertEquals(cache.getName(), CACHE_NAME);
 
             IgniteCache<Integer, Integer> clientCache1 = ignite(clientNode).createNearCache(CACHE_NAME,
-                "modules/core/src/test/config/cache.xml");
+                "modules/spring/src/test/java/org/apache/ignite/internal/cache.xml");
 
             IgniteCache clientCache2 = ignite(clientNode).getOrCreateNearCache(CACHE_NAME,
-                "modules/core/src/test/config/cache.xml");
+                "modules/spring/src/test/java/org/apache/ignite/internal/cache.xml");
 
             assertEquals(clientCache1, clientCache2);
 
@@ -172,15 +173,15 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest
{
 
             IgniteCache cache1 = ignite(clientNode).getOrCreateCache(
                 "modules/spring/src/test/java/org/apache/ignite/internal/filtered-cache.xml",
-                "modules/core/src/test/config/cache.xml");
+                "modules/spring/src/test/java/org/apache/ignite/internal/cache.xml");
 
             assertEquals(cache.getName(), cache1.getName());
 
             IgniteCache<Integer, Integer> clientCache1 = ignite(clientNode).createNearCache(CACHE_NAME,
-                "modules/core/src/test/config/cache.xml");
+                "modules/spring/src/test/java/org/apache/ignite/internal/cache.xml");
 
             IgniteCache clientCache2 = ignite(clientNode).getOrCreateNearCache(CACHE_NAME,
-                "modules/core/src/test/config/cache.xml");
+                "modules/spring/src/test/java/org/apache/ignite/internal/cache.xml");
 
             assertEquals(clientCache1, clientCache2);
 
@@ -210,7 +211,7 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest
{
      */
     public void testDynamicCacheStartFromInvalidConfig() throws Exception {
         try {
-            ignite(0).getOrCreateCache("modules/core/src/test/config/invalid-cache.xml");
+            ignite(0).getOrCreateCache("modules/spring/src/test/java/org/apache/ignite/internal/invalid-cache.xml");
 
             fail();
         }
@@ -227,7 +228,7 @@ public class IgniteDynamicCacheConfigTest extends GridCommonAbstractTest
{
 
         try {
             srv = GridEmbeddedHttpServer.startHttpServer().withFileDownloadingHandler(null,
-                GridTestUtils.resolveIgnitePath("/modules/core/src/test/config/cache.xml"));
+                GridTestUtils.resolveIgnitePath("modules/spring/src/test/java/org/apache/ignite/internal/cache.xml"));
 
             IgniteCache cache = ignite(0).createCache(srv.getBaseUrl());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04a22f10/modules/spring/src/test/java/org/apache/ignite/internal/cache.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/cache.xml b/modules/spring/src/test/java/org/apache/ignite/internal/cache.xml
new file mode 100644
index 0000000..ddd3b48
--- /dev/null
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/cache.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+    Ignite Spring configuration file to startup grid cache.
+
+    When starting a standalone Ignite node, you need to execute the following command:
+    {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
+
+    When starting Ignite from Java IDE, pass path to this file to Ignite:
+    Ignition.start("examples/config/example-cache.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+        http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util
+        http://www.springframework.org/schema/util/spring-util.xsd">
+    <bean id="cache-configuration" class="org.apache.ignite.configuration.CacheConfiguration">
+        <!-- Initial cache size. -->
+        <property name="startSize" value="3000000"/>
+
+        <!-- Set synchronous rebalancing (default is asynchronous). -->
+        <property name="rebalanceMode" value="SYNC"/>
+
+        <!-- Set to FULL_SYNC for examples, default is PRIMARY_SYNC. -->
+        <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+        <property name="name" value="TestDynamicCache"/>
+
+        <property name="cacheMode" value="PARTITIONED"/>
+
+        <property name="atomicityMode" value="ATOMIC"/>
+
+        <property name="backups" value="1"/>
+    </bean>
+    <bean id="nearCache-configuration" class="org.apache.ignite.configuration.NearCacheConfiguration">
+    </bean>
+</beans>
+

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04a22f10/modules/spring/src/test/java/org/apache/ignite/internal/invalid-cache.xml
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/invalid-cache.xml b/modules/spring/src/test/java/org/apache/ignite/internal/invalid-cache.xml
new file mode 100644
index 0000000..13a0b75
--- /dev/null
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/invalid-cache.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+    Ignite Spring configuration file to startup grid cache.
+
+    When starting a standalone Ignite node, you need to execute the following command:
+    {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml
+
+    When starting Ignite from Java IDE, pass path to this file to Ignite:
+    Ignition.start("examples/config/example-cache.xml");
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+        http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util
+        http://www.springframework.org/schema/util/spring-util.xsd">
+    <bean id="cache-configuration" class="org.apache.ignite.configuration.CacheConfiguration">
+        <!-- Initial cache size. -->
+        <property name="startSize" value="3000000"/>
+
+        <!-- Set synchronous rebalancing (default is asynchronous). -->
+        <property name="rebalanceMode" value="SYNC"/>
+
+        <!-- Set to FULL_SYNC for examples, default is PRIMARY_SYNC. -->
+        <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+        <property name="name" value="TestDynamicCache"/>
+
+        <property name="cacheMode" value="PARTITIONED"/>
+
+        <property name="atomicityMode" value="ATOMIC"/>
+
+        <property name="backups" value="1"/>
+    </bean>
+
+    <bean id="cache-configuration1" class="org.apache.ignite.configuration.CacheConfiguration">
+        <!-- Initial cache size. -->
+        <property name="startSize" value="3000000"/>
+
+        <!-- Set synchronous rebalancing (default is asynchronous). -->
+        <property name="rebalanceMode" value="SYNC"/>
+
+        <!-- Set to FULL_SYNC for examples, default is PRIMARY_SYNC. -->
+        <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+
+        <property name="name" value="TestDynamicCache1"/>
+
+        <property name="cacheMode" value="PARTITIONED"/>
+
+        <property name="atomicityMode" value="ATOMIC"/>
+
+        <property name="backups" value="1"/>
+    </bean>
+
+    <bean id="nearCache-configuration" class="org.apache.ignite.configuration.NearCacheConfiguration">
+    </bean>
+</beans>
+


Mime
View raw message