diff --git a/com.ibm.wala.emf/build.xml b/com.ibm.wala.emf/build.xml
index 4cf7cab21..bbc3561e5 100644
--- a/com.ibm.wala.emf/build.xml
+++ b/com.ibm.wala.emf/build.xml
@@ -5,6 +5,8 @@
 	<property name="baseos" value="${os}"/>
 	<property name="basearch" value="${arch}"/>
 	<property name="basenl" value="${nl}"/>
+	<property name="bundleId" value="com.ibm.wala.emf"/>
+	<property name="bundleVersion" value="1.0.0"/>
 
 	<!-- Compiler settings. -->
 	<property name="javacFailOnError" value="true"/>
@@ -14,8 +16,12 @@
 	<property name="compilerArg" value=""/>
 	<property name="javacSource" value="1.5"/>
 	<property name="javacTarget" value="1.5"/>
+	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
+		<os family="mac"/>
+	</condition>
+	<property name="dir_bootclasspath" value="${java.home}/lib"/>
 	<path id="path_bootclasspath">
-		<fileset dir="${java.home}/lib">
+		<fileset dir="${dir_bootclasspath}">
 			<include name="*.jar"/>
 		</fileset>
 	</path>
@@ -29,7 +35,7 @@
 			<isset property="buildTempFolder"/>
 		</condition>
 		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.emf">
+		<condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.emf_1.0.0">
 			<isset property="buildTempFolder"/>
 		</condition>
 		<property name="build.result.folder" value="${basedir}"/>
@@ -49,7 +55,7 @@
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip destfile="${plugin.destination}/com.ibm.wala.emf_1.0.0.jar" basedir="${temp.folder}/com.ibm.wala.emf_1.0.0" filesonly="false" whenempty="skip" update="false"/>
+		<jar destfile="${plugin.destination}/com.ibm.wala.emf_1.0.0.jar" basedir="${temp.folder}/com.ibm.wala.emf_1.0.0" filesetmanifest="merge"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -57,33 +63,31 @@
 		<delete dir="${temp.folder}/@dot.bin"/>
 		<mkdir dir="${temp.folder}/@dot.bin"/>
 		<path id="@dot.classpath">
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime_3.2.0.v20060603.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.osgi_3.2.0.v20060601.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.common_3.2.0.v20060603.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.jobs_3.2.0.v20060603.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0.v20060603/runtime_registry_compatibility.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0.v20060603"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.registry_3.2.0.v20060601.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.apache.xerces_2.8.0.v200606131651/resolver.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.apache.xerces_2.8.0.v200606131651/xercesImpl.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.apache.xerces_2.8.0.v200606131651/xml-apis.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.preferences_3.2.0.v20060601.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0.v20060603/@dot"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.contenttype_3.2.0.v20060603.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.0.v20060601.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.emf.ecore_2.2.0.v200606271057.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.emf.common_2.2.0.v200606271057.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.resources_3.2.0.v20060603.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.resources.compatibility_3.2.0.v20060603.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.resources.win32_3.2.0.v20060603.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility_3.1.100.v20060603.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.update.configurator_3.2.0.v20060605.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.ant.core_3.1.100.v20060531.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.variables_3.1.100.v20060605.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.expressions_3.2.0.v20060605-1400.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.filesystem_1.0.0.v20060603.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.filesystem.win32.x86_1.0.0.v20060603.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.emf.ecore.xmi_2.2.0.v200606271057.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.runtime_3.3.100.v20070530.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.osgi_3.3.0.v20070530.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.equinox.common_3.3.0.v20070426.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.jobs_3.3.0.v20070423.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/runtime_registry_compatibility.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.equinox.registry_3.3.0.v20070522.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.equinox.preferences_3.2.100.v20070522.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/@dot"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.contenttype_3.2.100.v20070319.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.100.v20070502.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.equinox.app_1.0.0.v20070606.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.osgi.services_3.1.200.v20070605.jar"/>
+			<pathelement path="${eclipse.root}/plugins/javax.servlet_2.4.0.v200706111738.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.emf.ecore_2.3.0.v200706262000.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.emf.common_2.3.0.v200706262000.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.resources_3.3.0.v20070604.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.resources.compatibility_3.2.100.v20070502.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.resources.win32_3.3.0.v20070226.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.ant.core_3.1.200.v20070522.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.variables_3.2.0.v20070426.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.expressions_3.3.0.v20070606-0010.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.filesystem_1.1.0.v20070606.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.core.filesystem.win32.x86_1.1.0.v20070510.jar"/>
+			<pathelement path="${eclipse.root}/plugins/org.eclipse.emf.ecore.xmi_2.3.0.v200706262000.jar"/>
 			<pathelement path="../com.ibm.wala.shrike/bin/"/>
 			<pathelement path="../com.ibm.wala.shrike/@dot"/>
 		</path>
@@ -98,12 +102,19 @@
 		</javac>
 		<!-- Copy necessary resources -->
 		<copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
-			<fileset dir="src/" excludes="**/*.java, **/package.htm*"			/>
-			<fileset dir="models/" excludes="**/*.java, **/package.htm*"			/>
+			<fileset dir="src/">
+				<exclude name="**/*.java"/>
+				<exclude name="**/package.htm*"/>
+			</fileset>
+			<fileset dir="models/">
+				<exclude name="**/*.java"/>
+				<exclude name="**/package.htm*"/>
+			</fileset>
 		</copy>
 		<mkdir dir="${build.result.folder}"/>
 		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="${temp.folder}/@dot.bin"			/>
+			<fileset dir="${temp.folder}/@dot.bin">
+			</fileset>
 		</copy>
 		<delete dir="${temp.folder}/@dot.bin"/>
 	</target>
@@ -111,12 +122,16 @@
 	<target name="src.zip" depends="init" unless="src.zip">
 		<mkdir dir="${build.result.folder}"/>
 		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/" includes="**/*.java"			/>
-			<fileset dir="models/" includes="**/*.java"			/>
+			<fileset dir="src/">
+				<include name="**/*.java"/>
+			</fileset>
+			<fileset dir="models/">
+				<include name="**/*.java"/>
+			</fileset>
 		</zip>
 	</target>
 
-	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: com.ibm.wala.emf.">
+	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: com.ibm.wala.emf.">
 		<available property="@dot" file="${build.result.folder}/@dot"/>
 		<antcall target="@dot"/>
 	</target>
@@ -129,10 +144,15 @@
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
 		<mkdir dir="${destination.temp.folder}/com.ibm.wala.emf_1.0.0"/>
 		<copy todir="${destination.temp.folder}/com.ibm.wala.emf_1.0.0" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot" includes="**"			/>
+			<fileset dir="${build.result.folder}/@dot">
+				<include name="**"/>
+			</fileset>
 		</copy>
 		<copy todir="${destination.temp.folder}/com.ibm.wala.emf_1.0.0" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}" includes=",META-INF/,plugin.properties"			/>
+			<fileset dir="${basedir}">
+				<include name="META-INF/"/>
+				<include name="plugin.properties"/>
+			</fileset>
 		</copy>
 	</target>
 
@@ -146,7 +166,11 @@
 
 	<target name="gather.logs" depends="init" if="destination.temp.folder">
 		<mkdir dir="${destination.temp.folder}/com.ibm.wala.emf_1.0.0"/>
-		<copy file="${temp.folder}/@dot.bin${logExtension}" todir="${destination.temp.folder}/com.ibm.wala.emf_1.0.0" failonerror="false" overwrite="false"/>
+		<copy todir="${destination.temp.folder}/com.ibm.wala.emf_1.0.0" failonerror="false" overwrite="false">
+			<fileset dir="${temp.folder}">
+				<include name="@dot.bin${logExtension}"/>
+			</fileset>
+		</copy>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the plug-in: com.ibm.wala.emf of all the zips, jars and logs created.">
@@ -158,7 +182,7 @@
 	</target>
 
 	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="C:/temp/walaWorkspace/com.ibm.wala.emf" property="resourcePath"/>
+		<eclipse.convertPath fileSystemPath="C:/Data/Projects/Safe/workspaces/safe-build/com.ibm.wala.emf" property="resourcePath"/>
 		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
 	</target>
 
@@ -174,7 +198,9 @@
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
 		<delete>
-			<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"			/>
+			<fileset dir="${temp.folder}">
+				<include name="**/*.bin${logExtension}"/>
+			</fileset>
 		</delete>
 		<zip destfile="${plugin.destination}/com.ibm.wala.emf_1.0.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>