--- /tmp/xml-security-1_5_2.orig/build.xml	2012-09-16 20:51:40.803579562 +0300
+++ build.xml	2012-09-16 20:56:41.070804693 +0300
@@ -253,6 +253,14 @@
       		<fileset dir="${dir.src.test}" includes="**/*.xml"/>
       		<fileset dir="${dir.src.test}" includes="**/*.zip"/>
     	</copy>
+		<!-- Tests -->
+		<jar basedir="${dir.build.test}" 
+			 excludes="org/apache/xml/security/temp/**" 
+			 includes="org/apache/**, javax/xml/crypto/**"
+			 destfile="${jar.tests}" 
+			 manifest="${jar.manifest}">
+		  <metainf file="${dir.manifest}/*.txt"/>
+		</jar>
     </target>
 
     <!-- samples -->
@@ -274,7 +282,7 @@
 
 	<!-- T E S T  T A R G E T S -->  
 	<!-- big test -->
-	<target name="test" depends="build.jar"
+	<target name="test" depends="build.jar,build.test"
 		description="Starts all Junit tests">
 	    <delete dir="${dir.build.junit.xml}"/>
 	    <delete dir="${dir.build.junit.html}"/>
@@ -327,7 +335,7 @@
 	</target>
 
     <!-- Test JSR 105/XML DSig API -->
-    <target name="test_jsr105" depends="build.jar"
+    <target name="test_jsr105" depends="build.jar,build.test"
 	    description="Runs JSR 105 interop and unit tests">
         <delete dir="${dir.build.junit.xml}"/>
         <delete dir="${dir.build.junit.html}"/>
@@ -668,7 +676,7 @@
     </target>
 
     <target name="build.jar"
-	    depends="manifest,build.src,build.test,build.samples">
+	    depends="manifest,build.src">
 
 	<!-- Main Library -->
 	<jar basedir="${dir.build.bin}"
@@ -679,23 +687,6 @@
 	  <metainf file="${dir.manifest}/*.txt"/>
 	</jar>
 
-	<!-- Samples -->
-	<jar basedir="${dir.build.samples}" 
-	     excludes="org/apache/xml/security/temp/**" 
-	     includes="org/apache/**, javax/xml/crypto/**"
-	     destfile="${jar.samples}" 
-	     manifest="${jar.manifest}">
-	  <metainf file="${dir.manifest}/*.txt"/>
-	</jar>
-		
-	<!-- Tests -->
-	<jar basedir="${dir.build.test}" 
-	     excludes="org/apache/xml/security/temp/**" 
-	     includes="org/apache/**, javax/xml/crypto/**"
-	     destfile="${jar.tests}" 
-	     manifest="${jar.manifest}">
-	  <metainf file="${dir.manifest}/*.txt"/>
-	</jar>
     </target>
 
     <target name="build.src.jar"