diff --git a/build.xml b/build.xml
index c8b7b7465403bc87f748f83323ab8e95e42a53f2..1e676a7ba62330f7a3cb1e2edb8b1b91849f0890 100644
--- a/build.xml
+++ b/build.xml
@@ -45,6 +45,9 @@
       <fileset dir="./lib">
 	<include name="*.jar"/>
       </fileset>
+      <fileset dir="../lib">
+	<include name="*.jar" />
+      </fileset>
     </path>
     
   </target>
@@ -85,6 +88,13 @@
       <fileset dir="classes" includes="fr/inrialpes/exmo/align/ling/**/*.class"/>
       <fileset dir="classes" includes="LICENSE.TXT"/>
     </jar>
+    <delete file="lib/alignsvc.jar"/>
+	<!-- A manifest for the standalone service class should be created -->
+    <jar jarfile="lib/alignsvc.jar" manifest="distrib/MANIFEST-wn.MF">
+      <fileset dir="classes" includes="fr/inrialpes/exmo/align/service/**/*.class"/>
+      <fileset dir="classes" includes="fr/inrialpes/exmo/queryprocessor/**/*.class"/>
+      <fileset dir="classes" includes="LICENSE.TXT"/>
+    </jar>
   </target>
 
   <!-- not tested -->
@@ -159,39 +169,76 @@
     </zip>
   </target>
 
+<target name="svnCommit">
+    <property name="source-root" value="/usr/src"/>
+    <property name="repository.URL" value="http://sources.example.com"/>
+    <java classname="org.tmatesoft.svn.cli.SVN"
+      dir="${source-root}/TESTREPO" fork="true">
+      <arg value="commit"/>
+      <arg value="--username"/>
+      <arg value="admin"/>
+      <arg value="--password"/>
+      <arg value="admin"/>
+      <arg value="-m"/> 
+      <arg value='"Testing"'/>
+      <arg value="${repository.URL}/TESTING"/>
+      <classpath>
+        <pathelement location="${antroot}/LIB/ganymed.jar" />
+        <pathelement location="${antroot}/LIB/javasvn.jar" />
+        <pathelement location="${antroot}/LIB/javasvn-cli.jar" />
+      </classpath>
+    </java>
+  </target>
+
+  <!-- This is for testing purposes, but has been found to work -->
+  <target name="status" depends="init">
+    <java classname="org.tmatesoft.svn.cli.SVN" dir="." fork="true">
+      <arg value="status" />
+      <classpath refid="classpath"/>
+    </java>
+  </target>
+
   <!-- not tested yet -->
   <target name="update" depends="init">
-    <exec executable="svn">
-      <arg line="update" />
-      <arg line="--username" />
-      <arg line="${login}" />
-    </exec>
+    <java classname="org.tmatesoft.svn.cli.SVN" dir="." fork="true"
+         failonerror="true">
+      <sysproperty key="javasvn.ssh2.key" 
+                   value="/Volumes/Khata/.ssh/id_dsa" />
+      <!--sysproperty key="javasvn.ssh2.username" value="${login}" />
+      <sysproperty key="javasvn.ssh2.passphrase" value="aa" /-->
+      <arg value="update" />
+      <classpath refid="classpath"/>
+    </java>
   </target>
 
   <!-- not tested yet -->
   <target name="commit" depends="update">
-    <exec executable="svn">
-      <arg line="commit" />
-      <arg line="--username" />
-      <arg line="${login}" />
-      <arg line="-m" />
-      <arg line='"Pre-release ${version}"' />
-    </exec>
+    <java classname="org.tmatesoft.svn.cli.SVN" dir="." fork="true">
+      <arg value="commit" />
+      <arg value="--username" />
+      <arg value="${login}" />
+      <arg value="-m" />
+      <arg value='"Pre-release ${version}"' />
+      <classpath refid="classpath"/>
+    </java>
   </target>
 
   <!-- not tested yet -->
   <target name="svnbranch" depends="">
-    <exec executable="svn">
-      <arg line="copy" />
-      <arg line="--username" />
-      <arg line="${login}" />
-       <arg line="${rep}/trunk" />
-      <arg line="${rep}/tags/version-${version}" />
-      <arg line="-m" />
-      <arg line='"Release ${version}"' />
-    </exec>
+    <java classname="org.tmatesoft.svn.cli.SVN" dir="." fork="true">
+      <arg value="copy" />
+      <arg value="--username" />
+      <arg value="${login}" />
+      <arg value="${rep}/trunk" />
+      <arg value="${rep}/tags/version-${version}" />
+      <arg value="-m" />
+      <arg value='"Release ${version}"' />
+      <classpath refid="classpath"/>
+    </java>
   </target>
 
+  
+
   <target name="clean">
     <echo message="Cleaning..."/>
   </target>