move mock jdk 1.7 to community/java

java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java

@@ -302,9 +302,13 @@ public class JavaSdkImpl extends JavaSdk {
     return createMockJdk(jdkHome, versionName, getInstance());
   }
   
-  public static Sdk getMockJdk17(@NonNls String versionName) {
+  public static Sdk getMockJdk17() {
-    String jdkHome = PathManager.getHomePath() + File.separator + "mockJDK-1.7";
+    File mockJdkCEPath = new File(PathManager.getHomePath(), "java/mockJDK-1.7");
-    return createMockJdk(jdkHome, versionName, getInstance());
+    if (mockJdkCEPath.exists()) {
+      return createMockJdk(mockJdkCEPath.getPath(), "java 1.7", getInstance());
+    }
+    mockJdkCEPath = new File(PathManager.getHomePath(), "community/java/mockJDK-1.7");
+    return createMockJdk(mockJdkCEPath.getPath(), "java 1.7", getInstance());
   }
 
   private static Sdk createMockJdk(String jdkHome, final String versionName, JavaSdk javaSdk) {

java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java

@@ -226,6 +226,6 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
   }
   @Override
    protected Sdk getProjectJDK() {
-    return JavaSdkImpl.getMockJdk17("java 1.7");
+    return JavaSdkImpl.getMockJdk17();
   }
 }