Switch to side-by-side view

--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Taverna-Provenance-Extractor v1.0
+# Taverna-Provenance-Extractor v1.3
 
 Link to the official website: ``http://www.ifs.tuwien.ac.at/dp/process/projects/tavernaExtractor.html``
 
@@ -14,57 +14,37 @@
 The standalone CLI version encapsulates two different features:
 
 * Feature A: Converts a Taverna 2.4 worfklow to an Archimate model.
-* Feature B: Accesses provenance data captured during a Taverna 2.4 workflow run, 
-	applies DROID on that capturing (to identify used file formats in the workflow) and generates 
-	a CSV report (including e.g., file formats). Extends an existing Domain Specific Ontology (DSO) 
-	with file format information identified by DROID.
+* Feature B: Updates a OWL with DROID information gathered from the provenance data of a certain workflow execution
 
 ### Interacting with the standalone CLI version
 
-	A	=>	-i,--inputFile <arg>      ...specifies the taverna t2flow (input) file. \path\to\taverna\input.t2flow
-			-o,--outputFile <arg>     ...specifies the archimate (output) file. \path\to\archimate\output.archimate
-			 
-		   
-	B1	=>	-d,--droid <arg>       ...\path\where\to\save\droidOutputFile	
-	   		
-	B2	=>	-cr,--report <arg> 	    ...\path\where\droidOutputFile\is\located      								
-		    
-	B3	=>	-ont,--ontology-file <arg>  ...ontology to extend. \path\to\ontology
-			-r,--reportFile <arg>	    ...generated DROID CSV report.
-
-	(general)	-v, verbose		...enable verbose mode
+	-i,--inputFile <arg>    ...specifies the taverna t2flow (input) file. \path\to\taverna\input.t2flow
+	-o,--outputFile <arg>   ...specifies the archimate (output) file. \path\to\archimate\output.archimate
+	
+	-p,--provenance <\path\to\copy\provenance-trace>    ...fetching provenance information from a workflow execution
+	
+	-ont,--ontology-file <\path\to\myOntology.owl>  ...ontology file
+    -r,--reportFile <\path\to\DroidCSVreport.csv>   ...DROID report file
+	
+	(optional) -v, verbose  ...enable verbose mode
 		   
 ### Sample usage
 
 [A] Convert a Taverna Workflow to an Archimate Model:
+    INPUT: Taverna 2.4/2.5 workflow model
+    OUTPUT: Process model of the workflow accoring to Archimate Specification
 
 	java -jar TavernaExtractor.jar -i \path\to\TavernvaWorkflowInputFile.t2flow -o \path\to\ArchimateOutputFile.archimate 
 	
-[B] Extract including file formats from Workflow and identify them with DROID. In the following the 3 necessray steps are presented:
-    ATTENTION: Due to its DROID dependencies, make sure you are executing the TavernaExtractor.jar in the respective directory!!
-
-[B1] Running DROID identififaction on collected Taverna Workflow Run data:
-     INPUT: path to file which gets created.
-     OUTPUT: file containing DROID identification information in a none readable form.
-
-	java -jar TavernaExtractor.jar -d path\to\myDroidFile.droid
+[B1] Fetch provenance information for a specific workflow run:
+     INPUT: directory where to store the fetched provenance information
+     OUTPUT: fetched provenance data
+     
+	java -jar TavernaExtractor.jar -p \path\to\store\workflow\provenance\data\for\DROID\identification
 	
-	Sample Output:
-	===== [ID] | [Workflow Name (Timestamp)] ===== | 2 entries found.
-
-	[1] MusicClassificationExperiment (2013-09-25 13:11:42.488)
-	[2] MusicClassificationExperiment (2013-09-23 10:44:43.839)
-	Your choice:  //Enter an ID to process
-	
-[B2] Generate a CSV report out of a DROID profile: (CSV report is stored in the same directory as the *.droid input file)
-     INPUT: file from step [B1].
-     OUTPUT: file in CSV format containing DROID information in a readable form.
-     
-	java -jar TavernaExtractor.jar -cr path\to\myDroidFile.droid
-	
-[B3] Extend existing ontology with information about the used file formats in the workflow run:
+[B2] Extend existing ontology with information about the used file formats in the workflow run:
      INPUT1: existing OWL file, which should be extended.
-     INPUT2: file from step [B2].
+     INPUT2: DROID generated CSV report.
      OUTPUT: updates OWL file from INPUT1.
      
 	java -jar TavernaExtractor.jar -ont \path\to\myOntology.owl -r \path\to\myDroidCSVreportFile.droid.csv
@@ -81,7 +61,7 @@
 ### Runtime Dependencies
 
 * JRE 1.7+
-* Apache Ant 1.9+ for building
+* Apache Maven 2+ (for building)
 * DOT (comes with Graphviz)
 	
 ## USING THE OSGi TIMBUS testbed BUNDLE