diff --git a/.idea/modules.xml b/.idea/modules.xml index 49d9584026c8..5eb92a1e3358 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -822,8 +822,8 @@ - - + + diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml index 11b536798c8a..3762ff351413 100644 --- a/intellij.idea.community.main.iml +++ b/intellij.idea.community.main.iml @@ -80,7 +80,7 @@ - + diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy index 71c0e678bea3..5bbb9eefe827 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -130,11 +130,11 @@ class CommunityRepositoryModules { doNotCreateSeparateJarForLocalizableResources() }, plugin("intellij.xslt.debugger") { - withModule("intellij.xslt.debugger.engine") - withModule("intellij.xslt.debugger.engine.impl", "rt/xslt-debugger-engine-impl.jar") - withModuleLibrary("Saxon-6.5.5", "intellij.xslt.debugger.engine.impl", "rt") - withModuleLibrary("Saxon-9HE", "intellij.xslt.debugger.engine.impl", "rt") - withModuleLibrary("Xalan-2.7.2", "intellij.xslt.debugger.engine.impl", "rt") + withModule("intellij.xslt.debugger.rt", "xslt-debugger-rt.jar") + withModule("intellij.xslt.debugger.impl.rt", "rt/xslt-debugger-impl-rt.jar") + withModuleLibrary("Saxon-6.5.5", "intellij.xslt.debugger.impl.rt", "rt") + withModuleLibrary("Saxon-9HE", "intellij.xslt.debugger.impl.rt", "rt") + withModuleLibrary("Xalan-2.7.2", "intellij.xslt.debugger.impl.rt", "rt") }, plugin("intellij.maven") { withModule("intellij.maven.jps") diff --git a/plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.engine.impl.iml b/plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.impl.rt.iml similarity index 99% rename from plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.engine.impl.iml rename to plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.impl.rt.iml index d7d120846856..dbe095a85551 100644 --- a/plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.engine.impl.iml +++ b/plugins/xslt-debugger/engine/impl/intellij.xslt.debugger.impl.rt.iml @@ -9,7 +9,7 @@ - + diff --git a/plugins/xslt-debugger/engine/intellij.xslt.debugger.engine.iml b/plugins/xslt-debugger/engine/intellij.xslt.debugger.rt.iml similarity index 100% rename from plugins/xslt-debugger/engine/intellij.xslt.debugger.engine.iml rename to plugins/xslt-debugger/engine/intellij.xslt.debugger.rt.iml diff --git a/plugins/xslt-debugger/intellij.xslt.debugger.iml b/plugins/xslt-debugger/intellij.xslt.debugger.iml index 7d6a207b518d..d55f998721ea 100644 --- a/plugins/xslt-debugger/intellij.xslt.debugger.iml +++ b/plugins/xslt-debugger/intellij.xslt.debugger.iml @@ -12,7 +12,7 @@ - + diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java index 0962a4d93fe8..32033983b1d3 100644 --- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java +++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java @@ -139,15 +139,15 @@ public class XsltDebuggerExtension extends XsltRunnerExtension { Path xsltDebuggerClassesRoot = Paths.get(PathUtil.getJarPathForClass(getClass())); if (!Files.isDirectory(xsltDebuggerClassesRoot)) { Path libDirectory = xsltDebuggerClassesRoot.getParent(); - addPathToClasspath(parameters, libDirectory.resolve("xslt-debugger-engine.jar")); + addPathToClasspath(parameters, libDirectory.resolve("xslt-debugger-rt.jar")); addPathToClasspath(parameters, libDirectory.resolve("rmi-stubs.jar")); - addPathToClasspath(parameters, libDirectory.resolve("rt/xslt-debugger-engine-impl.jar")); + addPathToClasspath(parameters, libDirectory.resolve("rt/xslt-debugger-impl-rt.jar")); } else { //running from sources Path outProductionDir = xsltDebuggerClassesRoot.getParent(); - addPathToClasspath(parameters, outProductionDir.resolve("intellij.xslt.debugger.engine")); - addPathToClasspath(parameters, outProductionDir.resolve("intellij.xslt.debugger.engine.impl")); + addPathToClasspath(parameters, outProductionDir.resolve("intellij.xslt.debugger.rt")); + addPathToClasspath(parameters, outProductionDir.resolve("intellij.xslt.debugger.impl.rt")); addPathToClasspath(parameters, getPluginEngineDirInSources().resolve("lib/rmi-stubs.jar")); }