From 91c02feb953ae530a96ef1fa17e1ce450e9fb381 Mon Sep 17 00:00:00 2001
From: Nikolay Chashnikov <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 2 Sep 2009 13:50:39 +0400
Subject: [PATCH] fix tests: search for jars in IDEA_HOME/community/lib folder

---
 .../facet/impl/ui/libraries/LibraryDownloader.java       | 3 +--
 .../com/intellij/openapi/application/PathManager.java    | 9 +++++++++
 .../lang/ant/config/impl/GlobalAntConfiguration.java     | 3 +--
 .../intellij/uiDesigner/actions/PreviewFormAction.java   | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloader.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloader.java
index cc2b25a9ea34..5db5e5bbee13 100644
--- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloader.java
+++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryDownloader.java
@@ -251,8 +251,7 @@ public class LibraryDownloader {
     if (url.startsWith(LIB_SCHEMA)) {
       indicator.setText2(IdeBundle.message("progress.locate.jar.text", getExpectedFileName(libraryInfo)));
       final String path = url.substring(LIB_SCHEMA.length()).replace('/', File.separatorChar);
-      final String fullPath = PathManager.getLibPath() + File.separatorChar + path;
-      final File file = new File(fullPath);
+      final File file = PathManager.findFileInLibDirectory(path);
       downloadedFiles.add(Pair.create(libraryInfo, file));
     } else if (url.startsWith(LocalFileSystem.PROTOCOL_PREFIX)) {
       String path = url.substring(LocalFileSystem.PROTOCOL_PREFIX.length()).replace('/', File.separatorChar).replace('\\', File.separatorChar);
diff --git a/platform/util/src/com/intellij/openapi/application/PathManager.java b/platform/util/src/com/intellij/openapi/application/PathManager.java
index cba5a1146d63..673b3708eefc 100644
--- a/platform/util/src/com/intellij/openapi/application/PathManager.java
+++ b/platform/util/src/com/intellij/openapi/application/PathManager.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.SystemProperties;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
 import java.net.URL;
@@ -372,4 +373,12 @@ public class PathManager {
 
     return systemPath + File.separator + PLUGINS_DIRECTORY;
   }
+
+  public static File findFileInLibDirectory(@NotNull String relativePath) {
+    File file = new File(getLibPath() + File.separator + relativePath);
+    if (file.exists()) {
+      return file;
+    }
+    return new File(getHomePath() + File.separator + "community" + File.separator + "lib" + File.separator + relativePath);
+  }
 }
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java
index 6b509934763d..1aae03d45a56 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java
@@ -69,8 +69,7 @@ public class GlobalAntConfiguration implements ApplicationComponent, JDOMExterna
       }
     };
     AntInstallation.NAME.set(bundledAnt.getProperties(), BUNDLED_ANT_NAME);
-    final File ideaLib = new File(PathManager.getLibPath());
-    final File antHome = new File(ideaLib, ANT_FILE);
+    final File antHome = PathManager.findFileInLibDirectory(ANT_FILE);
     AntInstallation.HOME_DIR.set(bundledAnt.getProperties(), antHome.getAbsolutePath());
     ArrayList<AntClasspathEntry> classpath = AntInstallation.CLASS_PATH.getModifiableList(bundledAnt.getProperties());
     File antLibDir = new File(antHome, LIB_DIR);
diff --git a/ui-designer/impl/com/intellij/uiDesigner/actions/PreviewFormAction.java b/ui-designer/impl/com/intellij/uiDesigner/actions/PreviewFormAction.java
index 64872229a8ec..524fa92ad48e 100644
--- a/ui-designer/impl/com/intellij/uiDesigner/actions/PreviewFormAction.java
+++ b/ui-designer/impl/com/intellij/uiDesigner/actions/PreviewFormAction.java
@@ -251,7 +251,7 @@ public final class PreviewFormAction extends AnAction{
     // 3. Now we are ready to launch Java process
     final JavaParameters parameters = new JavaParameters();
     parameters.getClassPath().add(tempPath);
-    parameters.getClassPath().add(PathManager.getLibPath() + "/jgoodies-forms.jar");
+    parameters.getClassPath().add(PathManager.findFileInLibDirectory("jgoodies-forms.jar").getAbsolutePath());
     final List<String> paths = sources.getPathList();
     for (final String path : paths) {
       parameters.getClassPath().add(path);