Mercurial > hg > tc-symbol-server
changeset 65:8fcb224ce394
fixed 'TeamCityDistribution' path variable usages
author | Evgeniy.Koshkin |
---|---|
date | Wed, 26 Feb 2014 16:15:18 +0400 |
parents | 144160a5b010 |
children | cee56ab3c315 |
files | .idea/artifacts/deploy.xml .idea/libraries/Agent_Api.xml .idea/libraries/Common_Api.xml .idea/libraries/Idea_OpenApi.xml .idea/libraries/Server_Api.xml .idea/libraries/Servlet_Api.xml .idea/libraries/TeamCity_agent_runtime.xml .idea/libraries/TeamCity_server_runtime.xml .idea/libraries/Test_Api.xml .idea/libraries/idea_annotations_jar.xml .idea/libraries/log4j.xml .idea/libraries/spring.xml .idea/libraries/standard_jar.xml .idea/runConfigurations/Server.xml agent/agent.iml idea-resolve-helper.iml server/server.iml |
diffstat | 17 files changed, 58 insertions(+), 58 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/artifacts/deploy.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/artifacts/deploy.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,6 +1,6 @@ <component name="ArtifactManager"> <artifact name="deploy"> - <output-path>$TeamCityDistribution$/../PluginDev.Data/plugins</output-path> + <output-path>$teamcitydistribution/../PluginDev.Data/plugins</output-path> <root id="root"> <element id="artifact" artifact-name="plugin-zip" /> </root>
--- a/.idea/libraries/Agent_Api.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/Agent_Api.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,11 +1,11 @@ <component name="libraryTable"> <library name="Agent-Api"> <CLASSES> - <root url="jar://$TeamCityDistribution$/devPackage/agent-api.jar!/" /> + <root url="jar://$teamcitydistribution$/devPackage/agent-api.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$TeamCityDistribution$/devPackage/src/openApi-source.jar!/" /> + <root url="jar://$teamcitydistribution$/devPackage/src/openApi-source.jar!/" /> </SOURCES> </library> </component> \ No newline at end of file
--- a/.idea/libraries/Common_Api.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/Common_Api.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,12 +1,12 @@ <component name="libraryTable"> <library name="Common-Api"> <CLASSES> - <root url="jar://$TeamCityDistribution$/devPackage/common-api.jar!/" /> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/annotations.jar!/" /> + <root url="jar://$teamcitydistribution$/devPackage/common-api.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/annotations.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$TeamCityDistribution$/devPackage/src/openApi-source.jar!/" /> + <root url="jar://$teamcitydistribution$/devPackage/src/openApi-source.jar!/" /> </SOURCES> </library> </component> \ No newline at end of file
--- a/.idea/libraries/Idea_OpenApi.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/Idea_OpenApi.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,11 +1,11 @@ <component name="libraryTable"> <library name="Idea-OpenApi"> <CLASSES> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/util.jar!/" /> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/openapi.jar!/" /> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/trove4j.jar!/" /> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/resources_en.jar!/" /> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/jdom.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/util.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/openapi.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/trove4j.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/resources_en.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/jdom.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />
--- a/.idea/libraries/Server_Api.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/Server_Api.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,11 +1,11 @@ <component name="libraryTable"> <library name="Server-Api"> <CLASSES> - <root url="jar://$TeamCityDistribution$/devPackage/server-api.jar!/" /> + <root url="jar://$teamcitydistribution$/devPackage/server-api.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$TeamCityDistribution$/devPackage/src/openApi-source.jar!/" /> + <root url="jar://$teamcitydistribution$/devPackage/src/openApi-source.jar!/" /> </SOURCES> </library> </component> \ No newline at end of file
--- a/.idea/libraries/Servlet_Api.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/Servlet_Api.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,7 +1,7 @@ <component name="libraryTable"> <library name="Servlet Api"> <CLASSES> - <root url="jar://$TeamCityDistribution$/lib/servlet-api.jar!/" /> + <root url="jar://$teamcitydistribution$/lib/servlet-api.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />
--- a/.idea/libraries/TeamCity_agent_runtime.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/TeamCity_agent_runtime.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,10 +1,10 @@ <component name="libraryTable"> <library name="TeamCity agent runtime"> <CLASSES> - <root url="file://$TeamCityDistribution$/buildAgent/lib" /> + <root url="file://$teamcitydistribution$/buildAgent/lib" /> </CLASSES> <JAVADOC /> <SOURCES /> - <jarDirectory url="file://$TeamCityDistribution$/buildAgent/lib" recursive="false" /> + <jarDirectory url="file://$teamcitydistribution$/buildAgent/lib" recursive="false" /> </library> </component> \ No newline at end of file
--- a/.idea/libraries/TeamCity_server_runtime.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/TeamCity_server_runtime.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,10 +1,10 @@ <component name="libraryTable"> <library name="TeamCity server runtime"> <CLASSES> - <root url="file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib" /> + <root url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib" /> </CLASSES> <JAVADOC /> <SOURCES /> - <jarDirectory url="file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib" recursive="false" /> + <jarDirectory url="file://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib" recursive="false" /> </library> </component> \ No newline at end of file
--- a/.idea/libraries/Test_Api.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/Test_Api.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,8 +1,8 @@ <component name="libraryTable"> <library name="Test-Api"> <CLASSES> - <root url="jar://$TeamCityDistribution$/devPackage/tests/tests-support.jar!/" /> - <root url="jar://$TeamCityDistribution$/devPackage/tests/tests-integration.jar!/" /> + <root url="jar://$teamcitydistribution$/devPackage/tests/tests-support.jar!/" /> + <root url="jar://$teamcitydistribution$/devPackage/tests/tests-integration.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />
--- a/.idea/libraries/idea_annotations_jar.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/idea_annotations_jar.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,7 +1,7 @@ <component name="libraryTable"> <library name="idea annotations.jar"> <CLASSES> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/annotations.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/annotations.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />
--- a/.idea/libraries/log4j.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/log4j.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,7 +1,7 @@ <component name="libraryTable"> <library name="log4j"> <CLASSES> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/log4j-1.2.12.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/log4j-1.2.12.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />
--- a/.idea/libraries/spring.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/spring.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,9 +1,9 @@ <component name="libraryTable"> <library name="spring"> <CLASSES> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/spring.jar!/" /> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/spring-webmvc.jar!/" /> - <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/spring-security.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/spring.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/spring-webmvc.jar!/" /> + <root url="jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/spring-security.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES />
--- a/.idea/libraries/standard_jar.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/libraries/standard_jar.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,7 +1,7 @@ <component name="libraryTable"> <library name="standard.jar"> <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 />
--- a/.idea/runConfigurations/Server.xml Wed Nov 20 20:53:10 2013 +0400 +++ b/.idea/runConfigurations/Server.xml Wed Feb 26 16:15:18 2014 +0400 @@ -1,11 +1,11 @@ <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="Server" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7"> + <configuration default="false" name="Server" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 7" ALTERNATIVE_JRE_ENABLED="false"> <option name="OPEN_IN_BROWSER" value="false" /> <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8111" /> - <option name="COMMON_VM_ARGUMENTS" value="-ea -Xmx384m -XX:MaxPermSize=200m -Ddebug=true -server -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless -DTC.res.disableAll=true -Dteamcity.development.mode=true -Dteamcity.development.shadowCopyClasses=true -Dteamcity.data.path=$TeamCityDistribution$/../PluginDev.Data -Dteamcity_logs=$TeamCityDistribution$/logs -Dlog4j.configuration=file:$TeamCityDistribution$/conf/teamcity-server-log4j.xml" /> + <option name="COMMON_VM_ARGUMENTS" value="-ea -Xmx384m -XX:MaxPermSize=200m -Ddebug=true -server -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless -DTC.res.disableAll=true -Dteamcity.development.mode=true -Dteamcity.development.shadowCopyClasses=true -Dteamcity.data.path=$teamcitydistribution$/../PluginDev.Data -Dteamcity_logs=$teamcitydistribution$/logs -Dlog4j.configuration=file:$teamcitydistribution$/conf/teamcity-server-log4j.xml" /> <option name="UPDATING_POLICY" value="restart-server" /> <deployment> - <file path="$TeamCityDistribution$/webapps/ROOT"> + <file path="C:/Program Files/Java/jdk1.7.0_21/jre/bin/$teamcitydistribution$/webapps/ROOT"> <settings> <option name="CONTEXT_PATH" value="/bs" /> </settings>
--- a/agent/agent.iml Wed Nov 20 20:53:10 2013 +0400 +++ b/agent/agent.iml Wed Feb 26 16:15:18 2014 +0400 @@ -5,8 +5,8 @@ <configuration> <fileset id="fileset1" name="agent" removed="false"> <file>file://$MODULE_DIR$/src/META-INF/build-agent-plugin-symbol-server.xml</file> - <file>jar://$TeamCityDistribution$/buildAgent/lib/agent.jar!/META-INF/buildAgentSpring.xml</file> - <file>jar://$TeamCityDistribution$/buildAgent/lib/agent.jar!/META-INF/buildAgentPlugins.xml</file> + <file>jar://$teamcitydistribution$/buildAgent/lib/agent.jar!/META-INF/buildAgentSpring.xml</file> + <file>jar://$teamcitydistribution$/buildAgent/lib/agent.jar!/META-INF/buildAgentPlugins.xml</file> <file>file://$MODULE_DIR$/fake-teamcity-agent-plugin-context.xml</file> </fileset> </configuration>
--- a/idea-resolve-helper.iml Wed Nov 20 20:53:10 2013 +0400 +++ b/idea-resolve-helper.iml Wed Feb 26 16:15:18 2014 +0400 @@ -4,41 +4,41 @@ <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> </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 />
--- a/server/server.iml Wed Nov 20 20:53:10 2013 +0400 +++ b/server/server.iml Wed Feb 26 16:15:18 2014 +0400 @@ -5,19 +5,19 @@ <configuration> <fileset id="fileset1" name="Server" removed="false"> <file>file://$MODULE_DIR$/fake-teamcity-server-plugin-context.xml</file> - <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/build-server-declarative-extensibility.xml</file> - <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/build-server-plugin-agents-statistics.xml</file> - <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerCompatMode.xml</file> - <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerPermissions.xml</file> - <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerPluginsSupport.xml</file> - <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerSpring.xml</file> - <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/common-impl.jar!/META-INF/shared-spring-sub-container.xml</file> - <file>jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/common-impl.jar!/META-INF/plugin-model-shared-spring.xml</file> - <file>file://$TeamCityDistribution$/webapps/ROOT/WEB-INF/buildServerSpringWeb.xml</file> + <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/build-server-declarative-extensibility.xml</file> + <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/build-server-plugin-agents-statistics.xml</file> + <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerCompatMode.xml</file> + <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerPermissions.xml</file> + <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerPluginsSupport.xml</file> + <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/server.jar!/META-INF/buildServerSpring.xml</file> + <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/common-impl.jar!/META-INF/shared-spring-sub-container.xml</file> + <file>jar://$teamcitydistribution$/webapps/ROOT/WEB-INF/lib/common-impl.jar!/META-INF/plugin-model-shared-spring.xml</file> + <file>file://$teamcitydistribution$/webapps/ROOT/WEB-INF/buildServerSpringWeb.xml</file> <file>file://$MODULE_DIR$/src/META-INF/build-server-plugin-symbol-server.xml</file> - <file>jar://$TeamCityDistribution$/buildAgent/lib/common-impl.jar!/META-INF/per-plugin-shared-spring.xml</file> - <file>jar://$TeamCityDistribution$/buildAgent/lib/common-impl.jar!/META-INF/plugin-model-shared-spring.xml</file> - <file>jar://$TeamCityDistribution$/buildAgent/lib/common-impl.jar!/META-INF/shared-spring-sub-container.xml</file> + <file>jar://$teamcitydistribution$/buildAgent/lib/common-impl.jar!/META-INF/per-plugin-shared-spring.xml</file> + <file>jar://$teamcitydistribution$/buildAgent/lib/common-impl.jar!/META-INF/plugin-model-shared-spring.xml</file> + <file>jar://$teamcitydistribution$/buildAgent/lib/common-impl.jar!/META-INF/shared-spring-sub-container.xml</file> </fileset> </configuration> </facet>