diff --git a/samples/airline/client/saaj/lib/maven-artifact-ant-2.0.4-dep.jar b/samples/airline/client/maven-artifact-ant-2.0.4-dep.jar
similarity index 100%
rename from samples/airline/client/saaj/lib/maven-artifact-ant-2.0.4-dep.jar
rename to samples/airline/client/maven-artifact-ant-2.0.4-dep.jar
diff --git a/samples/airline/client/saaj/build.xml b/samples/airline/client/saaj/build.xml
index 77e7e2b2..09701933 100644
--- a/samples/airline/client/saaj/build.xml
+++ b/samples/airline/client/saaj/build.xml
@@ -4,37 +4,36 @@
          xmlns:artifact="urn:maven-artifact-ant">
     <property name="bin.dir" value="bin"/>
     <property name="src.dir" value="src"/>
-    <property name="lib.dir" value="lib"/>
 
     <target name="init">
         <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
             <classpath>
-                <pathelement location="lib/maven-artifact-ant-2.0.4-dep.jar"/>
+                <pathelement location="${basedir}/../maven-artifact-ant-2.0.4-dep.jar"/>
             </classpath>
         </typedef>
 
-        <artifact:remoteRepository id="java.net" url="https://maven-repository.dev.java.net/nonav/repository" layout="legacy"/>
+        <artifact:remoteRepository id="java.net" url="https://maven-repository.dev.java.net/nonav/repository"
+                                   layout="legacy"/>
 
         <artifact:dependencies pathId="compile.classpath">
+            <remoteRepository refid="java.net" />            
             <dependency groupId="javax.xml.soap" artifactId="saaj-api" version="1.3"/>
-            <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
             <dependency groupId="com.sun.xml.wss" artifactId="xws-security" version="2.0-ea2"/>
             <dependency groupId="com.sun.org.apache.xml.security" artifactId="xmlsec" version="2.0"/>
         </artifact:dependencies>
 
         <artifact:dependencies pathId="runtime.classpath">
+            <remoteRepository refid="java.net" />
             <dependency groupId="com.sun.xml.messaging.saaj" artifactId="saaj-impl" version="1.3"/>
         </artifact:dependencies>
 
     </target>
 
 
-
-
     <target name="build" depends="init">
         <mkdir dir="${bin.dir}"/>
         <javac srcdir="${src.dir}" destdir="${bin.dir}">
-            <classpath refid="compile.classpath" />
+            <classpath refid="compile.classpath"/>
         </javac>
         <copy todir="${bin.dir}">
             <fileset dir="${src.dir}">