# ignite-63

apache · Jan 23, 2015 · d0e6cac · d0e6cac
1 parent 4b25edc
commit d0e6cac
Show file tree

Hide file tree

Showing 24 changed files with 38 additions and 40 deletions.
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
@@ -29,7 +29,7 @@
     <description>Main Spring file for grid configuration.</description>
 
     <!-- Example of bean definition with given configuration. -->
-    <bean id="mySpringBean" class="org.gridgain.grid.GridSpringBean">
+    <bean id="mySpringBean" class="org.apache.ignite.GridSpringBean">
         <property name="configuration">
             <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
                 <!-- Set to local host address just for examples. -->

diff --git a/...g/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/...g/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -26,7 +26,6 @@
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.fs.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.hadoop.*;
 import org.apache.ignite.internal.processors.hadoop.planner.*;
 import org.apache.ignite.internal.processors.interop.*;

diff --git a/...ain/grid/kernal/GridScheduleSelfTest.java → ...essors/schedule/GridScheduleSelfTest.java b/...ain/grid/kernal/GridScheduleSelfTest.java → ...essors/schedule/GridScheduleSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal;
+package org.apache.ignite.internal.processors.schedule;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;

diff --git a/...es/schedule/src/test/java/org/apache/ignite/testsuites/bamboo/GridSchedulerTestSuite.java b/...es/schedule/src/test/java/org/apache/ignite/testsuites/bamboo/GridSchedulerTestSuite.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.testsuites.bamboo;
 
 import junit.framework.*;
-import org.gridgain.grid.kernal.*;
+import org.apache.ignite.internal.processors.schedule.*;
 
 /**
  * Scheduler tests.

diff --git a/...in/grid/logger/slf4j/GridSlf4jLogger.java → .../ignite/logger/slf4j/GridSlf4jLogger.java b/...in/grid/logger/slf4j/GridSlf4jLogger.java → .../ignite/logger/slf4j/GridSlf4jLogger.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.logger.slf4j;
+package org.apache.ignite.logger.slf4j;
 
 import org.apache.ignite.*;
 import org.jetbrains.annotations.*;
@@ -28,7 +28,7 @@
  * Here is an example of configuring SLF4J logger in GridGain configuration Spring file:
  * <pre name="code" class="xml">
  *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.gridgain.grid.logger.slf4j.GridSlf4jLogger"/&gt;
+ *          &lt;bean class="org.apache.ignite.logger.slf4j.GridSlf4jLogger"/&gt;
  *      &lt;/property&gt;
  * </pre>
  * <p>

diff --git a/...g/gridgain/grid/logger/slf4j/package.html → ...g/apache/ignite/logger/slf4j/package.html b/...g/gridgain/grid/logger/slf4j/package.html → ...g/apache/ignite/logger/slf4j/package.html
diff --git a/...ava/org/gridgain/grid/GridGainSpring.java → ...ava/org/apache/ignite/GridGainSpring.java b/...ava/org/gridgain/grid/GridGainSpring.java → ...ava/org/apache/ignite/GridGainSpring.java
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid;
+package org.apache.ignite;
 
-import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.resource.*;

diff --git a/...ava/org/gridgain/grid/GridSpringBean.java → ...ava/org/apache/ignite/GridSpringBean.java b/...ava/org/gridgain/grid/GridSpringBean.java → ...ava/org/apache/ignite/GridSpringBean.java
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid;
+package org.apache.ignite;
 
-import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
@@ -49,7 +48,7 @@
  * <h1 class="header">Spring Configuration Example</h1>
  * Here is a typical example of describing it in Spring file:
  * <pre name="code" class="xml">
- * &lt;bean id="mySpringBean" class="org.gridgain.grid.GridSpringBean"&gt;
+ * &lt;bean id="mySpringBean" class="org.apache.ignite.GridSpringBean"&gt;
  *     &lt;property name="configuration"&gt;
  *         &lt;bean id="grid.cfg" class="org.gridgain.grid.GridConfiguration"&gt;
  *             &lt;property name="gridName" value="mySpringGrid"/&gt;
@@ -59,7 +58,7 @@
  * </pre>
  * Or use default configuration:
  * <pre name="code" class="xml">
- * &lt;bean id="mySpringBean" class="org.gridgain.grid.GridSpringBean"/&gt;
+ * &lt;bean id="mySpringBean" class="org.apache.ignite.GridSpringBean"/&gt;
  * </pre>
  * <h1 class="header">Java Example</h1>
  * Here is how you may access this bean from code:

diff --git a/...in/grid/cache/spring/GridSpringCache.java → .../ignite/cache/spring/GridSpringCache.java b/...in/grid/cache/spring/GridSpringCache.java → .../ignite/cache/spring/GridSpringCache.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.cache.spring;
+package org.apache.ignite.cache.spring;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/.../cache/spring/GridSpringCacheManager.java → .../cache/spring/GridSpringCacheManager.java b/.../cache/spring/GridSpringCacheManager.java → .../cache/spring/GridSpringCacheManager.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.cache.spring;
+package org.apache.ignite.cache.spring;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
@@ -62,7 +62,7 @@
  *         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
  *         http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd"&gt;
  *     &lt;-- Provide configuration file path. --&gt;
- *     &lt;bean id="cacheManager" class="org.gridgain.grid.cache.spring.GridSpringCacheManager"&gt;
+ *     &lt;bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager"&gt;
  *         &lt;property name="configurationPath" value="examples/config/spring-cache.xml"/&gt;
  *     &lt;/bean>
  *
@@ -79,7 +79,7 @@
  *         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
  *         http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd"&gt;
  *     &lt;-- Provide configuration bean. --&gt;
- *     &lt;bean id="cacheManager" class="org.gridgain.grid.cache.spring.GridSpringCacheManager"&gt;
+ *     &lt;bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager"&gt;
  *         &lt;property name="configuration"&gt;
  *             &lt;bean id="gridCfg" class="org.gridgain.grid.GridConfiguration"&gt;
  *                 ...
@@ -105,7 +105,7 @@
  *         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
  *         http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd"&gt;
  *     &lt;-- Provide Grid name. --&gt;
- *     &lt;bean id="cacheManager" class="org.gridgain.grid.cache.spring.GridSpringCacheManager"&gt;
+ *     &lt;bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager"&gt;
  *         &lt;property name="gridName" value="myGrid"/&gt;
  *     &lt;/bean>
  *

diff --git a/...spring/GridSpringDynamicCacheManager.java → ...spring/GridSpringDynamicCacheManager.java b/...spring/GridSpringDynamicCacheManager.java → ...spring/GridSpringDynamicCacheManager.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.cache.spring;
+package org.apache.ignite.cache.spring;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
@@ -62,7 +62,7 @@
  *         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
  *         http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd"&gt;
  *     &lt;-- Provide configuration file path --&gt;
- *     &lt;bean id="cacheManager" class="org.gridgain.grid.cache.spring.GridSpringCacheManager"&gt;
+ *     &lt;bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager"&gt;
  *         &lt;property name="dataCacheName" value="myDataCache"/&gt;
  *     &lt;/bean>
  *

diff --git a/...g/gridgain/grid/cache/spring/package.html → ...g/apache/ignite/cache/spring/package.html b/...g/gridgain/grid/cache/spring/package.html → ...g/apache/ignite/cache/spring/package.html
diff --git a/...gain/grid/kernal/GridFactorySelfTest.java → .../ignite/internal/GridFactorySelfTest.java b/...gain/grid/kernal/GridFactorySelfTest.java → .../ignite/internal/GridFactorySelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal;
+package org.apache.ignite.internal;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
@@ -24,7 +24,6 @@
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.spi.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.spi.collision.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.internal.util.lang.*;
@@ -54,7 +53,7 @@
 
 /**
  * Tests for {@link org.apache.ignite.Ignition}.
- * @see GridFactoryVmShutdownTest
+ * @see org.gridgain.grid.kernal.GridFactoryVmShutdownTest
  */
 @SuppressWarnings("UnusedDeclaration")
 @GridCommonTest(group = "NonDistributed Kernal Self")

diff --git a/.../GridSpringBeanSerializationSelfTest.java → .../GridSpringBeanSerializationSelfTest.java b/.../GridSpringBeanSerializationSelfTest.java → .../GridSpringBeanSerializationSelfTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.kernal;
+package org.apache.ignite.internal;
 
+import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.optimized.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

diff --git a/...p2p/GridP2PUserVersionChangeSelfTest.java → ...p2p/GridP2PUserVersionChangeSelfTest.java b/...p2p/GridP2PUserVersionChangeSelfTest.java → ...p2p/GridP2PUserVersionChangeSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.p2p;
+package org.apache.ignite.p2p;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;

diff --git a/...pring/GridSpringCacheManagerSelfTest.java → ...pring/GridSpringCacheManagerSelfTest.java b/...pring/GridSpringCacheManagerSelfTest.java → ...pring/GridSpringCacheManagerSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.cache.spring;
+package org.apache.ignite.spring;
 
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
@@ -75,7 +75,7 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest {
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        BeanFactory factory = new ClassPathXmlApplicationContext("org/gridgain/grid/cache/spring/spring-caching.xml");
+        BeanFactory factory = new ClassPathXmlApplicationContext("org/apache/ignite/spring/spring-caching.xml");
 
         svc = (GridSpringCacheTestService)factory.getBean("testService");
 

diff --git a/.../cache/spring/GridSpringCacheTestKey.java → ...ignite/spring/GridSpringCacheTestKey.java b/.../cache/spring/GridSpringCacheTestKey.java → ...ignite/spring/GridSpringCacheTestKey.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.cache.spring;
+package org.apache.ignite.spring;
 
 /**
  * Complex key.

diff --git a/...ring/GridSpringCacheTestKeyGenerator.java → ...ring/GridSpringCacheTestKeyGenerator.java b/...ring/GridSpringCacheTestKeyGenerator.java → ...ring/GridSpringCacheTestKeyGenerator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.cache.spring;
+package org.apache.ignite.spring;
 
 import org.springframework.cache.interceptor.*;
 

diff --git a/...he/spring/GridSpringCacheTestService.java → ...te/spring/GridSpringCacheTestService.java b/...he/spring/GridSpringCacheTestService.java → ...te/spring/GridSpringCacheTestService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.cache.spring;
+package org.apache.ignite.spring;
 
 import org.springframework.cache.annotation.*;
 

diff --git a/...ridSpringDynamicCacheManagerSelfTest.java → ...ridSpringDynamicCacheManagerSelfTest.java b/...ridSpringDynamicCacheManagerSelfTest.java → ...ridSpringDynamicCacheManagerSelfTest.java
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.cache.spring;
+package org.apache.ignite.spring;
 
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.spring.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -83,7 +84,7 @@ public class GridSpringDynamicCacheManagerSelfTest extends GridCommonAbstractTes
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         BeanFactory factory = new ClassPathXmlApplicationContext(
-            "org/gridgain/grid/cache/spring/spring-dynamic-caching.xml");
+            "org/apache/ignite/spring/spring-dynamic-caching.xml");
 
         svc = (GridSpringDynamicCacheTestService)factory.getBean("testService");
         mgr = (CacheManager)factory.getBean("cacheManager");

diff --git a/...ng/GridSpringDynamicCacheTestService.java → ...ng/GridSpringDynamicCacheTestService.java b/...ng/GridSpringDynamicCacheTestService.java → ...ng/GridSpringDynamicCacheTestService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.grid.cache.spring;
+package org.apache.ignite.spring;
 
 import org.springframework.cache.annotation.*;
 

diff --git a/...gain/grid/cache/spring/spring-caching.xml → ...g/apache/ignite/spring/spring-caching.xml b/...gain/grid/cache/spring/spring-caching.xml → ...g/apache/ignite/spring/spring-caching.xml
@@ -26,19 +26,19 @@
     <!--
         Test service with cacheable methods.
     -->
-    <bean id="testService" class="org.gridgain.grid.cache.spring.GridSpringCacheTestService"/>
+    <bean id="testService" class="org.apache.ignite.spring.GridSpringCacheTestService"/>
 
     <!--
         Cache manager.
     -->
-    <bean id="cacheManager" class="org.gridgain.grid.cache.spring.GridSpringCacheManager">
+    <bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager">
         <property name="gridName" value="testGrid"/>
     </bean>
 
     <!--
         Key generator.
     -->
-    <bean id="keyGenerator" class="org.gridgain.grid.cache.spring.GridSpringCacheTestKeyGenerator"/>
+    <bean id="keyGenerator" class="org.apache.ignite.spring.GridSpringCacheTestKeyGenerator"/>
 
     <!--
         Enable annotation-driver configuration for caching.

diff --git a/...d/cache/spring/spring-dynamic-caching.xml → .../ignite/spring/spring-dynamic-caching.xml b/...d/cache/spring/spring-dynamic-caching.xml → .../ignite/spring/spring-dynamic-caching.xml
@@ -26,12 +26,12 @@
     <!--
         Test service with cacheable methods.
     -->
-    <bean id="testService" class="org.gridgain.grid.cache.spring.GridSpringDynamicCacheTestService"/>
+    <bean id="testService" class="org.apache.ignite.spring.GridSpringDynamicCacheTestService"/>
 
     <!--
         Cache manager.
     -->
-    <bean id="cacheManager" class="org.gridgain.grid.cache.spring.GridSpringDynamicCacheManager">
+    <bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringDynamicCacheManager">
         <property name="gridName" value="testGrid"/>
         <property name="dataCacheName" value="data"/>
     </bean>

diff --git a/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java b/modules/spring/src/test/java/org/apache/ignite/testsuites/bamboo/GridSpringTestSuite.java
@@ -18,10 +18,11 @@
 package org.apache.ignite.testsuites.bamboo;
 
 import junit.framework.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.p2p.*;
+import org.apache.ignite.spring.*;
 import org.apache.ignite.testsuites.*;
 import org.gridgain.grid.cache.spring.*;
-import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.p2p.*;
 
 /**
  * Spring tests.