refactoring plugin build:

- using teamcity-common.xml
- generating teamcity-plugin.xml
- restructuring licenses, lib sources and compile-time libs

diff --git a/build.properties b/build.properties
new file mode 100644 (file)
index 0000000..1d8fc24
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,8 @@
+# Path to unpacked .tar.gz distribution or installed .exe distribution of TeamCity\r
+# for example:\r
+#path.variable.teamcitydistribution=C\:/TeamCity4\r
+\r
+\r
+# Path to JDK 1.5\r
+# for example:\r
+#jdk.home.1.5=c:/Program Files/Java/jdk1.5.0_08
\ No newline at end of file

diff --git a/build.xml b/build.xml
index ef6fafbed3043b0bb8845334a07db48e13b8d59f..746b150942d71536c6108e6caf30a26169750080 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -1,63 +1,50 @@
-<project name="GIT VCS Support" default="dist" basedir=".">\r
-  <property file="git-teamcity.properties"/>\r
-  <property name="lib-dir" location="${basedir}/lib"/>\r
-  <property name="javac2.home" location="${basedir}/buildtime/javac2"/>\r
-  <property name="product-name" value="jetbrains.git"/>\r
+<project name="git-custom-build" default="dist" basedir=".">\r
+\r
+  <property file="build.properties"/>\r
+  <property name="plugin.name" value="jetbrains.git"/>\r
+\r
+  <property name="build.number" value="SNAPSHOT"/>\r
+  <property name="build.vcs.revision" value=""/>\r
+\r
+  <property name="plugin.version" value="1.0.${build.number}-${build.vcs.revision}"/>\r
+\r
+  <property name="javac2.home" value="${basedir}/lib/lib-compile/javac2"/>\r
+\r
   <import file="git-teamcity.xml"/>\r
+  <import file="teamcity-common.xml"/>\r
 \r
-  <property name="distPath" value="${basedir}/dist"/>\r
-  <property name="plugins" location="${user.home}/.BuildServer/plugins"/>\r
-\r
-  <target name="dist" depends="all">\r
-    <delete dir="${distPath}"/>\r
-    <mkdir dir="${distPath}/unpacked"/>\r
-    <jar destfile="${distPath}/unpacked/git-server.jar" basedir="${git-server.output.dir}"/>\r
-\r
-    <mkdir dir="${distPath}/4.1"/>\r
-\r
-    <echo file="${distPath}/build.txt">Git Version: ${build.vcs.number}</echo>\r
-\r
-    <zip basedir="${distPath}/unpacked" destfile="${distPath}/4.1/${product-name}.zip" excludes="**/*">\r
-      <zipfileset prefix="server" dir="${distPath}/unpacked">\r
-        <include name="git-server.jar"/>\r
-      </zipfileset>\r
-      <zipfileset prefix="server" dir="${lib-dir}">\r
-        <include name="*.jar"/>\r
-        <include name="*.jar"/>\r
-        <exclude name="*sources.jar"/>\r
-      </zipfileset>\r
-      <zipfileset prefix="license" dir="${lib-dir}/license">\r
-        <include name="*.txt"/>\r
-      </zipfileset>\r
-      <zipfileset prefix="license" dir="${basedir}">\r
-        <include name="git-plugin-LICENSE.txt"/>\r
-      </zipfileset>\r
-      <zipfileset dir="${distPath}">\r
-        <include name="build.txt"/>\r
-      </zipfileset>\r
-    </zip>\r
+  <target name="package">\r
+    <package.teamcity.plugin name="${plugin.name}" server.output="${git-server.output.dir}"\r
+                             server.lib.dir="lib" server.lib.includes="*.jar"\r
+                             plugin.descriptor.file="teamcity-plugin.dist.xml"\r
+                             plugin.version="${plugin.version}">\r
+      <additional-files>\r
+        <fileset dir="${basedir}" includes="license/**"/>\r
+      </additional-files>\r
+    </package.teamcity.plugin>\r
 \r
-    <zip basedir="${basedir}" destfile="${distPath}/4.1/${product-name}-src.zip">\r
-      <include name="buildtime/**/*"/>\r
-      <include name="git-server/**/*"/>\r
-      <include name="git-tests/**/*"/>\r
-      <include name="lib/**/*"/>\r
-      <include name="git-server/**/*"/>\r
-      <include name="git-tests/**/*"/>\r
-      <include name="lib/**/*"/>\r
+    <zip basedir="${basedir}" destfile="dist/${plugin.name}-src.zip">\r
+      <include name="git-server/**"/>\r
+      <include name="git-tests/**"/>\r
+      <include name="lib/**"/>\r
+      <include name="license/**"/>\r
+      <include name="*.iml"/>\r
+      <include name="*.ipr"/>\r
       <include name="build.xml"/>\r
-      <include name="git-plugin-LICENSE.txt"/>\r
-      <include name="git-teamcity.ipr"/>\r
+      <include name="build.properties"/>\r
       <include name="git-teamcity.xml"/>\r
-      <include name="sample.git-teamcity.properties"/>\r
+      <include name="teamcity-common.xml"/>\r
     </zip>\r
+  </target>\r
+\r
+  <target name="dist" depends="check.teamcitydistribution,all,package"/>\r
 \r
-    <delete dir="${distPath}/unpacked"/>\r
+  <target name="clean" depends="git-teamcity.clean">\r
+    <delete dir="dist" quiet="true"/>\r
   </target>\r
 \r
   <target name="deploy" depends="dist">\r
-    <mkdir dir="${plugins}"/>\r
-    <copy file="${distPath}/4.1/${product-name}.zip" toDir="${plugins}"/>\r
+    <deploy.teamcity.plugin name="${plugin.name}"/>\r
   </target>\r
 \r
   <taskdef name="testng" classname="org.testng.TestNGAntTask" classpath="${basedir}/git-tests/lib/testng-5.7-jdk15.jar"/>\r
@@ -78,4 +65,7 @@
       </xmlfileset>\r
     </testng>\r
   </target>\r
-</project>
\ No newline at end of file
+\r
+</project>\r
+\r
+        
\ No newline at end of file

diff --git a/git-server/git-server.iml b/git-server/git-server.iml
index bdcc76e4dd9ac45d60edd3425eaf564185a71fa5..9f76d8ad42fbdf9ba6dfb12594df3075fb8a0c84 100755 (executable)
--- a/git-server/git-server.iml
+++ b/git-server/git-server.iml
@@ -8,8 +8,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">\r
     <exclude-output />\r
     <content url="file://$MODULE_DIR$">\r
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />\r
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />\r
     </content>\r
     <orderEntry type="inheritedJdk" />\r
     <orderEntry type="sourceFolder" forTests="false" />\r

diff --git a/git-teamcity.ipr b/git-teamcity.ipr
index df8223b7dda1305e34586c3fe8c4979985d8f873..48fa8ecedae3bd7aa6ec7b4f1f33d45fc8f9e8dc 100755 (executable)
--- a/git-teamcity.ipr
+++ b/git-teamcity.ipr
@@ -2,6 +2,14 @@
 <project relativePaths="false" version="4">\r
   <component name="AntConfiguration">\r
     <defaultAnt bundledAnt="true" />\r
+    <buildFile url="file://$PROJECT_DIR$/build.xml">\r
+      <additionalClassPath />\r
+      <antReference projectDefault="true" />\r
+      <customJdkName value="" />\r
+      <maximumHeapSize value="128" />\r
+      <maximumStackSize value="32" />\r
+      <properties />\r
+    </buildFile>\r
   </component>\r
   <component name="BuildJarProjectSettings">\r
     <option name="BUILD_JARS_ON_MAKE" value="false" />\r
@@ -146,7 +154,7 @@
       <element module="All" copyright="open.source" />\r
     </module2copyright>\r
     <LanguageOptions name="JAVA">\r
-      <option name="fileTypeOverride" value="3" />\r
+      <option name="fileTypeOverride" value="2" />\r
       <option name="relativeBefore" value="true" />\r
       <option name="addBlankAfter" value="false" />\r
       <option name="fileLocation" value="1" />\r
@@ -159,6 +167,62 @@
       <option name="box" value="false" />\r
       <option name="filler" value=" " />\r
     </LanguageOptions>\r
+    <LanguageOptions name="JSP">\r
+      <option name="fileTypeOverride" value="1" />\r
+      <option name="relativeBefore" value="true" />\r
+      <option name="addBlankAfter" value="true" />\r
+      <option name="fileLocation" value="1" />\r
+      <option name="block" value="true" />\r
+      <option name="separateBefore" value="false" />\r
+      <option name="separateAfter" value="false" />\r
+      <option name="prefixLines" value="true" />\r
+      <option name="lenBefore" value="80" />\r
+      <option name="lenAfter" value="80" />\r
+      <option name="box" value="false" />\r
+      <option name="filler" value=" " />\r
+    </LanguageOptions>\r
+    <LanguageOptions name="JSPX">\r
+      <option name="fileTypeOverride" value="1" />\r
+      <option name="relativeBefore" value="true" />\r
+      <option name="addBlankAfter" value="true" />\r
+      <option name="fileLocation" value="1" />\r
+      <option name="block" value="true" />\r
+      <option name="separateBefore" value="false" />\r
+      <option name="separateAfter" value="false" />\r
+      <option name="prefixLines" value="true" />\r
+      <option name="lenBefore" value="80" />\r
+      <option name="lenAfter" value="80" />\r
+      <option name="box" value="false" />\r
+      <option name="filler" value=" " />\r
+    </LanguageOptions>\r
+    <LanguageOptions name="Properties">\r
+      <option name="fileTypeOverride" value="1" />\r
+      <option name="relativeBefore" value="true" />\r
+      <option name="addBlankAfter" value="true" />\r
+      <option name="fileLocation" value="1" />\r
+      <option name="block" value="true" />\r
+      <option name="separateBefore" value="false" />\r
+      <option name="separateAfter" value="false" />\r
+      <option name="prefixLines" value="true" />\r
+      <option name="lenBefore" value="80" />\r
+      <option name="lenAfter" value="80" />\r
+      <option name="box" value="false" />\r
+      <option name="filler" value=" " />\r
+    </LanguageOptions>\r
+    <LanguageOptions name="XML">\r
+      <option name="fileTypeOverride" value="1" />\r
+      <option name="relativeBefore" value="true" />\r
+      <option name="addBlankAfter" value="true" />\r
+      <option name="fileLocation" value="1" />\r
+      <option name="block" value="true" />\r
+      <option name="separateBefore" value="false" />\r
+      <option name="separateAfter" value="false" />\r
+      <option name="prefixLines" value="true" />\r
+      <option name="lenBefore" value="80" />\r
+      <option name="lenAfter" value="80" />\r
+      <option name="box" value="false" />\r
+      <option name="filler" value=" " />\r
+    </LanguageOptions>\r
   </component>\r
   <component name="DependencyValidationManager">\r
     <option name="SKIP_IMPORT_STATEMENTS" value="false" />\r
@@ -357,13 +421,11 @@
     <option name="projectName" value="git-teamcity" />\r
   </component>\r
   <component name="ProjectFileVersion" converted="true" />\r
-  <component name="ProjectKey">\r
-    <option name="state" value="project://C:\projects\git-teamcity\git-teamcity.ipr" />\r
-  </component>\r
   <component name="ProjectModuleManager">\r
     <modules>\r
       <module fileurl="file://$PROJECT_DIR$/git-server/git-server.iml" filepath="$PROJECT_DIR$/git-server/git-server.iml" />\r
       <module fileurl="file://$PROJECT_DIR$/git-tests/git-tests.iml" filepath="$PROJECT_DIR$/git-tests/git-tests.iml" />\r
+      <module fileurl="file://$PROJECT_DIR$/root.iml" filepath="$PROJECT_DIR$/root.iml" />\r
     </modules>\r
   </component>\r
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">\r
@@ -448,7 +510,7 @@
       </CLASSES>\r
       <JAVADOC />\r
       <SOURCES>\r
-        <root url="jar://$PROJECT_DIR$/lib/jgit-0.4-SNAPSHOT-sources.jar!/" />\r
+        <root url="jar://$PROJECT_DIR$/lib/src/jgit-0.4-SNAPSHOT-sources.jar!/" />\r
       </SOURCES>\r
     </library>\r
     <library name="TestLibs">\r
@@ -464,270 +526,11 @@
         <root url="jar://$TeamCityDistribution$/webapps/ROOT/WEB-INF/lib/patches-impl.jar!/" />\r
       </CLASSES>\r
       <JAVADOC />\r
-      <SOURCES>\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/multimodule-failed-test/simple-module1/simple-module11/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/fxcop/fxcop-agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/inspections-runner/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ant-runner-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/rcodedup/server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/duplicator-util/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/coverage-agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/jboss/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/serverLoad/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/coverage-common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/MSBuild-runner/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ClearCaseTCSupport7-sources/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/util/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/wadi/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.6.0_01/sample/webservices/EbayServer/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/multimodule-failed-test/simple-module1/simple-module11/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/threadpool/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/mstest-agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/clearcase/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/feed-plugin-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/simple-testng/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/cometd/api/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/StackTraces/Tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/cometd/bayeux/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/cometd/client/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/plus/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/dotNet-searcher/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/sslengine/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ide-notificator-common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.6.0_01/sample/scripting/scriptpad/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/duplicator-runner/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/DotNetCommon-runtime/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ide-notificator-tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/StackTraces/Common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/sslengine/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/TeamCityArtifactsSizeStatisticsPlugin/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ide-common-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/agent-launcher/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/agentInstaller-izPack/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/duplicator-server-side/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/multimodule-failed-test/simple-module1/simple-module12/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/ajp/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test-sources/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-support-tests/testData/PatchForSymbolicReferenceRepository/after/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/vm-crash-detector-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/maven-beanshell-plugin/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/multimodule-failed-test/simple-module1/simple-module12/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/iprRunnerTest/j2ee/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/rcodedup/common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/CvsTCSupport.v.7/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/terracotta/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/web-openapi/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/xbean/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/VssTCSupport.v.7/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/starteam/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/iprRunnerTest/IdeaProject/moduleSources/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/examples/test-annotations/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/simple-multimodule/simple-module1/simple-module11/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ant-server-logging/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/idea-runner/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/spring/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/examples/embedded/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/html/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/servlet-tester/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/xml-tests-reporting/tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/inspection-tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tfs/server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/Solution2003-runner/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/Solution2005-runner/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/win32-notificator-tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/vss-support-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/idea-plugin-common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-support-tests/testData/ExportModule/after/ir-group/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/jspc-maven-plugin/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.6.0_01/sample/jnlp/servlet/src/classes" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/PerforceTCSupport/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tomcatConfigReader/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/PerforceTCSupport.v.7/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/license-keygen/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/grizzly/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/examples/test-webapp/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ntdomain-login/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/SvnTCSupport.v.7/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/server-logging/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/rake-runner/rake-runner-common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/notificator-common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/jdk-searcher/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.6.0_01/sample/jmx/jmx-scandir/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/iprRunnerTest/IdeaProject/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/patches-impl/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/maven-runner/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/xml-tests-reporting/server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/cometd/bayeux/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/eclipse-integration/jetbrains.teamcity.core/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/launcher/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-support-tests/testData/ExportModule2/after/test22/test32/i4j/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/management/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-support-tests/testData/CheckoutOnAgent5/dir1/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/simple-multimodule/simple-module1/simple-module11/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/servlet-api-2.5/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/SvnTCSupport/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/eclipse-integration/jetbrains.teamcity.test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ide-notificator/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/maven-beanshell-plugin/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.6.0_01/sample/jnlp/jreinstaller/src/share/classes" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/plus/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/client/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/multimodule-failed-test/simple-module2/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/patches/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/idea-common-util/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/StarteamTCSupport-sources/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/simple-multimodule/simple-module2/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ChangeTracking-Server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/searchByBuildNumber/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/simple/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/server-side-inspections/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/MSBuild-runner-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/vss-support/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/terracotta/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/xml-tests-reporting/agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/idea-settings/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/Solution2003-runner-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-support-tests/testData/SimpleModule_Aliases/after/ir-group/tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/mstest-tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/agentInstaller/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svn-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ldap-login-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/runtime-util/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/VssTCSupport/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/multimodule-failed-test/simple-module2/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/naming/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/xbean/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/rake-runner/rake-runner-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/license-common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/html/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.6.0_01/demo/plugin/jfc/Java2D/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/fxcop/fxcop-tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/common-runtime/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/mock-agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/examples/spring-ebj3-demo/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/changeViewers/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/jsp-2.1/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/agent-openapi/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/fxcop/fxcop-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/perforce/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/util/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/simple-multimodule/simple-module1/simple-module12/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.6.0_01/sample/webservices/EbayClient/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svn-common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/setuid/modules/native/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/NAnt-runner-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/agentInstaller-UI/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-support/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/duplicator-tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/mock-vcs/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/DotNetCommon/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/idea-runner-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/search-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/win32service/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.6.0_01/demo/scripting/jconsole-plugin/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/web-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.6.0_01/demo/jfc/Java2D/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svn/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tfs/server-tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/server-model/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/patches-tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-support-tests/testData/PatchForSymbolicReferenceRepository/before/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/starteam-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svn-agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/perforce-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/rake-runner/rake-runner-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/simple-testng/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/annotations/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/remote-server-proxy/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/StackTraces/Server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/examples/test-jndi-webapp/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/gwt/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/testng-runtime/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/start/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ant-runtime/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/testng/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-support-tests/testData/SimpleModule_Aliases/after/ir-group/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/idea-settings-test/testData/diana_test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/StackTraces/Agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/cometd/client/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/ajp/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/common-impl/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/feed-plugin/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/processesTerminator/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/simpleRunner-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/processesTerminator-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/xml-rpc-wrapper/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/jsp-api-2.0/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ldap-login/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/jetty-ant/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/artefacts/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ide-common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/setuid/modules/java/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/management/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-support-tests/testData/ExportModule/after/ir-group/tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/maven-runner-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tfs/agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/inspections-util/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/clearcase-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/jetty/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/vm-crash-detector/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/build-server4idea/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/web/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/Solution2008-runner/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/rcodedup/agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/idea-settings-test/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/duplicates/testProject/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.5.0_08/sample/jnlp/jreinstaller/src/share/classes" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/NAnt-runner/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/messages/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/examples/tests/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/CvsTCSupport/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/annotations/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/cvs-support-tests/testData/ExportModule/after/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/coverage-agent-runtime/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/remoteAccess/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/email-notificator/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/simple/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/fxcop/fxcop-common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/AgentScheduledProcessPlugin/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tfs/common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/cometd/demo/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/jabber-notificator/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/duplicates/mavenProject/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/iprRunnerTest/IdeaProject/moduleTest/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/coverage.net-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/server-openapi/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/ant-runner/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/buildDurationStatisticsPlugin/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/maven-plugin/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/eclipse-integration/install.handler/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/TeamCitySamplePlugin/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/Solution2005-runner-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/naming/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/xml-tests-reporting/common/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/simple-multimodule/simple-module1/simple-module12/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/modules/jetty/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/Solution2008-runner-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/j2se6/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/StarteamTCSupport7-sources/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/test/testData/maven.runner/simple-multimodule/simple-module2/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/build-server4idea-compatibility-tests/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/win32-notificator/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/extras/client/src/test/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/stacktraces-native/win32/lib/jdk1.5.0_08/sample/jnlp/servlet/src/classes" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/tools/jetty-6.1.9/contrib/jetty-ant/src/main/java" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/svnrepo/rake-runner/rake-runner-agent/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/coverage-server/src" />\r
-        <root url="jar://$TeamCityDistribution$/sources.jar!/utils/src" />\r
-      </SOURCES>\r
+      <SOURCES />\r
     </library>\r
   </component>\r
   <UsedPathMacros>\r
-    <macro name="TeamCityDistribution" description="" />\r
+    <macro name="TeamCityDistribution" />\r
   </UsedPathMacros>\r
 </project>\r
 \r

diff --git a/buildtime/javac2/asm-commons.jar b/lib/lib-compile/javac2/asm-commons.jar
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from buildtime/javac2/asm-commons.jar
rename to lib/lib-compile/javac2/asm-commons.jar

diff --git a/buildtime/javac2/asm.jar b/lib/lib-compile/javac2/asm.jar
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from buildtime/javac2/asm.jar
rename to lib/lib-compile/javac2/asm.jar

diff --git a/buildtime/javac2/javac2.jar b/lib/lib-compile/javac2/javac2.jar
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from buildtime/javac2/javac2.jar
rename to lib/lib-compile/javac2/javac2.jar

diff --git a/buildtime/javac2/jdom.jar b/lib/lib-compile/javac2/jdom.jar
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from buildtime/javac2/jdom.jar
rename to lib/lib-compile/javac2/jdom.jar

diff --git a/buildtime/javac2/readme.txt b/lib/lib-compile/javac2/readme.txt
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from buildtime/javac2/readme.txt
rename to lib/lib-compile/javac2/readme.txt

diff --git a/lib/jgit-0.4-SNAPSHOT-sources.jar b/lib/src/jgit-0.4-SNAPSHOT-sources.jar
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from lib/jgit-0.4-SNAPSHOT-sources.jar
rename to lib/src/jgit-0.4-SNAPSHOT-sources.jar

diff --git a/lib/jgit-0.4-SNAPSHOT-version.txt b/lib/src/jgit-0.4-SNAPSHOT-version.txt
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from lib/jgit-0.4-SNAPSHOT-version.txt
rename to lib/src/jgit-0.4-SNAPSHOT-version.txt

diff --git a/lib/license/JSch.LICENSE.txt b/license/JSch.LICENSE.txt
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from lib/license/JSch.LICENSE.txt
rename to license/JSch.LICENSE.txt

diff --git a/git-plugin-LICENSE.txt b/license/git-plugin-LICENSE.txt
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from git-plugin-LICENSE.txt
rename to license/git-plugin-LICENSE.txt

diff --git a/lib/license/jgit.LICENSE.txt b/license/jgit.LICENSE.txt
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from lib/license/jgit.LICENSE.txt
rename to license/jgit.LICENSE.txt

diff --git a/root.iml b/root.iml
new file mode 100644 (file)
index 0000000..11910a7
--- /dev/null
+++ b/root.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<module relativePaths="true" type="JAVA_MODULE" version="4">\r
+  <component name="NewModuleRootManager" inherit-compiler-output="true">\r
+    <exclude-output />\r
+    <content url="file://$MODULE_DIR$">\r
+      <excludeFolder url="file://$MODULE_DIR$/dist" />\r
+    </content>\r
+    <orderEntry type="inheritedJdk" />\r
+    <orderEntry type="sourceFolder" forTests="false" />\r
+  </component>\r
+</module>\r
+\r

diff --git a/teamcity-common.xml b/teamcity-common.xml
new file mode 100644 (file)
index 0000000..72f4a1f
--- /dev/null
+++ b/teamcity-common.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project name="TeamCityPluginCommon">\r
+\r
+  <!--\r
+  Tasks:\r
+                package.teamcity.plugin\r
+                deploy.teamcity.plugin\r
+                undeploy.teamcity.plugin\r
+                unpack.teamcity\r
+\r
+  Targets:\r
+                check.teamcitydistribution\r
+  -->\r
+  <property name="teamcity.internal.default.out" value="dist"/>\r
+\r
+\r
+  <macrodef name="package.teamcity.plugin" description="packages TeamCity plugin">\r
+    <attribute name="name" description="name of the plugin"/>\r
+    <attribute name="server.output" default="" description="path to compiled server plugin output"/>\r
+    <attribute name="agent.output" default="" description="path to compiled agent plugin output"/>\r
+    <attribute name="common.output" default="" description="path to compiled common plugin output"/>\r
+    <attribute name="out" default="${teamcity.internal.default.out}" description="directory to put prepared plugin zip into"/>\r
+    <attribute name="plugin.descriptor.file" default="${basedir}/teamcity-plugin.xml" description="path to teamcity-plugin.xml file"/>\r
+    <attribute name="common.jar.name" default="@{name}-common.jar" description="name of the shared jar between server and agent"/>\r
+    <attribute name="out.unpacked" default="@{out}/unpacked"\r
+               description="name of the directory to store unpacked plugin (not packed into zip)"/>\r
+\r
+    <attribute name="server.lib.dir" default="" description="directory to get libs for the server part"/>\r
+    <attribute name="server.lib.includes" default="none should match" description="includes pattern of the files in the directory"/>\r
+    <attribute name="plugin.version" default="SNAPSHOT" description="the version of the plugin to put into teamcity-plugin.xml"/>\r
+\r
+    <element name="additional-files" optional="yes"/>\r
+\r
+    <sequential>\r
+\r
+      <antcall target="check.already.defined"/>\r
+\r
+      <property name="teamcity.internal.distrib.prep" value="${basedir}/temp/dist_prep"/>\r
+      <property name="teamcity.internal.distrib.prep.agent" value="${teamcity.internal.distrib.prep}/agent"/>\r
+      <property name="teamcity.internal.distrib.prep.common" value="${teamcity.internal.distrib.prep}/common"/>\r
+      <property name="teamcity.internal.distrib.prep.agent.jars" value="${teamcity.internal.distrib.prep.agent}/unpacked"/>\r
+\r
+\r
+      <!-- build jars -->\r
+\r
+      <delete dir="@{out.unpacked}" quiet="true"/>\r
+      <delete dir="${teamcity.internal.distrib.prep}" quiet="true"/>\r
+\r
+      <mkdir dir="@{out.unpacked}"/>\r
+\r
+      <condition property="common.needed">\r
+        <length string="@{common.output}" when="greater" length="0"/>\r
+      </condition>\r
+      <condition property="server.needed">\r
+        <length string="@{server.output}" when="greater" length="0"/>\r
+      </condition>\r
+      <condition property="agent.needed">\r
+        <length string="@{agent.output}" when="greater" length="0"/>\r
+      </condition>\r
+\r
+\r
+      <antcall target="prepare.common.part">\r
+        <param name="common.output" value="@{common.output}"/>\r
+        <param name="common.jar.name" value="@{common.jar.name}"/>\r
+      </antcall>\r
+\r
+      <antcall target="prepare.server.part">\r
+        <param name="out.unpacked" value="@{out.unpacked}"/>\r
+        <param name="name" value="@{name}"/>\r
+        <param name="server.output" value="@{server.output}"/>\r
+        <param name="common.jar.name" value="@{common.jar.name}"/>\r
+        <param name="lib.dir" value="@{server.lib.dir}"/>\r
+        <param name="lib.includes" value="@{server.lib.includes}"/>\r
+      </antcall>\r
+\r
+      <antcall target="prepare.agent.part">\r
+        <param name="out.unpacked" value="@{out.unpacked}"/>\r
+        <param name="name" value="@{name}"/>\r
+        <param name="agent.output" value="@{agent.output}"/>\r
+        <param name="common.jar.name" value="@{common.jar.name}"/>\r
+      </antcall>\r
+\r
+      <!-- copy teamcity-plugin.xml -->\r
+      <copy file="@{plugin.descriptor.file}" tofile="@{out.unpacked}/teamcity-plugin.xml" failonerror="false"/>\r
+\r
+      <replace file="@{out.unpacked}/teamcity-plugin.xml" value="@{plugin.version}">\r
+        <replacetoken><![CDATA[@version@]]></replacetoken>\r
+      </replace>\r
+\r
+      <!-- copy additional files -->\r
+      <copy todir="@{out.unpacked}">\r
+        <additional-files/>\r
+      </copy>\r
+      <!-- clean -->\r
+      <delete dir="${teamcity.internal.distrib.prep}" quiet="true"/>\r
+\r
+      <!-- package in zip -->\r
+      <delete file="@{out}/@{name}.zip" quiet="true"/>\r
+      <zip destfile="@{out}/@{name}.zip">\r
+        <fileset dir="@{out.unpacked}"/>\r
+      </zip>\r
+      <echo message="To install the plugin, place '@{out}\@{name}.zip' into '.BuildServer/plugins' directory"/>\r
+\r
+    </sequential>\r
+  </macrodef>\r
+\r
+  <target name="check.teamcitydistribution" description="checks whether TeamCity distribution ready to be used by IDEA-generated build">\r
+    <check.property name="path.variable.teamcitydistribution"\r
+                    fail-message="Please define 'path.variable.teamcitydistribution' property in build.properties file. The property should point to unpacked TeamCity .tar.gz or .exe distribution."\r
+        />\r
+\r
+      <condition property="teamcity.distribution.not.present">\r
+        <not>\r
+          <and>\r
+              <available file="${path.variable.teamcitydistribution}/webapps/ROOT/WEB-INF/lib"/>\r
+          </and>\r
+        </not>\r
+      </condition>\r
+      <fail if="teamcity.distribution.not.present"\r
+            message="Cannot find TeamCity distribution at path '${path.variable.teamcitydistribution}'. The property 'path.variable.teamcitydistribution' should point to unpacked TeamCity .tar.gz or .exe distribution."/>\r
+  </target>\r
+\r
+  <macrodef name="deploy.teamcity.plugin">\r
+    <attribute name="name"/>\r
+    <attribute name="teamcity.data.path" default="${user.home}/.BuildServer" description="path to .BuildServer"/>\r
+    <attribute name="out" default="${teamcity.internal.default.out}" description="directory storing prepared plugin zip"/>\r
+\r
+    <sequential>\r
+      <copy file="@{out}/@{name}.zip" todir="@{teamcity.data.path}/plugins" failonerror="true"/>\r
+    </sequential>\r
+  </macrodef>\r
+\r
+  <macrodef name="undeploy.teamcity.plugin">\r
+    <attribute name="name"/>\r
+    <attribute name="teamcity.data.path" default="${user.home}/.BuildServer" description="path to .BuildServer"/>\r
+\r
+    <sequential>\r
+      <delete file="@{teamcity.data.path}/plugins/@{name}.zip" quiet="true"/>\r
+    </sequential>\r
+  </macrodef>\r
+\r
+\r
+  <macrodef name="unpack.teamcity" description="TeamCity distribution unpacking">\r
+    <attribute name="distribution.dir" default="${basedir}/teamcity-dist"\r
+               description="path to put unpacked TeamCity distribution into. Warning: the content of the directory will be deleted!"/>\r
+    <attribute name="teamcity.data.path" default="${user.home}/.BuildServer" description="path to .BuildServer"/>\r
+    <attribute name="teamcity.tar.gz-location" default="${basedir}" description="path where TeamCity-NNNN.tar.gz file resides"/>\r
+\r
+    <sequential>\r
+      <delete dir="@{distribution.dir}" quiet="true"/>\r
+      <mkdir dir="@{distribution.dir}"/>\r
+\r
+      <!-- TODO: issue error if there are several matching files -->\r
+\r
+      <untar compression="gzip" dest="@{distribution.dir}">\r
+        <fileset dir="@{teamcity.tar.gz-location}">\r
+          <include name="*.tar.gz"/>\r
+        </fileset>\r
+      </untar>\r
+\r
+      <move todir="@{distribution.dir}">\r
+        <fileset dir="@{distribution.dir}\TeamCity">\r
+          <include name="**"/>\r
+        </fileset>\r
+      </move>\r
+    </sequential>\r
+  </macrodef>\r
+\r
+\r
+  <!--   ** Implementation **   -->\r
+\r
+  <macrodef name="check.property">\r
+    <attribute name="name"/>\r
+    <attribute name="fail-message" default=""/>\r
+    <attribute name="check-path" default=""/>\r
+    <sequential>\r
+      <condition property="is.configured.@{name}">\r
+        <not>\r
+          <and>\r
+            <isset property="@{name}"/>\r
+            <length string="${@{name}}" when="greater" length="0"/>\r
+          </and>\r
+        </not>\r
+      </condition>\r
+      <fail if="is.configured.@{name}"\r
+            message="Property '@{name}' not defined. @{fail-message}"/>\r
+    </sequential>\r
+  </macrodef>\r
+\r
+\r
+  <target name="prepare.common.part" if="common.needed">\r
+    <mkdir dir="${teamcity.internal.distrib.prep.common}"/>\r
+    <jar destfile="${teamcity.internal.distrib.prep.common}/${common.jar.name}">\r
+      <fileset dir="${common.output}"/>\r
+    </jar>\r
+  </target>\r
+\r
+\r
+  <target name="prepare.server.part" if="server.needed">\r
+    <mkdir dir="${out.unpacked}/server"/>\r
+\r
+    <jar destfile="${out.unpacked}/server/${name}.jar">\r
+      <fileset dir="${server.output}"/>\r
+    </jar>\r
+\r
+    <copy todir="${out.unpacked}/server" failonerror="false">\r
+      <fileset file="${teamcity.internal.distrib.prep.common}/${common.jar.name}"/>\r
+      <fileset dir="${lib.dir}" includes="${lib.includes}"/>\r
+    </copy>\r
+  </target>\r
+\r
+\r
+  <target name="prepare.agent.part" if="agent.needed">\r
+    <!-- prepare.agent.part -->\r
+    <mkdir dir="${teamcity.internal.distrib.prep.agent}"/>\r
+    <mkdir dir="${teamcity.internal.distrib.prep.agent.jars}/${name}/lib"/>\r
+    <mkdir dir="${out.unpacked}/agent"/>\r
+\r
+    <jar destfile="${teamcity.internal.distrib.prep.agent.jars}/${name}/lib/${name}.jar">\r
+      <fileset dir="${agent.output}"/>\r
+    </jar>\r
+\r
+    <copy todir="${teamcity.internal.distrib.prep.agent.jars}/${name}/lib" failonerror="false">\r
+      <fileset file="${teamcity.internal.distrib.prep.common}/${common.jar.name}"/>\r
+    </copy>\r
+\r
+    <zip destfile="${out.unpacked}/agent/${name}.zip">\r
+      <fileset dir="${teamcity.internal.distrib.prep.agent.jars}"/>\r
+    </zip>\r
+  </target>\r
+\r
+  <target name="check.already.defined">\r
+    <condition property="already.defined">\r
+          <isset property="teamcity.internal.distrib.prep"/>\r
+    </condition>\r
+    <fail if="already.defined"\r
+          message="It seems you are trying to use the script several times in the same context. This script does not support such use. Please call this script as a separate Ant process, via 'ant' task."/>\r
+  </target>\r
+\r
+</project>
\ No newline at end of file

diff --git a/teamcity-plugin.dist.xml b/teamcity-plugin.dist.xml
new file mode 100644 (file)
index 0000000..26cbe73
--- /dev/null
+++ b/teamcity-plugin.dist.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<teamcity-plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+                 xsi:noNamespaceSchemaLocation="urn:shemas-jetbrains-com:teamcity-plugin-v1-xml">\r
+  <info>\r
+    <name>jetbrains.git</name>\r
+    <display-name>Git plugin by JetBrains</display-name>\r
+    <version>@version@</version>\r
+    <description>TeamCity Git integration plugin</description>\r
+  </info>\r
+  <deployment use-separate-classloader="false"/>\r
+</teamcity-plugin>\r