ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [07/50] [abbrv] incubator-ignite git commit: # ignite-113 : Grid-prefix was deleted (renamed to Ignite) in part of classes
Date Sat, 31 Jan 2015 01:22:54 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/IgniteCacheHibernateBlobStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/IgniteCacheHibernateBlobStoreSelfTest.java
b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/IgniteCacheHibernateBlobStoreSelfTest.java
new file mode 100644
index 0000000..9c9da7a
--- /dev/null
+++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/IgniteCacheHibernateBlobStoreSelfTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.cache.store.hibernate;
+
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.testframework.junits.cache.*;
+import org.hibernate.*;
+
+import java.io.*;
+import java.net.*;
+
+/**
+ * Cache store test.
+ */
+public class IgniteCacheHibernateBlobStoreSelfTest extends
+    GridAbstractCacheStoreSelfTest<IgniteCacheHibernateBlobStore<Object, Object>>
{
+    /**
+     * @throws Exception If failed.
+     */
+    public IgniteCacheHibernateBlobStoreSelfTest() throws Exception {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void afterTest() throws Exception {
+        super.afterTest();
+
+        Session s = store.session(null);
+
+        if (s == null)
+            return;
+
+        try {
+            s.createQuery("delete from " + IgniteCacheHibernateBlobStoreEntry.class.getSimpleName())
+                    .setFlushMode(FlushMode.ALWAYS).executeUpdate();
+
+            Transaction hTx = s.getTransaction();
+
+            if (hTx != null && hTx.isActive())
+                hTx.commit();
+        }
+        finally {
+            s.close();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected IgniteCacheHibernateBlobStore<Object, Object> store() {
+        return new IgniteCacheHibernateBlobStore<>();
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testConfigurationByUrl() throws Exception {
+        URL url = U.resolveGridGainUrl(
+            "modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml");
+
+        assert url != null;
+
+        store.setHibernateConfigurationPath(url.toString());
+
+        // Store will be implicitly initialized.
+        store.load("key");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testConfigurationByFile() throws Exception {
+        URL url = U.resolveGridGainUrl(
+            "modules/hibernate/src/test/java/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml");
+
+        assert url != null;
+
+        File file = new File(url.toURI());
+
+        store.setHibernateConfigurationPath(file.getAbsolutePath());
+
+        // Store will be implicitly initialized.
+        store.load("key");
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testConfigurationByResource() throws Exception {
+        store.setHibernateConfigurationPath("/org/apache/ignite/cache/store/hibernate/hibernate.cfg.xml");
+
+        // Store will be implicitly initialized.
+        store.load("key");
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/hibernate/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java
b/modules/hibernate/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java
index f766c82..c472779 100644
--- a/modules/hibernate/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java
+++ b/modules/hibernate/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java
@@ -37,7 +37,7 @@ public class IgniteHibernateTestSuite extends TestSuite {
 //        suite.addTestSuite(GridHibernateL2CacheTransactionalSelfTest.class);
         suite.addTestSuite(GridHibernateL2CacheConfigurationSelfTest.class);
 
-        suite.addTestSuite(GridCacheHibernateBlobStoreSelfTest.class);
+        suite.addTestSuite(IgniteCacheHibernateBlobStoreSelfTest.class);
 
         return suite;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index c7ca6dc..03448fd 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -226,7 +226,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
     };
 
     /** */
-    private volatile GridQueryConfiguration cfg = new GridQueryConfiguration();
+    private volatile IgniteQueryConfiguration cfg = new IgniteQueryConfiguration();
 
     /** */
     private volatile GridKernalContext ctx;
@@ -587,7 +587,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
     /**
      * @return Configuration.
      */
-    public GridQueryConfiguration configuration() {
+    public IgniteQueryConfiguration configuration() {
         return cfg;
     }
 
@@ -1119,7 +1119,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
             nodeId = ctx.localNodeId();
             marshaller = ctx.config().getMarshaller();
 
-            GridQueryConfiguration cfg0 = ctx.config().getQueryConfiguration();
+            IgniteQueryConfiguration cfg0 = ctx.config().getQueryConfiguration();
 
             if (cfg0 != null)
                 cfg = cfg0;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
index 53b9607..7cb8189 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -107,7 +107,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
 
         c.setDiscoverySpi(disco);
 
-        GridQueryConfiguration idxCfg = new GridQueryConfiguration();
+        IgniteQueryConfiguration idxCfg = new IgniteQueryConfiguration();
 
         idxCfg.setIndexCustomFunctionClasses(SqlFunctions.class);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
index 6f28208..309cb40 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
@@ -105,7 +105,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
 
         cfg.setCacheConfiguration(cacheCfg);
 
-        GridQueryConfiguration indexing = new GridQueryConfiguration();
+        IgniteQueryConfiguration indexing = new IgniteQueryConfiguration();
 
         indexing.setMaxOffheapRowsCacheSize(128);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 96d46cb..ec6d1d8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -55,7 +55,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
 
         c.setDiscoverySpi(disco);
 
-        GridQueryConfiguration idxCfg = new GridQueryConfiguration();
+        IgniteQueryConfiguration idxCfg = new IgniteQueryConfiguration();
 
         c.setQueryConfiguration(idxCfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/jta/src/main/java/org/apache/ignite/cache/jta/GridCacheTmLookup.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/GridCacheTmLookup.java
b/modules/jta/src/main/java/org/apache/ignite/cache/jta/GridCacheTmLookup.java
deleted file mode 100644
index 95e7d0a..0000000
--- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/GridCacheTmLookup.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.ignite.cache.jta;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-import javax.transaction.*;
-
-/**
- * Allows grid to use different transactional systems. Implement this interface
- * to look up native transaction manager within your environment. Transaction
- * manager lookup is configured via {@link org.apache.ignite.cache.CacheConfiguration#getTransactionManagerLookupClassName()}
- * method.
- * <p>
- * The following implementations are provided out of the box:
- * <ul>
- * <li>
- *  {@link GridCacheJndiTmLookup} utilizes a configured JNDI name to look up a transaction
manager.
- * </li>
- * <li>
- *  {@link GridCacheReflectionTmLookup} uses reflection to call a method on a given class
- *  to get to transaction manager.
- * </li>
- * </ul>
- */
-public interface GridCacheTmLookup {
-    /**
-     * Gets Transaction Manager (TM).
-     *
-     * @return TM or {@code null} if TM cannot be looked up.
-     * @throws IgniteCheckedException In case of error.
-     */
-    @Nullable public TransactionManager getTm() throws IgniteCheckedException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/jta/src/main/java/org/apache/ignite/cache/jta/IgniteCacheTmLookup.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/IgniteCacheTmLookup.java
b/modules/jta/src/main/java/org/apache/ignite/cache/jta/IgniteCacheTmLookup.java
new file mode 100644
index 0000000..b44117a
--- /dev/null
+++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/IgniteCacheTmLookup.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.cache.jta;
+
+import org.apache.ignite.*;
+import org.jetbrains.annotations.*;
+
+import javax.transaction.*;
+
+/**
+ * Allows grid to use different transactional systems. Implement this interface
+ * to look up native transaction manager within your environment. Transaction
+ * manager lookup is configured via {@link org.apache.ignite.cache.CacheConfiguration#getTransactionManagerLookupClassName()}
+ * method.
+ * <p>
+ * The following implementations are provided out of the box:
+ * <ul>
+ * <li>
+ *  {@link org.apache.ignite.cache.jta.jndi.IgniteCacheJndiTmLookup} utilizes a configured
JNDI name to look up a transaction manager.
+ * </li>
+ * <li>
+ *  {@link org.apache.ignite.cache.jta.reflect.IgniteCacheReflectionTmLookup} uses reflection
to call a method on a given class
+ *  to get to transaction manager.
+ * </li>
+ * </ul>
+ */
+public interface IgniteCacheTmLookup {
+    /**
+     * Gets Transaction Manager (TM).
+     *
+     * @return TM or {@code null} if TM cannot be looked up.
+     * @throws IgniteCheckedException In case of error.
+     */
+    @Nullable public TransactionManager getTm() throws IgniteCheckedException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/GridCacheJndiTmLookup.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/GridCacheJndiTmLookup.java
b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/GridCacheJndiTmLookup.java
deleted file mode 100644
index 10c7f83..0000000
--- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/GridCacheJndiTmLookup.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.ignite.cache.jta.jndi;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.jta.*;
-import org.jetbrains.annotations.*;
-
-import javax.naming.*;
-import javax.transaction.*;
-import java.util.*;
-
-/**
- * Implementation of {@link org.apache.ignite.cache.jta.GridCacheTmLookup} interface that
is using list of JNDI names to find TM.
- */
-public class GridCacheJndiTmLookup implements GridCacheTmLookup {
-    /** */
-    private List<String> jndiNames;
-
-    /**
-     * Gets a list of JNDI names.
-     *
-     * @return List of JNDI names that is used to find TM.
-     */
-    public List<String> getJndiNames() {
-        return jndiNames;
-    }
-
-    /**
-     * Sets a list of JNDI names used by this TM.
-     *
-     * @param jndiNames List of JNDI names that is used to find TM.
-     */
-    public void setJndiNames(List<String> jndiNames) {
-        this.jndiNames = jndiNames;
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public TransactionManager getTm() throws IgniteCheckedException {
-        assert jndiNames != null;
-        assert !jndiNames.isEmpty();
-
-        try {
-            InitialContext ctx = new InitialContext();
-
-            for (String s : jndiNames) {
-                Object obj = ctx.lookup(s);
-
-                if (obj != null && obj instanceof TransactionManager)
-                    return (TransactionManager) obj;
-            }
-        }
-        catch (NamingException e) {
-            throw new IgniteCheckedException("Unable to lookup TM by: " + jndiNames, e);
-        }
-
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/IgniteCacheJndiTmLookup.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/IgniteCacheJndiTmLookup.java
b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/IgniteCacheJndiTmLookup.java
new file mode 100644
index 0000000..6836e14
--- /dev/null
+++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/jndi/IgniteCacheJndiTmLookup.java
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.cache.jta.jndi;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.jta.*;
+import org.jetbrains.annotations.*;
+
+import javax.naming.*;
+import javax.transaction.*;
+import java.util.*;
+
+/**
+ * Implementation of {@link org.apache.ignite.cache.jta.IgniteCacheTmLookup} interface that
is using list of JNDI names to find TM.
+ */
+public class IgniteCacheJndiTmLookup implements IgniteCacheTmLookup {
+    /** */
+    private List<String> jndiNames;
+
+    /**
+     * Gets a list of JNDI names.
+     *
+     * @return List of JNDI names that is used to find TM.
+     */
+    public List<String> getJndiNames() {
+        return jndiNames;
+    }
+
+    /**
+     * Sets a list of JNDI names used by this TM.
+     *
+     * @param jndiNames List of JNDI names that is used to find TM.
+     */
+    public void setJndiNames(List<String> jndiNames) {
+        this.jndiNames = jndiNames;
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public TransactionManager getTm() throws IgniteCheckedException {
+        assert jndiNames != null;
+        assert !jndiNames.isEmpty();
+
+        try {
+            InitialContext ctx = new InitialContext();
+
+            for (String s : jndiNames) {
+                Object obj = ctx.lookup(s);
+
+                if (obj != null && obj instanceof TransactionManager)
+                    return (TransactionManager) obj;
+            }
+        }
+        catch (NamingException e) {
+            throw new IgniteCheckedException("Unable to lookup TM by: " + jndiNames, e);
+        }
+
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/GridCacheReflectionTmLookup.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/GridCacheReflectionTmLookup.java
b/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/GridCacheReflectionTmLookup.java
deleted file mode 100644
index ea0ef76..0000000
--- a/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/GridCacheReflectionTmLookup.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.ignite.cache.jta.reflect;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.jta.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import javax.transaction.*;
-import java.lang.reflect.*;
-
-/**
- * Implementation of {@link org.apache.ignite.cache.jta.GridCacheTmLookup} interface that
attempts to obtain
- * JTA manager by calling static method on the class.
- */
-public class GridCacheReflectionTmLookup implements GridCacheTmLookup {
-    /** */
-    private String cls;
-
-    /** */
-    private String mtd;
-
-    /**
-     * Creates uninitialized reflection TM lookup.
-     */
-    public GridCacheReflectionTmLookup() { /* No-op. */ }
-
-    /**
-     * Creates generic TM lookup with given class and method name.
-     *
-     * @param cls Class name.
-     * @param mtd Method name on that the class.
-     */
-    public GridCacheReflectionTmLookup(String cls, String mtd) {
-        A.notNull(cls, "cls");
-        A.notNull(mtd, "mtd");
-
-        this.cls = cls;
-        this.mtd = mtd;
-    }
-
-    /**
-     * Gets class name to use.
-     *
-     * @return Class name to use.
-     */
-    public String getClassName() {
-        return cls;
-    }
-
-    /**
-     * Sets class name to use.
-     *
-     * @param cls Class name to use.
-     */
-    public void setClassName(String cls) {
-        A.notNull(cls, "cls");
-
-        this.cls = cls;
-    }
-
-    /**
-     * Gets method name.
-     *
-     * @return Method name to use.
-     */
-    public String getMethodName() {
-        return mtd;
-    }
-
-    /**
-     * Sets method name.
-     *
-     * @param mtd Method name to use.
-     */
-    public void setMethodName(String mtd) {
-        A.notNull(mtd, "mtd");
-
-        this.mtd = mtd;
-    }
-
-    /** {@inheritDoc} */
-    @Override public TransactionManager getTm() throws IgniteCheckedException {
-        assert cls != null;
-        assert mtd != null;
-
-        try {
-            return (TransactionManager)Class.forName(cls).getMethod(mtd).invoke(null);
-        }
-        catch (ClassNotFoundException e) {
-            throw new IgniteCheckedException("Failed to find class: " + cls, e);
-        }
-        catch (NoSuchMethodException e) {
-            throw new IgniteCheckedException("Failed to find method: " + mtd, e);
-        }
-        catch (InvocationTargetException | IllegalAccessException e) {
-            throw new IgniteCheckedException("Failed to invoke method: " + mtd, e);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/IgniteCacheReflectionTmLookup.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/IgniteCacheReflectionTmLookup.java
b/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/IgniteCacheReflectionTmLookup.java
new file mode 100644
index 0000000..e1c9875
--- /dev/null
+++ b/modules/jta/src/main/java/org/apache/ignite/cache/jta/reflect/IgniteCacheReflectionTmLookup.java
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.cache.jta.reflect;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.jta.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+import javax.transaction.*;
+import java.lang.reflect.*;
+
+/**
+ * Implementation of {@link org.apache.ignite.cache.jta.IgniteCacheTmLookup} interface that
attempts to obtain
+ * JTA manager by calling static method on the class.
+ */
+public class IgniteCacheReflectionTmLookup implements IgniteCacheTmLookup {
+    /** */
+    private String cls;
+
+    /** */
+    private String mtd;
+
+    /**
+     * Creates uninitialized reflection TM lookup.
+     */
+    public IgniteCacheReflectionTmLookup() { /* No-op. */ }
+
+    /**
+     * Creates generic TM lookup with given class and method name.
+     *
+     * @param cls Class name.
+     * @param mtd Method name on that the class.
+     */
+    public IgniteCacheReflectionTmLookup(String cls, String mtd) {
+        A.notNull(cls, "cls");
+        A.notNull(mtd, "mtd");
+
+        this.cls = cls;
+        this.mtd = mtd;
+    }
+
+    /**
+     * Gets class name to use.
+     *
+     * @return Class name to use.
+     */
+    public String getClassName() {
+        return cls;
+    }
+
+    /**
+     * Sets class name to use.
+     *
+     * @param cls Class name to use.
+     */
+    public void setClassName(String cls) {
+        A.notNull(cls, "cls");
+
+        this.cls = cls;
+    }
+
+    /**
+     * Gets method name.
+     *
+     * @return Method name to use.
+     */
+    public String getMethodName() {
+        return mtd;
+    }
+
+    /**
+     * Sets method name.
+     *
+     * @param mtd Method name to use.
+     */
+    public void setMethodName(String mtd) {
+        A.notNull(mtd, "mtd");
+
+        this.mtd = mtd;
+    }
+
+    /** {@inheritDoc} */
+    @Override public TransactionManager getTm() throws IgniteCheckedException {
+        assert cls != null;
+        assert mtd != null;
+
+        try {
+            return (TransactionManager)Class.forName(cls).getMethod(mtd).invoke(null);
+        }
+        catch (ClassNotFoundException e) {
+            throw new IgniteCheckedException("Failed to find class: " + cls, e);
+        }
+        catch (NoSuchMethodException e) {
+            throw new IgniteCheckedException("Failed to find method: " + mtd, e);
+        }
+        catch (InvocationTargetException | IllegalAccessException e) {
+            throw new IgniteCheckedException("Failed to invoke method: " + mtd, e);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
index 845bb6f..294eb6a 100644
--- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
+++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java
@@ -38,7 +38,7 @@ public class CacheJtaManager<K, V> extends CacheJtaManagerAdapter<K,
V> {
     private TransactionManager jtaTm;
 
     /** */
-    private GridCacheTmLookup tmLookup;
+    private IgniteCacheTmLookup tmLookup;
 
     /** {@inheritDoc} */
     @Override public void createTmLookup(CacheConfiguration ccfg) throws IgniteCheckedException
{
@@ -47,7 +47,7 @@ public class CacheJtaManager<K, V> extends CacheJtaManagerAdapter<K,
V> {
         try {
             Class<?> cls = Class.forName(ccfg.getTransactionManagerLookupClassName());
 
-            tmLookup = (GridCacheTmLookup)cls.newInstance();
+            tmLookup = (IgniteCacheTmLookup)cls.newInstance();
         }
         catch (Exception e) {
             throw new IgniteCheckedException("Failed to instantiate transaction manager lookup.",
e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
index 6b0259a..96561e6 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaConfigurationValidationSelfTest.java
@@ -66,7 +66,7 @@ public class GridCacheJtaConfigurationValidationSelfTest extends GridCommonAbstr
      *
      */
     @SuppressWarnings("PublicInnerClass")
-    public static class TestTxLookup implements GridCacheTmLookup {
+    public static class TestTxLookup implements IgniteCacheTmLookup {
         @Nullable @Override public TransactionManager getTm() throws IgniteCheckedException
{
             return null;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
index 9502b64..556cd27 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java
@@ -91,7 +91,7 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest {
      *
      */
     @SuppressWarnings("PublicInnerClass")
-    public static class TestTmLookup implements GridCacheTmLookup {
+    public static class TestTmLookup implements IgniteCacheTmLookup {
         /** {@inheritDoc} */
         @Override public TransactionManager getTm() throws IgniteCheckedException {
             return jotm.getTransactionManager();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
index e7d9d60..3ecd6d4 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
@@ -32,7 +32,7 @@ import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 
 /**
- * Test for {@link org.apache.ignite.lifecycle.LifecycleAware} support for {@link org.apache.ignite.cache.jta.GridCacheTmLookup}.
+ * Test for {@link org.apache.ignite.lifecycle.LifecycleAware} support for {@link org.apache.ignite.cache.jta.IgniteCacheTmLookup}.
  */
 public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTest
{
     /** */
@@ -45,7 +45,7 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa
      */
     @SuppressWarnings("PublicInnerClass")
     public static class TestTxLookup extends GridAbstractLifecycleAwareSelfTest.TestLifecycleAware
-        implements GridCacheTmLookup {
+        implements IgniteCacheTmLookup {
         /**
          */
         public TestTxLookup() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/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 c9eacd7..524939d 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
@@ -114,7 +114,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.GridServletContextListenerStartup}
+ * in a J2EE Web container and use {@ignitelink org.apache.ignite.startup.servlet.IgniteServletContextListenerStartup}
  * for node startup.
  * <p>
  * If neither {@link #setConfigurationPath(String) configurationPath},

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c0fcf3c/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessor.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessor.java
b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessor.java
index 82f8f6d..a36911b 100644
--- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessor.java
+++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessor.java
@@ -32,7 +32,7 @@ import java.net.*;
 import java.security.*;
 import java.util.*;
 
-import static org.apache.ignite.spi.deployment.uri.GridUriDeploymentSpi.*;
+import static org.apache.ignite.spi.deployment.uri.IgniteUriDeploymentSpi.*;
 
 /**
  * Utility class.


Mime
View raw message