cishell-svn Mailing List for Cyberinfrastructure Shell (CIShell) (Page 29)

Status: Beta

Brought to you by: bh2, katyb, kongchinhua

cishell-svn — Mailing list for commit messages to CIShell

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul (7)	Aug	Sep (46)	Oct (102)	Nov (10)	Dec (21)
2007	Jan (1)	Feb (3)	Mar (14)	Apr (9)	May (12)	Jun (4)	Jul (40)	Aug (60)	Sep (38)	Oct (2)	Nov (1)	Dec (42)
2008	Jan (23)	Feb (29)	Mar (107)	Apr (27)	May (3)	Jun (1)	Jul (15)	Aug (7)	Sep (19)	Oct	Nov (2)	Dec
2009	Jan (36)	Feb (4)	Mar (2)	Apr (1)	May (1)	Jun (15)	Jul (30)	Aug (32)	Sep (11)	Oct (21)	Nov (12)	Dec (15)
2010	Jan (29)	Feb (9)	Mar (25)	Apr	May (7)	Jun (5)	Jul (21)	Aug (32)	Sep (10)	Oct (8)	Nov (29)	Dec (8)
2011	Jan (9)	Feb (35)	Mar (11)	Apr (4)	May	Jun (1)	Jul	Aug	Sep	Oct (2)	Nov (3)	Dec (30)
2012	Jan (5)	Feb (7)	Mar (10)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 27 28 29 30 31 .. 45 > >> (Page 29 of 45)

[CIShell-SVN] SF.net SVN: cishell: [602] trunk

From: <bh...@us...> - 2008-01-23 20:53:27

Revision: 602
          http://cishell.svn.sourceforge.net/cishell/?rev=602&view=rev
Author:   bh2
Date:     2008-01-23 12:53:14 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
Initial commit of the edu.iu.nwb.util utility bundle. It currently contains a callback
based api for reading nwb files, an nwb writing class, and a handler for just grabbing
metadata from nwb files. Future general purpose utility classes should go here.

edu.iu.nwb.visualization.drl uses this library for its nwb reading/writing.

Added Paths:
-----------
    trunk/plugins/
    trunk/plugins/shared/
    trunk/plugins/shared/edu.iu.nwb.util/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [601] trunk/templates/org.cishell.templates

From: <bh...@us...> - 2008-01-23 17:54:57

Revision: 601
          http://cishell.svn.sourceforge.net/cishell/?rev=601&view=rev
Author:   bh2
Date:     2008-01-23 09:52:13 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
Added a fix to the cishell template code plugin to allow static executables to be called from java code.
You now just need to instantiate the StaticExecutableAlgorithmFactory giving it the top level directory 
where the algorithm is and a BundleContext. If the alg is correctly laid out like other executable projects
and is contained in the bundle of the given BundleContext, everything should work! 
Also bumped the version to 0.9.0.

Modified Paths:
--------------
    trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF
    trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableAlgorithmFactory.java

Modified: trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF
===================================================================
--- trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF	2008-01-23 15:24:44 UTC (rev 600)
+++ trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF	2008-01-23 17:52:13 UTC (rev 601)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CIShell Template Code Provider
 Bundle-SymbolicName: org.cishell.templates;singleton:=true
-Bundle-Version: 0.3.0
+Bundle-Version: 0.9.0
 Bundle-Localization: plugin
 X-AutoStart: true
 Import-Package: org.cishell.framework,

Modified: trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableAlgorithmFactory.java
===================================================================
--- trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableAlgorithmFactory.java	2008-01-23 15:24:44 UTC (rev 600)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableAlgorithmFactory.java	2008-01-23 17:52:13 UTC (rev 601)
@@ -41,6 +41,13 @@
     BundleContext bContext;
     String algName;
     MetaTypeProvider provider;
+    
+    public StaticExecutableAlgorithmFactory() {}
+    
+    public StaticExecutableAlgorithmFactory(String algName, BundleContext bContext) {
+    	this.algName = algName;
+    	this.bContext = bContext;
+    }
 
     protected void activate(ComponentContext ctxt) {
         bContext = ctxt.getBundleContext();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [600] trunk/clients/gui/org.cishell.reference.gui. persistence/src/org/cishell/reference/gui/persistence

From: <mwl...@us...> - 2008-01-23 15:24:51

Revision: 600
          http://cishell.svn.sourceforge.net/cishell/?rev=600&view=rev
Author:   mwlinnem
Date:     2008-01-23 07:24:44 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
We now only show one menu choice per file format when saving or viewing. Also, menu choices are now alphabetized.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/ViewDataChooser.java
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/viewwith/ViewWithDataChooser.java

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java	2008-01-18 17:49:49 UTC (rev 599)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java	2008-01-23 15:24:44 UTC (rev 600)
@@ -57,7 +57,7 @@
     public Data[] execute() {
     	//This only checks the first Data in the array
     	final Converter[] converters = conversionManager.findConverters(data[0], "file-ext:*");
-
+    	
     	if (converters.length < 1 && !(data[0].getData() instanceof File)) {
     		guiBuilder.showError("No Converters", 
     				"No valid converters for data type: " + 

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java	2008-01-18 17:49:49 UTC (rev 599)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java	2008-01-23 15:24:44 UTC (rev 600)
@@ -6,8 +6,12 @@
  */
 package org.cishell.reference.gui.persistence.save;
 
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Dictionary;
 import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.cishell.framework.CIShellContext;
 import org.cishell.framework.algorithm.AlgorithmProperty;
@@ -38,7 +42,7 @@
  *
  * @author Team IVC
  */
-public class SaveDataChooser extends AbstractDialog {
+public class SaveDataChooser extends AbstractDialog implements AlgorithmProperty {
     protected Data data;
     protected Converter[] converterArray;
     private List converterList;
@@ -61,7 +65,7 @@
     						String title, CIShellContext context) {
     	super(parent, title, QUESTION);
         this.data = data;        
-        this.converterArray = converterArray;
+        this.converterArray = alphabetizeConverters(filterConverters(converterArray));
         this.context = context;
     }   
 
@@ -187,6 +191,117 @@
             detailPane.append(val + "\n");
         }
     }
+    
+    /**
+     * In allConverters, there are sometimes more than one 
+     * that converts to a single data type. When the 
+     * chooser pops up, this is confusing to the user, since it 
+     * will, for instance, display two 'Pajek.net' choices.
+     * 
+     * This method attempts to choose the best converter for each
+     * out_data format, choosing based on lossiness primarily, and
+     * length of converter chain secondarily.
+     * @param allConverters All the converters starting with
+     * the original file's data type (that is, any type in its class heirarchy)
+     * and ending in a file format.
+     * @return allConverters, with redudant out file formats removed.
+     */
+    private Converter[] filterConverters(Converter[] allConverters) {
+    	Map lastInDataToConverter = new HashMap();
+    	
+    	for (int i = 0; i < allConverters.length; i++) {
+    		Converter converter = allConverters[i];
+    		
+    		
+    		
+    		//for .xml files, to uniquely identify it 
+    		//we need to know what kind of xml it was
+    		//so we look at the in_data type of the 
+    		//last converter
+    		String lastInData = getLastConverterInData(converter);
+    		
+    		//if we already have a converter with this out data type...
+    		if (lastInDataToConverter.containsKey(lastInData)) {
+    			Converter alreadyStoredConverter = (Converter) lastInDataToConverter.get(lastInData);
+    			
+    			Converter chosenConverter = returnPreferredConverter(converter,alreadyStoredConverter);
+    			
+    			lastInDataToConverter.put(lastInData, chosenConverter);
+    		} else {
+    			lastInDataToConverter.put(lastInData, converter);
+    		}
+    	}
+    	
+    	return (Converter[]) lastInDataToConverter.values().toArray(new Converter[0]);
+    }
+    
+    private String getLastConverterInData(Converter converter) {
+    	ServiceReference[] convChain = converter.getConverterChain();
+    	if (convChain.length >= 1) {
+    		ServiceReference lastConv = convChain[convChain.length - 1];
+    	
+    		String lastInData = (String) lastConv.getProperty("in_data");
+    	
+    		return lastInData;
+    	} else {
+    		return "";
+    	}
+    }
+    
+    /**
+     * Returns whichever converter is better to show to the user in the chooser,
+     * based on lossiness, and length of converter chain
+     * @param c1 A converter with the same out_data type as the other
+     * @param c2 A converter with the same out_data type as the other
+     * @return The preferred converter of the two
+     */
+    private Converter returnPreferredConverter(Converter c1, Converter c2) {
+    	Dictionary c1Dict = c1.getProperties();
+    	String c1Lossiness = (String) c1Dict.get(CONVERSION);
+    	int c1Quality = determineQuality(c1Lossiness);
+    	
+    	
+    	
+    	Dictionary c2Dict = c2.getProperties();
+    	String c2Lossiness = (String) c2Dict.get(CONVERSION);
+    	int c2Quality = determineQuality(c2Lossiness);
+    	
+    	if (c1Quality > c2Quality) {
+    		return c1;
+    	} else if (c2Quality > c1Quality) {
+    		return c2;
+    	} else {
+    		//they are tied. Look at converter chain length
+    		
+    		int c1Length = c1.getConverterChain().length;
+    		int c2Length = c2.getConverterChain().length;
+    		//return the shortest
+    		if (c1Length > c2Length) {
+    			return c2;
+    		} else if (c2Length > c1Length) {
+    			return c1;
+    		} else {
+    			//both have the same lossiness and same length
+    			//arbitrary pick the first
+    			return c1;
+    		}
+    	}
+    }
+    
+    private int determineQuality(String lossiness) {
+    	if (lossiness == LOSSY) {
+    		return 0;
+    	} else if (lossiness == null) {
+    		return 1;
+    	} else { //lossiness == LOSSLESS 
+    		return 2;
+    	}
+    }
+    
+    private Converter[] alphabetizeConverters(Converter[] cs) {
+    	Arrays.sort(cs, new CompareAlphabetically());
+    	return cs;
+    }
 
     /**
      * When a Persister is chosen to Persist this model, this method handles the job
@@ -244,4 +359,33 @@
     		return initGUI(parent);
     	}
     }
+    
+    private class CompareAlphabetically implements Comparator {
+
+    	public int compare(Object o1, Object o2) {
+					if (o1 instanceof Converter && o2 instanceof Converter) {
+						Converter c1 = (Converter) o1;
+						String c1Label = getLabel(c1);
+						
+						Converter c2 = (Converter) o2;
+						String c2Label = getLabel(c2);
+						
+						return c1Label.compareTo(c2Label);
+					} else {
+						throw new IllegalArgumentException("Can only " +
+								"compare Converters");
+					}
+    	}
+					
+		private String getLabel(Converter c) {
+			 String label = "";
+            ServiceReference[] refs = c.getConverterChain();
+            if (refs != null && refs.length > 0) {
+                label = (String) refs[refs.length-1].getProperty(
+                        AlgorithmProperty.LABEL);
+            }
+            
+            return label;
+		}
+    }
 }

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/ViewDataChooser.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/ViewDataChooser.java	2008-01-18 17:49:49 UTC (rev 599)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/ViewDataChooser.java	2008-01-23 15:24:44 UTC (rev 600)
@@ -16,7 +16,6 @@
 public class ViewDataChooser extends SaveDataChooser {
 	private File tempFile;
 	boolean isSaved = false;
-	Converter[] converters;
 	Data theData;
 	
 	public ViewDataChooser(String title, File tempFile, Shell parent, 
@@ -24,7 +23,6 @@
 		super (data, parent, converters, title, context);
 		
 		this.tempFile = tempFile;
-		this.converters = converters;
 		this.theData = data;
 	}
 

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/viewwith/ViewWithDataChooser.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/viewwith/ViewWithDataChooser.java	2008-01-18 17:49:49 UTC (rev 599)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/viewwith/ViewWithDataChooser.java	2008-01-23 15:24:44 UTC (rev 600)
@@ -16,7 +16,6 @@
 public class ViewWithDataChooser extends SaveDataChooser {
 	private File tempFile;
 	boolean isSaved = false;
-	Converter[] converters;
 	Data theData;
 	
 	public ViewWithDataChooser(String title, File tempFile, Shell parent, 
@@ -24,7 +23,6 @@
 		super (data, parent, converters, title, context);
 		
 		this.tempFile = tempFile;
-		this.converters = converters;
 		this.theData = data;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [599] trunk/deployment/org.cishell.reference.releng/ releases/HEAD.properties

From: <bh...@us...> - 2008-01-18 17:49:53

Revision: 599
          http://cishell.svn.sourceforge.net/cishell/?rev=599&view=rev
Author:   bh2
Date:     2008-01-18 09:49:49 -0800 (Fri, 18 Jan 2008)

Log Message:
-----------
updated cishell's releng builder to 0.9.0

Modified Paths:
--------------
    trunk/deployment/org.cishell.reference.releng/releases/HEAD.properties

Modified: trunk/deployment/org.cishell.reference.releng/releases/HEAD.properties
===================================================================
--- trunk/deployment/org.cishell.reference.releng/releases/HEAD.properties	2008-01-15 21:24:32 UTC (rev 598)
+++ trunk/deployment/org.cishell.reference.releng/releases/HEAD.properties	2008-01-18 17:49:49 UTC (rev 599)
@@ -1,5 +1,5 @@
 #released software version
-version=0.8.0
+version=0.9.0
 
 #nightly build
 buildType=N


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [598] trunk/templates/org.cishell.templates. jythonrunner/OSGI-INF/algorithm.properties

From: <mwl...@us...> - 2008-01-15 21:24:39

Revision: 598
          http://cishell.svn.sourceforge.net/cishell/?rev=598&view=rev
Author:   mwlinnem
Date:     2008-01-15 13:24:32 -0800 (Tue, 15 Jan 2008)

Log Message:
-----------
Added author information

Modified Paths:
--------------
    trunk/templates/org.cishell.templates.jythonrunner/OSGI-INF/algorithm.properties

Modified: trunk/templates/org.cishell.templates.jythonrunner/OSGI-INF/algorithm.properties
===================================================================
--- trunk/templates/org.cishell.templates.jythonrunner/OSGI-INF/algorithm.properties	2008-01-11 21:57:18 UTC (rev 597)
+++ trunk/templates/org.cishell.templates.jythonrunner/OSGI-INF/algorithm.properties	2008-01-15 21:24:32 UTC (rev 598)
@@ -1,3 +1,4 @@
+implementors=Micah Linnemeier
 label=Jython Script Runner
 description=Runs Jython Algorithms
 in_data=null


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [597] trunk/core/org.cishell.docs/src/bibliography.bib

From: <bh...@us...> - 2008-01-11 21:57:24

Revision: 597
          http://cishell.svn.sourceforge.net/cishell/?rev=597&view=rev
Author:   bh2
Date:     2008-01-11 13:57:18 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
oops, didn't mean to delete those

Modified Paths:
--------------
    trunk/core/org.cishell.docs/src/bibliography.bib

Modified: trunk/core/org.cishell.docs/src/bibliography.bib
===================================================================
--- trunk/core/org.cishell.docs/src/bibliography.bib	2008-01-11 21:53:34 UTC (rev 596)
+++ trunk/core/org.cishell.docs/src/bibliography.bib	2008-01-11 21:57:18 UTC (rev 597)
@@ -8,3 +8,21 @@
   publisher = {IEEE Computer Society Conference Publishing Services}
 }
 
+@Unpublished{chrisharrison,
+  author = 	 {Chris Harrison},
+  title = 	 {{WikiViz} v5},
+  note = 	 {from \url{http://www.chrisharrison.net/projects/wikiviz/}},
+  month = 	 {November},
+  year = 	 {2007}
+}
+
+@Article{holowaywiki,
+  author = 	 {Holloway, Todd and Božicevic, Miran and Börner, Katy},
+  title = 	 {Analyzing and Visualizing the Semantic Coverage of Wikipedia and Its Authors},
+  journal = 	 {Complexity\textnormal{, Special issue on Understanding Complex Systems}},
+  year = 	 {2007},
+  volume = 	 {12},
+  number = 	 {3},
+  pages = 	 {33-40},
+  note = 	 {Also available as cs.IR/0512085.q},
+} 
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [596] trunk/core/org.cishell.docs/src

From: <bh...@us...> - 2008-01-11 21:53:47

Revision: 596
          http://cishell.svn.sourceforge.net/cishell/?rev=596&view=rev
Author:   bh2
Date:     2008-01-11 13:53:34 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
Lots of updates. Every section now has at least a skeleton. Nowhere near complete.

Modified Paths:
--------------
    trunk/core/org.cishell.docs/src/bibliography.bib
    trunk/core/org.cishell.docs/src/specification/main.tex
    trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex
    trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex
    trunk/core/org.cishell.docs/src/specification/tex/logservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/preferencesservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/schedulerservice.tex

Added Paths:
-----------
    trunk/core/org.cishell.docs/src/img/conversionGraph.epsi
    trunk/core/org.cishell.docs/src/img/conversionGraph.pdf
    trunk/core/org.cishell.docs/src/img/conversionGraph.svg

Modified: trunk/core/org.cishell.docs/src/bibliography.bib
===================================================================
--- trunk/core/org.cishell.docs/src/bibliography.bib	2008-01-10 20:59:40 UTC (rev 595)
+++ trunk/core/org.cishell.docs/src/bibliography.bib	2008-01-11 21:53:34 UTC (rev 596)
@@ -8,21 +8,3 @@
   publisher = {IEEE Computer Society Conference Publishing Services}
 }
 
-@Unpublished{chrisharrison,
-  author = 	 {Chris Harrison},
-  title = 	 {{WikiViz} v5},
-  note = 	 {from \url{http://www.chrisharrison.net/projects/wikiviz/}},
-  month = 	 {November},
-  year = 	 {2007}
-}
-
-@Article{holowaywiki,
-  author = 	 {Holloway, Todd and Božicevic, Miran and Börner, Katy},
-  title = 	 {Analyzing and Visualizing the Semantic Coverage of Wikipedia and Its Authors},
-  journal = 	 {Complexity\textnormal{, Special issue on Understanding Complex Systems}},
-  year = 	 {2007},
-  volume = 	 {12},
-  number = 	 {3},
-  pages = 	 {33-40},
-  note = 	 {Also available as cs.IR/0512085.q},
-}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/img/conversionGraph.epsi
===================================================================
--- trunk/core/org.cishell.docs/src/img/conversionGraph.epsi	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/img/conversionGraph.epsi	2008-01-11 21:53:34 UTC (rev 596)
@@ -0,0 +1,1061 @@
+%!PS-Adobe-2.0 EPSF-1.2
+%%Title: 
+%%Creator: inkscape 0.43
+%%CreationDate: 2008-01-10 12:22 /tmp/ink_ext_RI8V4T
+%%For:bherrbherr bherr
+%%Pages: 1
+%%DocumentFonts:
+%%BoundingBox: 121 451 216 537
+%%EndComments
+
+%%BeginProlog
+%%BeginPreview: 95 86 8 258
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000066bbbb77000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000088440088770000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000001199bb00000088440044990000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000088bb0000000011cc881100000088440066880000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0011775566000000aa7700000000008899aaaa110000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0044660088000055cc00000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 00009933880000ee3300000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000011cc440066aa0000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000077110000bb550000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 005588000022dd000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 11997700008888000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0011880000cc22000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0011770011dd00000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 00880000559900000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000668888440000000000000000000000000000000000000000000000
+% 55440000886600000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000bb00000000aaffee88110000000000000000000000000000000000
+% 55110000cc2200000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000bbbbbb330055001188ee3300000000000000000000000000000022
+% 55880011dd0000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000bb000000000000000033dd33000000000000000000000000000044
+% cc110055990000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000bb88884400000000000033dd330000000000000000000000000033
+% 66000088880000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000334444220000000000550033ee1100000000000000000000007722
+% 000000aa440000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000aa660088bb0000000000000000000011bbcc
+% 880000cc220000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000cc881100bb77000000000000000000008888
+% 110000ff000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 000000000000000000000000000000000000000000009977330022dd220000000000000000002299
+% 000022cc000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000886600000077bb0000000000000000000088
+% 000044aa000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000117700000000bb6600000000000000000022
+% 00008888000000000000000000000000000000000000003399440000000000000000000000000000
+% 000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000557700000033dd00000000000000000000
+% 00008855000000000000000000000000000000000000008800000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000022553300009977000000000000000000
+% 0000bb4400000000000000000000000000000000000044550033000000000000005599bbddeeeeff
+% aa4400000000000000000000000000
+% 000000000000000000000000000000000000000000000000000066000022ee110000000000000000
+% 0000ee0000000000000000000000000000000000226644998833000000005599eeaa664400000000
+% 55660033aa88880000000000000000
+% 00000000000000000000000000000000000000000000000000225533000099880000000000000000
+% 0000ff0000000000000000000000000000002288999900440000001188eeaa661100000000000000
+% 000000bb3300220000000000000000
+% 00000000000000000000000000000000000000000000000000118888000011dd1100000000000000
+% 0000cc000000000000000000000000000000003366000000002288ee992200000000000000000000
+% 000000bb0000000000000000000000
+% 000000000000000000000000000000000000000000000000000022cc110000888800000000000000
+% 0044bb0000000000000000000000005530883f550000002299ee8811000000000000000000000000
+% 000000cc1100000000000000000000
+% 0000000000000000000000000000000000000000000000000000003377000011ee22000000000000
+% 0044bb0000000000000000000000883311110000001188ee88110000000000000000000000000000
+% 00000055cc88990000000000000000
+% 00000000000000000000000000000000000000000000000000000000003355008888000000000000
+% 0055880000000000000033770099aa883300000066ee881100000000000000000000000000000000
+% 000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000033dd990022ee110000000000
+% 0088880000000000000088aa11441100000044ccbb22000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000449988000099660000000000
+% 00888800000000000000bbbb880000002299dd550000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 000000000000000000000000000000000000000000000000000000000022aa000033dd0000000000
+% 00884400000000000044880022000088dd8800000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000088000000bb5500000000
+% 00bb440000000000007700000033ccaa220000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000007700000055bb00000000
+% 00bb4400000000000000000088ee5500000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000001100000000dd22000000
+% 00dd000000000000000033ccaa110000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000007799000000
+% 00ff0000000000000077ee5500000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 000000000000000000000000000000000000000000000000000000000000000000000011ee110000
+% 00ee000000000022bbbb220000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000088880000
+% 00000000000077dd7700000000000000000000000000008844000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000022770000
+% 0000000011bbbb220000000000000000000000000000229988000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 00000000dd77000000000000000000000000000000008899cc009988990000111100001122000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 22990000000000000000000000000000000000000000550055554499332277118877004499990000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 88cc33000000000000000000000000000000000000000000001100007700221177aa9944aabb0000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000334400000000000000000000000000000000
+% cc33880000bbffffffeebbbbbbbbbbbbbbbb99888877444444000000000000113300004444883300
+% 000000000000000000000000000000
+% 0000000000000000000000000000000000000000000088bb00000000000000000000000000000055
+% eebbee0000000000000000000044444444444466888899bbbbccffddbb8877442200002288aa1100
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000000aabb660000000000000000000055550000aa
+% 22008855000000000000000000000000000000000000000000000011446688bbcceeaa7733000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000033558844882255000000000000005599eeaa66000044
+% 000011220000000000000000000000000000000000000000000000000000000000004488ccee9933
+% 000000000000000000000000000000
+% 000000000000000000000000000000000022668866770000000000001166aaffaa66110000000000
+% 000000000000000000000000000000000000000000000000000000000000000000000000001166dd
+% cc4400000000000000000000000000
+% 000000000000000000000000000033222211883300000000002277aaee9955000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 44dd880000bbaa8811000000000000
+% 000000000000000000000011003388228840330000001166ccdd8855000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0011cc4400bb008844000000000000
+% 00000000000000000055992266885522000000004499dd9944000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0000000000eebbdd22000000000000
+% 00000000000000000088882288664400002277ddcc66110000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0000000000bb006677000000000000
+% 00000000000000000099220000000044aaee88330000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0000000000dd88cc55000000000000
+% 0000000000000000008800000044bbdd660000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000044440000000000000000
+% 000000000000000000330044bbbb4400000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000044ddbb44000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000444400000000000000
+% 000000000000001188dd440000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000bb4400000000002200
+% 00000000000044dd8811000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000ee0000000000889900
+% 000000000066ee440000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000022cc000000002288bb88
+% 0000000066ee33000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000066990000000000bb5588
+% 00000022ee2200000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 00000000009966000000000040bb55
+% 00000099770000000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0000000000ee220000002211885500
+% 00000088330000000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 0000000055cc000000008822110000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000009977000000008855000000
+% 88bbbb33000000000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 00000011ee22000000448877000000
+% bb440000000000000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000888800004466886600000000
+% bbccbb00000000000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000663300880000
+% 000033dd11000000bb110000000000
+% bb440044aa4400000000000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000884400bb0000
+% 0044dd660000663399880000000000
+% bb44000066ccbb660000000000000000000000000000000000000000000000000000000000000000
+% 0000000000000000000000000000000000000000000000000000000000000000000088ccbbee0044
+% ffdd5500000022dd00440000000000
+% 00000000000044bbdd66000000000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000884400bb0000
+% 000000000000008833000000000000
+% 00000000000000003399ee8811000000000000000000000000000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000884400bb0000
+% 000000000000001155000000000000
+% 000000000000000000002299ee882200000000000000000000000000000000000000000000000044
+% ccbbbb00000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 0000000000000000884400001188ee994400000000000000000000000000000000000000000000cc
+% 11001100000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 0000000000000000bb66440000001166bbdd882200000000000000000000000000000000000000bb
+% 0088bb33000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 0000000000000000bb99220000000000002288eeaa550000000000000000000000000000000000cc
+% 11008844000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 0000000000000000aa000066884411000000000066aaee8844000000000000000000000000000033
+% aaaa9922000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 000000000000000000000033994411000000000000002277bbee9966110000000000000000001100
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000033881166006600000000000000116699eecc8877441100001166ee44
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 0000000000000000000000000011224422338800003300000000000000336688bbccccbbbb994400
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000009999bb33aa885500000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000334455113300000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000001199448800000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+% 00000000000000000000000000000000000000000033889900000000000000000000000000000000
+% 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+% 000000000000000000000000000000
+%%EndImage
+%%EndPreview
+save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def
+%%EndProlog
+%%Page: 1 1
+%%BeginDocument: /tmp/ink_ext_RI8V4T
+0 842 translate
+0.8 -0.8 scale
+gsave [1 0 0 1 0 0] concat
+gsave
+0 0 0 setrgbcolor
+newpath
+202.89658 437.53802 moveto
+201.82626 440.44037 lineto
+203.97079 440.44037 lineto
+202.89658 437.53802 lineto
+202.45126 436.76068 moveto
+203.34579 436.76068 lineto
+205.56845 442.59271 lineto
+204.74814 442.59271 lineto
+204.21689 441.09662 lineto
+201.58798 441.09662 lineto
+201.05673 442.59271 lineto
+200.2247 442.59271 lineto
+202.45126 436.76068 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+258.51172 448.57703 moveto
+258.51172 450.71375 lineto
+259.77734 450.71375 lineto
+260.20182 450.71375 260.51562 450.62651 260.71875 450.45203 curveto
+260.92448 450.27494 261.02734 450.00541 261.02734 449.64343 curveto
+261.02734 449.27885 260.92448 449.01062 260.71875 448.83875 curveto
+260.51562 448.66427 260.20182 448.57703 259.77734 448.57703 curveto
+258.51172 448.57703 lineto
+258.51172 446.17859 moveto
+258.51172 447.9364 lineto
+259.67969 447.9364 lineto
+260.0651 447.9364 260.35156 447.86479 260.53906 447.72156 curveto
+260.72916 447.57573 260.82421 447.35437 260.82422 447.0575 curveto
+260.82421 446.76323 260.72916 446.54318 260.53906 446.39734 curveto
+260.35156 446.25151 260.0651 446.17859 259.67969 446.17859 curveto
+258.51172 446.17859 lineto
+257.72266 445.53015 moveto
+259.73828 445.53015 lineto
+260.33984 445.53016 260.80338 445.65516 261.12891 445.90515 curveto
+261.45442 446.15516 261.61718 446.51062 261.61719 446.97156 curveto
+261.61718 447.32833 261.53385 447.61219 261.36719 447.82312 curveto
+261.20052 448.03406 260.95573 448.16557 260.63281 448.21765 curveto
+261.02083 448.30099 261.32161 448.47547 261.53516 448.74109 curveto
+261.7513 449.00411 261.85937 449.33354 261.85938 449.72937 curveto
+261.85937 450.2502 261.68229 450.65255 261.32812 450.9364 curveto
+260.97395 451.22026 260.47005 451.36218 259.81641 451.36218 curveto
+257.72266 451.36218 lineto
+257.72266 445.53015 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+259.74609 415.8114 moveto
+259.74609 416.64343 lineto
+259.48046 416.39604 259.19661 416.21115 258.89453 416.08875 curveto
+258.59505 415.96635 258.27604 415.90516 257.9375 415.90515 curveto
+257.27083 415.90516 256.76041 416.10958 256.40625 416.51843 curveto
+256.05208 416.92469 255.875 417.51323 255.875 418.28406 curveto
+255.875 419.05229 256.05208 419.64083 256.40625 420.04968 curveto
+256.76041 420.45593 257.27083 420.65906 257.9375 420.65906 curveto
+258.27604 420.65906 258.59505 420.59786 258.89453 420.47546 curveto
+259.19661 420.35307 259.48046 420.16817 259.74609 419.92078 curveto
+259.74609 420.745 lineto
+259.47005 420.9325 259.17708 421.07312 258.86719 421.16687 curveto
+258.55989 421.26062 258.23437 421.3075 257.89062 421.3075 curveto
+257.00781 421.3075 256.3125 421.03796 255.80469 420.4989 curveto
+255.29687 419.95724 255.04297 419.21896 255.04297 418.28406 curveto
+255.04297 417.34656 255.29687 416.60828 255.80469 416.06921 curveto
+256.3125 415.52755 257.00781 415.25672 257.89062 415.25671 curveto
+258.23958 415.25672 258.5677 415.30359 258.875 415.39734 curveto
+259.18489 415.48849 259.47526 415.62651 259.74609 415.8114 curveto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+168.04361 399.35416 moveto
+171.73111 399.35416 lineto
+171.73111 400.01822 lineto
+168.83267 400.01822 lineto
+168.83267 401.74478 lineto
+171.61002 401.74478 lineto
+171.61002 402.40884 lineto
+168.83267 402.40884 lineto
+168.83267 404.52213 lineto
+171.80142 404.52213 lineto
+171.80142 405.18619 lineto
+168.04361 405.18619 lineto
+168.04361 399.35416 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+221.62907 382.3071 moveto
+221.62907 386.84225 lineto
+222.5822 386.84225 lineto
+223.38688 386.84226 223.97542 386.65996 224.34782 386.29538 curveto
+224.72282 385.9308 224.91032 385.35528 224.91032 384.56882 curveto
+224.91032 383.78757 224.72282 383.21596 224.34782 382.85397 curveto
+223.97542 382.4894 223.38688 382.3071 222.5822 382.3071 curveto
+221.62907 382.3071 lineto
+220.84001 381.65866 moveto
+222.46111 381.65866 lineto
+223.59131 381.65867 224.42074 381.89434 224.94939 382.36569 curveto
+225.47803 382.83445 225.74235 383.56882 225.74236 384.56882 curveto
+225.74235 385.57403 225.47672 386.31231 224.94548 386.78366 curveto
+224.41423 387.25502 223.5861 387.49069 222.46111 387.49069 curveto
+220.84001 387.49069 lineto
+220.84001 381.65866 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+151.79855 465.49472 moveto
+155.15012 465.49472 lineto
+155.15012 466.15878 lineto
+152.58762 466.15878 lineto
+152.58762 467.87753 lineto
+154.90012 467.87753 lineto
+154.90012 468.5416 lineto
+152.58762 468.5416 lineto
+152.58762 471.32675 lineto
+151.79855 471.32675 lineto
+151.79855 465.49472 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+204.3125 478.90735 moveto
+204.3125 477.34094 lineto
+203.02344 477.34094 lineto
+203.02344 476.6925 lineto
+205.09375 476.6925 lineto
+205.09375 479.19641 lineto
+204.78906 479.41256 204.45312 479.57662 204.08594 479.6886 curveto
+203.71875 479.79797 203.32682 479.85266 202.91016 479.85266 curveto
+201.9987 479.85266 201.28515 479.58704 200.76953 479.05579 curveto
+200.25651 478.52193 200 477.77975 200 476.82922 curveto
+200 475.8761 200.25651 475.13392 200.76953 474.60266 curveto
+201.28515 474.06881 201.9987 473.80189 202.91016 473.80188 curveto
+203.29036 473.80189 203.65104 473.84876 203.99219 473.9425 curveto
+204.33593 474.03626 204.65234 474.17428 204.94141 474.35657 curveto
+204.94141 475.19641 lineto
+204.64973 474.94902 204.33984 474.76282 204.01172 474.63782 curveto
+203.68359 474.51282 203.33854 474.45032 202.97656 474.45032 curveto
+202.26302 474.45032 201.72656 474.64954 201.36719 475.04797 curveto
+201.01042 475.44642 200.83203 476.04016 200.83203 476.82922 curveto
+200.83203 477.61568 201.01042 478.20813 201.36719 478.60657 curveto
+201.72656 479.00501 202.26302 479.20422 202.97656 479.20422 curveto
+203.2552 479.20422 203.5039 479.18079 203.72266 479.13391 curveto
+203.9414 479.08443 204.13802 479.00891 204.3125 478.90735 curveto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+244.33731 467.81543 moveto
+245.12637 467.81543 lineto
+245.12637 470.20605 lineto
+247.99356 470.20605 lineto
+247.99356 467.81543 lineto
+248.78262 467.81543 lineto
+248.78262 473.64746 lineto
+247.99356 473.64746 lineto
+247.99356 470.87012 lineto
+245.12637 470.87012 lineto
+245.12637 473.64746 lineto
+244.33731 473.64746 lineto
+244.33731 467.81543 lineto
+fill
+grestore
+0 0 0 setrgbcolor
+[] 0 setdash
+1 setlinewidth
+0 setlinejoin
+0 setlinecap
+newpath
+208 439.36218 moveto
+254 439.36218 255 447.36218 255 447.36218 curveto
+stroke
+0 0 0 setrgbcolor
+[] 0 setdash
+1 setlinewidth
+0 setlinejoin
+0 setlinecap
+newpath
+206.54418 435.92063 moveto
+246.57662 406.91162 253 415.36218 253 415.36218 curveto
+stroke
+0 0 0 setrgbcolor
+[] 0 setdash
+1 setlinewidth
+0 setlinejoin
+0 setlinecap
+newpath
+203 432.36218 moveto
+206 382.36218 216 384.36218 216 384.36218 curveto
+stroke
+0 0 0 setrgbcolor
+[] 0 setdash
+1 setlinewidth
+0 setlinejoin
+0 setlinecap
+newpath
+198 434.36218 moveto
+181 392.36218 174 401.36218 174 401.36218 curveto
+stroke
+0 0 0 setrgbcolor
+[] 0 setdash
+1 setlinewidth
+0 setlinejoin
+0 setlinecap
+newpath
+197 442.36218 moveto
+152 455.36218 156 463.36218 156 463.36218 curveto
+stroke
+0 0 0 setrgbcolor
+[] 0 setdash
+1 setlinewidth
+0 setlinejoin
+0 setlinecap
+newpath
+260 454.36218 moveto
+256.43969 474.36218 251 470.36218 251 470.36218 curveto
+stroke
+0 0 0 setrgbcolor
+[] 0 setdash
+1 setlinewidth
+0 setlinejoin
+0 setlinecap
+newpath
+156 469.36218 moveto
+197.55139 489.8774 200 481.36218 200 481.36218 curveto
+stroke
+gsave [1 0.489579 0 1 0 0] concat
+gsave
+0 0 0 setrgbcolor
+newpath
+161.75195 396.17181 moveto
+164.26562 396.17181 lineto
+164.26562 396.66986 lineto
+162.34375 396.66986 lineto
+162.34375 397.95892 lineto
+164.07812 397.95892 lineto
+164.07812 398.45697 lineto
+162.34375 398.45697 lineto
+162.34375 400.54584 lineto
+161.75195 400.54584 lineto
+161.75195 396.17181 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+169.01172 397.59271 moveto
+165.98828 398.66791 lineto
+169.01172 399.73724 lineto
+169.01172 400.27045 lineto
+165.25586 398.90814 lineto
+165.25586 398.42181 lineto
+169.01172 397.05951 lineto
+169.01172 397.59271 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+169.94043 398.66205 moveto
+171.51953 398.66205 lineto
+171.51953 399.14252 lineto
+169.94043 399.14252 lineto
+169.94043 398.66205 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+172.45117 397.59271 moveto
+172.45117 397.05951 lineto
+176.20703 398.42181 lineto
+176.20703 398.90814 lineto
+172.45117 400.27045 lineto
+172.45117 399.73724 lineto
+175.46875 398.66791 lineto
+172.45117 397.59271 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+180.41406 399.92181 moveto
+180.41406 398.74701 lineto
+179.44727 398.74701 lineto
+179.44727 398.26068 lineto
+181 398.26068 lineto
+181 400.13861 lineto
+180.77148 400.30072 180.51953 400.42377 180.24414 400.50775 curveto
+179.96875 400.58978 179.6748 400.6308 179.3623 400.6308 curveto
+178.67871 400.6308 178.14355 400.43158 177.75684 400.03314 curveto
+177.37207 399.63275 177.17969 399.07611 177.17969 398.36322 curveto
+177.17969 397.64838 177.37207 397.09174 177.75684 396.6933 curveto
+178.14355 396.29291 178.67871 396.09272 179.3623 396.09271 curveto
+179.64746 396.09272 179.91797 396.12787 180.17383 396.19818 curveto
+180.43164 396.2685 180.66894 396.37201 180.88574 396.50873 curveto
+180.88574 397.13861 lineto
+180.66699 396.95307 180.43457 396.81342 180.18848 396.71967 curveto
+179.94238 396.62592 179.68359 396.57904 179.41211 396.57904 curveto
+178.87695 396.57904 178.47461 396.72846 178.20508 397.02728 curveto
+177.9375 397.32611 177.80371 397.77143 177.80371 398.36322 curveto
+177.80371 398.95307 177.9375 399.3974 178.20508 399.69623 curveto
+178.47461 399.99506 178.87695 400.14447 179.41211 400.14447 curveto
+179.62109 400.14447 179.80761 400.12689 179.97168 400.09174 curveto
+180.13574 400.05463 180.2832 399.99799 180.41406 399.92181 curveto
+fill
+grestore
+grestore
+gsave [1 -0.53423 0 1 0 0] concat
+gsave
+0 0 0 setrgbcolor
+newpath
+162.85449 535.59204 moveto
+165.36816 535.59204 lineto
+165.36816 536.09009 lineto
+163.44629 536.09009 lineto
+163.44629 537.37915 lineto
+165.18066 537.37915 lineto
+165.18066 537.8772 lineto
+163.44629 537.8772 lineto
+163.44629 539.96606 lineto
+162.85449 539.96606 lineto
+162.85449 535.59204 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+170.11426 537.01294 moveto
+167.09082 538.08813 lineto
+170.11426 539.15747 lineto
+170.11426 539.69067 lineto
+166.3584 538.32837 lineto
+166.3584 537.84204 lineto
+170.11426 536.47974 lineto
+170.11426 537.01294 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+171.04297 538.08228 moveto
+172.62207 538.08228 lineto
+172.62207 538.56274 lineto
+171.04297 538.56274 lineto
+171.04297 538.08228 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+173.55371 537.01294 moveto
+173.55371 536.47974 lineto
+177.30957 537.84204 lineto
+177.30957 538.32837 lineto
+173.55371 539.69067 lineto
+173.55371 539.15747 lineto
+176.57129 538.08813 lineto
+173.55371 537.01294 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+179.99609 536.17505 moveto
+179.19336 538.35181 lineto
+180.80176 538.35181 lineto
+179.99609 536.17505 lineto
+179.66211 535.59204 moveto
+180.33301 535.59204 lineto
+182 539.96606 lineto
+181.38477 539.96606 lineto
+180.98633 538.84399 lineto
+179.01465 538.84399 lineto
+178.61621 539.96606 lineto
+177.99219 539.96606 lineto
+179.66211 535.59204 lineto
+fill
+grestore
+grestore
+gsave [0.778729 1.35752 -0.171495 0.985185 0 0] concat
+gsave
+0 0 0 setrgbcolor
+newpath
+246.3611 71.909096 moveto
+249.12672 71.909096 lineto
+249.12672 72.407143 lineto
+246.9529 72.407143 lineto
+246.9529 73.702065 lineto
+249.0359 73.702065 lineto
+249.0359 74.200111 lineto
+246.9529 74.200111 lineto
+246.9529 75.785072 lineto
+249.17946 75.785072 lineto
+249.17946 76.283119 lineto
+246.3611 76.283119 lineto
+246.3611 71.909096 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+249.86208 74.39933 moveto
+251.44118 74.39933 lineto
+251.44118 74.879799 lineto
+249.86208 74.879799 lineto
+249.86208 74.39933 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+252.37282 73.329994 moveto
+252.37282 72.796791 lineto
+256.12868 74.159096 lineto
+256.12868 74.645424 lineto
+252.37282 76.007729 lineto
+252.37282 75.474525 lineto
+255.3904 74.40519 lineto
+252.37282 73.329994 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+258.8152 72.492104 moveto
+258.01247 74.668861 lineto
+259.62086 74.668861 lineto
+258.8152 72.492104 lineto
+258.48122 71.909096 moveto
+259.15211 71.909096 lineto
+260.81911 76.283119 lineto
+260.20387 76.283119 lineto
+259.80544 75.161049 lineto
+257.83376 75.161049 lineto
+257.43532 76.283119 lineto
+256.81129 76.283119 lineto
+258.48122 71.909096 lineto
+fill
+grestore
+grestore
+gsave [0.311433 -1.183861 0.643283 0.765628 0 0] concat
+gsave
+0 0 0 setrgbcolor
+newpath
+-108.94738 362.30954 moveto
+-109.75011 364.4863 lineto
+-108.14172 364.4863 lineto
+-108.94738 362.30954 lineto
+-109.28136 361.72653 moveto
+-108.61047 361.72653 lineto
+-106.94347 366.10056 lineto
+-107.55871 366.10056 lineto
+-107.95714 364.97848 lineto
+-109.92883 364.97848 lineto
+-110.32726 366.10056 lineto
+-110.95129 366.10056 lineto
+-109.28136 361.72653 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+-102.505 363.14743 moveto
+-105.52843 364.22263 lineto
+-102.505 365.29196 lineto
+-102.505 365.82516 lineto
+-106.26086 364.46286 lineto
+-106.26086 363.97653 lineto
+-102.505 362.61423 lineto
+-102.505 363.14743 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+-101.57628 364.21677 moveto
+-99.997182 364.21677 lineto
+-99.997182 364.69723 lineto
+-101.57628 364.69723 lineto
+-101.57628 364.21677 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+-99.065541 363.14743 moveto
+-99.065541 362.61423 lineto
+-95.309681 363.97653 lineto
+-95.309681 364.46286 lineto
+-99.065541 365.82516 lineto
+-99.065541 365.29196 lineto
+-96.047962 364.22263 lineto
+-99.065541 363.14743 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+-93.493274 362.21286 moveto
+-93.493274 365.61423 lineto
+-92.77843 365.61423 lineto
+-92.174917 365.61423 -91.733511 365.47751 -91.454211 365.20407 curveto
+-91.172965 364.93063 -91.03234 364.49899 -91.032336 363.90915 curveto
+-91.03234 363.32321 -91.172965 362.8945 -91.454211 362.62302 curveto
+-91.733511 362.34958 -92.174917 362.21286 -92.77843 362.21286 curveto
+-93.493274 362.21286 lineto
+-94.085071 361.72653 moveto
+-92.869251 361.72653 lineto
+-92.021597 361.72654 -91.399527 361.90329 -91.003039 362.2568 curveto
+-90.606559 362.60837 -90.408317 363.15915 -90.408313 363.90915 curveto
+-90.408317 364.66306 -90.607536 365.21677 -91.005969 365.57028 curveto
+-91.40441 365.9238 -92.025503 366.10056 -92.869251 366.10056 curveto
+-94.085071 366.10056 lineto
+-94.085071 361.72653 lineto
+fill
+grestore
+grestore
+gsave [1 -0.604907 0 1 0 0] concat
+gsave
+0 0 0 setrgbcolor
+newpath
+215.00391 552.41638 moveto
+214.20117 554.59314 lineto
+215.80957 554.59314 lineto
+215.00391 552.41638 lineto
+214.66992 551.83337 moveto
+215.34082 551.83337 lineto
+217.00781 556.2074 lineto
+216.39258 556.2074 lineto
+215.99414 555.08533 lineto
+214.02246 555.08533 lineto
+213.62402 556.2074 lineto
+213 556.2074 lineto
+214.66992 551.83337 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+221.44629 553.25427 moveto
+218.42285 554.32947 lineto
+221.44629 555.3988 lineto
+221.44629 555.93201 lineto
+217.69043 554.5697 lineto
+217.69043 554.08337 lineto
+221.44629 552.72107 lineto
+221.44629 553.25427 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+222.375 554.32361 moveto
+223.9541 554.32361 lineto
+223.9541 554.80408 lineto
+222.375 554.80408 lineto
+222.375 554.32361 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+224.88574 553.25427 moveto
+224.88574 552.72107 lineto
+228.6416 554.08337 lineto
+228.6416 554.5697 lineto
+224.88574 555.93201 lineto
+224.88574 555.3988 lineto
+227.90332 554.32947 lineto
+224.88574 553.25427 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+233.1416 552.17029 moveto
+233.1416 552.79431 lineto
+232.94238 552.60877 232.72949 552.4701 232.50293 552.3783 curveto
+232.27832 552.2865 232.03906 552.2406 231.78516 552.2406 curveto
+231.28515 552.2406 230.90234 552.39392 230.63672 552.70056 curveto
+230.37109 553.00525 230.23828 553.44666 230.23828 554.02478 curveto
+230.23828 554.60095 230.37109 555.04236 230.63672 555.349 curveto
+230.90234 555.65369 231.28515 555.80603 231.78516 555.80603 curveto
+232.03906 555.80603 232.27832 555.76013 232.50293 555.66833 curveto
+232.72949 555.57654 232.94238 555.43787 233.1416 555.25232 curveto
+233.1416 555.87048 lineto
+232.93457 556.01111 232.71484 556.11658 232.48242 556.18689 curveto
+232.25195 556.2572 232.00781 556.29236 231.75 556.29236 curveto
+231.08789 556.29236 230.5664 556.09021 230.18555 555.68591 curveto
+229.80469 555.27966 229.61426 554.72595 229.61426 554.02478 curveto
+229.61426 553.32166 229.80469 552.76795 230.18555 552.36365 curveto
+230.5664 551.9574 231.08789 551.75428 231.75 551.75427 curveto
+232.01172 551.75428 232.25781 551.78943 232.48828 551.85974 curveto
+232.7207 551.9281 232.93847 552.03162 233.1416 552.17029 curveto
+fill
+grestore
+grestore
+gsave [0.999917 0.215669 -0.01285755 0.997309 0 0] concat
+gsave
+0 0 0 setrgbcolor
+newpath
+236.00296 383.50913 moveto
+235.20022 385.68588 lineto
+236.80862 385.68588 lineto
+236.00296 383.50913 lineto
+235.66897 382.92612 moveto
+236.33987 382.92612 lineto
+238.00686 387.30014 lineto
+237.39163 387.30014 lineto
+236.99319 386.17807 lineto
+235.02151 386.17807 lineto
+234.62308 387.30014 lineto
+233.99905 387.30014 lineto
+235.66897 382.92612 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+242.44534 384.34702 moveto
+239.4219 385.42221 lineto
+242.44534 386.49155 lineto
+242.44534 387.02475 lineto
+238.68948 385.66245 lineto
+238.68948 385.17612 lineto
+242.44534 383.81381 lineto
+242.44534 384.34702 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+243.37405 385.41635 moveto
+244.95315 385.41635 lineto
+244.95315 385.89682 lineto
+243.37405 385.89682 lineto
+243.37405 385.41635 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+245.88479 384.34702 moveto
+245.88479 383.81381 lineto
+249.64064 385.17612 lineto
+249.64064 385.66245 lineto
+245.88479 387.02475 lineto
+245.88479 386.49155 lineto
+248.90236 385.42221 lineto
+245.88479 384.34702 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+251.45705 385.21127 moveto
+251.45705 386.81381 lineto
+252.40627 386.81381 lineto
+252.72462 386.81381 252.95998 386.74838 253.11232 386.61752 curveto
+253.26662 386.48471 253.34376 386.28256 253.34377 386.01108 curveto
+253.34376 385.73764 253.26662 385.53647 253.11232 385.40756 curveto
+252.95998 385.27671 252.72462 385.21128 252.40627 385.21127 curveto
+251.45705 385.21127 lineto
+251.45705 383.41245 moveto
+251.45705 384.73081 lineto
+252.33303 384.73081 lineto
+252.62209 384.73081 252.83693 384.6771 252.97756 384.56967 curveto
+253.12013 384.4603 253.19142 384.29429 253.19142 384.07163 curveto
+253.19142 383.85093 253.12013 383.68589 252.97756 383.57651 curveto
+252.83693 383.46714 252.62209 383.41245 252.33303 383.41245 curveto
+251.45705 383.41245 lineto
+250.86525 382.92612 moveto
+252.37697 382.92612 lineto
+252.82814 382.92612 253.1758 383.01987 253.41994 383.20737 curveto
+253.66408 383.39487 253.78615 383.66147 253.78615 384.00717 curveto
+253.78615 384.27475 253.72365 384.48765 253.59865 384.64585 curveto
+253.47365 384.80405 253.29005 384.90268 253.04787 384.94174 curveto
+253.33888 385.00425 253.56447 385.13511 253.72463 385.33432 curveto
+253.88673 385.53159 253.96779 385.77866 253.96779 386.07553 curveto
+253.96779 386.46616 253.83497 386.76791 253.56935 386.9808 curveto
+253.30372 387.1937 252.9258 387.30014 252.43556 387.30014 curveto
+250.86525 387.30014 lineto
+250.86525 382.92612 lineto
+fill
+grestore
+grestore
+gsave [0.583946 -0.983221 0.504158 0.863611 0 0] concat
+gsave
+0 0 0 setrgbcolor
+newpath
+-12.777346 529.15479 moveto
+-12.185549 529.15479 lineto
+-12.185549 530.94775 lineto
+-10.035158 530.94775 lineto
+-10.035158 529.15479 lineto
+-9.4433613 529.15479 lineto
+-9.4433613 533.52881 lineto
+-10.035158 533.52881 lineto
+-10.035158 531.4458 lineto
+-12.185549 531.4458 lineto
+-12.185549 533.52881 lineto
+-12.777346 533.52881 lineto
+-12.777346 529.15479 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+-4.4628925 530.57568 moveto
+-7.48633 531.65088 lineto
+-4.4628925 532.72021 lineto
+-4.4628925 533.25342 lineto
+-8.2187519 531.89111 lineto
+-8.2187519 531.40479 lineto
+-4.4628925 530.04248 lineto
+-4.4628925 530.57568 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+-3.5341816 531.64502 moveto
+-1.95508 531.64502 lineto
+-1.95508 532.12549 lineto
+-3.5341816 532.12549 lineto
+-3.5341816 531.64502 lineto
+fill
+grestore
+gsave
+0 0 0 setrgbcolor
+newpath
+-0.68945503 531.43994 moveto
+-0.68945503 533.04248 lineto
+0.25976372 533.04248 lineto
+0.57812064 533.04248 0.81347197 532.97705 0.96581841 532.84619 curveto
+1.1201123 532.71338 1.1972607 532.51123 1.1972637 532.23975 curveto
+1.1972607 531.96631 1.1201123 531.76514 0.96581841 531.63623 curveto
+0.81347197 531.50537 0.57812064 531.43994 0.25976372 531.43994 curveto
+-0.68945503 531.43994 lineto
+-0.68945503 529.64111 moveto
+-0.68945503 530.95947 lineto
+0.18652153 530.95947 lineto
+0.47558168 530.95948 0.69042522 530.90576 0.83105278 530.79834 curveto
+0.97362806 530.68897 1.0449171 530.52295 1.04492 530.30029 curveto
+1.0449171 530.07959 0.97362806 529.91455 0.83105278 529.80518 curveto
+0.69042522 529.6958 0.47558168 529.64112 0.18652153 529.64111 curveto
+-0.68945503 529.64111 lineto
+-1.2812519 529.15479 moveto
+0.23046684 529.15479 lineto
+0.68163617 529.15479 1.0292921 529.24854 1.2734356 529.43604 curveto
+1.5175728 529.62354 1.639643 529.89014 1.6396465 530.23584 curveto
+1.639643 530.50342 1.5771431 530.71631 1.4521465 530.87451 curveto
+1.3271433 531.03272 1.1435498 531.13135 0.90136528 531.17041 curveto
+1.1923778 531.23291 1.4179636 531.36377 1.5781231 531.56299 curveto
+1.7402289 531.76026 1.8212835 532.00733 1.8212872 532.3042 curveto
+1.8212835 532.69483 1.6884711 532.99658 1.4228497 533.20947 curveto
+1.1572216 533.42236 0.77929232 533.52881 0.28906059 533.52881 curveto
+-1.2812519 533.52881 lineto
+-1.2812519 529.15479 lineto
+fill
+grestore
+grestore
+grestore
+showpage
+%%EndDocument
+%%Trailer
+cleartomark countdictstack exch sub { end } repeat restore
+%%EOF

Added: trunk/core/org.cishell.docs/src/img/conversionGraph.pdf
===================================================================
(Binary files differ)


Property changes on: trunk/core/org.cishell.docs/src/img/conversionGraph.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/core/org.cishell.docs/src/img/conversionGraph.svg
===================================================================
--- trunk/core/org.cishell.docs/src/img/conversionGraph.svg	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/img/conversionGraph.svg	2008-01-11 21:53:34 UTC (rev 596)
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg28141"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/bherr/cishell-workspace/org.cishell.docs/src/img"
+   sodipodi:docname="conversionGraph.svg"
+   inkscape:export-filename="/home/bherr/workspace/org.cishell.docs.intro/src/graphics/conversionGraph.png"
+   inkscape:export-xdpi="1522.2271"
+   inkscape:export-ydpi="1522.2271">
+  <defs
+     id="defs28143" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.4472044"
+     inkscape:cx="318.86479"
+     inkscape:cy="612.18474"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1132"
+     inkscape:window-x="1920"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata28146">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="200.1622"
+       y="442.59271"
+       id="text28149"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="200.1622"
+         y="442.59271"
+         id="tspan28153">A</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="256.9375"
+       y="451.36218"
+       id="text28171"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="256.9375"
+         y="451.36218"
+         id="tspan28173">B</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="254.59375"
+       y="421.19421"
+       id="text28175"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="254.59375"
+         y="421.19421"
+         id="tspan28177">C</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="167.25845"
+       y="405.18619"
+       id="text28179"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="167.25845"
+         y="405.18619"
+         id="tspan28181">E</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="220.05486"
+       y="387.49069"
+       id="text28183"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="220.05486"
+         y="387.49069"
+         id="tspan28185">D</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="151.0134"
+       y="471.32675"
+       id="text28187"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="151.0134"
+         y="471.32675"
+         id="tspan28189">F</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="199.55078"
+       y="479.73938"
+       id="text28191"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="199.55078"
+         y="479.73938"
+         id="tspan28193">G</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="243.55215"
+       y="473.64746"
+       id="text28195"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="243.55215"
+         y="473.64746"
+         id="tspan28197">H</tspan></text>
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 208,439.36218 C 254,439.36218 255,447.36218 255,447.36218"
+       id="path28199" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 206.54418,435.92063 C 246.57662,406.91162 253,415.36218 253,415.36218"
+       id="path28201" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 203,432.36218 C 206,382.36218 216,384.36218 216,384.36218"
+       id="path28203" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 198,434.36218 C 181,392.36218 174,401.36218 174,401.36218"
+       id="path28205" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 197,442.36218 C 152,455.36218 156,463.36218 156,463.36218"
+       id="path28207" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 260,454.36218 C 256.43969,474.36218 251,470.36218 251,470.36218"
+       id="path28211" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 156,469.36218 C 197.55139,489.8774 200,481.36218 200,481.36218"
+       id="path28213" />
+    <text
+       xml:space="preserve"
+       style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="161.16309"
+       y="400.54584"
+       id="text28215"
+       sodipodi:linespacing="125%"
+       transform="matrix(1,0.489579,0,1,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan28217"
+         x="161.16309"
+         y="400.54584">F&lt;-&gt;G</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="162.26562"
+       y="539.96606"
+       id="text28219"
+       sodipodi:linespacing="125%"
+       transform="matrix(1,-0.53423,0,1,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan28221"
+         x="162.26562"
+         y="539.96606">F&lt;-&gt;A</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="245.77223"
+       y="76.283119"
+       id="text28223"
+       sodipodi:linespacing="125%"
+       transform="matrix(0.778729,1.35752,-0.171495,0.985185,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan28225"
+         x="245.77223"
+         y="76.283119">E-&gt;A</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:6.00000143px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-110.99816"
+       y="366.10056"
+       id="text28227"
+       sodipodi:linespacing="125%"
+       transform="matrix(0.311433,-1.183861,0.643283,0.765628,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan28229"
+         x="-110.99816"
+         y="366.10056">A&lt;-&gt;D</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="212.95312"
+       y="556.2074"
+       id="text28231"
+       sodipodi:linespacing="125%"
+       transform="matrix(1,-0.604907,0,1,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan28233"
+         x="212.95312"
+         y="556.2074">A&lt;-&gt;C</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:5.99999571px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="233.95218"
+       y="387.30014"
+       id="text28235"
+       sodipodi:linespacing="125%"
+       transform="matrix(0.999917,0.215669,-1.285755e-2,0.997309,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan28237"
+         x="233.95218"
+         y="387.30014">A&lt;-&gt;B</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:6px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-13.366213"
+       y="533.52881"
+       id="text28239"
+       sodipodi:linespacing="125%"
+       transform="matrix(0.583946,-0.983221,0.504158,0.863611,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan28241"
+         x="-13.366213"
+         y="533.52881">H&lt;-B</tspan></text>
+  </g>
+</svg>


Property changes on: trunk/core/org.cishell.docs/src/img/conversionGraph.svg
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: trunk/core/org.cishell.docs/src/specification/main.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/main.tex	2008-01-10 20:59:40 UTC (rev 595)
+++ trunk/core/org.cishell.docs/src/specification/main.tex	2008-01-11 21:53:34 UTC (rev 596)
@@ -45,10 +45,10 @@
 
 %% Each service gets its own tex file
 \input{./tex/dataconversionservice.tex}
-\input{./tex/datamanagerservice.tex}
 \input{./tex/guibuilderservice.tex}
 \input{./tex/logservice.tex}
 \input{./tex/preferencesservice.tex}
+\input{./tex/datamanagerservice.tex}
 \input{./tex/schedulerservice.tex}
 
 % Bibliography:

Modified: trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex	2008-01-10 20:59:40 UTC (rev 595)
+++ trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex	2008-01-11 21:53:34 UTC (rev 596)
@@ -62,4 +62,7 @@
 \comments{Lots more to do here. Need to define what is/isn't mandatory for each
 algorithm type. Perhaps some figures\ldots}
 
+\subsubsection{Standard Algorithm Constraints}
+\label{algConstraints}
 
+

Modified: trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex	2008-01-10 20:59:40 UTC (rev 595)
+++ trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex	2008-01-11 21:53:34 UTC (rev 596)
@@ -1,5 +1,113 @@
 \chapter{Data Conversion Service Specification}
 \section*{\textit{Version 1.0}}
 \section{Introduction}
+
+A conscious design decision was made for CIShell not to enforce a central data
+model/format that all algorithms had to work with. Instead, an algorithm
+expresses in its service metadata for each data item coming into and out of the
+algorithm what the format of the data is. It is the job of the code calling the
+algorithm to get the data in the right format before calling the algorithm. The
+Data Conversion Service is used here to simplify the process of converting data.
+
+\subsection{Entities}
+
+\begin{itemize}
+  \item \textit{DataConversionService} - The service interface for converting
+  data to different formats.
+  \item \textit{Converter Algorithm} - A special type of algorithm which
+  converts data from one format to another.
+  \item \textit{Converter} - The interface for a wrapped set of converter
+  algorithms returned by the \class{DataConversionService} that will convert
+  data from one format to another.
+  \item \textit{Validator} - A special type of converter algorithm which checks
+  a specified file to see if it is a particular file format. 
+\end{itemize}
+
 \section{Data Conversion Service}
+
+The Data Conversion Service provides unified access to converter algorithms.
+\class{DataConversionService} system developers may choose not to use converter
+algorithms, but is ill-advised. Also, good implementations will take advantage of
+the nature of algorithms to allow for more than just single hop conversions.
+Since all converter algorithms specify a single data object in and a single data
+object out, a graph can be constructed where nodes are the data formats and edges
+are the converters. Using this directed grap...
 
[truncated message content]

[CIShell-SVN] SF.net SVN: cishell: [595] trunk/clients/gui/org.cishell.reference.gui. menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper .java

From: <mwl...@us...> - 2008-01-10 20:59:49

Revision: 595
          http://cishell.svn.sourceforge.net/cishell/?rev=595&view=rev
Author:   mwlinnem
Date:     2008-01-10 12:59:40 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
Now throws exception if, in a chain of conversion, a non-terminal converter returns a null result. This is so that the error is pre-emptively caught, as oppose to feeding that null value to the next converter while will inevitably choke on it.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java

Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java	2008-01-09 22:33:54 UTC (rev 594)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java	2008-01-10 20:59:40 UTC (rev 595)
@@ -78,6 +78,14 @@
             for (int i=0; i < data.length; i++) {
                 if (converters[i] != null) {
                     data[i] = converters[i][0].convert(data[i]);
+    
+                    if (data[i] == null && i < (data.length - 1)) {
+                    	Exception e = 
+                    		new Exception("The converter " + 
+                    				converters[i].getClass().getName() +
+                    				" returned a null result where data was expected.");
+                    	throw e;
+                    }
                     converters[i] = null;
                 }
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [594] trunk/core/org.cishell.docs/src

From: <bh...@us...> - 2008-01-09 22:34:02

Revision: 594
          http://cishell.svn.sourceforge.net/cishell/?rev=594&view=rev
Author:   bh2
Date:     2008-01-09 14:33:54 -0800 (Wed, 09 Jan 2008)

Log Message:
-----------
Most of org.cishell.framework part of the spec has been rough drafted. 
Still need to work on algorithm service properties and data properties.
Next I'll start drafting the cishell services.

Modified Paths:
--------------
    trunk/core/org.cishell.docs/src/img/algExecWorkflow.dia
    trunk/core/org.cishell.docs/src/img/algExecWorkflow.eps
    trunk/core/org.cishell.docs/src/img/algExecWorkflow.pdf
    trunk/core/org.cishell.docs/src/mystyle.sty
    trunk/core/org.cishell.docs/src/specification/main.tex
    trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex
    trunk/core/org.cishell.docs/src/specification/tex/data.tex
    trunk/core/org.cishell.docs/src/specification/tex/framework.tex
    trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex
    trunk/core/org.cishell.docs/src/specification/tex/introduction.tex
    trunk/core/org.cishell.docs/src/texdoclet/src/org/wonderly/doclets/TexDoclet.java

Modified: trunk/core/org.cishell.docs/src/img/algExecWorkflow.dia
===================================================================
(Binary files differ)

Modified: trunk/core/org.cishell.docs/src/img/algExecWorkflow.eps
===================================================================
--- trunk/core/org.cishell.docs/src/img/algExecWorkflow.eps	2008-01-09 00:57:19 UTC (rev 593)
+++ trunk/core/org.cishell.docs/src/img/algExecWorkflow.eps	2008-01-09 22:33:54 UTC (rev 594)
@@ -1,11 +1,11 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: /home/bherr/cishell-workspace/org.cishell.docs/src/img/algExecWorkflow.dia
 %%Creator: Dia v0.95
-%%CreationDate: Tue Jan  8 19:30:54 2008
+%%CreationDate: Wed Jan  9 10:58:56 2008
 %%For: bherr
 %%Orientation: Portrait
 %%Magnification: 1.0000
-%%BoundingBox: 0 0 1146 213
+%%BoundingBox: 0 0 1146 381
 %%BeginSetup
 %%EndSetup
 %%EndComments
@@ -341,7 +341,7 @@
     currentdict end
 definefont pop
 28.346000 -28.346000 scale
--3.052329 -20.889765 translate
+-3.052330 -20.889800 translate
 %%EndProlog
 
 
@@ -369,32 +369,32 @@
 [] 0 sd
 0 slj
 0 slc
-n 27.273560 17.145000 m 23.346440 17.145000 l 23.346440 17.144000 l 22.555758 17.144000 l s
+n 27.273500 17.145000 m 23.346400 17.145000 l 23.346400 17.144000 l 22.558300 17.144000 l s
 /Courier-latin1 ff 0.560000 scf sf
-(Creates) 23.446440 16.994500 m gs 1 -1 sc sh gr
-n 25.996440 16.994500 m 25.996440 16.594500 l 26.396440 16.794500 l ef
-(1) dup sw 27.073560 ex sub 16.995000 m gs 1 -1 sc sh gr
-(1) 22.755758 16.994000 m gs 1 -1 sc sh gr
+(creates) 23.446400 16.994500 m gs 1 -1 sc sh gr
+n 25.996400 16.994500 m 25.996400 16.594500 l 26.396400 16.794500 l ef
+(1) dup sw 27.073500 ex sub 16.995000 m gs 1 -1 sc sh gr
+(1) 22.758300 16.994000 m gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 1.000000 1.000000 1.000000 srgb
-n 4.665347 13.448391 m 4.665347 15.648391 l 9.715347 15.648391 l 9.715347 13.448391 l f
+n 4.652850 16.044700 m 4.652850 18.244700 l 9.702850 18.244700 l 9.702850 16.044700 l f
 0.000000 0.000000 0.000000 srgb
-n 4.665347 13.448391 m 4.665347 15.648391 l 9.715347 15.648391 l 9.715347 13.448391 l cp s
+n 4.652850 16.044700 m 4.652850 18.244700 l 9.702850 18.244700 l 9.702850 16.044700 l cp s
 /Courier-latin1 ff 0.560000 scf sf
-(<<interface>>) dup sw 2 div 7.190347 ex sub 14.098391 m gs 1 -1 sc sh gr
+(<<interface>>) dup sw 2 div 7.177850 ex sub 16.694700 m gs 1 -1 sc sh gr
 /Helvetica-Bold-latin1 ff 0.700000 scf sf
-(Data) dup sw 2 div 7.190347 ex sub 15.098391 m gs 1 -1 sc sh gr
+(Data) dup sw 2 div 7.177850 ex sub 17.694700 m gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 1.000000 1.000000 1.000000 srgb
-n 3.102329 18.639765 m 3.102329 20.839765 l 9.702329 20.839765 l 9.702329 18.639765 l f
+n 3.102330 18.639800 m 3.102330 20.839800 l 9.702330 20.839800 l 9.702330 18.639800 l f
 0.000000 0.000000 0.000000 srgb
-n 3.102329 18.639765 m 3.102329 20.839765 l 9.702329 20.839765 l 9.702329 18.639765 l cp s
+n 3.102330 18.639800 m 3.102330 20.839800 l 9.702330 20.839800 l 9.702330 18.639800 l cp s
 /Courier-latin1 ff 0.560000 scf sf
-(<<interface>>) dup sw 2 div 6.402329 ex sub 19.289765 m gs 1 -1 sc sh gr
+(<<interface>>) dup sw 2 div 6.402330 ex sub 19.289800 m gs 1 -1 sc sh gr
 /Helvetica-Bold-latin1 ff 0.700000 scf sf
-(CIShellContext) dup sw 2 div 6.402329 ex sub 20.289765 m gs 1 -1 sc sh gr
+(CIShellContext) dup sw 2 div 6.402330 ex sub 20.289800 m gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 [] 0 sd
@@ -406,56 +406,137 @@
 [] 0 sd
 0 slj
 0 slc
-n 9.702329 19.739765 m 11.446440 19.739765 l 11.446440 17.144000 l 14.958000 17.144000 l s
+n 9.702330 19.739800 m 11.446400 19.739800 l 11.446400 17.144000 l 14.958000 17.144000 l s
 /Courier-latin1 ff 0.560000 scf sf
-(1) 9.902329 19.589765 m gs 1 -1 sc sh gr
+(1) 9.902330 19.589800 m gs 1 -1 sc sh gr
 (1) dup sw 14.758000 ex sub 16.994000 m gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 0 slj
 0 slc
-n 9.715347 14.548391 m 11.446440 14.548391 l 11.446440 17.144000 l 14.958000 17.144000 l s
+n 9.702850 17.144700 m 11.777300 17.144700 l 11.777300 17.144000 l 14.958000 17.144000 l s
 /Courier-latin1 ff 0.560000 scf sf
-(0..n) 9.915347 14.398391 m gs 1 -1 sc sh gr
+(given) 11.877300 16.994350 m gs 1 -1 sc sh gr
+n 13.727300 16.994350 m 13.727300 16.594350 l 14.127300 16.794350 l ef
+(0..n) 9.902850 16.994700 m gs 1 -1 sc sh gr
 (1) dup sw 14.758000 ex sub 16.994000 m gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 1.000000 1.000000 1.000000 srgb
-n 4.663538 16.042763 m 4.663538 18.242763 l 9.713538 18.242763 l 9.713538 16.042763 l f
+n 4.651040 13.330300 m 4.651040 15.530300 l 9.701040 15.530300 l 9.701040 13.330300 l f
 0.000000 0.000000 0.000000 srgb
-n 4.663538 16.042763 m 4.663538 18.242763 l 9.713538 18.242763 l 9.713538 16.042763 l cp s
+n 4.651040 13.330300 m 4.651040 15.530300 l 9.701040 15.530300 l 9.701040 13.330300 l cp s
 /Courier-latin1 ff 0.560000 scf sf
-(<<interface>>) dup sw 2 div 7.188538 ex sub 16.692763 m gs 1 -1 sc sh gr
+(<<interface>>) dup sw 2 div 7.176040 ex sub 13.980300 m gs 1 -1 sc sh gr
 /Helvetica-Bold-latin1 ff 0.700000 scf sf
-(Dictionary) dup sw 2 div 7.188538 ex sub 17.692763 m gs 1 -1 sc sh gr
+(Dictionary) dup sw 2 div 7.176040 ex sub 14.980300 m gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 0 slj
 0 slc
-n 9.763802 17.142763 m 11.761822 17.142763 l 11.761822 17.144000 l 14.958000 17.144000 l s
+n 9.751110 14.430300 m 11.452300 14.430300 l 11.452300 17.144000 l 14.958000 17.144000 l s
 /Courier-latin1 ff 0.560000 scf sf
-(given) 11.861822 16.993381 m gs 1 -1 sc sh gr
-n 13.711822 16.993381 m 13.711822 16.593381 l 14.111822 16.793381 l ef
-(1) 9.963802 16.992763 m gs 1 -1 sc sh gr
+(1) 9.951110 14.280300 m gs 1 -1 sc sh gr
 (1) dup sw 14.758000 ex sub 16.994000 m gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 1.000000 1.000000 1.000000 srgb
-n 38.373025 16.043657 m 38.373025 18.243657 l 43.423025 18.243657 l 43.423025 16.043657 l f
+n 38.373000 16.043700 m 38.373000 18.243700 l 43.423000 18.243700 l 43.423000 16.043700 l f
 0.000000 0.000000 0.000000 srgb
-n 38.373025 16.043657 m 38.373025 18.243657 l 43.423025 18.243657 l 43.423025 16.043657 l cp s
+n 38.373000 16.043700 m 38.373000 18.243700 l 43.423000 18.243700 l 43.423000 16.043700 l cp s
 /Courier-latin1 ff 0.560000 scf sf
-(<<interface>>) dup sw 2 div 40.898025 ex sub 16.693657 m gs 1 -1 sc sh gr
+(<<interface>>) dup sw 2 div 40.898000 ex sub 16.693700 m gs 1 -1 sc sh gr
 /Helvetica-Bold-latin1 ff 0.700000 scf sf
-(Data) dup sw 2 div 40.898025 ex sub 17.693657 m gs 1 -1 sc sh gr
+(Data) dup sw 2 div 40.898000 ex sub 17.693700 m gs 1 -1 sc sh gr
 0.100000 slw
 [] 0 sd
 0 slj
 0 slc
-n 38.323936 17.143657 m 33.196440 17.143657 l 33.196440 17.145000 l 32.368000 17.145000 l s
+n 38.323900 17.143700 m 33.196400 17.143700 l 33.196400 17.145000 l 32.368000 17.145000 l s
 /Courier-latin1 ff 0.560000 scf sf
-(Creates) 33.296440 16.994328 m gs 1 -1 sc sh gr
-n 35.846440 16.994328 m 35.846440 16.594328 l 36.246440 16.794328 l ef
-(0..n) dup sw 38.123936 ex sub 16.993657 m gs 1 -1 sc sh gr
+(creates) 33.296400 16.994350 m gs 1 -1 sc sh gr
+n 35.846400 16.994350 m 35.846400 16.594350 l 36.246400 16.794350 l ef
+(0..n) dup sw 38.123900 ex sub 16.993700 m gs 1 -1 sc sh gr
 (1) 32.568000 16.995000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 14.842100 7.525020 m 14.842100 9.725020 l 22.392100 9.725020 l 22.392100 7.525020 l f
+0.000000 0.000000 0.000000 srgb
+n 14.842100 7.525020 m 14.842100 9.725020 l 22.392100 9.725020 l 22.392100 7.525020 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 18.617100 ex sub 8.175020 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(AlgorithmFactory) dup sw 2 div 18.617100 ex sub 9.175020 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 27.902100 7.526020 m 27.902100 9.726020 l 35.802100 9.726020 l 35.802100 7.526020 l f
+0.000000 0.000000 0.000000 srgb
+n 27.902100 7.526020 m 27.902100 9.726020 l 35.802100 9.726020 l 35.802100 7.526020 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 31.852100 ex sub 8.176020 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(MetaTypeProvider) dup sw 2 div 31.852100 ex sub 9.176020 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 27.852214 8.626020 m 23.434100 8.626020 l 23.434100 8.625020 l 22.442123 8.625020 l s
+/Courier-latin1 ff 0.560000 scf sf
+(provides) 23.534100 8.475520 m gs 1 -1 sc sh gr
+n 26.434100 8.475520 m 26.434100 8.075520 l 26.834100 8.275520 l ef
+(1) dup sw 27.652214 ex sub 8.476020 m gs 1 -1 sc sh gr
+(1) 22.642123 8.475020 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 4.595000 7.525000 m 4.595000 9.725000 l 9.645000 9.725000 l 9.645000 7.525000 l f
+0.000000 0.000000 0.000000 srgb
+n 4.595000 7.525000 m 4.595000 9.725000 l 9.645000 9.725000 l 9.645000 7.525000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 7.120000 ex sub 8.175000 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(Data) dup sw 2 div 7.120000 ex sub 9.175000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slj
+0 slc
+n 22.510300 8.794320 m 21.415600 9.834120 l 22.509600 9.834120 l ef
+n 22.510300 8.794320 m 21.415600 9.834120 l 22.509600 9.834120 l cp s
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 9.645000 8.625000 m 11.534100 8.625000 l 11.534100 8.625020 l 14.842100 8.625020 l s
+/Courier-latin1 ff 0.560000 scf sf
+(given) 11.634100 8.475010 m gs 1 -1 sc sh gr
+n 13.484100 8.475010 m 13.484100 8.075010 l 13.884100 8.275010 l ef
+(0..n) 9.845000 8.475000 m gs 1 -1 sc sh gr
+(1) dup sw 14.642100 ex sub 8.475020 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 37.470200 7.774310 m 42.670200 7.774310 l 43.270200 8.374310 l 43.270200 9.474310 l 37.470200 9.474310 l ef
+0.000000 0.000000 0.000000 srgb
+n 37.470200 7.774310 m 42.670200 7.774310 l 43.270200 8.374310 l 43.270200 9.474310 l 37.470200 9.474310 l cp s
+0.050000 slw
+n 42.670200 7.774310 m 42.670200 8.374310 l 43.270200 8.374310 l s
+/Courier-latin1 ff 0.560000 scf sf
+(Get User Input) 37.820200 8.974310 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 35.852423 8.626020 m 37.201100 8.626020 l 37.201100 8.624310 l 37.420059 8.624310 l s
+/Courier-latin1 ff 0.560000 scf sf
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 40.370200 9.522621 m 40.370200 12.650000 l 7.176040 12.650000 l 7.176040 13.330300 l s
+/Courier-latin1 ff 0.560000 scf sf
+(creates) dup sw 2 div 23.773120 ex sub 12.500000 m gs 1 -1 sc sh gr
+n 22.348120 12.500000 m 22.348120 12.100000 l 21.948120 12.300000 l ef
 showpage

Modified: trunk/core/org.cishell.docs/src/img/algExecWorkflow.pdf
===================================================================
(Binary files differ)

Modified: trunk/core/org.cishell.docs/src/mystyle.sty
===================================================================
--- trunk/core/org.cishell.docs/src/mystyle.sty	2008-01-09 00:57:19 UTC (rev 593)
+++ trunk/core/org.cishell.docs/src/mystyle.sty	2008-01-09 22:33:54 UTC (rev 594)
@@ -1,3 +1,4 @@
 % used for custom commands
 \definecolor{comment}{rgb}{1,0,0}
 \newcommand{\comments}[1]{\textbf{\textcolor{comment}{#1}}}
+\newcommand{\class}[1]{\texttt{#1}}
\ No newline at end of file

Modified: trunk/core/org.cishell.docs/src/specification/main.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/main.tex	2008-01-09 00:57:19 UTC (rev 593)
+++ trunk/core/org.cishell.docs/src/specification/main.tex	2008-01-09 22:33:54 UTC (rev 594)
@@ -10,15 +10,18 @@
 \usepackage{color}
 
 \hypersetup{
-    pdftitle={CIShell Specification},    % title
-    pdfsubject={CIShell Specification},
-    pdfauthor={},
+    pdftitle={Cyberinfrastructure Shell (CIShell) Core Specification 1.0},    %
+    title pdfsubject={Cyberinfrastructure Shell (CIShell) Core Specification
+    1.0}, 
+    pdfauthor={}, 
     pdfnewwindow=true,      % links in new window
 }
 
 \usepackage{../mystyle}
 
-\title{CIShell Specification \\
+\title{Cyberinfrastructure Shell (CIShell) \\
+Core Specification \\
+1.0 \\
 \textbf{DRAFT}}
 % \author{} % Will fill in later 
 % \date{} % ditto
@@ -37,6 +40,8 @@
 \input{./tex/data.tex}
 \input{./tex/guidefinition.tex}
 \orgcishellframework{}
+\orgcishellframeworkalgorithm{}
+\orgcishellframeworkdata{}
 
 %% Each service gets its own tex file
 \input{./tex/dataconversionservice.tex}

Modified: trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex	2008-01-09 00:57:19 UTC (rev 593)
+++ trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex	2008-01-09 22:33:54 UTC (rev 594)
@@ -7,16 +7,30 @@
 The CIShell Platform has been specifically designed around the idea of the
 algorithm. It is the central and most important concept. Algorithms are fully
 defined and self-contained bits of execution. They can do many things from data
-conversion, data analysis, and can even spawn whole outside programs if needs be.
-Algorithms are very well defined black boxes in that what can come into and out
-of the algorithm is specified in each algorithm's metadata. Other than that,
+conversion, data analysis, and can even spawn whole outside programs if it needs
+to. Algorithms are very well defined black boxes in that what can come into and
+out of the algorithm is specified in each algorithm's metadata. Other than that,
 CIShell makes no attempt to understand the algorithm.
 
-Figure \ref{fig:algExecWorkflow} shows the flow of information into and out of an
-algorithm. Here an algorithm is passed zero or more pieces of data, any
-user-entered parameters, and a CIShell context. The algorithm is then executed
-and produces zero or more pieces of data.
+To be recognized by CIShell, an \class{AlgorithmFactory} must be registered with
+OSGi's Service Registry. The service registry requires three things when
+registering: An interface (\class{AlgorithmFactory}), an implementation, and a
+\class{Dictionary} of metadata. The algorithm developer provides the
+implementation and metadata. The metadata helps to differentiate and define the
+algorithm for search and discovery, see section \ref{algMetaData}.
 
+An algorithm defines its inputs in two ways. First, the input data is defined in
+the algorithm's service metadata. Second, the acceptable user-entered parameters
+are defined in a \class{MetaTypeProvider}, see section \ref{GUISpec}.
+
+Figure \ref{fig:algExecWorkflow} shows the typical flow of information into and
+out of an algorithm. First the input parameter specification is pulled from the
+\class{AlgorithmFactory}. If parameters are needed, then a UI is created and user
+inputs are entered. To create an \class{Algorithm}, the \class{AlgorithmFactory}
+is passed the user-entered parameters, zero or more pieces of data, and a
+\class{CIShellContext}. The \class{Algorithm} is then executed and produces zero
+or more pieces of data.
+
 \begin{figure}[htb!]
 \centering
 \includegraphics[width=150mm]{../img/algExecWorkflow.pdf}
@@ -24,12 +38,28 @@
 \label{fig:algExecWorkflow}
 \end{figure}
 
-An algorithm defines its inputs in two ways. First, the input Data is defined
-in the algorithm's service metadata. Second, the acceptable user-entered
-parameters are defined in a MetaTypeProvider. This MetaTypeProvider defines the
-types, value range, and textual description of the parameters needed. From this
-information, a user interface (UI) can be created that asks a user for the
-data.
+\subsection{Optional Interfaces}
 
-\subsection{Standard Algorithm Properties}
-\orgcishellframeworkalgorithm{}
+Algorithm developers may augment algorithms with additional interfaces to enhance
+parts of the execution workflow. An \class{AlgorithmFactory} can also implement
+the \class{DataValidator} interface to validate the data beyond the data format
+validation that an application should provide ahead of time. An \class{Algorithm}
+can implement \class{ProgressTrackable} to allow for more detailed monitoring and
+control of an \class{Algorithm}'s progress while executing. See each interface's
+documentation for more details.
+
+\subsection{Algorithm Service Metadata}
+\label{algMetaData}
+
+When an algorithm is registered with OSGi's service registry, a dictionary of
+metadata is provided. Since the algorithm itself is a black box, the metadata is
+used to provide information about the algorithm. Information such as the format
+of each \class{Data} item to be inputted and outputted is provided. In addition to the
+mechanics of the algorithms, interesting data such as the authors, label, urls,
+and description are provided. This metadata can be searched by anyone using
+OSGi's service registry to find relevant algorithms for use.
+
+\comments{Lots more to do here. Need to define what is/isn't mandatory for each
+algorithm type. Perhaps some figures\ldots}
+
+

Modified: trunk/core/org.cishell.docs/src/specification/tex/data.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/data.tex	2008-01-09 00:57:19 UTC (rev 593)
+++ trunk/core/org.cishell.docs/src/specification/tex/data.tex	2008-01-09 22:33:54 UTC (rev 594)
@@ -1,5 +1,16 @@
 \section{Data Specification}
 \subsection*{\textit{Version 1.0}}
 \subsection{Introduction}
-\subsection{Standard Data Properties}
-\orgcishellframeworkdata{}
+
+Data to be operated on is passed around in \class{Data} objects which hold the
+real data, the data's format, and its properties (metadata). The data can be any
+Java \class{Object}. The format is a string which is either a full Java class or
+a mime type if it is a \class{java.lang.File}. The mime type corresponds to the
+file's data type and has the following form - ``file:mime/type''. Note that if no
+official mime type is available for a file format, a made up one can be used, but
+must still conform to how mime types are constructed, see \comments{reference to
+mime-type construction}. Finally, the properties help describe the data. The
+label to give the data, the parent \class{Data} object from which it was derived
+from, and a coarse data type can all be defined in the \class{Data}'s properties.
+See the \class{DataProperty} interface definition for specific properties to use.
+

Modified: trunk/core/org.cishell.docs/src/specification/tex/framework.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/framework.tex	2008-01-09 00:57:19 UTC (rev 593)
+++ trunk/core/org.cishell.docs/src/specification/tex/framework.tex	2008-01-09 22:33:54 UTC (rev 594)
@@ -4,11 +4,12 @@
 
 \section{Introduction}
 
-The org.cishell.framework package and subpackages define the core of CIShell. The
-key components being algorithms, data, and CIShell service access.
+The \class{org.cishell.framework} package and subpackages define the core of
+CIShell. The key components being algorithms, data, and CIShell service access.
 
 \subsection{Essentials}
 
+\comments{Needs work}
 \begin{itemize}
   \item \textit{Application Independence} - Algorithms must be usable in a wide
   variety of contexts and should not be tied to any one front end where
@@ -23,30 +24,33 @@
 
 \begin{itemize}
   \item \textit{AlgorithmFactory} - The service interface for algorithms.
-  A factory class which creates an Algorithm for execution from input data.
+  A factory class which creates an \class{Algorithm} for execution from input
+  data.
   \item \textit{Algorithm} - The interface for the code execution part of the
   algorithm.
   \item \textit{AlgorithmProperty} - The interface which provides string
   constants for an algorithm's service metadata.
-  \item \textit{DataValidator} - The interface an AlgorithmFactory extends to
-  provide additional data validation in addition to the data format validation
+  \item \textit{DataValidator} - The interface an \class{AlgorithmFactory}
+  extends to provide additional data validation in addition to the data format validation
   that an application should provide ahead of time.
-  \item \textit{ProgressTrackable} - The interface an Algorithm extends to allow
-  for more detailed monitoring and control of an Algorithm's progress while
+  \item \textit{ProgressTrackable} - The interface an \class{Algorithm} extends
+  to allow for more detailed monitoring and control of an Algorithm's progress while
   executing.
   \item \textit{ProgressMonitor} - The interface for a class to be passed in to
-  a ProgressTrackable Algorithm so that the Algorithm can be controlled
-  and provide information on its progress while executing.
+  a \class{ProgressTrackable} \class{Algorithm} so that the \class{Algorithm}
+  can be controlled and provide information on its progress while executing.
   \item \textit{Data} - The interface used to pass data (other than
   parameters) and meta-data between algorithms.
-  \item \textit{BasicData} - A simple implementation of the Data interface. 
+  \item \textit{BasicData} - A simple implementation of the \class{Data}
+  interface.
   \item \textit{DataProperty} - The interface which provides string constants
-  for Data's metadata.
+  for \class{Data}'s metadata.
   \item \textit{CIShellContext} - The interface for a class to be passed in to
-  an AlgorithmFactory for us in gaining access to standard CIShell services.
+  an \class{AlgorithmFactory} for use in gaining access to standard CIShell
+  services.
   \item \textit{LocalCIShellContext} - A simple implementation of the
-  CIShellContext interface which pulls CIShell services from the OSGi Service
-  Registry.
+  \class{CIShellContext} interface which pulls CIShell services from the OSGi
+  Service Registry.
 \end{itemize}
 
 \begin{figure}[htb!]
@@ -58,8 +62,8 @@
 
 \subsection{Operations}
 
-The algorithm developer should fully implement the AlgorithmFactory interface and
-make it available in OSGi's Service Registry. The system developer will provide
-the services required by CIShell in OSGi's Service Registry. Application
-developers will provide everything else, orchestrating the passing of information
-between algorithms.
+The algorithm developer should fully implement the \class{AlgorithmFactory}
+interface and make it available in OSGi's service registry. The system developer
+will provide the services required by CIShell in OSGi's service registry.
+Application developers will provide everything else, orchestrating the passing of
+information between algorithms.

Modified: trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex	2008-01-09 00:57:19 UTC (rev 593)
+++ trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex	2008-01-09 22:33:54 UTC (rev 594)
@@ -1,5 +1,36 @@
-\section{GUI Specification}
+\section{User Interface Specification}
+\label{GUISpec}
 \subsection*{\textit{Version 1.0}}
 \subsection{Introduction}
-\subsection{org.osgi.service.metatype}
-\subsection{MetaType Extensions}
+
+For many algorithms, just looking at the data given isn't enough. Additional
+parameters are often needed to know how to operate on a given piece of data. An
+algorithm can define what parameters are needed by providing a
+\class{MetaTypeProvider}. It defines the types, value range, and textual
+description of the parameters needed. From this information, a user interface
+(UI) can be created that asks a user for the data. The \class{MetaTypeProvider}
+is not tied to any specific UI, so it can be reused depending on the context
+(desktop application, web application, command line, etc.).
+
+\class{MetaTypeProvider} is defined in the OSGi R4 Specification Service
+Compendium as part of the Meta Type Service. \class{MetaTypeProvider}s can be
+created in code or can be specified in an xml file (as defined in the
+specification) and pulled out of the \class{MetaTypeService} service. A
+\class{MetaTypeProvider} can be thought of as a collection of UIs. Each UI is
+called an \class{ObjectClassDefinition}, which provides a UI name and
+description and is a collection of parameters. Each parameter is an
+\class{AttributeDefinition} which includes the type, label, description, default
+value, and range of valid values. Drop-down boxes can also be defined by using
+option labels and values with the \class{AttributeDefinition}. OSGi's
+documentation should be consulted for more information.
+
+\subsection{MetaTypeProvider Extensions}
+
+Some minor extensions to \class{MetaTypeProvider} were made to support some
+use cases. The \class{MetaTypeProvider} supports several simple types such as
+strings, integers, booleans, etc, but several useful types are missing. Two
+such types are files and directories. To get a file or a directory as input,
+create an \class{AttributeDefinition} with string as its type and with ``file:``
+or ``directory:`` (respectively) as its default value. When the algorithm is
+run it will receive a \class{String} which is the absolute path to a file or
+directory.

Modified: trunk/core/org.cishell.docs/src/specification/tex/introduction.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/introduction.tex	2008-01-09 00:57:19 UTC (rev 593)
+++ trunk/core/org.cishell.docs/src/specification/tex/introduction.tex	2008-01-09 22:33:54 UTC (rev 594)
@@ -38,7 +38,7 @@
 when developing anything on CIShell.
 
 Non-Java Algorithm developers may not need to know any Java and should be mainly
-concerned with the metadata definitions for Algorithms and Data. They may also
+concerned with the metadata definitions for algorithms and data. They may also
 need to be aware of OSGi and the other services CIShell provides, but more than
 likely will not directly interact with them.
 

Modified: trunk/core/org.cishell.docs/src/texdoclet/src/org/wonderly/doclets/TexDoclet.java
===================================================================
--- trunk/core/org.cishell.docs/src/texdoclet/src/org/wonderly/doclets/TexDoclet.java	2008-01-09 00:57:19 UTC (rev 593)
+++ trunk/core/org.cishell.docs/src/texdoclet/src/org/wonderly/doclets/TexDoclet.java	2008-01-09 22:33:54 UTC (rev 594)
@@ -578,12 +578,7 @@
 	
 	static void layoutClasses( String type, Vector classes ) {
 		if( classes.size() > 0 && !("Classes".equals(type))) {
-		    if (type.startsWith("org.cishell.framework.")) {
-		        os.print("\\subsection{" );
-		    } else {
-		        os.print("\\section{" );
-		    }
-		    
+		    os.print("\\section{" );
 			os.print( type );
 			os.println( "}{" );
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [593] trunk/core/org.cishell.docs/src

From: <bh...@us...> - 2008-01-09 00:57:22

Revision: 593
          http://cishell.svn.sourceforge.net/cishell/?rev=593&view=rev
Author:   bh2
Date:     2008-01-08 16:57:19 -0800 (Tue, 08 Jan 2008)

Log Message:
-----------
Some initial work on the cishell specification, mainly in the Introduction, Framework, and Algorithm sections.

Modified Paths:
--------------
    trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex
    trunk/core/org.cishell.docs/src/specification/tex/data.tex
    trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/framework.tex
    trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex
    trunk/core/org.cishell.docs/src/specification/tex/introduction.tex

Added Paths:
-----------
    trunk/core/org.cishell.docs/src/img/algExecWorkflow.dia
    trunk/core/org.cishell.docs/src/img/algExecWorkflow.eps
    trunk/core/org.cishell.docs/src/img/algExecWorkflow.pdf
    trunk/core/org.cishell.docs/src/img/cishellInteraction.dia
    trunk/core/org.cishell.docs/src/img/cishellInteraction.eps
    trunk/core/org.cishell.docs/src/img/cishellInteraction.pdf

Added: trunk/core/org.cishell.docs/src/img/algExecWorkflow.dia
===================================================================
(Binary files differ)


Property changes on: trunk/core/org.cishell.docs/src/img/algExecWorkflow.dia
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/core/org.cishell.docs/src/img/algExecWorkflow.eps
===================================================================
--- trunk/core/org.cishell.docs/src/img/algExecWorkflow.eps	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/img/algExecWorkflow.eps	2008-01-09 00:57:19 UTC (rev 593)
@@ -0,0 +1,461 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: /home/bherr/cishell-workspace/org.cishell.docs/src/img/algExecWorkflow.dia
+%%Creator: Dia v0.95
+%%CreationDate: Tue Jan  8 19:30:54 2008
+%%For: bherr
+%%Orientation: Portrait
+%%Magnification: 1.0000
+%%BoundingBox: 0 0 1146 213
+%%BeginSetup
+%%EndSetup
+%%EndComments
+%%BeginProlog
+[ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash /zero /one
+/two /three /four /five /six /seven /eight /nine /colon /semicolon
+/less /equal /greater /question /at /A /B /C /D /E
+/F /G /H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W /X /Y
+/Z /bracketleft /backslash /bracketright /asciicircum /underscore /quoteleft /a /b /c
+/d /e /f /g /h /i /j /k /l /m
+/n /o /p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclamdown /cent /sterling /currency /yen /brokenbar /section /dieresis /copyright
+/ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron /degree /plusminus /twosuperior /threesuperior
+/acute /mu /paragraph /periodcentered /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf
+/threequarters /questiondown /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis /Eth /Ntilde
+/Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply /Oslash /Ugrave /Uacute /Ucircumflex
+/Udieresis /Yacute /Thorn /germandbls /agrave /aacute /acircumflex /atilde /adieresis /aring
+/ae /ccedilla /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide /oslash /ugrave
+/uacute /ucircumflex /udieresis /yacute /thorn /ydieresis] /isolatin1encoding exch def
+/cp {closepath} bind def
+/c {curveto} bind def
+/f {fill} bind def
+/a {arc} bind def
+/ef {eofill} bind def
+/ex {exch} bind def
+/gr {grestore} bind def
+/gs {gsave} bind def
+/sa {save} bind def
+/rs {restore} bind def
+/l {lineto} bind def
+/m {moveto} bind def
+/rm {rmoveto} bind def
+/n {newpath} bind def
+/s {stroke} bind def
+/sh {show} bind def
+/slc {setlinecap} bind def
+/slj {setlinejoin} bind def
+/slw {setlinewidth} bind def
+/srgb {setrgbcolor} bind def
+/rot {rotate} bind def
+/sc {scale} bind def
+/sd {setdash} bind def
+/ff {findfont} bind def
+/sf {setfont} bind def
+/scf {scalefont} bind def
+/sw {stringwidth pop} bind def
+/tr {translate} bind def
+
+/ellipsedict 8 dict def
+ellipsedict /mtrx matrix put
+/ellipse
+{ ellipsedict begin
+   /endangle exch def
+   /startangle exch def
+   /yrad exch def
+   /xrad exch def
+   /y exch def
+   /x exch def   /savematrix mtrx currentmatrix def
+   x y tr xrad yrad sc
+   0 0 1 startangle endangle arc
+   savematrix setmatrix
+   end
+} def
+
+/mergeprocs {
+dup length
+3 -1 roll
+dup
+length
+dup
+5 1 roll
+3 -1 roll
+add
+array cvx
+dup
+3 -1 roll
+0 exch
+putinterval
+dup
+4 2 roll
+putinterval
+} bind def
+/Times-Roman-latin1
+    /Times-Roman findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Times-Italic-latin1
+    /Times-Italic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Times-Bold-latin1
+    /Times-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Times-BoldItalic-latin1
+    /Times-BoldItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-Book-latin1
+    /AvantGarde-Book findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-BookOblique-latin1
+    /AvantGarde-BookOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-Demi-latin1
+    /AvantGarde-Demi findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-DemiOblique-latin1
+    /AvantGarde-DemiOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-Light-latin1
+    /Bookman-Light findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-LightItalic-latin1
+    /Bookman-LightItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-Demi-latin1
+    /Bookman-Demi findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-DemiItalic-latin1
+    /Bookman-DemiItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-latin1
+    /Courier findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-Oblique-latin1
+    /Courier-Oblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-Bold-latin1
+    /Courier-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-BoldOblique-latin1
+    /Courier-BoldOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-latin1
+    /Helvetica findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Oblique-latin1
+    /Helvetica-Oblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Bold-latin1
+    /Helvetica-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-BoldOblique-latin1
+    /Helvetica-BoldOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-latin1
+    /Helvetica-Narrow findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-Oblique-latin1
+    /Helvetica-Narrow-Oblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-Bold-latin1
+    /Helvetica-Narrow-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-BoldOblique-latin1
+    /Helvetica-Narrow-BoldOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-Roman-latin1
+    /NewCenturySchoolbook-Roman findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-Italic-latin1
+    /NewCenturySchoolbook-Italic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-Bold-latin1
+    /NewCenturySchoolbook-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-BoldItalic-latin1
+    /NewCenturySchoolbook-BoldItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-Roman-latin1
+    /Palatino-Roman findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-Italic-latin1
+    /Palatino-Italic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-Bold-latin1
+    /Palatino-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-BoldItalic-latin1
+    /Palatino-BoldItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Symbol-latin1
+    /Symbol findfont
+definefont pop
+/ZapfChancery-MediumItalic-latin1
+    /ZapfChancery-MediumItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/ZapfDingbats-latin1
+    /ZapfDingbats findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+28.346000 -28.346000 scale
+-3.052329 -20.889765 translate
+%%EndProlog
+
+
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 14.958000 16.044000 m 14.958000 18.244000 l 22.508000 18.244000 l 22.508000 16.044000 l f
+0.000000 0.000000 0.000000 srgb
+n 14.958000 16.044000 m 14.958000 18.244000 l 22.508000 18.244000 l 22.508000 16.044000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 18.733000 ex sub 16.694000 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(AlgorithmFactory) dup sw 2 div 18.733000 ex sub 17.694000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 27.318000 16.045000 m 27.318000 18.245000 l 32.368000 18.245000 l 32.368000 16.045000 l f
+0.000000 0.000000 0.000000 srgb
+n 27.318000 16.045000 m 27.318000 18.245000 l 32.368000 18.245000 l 32.368000 16.045000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 29.843000 ex sub 16.695000 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(Algorithm) dup sw 2 div 29.843000 ex sub 17.695000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 27.273560 17.145000 m 23.346440 17.145000 l 23.346440 17.144000 l 22.555758 17.144000 l s
+/Courier-latin1 ff 0.560000 scf sf
+(Creates) 23.446440 16.994500 m gs 1 -1 sc sh gr
+n 25.996440 16.994500 m 25.996440 16.594500 l 26.396440 16.794500 l ef
+(1) dup sw 27.073560 ex sub 16.995000 m gs 1 -1 sc sh gr
+(1) 22.755758 16.994000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 4.665347 13.448391 m 4.665347 15.648391 l 9.715347 15.648391 l 9.715347 13.448391 l f
+0.000000 0.000000 0.000000 srgb
+n 4.665347 13.448391 m 4.665347 15.648391 l 9.715347 15.648391 l 9.715347 13.448391 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 7.190347 ex sub 14.098391 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(Data) dup sw 2 div 7.190347 ex sub 15.098391 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 3.102329 18.639765 m 3.102329 20.839765 l 9.702329 20.839765 l 9.702329 18.639765 l f
+0.000000 0.000000 0.000000 srgb
+n 3.102329 18.639765 m 3.102329 20.839765 l 9.702329 20.839765 l 9.702329 18.639765 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 6.402329 ex sub 19.289765 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(CIShellContext) dup sw 2 div 6.402329 ex sub 20.289765 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slj
+0 slc
+n 22.626200 17.313300 m 21.531500 18.353100 l 22.625500 18.353100 l ef
+n 22.626200 17.313300 m 21.531500 18.353100 l 22.625500 18.353100 l cp s
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 9.702329 19.739765 m 11.446440 19.739765 l 11.446440 17.144000 l 14.958000 17.144000 l s
+/Courier-latin1 ff 0.560000 scf sf
+(1) 9.902329 19.589765 m gs 1 -1 sc sh gr
+(1) dup sw 14.758000 ex sub 16.994000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 9.715347 14.548391 m 11.446440 14.548391 l 11.446440 17.144000 l 14.958000 17.144000 l s
+/Courier-latin1 ff 0.560000 scf sf
+(0..n) 9.915347 14.398391 m gs 1 -1 sc sh gr
+(1) dup sw 14.758000 ex sub 16.994000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 4.663538 16.042763 m 4.663538 18.242763 l 9.713538 18.242763 l 9.713538 16.042763 l f
+0.000000 0.000000 0.000000 srgb
+n 4.663538 16.042763 m 4.663538 18.242763 l 9.713538 18.242763 l 9.713538 16.042763 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 7.188538 ex sub 16.692763 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(Dictionary) dup sw 2 div 7.188538 ex sub 17.692763 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 9.763802 17.142763 m 11.761822 17.142763 l 11.761822 17.144000 l 14.958000 17.144000 l s
+/Courier-latin1 ff 0.560000 scf sf
+(given) 11.861822 16.993381 m gs 1 -1 sc sh gr
+n 13.711822 16.993381 m 13.711822 16.593381 l 14.111822 16.793381 l ef
+(1) 9.963802 16.992763 m gs 1 -1 sc sh gr
+(1) dup sw 14.758000 ex sub 16.994000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 38.373025 16.043657 m 38.373025 18.243657 l 43.423025 18.243657 l 43.423025 16.043657 l f
+0.000000 0.000000 0.000000 srgb
+n 38.373025 16.043657 m 38.373025 18.243657 l 43.423025 18.243657 l 43.423025 16.043657 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 40.898025 ex sub 16.693657 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(Data) dup sw 2 div 40.898025 ex sub 17.693657 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 38.323936 17.143657 m 33.196440 17.143657 l 33.196440 17.145000 l 32.368000 17.145000 l s
+/Courier-latin1 ff 0.560000 scf sf
+(Creates) 33.296440 16.994328 m gs 1 -1 sc sh gr
+n 35.846440 16.994328 m 35.846440 16.594328 l 36.246440 16.794328 l ef
+(0..n) dup sw 38.123936 ex sub 16.993657 m gs 1 -1 sc sh gr
+(1) 32.568000 16.995000 m gs 1 -1 sc sh gr
+showpage

Added: trunk/core/org.cishell.docs/src/img/algExecWorkflow.pdf
===================================================================
(Binary files differ)


Property changes on: trunk/core/org.cishell.docs/src/img/algExecWorkflow.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/core/org.cishell.docs/src/img/cishellInteraction.dia
===================================================================
(Binary files differ)


Property changes on: trunk/core/org.cishell.docs/src/img/cishellInteraction.dia
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/core/org.cishell.docs/src/img/cishellInteraction.eps
===================================================================
--- trunk/core/org.cishell.docs/src/img/cishellInteraction.eps	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/img/cishellInteraction.eps	2008-01-09 00:57:19 UTC (rev 593)
@@ -0,0 +1,581 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: /home/bherr/cishell-workspace/org.cishell.docs/src/img/cishellInteraction.dia
+%%Creator: Dia v0.95
+%%CreationDate: Tue Jan  8 18:06:57 2008
+%%For: bherr
+%%Orientation: Portrait
+%%Magnification: 1.0000
+%%BoundingBox: 0 0 1053 520
+%%BeginSetup
+%%EndSetup
+%%EndComments
+%%BeginProlog
+[ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash /zero /one
+/two /three /four /five /six /seven /eight /nine /colon /semicolon
+/less /equal /greater /question /at /A /B /C /D /E
+/F /G /H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W /X /Y
+/Z /bracketleft /backslash /bracketright /asciicircum /underscore /quoteleft /a /b /c
+/d /e /f /g /h /i /j /k /l /m
+/n /o /p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclamdown /cent /sterling /currency /yen /brokenbar /section /dieresis /copyright
+/ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron /degree /plusminus /twosuperior /threesuperior
+/acute /mu /paragraph /periodcentered /cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf
+/threequarters /questiondown /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis /Eth /Ntilde
+/Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply /Oslash /Ugrave /Uacute /Ucircumflex
+/Udieresis /Yacute /Thorn /germandbls /agrave /aacute /acircumflex /atilde /adieresis /aring
+/ae /ccedilla /egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide /oslash /ugrave
+/uacute /ucircumflex /udieresis /yacute /thorn /ydieresis] /isolatin1encoding exch def
+/cp {closepath} bind def
+/c {curveto} bind def
+/f {fill} bind def
+/a {arc} bind def
+/ef {eofill} bind def
+/ex {exch} bind def
+/gr {grestore} bind def
+/gs {gsave} bind def
+/sa {save} bind def
+/rs {restore} bind def
+/l {lineto} bind def
+/m {moveto} bind def
+/rm {rmoveto} bind def
+/n {newpath} bind def
+/s {stroke} bind def
+/sh {show} bind def
+/slc {setlinecap} bind def
+/slj {setlinejoin} bind def
+/slw {setlinewidth} bind def
+/srgb {setrgbcolor} bind def
+/rot {rotate} bind def
+/sc {scale} bind def
+/sd {setdash} bind def
+/ff {findfont} bind def
+/sf {setfont} bind def
+/scf {scalefont} bind def
+/sw {stringwidth pop} bind def
+/tr {translate} bind def
+
+/ellipsedict 8 dict def
+ellipsedict /mtrx matrix put
+/ellipse
+{ ellipsedict begin
+   /endangle exch def
+   /startangle exch def
+   /yrad exch def
+   /xrad exch def
+   /y exch def
+   /x exch def   /savematrix mtrx currentmatrix def
+   x y tr xrad yrad sc
+   0 0 1 startangle endangle arc
+   savematrix setmatrix
+   end
+} def
+
+/mergeprocs {
+dup length
+3 -1 roll
+dup
+length
+dup
+5 1 roll
+3 -1 roll
+add
+array cvx
+dup
+3 -1 roll
+0 exch
+putinterval
+dup
+4 2 roll
+putinterval
+} bind def
+/Times-Roman-latin1
+    /Times-Roman findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Times-Italic-latin1
+    /Times-Italic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Times-Bold-latin1
+    /Times-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Times-BoldItalic-latin1
+    /Times-BoldItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-Book-latin1
+    /AvantGarde-Book findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-BookOblique-latin1
+    /AvantGarde-BookOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-Demi-latin1
+    /AvantGarde-Demi findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/AvantGarde-DemiOblique-latin1
+    /AvantGarde-DemiOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-Light-latin1
+    /Bookman-Light findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-LightItalic-latin1
+    /Bookman-LightItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-Demi-latin1
+    /Bookman-Demi findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Bookman-DemiItalic-latin1
+    /Bookman-DemiItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-latin1
+    /Courier findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-Oblique-latin1
+    /Courier-Oblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-Bold-latin1
+    /Courier-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Courier-BoldOblique-latin1
+    /Courier-BoldOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-latin1
+    /Helvetica findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Oblique-latin1
+    /Helvetica-Oblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Bold-latin1
+    /Helvetica-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-BoldOblique-latin1
+    /Helvetica-BoldOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-latin1
+    /Helvetica-Narrow findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-Oblique-latin1
+    /Helvetica-Narrow-Oblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-Bold-latin1
+    /Helvetica-Narrow-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Helvetica-Narrow-BoldOblique-latin1
+    /Helvetica-Narrow-BoldOblique findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-Roman-latin1
+    /NewCenturySchoolbook-Roman findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-Italic-latin1
+    /NewCenturySchoolbook-Italic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-Bold-latin1
+    /NewCenturySchoolbook-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/NewCenturySchoolbook-BoldItalic-latin1
+    /NewCenturySchoolbook-BoldItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-Roman-latin1
+    /Palatino-Roman findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-Italic-latin1
+    /Palatino-Italic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-Bold-latin1
+    /Palatino-Bold findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Palatino-BoldItalic-latin1
+    /Palatino-BoldItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/Symbol-latin1
+    /Symbol findfont
+definefont pop
+/ZapfChancery-MediumItalic-latin1
+    /ZapfChancery-MediumItalic findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+/ZapfDingbats-latin1
+    /ZapfDingbats findfont
+    dup length dict begin
+	{1 index /FID ne {def} {pop pop} ifelse} forall
+	/Encoding isolatin1encoding def
+    currentdict end
+definefont pop
+28.346000 -28.346000 scale
+3.053557 -24.440110 translate
+%%EndProlog
+
+
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 14.958000 16.044000 m 14.958000 18.244000 l 22.508000 18.244000 l 22.508000 16.044000 l f
+0.000000 0.000000 0.000000 srgb
+n 14.958000 16.044000 m 14.958000 18.244000 l 22.508000 18.244000 l 22.508000 16.044000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 18.733000 ex sub 16.694000 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(AlgorithmFactory) dup sw 2 div 18.733000 ex sub 17.694000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 27.468000 16.045000 m 27.468000 18.245000 l 32.518000 18.245000 l 32.518000 16.045000 l f
+0.000000 0.000000 0.000000 srgb
+n 27.468000 16.045000 m 27.468000 18.245000 l 32.518000 18.245000 l 32.518000 16.045000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 29.993000 ex sub 16.695000 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(Algorithm) dup sw 2 div 29.993000 ex sub 17.695000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 27.417846 17.145000 m 23.876543 17.145000 l 23.876543 17.144000 l 22.556752 17.144000 l s
+/Courier-latin1 ff 0.560000 scf sf
+(Creates) 23.976543 16.994500 m gs 1 -1 sc sh gr
+(n) dup sw 27.217846 ex sub 16.995000 m gs 1 -1 sc sh gr
+(1) 22.756752 16.994000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 14.706000 22.187000 m 14.706000 24.387000 l 22.756000 24.387000 l 22.756000 22.187000 l f
+0.000000 0.000000 0.000000 srgb
+n 14.706000 22.187000 m 14.706000 24.387000 l 22.756000 24.387000 l 22.756000 22.187000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 18.731000 ex sub 22.837000 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(AlgorithmProperty) dup sw 2 div 18.731000 ex sub 23.837000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 15.658686 9.829000 m 15.658686 12.029000 l 21.808686 12.029000 l 21.808686 9.829000 l f
+0.000000 0.000000 0.000000 srgb
+n 15.658686 9.829000 m 15.658686 12.029000 l 21.808686 12.029000 l 21.808686 9.829000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 18.733686 ex sub 10.479000 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(DataValidator) dup sw 2 div 18.733686 ex sub 11.479000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 25.944343 10.154657 m 25.944343 12.354657 l 34.044343 12.354657 l 34.044343 10.154657 l f
+0.000000 0.000000 0.000000 srgb
+n 25.944343 10.154657 m 25.944343 12.354657 l 34.044343 12.354657 l 34.044343 10.154657 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 29.994343 ex sub 10.804657 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(ProgressTrackable) dup sw 2 div 29.994343 ex sub 11.804657 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 26.740000 6.159000 m 26.740000 8.359000 l 33.990000 8.359000 l 33.990000 6.159000 l f
+0.000000 0.000000 0.000000 srgb
+n 26.740000 6.159000 m 26.740000 8.359000 l 33.990000 8.359000 l 33.990000 6.159000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 30.365000 ex sub 6.809000 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(ProgressMonitor) dup sw 2 div 30.365000 ex sub 7.809000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 5.011421 17.736731 m 5.011421 19.936731 l 10.061421 19.936731 l 10.061421 17.736731 l f
+0.000000 0.000000 0.000000 srgb
+n 5.011421 17.736731 m 5.011421 19.936731 l 10.061421 19.936731 l 10.061421 17.736731 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 7.536421 ex sub 18.386731 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(Data) dup sw 2 div 7.536421 ex sub 19.386731 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n -2.927751 17.728768 m -2.927751 19.928768 l 1.672249 19.928768 l 1.672249 17.728768 l f
+0.000000 0.000000 0.000000 srgb
+n -2.927751 17.728768 m -2.927751 19.928768 l 1.672249 19.928768 l 1.672249 17.728768 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<class>>) dup sw 2 div -0.627751 ex sub 18.378768 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(BasicData) dup sw 2 div -0.627751 ex sub 19.378768 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slc
+n 18.733127 15.995378 m 18.733506 12.564425 l s
+[] 0 sd
+0 slj
+0 slc
+n 18.733547 12.189425 m 18.983492 12.689453 l 18.733506 12.564425 l 18.483492 12.689398 l ef
+n 18.733547 12.189425 m 18.983492 12.689453 l 18.733506 12.564425 l 18.483492 12.689398 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+( Optional) 18.733343 14.036500 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slc
+n 29.993257 16.017552 m 29.993975 12.868909 l s
+[] 0 sd
+0 slj
+0 slc
+n 29.994061 12.493909 m 30.243947 12.993966 l 29.993975 12.868909 l 29.743947 12.993852 l ef
+n 29.994061 12.493909 m 30.243947 12.993966 l 29.993975 12.868909 l 29.743947 12.993852 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+( Optional) 29.993672 14.199828 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 18.731000 22.187000 m 18.736886 22.187000 l 18.736886 18.244000 l 18.733000 18.244000 l s
+/Courier-latin1 ff 0.560000 scf sf
+(Service Constants) 18.836886 20.065500 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 26.700999 7.259000 m 24.447119 7.259000 l 24.447119 11.254657 l 25.944343 11.254657 l s
+/Courier-latin1 ff 0.560000 scf sf
+(Communications) 24.547119 9.106828 m gs 1 -1 sc sh gr
+(1) dup sw 26.500999 ex sub 7.109000 m gs 1 -1 sc sh gr
+(1) dup sw 25.744343 ex sub 11.104657 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 4.410510 11.796019 m 4.410510 13.996019 l 11.010510 13.996019 l 11.010510 11.796019 l f
+0.000000 0.000000 0.000000 srgb
+n 4.410510 11.796019 m 4.410510 13.996019 l 11.010510 13.996019 l 11.010510 11.796019 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 7.710510 ex sub 12.446019 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(CIShellContext) dup sw 2 div 7.710510 ex sub 13.446019 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 3.336167 6.180019 m 3.336167 8.380019 l 12.086167 8.380019 l 12.086167 6.180019 l f
+0.000000 0.000000 0.000000 srgb
+n 3.336167 6.180019 m 3.336167 8.380019 l 12.086167 8.380019 l 12.086167 6.180019 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<class>>) dup sw 2 div 7.711167 ex sub 6.830019 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(LocalCIShellContext) dup sw 2 div 7.711167 ex sub 7.830019 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slj
+0 slc
+n 7.710510 11.258868 m 7.710510 8.828843 l 7.711167 8.828843 l 7.711167 8.429915 l s
+[] 0 sd
+0 slj
+0 slc
+n 7.710510 11.633868 m 7.460510 11.133868 l 7.710510 11.258868 l 7.960510 11.133868 l ef
+n 7.710510 11.633868 m 7.460510 11.133868 l 7.710510 11.258868 l 7.960510 11.133868 l cp s
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slj
+0 slc
+n 22.626177 17.313299 m 21.531491 18.353113 l 22.625491 18.353113 l ef
+n 22.626177 17.313299 m 21.531491 18.353113 l 22.625491 18.353113 l cp s
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 4.650942 22.190110 m 4.650942 24.390110 l 10.700942 24.390110 l 10.700942 22.190110 l f
+0.000000 0.000000 0.000000 srgb
+n 4.650942 22.190110 m 4.650942 24.390110 l 10.700942 24.390110 l 10.700942 22.190110 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) dup sw 2 div 7.675942 ex sub 22.840110 m gs 1 -1 sc sh gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(DataProperty) dup sw 2 div 7.675942 ex sub 23.840110 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slj
+0 slc
+n 1.672249 18.828768 m 4.717962 18.828768 l 4.717962 18.836731 l 4.524618 18.836731 l s
+[] 0 sd
+0 slj
+0 slc
+n 4.899618 18.836731 m 4.399618 19.086731 l 4.524618 18.836731 l 4.399618 18.586731 l ef
+n 4.899618 18.836731 m 4.399618 19.086731 l 4.524618 18.836731 l 4.399618 18.586731 l cp s
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 7.675942 22.190110 m 7.339526 22.190110 l 7.339526 19.936731 l 7.536421 19.936731 l s
+/Courier-latin1 ff 0.560000 scf sf
+(Data Constants) 7.439526 20.913420 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 11.062569 12.898019 m 12.164040 12.898019 l 12.164040 17.144000 l 14.958000 17.144000 l s
+/Courier-latin1 ff 0.560000 scf sf
+(given) 12.264040 14.871010 m gs 1 -1 sc sh gr
+(n) 11.262569 12.748019 m gs 1 -1 sc sh gr
+(1) dup sw 14.758000 ex sub 16.994000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 10.061421 18.836731 m 12.164040 18.836731 l 12.164040 17.144000 l 14.958000 17.144000 l s
+/Courier-latin1 ff 0.560000 scf sf
+(given) 12.264040 17.840365 m gs 1 -1 sc sh gr
+(0..n) 10.261421 18.686731 m gs 1 -1 sc sh gr
+(1) dup sw 14.758000 ex sub 16.994000 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 1.095192 10.315063 m 2.207518 10.315063 l 2.207518 12.896019 l 4.361154 12.896019 l s
+/Courier-latin1 ff 0.560000 scf sf
+(Provides Access) 2.307518 11.455541 m gs 1 -1 sc sh gr
+(4) 1.295192 10.165063 m gs 1 -1 sc sh gr
+(n) dup sw 4.161154 ex sub 12.746019 m gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n -3.003557 9.065063 m 0.446443 9.065063 l 1.046443 9.665063 l 1.046443 11.565063 l -3.003557 11.565063 l ef
+0.000000 0.000000 0.000000 srgb
+n -3.003557 9.065063 m 0.446443 9.065063 l 1.046443 9.665063 l 1.046443 11.565063 l -3.003557 11.565063 l cp s
+0.050000 slw
+n 0.446443 9.065063 m 0.446443 9.665063 l 1.046443 9.665063 l s
+/Courier-latin1 ff 0.560000 scf sf
+(Standard ) -2.653557 10.265063 m gs 1 -1 sc sh gr
+(Services) -2.653557 11.065063 m gs 1 -1 sc sh gr
+showpage

Added: trunk/core/org.cishell.docs/src/img/cishellInteraction.pdf
===================================================================
(Binary files differ)


Property changes on: trunk/core/org.cishell.docs/src/img/cishellInteraction.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex	2008-01-02 20:40:30 UTC (rev 592)
+++ trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex	2008-01-09 00:57:19 UTC (rev 593)
@@ -1,13 +1,35 @@
-\section{Algorithm Definition}
+\section{Algorithm Specification}
+
+\subsection*{\textit{Version 1.0}}
+
 \subsection{Introduction}
 
+The CIShell Platform has been specifically designed around the idea of the
+algorithm. It is the central and most important concept. Algorithms are fully
+defined and self-contained bits of execution. They can do many things from data
+conversion, data analysis, and can even spawn whole outside programs if needs be.
+Algorithms are very well defined black boxes in that what can come into and out
+of the algorithm is specified in each algorithm's metadata. Other than that,
+CIShell makes no attempt to understand the algorithm.
+
+Figure \ref{fig:algExecWorkflow} shows the flow of information into and out of an
+algorithm. Here an algorithm is passed zero or more pieces of data, any
+user-entered parameters, and a CIShell context. The algorithm is then executed
+and produces zero or more pieces of data.
+
 \begin{figure}[htb!]
 \centering
-\includegraphics[width=90mm]{../img/algorithmDefn.pdf}
-\caption{Algorithm Definition}
-\label{fig:algorithmDefn}
+\includegraphics[width=150mm]{../img/algExecWorkflow.pdf}
+\caption{Algorithm Execution Workflow}
+\label{fig:algExecWorkflow}
 \end{figure}
 
+An algorithm defines its inputs in two ways. First, the input Data is defined
+in the algorithm's service metadata. Second, the acceptable user-entered
+parameters are defined in a MetaTypeProvider. This MetaTypeProvider defines the
+types, value range, and textual description of the parameters needed. From this
+information, a user interface (UI) can be created that asks a user for the
+data.
 
 \subsection{Standard Algorithm Properties}
 \orgcishellframeworkalgorithm{}

Modified: trunk/core/org.cishell.docs/src/specification/tex/data.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/data.tex	2008-01-02 20:40:30 UTC (rev 592)
+++ trunk/core/org.cishell.docs/src/specification/tex/data.tex	2008-01-09 00:57:19 UTC (rev 593)
@@ -1,4 +1,5 @@
-\section{Data Definition}
+\section{Data Specification}
+\subsection*{\textit{Version 1.0}}
 \subsection{Introduction}
 \subsection{Standard Data Properties}
 \orgcishellframeworkdata{}

Modified: trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex	2008-01-02 20:40:30 UTC (rev 592)
+++ trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex	2008-01-09 00:57:19 UTC (rev 593)
@@ -1,4 +1,5 @@
 \chapter{Data Conversion Service Specification}
+\section*{\textit{Version 1.0}}
 \section{Introduction}
 \section{Data Conversion Service}
 \orgcishellserviceconversion{}

Modified: trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex	2008-01-02 20:40:30 UTC (rev 592)
+++ trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex	2008-01-09 00:57:19 UTC (rev 593)
@@ -1,4 +1,5 @@
 \chapter{Data Manager Application Service Specification}
+\section*{\textit{Version 1.0}}
 \section{Introduction}
 \section{Data Manager Service}
 \orgcishellappservicedatamanager{}
\ No newline at end of file

Modified: trunk/core/org.cishell.docs/src/specification/tex/framework.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/framework.tex	2008-01-02 20:40:30 UTC (rev 592)
+++ trunk/core/org.cishell.docs/src/specification/tex/framework.tex	2008-01-09 00:57:19 UTC (rev 593)
@@ -1,5 +1,65 @@
 \chapter{Framework API}
+
+\section*{\textit{Version 1.0}}
+
 \section{Introduction}
+
+The org.cishell.framework package and subpackages define the core of CIShell. The
+key components being algorithms, data, and CIShell service access.
+
 \subsection{Essentials}
+
+\begin{itemize}
+  \item \textit{Application Independence} - Algorithms must be usable in a wide
+  variety of contexts and should not be tied to any one front end where
+  possible.
+  \item \textit{Delayed Execution} - There may be a large delay between an
+  algorithm getting parameters for execution and its actual execution.
+  \item \textit{Remote Execution} - Algorithm interfaces should be designed to
+  facilitate remote execution of algorithms where possible.
+\end{itemize}
+
 \subsection{Entities}
-\subsection{Operations}
\ No newline at end of file
+
+\begin{itemize}
+  \item \textit{AlgorithmFactory} - The service interface for algorithms.
+  A factory class which creates an Algorithm for execution from input data.
+  \item \textit{Algorithm} - The interface for the code execution part of the
+  algorithm.
+  \item \textit{AlgorithmProperty} - The interface which provides string
+  constants for an algorithm's service metadata.
+  \item \textit{DataValidator} - The interface an AlgorithmFactory extends to
+  provide additional data validation in addition to the data format validation
+  that an application should provide ahead of time.
+  \item \textit{ProgressTrackable} - The interface an Algorithm extends to allow
+  for more detailed monitoring and control of an Algorithm's progress while
+  executing.
+  \item \textit{ProgressMonitor} - The interface for a class to be passed in to
+  a ProgressTrackable Algorithm so that the Algorithm can be controlled
+  and provide information on its progress while executing.
+  \item \textit{Data} - The interface used to pass data (other than
+  parameters) and meta-data between algorithms.
+  \item \textit{BasicData} - A simple implementation of the Data interface. 
+  \item \textit{DataProperty} - The interface which provides string constants
+  for Data's metadata.
+  \item \textit{CIShellContext} - The interface for a class to be passed in to
+  an AlgorithmFactory for us in gaining access to standard CIShell services.
+  \item \textit{LocalCIShellContext} - A simple implementation of the
+  CIShellContext interface which pulls CIShell services from the OSGi Service
+  Registry.
+\end{itemize}
+
+\begin{figure}[htb!]
+\centering
+\includegraphics[width=150mm]{../img/cishellInteraction.pdf}
+\caption{org.cishell.framework Class Diagram}
+\label{fig:cishellInteraction}
+\end{figure}
+
+\subsection{Operations}
+
+The algorithm developer should fully implement the AlgorithmFactory interface and
+make it available in OSGi's Service Registry. The system developer will provide
+the services required by CIShell in OSGi's Service Registry. Application
+developers will provide everything else, orchestrating the passing of information
+between algorithms.

Modified: trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex	2008-01-02 20:40:30 UTC (rev 592)
+++ trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex	2008-01-09 00:57:19 UTC (rev 593)
@@ -1,4 +1,5 @@
 \chapter{GUI Builder Service Specification}
+\section*{\textit{Version 1.0}}
 \section{Introduction}
 \section{GUI Definition}
 \section{GUI Builder Service}

Modified: trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex	2008-01-02 20:40:30 UTC (rev 592)
+++ trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex	2008-01-09 00:57:19 UTC (rev 593)
@@ -1,4 +1,5 @@
-\section{GUI Definition}
+\section{GUI Specification}
+\subsection*{\textit{Version 1.0}}
 \subsection{Introduction}
 \subsection{org.osgi.service.metatype}
 \subsection{MetaType Extensions}

Modified: trunk/core/org.cishell.docs/src/specification/tex/introduction.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/introduction.tex	2008-01-02 20:40:30 UTC (rev 592)
+++ trunk/core/org.cishell.docs/src/specification/tex/introduction.tex	2008-01-09 00:57:19 UTC (rev 593)
@@ -1,5 +1,54 @@
 \chapter{Introduction}
-\section{CIShell Overview}
+
+The Cyberinfrastructure Shell (CIShell) is an open source, community-driven
+platform for the integration and utilization of datasets, algorithms, tools, and
+computing resources. It is built specifically to enable (1) algorithm developers
+to write and disseminate their algorithms in their favorite programming language
+while retaining their intellectual rights after distribution; (2) data holders to
+easily disseminate their data for use by others; (3) application developers to
+design applications from custom sets of algorithms and datasets that interoperate
+seamlessly; and finally (4) researchers, educators, and practitioners to use
+existing datasets and algorithms to further science.
+
+\section{CIShell Platform Overview}
+
+The CIShell Platform consists of Java interface definitions of algorithms, data,
+services for algorithm developers, and services for application developers. Much
+of the platform uses metadata and is fully defined.
+
 \section{What is New}
+
+This is the first release of the CIShell Platform Specification. Future
+versions will strive for backwards compatibility.
+
 \section{Reader Level}
-\section{Conventions and Terms}
\ No newline at end of file
+
+This specification is written for the following audiences:
+\begin{itemize}
+  \item Java Algorithm developers
+  \item Non-Java Algorithm developers
+  \item Framework and system service developers (system developers)
+  \item Application developers building on CIShell
+\end{itemize}
+
+The CIShell Specifications assume that the reader has at least one year of
+practical experience in writing Java programs. CIShell is built to run on the
+OSGi Service Platform Release 4 and thus a working knowledge of OSGi is expected.
+OSGi (and thus CIShell) is highly dynamic and must be taken into consideration
+when developing anything on CIShell.
+
+Non-Java Algorithm developers may not need to know any Java and should be mainly
+concerned with the metadata definitions for Algorithms and Data. They may also
+need to be aware of OSGi and the other services CIShell provides, but more than
+likely will not directly interact with them.
+
+\section{Conventions and Terms}
+
+The conventions and terms are exactly the same as from OSGi's Core
+Specification, section 1.4.
+
+\section{Version Information}
+
+This is the first release of the CIShell Platform Specification. All packages are
+at 1.0 for this release. Subsequent releases may increase the version number of
+specific packages, if changes have been made.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [592] trunk/core/org.cishell.docs

From: <bh...@us...> - 2008-01-02 20:40:40

Revision: 592
          http://cishell.svn.sourceforge.net/cishell/?rev=592&view=rev
Author:   bh2
Date:     2008-01-02 12:40:30 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
Initial commit of the cishell documentation project. Lots of content is still left to be included, but the build system is done.

Property Changed:
----------------
    trunk/core/org.cishell.docs/lib/
    trunk/core/org.cishell.docs/src/specification/tex/


Property changes on: trunk/core/org.cishell.docs/lib
___________________________________________________________________
Name: svn:ignore
   + texdoclet.jar



Property changes on: trunk/core/org.cishell.docs/src/specification/tex
___________________________________________________________________
Name: svn:ignore
   + api.tex



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [591] trunk/core/org.cishell.docs

From: <bh...@us...> - 2008-01-02 20:37:33

Revision: 591
          http://cishell.svn.sourceforge.net/cishell/?rev=591&view=rev
Author:   bh2
Date:     2008-01-02 12:37:28 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------


Added Paths:
-----------
    trunk/core/org.cishell.docs/.classpath
    trunk/core/org.cishell.docs/.externalToolBuilders/
    trunk/core/org.cishell.docs/.externalToolBuilders/Docs Builder.launch
    trunk/core/org.cishell.docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder (1).launch
    trunk/core/org.cishell.docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder.launch
    trunk/core/org.cishell.docs/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch
    trunk/core/org.cishell.docs/.fbprefs
    trunk/core/org.cishell.docs/.project
    trunk/core/org.cishell.docs/build.properties
    trunk/core/org.cishell.docs/build.xml
    trunk/core/org.cishell.docs/lib/
    trunk/core/org.cishell.docs/lib/ant_latex_0.0.9_1.jar
    trunk/core/org.cishell.docs/src/
    trunk/core/org.cishell.docs/src/bibliography.bib
    trunk/core/org.cishell.docs/src/dev_guide/
    trunk/core/org.cishell.docs/src/dev_guide/main.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/
    trunk/core/org.cishell.docs/src/dev_guide/tex/algconcepts.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/analysismodeling.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/cishellupdatesites.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/converteralgs.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/coreoverview.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/creatingupdatesites.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/dataalgs.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/envsetup.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/examplealgs.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/execalgs.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/glossary.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/guicreation.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/javaalgs.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/javalibs.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/jythonalgs.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/services.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/usingupdatesites.tex
    trunk/core/org.cishell.docs/src/dev_guide/tex/vizalgs.tex
    trunk/core/org.cishell.docs/src/glossary.bib
    trunk/core/org.cishell.docs/src/img/
    trunk/core/org.cishell.docs/src/img/algorithmDefn.pdf
    trunk/core/org.cishell.docs/src/img/algorithmDefn.svg
    trunk/core/org.cishell.docs/src/mystyle.sty
    trunk/core/org.cishell.docs/src/specification/
    trunk/core/org.cishell.docs/src/specification/main.tex
    trunk/core/org.cishell.docs/src/specification/tex/
    trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex
    trunk/core/org.cishell.docs/src/specification/tex/data.tex
    trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/framework.tex
    trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex
    trunk/core/org.cishell.docs/src/specification/tex/introduction.tex
    trunk/core/org.cishell.docs/src/specification/tex/logservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/preferencesservice.tex
    trunk/core/org.cishell.docs/src/specification/tex/schedulerservice.tex
    trunk/core/org.cishell.docs/src/texdoclet/
    trunk/core/org.cishell.docs/src/texdoclet/README
    trunk/core/org.cishell.docs/src/texdoclet/build.xml
    trunk/core/org.cishell.docs/src/texdoclet/src/
    trunk/core/org.cishell.docs/src/texdoclet/src/org/
    trunk/core/org.cishell.docs/src/texdoclet/src/org/wonderly/
    trunk/core/org.cishell.docs/src/texdoclet/src/org/wonderly/doclets/
    trunk/core/org.cishell.docs/src/texdoclet/src/org/wonderly/doclets/ClassFilter.java
    trunk/core/org.cishell.docs/src/texdoclet/src/org/wonderly/doclets/Package.java
    trunk/core/org.cishell.docs/src/texdoclet/src/org/wonderly/doclets/TableInfo.java
    trunk/core/org.cishell.docs/src/texdoclet/src/org/wonderly/doclets/TexDoclet.java
    trunk/core/org.cishell.docs/src/texdoclet/www/
    trunk/core/org.cishell.docs/src/texdoclet/www/docs.aux
    trunk/core/org.cishell.docs/src/texdoclet/www/docs.dvi
    trunk/core/org.cishell.docs/src/texdoclet/www/docs.pdf
    trunk/core/org.cishell.docs/src/texdoclet/www/docs.ps
    trunk/core/org.cishell.docs/src/texdoclet/www/docs.tex
    trunk/core/org.cishell.docs/src/texdoclet/www/docs.toc
    trunk/core/org.cishell.docs/src/texdoclet/www/index.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/allclasses-frame.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/allclasses-noframe.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/constant-values.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/deprecated-list.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/help-doc.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/index-all.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/index.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/ClassFilter.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/Package.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/TableInfo.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/TexDoclet.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/class-use/
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/class-use/ClassFilter.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/class-use/Package.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/class-use/TableInfo.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/class-use/TexDoclet.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/package-frame.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/package-summary.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/package-tree.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/org/wonderly/doclets/package-use.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/overview-tree.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/package-list
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/packages.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/resources/
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/resources/inherit.gif
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/serialized-form.html
    trunk/core/org.cishell.docs/src/texdoclet/www/javadocs/stylesheet.css

Added: trunk/core/org.cishell.docs/.classpath
===================================================================
--- trunk/core/org.cishell.docs/.classpath	                        (rev 0)
+++ trunk/core/org.cishell.docs/.classpath	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/texdoclet/src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>


Property changes on: trunk/core/org.cishell.docs/.classpath
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/core/org.cishell.docs/.externalToolBuilders/Docs Builder.launch
===================================================================
--- trunk/core/org.cishell.docs/.externalToolBuilders/Docs Builder.launch	                        (rev 0)
+++ trunk/core/org.cishell.docs/.externalToolBuilders/Docs Builder.launch	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.cishell.docs/build.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.cishell.docs"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.cishell.docs/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,clean"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>


Property changes on: trunk/core/org.cishell.docs/.externalToolBuilders/Docs Builder.launch
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/core/org.cishell.docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder (1).launch
===================================================================
--- trunk/core/org.cishell.docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder (1).launch	                        (rev 0)
+++ trunk/core/org.cishell.docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder (1).launch	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="net.sourceforge.texlipse.builder.TexlipseBuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>


Property changes on: trunk/core/org.cishell.docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder (1).launch
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/core/org.cishell.docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder.launch
===================================================================
--- trunk/core/org.cishell.docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder.launch	                        (rev 0)
+++ trunk/core/org.cishell.docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder.launch	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="net.sourceforge.texlipse.builder.TexlipseBuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>


Property changes on: trunk/core/org.cishell.docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder.launch
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/core/org.cishell.docs/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch
===================================================================
--- trunk/core/org.cishell.docs/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch	                        (rev 0)
+++ trunk/core/org.cishell.docs/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.jdt.core.javabuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>


Property changes on: trunk/core/org.cishell.docs/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/core/org.cishell.docs/.fbprefs
===================================================================
--- trunk/core/org.cishell.docs/.fbprefs	                        (rev 0)
+++ trunk/core/org.cishell.docs/.fbprefs	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,109 @@
+#FindBugs User Preferences
+#Tue Dec 04 13:18:19 EST 2007
+detectorBadAppletConstructor=BadAppletConstructor|false
+detectorBadResultSetAccess=BadResultSetAccess|true
+detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true
+detectorBadUseOfReturnValue=BadUseOfReturnValue|true
+detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true
+detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true
+detectorCloneIdiom=CloneIdiom|true
+detectorComparatorIdiom=ComparatorIdiom|true
+detectorConfusedInheritance=ConfusedInheritance|true
+detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true
+detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true
+detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true
+detectorDontUseEnum=DontUseEnum|true
+detectorDroppedException=DroppedException|true
+detectorDumbMethodInvocations=DumbMethodInvocations|true
+detectorDumbMethods=DumbMethods|true
+detectorDuplicateBranches=DuplicateBranches|true
+detectorEmptyZipFileEntry=EmptyZipFileEntry|true
+detectorFinalizerNullsFields=FinalizerNullsFields|true
+detectorFindBadCast2=FindBadCast2|true
+detectorFindBadForLoop=FindBadForLoop|true
+detectorFindCircularDependencies=FindCircularDependencies|false
+detectorFindDeadLocalStores=FindDeadLocalStores|true
+detectorFindDoubleCheck=FindDoubleCheck|true
+detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true
+detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true
+detectorFindFinalizeInvocations=FindFinalizeInvocations|true
+detectorFindFloatEquality=FindFloatEquality|true
+detectorFindHEmismatch=FindHEmismatch|true
+detectorFindInconsistentSync2=FindInconsistentSync2|true
+detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true
+detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true
+detectorFindMaskedFields=FindMaskedFields|true
+detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true
+detectorFindNakedNotify=FindNakedNotify|true
+detectorFindNonSerializableStoreIntoSession=FindNonSerializableStoreIntoSession|true
+detectorFindNonSerializableValuePassedToWriteObject=FindNonSerializableValuePassedToWriteObject|true
+detectorFindNonShortCircuit=FindNonShortCircuit|true
+detectorFindNullDeref=FindNullDeref|true
+detectorFindOpenStream=FindOpenStream|true
+detectorFindPuzzlers=FindPuzzlers|true
+detectorFindRefComparison=FindRefComparison|true
+detectorFindReturnRef=FindReturnRef|true
+detectorFindRunInvocations=FindRunInvocations|true
+detectorFindSelfComparison=FindSelfComparison|true
+detectorFindSelfComparison2=FindSelfComparison2|true
+detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true
+detectorFindSpinLoop=FindSpinLoop|true
+detectorFindSqlInjection=FindSqlInjection|true
+detectorFindTwoLockWait=FindTwoLockWait|true
+detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true
+detectorFindUnconditionalWait=FindUnconditionalWait|true
+detectorFindUninitializedGet=FindUninitializedGet|true
+detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true
+detectorFindUnreleasedLock=FindUnreleasedLock|true
+detectorFindUnsyncGet=FindUnsyncGet|true
+detectorFindUselessControlFlow=FindUselessControlFlow|true
+detectorHugeSharedStringConstants=HugeSharedStringConstants|true
+detectorIDivResultCastToDouble=IDivResultCastToDouble|true
+detectorIncompatMask=IncompatMask|true
+detectorInefficientMemberAccess=InefficientMemberAccess|false
+detectorInefficientToArray=InefficientToArray|true
+detectorInfiniteLoop=InfiniteLoop|true
+detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true
+detectorInfiniteRecursiveLoop2=InfiniteRecursiveLoop2|false
+detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true
+detectorInitializationChain=InitializationChain|true
+detectorInstantiateStaticClass=InstantiateStaticClass|true
+detectorInvalidJUnitTest=InvalidJUnitTest|true
+detectorIteratorIdioms=IteratorIdioms|true
+detectorLazyInit=LazyInit|true
+detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true
+detectorMethodReturnCheck=MethodReturnCheck|true
+detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true
+detectorMutableLock=MutableLock|true
+detectorMutableStaticFields=MutableStaticFields|true
+detectorNaming=Naming|true
+detectorNumberConstructor=NumberConstructor|true
+detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true
+detectorPublicSemaphores=PublicSemaphores|false
+detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true
+detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true
+detectorRedundantInterfaces=RedundantInterfaces|true
+detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true
+detectorSerializableIdiom=SerializableIdiom|true
+detectorStartInConstructor=StartInConstructor|true
+detectorStaticCalendarDetector=StaticCalendarDetector|true
+detectorStringConcatenation=StringConcatenation|true
+detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true
+detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true
+detectorSwitchFallthrough=SwitchFallthrough|true
+detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true
+detectorTestASM=TestASM|false
+detectorURLProblems=URLProblems|true
+detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true
+detectorUnnecessaryMath=UnnecessaryMath|true
+detectorUnreadFields=UnreadFields|true
+detectorUseObjectEquals=UseObjectEquals|false
+detectorUselessSubclassMethod=UselessSubclassMethod|false
+detectorVarArgsProblems=VarArgsProblems|true
+detectorVolatileUsage=VolatileUsage|true
+detectorWaitInLoop=WaitInLoop|true
+detectorWrongMapIterator=WrongMapIterator|true
+detectorXMLFactoryBypass=XMLFactoryBypass|true
+detector_threshold=2
+filter_settings=Medium|PERFORMANCE,CORRECTNESS,I18N,MT_CORRECTNESS,BAD_PRACTICE,MALICIOUS_CODE,STYLE|false
+filter_settings_neg=|

Added: trunk/core/org.cishell.docs/.project
===================================================================
--- trunk/core/org.cishell.docs/.project	                        (rev 0)
+++ trunk/core/org.cishell.docs/.project	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.cishell.docs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder (1).launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/Docs Builder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>net.sourceforge.texlipse.builder.TexlipseNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>


Property changes on: trunk/core/org.cishell.docs/.project
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/core/org.cishell.docs/build.properties
===================================================================
--- trunk/core/org.cishell.docs/build.properties	                        (rev 0)
+++ trunk/core/org.cishell.docs/build.properties	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,27 @@
+version = 0.8
+
+build.dir = build
+api.tex = api.tex
+api.final.tex = ${spec.dir}/tex/${api.tex}
+
+fw.src.dir = src
+fw.dir = ../org.cishell.framework
+fw.classpath = ${fw.dir}/lib/osgi.core.jar:${fw.dir}/lib/osgi.compendium.jar 
+fw.packages = org.cishell.framework.data,org.cishell.service.guibuilder,org.cishell.app.service.scheduler,org.cishell.framework,org.cishell.app.service.datamanager,org.cishell.framework.algorithm,org.cishell.service.conversion
+
+lib.ant_latex = lib/ant_latex_0.0.9_1.jar
+lib.texdoclet.jar = lib/texdoclet.jar
+
+texdoclet.dir = src/texdoclet
+
+spec.tex = main.tex
+spec.dir = src/specification
+spec.html.dir = ${build.dir}/cishell-specification-${version}
+spec.tmp.pdf = ${spec.dir}/main.pdf
+spec.final.pdf = ${build.dir}/cishell-specification-${version}.pdf
+
+guide.tex = main.tex
+guide.dir = src/dev_guide
+guide.html.dir = ${build.dir}/cishell-dev-guide-${version}
+guide.tmp.pdf = ${guide.dir}/main.pdf
+guide.final.pdf = ${build.dir}/cishell-dev-guide-${version}.pdf


Property changes on: trunk/core/org.cishell.docs/build.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/core/org.cishell.docs/build.xml
===================================================================
--- trunk/core/org.cishell.docs/build.xml	                        (rev 0)
+++ trunk/core/org.cishell.docs/build.xml	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="CIShell Documentation" default="all">
+	<property file="build.properties" />
+	
+	<target name="all" depends="javadoc-tex,build-spec,build-guide,setup"/>
+	
+	<target name="setup">
+		<mkdir dir="${build.dir}"/>
+		<available file="${lib.texdoclet.jar}" property="texdoclet-build.notRequired" />
+		<available file="${api.final.tex}" property="api-tex-build.notRequired" />
+	</target>
+	
+	<target name="setup-latex-task">
+		<taskdef name="latex"
+			classname="de.dokutransdata.antlatex.LaTeX"
+			classpath="${lib.ant_latex}" />
+		
+		<taskdef name="makeindex"  
+		    classname="de.dokutransdata.antlatex.MakeindexTask"  
+		    classpath="${lib.ant_latex}"/>
+		
+		<taskdef name="bibtex"  
+		    classname="de.dokutransdata.antlatex.BibTeXTask"  
+		    classpath="${lib.ant_latex}"/>
+	</target>
+	
+	<target name="build-spec" depends="setup,javadoc-tex">
+		<antcall target="latex">
+			<param name="tex_file" value="${spec.tex}"/>
+			<param name="working_dir" value="${spec.dir}"/>
+			<param name="html_dir" value="${spec.html.dir}"/>
+		</antcall>
+		<move file="${spec.tmp.pdf}" tofile="${spec.final.pdf}" />
+	</target>
+	
+	<target name="build-guide" depends="setup">
+		<antcall target="latex">
+			<param name="tex_file" value="${guide.tex}"/>
+			<param name="working_dir" value="${guide.dir}"/>
+			<param name="html_dir" value="${guide.html.dir}"/>
+		</antcall>
+		<move file="${guide.tmp.pdf}" tofile="${guide.final.pdf}" />
+	</target>
+	
+	<target name="build-texdoclet" depends="setup" unless="texdoclet-build.notRequired">
+		<ant dir="${texdoclet.dir}" target="${build.dir}" />
+	</target>
+	
+	<target name="javadoc-tex" depends="setup,build-texdoclet" unless="api-tex-build.notRequired">
+		<javadoc access="public"
+			source="1.4"  
+			packagenames="${fw.packages}" 
+			sourcepath="${fw.dir}/${fw.src.dir}" 
+			classpath="${fw.classpath}">
+			
+			<doclet name="org.wonderly.doclets.TexDoclet"
+				path="${lib.texdoclet.jar}">
+				<param name="-docdir" value="${fw.src.dir}"/>
+				<param name="-output" value="${api.final.tex}"/>
+			</doclet>
+		</javadoc>		
+	</target>
+	
+	<target name="latex" depends="setup-latex-task">
+		<latex
+			latexfile="${tex_file}"
+			verbose="off"
+			pdftex="true"
+			workingDir="${working_dir}" 
+		/>
+		<bibtex  
+			workingDir="${working_dir}">  
+		    <fileset dir="${working_dir}">  
+		    	<include name="*.aux"/>  
+		    </fileset>  
+		</bibtex>
+		
+		<!-- uncomment this when we get serious about html output
+		<mkdir dir="${working_dir}/html"/>
+		<mkdir dir="${html_dir}"/>
+		<exec executable="/usr/bin/env" dir="${working_dir}" >
+			<arg value="latex2html" />
+			<arg line="-dir html" />
+			<arg value="-white" />
+			<arg value="-auto_navigation" />
+			<arg line="-long_titles 20" />
+			<arg line="-external_file *.aux" />
+			<arg value="${tex_file}" />
+		</exec>
+		<move file="${working_dir}/html" tofile="${html_dir}"/>
+		-->
+		
+		<!-- Need to run twice to get the TOC/Bib/Glossary right -->
+		<latex
+				latexfile="${tex_file}"
+				verbose="off"
+				pdftex="true"
+				clean="true"
+				workingDir="${working_dir}" 
+		/>
+	</target>
+	
+	<target name="clean">
+		<ant dir="${texdoclet.dir}" target="clean" />
+		<delete dir="${build.dir}" />
+		<delete file="${lib.texdoclet.jar}" />
+		<delete file="${api.final.tex}"/>
+	</target>
+</project>


Property changes on: trunk/core/org.cishell.docs/build.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/core/org.cishell.docs/lib/ant_latex_0.0.9_1.jar
===================================================================
(Binary files differ)


Property changes on: trunk/core/org.cishell.docs/lib/ant_latex_0.0.9_1.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/core/org.cishell.docs/src/bibliography.bib
===================================================================
--- trunk/core/org.cishell.docs/src/bibliography.bib	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/bibliography.bib	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,28 @@
+@InProceedings{movieactors,
+  author = 	 {Herr, Bruce W. and Ke, Weimao and Hardy, Elisha and Börner, Katy},
+  title = 	 {Movies and Actors},
+  booktitle = {Proceedings of the 11th Information Visualisation Conference},
+  pages = 	 {465-469},
+  year = 	 {2007},
+  address = 	 {ETH Zürich, Switzerland},
+  publisher = {IEEE Computer Society Conference Publishing Services}
+}
+
+@Unpublished{chrisharrison,
+  author = 	 {Chris Harrison},
+  title = 	 {{WikiViz} v5},
+  note = 	 {from \url{http://www.chrisharrison.net/projects/wikiviz/}},
+  month = 	 {November},
+  year = 	 {2007}
+}
+
+@Article{holowaywiki,
+  author = 	 {Holloway, Todd and Božicevic, Miran and Börner, Katy},
+  title = 	 {Analyzing and Visualizing the Semantic Coverage of Wikipedia and Its Authors},
+  journal = 	 {Complexity\textnormal{, Special issue on Understanding Complex Systems}},
+  year = 	 {2007},
+  volume = 	 {12},
+  number = 	 {3},
+  pages = 	 {33-40},
+  note = 	 {Also available as cs.IR/0512085.q},
+}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/dev_guide/main.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/main.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/main.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,79 @@
+%% CIShell Algorithm Developer's Guide
+%%
+%
+
+\documentclass[pdftex,11pt,a4paper]{article}
+\usepackage[top=0.4in, left=0.5in, right=0.5in, bottom=0.6in]{geometry}
+\usepackage[pdftex]{graphicx}
+\DeclareGraphicsExtensions{.pdf,.png,.jpg,.mps,.eps}
+\usepackage[pdftex]{hyperref}
+\usepackage{color}
+
+\hypersetup{
+    pdftitle={CIShell Algorithm Developer's Guide},    % title
+    pdfsubject={CIShell Algorithm Developer's Guide},
+    pdfauthor={},      
+    pdfnewwindow=true,      % links in new window
+}
+
+\usepackage[refpages]{gloss}
+\renewcommand{\glosslinkborder}{0 0 0}
+\renewcommand{\glosslinkcolor}{blue}
+
+\makegloss
+
+\usepackage{../mystyle}
+
+\title{CIShell Algorithm Developer's Guide \\
+\textbf{DRAFT}}
+% \author{} % Will fill in later 
+% \date{} % ditto
+
+\begin{document}
+
+\maketitle{}
+\tableofcontents{}
+
+
+% Overview, introduction, etc.
+\input{./tex/coreoverview.tex}
+
+\section{Plugin Tutorials}
+% Setup
+\input{./tex/envsetup.tex}
+
+% General Algs
+\subsection{General Algorithm Development}
+\input{./tex/algconcepts.tex}
+\input{./tex/javaalgs.tex}
+\input{./tex/execalgs.tex}
+\input{./tex/jythonalgs.tex}
+
+% Specific Algs
+\subsection{Specific Algorithm types}
+\input{./tex/analysismodeling.tex}
+\input{./tex/vizalgs.tex}
+\input{./tex/dataalgs.tex}
+\input{./tex/converteralgs.tex}
+
+% Other Tutorials
+\input{./tex/javalibs.tex}
+\input{./tex/services.tex}
+\input{./tex/guicreation.tex}
+
+% Software Update Tool
+\input{./tex/usingupdatesites.tex}
+\input{./tex/creatingupdatesites.tex}
+
+\section{Appendix}
+\input{./tex/examplealgs.tex}
+\input{./tex/cishellupdatesites.tex}
+
+\printgloss{../glossary}
+
+% Bibliography:
+\clearpage
+\bibliographystyle{plain}
+\bibliography{../bibliography}
+
+\end{document}

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/algconcepts.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/algconcepts.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/algconcepts.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,11 @@
+\subsubsection{Concepts}
+
+\gloss[Long]{osgi} and stuff.
+
+\begin{figure}[htb!]
+\centering
+\includegraphics[width=90mm]{../img/algorithmDefn.pdf}
+\caption{Algorithm Definition}
+\label{fig:algorithmDefn}
+\end{figure}
+

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/analysismodeling.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/analysismodeling.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/analysismodeling.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,2 @@
+\subsubsection{Analysis}
+\subsubsection{Modeling}

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/cishellupdatesites.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/cishellupdatesites.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/cishellupdatesites.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsection{Accessing CIShell-Related Update Sites}

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/converteralgs.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/converteralgs.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/converteralgs.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,5 @@
+\subsubsection{Data Loading And Conversion}
+
+\paragraph{Introduction}
+\paragraph{Supporting New File Types}
+\paragraph{Converters}

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/coreoverview.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/coreoverview.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/coreoverview.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,4 @@
+\section{CIShell Core Overview}
+\subsection{Introduction}
+\subsection{Concepts}
+\subsection{GUI}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/creatingupdatesites.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/creatingupdatesites.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/creatingupdatesites.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,3 @@
+\subsection{Creating an Update Site}
+\subsubsection{Features}
+\subsubsection{Update Site}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/dataalgs.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/dataalgs.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/dataalgs.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsubsection{Sample Data}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/envsetup.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/envsetup.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/envsetup.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsection{Setting Up the Environment}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/examplealgs.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/examplealgs.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/examplealgs.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsection{Accessing Exemplary Algorithms}

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/execalgs.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/execalgs.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/execalgs.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsubsection{Static-Executable}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/glossary.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/glossary.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/glossary.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\section{Glossary}

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/guicreation.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/guicreation.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/guicreation.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsection{Creating GUIs}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/javaalgs.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/javaalgs.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/javaalgs.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsubsection{Java-based}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/javalibs.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/javalibs.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/javalibs.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsection{Java Libraries}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/jythonalgs.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/jythonalgs.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/jythonalgs.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsubsection{Jython-based}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/services.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/services.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/services.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsection{Available Services}

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/usingupdatesites.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/usingupdatesites.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/usingupdatesites.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,2 @@
+\section{Software Update Tool}
+\subsection{Using the Software Update Tool}

Added: trunk/core/org.cishell.docs/src/dev_guide/tex/vizalgs.tex
===================================================================
--- trunk/core/org.cishell.docs/src/dev_guide/tex/vizalgs.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/dev_guide/tex/vizalgs.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1 @@
+\subsubsection{Visualizations}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/glossary.bib
===================================================================
--- trunk/core/org.cishell.docs/src/glossary.bib	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/glossary.bib	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,11 @@
+% see http://www.ctan.org/tex-archive/macros/latex/contrib/gloss/ for docu
+
+@GLOSSDEF{osgi,
+	word="OSGi Alliance",
+	short="OSGi",
+	definition="The OSGi Alliance is an independent non-profit corporation 
+		comprised of technology innovators and developers and focused on the 
+		interoperability of applications and services based on its component 
+		integration platform."
+}
+

Added: trunk/core/org.cishell.docs/src/img/algorithmDefn.pdf
===================================================================
(Binary files differ)


Property changes on: trunk/core/org.cishell.docs/src/img/algorithmDefn.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/core/org.cishell.docs/src/img/algorithmDefn.svg
===================================================================
--- trunk/core/org.cishell.docs/src/img/algorithmDefn.svg	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/img/algorithmDefn.svg	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="/home/bherr/workspace/org.cishell.docs.intro/src/graphics"
+   sodipodi:docname="algorithmDefn.svg"
+   inkscape:export-filename="/home/bherr/workspace/org.cishell.docs.intro/src/graphics/algorithmDefn.png"
+   inkscape:export-xdpi="805.04999"
+   inkscape:export-ydpi="805.04999">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mstart"
+       style="overflow:visible">
+      <path
+         id="path6249"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.4)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.6407193"
+     inkscape:cx="240.99011"
+     inkscape:cy="627.15429"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1918"
+     inkscape:window-height="1128"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     showgrid="true"
+     showguides="false" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.875;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3976"
+       sodipodi:cx="263.5"
+       sodipodi:cy="416.86218"
+       sodipodi:rx="25"
+       sodipodi:ry="25"
+       d="M 286.5202,407.11179 A 25,25 0 1 1 263.82546,391.8643"
+       transform="translate(11,2.322265)"
+       sodipodi:start="5.8825365"
+       sodipodi:end="11.008593"
+       sodipodi:open="true" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3956"
+       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+       transform="translate(1.889705,4.808111)"><flowRegion
+         id="flowRegion3958"><rect
+           id="rect3960"
+           width="54.428574"
+           height="13.857147"
+           x="248.57143"
+           y="409.50504"
+           style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara3962">Algorithm</flowPara></flowRoot>    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="198.71484"
+       y="406.62976"
+       id="text3980"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan3982"
+         x="198.71484"
+         y="406.62976">Data[]</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="124.59766"
+       y="422.44031"
+       id="text3985"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3987"
+         x="124.59766"
+         y="422.44031">User-entered parameters</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="163.05078"
+       y="438.76257"
+       id="text3989"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3991"
+         x="163.05078"
+         y="438.76257">CIShell Context</tspan></text>
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 227,404.18445 L 244.36435,420.28379"
+       id="path3995"
+       inkscape:connector-type="polyline" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 227.75,420.11218 L 249.5,420.03445"
+       id="path3999"
+       inkscape:connector-type="polyline" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 227.25,435.36218 L 243.82846,420.28379"
+       id="path4001"
+       inkscape:connector-type="polyline" />
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="324.21484"
+       y="422.44031"
+       id="text4015"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4017"
+         x="324.21484"
+         y="422.44031">Data[]</tspan></text>
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.875;stroke-linecap:round;stroke-linejoin:miter;marker-start:url(#Arrow1Mstart);marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       d="M 318.4896,419.74999 L 299.99005,419.85517"
+       id="path4021"
+       inkscape:connector-type="polyline" />
+    <rect
+       style="fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.875;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect10645"
+       width="42.402164"
+       height="26"
+       x="275"
+       y="383.36218" />
+    <text
+       xml:space="preserve"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="277.21484"
+       y="392.44031"
+       id="text10647"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="277.21484"
+         y="392.44031"
+         id="tspan10655">Metadata</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:4px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="285.63672"
+       y="397.40125"
+       id="text10661"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan10663"
+         x="285.63672"
+         y="397.40125">key=value</tspan><tspan
+         sodipodi:role="line"
+         x="285.63672"
+         y="401.40125"
+         id="tspan10665">key=value</tspan><tspan
+         sodipodi:role="line"
+         x="285.63672"
+         y="405.40125"
+         id="tspan10667">key=value</tspan></text>
+  </g>
+</svg>


Property changes on: trunk/core/org.cishell.docs/src/img/algorithmDefn.svg
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/core/org.cishell.docs/src/mystyle.sty
===================================================================
--- trunk/core/org.cishell.docs/src/mystyle.sty	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/mystyle.sty	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,3 @@
+% used for custom commands
+\definecolor{comment}{rgb}{1,0,0}
+\newcommand{\comments}[1]{\textbf{\textcolor{comment}{#1}}}

Added: trunk/core/org.cishell.docs/src/specification/main.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/main.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/main.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,54 @@
+%% CIShell Specification
+%%
+%
+
+\documentclass[pdftex,11pt,a4paper]{report}
+\usepackage[top=0.4in, left=0.5in, right=0.5in, bottom=0.6in]{geometry}
+\usepackage[pdftex]{graphicx}
+\DeclareGraphicsExtensions{.pdf,.png,.jpg,.mps,.eps}
+\usepackage[pdftex]{hyperref}
+\usepackage{color}
+
+\hypersetup{
+    pdftitle={CIShell Specification},    % title
+    pdfsubject={CIShell Specification},
+    pdfauthor={},
+    pdfnewwindow=true,      % links in new window
+}
+
+\usepackage{../mystyle}
+
+\title{CIShell Specification \\
+\textbf{DRAFT}}
+% \author{} % Will fill in later 
+% \date{} % ditto
+
+\input{./tex/api.tex}
+\packagesheader{}
+
+\begin{document}
+
+\maketitle{}
+\tableofcontents{}
+
+\input{./tex/introduction.tex}
+\input{./tex/framework.tex}
+\input{./tex/algorithms.tex}
+\input{./tex/data.tex}
+\input{./tex/guidefinition.tex}
+\orgcishellframework{}
+
+%% Each service gets its own tex file
+\input{./tex/dataconversionservice.tex}
+\input{./tex/datamanagerservice.tex}
+\input{./tex/guibuilderservice.tex}
+\input{./tex/logservice.tex}
+\input{./tex/preferencesservice.tex}
+\input{./tex/schedulerservice.tex}
+
+% Bibliography:
+\clearpage
+\bibliographystyle{plain}
+\bibliography{../bibliography}
+
+\end{document}

Added: trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,13 @@
+\section{Algorithm Definition}
+\subsection{Introduction}
+
+\begin{figure}[htb!]
+\centering
+\includegraphics[width=90mm]{../img/algorithmDefn.pdf}
+\caption{Algorithm Definition}
+\label{fig:algorithmDefn}
+\end{figure}
+
+
+\subsection{Standard Algorithm Properties}
+\orgcishellframeworkalgorithm{}

Added: trunk/core/org.cishell.docs/src/specification/tex/data.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/data.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/data.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,4 @@
+\section{Data Definition}
+\subsection{Introduction}
+\subsection{Standard Data Properties}
+\orgcishellframeworkdata{}

Added: trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,4 @@
+\chapter{Data Conversion Service Specification}
+\section{Introduction}
+\section{Data Conversion Service}
+\orgcishellserviceconversion{}

Added: trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,4 @@
+\chapter{Data Manager Application Service Specification}
+\section{Introduction}
+\section{Data Manager Service}
+\orgcishellappservicedatamanager{}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/specification/tex/framework.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/framework.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/framework.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,5 @@
+\chapter{Framework API}
+\section{Introduction}
+\subsection{Essentials}
+\subsection{Entities}
+\subsection{Operations}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,5 @@
+\chapter{GUI Builder Service Specification}
+\section{Introduction}
+\section{GUI Definition}
+\section{GUI Builder Service}
+\orgcishellserviceguibuilder{}

Added: trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,4 @@
+\section{GUI Definition}
+\subsection{Introduction}
+\subsection{org.osgi.service.metatype}
+\subsection{MetaType Extensions}

Added: trunk/core/org.cishell.docs/src/specification/tex/introduction.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/introduction.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/introduction.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,5 @@
+\chapter{Introduction}
+\section{CIShell Overview}
+\section{What is New}
+\section{Reader Level}
+\section{Conventions and Terms}
\ No newline at end of file

Added: trunk/core/org.cishell.docs/src/specification/tex/logservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/logservice.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/logservice.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,4 @@
+\chapter{Log Service Specification}
+\section{Introduction}
+\section{Log Service}
+\section{org.osgi.service.log}

Added: trunk/core/org.cishell.docs/src/specification/tex/preferencesservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/preferencesservice.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/preferencesservice.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,4 @@
+\chapter{Preferences Service Specification}
+\section{Introduction}
+\section{Preferences Service}
+\section{org.osgi.service.prefs}

Added: trunk/core/org.cishell.docs/src/specification/tex/schedulerservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/schedulerservice.tex	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/schedulerservice.tex	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,4 @@
+\chapter{Scheduler Application Service Specification}
+\section{Introduction}
+\section{Scheduler Service}
+\orgcishellappservicescheduler{}

Added: trunk/core/org.cishell.docs/src/texdoclet/README
===================================================================
--- trunk/core/org.cishell.docs/src/texdoclet/README	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/texdoclet/README	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,3 @@
+Customized version of TexDoclet from: https://texdoclet.dev.java.net/
+
+

Added: trunk/core/org.cishell.docs/src/texdoclet/build.xml
===================================================================
--- trunk/core/org.cishell.docs/src/texdoclet/build.xml	                        (rev 0)
+++ trunk/core/org.cishell.docs/src/texdoclet/build.xml	2008-01-02 20:37:28 UTC (rev 591)
@@ -0,0 +1,93 @@
+<project name="overcyte" default="build">
+	<property name="build" location="build"/>
+	<property name="jars" location="../../lib"/>
+	<property name="version" value="1.0"/>
+	<property name="source" location=""/>
+	
+	<path id="texdoclet.classpath">
+		<pathelement path="${build}/"/>
+	</path>
+	
+	<target name="build" unless="build-completed"
+		description="Builds the whole tree"
+		depends="compile,jar,updjar">
+	</target>
+	<target name="all" unless="build-completed"
+		description="Builds the whole tree"
+		depends="compile,jar">
+	</target>
+	
+	<target name="updjar" unless="updjar-completed">
+		<copy file="${jars}/texdoclet.jar"
+			todir="${jars}"/>	
+	</target>
+	
+	<target name="jar" unless="jar-completed">
+		<jar destfile="${jars}/texdoclet.jar"
+			basedir="${build}"
+			filesonly="true"
+		/>
+	</target>
+	
+	<target name="rmic" unless="rmic-completed"
+		description="Run RMIC on remote classes"
+		depends="compile">
+	</target>
+	
+	<target name="compile" unless="compile-completed"
+		description="Builds the whole tree"
+		depends="mkdirs">
+	
+		<javac srcdir="${source}/src"
+			destdir="${build}"
+			source="1.4"
+			target="1.4"
+			classpathref="texdoclet.classpath"
+			/>
+
+		<!--
+		<javadoc
+			packagenames="org.wonderly.*"
+			destdir="www/javadocs"
+			author="true"
+			version="true"
+			use="true"
+			windowtitle="Java Docs"
+			>
+			<fileset dir="src">
+			</fileset>
+		</javadoc>
+	    
+		<jar destfile="www/docs.zip"
+			basedir="www/javadocs"
+			filesonly="true"
+		/>
+	
+		<jar destfile="www/texdoclet.jar"
+			basedir="build"
+			filesonly="true"
+		/>
+	    -->
+	</target>
+	
+	<target name="javadoclet">
+		<javadoc>
+			<doclet name="org.wonderly.doclets.TexDoclet"
+				path="${jars}/texdoclet.jar">
+			</doclet>
+			<fileset dir="src">
+			</fileset>
+		</javadoc>
+	</target>
+	
+	<target name="clean">
+		<delete dir="${build}"/>
+		<delete file="${jars}/texdoclet.jar"/>
+	</target>
+	
+	<target name="mkdirs">
+		<delete dir="${build}"/>
+		<mkdir dir="${build}"/>
+		<mkdir dir="${jars}"/>
+	</target>
+</project>


Property changes on: trunk/core/org.cishell.docs/src/texdoclet/build.xml
________...
 
[truncated message content]

[CIShell-SVN] SF.net SVN: cishell: [590] trunk/core/org.cishell.docs/

From: <bh...@us...> - 2008-01-02 20:36:17

Revision: 590
          http://cishell.svn.sourceforge.net/cishell/?rev=590&view=rev
Author:   bh2
Date:     2008-01-02 12:36:05 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
Initial commit of the cishell documentation project. Lots of content is still left to be included, but the build system is done.

Added Paths:
-----------
    trunk/core/org.cishell.docs/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [589] trunk/clients/gui/org.cishell.reference.gui. persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java

From: <hu...@us...> - 2007-12-21 15:18:50

Revision: 589
          http://cishell.svn.sourceforge.net/cishell/?rev=589&view=rev
Author:   huangb
Date:     2007-12-21 07:18:39 -0800 (Fri, 21 Dec 2007)

Log Message:
-----------
set the default directory for File-->Load as sampledata directory, 
which contains isi and network sub-folders.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java

Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java	2007-12-19 20:50:31 UTC (rev 588)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java	2007-12-21 15:18:39 UTC (rev 589)
@@ -106,15 +106,12 @@
     	    	FileDialog dialog = new FileDialog(window.getShell(), SWT.OPEN);
 		        if (currentDir == null) {
 		        	currentDir = new File(System.getProperty("osgi.install.area").replace("file:","")
-		            		+ "sampledata"+File.separator+"Network");
+		            		+ "sampledata");
                     
                     if (!currentDir.exists()) {
                     	currentDir = new File(System.getProperty("osgi.install.area").replace("file:","")
-    		            		+ "sampledata" +File.separator+"Network"+ File.separator + "anything");
-                    } 
-//                    else {
-//                        currentDir = new File(System.getProperty("user.dir") + File.separator + "sampledata" + File.separator + "anything");
-//                    }
+    		            		+ "sampledata" +File.separator + "anything");
+                    }                   
 		        }
 		        dialog.setFilterPath(currentDir.getPath());
 		        dialog.setText("Select a File");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [588] trunk/deployment/org.cishell.reference.releng/ build_local.properties

From: <bh...@us...> - 2007-12-19 20:50:34

Revision: 588
          http://cishell.svn.sourceforge.net/cishell/?rev=588&view=rev
Author:   bh2
Date:     2007-12-19 12:50:31 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
changed releng output dir so different people running nightly builds on the same machine won't step on each other.

Modified Paths:
--------------
    trunk/deployment/org.cishell.reference.releng/build_local.properties

Modified: trunk/deployment/org.cishell.reference.releng/build_local.properties
===================================================================
--- trunk/deployment/org.cishell.reference.releng/build_local.properties	2007-12-19 20:37:56 UTC (rev 587)
+++ trunk/deployment/org.cishell.reference.releng/build_local.properties	2007-12-19 20:50:31 UTC (rev 588)
@@ -9,7 +9,7 @@
 # where the build takes place
 # THIS DIRECTORY WILL BE DELETED !!!
 #
-buildDirectory=/tmp/pluginbuilder/org.cishell.reference.releng
+buildDirectory=/tmp/pluginbuilder.${user.name}/org.cishell.reference.releng
 
 #
 # the eclipse build host


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [587] trunk/deployment/cishell-installer/

From: <bh...@us...> - 2007-12-19 20:37:58

Revision: 587
          http://cishell.svn.sourceforge.net/cishell/?rev=587&view=rev
Author:   bh2
Date:     2007-12-19 12:37:56 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
cishell-installer is dead, 
long live org.cishell.reference.releng!

Removed Paths:
-------------
    trunk/deployment/cishell-installer/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [586] trunk/templates/org.cishell.templates.tasks/src/ org/cishell/templates/dataset/DatasetIntegrationTask.java

From: <hu...@us...> - 2007-12-19 20:11:47

Revision: 586
          http://cishell.svn.sourceforge.net/cishell/?rev=586&view=rev
Author:   huangb
Date:     2007-12-19 12:11:45 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
fixed a bug in the dataset integration ant task

Modified Paths:
--------------
    trunk/templates/org.cishell.templates.tasks/src/org/cishell/templates/dataset/DatasetIntegrationTask.java

Modified: trunk/templates/org.cishell.templates.tasks/src/org/cishell/templates/dataset/DatasetIntegrationTask.java
===================================================================
--- trunk/templates/org.cishell.templates.tasks/src/org/cishell/templates/dataset/DatasetIntegrationTask.java	2007-12-19 20:09:48 UTC (rev 585)
+++ trunk/templates/org.cishell.templates.tasks/src/org/cishell/templates/dataset/DatasetIntegrationTask.java	2007-12-19 20:11:45 UTC (rev 586)
@@ -117,14 +117,12 @@
         File parent = dataProps.getParentFile();
         while (parent != null && !parent.getName().equals("data") &&
                 !parent.getParent().equals(baseDir.getName())) {
-            symbolicDir = parent.getName() + "/" + symbolicDir;
+            symbolicDir = parent.getName() + "." + symbolicDir;
             parent = parent.getParentFile();
         }
-        //symbolicDir at this point should be '/' or /dir1/dir2/
-        symbolicDir = "/" + symbolicDir;
+        symbolicDir = "." + symbolicDir;
         
-        String pid = symbolicName + symbolicDir.replace(File.separatorChar, '.')
-            + dataFile.getName();
+        String pid = symbolicName + dataFile.getName();
         
         out.println("service.pid="+pid);
         out.close();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [585] trunk/examples/org.cishell.tests. ProgressTrackableAlgorithm/META-INF/MANIFEST.MF

From: <hu...@us...> - 2007-12-19 20:09:52

Revision: 585
          http://cishell.svn.sourceforge.net/cishell/?rev=585&view=rev
Author:   huangb
Date:     2007-12-19 12:09:48 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
update the metadata

Modified Paths:
--------------
    trunk/examples/org.cishell.tests.ProgressTrackableAlgorithm/META-INF/MANIFEST.MF

Modified: trunk/examples/org.cishell.tests.ProgressTrackableAlgorithm/META-INF/MANIFEST.MF
===================================================================
--- trunk/examples/org.cishell.tests.ProgressTrackableAlgorithm/META-INF/MANIFEST.MF	2007-12-19 18:29:53 UTC (rev 584)
+++ trunk/examples/org.cishell.tests.ProgressTrackableAlgorithm/META-INF/MANIFEST.MF	2007-12-19 20:09:48 UTC (rev 585)
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: My algorithm tester
-Bundle-SymbolicName: org.my.algorithm.test
+Bundle-Name: ProgressTrackableAlgorithm
+Bundle-SymbolicName: org.cishell.tests.ProgressTrackableAlgorithm
 Bundle-Version: 0.3.0
 Bundle-ClassPath: .
 Bundle-Localization: plugin


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [584] trunk/deployment/org.cishell.reference.releng/ installer

From: <bh...@us...> - 2007-12-19 18:29:58

Revision: 584
          http://cishell.svn.sourceforge.net/cishell/?rev=584&view=rev
Author:   bh2
Date:     2007-12-19 10:29:53 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
some minor text updates to the cishell installer

Modified Paths:
--------------
    trunk/deployment/org.cishell.reference.releng/installer/build.xml
    trunk/deployment/org.cishell.reference.releng/installer/info/license.txt
    trunk/deployment/org.cishell.reference.releng/installer/info/mac_instructions.txt

Modified: trunk/deployment/org.cishell.reference.releng/installer/build.xml
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/build.xml	2007-12-19 18:02:18 UTC (rev 583)
+++ trunk/deployment/org.cishell.reference.releng/installer/build.xml	2007-12-19 18:29:53 UTC (rev 584)
@@ -6,7 +6,7 @@
 	Maintained by Bruce Herr (bh...@bh...).
 -->
 
-<project name='CIShell Installer' default='compile.both' basedir='.'>
+<project name='CIShell Installer Builder' default='compile.both' basedir='.'>
 	<!--  Properties -->
 	<property file="build.properties" />
 	<property name="full.jar" value="${archivePrefix}-full-installer_${version}.jar"/>
@@ -54,8 +54,7 @@
 		<authors>
 			<author name="Bruce Herr" email="bh...@bh..." />
 			<author name="Weixia Huang" email="hu...@in..." />
-			<author name="Shashikant Penumarthy" email="sp...@cs..." />
-			<author name="Dr. Katy Borner" email="ka...@in..." />
+			<author name="Katy Borner" email="ka...@in..." />
 		</authors>
 		<url>@{home.url}/</url>
 		<webdir>@{packs.url}</webdir>
@@ -96,14 +95,14 @@
 		The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
 	-->
 	<resources>
-		<res id="LicencePanel.licence" src="info/license.txt" />
+		<res id="LicencePanel.licence" src="info/license.txt" parse="yes" />
 		<!-- <res id="Installer.image" src="info/nice-image.png" /> -->
 		<res src="info/windows_shortcut_specification.xml"
 			id="shortcutSpec.xml" />
 		<res src="info/unix_shortcut_specification.xml"
 			id="Unix_shortcutSpec.xml"/>
-		<res id="InfoPanel.info" src="info/thanks.txt" />
-		<res id="XInfoPanel.info" src="info/mac_instructions.txt" />
+		<res id="InfoPanel.info" src="info/thanks.txt" parse="yes" />
+		<res id="XInfoPanel.info" src="info/mac_instructions.txt" parse="yes" />
 	</resources>
 
 	<native type="izpack" name="ShellLink.dll" />

Modified: trunk/deployment/org.cishell.reference.releng/installer/info/license.txt
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/info/license.txt	2007-12-19 18:02:18 UTC (rev 583)
+++ trunk/deployment/org.cishell.reference.releng/installer/info/license.txt	2007-12-19 18:29:53 UTC (rev 584)
@@ -16,5 +16,4 @@
 Project Contacts:
 Bruce Herr (bh...@bh...)
 Weixia Huang (hu...@in...)
-Shashikant Penumarthy (sp...@in...)
-Dr. Katy Borner (ka...@in...)
+Katy Borner (ka...@in...)

Modified: trunk/deployment/org.cishell.reference.releng/installer/info/mac_instructions.txt
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/info/mac_instructions.txt	2007-12-19 18:02:18 UTC (rev 583)
+++ trunk/deployment/org.cishell.reference.releng/installer/info/mac_instructions.txt	2007-12-19 18:29:53 UTC (rev 584)
@@ -1,5 +1,7 @@
 Extra installation steps for Mac OSX users:
 
-For all CIShell features to work properly, please upgrade to the newest version
-of Java, version 1.5.0 Release 5 (or greater). See the FAQ section at 
-http://cishell.org for more information.
+In order to get certain Swing or AWT based algorithms to work, some additional
+steps are needed. First, you need Java version 1.5.0 Release 4 (or greater). 
+Second, you must download and install the "SWT Compatibility Libraries" from 
+the Apple Developer Connection website at 'http://connect.apple.com'. See the 
+FAQ section at http://cishell.org for more information.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [583] trunk/deployment/org.cishell.reference.releng/ installer/${files.dir}/

From: <bh...@us...> - 2007-12-19 18:02:23

Revision: 583
          http://cishell.svn.sourceforge.net/cishell/?rev=583&view=rev
Author:   bh2
Date:     2007-12-19 10:02:18 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
killed a maverick directory

Removed Paths:
-------------
    trunk/deployment/org.cishell.reference.releng/installer/${files.dir}/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [582] trunk/deployment/org.cishell.reference.releng

From: <bh...@us...> - 2007-12-19 18:01:59

Revision: 582
          http://cishell.svn.sourceforge.net/cishell/?rev=582&view=rev
Author:   bh2
Date:     2007-12-19 10:01:45 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
Initial commit of the installer builder for cishell

Modified Paths:
--------------
    trunk/deployment/org.cishell.reference.releng/build_local.properties

Added Paths:
-----------
    trunk/deployment/org.cishell.reference.releng/installer/
    trunk/deployment/org.cishell.reference.releng/installer/${files.dir}/
    trunk/deployment/org.cishell.reference.releng/installer/build.properties
    trunk/deployment/org.cishell.reference.releng/installer/build.xml
    trunk/deployment/org.cishell.reference.releng/installer/info/
    trunk/deployment/org.cishell.reference.releng/installer/info/license.txt
    trunk/deployment/org.cishell.reference.releng/installer/info/mac_instructions.txt
    trunk/deployment/org.cishell.reference.releng/installer/info/thanks.txt
    trunk/deployment/org.cishell.reference.releng/installer/info/unix_shortcut_specification.xml
    trunk/deployment/org.cishell.reference.releng/installer/info/windows_shortcut_specification.xml
    trunk/deployment/org.cishell.reference.releng/installer/lib/
    trunk/deployment/org.cishell.reference.releng/installer/lib/standalone-compiler.jar
    trunk/deployment/org.cishell.reference.releng/installer/post_install/
    trunk/deployment/org.cishell.reference.releng/installer/post_install/post_install.bat
    trunk/deployment/org.cishell.reference.releng/installer/post_install/post_install.sh

Modified: trunk/deployment/org.cishell.reference.releng/build_local.properties
===================================================================
--- trunk/deployment/org.cishell.reference.releng/build_local.properties	2007-12-17 23:16:23 UTC (rev 581)
+++ trunk/deployment/org.cishell.reference.releng/build_local.properties	2007-12-19 18:01:45 UTC (rev 582)
@@ -14,7 +14,7 @@
 #
 # the eclipse build host
 #
-eclipseDir=../org.cishell.reference.releng.eclipse/eclipse/
+eclipseDir=/projects/cishell/releng/org.cishell.reference.releng.eclipse/eclipse/
 
 #
 # environment: both the environment for the eclipse build host (baseos, basews and basearch)

Added: trunk/deployment/org.cishell.reference.releng/installer/build.properties
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/build.properties	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.releng/installer/build.properties	2007-12-19 18:01:45 UTC (rev 582)
@@ -0,0 +1,13 @@
+project.name=Cyberinfrastructure Shell
+project.short.name=CIShell
+home.url=http://cishell.org
+files.url.base=http://cishell.org/nightly
+
+#These properties could be passed in by the releng stuff
+#but it would also double the size of each nightly dir.
+#So, I recommend not creating this until a release is made.
+version=0.8.0
+version.full=0.8.0.200712180500NGT
+buildLabel = N-${version.full}
+finalResults=/projects/cishell/www/htdocs/nightly
+archivePrefix=cishell


Property changes on: trunk/deployment/org.cishell.reference.releng/installer/build.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/deployment/org.cishell.reference.releng/installer/build.xml
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/build.xml	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.releng/installer/build.xml	2007-12-19 18:01:45 UTC (rev 582)
@@ -0,0 +1,225 @@
+<!--
+	CIShell: Cyberinfrastructure Shell (http://cishell.org/)
+
+	CIShell Installer Generator
+	
+	Maintained by Bruce Herr (bh...@bh...).
+-->
+
+<project name='CIShell Installer' default='compile.both' basedir='.'>
+	<!--  Properties -->
+	<property file="build.properties" />
+	<property name="full.jar" value="${archivePrefix}-full-installer_${version}.jar"/>
+	<property name="web.jar" value="${archivePrefix}-web-installer_${version}.jar"/>
+	<property name="build.dir" value="${finalResults}/${version.full}"/>
+	<property name="packs.url" value="${files.url.base}/${version.full}/packs"/>
+	<property name="packs.dir" value="${build.dir}/packs" />
+	
+	<!-- Allows us to use the IzPack Ant task -->
+	<taskdef name="izpack" classpath="${basedir}/lib/standalone-compiler.jar"
+	         classname="com.izforge.izpack.ant.IzPackTask"/>
+	
+	<target name='compile.both' depends='compile.web,compile.full' />
+	
+	<target name='compile.full'>
+		<antcall target="-compile">
+			<param name="installerType" value="standard" />
+			<param name="outputFile" value="${build.dir}/${full.jar}" />
+		</antcall>
+	</target>
+	
+	<target name='compile.web'>
+		<mkdir dir="${packs.dir}"/>
+		<antcall target="-compile">
+			<param name="installerType" value="web" />
+			<param name="outputFile" value="${packs.dir}/${web.jar}" />
+		</antcall>
+		<move file="${packs.dir}/${web.jar}" tofile="${build.dir}/${web.jar}" />
+	</target>
+	
+	<target name='-compile'>
+		<izpack installerType="${installerType}"
+				output="${outputFile}"
+		        basedir="${basedir}">
+			<config><![CDATA[
+<installation version="1.0">
+
+	<!-- 
+		The info section.
+	-->			
+	<info>
+		<appname>@{project.name}</appname>
+		<appsubpath>@{archivePrefix}</appsubpath>
+		<appversion>@{version}</appversion>
+		<authors>
+			<author name="Bruce Herr" email="bh...@bh..." />
+			<author name="Weixia Huang" email="hu...@in..." />
+			<author name="Shashikant Penumarthy" email="sp...@cs..." />
+			<author name="Dr. Katy Borner" email="ka...@in..." />
+		</authors>
+		<url>@{home.url}/</url>
+		<webdir>@{packs.url}</webdir>
+		<javaversion>1.4</javaversion>
+	</info>
+		
+	<variables>
+		<variable name="archivePrefix" value="@{archivePrefix}"/>
+		<variable name="projectName" value="@{project.name}"/>
+		<variable name="projectShortName" value="@{project.short.name}"/>				
+	</variables>
+	
+	<!-- 
+		The gui preferences indication.
+		Sets the installer window to 640x480. It will not be able to change the size.
+	-->
+	<guiprefs width="640" height="480" resizable="no">
+		<laf name="metouia">
+			<os family="unix" />
+		</laf>
+		<laf name="looks">
+			<os family="windows" />
+			<param name="variant" value="extwin" />
+		</laf>
+		<modifier value="true" key="showDebugWindow"/>
+	</guiprefs>
+
+	<!-- 
+		The locale section.
+		Asks here to include the English and French langpacks.
+	-->
+	<locale>
+		<langpack iso3="eng" />
+	</locale>
+
+	<!-- 
+		The resources section.
+		The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
+	-->
+	<resources>
+		<res id="LicencePanel.licence" src="info/license.txt" />
+		<!-- <res id="Installer.image" src="info/nice-image.png" /> -->
+		<res src="info/windows_shortcut_specification.xml"
+			id="shortcutSpec.xml" />
+		<res src="info/unix_shortcut_specification.xml"
+			id="Unix_shortcutSpec.xml"/>
+		<res id="InfoPanel.info" src="info/thanks.txt" />
+		<res id="XInfoPanel.info" src="info/mac_instructions.txt" />
+	</resources>
+
+	<native type="izpack" name="ShellLink.dll" />
+
+	<!-- 
+		The panels section.
+		We indicate here which panels we want to use. The order will be respected.
+	-->
+	<panels>
+		<panel classname="HelloPanel" />
+		<panel classname="LicencePanel" />
+		<panel classname="PacksPanel"/>				
+		<panel classname="TargetPanel" />		
+		<panel classname="InstallPanel" />
+		<panel classname="ShortcutPanel" />
+		<panel os="mac" classname="XInfoPanel" />
+		<panel classname="InfoPanel" />
+		<panel classname="SimpleFinishPanel" />
+	</panels>
+
+	<!-- 
+		The packs section.
+		We specify here our packs.
+	-->
+	<packs>
+		<pack name="Windows_Vista" os="windows" required="no">
+			<description>Windows Vista Version</description>
+			<file unpack="true" targetdir="$INSTALL_PATH" 
+				  src="@{build.dir}/@{archivePrefix}-@{buildLabel}-win32.wpf.x86.zip" />
+				
+			<parsable targetfile="$INSTALL_PATH/post_install.bat" />
+			<file targetdir="$INSTALL_PATH" 
+				src="post_install/post_install.bat" />
+			<executable keep="false" stage="postinstall"
+				targetfile="$INSTALL_PATH/post_install.bat" />
+		</pack>
+		<pack name="Windows_XP" os="windows" required="no">
+			<description>Windows 2000/XP Version</description>
+			<file unpack="true" targetdir="$INSTALL_PATH" 
+				  src="@{build.dir}/@{archivePrefix}-@{buildLabel}-win32.win32.x86.zip" />
+			
+			<parsable targetfile="$INSTALL_PATH/post_install.bat" />
+			<file targetdir="$INSTALL_PATH" 
+				src="post_install/post_install.bat" />				
+			<executable keep="false" stage="postinstall"
+				targetfile="$INSTALL_PATH/post_install.bat"/>
+		</pack>
+		<pack name="32-bit_Linux_(x86)" os="unix" required="no">
+			<description>32-bit Linux (x86) Version</description>
+			<file unpack="true" targetdir="$INSTALL_PATH" 
+				  src="@{build.dir}/@{archivePrefix}-@{buildLabel}-linux.gtk.x86.zip" />
+			
+			<parsable targetfile="$INSTALL_PATH/post_install.sh" />
+			<file targetdir="$INSTALL_PATH"
+				src="post_install/post_install.sh" />
+			<executable keep="false" stage="postinstall"
+				targetfile="$INSTALL_PATH/post_install.sh" />
+			<executable keep="true" stage="never" 
+				targetfile="$INSTALL_PATH/@{archivePrefix}" />
+		</pack>
+		<pack name="64-bit_Linux_(x86_64)" os="unix" required="no">
+			<description>64-bit Linux (x86_64) Version</description>
+			<file unpack="true" targetdir="$INSTALL_PATH" 
+				  src="@{build.dir}/@{archivePrefix}-@{buildLabel}-linux.gtk.x86_64.zip" />
+			
+			<parsable targetfile="$INSTALL_PATH/post_install.sh" />
+			<file targetdir="$INSTALL_PATH" 
+				src="post_install/post_install.sh" />
+			<executable keep="false" stage="postinstall"
+				targetfile="$INSTALL_PATH/post_install.sh" />
+			<executable keep="true" stage="never" 
+				targetfile="$INSTALL_PATH/@{archivePrefix}" />
+		</pack>
+		<pack name="Mac_OSX_(x86)" os="mac" required="no">
+			<description>Mac OSX (x86) Version</description>
+			<file unpack="true" targetdir="$INSTALL_PATH" 
+				  src="@{build.dir}/@{archivePrefix}-@{buildLabel}-macosx.carbon.x86.zip" />
+				
+			<parsable targetfile="$INSTALL_PATH/post_install.sh" />
+			<file targetdir="$INSTALL_PATH" 
+				src="post_install/post_install.sh" />
+			<executable keep="false" stage="postinstall"
+				targetfile="$INSTALL_PATH/post_install.sh" />
+			<executable keep="true" stage="never" 
+				targetfile="$INSTALL_PATH/@{archivePrefix}.app/Contents/MacOS/@{archivePrefix}" />	
+		</pack>
+		<pack name="Mac_OSX_(ppc)" os="mac" required="no">
+			<description>Mac OSX (ppc) Version</description>
+			<file unpack="true" targetdir="$INSTALL_PATH" 
+				  src="@{build.dir}/@{archivePrefix}-@{buildLabel}-macosx.carbon.ppc.zip" />
+			
+			<parsable targetfile="$INSTALL_PATH/post_install.sh" />
+			<file targetdir="$INSTALL_PATH" 
+				src="post_install/post_install.sh" />
+			<executable keep="false" stage="postinstall"
+				targetfile="$INSTALL_PATH/post_install.sh" />
+			<executable keep="true" stage="never" 
+				targetfile="$INSTALL_PATH/@{archivePrefix}.app/Contents/MacOS/@{archivePrefix}" />
+		</pack>
+		<pack name="Solaris_(sparc)" os="unix" required="no">
+			<description>Solaris (sparc) Version</description>
+			<file unpack="true" targetdir="$INSTALL_PATH" 
+				  src="@{build.dir}/@{archivePrefix}-@{buildLabel}-solaris.gtk.sparc.zip" />
+			
+			<parsable targetfile="$INSTALL_PATH/post_install.sh" />
+			<file targetdir="$INSTALL_PATH" 
+				src="post_install/post_install.sh" />
+			<executable keep="false" stage="postinstall"
+				targetfile="$INSTALL_PATH/post_install.sh" />
+			<executable keep="true" stage="never" 
+				targetfile="$INSTALL_PATH/@{archivePrefix}" />
+		</pack>
+	</packs>
+
+</installation>
+			]]></config>
+		</izpack>
+	</target>
+</project>
\ No newline at end of file


Property changes on: trunk/deployment/org.cishell.reference.releng/installer/build.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/deployment/org.cishell.reference.releng/installer/info/license.txt
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/info/license.txt	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.releng/installer/info/license.txt	2007-12-19 18:01:45 UTC (rev 582)
@@ -0,0 +1,20 @@
+CIShell: Cyberinfrastructure Shell
+Copyright 2005 Indiana University
+
+Licensed under the Apache License, Version 2.0 (the "License"); 
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software 
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
+implied. See the License for the specific language governing 
+permissions and limitations under the License.
+
+Project Contacts:
+Bruce Herr (bh...@bh...)
+Weixia Huang (hu...@in...)
+Shashikant Penumarthy (sp...@in...)
+Dr. Katy Borner (ka...@in...)


Property changes on: trunk/deployment/org.cishell.reference.releng/installer/info/license.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/deployment/org.cishell.reference.releng/installer/info/mac_instructions.txt
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/info/mac_instructions.txt	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.releng/installer/info/mac_instructions.txt	2007-12-19 18:01:45 UTC (rev 582)
@@ -0,0 +1,5 @@
+Extra installation steps for Mac OSX users:
+
+For all CIShell features to work properly, please upgrade to the newest version
+of Java, version 1.5.0 Release 5 (or greater). See the FAQ section at 
+http://cishell.org for more information.


Property changes on: trunk/deployment/org.cishell.reference.releng/installer/info/mac_instructions.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/deployment/org.cishell.reference.releng/installer/info/thanks.txt
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/info/thanks.txt	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.releng/installer/info/thanks.txt	2007-12-19 18:01:45 UTC (rev 582)
@@ -0,0 +1,8 @@
+Installation of CIShell: Cyberinfrastructure Shell was successful!
+
+If you have any problems, please contact the CIShell development team at 
+ci...@li....
+New releases will be announced on the users list. You can sign up on our 
+sourceforge page at http://sourceforge.net/projects/cishell 
+
+Please go to http://cishell.org for more information and breaking news.


Property changes on: trunk/deployment/org.cishell.reference.releng/installer/info/thanks.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/deployment/org.cishell.reference.releng/installer/info/unix_shortcut_specification.xml
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/info/unix_shortcut_specification.xml	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.releng/installer/info/unix_shortcut_specification.xml	2007-12-19 18:01:45 UTC (rev 582)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<shortcuts>
+  <programGroup defaultName="${projectShortName}" location="applications"/>
+   <shortcut
+     name="${projectShortName}"
+     programGroup="yes"
+     desktop="yes"
+     applications="no"
+     startMenu="yes"
+     startup="no"
+     target="$INSTALL_PATH/${archivePrefix}"
+     commandLine=""
+     workingDirectory="$INSTALL_PATH"
+     description="${projectName}"
+     iconFile="$INSTALL_PATH/icon.xpm"
+     iconIndex="0"
+     type="Application"
+     encoding="UTF-8"
+     terminal="false"
+     KdeSubstUID="false"
+     initialState="normal">
+   </shortcut>
+</shortcuts>


Property changes on: trunk/deployment/org.cishell.reference.releng/installer/info/unix_shortcut_specification.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/deployment/org.cishell.reference.releng/installer/info/windows_shortcut_specification.xml
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/info/windows_shortcut_specification.xml	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.releng/installer/info/windows_shortcut_specification.xml	2007-12-19 18:01:45 UTC (rev 582)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<shortcuts>
+  <programGroup defaultName="${projectName}"
+                location="startMenu"/>
+  <shortcut
+    name="${projectName}"
+    target="$INSTALL_PATH\${archivePrefix}.exe"
+    commandLine=""
+    workingDirectory="$INSTALL_PATH"
+    description="${projectName}"
+    iconFile="$INSTALL_PATH\${archivePrefix}.exe"
+    iconIndex="0"
+    initialState="normal"
+    programGroup="yes"
+    desktop="yes"
+    applications="no"
+    startMenu="yes"
+    startup="no">
+  </shortcut>
+  
+  <shortcut
+    name="Uninstall ${projectShortName}"
+    target="$INSTALL_PATH\Uninstaller\uninstaller.jar"
+    commandLine=""
+    workingDirectory="$INSTALL_PATH\Uninstaller"
+    description="Uninstall ${projectShortName}"
+    iconFile="$INSTALL_PATH\${archivePrefix}.exe"
+    iconIndex="0"
+    initialState="normal"
+    programGroup="yes"
+    desktop="yes"
+    applications="no"
+    startMenu="yes"
+    startup="no">
+  </shortcut>
+  
+</shortcuts>


Property changes on: trunk/deployment/org.cishell.reference.releng/installer/info/windows_shortcut_specification.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/deployment/org.cishell.reference.releng/installer/lib/standalone-compiler.jar
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/org.cishell.reference.releng/installer/lib/standalone-compiler.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/org.cishell.reference.releng/installer/post_install/post_install.bat
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/post_install/post_install.bat	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.releng/installer/post_install/post_install.bat	2007-12-19 18:01:45 UTC (rev 582)
@@ -0,0 +1,3 @@
+move "$INSTALL_PATH\${archivePrefix}" "$INSTALL_PATH\${archivePrefix}_install"
+xcopy /E "$INSTALL_PATH\${archivePrefix}_install\*" "$INSTALL_PATH"
+rmdir /S /Q "$INSTALL_PATH\${archivePrefix}_install"

Added: trunk/deployment/org.cishell.reference.releng/installer/post_install/post_install.sh
===================================================================
--- trunk/deployment/org.cishell.reference.releng/installer/post_install/post_install.sh	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.releng/installer/post_install/post_install.sh	2007-12-19 18:01:45 UTC (rev 582)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+mv "$INSTALL_PATH/${archivePrefix}" "$INSTALL_PATH/${archivePrefix}_install"
+mv "$INSTALL_PATH/${archivePrefix}_install"/* "$INSTALL_PATH"
+mv "$INSTALL_PATH/${archivePrefix}_install"/.* "$INSTALL_PATH"
+rmdir "$INSTALL_PATH/${archivePrefix}_install"


Property changes on: trunk/deployment/org.cishell.reference.releng/installer/post_install/post_install.sh
___________________________________________________________________
Name: svn:mime-type
   + text/plain


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [581] trunk/deployment/org.cishell.reference.releng/ build-files/customTargets.xml

From: <bh...@us...> - 2007-12-17 23:16:25

Revision: 581
          http://cishell.svn.sourceforge.net/cishell/?rev=581&view=rev
Author:   bh2
Date:     2007-12-17 15:16:23 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
fixed a mac specific bug in the releng project

Modified Paths:
--------------
    trunk/deployment/org.cishell.reference.releng/build-files/customTargets.xml

Modified: trunk/deployment/org.cishell.reference.releng/build-files/customTargets.xml
===================================================================
--- trunk/deployment/org.cishell.reference.releng/build-files/customTargets.xml	2007-12-17 19:53:09 UTC (rev 580)
+++ trunk/deployment/org.cishell.reference.releng/build-files/customTargets.xml	2007-12-17 23:16:23 UTC (rev 581)
@@ -167,7 +167,10 @@
 		
 		<zip destfile="${archiveName}" update="true" >
 			<zipfileset dir="${buildDirectory}/temp.extra-files" includes="**/*" excludes="${archivePrefix}/${archivePrefix}*"/>
-			<zipfileset dir="${buildDirectory}/temp.extra-files" includes="${archivePrefix}/${archivePrefix}*" filemode="755"/>
+			<zipfileset dir="${buildDirectory}/temp.extra-files" includes="${archivePrefix}/${archivePrefix}*" filemode="755"/>
+			
+			<!-- Set executable bit for Mac binaries -->
+			<zipfileset dir="${buildDirectory}/temp.extra-files" includes="${archivePrefix}/${archivePrefix}.app/MacOS/${archivePrefix}" filemode="755"/>
 		</zip>
 		<delete dir="${buildDirectory}/temp.extra-files"/>
 	</target>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [580] trunk/deployment/org.cishell.reference.releng/ build-files/fetchSvnAll.xml

From: <bh...@us...> - 2007-12-17 19:53:23

Revision: 580
          http://cishell.svn.sourceforge.net/cishell/?rev=580&view=rev
Author:   bh2
Date:     2007-12-17 11:53:09 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
added svn checkout of new brand feature in the releng project

Modified Paths:
--------------
    trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml

Modified: trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml
===================================================================
--- trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml	2007-12-17 19:51:32 UTC (rev 579)
+++ trunk/deployment/org.cishell.reference.releng/build-files/fetchSvnAll.xml	2007-12-17 19:53:09 UTC (rev 580)
@@ -84,6 +84,12 @@
       <param name="project.name" value="/deployment/org.cishell.reference.gui.feature"/>
       <param name="url" value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk"/>
     </antcall>
+  	<antcall target="svn.co">
+      <param name="target" value="features"/>
+      <param name="element.id" value="org.cishell.reference.gui.brand.feature"/>
+      <param name="project.name" value="/deployment/org.cishell.reference.gui.brand.feature"/>
+      <param name="url" value="https://cishell.svn.sourceforge.net/svnroot/cishell/trunk"/>
+    </antcall>  	
     <antcall target="svn.co">
       <param name="target" value="plugins"/>
       <param name="element.id" value="org.cishell.reference.gui.brand.cishell"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [579] trunk/deployment/org.cishell.reference.gui.brand .feature

From: <bh...@us...> - 2007-12-17 19:51:36

Revision: 579
          http://cishell.svn.sourceforge.net/cishell/?rev=579&view=rev
Author:   bh2
Date:     2007-12-17 11:51:32 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
Initial commit of the cishell brand feature following a refactor of the reference gui feature.

Added Paths:
-----------
    trunk/deployment/org.cishell.reference.gui.brand.feature/.project
    trunk/deployment/org.cishell.reference.gui.brand.feature/build.properties
    trunk/deployment/org.cishell.reference.gui.brand.feature/feature.xml

Added: trunk/deployment/org.cishell.reference.gui.brand.feature/.project
===================================================================
--- trunk/deployment/org.cishell.reference.gui.brand.feature/.project	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.gui.brand.feature/.project	2007-12-17 19:51:32 UTC (rev 579)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.cishell.reference.gui.brand.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>


Property changes on: trunk/deployment/org.cishell.reference.gui.brand.feature/.project
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/deployment/org.cishell.reference.gui.brand.feature/build.properties
===================================================================
--- trunk/deployment/org.cishell.reference.gui.brand.feature/build.properties	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.gui.brand.feature/build.properties	2007-12-17 19:51:32 UTC (rev 579)
@@ -0,0 +1 @@
+bin.includes = feature.xml


Property changes on: trunk/deployment/org.cishell.reference.gui.brand.feature/build.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/deployment/org.cishell.reference.gui.brand.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.reference.gui.brand.feature/feature.xml	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.gui.brand.feature/feature.xml	2007-12-17 19:51:32 UTC (rev 579)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.cishell.reference.gui.brand.feature"
+      label="CIShell Branding Feature"
+      version="0.8.0">
+
+   <description url="http://cishell.org">
+      Branded CIShell Reference GUI
+   </description>
+
+   <copyright>
+      Copyright 2006 Indiana University
+   </copyright>
+
+   <license url="http://www.apache.org/licenses/LICENSE-2.0">
+      CIShell: Cyberinfrastructure Shell
+Copyright 2006 Indiana University
+Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at:
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, 
+software distributed under the License is distributed on an 
+&quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
+KIND, either express or implied. See the License for the specific
+language governing permissions and limitations under the License.
+Project Contacts:
+Bruce Herr (bh...@bh...)
+Weixia Huang (hu...@in...)
+Shashikant Penumarthy (sp...@in...)
+Dr. Katy Borner (ka...@in...)
+   </license>
+
+   <url>
+      <update label="CIShell Update Site" url="http://cishell.org/update"/>
+      <discovery label="CIShell Update Site" url="http://cishell.org/update"/>
+   </url>
+
+   <includes
+         id="org.cishell.reference.gui.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.cishell.reference.gui.brand.cishell"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>


Property changes on: trunk/deployment/org.cishell.reference.gui.brand.feature/feature.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [578] trunk/deployment

From: <bh...@us...> - 2007-12-17 19:51:26

Revision: 578
          http://cishell.svn.sourceforge.net/cishell/?rev=578&view=rev
Author:   bh2
Date:     2007-12-17 11:51:12 -0800 (Mon, 17 Dec 2007)

Log Message:
-----------
refactored the reference gui feature to not have the cishell brand in it. Then a cishell brand feature is created that also includes the reference gui feature.

Modified Paths:
--------------
    trunk/deployment/org.cishell.reference.gui.feature/feature.xml
    trunk/deployment/org.cishell.reference.releng/cishell.product

Modified: trunk/deployment/org.cishell.reference.gui.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.reference.gui.feature/feature.xml	2007-12-17 19:50:36 UTC (rev 577)
+++ trunk/deployment/org.cishell.reference.gui.feature/feature.xml	2007-12-17 19:51:12 UTC (rev 578)
@@ -37,13 +37,6 @@
    </url>
 
    <plugin
-         id="org.cishell.reference.gui.brand.cishell"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.cishell.reference.gui.datamanager"
          download-size="0"
          install-size="0"

Modified: trunk/deployment/org.cishell.reference.releng/cishell.product
===================================================================
--- trunk/deployment/org.cishell.reference.releng/cishell.product	2007-12-17 19:50:36 UTC (rev 577)
+++ trunk/deployment/org.cishell.reference.releng/cishell.product	2007-12-17 19:51:12 UTC (rev 578)
@@ -43,10 +43,11 @@
    </plugins>
 
    <features>
+      <feature id="org.cishell.environment.equinox.feature" version="0.0.0"/>
       <feature id="org.cishell.feature" version="0.3.0"/>
       <feature id="org.cishell.reference.feature" version="0.4.0"/>
       <feature id="org.cishell.reference.gui.feature" version="0.4.0"/>
-      <feature id="org.cishell.environment.equinox.feature" version="0.0.0"/>
+      <feature id="org.cishell.reference.gui.brand.feature" version="0.8.0"/>
    </features>
 
 </product>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 .. 27 28 29 30 31 .. 45 > >> (Page 29 of 45)