Index: java/build.xml
===================================================================
--- java/build.xml	(revision 6b31de638ea19a82f4b9aaaa67d2bcfb4d3f7e88)
+++ java/build.xml	(revision 008dc259d6f8528dff99cf5297b9439ac4987ba5)
@@ -21,4 +21,5 @@
   <property name="build.dir" value="build"/>
   <property name="classes.dir" value="${build.dir}/classes"/>
+  <property name="example.dir" value="${src.dir}/example"/>
   <property name="jar.dir" value="${build.dir}/jar"/>
   <property name="doc.dir" value="./doc"/>
@@ -42,4 +43,5 @@
     <delete dir="${doc.dir}"/>
     <delete dir="${devdoc.dir}"/>
+    <delete dir="${example.dir}"/>
     <delete>
       <fileset dir="${basedir}" includes="**/*.der"/>
@@ -80,5 +82,5 @@
   </target>
 
-  <target name="run-test" depends="compile" description="run visualizer">
+  <target name="run-test-default" depends="compile,run-create-default" description="run test query on default example">
     <java classname="${main.class}" fork="true" >
       <classpath>
@@ -86,10 +88,34 @@
 	<pathelement path="${classes.dir}"/>
       </classpath>
-      <!-- <arg file="../examples/experiment_create/"/> -->
-      <arg file="./example"/>
+      <arg file="./example/default"/>
       <arg value="Acme.experiment_create"/>
       <arg value="Bob"/>
     </java>
   </target>
+
+  <target name="run-test-x509" depends="compile,run-create-x509" description="run test query on X.509 example">
+    <java classname="${main.class}" fork="true" >
+      <classpath>
+	<path refid="compile.classpath"/>
+	<pathelement path="${classes.dir}"/>
+      </classpath>
+      <arg file="./example/X509Credential"/>
+      <arg value="Acme.experiment_create"/>
+      <arg value="Bob"/>
+    </java>
+  </target>
+
+  <target name="run-test-geni" depends="compile,run-create-geni" description="run test query on GENI example">
+    <java classname="${main.class}" fork="true" >
+      <classpath>
+	<path refid="compile.classpath"/>
+	<pathelement path="${classes.dir}"/>
+      </classpath>
+      <arg file="./example/GENICredential"/>
+      <arg value="Acme.experiment_create"/>
+      <arg value="Bob"/>
+    </java>
+  </target>
+  <target name="run-test" depends="run-test-default,run-test-x509,run-test-geni" description="Run all the test queries"/>
 
   <target name="run-dump" depends="compile" description="run dumper">
@@ -103,28 +129,5 @@
   </target>
 
-  <target name="run-read" depends="compile" description="run visualizer">
-    <java classname="${read.class}" fork="true" >
-      <classpath>
-	<path refid="compile.classpath"/>
-	<pathelement path="${classes.dir}"/>
-      </classpath>
-      <arg file="./example"/>
-    </java>
-  </target>
-
-  <target name="run-write" depends="compile" description="run visualizer">
-    <java classname="${write.class}" fork="true" >
-      <classpath>
-	<path refid="compile.classpath"/>
-	<pathelement path="${classes.dir}"/>
-      </classpath>
-      <arg file="./fedid.pem"/>
-      <arg value="0a778934b93d546406d195d18e4f208af11ea84a.experiment_create"/>
-      <arg value="Bob"/>
-      <arg file="./test.xml"/>
-    </java>
-  </target>
-
-  <target name="run-create" depends="compile" description="run visualizer">
+  <target name="run-create-default" depends="compile" description="Create example certs in default format">
     <java classname="${example.class}" fork="true" >
       <classpath>
@@ -136,5 +139,5 @@
   </target>
 
-  <target name="run-create-geni" depends="compile" description="run visualizer">
+  <target name="run-create-geni" depends="compile" description="Create example certs in GENI format">
     <java classname="${example.class}" fork="true" >
       <classpath>
@@ -146,5 +149,5 @@
   </target>
 
-  <target name="run-create-x509" depends="compile" description="run visualizer">
+  <target name="run-create-x509" depends="compile" description="Create example certs in X.509 format">
     <java classname="${example.class}" fork="true" >
       <classpath>
@@ -155,3 +158,5 @@
     </java>
   </target>
+
+  <target name="run-create" depends="run-create-default,run-create-x509,run-create-geni" description="Create all the examples"/>
 </project>
