From 79ba69f0af58734a99323bf919a9c7abbe4c13e2 Mon Sep 17 00:00:00 2001
From: "nosslived@gmail.com"
 <nosslived@gmail.com@b68fe964-5755-0410-a06c-9fee2ea08261>
Date: Fri, 13 Jan 2012 12:12:21 +0000
Subject: [PATCH] Improved filtering of properties on resources/build.xml.

---
 build.xml                    | 26 +++++++++++++-------------
 src/main/resources/build.xml | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/build.xml b/build.xml
index c46d3a9..df9a3f0 100644
--- a/build.xml
+++ b/build.xml
@@ -1,26 +1,26 @@
 <project name="json-simple" default="main" basedir=".">
 	<property name="current-version" value="1.1.1"/>
 	<property name="jar-name" value="json-simple-${current-version}.jar"/>
-	<property name="classes-target" value="target/classes"/>
-	<property name="jar-target" value="target/${jar-name}"/>
-	
-	<target name="main" depends="jar">
-	</target>
+	<property name="targetDir" value="target"/>
+	<property name="jar-target" value="${targetDir}/${jar-name}"/>
+	<property name="javaSourceDir" value="src/main/java"/>
+	<property name="javaTargetDir" value="target/classes"/>
+
+	<target name="main" depends="jar"></target>
 	
 	<target name="clean">
 		<delete includeemptydirs="true">
-			<fileset dir="target" includes="**/*"/>
-		 </delete>
-		<delete file="${jar-target}"/>
+			<fileset dir="${targetDir}" includes="**/*"/>
+		</delete>
 	</target>
 	
 	<target name="mkdir">
-	    <mkdir dir="${classes-target}"/>
+	    <mkdir dir="${javaTargetDir}"/>
 	</target>
 	
 	<target name="compile" depends="mkdir">
-		<javac 	srcdir="src/main/java" 
-				destdir="${classes-target}"
+		<javac 	srcdir="${javaSourceDir}" 
+				destdir="${javaTargetDir}"
 				includes="**/*.java"
 				target="1.2"
 				source="1.2"/>
@@ -28,7 +28,7 @@
 	
 	<target name="jar" depends="compile">
 		<jar	destfile="${jar-target}"
-				basedir="${classes-target}"
-				includes="**/*.class"/>
+				basedir="${javaTargetDir}"
+				excludes="build.xml"/>
 	</target>
 </project>
diff --git a/src/main/resources/build.xml b/src/main/resources/build.xml
index fca5812..60fdc74 100644
--- a/src/main/resources/build.xml
+++ b/src/main/resources/build.xml
@@ -1,26 +1,26 @@
 <project name="${project.artifactId}" default="main" basedir=".">
 	<property name="current-version" value="${project.version}"/>
 	<property name="jar-name" value="json-simple-${current-version}.jar"/>
-	<property name="classes-target" value="target/classes"/>
-	<property name="jar-target" value="target/${jar-name}"/>
-	
-	<target name="main" depends="jar">
-	</target>
+	<property name="targetDir" value="${project.build.directory}"/>
+	<property name="jar-target" value="${targetDir}/${jar-name}"/>
+	<property name="javaSourceDir" value="${project.build.sourceDirectory}"/>
+	<property name="javaTargetDir" value="${project.build.outputDirectory}"/>
+
+	<target name="main" depends="jar"></target>
 	
 	<target name="clean">
 		<delete includeemptydirs="true">
-			<fileset dir="target" includes="**/*"/>
-		 </delete>
-		<delete file="${jar-target}"/>
+			<fileset dir="${targetDir}" includes="**/*"/>
+		</delete>
 	</target>
 	
 	<target name="mkdir">
-	    <mkdir dir="${classes-target}"/>
+	    <mkdir dir="${javaTargetDir}"/>
 	</target>
 	
 	<target name="compile" depends="mkdir">
-		<javac 	srcdir="src/main/java" 
-				destdir="${classes-target}"
+		<javac 	srcdir="${javaSourceDir}" 
+				destdir="${javaTargetDir}"
 				includes="**/*.java"
 				target="1.2"
 				source="1.2"/>
@@ -28,7 +28,7 @@
 	
 	<target name="jar" depends="compile">
 		<jar	destfile="${jar-target}"
-				basedir="${classes-target}"
-				includes="**/*.class"/>
+				basedir="${javaTargetDir}"
+				excludes="build.xml"/>
 	</target>
 </project>