--- a/mercurial.xml	Mon Jul 21 21:22:25 2008 +0400
+++ b/mercurial.xml	Wed Jul 23 09:18:03 2008 +0400
@@ -45,21 +45,19 @@
   
   <!-- Project Libraries -->
   
-  <path id="library.teamcity-openapi.classpath">
-    <pathelement location="${basedir}/mercurial/lib/server-api.jar"/>
-    <pathelement location="${basedir}/mercurial/lib/common-api.jar"/>
+  <path id="library.teamcityapi-server.classpath">
+    <pathelement location="${basedir}/mercurial-server/lib/server-api.jar"/>
   </path>
   
   <path id="library.idea-openapi.classpath">
-    <pathelement location="${basedir}/mercurial/lib/annotations.jar"/>
-    <pathelement location="${basedir}/mercurial/lib/openapi.jar"/>
-    <pathelement location="${basedir}/mercurial/lib/util.jar"/>
-    <pathelement location="${basedir}/mercurial/lib/resources_en.jar"/>
+    <pathelement location="${basedir}/mercurial-server/lib/resources_en.jar"/>
+    <pathelement location="${basedir}/mercurial-server/lib/util.jar"/>
+    <pathelement location="${basedir}/mercurial-server/lib/openapi.jar"/>
+    <pathelement location="${basedir}/mercurial-server/lib/annotations.jar"/>
   </path>
   
   <path id="library.teamcity-testssupport.classpath">
     <pathelement location="${basedir}/mercurial-tests/lib/patches-tests.jar"/>
-    <pathelement location="${basedir}/mercurial-tests/lib/test.jar"/>
   </path>
   
   <path id="library.junit.classpath">
@@ -75,15 +73,19 @@
   </path>
   
   <path id="library.teamcity-impl.classpath">
-    <pathelement location="${basedir}/mercurial/lib/patches-impl.jar"/>
+    <pathelement location="${basedir}/mercurial-server/lib/patches-impl.jar"/>
   </path>
   
   <path id="library.log4j.classpath">
-    <pathelement location="${basedir}/mercurial/lib/log4j-1.2.12.jar"/>
+    <pathelement location="${basedir}/mercurial-server/lib/log4j-1.2.12.jar"/>
   </path>
   
   <path id="library.gnu_trove.classpath">
-    <pathelement location="${basedir}/mercurial/lib/trove4j.jar"/>
+    <pathelement location="${basedir}/mercurial-server/lib/trove4j.jar"/>
+  </path>
+  
+  <path id="library.teamcityapi-common.classpath">
+    <pathelement location="${basedir}/mercurial-server/lib/common-api.jar"/>
   </path>
   
   
@@ -133,84 +135,223 @@
   </target>
   
   
-  <!-- Module mercurial -->
+  <!-- Module mercurial-agent -->
   
-  <dirname property="module.mercurial.basedir" file="${ant.file}"/>
+  <dirname property="module.mercurial-agent.basedir" file="${ant.file}"/>
   
   
   
-  <property name="compiler.args.mercurial" value="${compiler.args}"/>
+  <property name="compiler.args.mercurial-agent" value="${compiler.args}"/>
   
-  <property name="mercurial.output.dir" value="${module.mercurial.basedir}/mercurial/classes"/>
-  <property name="mercurial.testoutput.dir" value="${module.mercurial.basedir}/mercurial/classes"/>
+  <property name="mercurial-agent.output.dir" value="${module.mercurial-agent.basedir}/mercurial-agent/classes"/>
+  <property name="mercurial-agent.testoutput.dir" value="${module.mercurial-agent.basedir}/mercurial-agent/classes"/>
   
-  <path id="mercurial.module.bootclasspath">
+  <path id="mercurial-agent.module.bootclasspath">
     <!-- Paths to be included in compilation bootclasspath -->
   </path>
   
-  <path id="mercurial.module.classpath">
-    <path refid="library.teamcity-openapi.classpath"/>
+  <path id="mercurial-agent.module.classpath"/>
+  
+  <path id="mercurial-agent.runtime.module.classpath">
+    <pathelement location="${mercurial-agent.output.dir}"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.mercurial-agent">
+    <patternset refid="ignored.files"/>
+  </patternset>
+  
+  <patternset id="excluded.from.compilation.mercurial-agent">
+    <patternset refid="excluded.from.module.mercurial-agent"/>
+  </patternset>
+  
+  <path id="mercurial-agent.module.sourcepath">
+    <dirset dir="${module.mercurial-agent.basedir}/mercurial-agent">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.mercurial-agent" depends="compile.module.mercurial-agent.production,compile.module.mercurial-agent.tests" description="Compile module mercurial-agent"/>
+  
+  <target name="compile.module.mercurial-agent.production" description="Compile module mercurial-agent; production classes">
+    <mkdir dir="${mercurial-agent.output.dir}"/>
+    <javac destdir="${mercurial-agent.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
+      <compilerarg line="${compiler.args.mercurial-agent}"/>
+      <bootclasspath refid="mercurial-agent.module.bootclasspath"/>
+      <classpath refid="mercurial-agent.module.classpath"/>
+      <src refid="mercurial-agent.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.mercurial-agent"/>
+    </javac>
+    
+    <copy todir="${mercurial-agent.output.dir}">
+      <fileset dir="${module.mercurial-agent.basedir}/mercurial-agent/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.mercurial-agent.tests" depends="compile.module.mercurial-agent.production" description="compile module mercurial-agent; test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.mercurial-agent" description="cleanup module">
+    <delete dir="${mercurial-agent.output.dir}"/>
+    <delete dir="${mercurial-agent.testoutput.dir}"/>
+  </target>
+  
+  
+  <!-- Module mercurial-common -->
+  
+  <dirname property="module.mercurial-common.basedir" file="${ant.file}"/>
+  
+  
+  
+  <property name="compiler.args.mercurial-common" value="${compiler.args}"/>
+  
+  <property name="mercurial-common.output.dir" value="${module.mercurial-common.basedir}/mercurial-common/classes"/>
+  <property name="mercurial-common.testoutput.dir" value="${module.mercurial-common.basedir}/mercurial-common/classes"/>
+  
+  <path id="mercurial-common.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="mercurial-common.module.classpath">
+    <path refid="library.teamcityapi-common.classpath"/>
+    <path refid="library.idea-openapi.classpath"/>
+  </path>
+  
+  <path id="mercurial-common.runtime.module.classpath">
+    <pathelement location="${mercurial-common.output.dir}"/>
+    <path refid="library.teamcityapi-common.classpath"/>
+    <path refid="library.idea-openapi.classpath"/>
+  </path>
+  
+  
+  <patternset id="excluded.from.module.mercurial-common">
+    <patternset refid="ignored.files"/>
+  </patternset>
+  
+  <patternset id="excluded.from.compilation.mercurial-common">
+    <patternset refid="excluded.from.module.mercurial-common"/>
+  </patternset>
+  
+  <path id="mercurial-common.module.sourcepath">
+    <dirset dir="${module.mercurial-common.basedir}/mercurial-common">
+      <include name="src"/>
+    </dirset>
+  </path>
+  
+  
+  <target name="compile.module.mercurial-common" depends="compile.module.mercurial-common.production,compile.module.mercurial-common.tests" description="Compile module mercurial-common"/>
+  
+  <target name="compile.module.mercurial-common.production" description="Compile module mercurial-common; production classes">
+    <mkdir dir="${mercurial-common.output.dir}"/>
+    <javac destdir="${mercurial-common.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
+      <compilerarg line="${compiler.args.mercurial-common}"/>
+      <bootclasspath refid="mercurial-common.module.bootclasspath"/>
+      <classpath refid="mercurial-common.module.classpath"/>
+      <src refid="mercurial-common.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.mercurial-common"/>
+    </javac>
+    
+    <copy todir="${mercurial-common.output.dir}">
+      <fileset dir="${module.mercurial-common.basedir}/mercurial-common/src">
+        <patternset refid="compiler.resources"/>
+        <type type="file"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <target name="compile.module.mercurial-common.tests" depends="compile.module.mercurial-common.production" description="compile module mercurial-common; test classes" unless="skip.tests"/>
+  
+  <target name="clean.module.mercurial-common" description="cleanup module">
+    <delete dir="${mercurial-common.output.dir}"/>
+    <delete dir="${mercurial-common.testoutput.dir}"/>
+  </target>
+  
+  
+  <!-- Module mercurial-server -->
+  
+  <dirname property="module.mercurial-server.basedir" file="${ant.file}"/>
+  
+  
+  
+  <property name="compiler.args.mercurial-server" value="${compiler.args}"/>
+  
+  <property name="mercurial-server.output.dir" value="${module.mercurial-server.basedir}/mercurial-server/classes"/>
+  <property name="mercurial-server.testoutput.dir" value="${module.mercurial-server.basedir}/mercurial-server/classes"/>
+  
+  <path id="mercurial-server.module.bootclasspath">
+    <!-- Paths to be included in compilation bootclasspath -->
+  </path>
+  
+  <path id="mercurial-server.module.classpath">
+    <path refid="library.teamcityapi-server.classpath"/>
     <path refid="library.idea-openapi.classpath"/>
     <path refid="library.teamcity-impl.classpath"/>
     <path refid="library.log4j.classpath"/>
     <path refid="library.gnu_trove.classpath"/>
+    <pathelement location="${mercurial-common.output.dir}"/>
+    <path refid="library.teamcityapi-common.classpath"/>
   </path>
   
-  <path id="mercurial.runtime.module.classpath">
-    <pathelement location="${mercurial.output.dir}"/>
-    <path refid="library.teamcity-openapi.classpath"/>
+  <path id="mercurial-server.runtime.module.classpath">
+    <pathelement location="${mercurial-server.output.dir}"/>
+    <path refid="library.teamcityapi-server.classpath"/>
     <path refid="library.idea-openapi.classpath"/>
     <path refid="library.teamcity-impl.classpath"/>
     <path refid="library.log4j.classpath"/>
     <path refid="library.gnu_trove.classpath"/>
+    <pathelement location="${mercurial-common.output.dir}"/>
+    <path refid="library.teamcityapi-common.classpath"/>
   </path>
   
   
-  <patternset id="excluded.from.module.mercurial">
+  <patternset id="excluded.from.module.mercurial-server">
     <patternset refid="ignored.files"/>
   </patternset>
   
-  <patternset id="excluded.from.compilation.mercurial">
-    <patternset refid="excluded.from.module.mercurial"/>
+  <patternset id="excluded.from.compilation.mercurial-server">
+    <patternset refid="excluded.from.module.mercurial-server"/>
   </patternset>
   
-  <path id="mercurial.module.sourcepath">
-    <dirset dir="${module.mercurial.basedir}/mercurial">
+  <path id="mercurial-server.module.sourcepath">
+    <dirset dir="${module.mercurial-server.basedir}/mercurial-server">
       <include name="resources"/>
       <include name="src"/>
     </dirset>
   </path>
   
   
-  <target name="compile.module.mercurial" depends="compile.module.mercurial.production,compile.module.mercurial.tests" description="Compile module mercurial"/>
+  <target name="compile.module.mercurial-server" depends="compile.module.mercurial-server.production,compile.module.mercurial-server.tests" description="Compile module mercurial-server"/>
   
-  <target name="compile.module.mercurial.production" description="Compile module mercurial; production classes">
-    <mkdir dir="${mercurial.output.dir}"/>
-    <javac destdir="${mercurial.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
-      <compilerarg line="${compiler.args.mercurial}"/>
-      <bootclasspath refid="mercurial.module.bootclasspath"/>
-      <classpath refid="mercurial.module.classpath"/>
-      <src refid="mercurial.module.sourcepath"/>
-      <patternset refid="excluded.from.compilation.mercurial"/>
+  <target name="compile.module.mercurial-server.production" depends="compile.module.mercurial-common" description="Compile module mercurial-server; production classes">
+    <mkdir dir="${mercurial-server.output.dir}"/>
+    <javac destdir="${mercurial-server.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
+      <compilerarg line="${compiler.args.mercurial-server}"/>
+      <bootclasspath refid="mercurial-server.module.bootclasspath"/>
+      <classpath refid="mercurial-server.module.classpath"/>
+      <src refid="mercurial-server.module.sourcepath"/>
+      <patternset refid="excluded.from.compilation.mercurial-server"/>
     </javac>
     
-    <copy todir="${mercurial.output.dir}">
-      <fileset dir="${module.mercurial.basedir}/mercurial/resources">
+    <copy todir="${mercurial-server.output.dir}">
+      <fileset dir="${module.mercurial-server.basedir}/mercurial-server/resources">
         <patternset refid="compiler.resources"/>
         <type type="file"/>
       </fileset>
-      <fileset dir="${module.mercurial.basedir}/mercurial/src">
+      <fileset dir="${module.mercurial-server.basedir}/mercurial-server/src">
         <patternset refid="compiler.resources"/>
         <type type="file"/>
       </fileset>
     </copy>
   </target>
   
-  <target name="compile.module.mercurial.tests" depends="compile.module.mercurial.production" description="compile module mercurial; test classes" unless="skip.tests"/>
+  <target name="compile.module.mercurial-server.tests" depends="compile.module.mercurial-server.production" description="compile module mercurial-server; test classes" unless="skip.tests"/>
   
-  <target name="clean.module.mercurial" description="cleanup module">
-    <delete dir="${mercurial.output.dir}"/>
-    <delete dir="${mercurial.testoutput.dir}"/>
+  <target name="clean.module.mercurial-server" description="cleanup module">
+    <delete dir="${mercurial-server.output.dir}"/>
+    <delete dir="${mercurial-server.testoutput.dir}"/>
   </target>
   
   
@@ -230,26 +371,30 @@
   </path>
   
   <path id="mercurial-tests.module.classpath">
-    <pathelement location="${mercurial.output.dir}"/>
-    <path refid="library.teamcity-openapi.classpath"/>
+    <pathelement location="${mercurial-server.output.dir}"/>
+    <path refid="library.teamcityapi-server.classpath"/>
     <path refid="library.idea-openapi.classpath"/>
     <path refid="library.teamcity-impl.classpath"/>
     <path refid="library.log4j.classpath"/>
     <path refid="library.gnu_trove.classpath"/>
+    <path refid="library.teamcityapi-common.classpath"/>
     <path refid="library.teamcity-testssupport.classpath"/>
     <path refid="library.junit.classpath"/>
     <path refid="library.testng.classpath"/>
     <path refid="library.jmock.classpath"/>
+    <pathelement location="${mercurial-common.output.dir}"/>
   </path>
   
   <path id="mercurial-tests.runtime.module.classpath">
     <pathelement location="${mercurial-tests.output.dir}"/>
-    <pathelement location="${mercurial.output.dir}"/>
-    <path refid="library.teamcity-openapi.classpath"/>
+    <pathelement location="${mercurial-server.output.dir}"/>
+    <path refid="library.teamcityapi-server.classpath"/>
     <path refid="library.idea-openapi.classpath"/>
     <path refid="library.teamcity-impl.classpath"/>
     <path refid="library.log4j.classpath"/>
     <path refid="library.gnu_trove.classpath"/>
+    <pathelement location="${mercurial-common.output.dir}"/>
+    <path refid="library.teamcityapi-common.classpath"/>
     <path refid="library.teamcity-testssupport.classpath"/>
     <path refid="library.junit.classpath"/>
     <path refid="library.testng.classpath"/>
@@ -274,7 +419,7 @@
   
   <target name="compile.module.mercurial-tests" depends="compile.module.mercurial-tests.production,compile.module.mercurial-tests.tests" description="Compile module mercurial-tests"/>
   
-  <target name="compile.module.mercurial-tests.production" depends="compile.module.mercurial" description="Compile module mercurial-tests; production classes">
+  <target name="compile.module.mercurial-tests.production" depends="compile.module.mercurial-server,compile.module.mercurial-common" description="Compile module mercurial-tests; production classes">
     <mkdir dir="${mercurial-tests.output.dir}"/>
     <javac destdir="${mercurial-tests.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
       <compilerarg line="${compiler.args.mercurial-tests}"/>
@@ -303,7 +448,7 @@
     <!-- Perform any build initialization in this target -->
   </target>
   
-  <target name="clean" depends="clean.module.main, clean.module.mercurial, clean.module.mercurial-tests" description="cleanup all"/>
+  <target name="clean" depends="clean.module.main, clean.module.mercurial-agent, clean.module.mercurial-common, clean.module.mercurial-server, clean.module.mercurial-tests" description="cleanup all"/>
   
-  <target name="all" depends="init, clean, compile.module.main, compile.module.mercurial, compile.module.mercurial-tests" description="build all"/>
+  <target name="all" depends="init, clean, compile.module.main, compile.module.mercurial-agent, compile.module.mercurial-common, compile.module.mercurial-server, compile.module.mercurial-tests" description="build all"/>
 </project>
\ No newline at end of file