diff idea-resolve-helper.iml @ 112:bb78121b3602 9.1.x

merge from trunk, fix TW-45209
author Evgeniy.Koshkin@unit-519.Labs.IntelliJ.Net
date Wed, 18 May 2016 19:25:37 +0300
parents d15927dab809
children
line wrap: on
line diff
--- a/idea-resolve-helper.iml	Wed Nov 25 13:37:57 2015 +0300
+++ b/idea-resolve-helper.iml	Wed May 18 19:25:37 2016 +0300
@@ -4,41 +4,44 @@
     <facet type="Spring" name="Spring">
       <configuration>
         <fileset id="fileset1" name="idea resolve helper" removed="false">
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-agents-statistics-web.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-buildFailures.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-dotnet-pdb.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/build-server-plugin-freespace.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerConfigurator.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerPluginsSupportWeb.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringStatistics.xml</file>
-          <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringWeb.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/build-server-plugin-agents-statistics-web.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/build-server-plugin-buildFailures.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/build-server-plugin-dotnet-pdb.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/build-server-plugin-freespace.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/buildServerConfigurator.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/buildServerPluginsSupportWeb.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/buildServerSpringStatistics.xml</file>
+          <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/buildServerSpringWeb.xml</file>
         </fileset>
       </configuration>
     </facet>
     <facet type="web" name="Web">
       <configuration>
         <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/web.xml" />
+          <deploymentDescriptor name="web.xml" url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/web.xml" />
         </descriptors>
         <webroots>
-          <root url="file://$TeamCityDistribution$/webapps/ROOT" relative="/" />
+          <root url="file://$teamcitydistribution$/webapps/ROOT" relative="/" />
         </webroots>
+        <sourceRoots>
+          <root url="file://$TeamCityDistribution$/webapps/ROOT" />
+        </sourceRoots>
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$TeamCityDistribution$/webapps/ROOT">
-      <sourceFolder url="file://$TeamCityDistribution$/webapps/ROOT" isTestSource="false" />
-      <excludeFolder url="file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/plugins" />
-      <excludeFolder url="file://$TeamCityDistribution$/webapps/ROOT/plugins" />
+    <content url="file://$teamcitydistribution$/webapps/ROOT">
+      <sourceFolder url="file://$teamcitydistribution$/webapps/ROOT" isTestSource="false" />
+      <excludeFolder url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/plugins" />
+      <excludeFolder url="file://$teamcitydistribution$/webapps/ROOT/plugins" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/standard.jar!/" />
+          <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/standard.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />