[4/9] incubator-ignite git commit: # sprint-2 minor

[akuznetsov]

# sprint-2 minor


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

Branch: refs/heads/ignite-275
Commit: 2f7d2ad9c55ad126d1e7a18457361f2be1fb1401
Parents: 68a3b77
Author: sboikov <sboi...@gridgain.com>
Authored: Tue Feb 17 11:22:44 2015 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Tue Feb 17 11:22:44 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    | 22 ++------------------
 1 file changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f7d2ad9/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 597322d..44e92d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -3003,25 +3003,15 @@ public class IgniteKernal extends ClusterGroupAdapter 
implements IgniteEx, Ignit
         if (comp != null)
             return comp;
 
-        // TODO 9341: get rid of ent/os after moving ent code to plugin.
         Class<T> implCls = null;
 
         try {
-            implCls = (Class<T>)Class.forName(enterpriseClassName(cls));
+            implCls = (Class<T>)Class.forName(componentClassName(cls));
         }
         catch (ClassNotFoundException ignore) {
             // No-op.
         }
 
-        if (implCls == null) {
-            try {
-                implCls = (Class<T>)Class.forName(openSourceClassName(cls));
-            }
-            catch (ClassNotFoundException ignore) {
-                // No-op.
-            }
-        }
-
         if (implCls == null)
             throw new IgniteCheckedException("Failed to find component 
implementation: " + cls.getName());
 
@@ -3049,17 +3039,9 @@ public class IgniteKernal extends ClusterGroupAdapter 
implements IgniteEx, Ignit
 
     /**
      * @param cls Component interface.
-     * @return Name of component implementation class for enterprise edition.
-     */
-    private static String enterpriseClassName(Class<?> cls) {
-        return cls.getPackage().getName() + ".ent." + 
cls.getSimpleName().replace("Grid", "GridEnt");
-    }
-
-    /**
-     * @param cls Component interface.
      * @return Name of component implementation class for open source edition.
      */
-    private static String openSourceClassName(Class<?> cls) {
+    private static String componentClassName(Class<?> cls) {
         return cls.getPackage().getName() + ".os." + 
cls.getSimpleName().replace("Grid", "GridOs");
     }