From 307f4025a48582f61305f19bb93031f0da483831 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 24 Jul 2014 15:57:52 +0400
Subject: [PATCH] appengine: fixed starting enhancer for latest versions of SDK

---
 .../jps/appengine/build/AppEngineEnhancerBuilder.java        | 4 ++++
 .../jps/appengine/model/JpsAppEngineModuleExtension.java     | 2 ++
 .../model/impl/JpsAppEngineModuleExtensionImpl.java          | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/AppEngineEnhancerBuilder.java b/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/AppEngineEnhancerBuilder.java
index 549aa1a5b361..e6ab8747c2a3 100644
--- a/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/AppEngineEnhancerBuilder.java
+++ b/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/build/AppEngineEnhancerBuilder.java
@@ -113,7 +113,11 @@ public class AppEngineEnhancerBuilder extends ModuleLevelBuilder {
     List<String> classpath = new ArrayList<String>();
     classpath.add(extension.getToolsApiJarPath());
     classpath.add(PathManager.getJarPathForClass(EnhancerRunner.class));
+    boolean removeOrmJars = Boolean.parseBoolean(System.getProperty("jps.appengine.enhancer.remove.orm.jars", "true"));
     for (File file : JpsJavaExtensionService.dependencies(module).recursively().compileOnly().productionOnly().classes().getRoots()) {
+      if (removeOrmJars && FileUtil.isAncestor(new File(extension.getOrmLibPath()), file, true)) {
+        continue;
+      }
       classpath.add(file.getAbsolutePath());
     }
 
diff --git a/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/model/JpsAppEngineModuleExtension.java b/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/model/JpsAppEngineModuleExtension.java
index 0c68b4139ff6..beb54b57cc7c 100644
--- a/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/model/JpsAppEngineModuleExtension.java
+++ b/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/model/JpsAppEngineModuleExtension.java
@@ -26,6 +26,8 @@ import java.util.List;
 public interface JpsAppEngineModuleExtension extends JpsElement {
   JpsModule getModule();
 
+  String getOrmLibPath();
+
   String getSdkHomePath();
 
   boolean isRunEnhancerOnMake();
diff --git a/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/model/impl/JpsAppEngineModuleExtensionImpl.java b/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/model/impl/JpsAppEngineModuleExtensionImpl.java
index e52d54db2bee..d40f7c007959 100644
--- a/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/model/impl/JpsAppEngineModuleExtensionImpl.java
+++ b/plugins/google-app-engine/jps-plugin/src/org/jetbrains/jps/appengine/model/impl/JpsAppEngineModuleExtensionImpl.java
@@ -70,6 +70,11 @@ public class JpsAppEngineModuleExtensionImpl extends JpsElementBase<JpsAppEngine
     return FileUtil.toSystemDependentName(JpsArtifactPathUtil.appendToPath(getSdkHomePath(), LIB_APPENGINE_TOOLS_API_JAR));
   }
 
+  @Override
+  public String getOrmLibPath() {
+    return FileUtil.toSystemDependentName(JpsArtifactPathUtil.appendToPath(getSdkHomePath(), "/lib/user/orm"));
+  }
+
   @Override
   public String getSdkHomePath() {
     return myProperties.mySdkHomePath;