Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [650] trunk/core/org.cishell.docs/src
|
From: <bh...@us...> - 2008-03-11 19:36:43
|
Revision: 650
http://cishell.svn.sourceforge.net/cishell/?rev=650&view=rev
Author: bh2
Date: 2008-03-11 12:35:36 -0700 (Tue, 11 Mar 2008)
Log Message:
-----------
* Revised the title page
* Added apache 2.0 license text
* updated figures
* added acknowledgements
* added userprefs package for user-adjustable preferences
Barring any other editions, this spec is... DONE!!!!
Modified Paths:
--------------
branches/spec_update/org.cishell.framework/META-INF/MANIFEST.MF
branches/spec_update/org.cishell.framework/javadoc.xml
branches/spec_update/org.cishell.framework/src/org/cishell/overview.html
trunk/core/org.cishell.docs/build.properties
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
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/algorithmtypes.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/osgidependencies.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/specification/tex/useradjustableprefs.tex
Added Paths:
-----------
branches/spec_update/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs
branches/spec_update/org.cishell.framework/src/org/cishell/framework/userprefs/
branches/spec_update/org.cishell.framework/src/org/cishell/framework/userprefs/UserPrefsProperty.java
branches/spec_update/org.cishell.framework/src/org/cishell/framework/userprefs/package.html
trunk/core/org.cishell.docs/src/img/cishellLogo.png
trunk/core/org.cishell.docs/src/specification/tex/license.tex
trunk/core/org.cishell.docs/src/specification/tex/title.tex
Added: branches/spec_update/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- branches/spec_update/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ branches/spec_update/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs 2008-03-11 19:35:36 UTC (rev 650)
@@ -0,0 +1,12 @@
+#Wed Feb 06 22:39:13 GMT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
Modified: branches/spec_update/org.cishell.framework/META-INF/MANIFEST.MF
===================================================================
--- branches/spec_update/org.cishell.framework/META-INF/MANIFEST.MF 2008-03-10 22:31:38 UTC (rev 649)
+++ branches/spec_update/org.cishell.framework/META-INF/MANIFEST.MF 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,19 +1,19 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: CIShell Framework API
+Bundle-Name: CIShell Platform API
Bundle-SymbolicName: org.cishell.framework
-Bundle-Version: 0.3.0
-Bundle-Vendor: Bruce Herr
-Bundle-Localization: plugin
+Bundle-Version: 1.0.0
+Bundle-Vendor: Cyberinfrastructure for Network Science Center
Import-Package: org.osgi.framework,
org.osgi.service.log,
org.osgi.service.metatype,
org.osgi.service.prefs
-Export-Package: org.cishell.app.service.datamanager,
- org.cishell.app.service.scheduler,
- org.cishell.framework,
- org.cishell.framework.algorithm,
- org.cishell.framework.data,
- org.cishell.service.conversion,
- org.cishell.service.guibuilder
-Eclipse-LazyStart: true
+Export-Package: org.cishell.app.service.datamanager;version="1.0.0",
+ org.cishell.app.service.scheduler;version="1.0.0",
+ org.cishell.framework;version="1.0.0",
+ org.cishell.framework.algorithm;version="1.0.0",
+ org.cishell.framework.data;version="1.0.0",
+ org.cishell.framework.userprefs;version="1.0.0",
+ org.cishell.service.conversion;version="1.0.0",
+ org.cishell.service.guibuilder;version="1.0.0"
+Bundle-ActivationPolicy: lazy
Modified: branches/spec_update/org.cishell.framework/javadoc.xml
===================================================================
--- branches/spec_update/org.cishell.framework/javadoc.xml 2008-03-10 22:31:38 UTC (rev 649)
+++ branches/spec_update/org.cishell.framework/javadoc.xml 2008-03-11 19:35:36 UTC (rev 650)
@@ -14,7 +14,7 @@
version="true"
nodeprecatedlist="false"
nodeprecated="false"
- packagenames="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"
+ packagenames="org.cishell.framework.data,org.cishell.framework.userprefs,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"
sourcepath="src"
classpath="lib/osgi.core.jar:lib/osgi.compendium.jar"
overview="src/org/cishell/overview.html"
Added: branches/spec_update/org.cishell.framework/src/org/cishell/framework/userprefs/UserPrefsProperty.java
===================================================================
--- branches/spec_update/org.cishell.framework/src/org/cishell/framework/userprefs/UserPrefsProperty.java (rev 0)
+++ branches/spec_update/org.cishell.framework/src/org/cishell/framework/userprefs/UserPrefsProperty.java 2008-03-11 19:35:36 UTC (rev 650)
@@ -0,0 +1,112 @@
+/* ****************************************************************************
+ * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Apache License v2.0 which accompanies
+ * this distribution, and is available at:
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ *
+ * Created on Feb 8, 2008 at Indiana University.
+ *
+ * Contributors:
+ * Indiana University -
+ * ***************************************************************************/
+package org.cishell.framework.userprefs;
+
+/**
+ * A standard set of properties and values to be placed in a service's
+ * metadata Dictionary when registering a service with the OSGi service registry
+ * for the purpose of publishing and receiving user-adjustable preferences.
+ *
+ * See the <a href="http://cishell.org/dev/docs/spec/cishell-spec-1.0.pdf">
+ * CIShell Specification 1.0</a> for information on publishing user-adjustable
+ * preferences.
+ */
+public interface UserPrefsProperty {
+
+ /**
+ * The suffix to add to the service's PID for generating a local preferences
+ * PID when using the standard naming convention
+ */
+ public static final String LOCAL_PREFS_OCD_SUFFIX = ".prefs.local";
+
+ /**
+ * The suffix to add to the service's PID for generating a global preferences
+ * PID when using the standard naming convention
+ */
+ public static final String GLOBAL_PREFS_OCD_SUFFIX = ".prefs.global";
+
+ /**
+ * The suffix to add to the service's PID for an {@link Algorithm}'s
+ * user-entered input parameters PID when using the standard naming convention
+ */
+ public static final String PARAM_PREFS_OCD_SUFFIX = "";
+
+ /**
+ * The key for specifying a local preferences PID.
+ * Only use this when not following the standard naming convention.
+ */
+ public static final String LOCAL_PREFS_PID = "local_prefs_pid";
+
+ /**
+ * The key for specifying a global preferences PID.
+ * Only use this when not following the standard naming convention.
+ */
+ public static final String GLOBAL_PREFS_PID = "global_prefs_pid";
+
+
+
+ /**
+ * The key for specifying what types of preferences are published
+ */
+ public static final String PREFS_PUBLISHED_KEY = "prefs_published";
+
+ /**
+ * The value for specifying that local preferences are to be published
+ */
+ public static final String PUBLISH_LOCAL_PREFS_VALUE = "local";
+
+ /**
+ * The value for specifying that global preferences are to be published
+ */
+ public static final String PUBLISH_GLOBAL_PREFS_VALUE = "global";
+
+ /**
+ * The value for specifying that an {@link Algorithm}'s user-entered input
+ * parameter defaults may be adjusted by the user
+ */
+ public static final String PUBLISH_PARAM_DEFAULT_PREFS_VALUE = "param-defaults";
+
+ /**
+ * The key for declaring a need to receive preferences. "true" and "false"
+ * are the possible associated values.
+ */
+ public static final String RECEIVE_PREFS_KEY = "receive_prefs";
+
+
+
+ /**
+ * The suffix to add to the service's PID for getting the local preferences
+ * directly from the ConfigurationAdmin (not recommended)
+ */
+ public static final String LOCAL_PREFS_CONF_SUFFIX = "";
+
+ /**
+ * The suffix to add to the service's PID for getting the global preferences
+ * directly from the ConfigurationAdmin (not recommended)
+ */
+ public static final String GLOBAL_PREFS_CONF_SUFFIX = GLOBAL_PREFS_OCD_SUFFIX;
+
+ /**
+ * The suffix to add to the service's PID for getting an {@link Algorithm}'s
+ * user-entered input parameter defaults that have been user-adjusted directly
+ * from the ConfigurationAdmin (not recommended)
+ */
+ public static final String PARAM_PREFS_CONF_SUFFIX = ".prefs.params";
+
+ /**
+ * A key set in each configuration object which states the Bundle-Version of
+ * the service when it was last updated
+ */
+ public static final String BUNDLE_VERSION_KEY = "Bundle-Version";
+}
Added: branches/spec_update/org.cishell.framework/src/org/cishell/framework/userprefs/package.html
===================================================================
--- branches/spec_update/org.cishell.framework/src/org/cishell/framework/userprefs/package.html (rev 0)
+++ branches/spec_update/org.cishell.framework/src/org/cishell/framework/userprefs/package.html 2008-03-11 19:35:36 UTC (rev 650)
@@ -0,0 +1,30 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>org.cishell.framework.userprefs Package-level Javadoc</title>
+<!--
+/* ****************************************************************************
+ * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Apache License v2.0 which accompanies
+ * this distribution, and is available at:
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ *
+ * Created on Mar 11, 2008 at Indiana University.
+ *
+ * Contributors:
+ * Indiana University -
+ * ***************************************************************************/
+-->
+</head>
+<body>Provides interfaces required for publishing user-adjustable preferences.
+<h2>Package Specification</h2>
+The API related to publishing user-adjustable preferences.
+
+@see <a href="http://cishell.org/dev/docs/spec/cishell-spec-1.0.pdf">
+CIShell Specification 1.0</a>
+
+</body>
+</html>
\ No newline at end of file
Modified: branches/spec_update/org.cishell.framework/src/org/cishell/overview.html
===================================================================
--- branches/spec_update/org.cishell.framework/src/org/cishell/overview.html 2008-03-10 22:31:38 UTC (rev 649)
+++ branches/spec_update/org.cishell.framework/src/org/cishell/overview.html 2008-03-11 19:35:36 UTC (rev 650)
@@ -20,7 +20,7 @@
-->
</head>
<body>
-API documentation for the Cyberinfrastructure Shell specification
+API documentation for the Cyberinfrastructure Shell specification.
@see <a href="http://www.osgi.org/osgi_technology/download_specs.asp">OSGi
Service Platform Specification, Release 4</a></li>
Modified: trunk/core/org.cishell.docs/build.properties
===================================================================
--- trunk/core/org.cishell.docs/build.properties 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/build.properties 2008-03-11 19:35:36 UTC (rev 650)
@@ -7,7 +7,7 @@
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
+fw.packages = org.cishell.framework.data,org.cishell.framework.userprefs,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
Modified: trunk/core/org.cishell.docs/src/img/cishellInteraction.dia
===================================================================
(Binary files differ)
Modified: trunk/core/org.cishell.docs/src/img/cishellInteraction.eps
===================================================================
--- trunk/core/org.cishell.docs/src/img/cishellInteraction.eps 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/img/cishellInteraction.eps 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,11 +1,11 @@
%!PS-Adobe-2.0 EPSF-2.0
%%Title: /home/bherr/workspace/org.cishell.docs/src/img/cishellInteraction.dia
%%Creator: Dia v0.96.1
-%%CreationDate: Fri Mar 7 16:39:20 2008
+%%CreationDate: Tue Mar 11 11:32:40 2008
%%For: bherr
%%Orientation: Portrait
%%Magnification: 1.0000
-%%BoundingBox: 0 0 1055 520
+%%BoundingBox: 0 0 1257 521
%%BeginSetup
%%EndSetup
%%EndComments
@@ -341,7 +341,7 @@
currentdict end
definefont pop
28.346000 -28.346000 scale
-3.053560 -24.440100 translate
+10.163560 -24.440100 translate
%%EndProlog
@@ -381,17 +381,17 @@
[] 0 sd
0 slj
0 slc
-n 27.417828 17.145000 m 23.876500 17.145000 l 23.876500 17.144000 l 22.655676 17.144000 l s
+n 27.417800 17.145000 m 23.876500 17.145000 l 23.876500 17.144000 l 22.655700 17.144000 l s
/Courier-latin1 ff 0.560000 scf sf
(Creates) 23.976500 16.864500 m
dup sw 2.450000 exch sub
7 div exch 0.0 exch
gs 1 -1 sc ashow gr
-(n) 26.867828 16.865000 m
+(n) 26.867800 16.865000 m
dup sw 0.350000 exch sub
1 div exch 0.0 exch
gs 1 -1 sc ashow gr
-(1) 22.855676 16.864000 m
+(1) 22.855700 16.864000 m
dup sw 0.350000 exch sub
1 div exch 0.0 exch
gs 1 -1 sc ashow gr
@@ -414,16 +414,16 @@
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 12.958700 10.229000 m 12.958700 12.429000 l 19.143700 12.429000 l 19.143700 10.229000 l f
+n 13.008700 9.429000 m 13.008700 11.629000 l 19.193700 11.629000 l 19.193700 9.429000 l f
0.000000 0.000000 0.000000 srgb
-n 12.958700 10.229000 m 12.958700 12.429000 l 19.143700 12.429000 l 19.143700 10.229000 l cp s
+n 13.008700 9.429000 m 13.008700 11.629000 l 19.193700 11.629000 l 19.193700 9.429000 l cp s
/Courier-latin1 ff 0.560000 scf sf
-(<<interface>>) 13.776200 10.731500 m
+(<<interface>>) 13.826200 9.931500 m
dup sw 4.550000 exch sub
13 div exch 0.0 exch
gs 1 -1 sc ashow gr
/Helvetica-Bold-latin1 ff 0.700000 scf sf
-(DataValidator) 13.208700 11.699000 m
+(DataValidator) 13.258700 10.899000 m
dup sw 5.685000 exch sub
13 div exch 0.0 exch
gs 1 -1 sc ashow gr
@@ -495,14 +495,14 @@
[] 0 sd
[] 0 sd
0 slc
-n 16.035133 15.993750 m 16.049006 12.915798 l s
+n 16.035100 15.993800 m 16.093829 12.115748 l s
[] 0 sd
0 slj
0 slc
-n 16.050696 12.540802 m 16.298440 13.041924 l 16.049006 12.915798 l 15.798445 13.039670 l ef
-n 16.050696 12.540802 m 16.298440 13.041924 l 16.049006 12.915798 l 15.798445 13.039670 l cp s
+n 16.099507 11.740791 m 16.341907 12.244519 l 16.093829 12.115748 l 15.841965 12.236948 l ef
+n 16.099507 11.740791 m 16.341907 12.244519 l 16.093829 12.115748 l 15.841965 12.236948 l cp s
/Courier-latin1 ff 0.560000 scf sf
-( Optional) 16.043166 14.071375 m
+( Optional) 16.068150 13.671400 m
dup sw 3.150000 exch sub
9 div exch 0.0 exch
gs 1 -1 sc ashow gr
@@ -525,7 +525,7 @@
[] 0 sd
0 slj
0 slc
-n 18.731000 22.187000 m 18.736900 22.187000 l 18.736900 18.244000 l 18.781750 18.244000 l s
+n 18.796000 22.187000 m 18.736900 22.187000 l 18.736900 18.244000 l 18.781700 18.244000 l s
/Courier-latin1 ff 0.560000 scf sf
(Service Constants) 18.836900 19.935500 m
dup sw 5.950000 exch sub
@@ -567,16 +567,16 @@
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 3.336170 6.180020 m 3.336170 8.380020 l 12.048670 8.380020 l 12.048670 6.180020 l f
+n 3.348670 6.167520 m 3.348670 8.367520 l 12.061170 8.367520 l 12.061170 6.167520 l f
0.000000 0.000000 0.000000 srgb
-n 3.336170 6.180020 m 3.336170 8.380020 l 12.048670 8.380020 l 12.048670 6.180020 l cp s
+n 3.348670 6.167520 m 3.348670 8.367520 l 12.061170 8.367520 l 12.061170 6.167520 l cp s
/Courier-latin1 ff 0.560000 scf sf
-(<<class>>) 6.117420 6.682520 m
+(<<class>>) 6.129920 6.670020 m
dup sw 3.150000 exch sub
9 div exch 0.0 exch
gs 1 -1 sc ashow gr
/Helvetica-Bold-latin1 ff 0.700000 scf sf
-(LocalCIShellContext) 3.586170 7.650020 m
+(LocalCIShellContext) 3.598670 7.637520 m
dup sw 8.212500 exch sub
19 div exch 0.0 exch
gs 1 -1 sc ashow gr
@@ -585,19 +585,19 @@
[] 0 sd
0 slj
0 slc
-n 7.710510 11.258897 m 7.710510 8.828840 l 7.711170 8.828840 l 7.711170 8.429910 l s
+n 7.701548 11.258857 m 7.710510 8.828840 l 7.704920 8.828840 l 7.704920 8.417545 l s
[] 0 sd
0 slj
0 slc
-n 7.710510 11.633897 m 7.460510 11.133897 l 7.710510 11.258897 l 7.960510 11.133897 l ef
-n 7.710510 11.633897 m 7.460510 11.133897 l 7.710510 11.258897 l 7.960510 11.133897 l cp s
+n 7.700165 11.633854 m 7.452011 11.132936 l 7.701548 11.258857 l 7.952007 11.134780 l ef
+n 7.700165 11.633854 m 7.452011 11.132936 l 7.701548 11.258857 l 7.952007 11.134780 l cp s
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
+n 22.713700 17.313300 m 21.619000 18.353100 l 22.713000 18.353100 l ef
+n 22.713700 17.313300 m 21.619000 18.353100 l 22.713000 18.353100 l cp s
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
@@ -671,67 +671,170 @@
gs 1 -1 sc ashow gr
0.100000 slw
[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 15.656400 6.140000 m 15.656400 8.340000 l 23.778900 8.340000 l 23.778900 6.140000 l f
+0.000000 0.000000 0.000000 srgb
+n 15.656400 6.140000 m 15.656400 8.340000 l 23.778900 8.340000 l 23.778900 6.140000 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) 17.442650 6.642500 m
+dup sw 4.550000 exch sub
+13 div exch 0.0 exch
+ gs 1 -1 sc ashow gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(ParameterMutator) 15.906400 7.610000 m
+dup sw 7.622500 exch sub
+16 div exch 0.0 exch
+ gs 1 -1 sc ashow gr
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slc
+n 19.722600 15.993800 m 19.717965 8.826803 l s
+[] 0 sd
0 slj
0 slc
-n 1.095190 10.315100 m 2.207520 10.315100 l 2.207520 12.896000 l 4.361150 12.896000 l s
-(Provides Access) 2.307520 11.325550 m
-dup sw 5.250000 exch sub
-15 div exch 0.0 exch
+n 19.717722 8.451803 m 19.968046 8.951642 l 19.717965 8.826803 l 19.468046 8.951965 l ef
+n 19.717722 8.451803 m 19.968046 8.951642 l 19.717965 8.826803 l 19.468046 8.951965 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+( Optional) 19.720125 12.026900 m
+dup sw 3.150000 exch sub
+9 div exch 0.0 exch
gs 1 -1 sc ashow gr
-(4) 1.295190 10.035100 m
-dup sw 0.350000 exch sub
-1 div exch 0.0 exch
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n -5.096060 14.242500 m -5.096060 16.442500 l -0.046060 16.442500 l -0.046060 14.242500 l f
+0.000000 0.000000 0.000000 srgb
+n -5.096060 14.242500 m -5.096060 16.442500 l -0.046060 16.442500 l -0.046060 14.242500 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) -4.846060 14.745000 m
+dup sw 4.550000 exch sub
+13 div exch 0.0 exch
gs 1 -1 sc ashow gr
-(n) 3.811150 12.616000 m
-dup sw 0.350000 exch sub
-1 div exch 0.0 exch
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(LogService) -4.832310 15.712500 m
+dup sw 4.522500 exch sub
+10 div exch 0.0 exch
gs 1 -1 sc ashow gr
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n -3.003560 9.065060 m 0.446440 9.065060 l 1.046440 9.665060 l 1.046440 11.565060 l -3.003560 11.565060 l ef
+n -8.508560 11.530000 m -8.508560 13.730000 l -0.036060 13.730000 l -0.036060 11.530000 l f
0.000000 0.000000 0.000000 srgb
-n -3.003560 9.065060 m 0.446440 9.065060 l 1.046440 9.665060 l 1.046440 11.565060 l -3.003560 11.565060 l cp s
-0.050000 slw
-n 0.446440 9.065060 m 0.446440 9.665060 l 1.046440 9.665060 l s
+n -8.508560 11.530000 m -8.508560 13.730000 l -0.036060 13.730000 l -0.036060 11.530000 l cp s
/Courier-latin1 ff 0.560000 scf sf
-(Standard ) -2.653560 10.117560 m
-dup sw 3.150000 exch sub
-9 div exch 0.0 exch
+(<<interface>>) -6.547310 12.032500 m
+dup sw 4.550000 exch sub
+13 div exch 0.0 exch
gs 1 -1 sc ashow gr
-(Services) -2.653560 10.917560 m
-dup sw 2.800000 exch sub
-8 div exch 0.0 exch
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(PreferencesService) -8.258560 13.000000 m
+dup sw 7.972500 exch sub
+18 div exch 0.0 exch
gs 1 -1 sc ashow gr
0.100000 slw
[] 0 sd
1.000000 1.000000 1.000000 srgb
-n 15.656440 6.540000 m 15.656440 8.740000 l 23.778940 8.740000 l 23.778940 6.540000 l f
+n -10.113560 6.160000 m -10.113560 8.360000 l -0.046060 8.360000 l -0.046060 6.160000 l f
0.000000 0.000000 0.000000 srgb
-n 15.656440 6.540000 m 15.656440 8.740000 l 23.778940 8.740000 l 23.778940 6.540000 l cp s
+n -10.113560 6.160000 m -10.113560 8.360000 l -0.046060 8.360000 l -0.046060 6.160000 l cp s
/Courier-latin1 ff 0.560000 scf sf
-(<<interface>>) 17.442690 7.042500 m
+(<<interface>>) -7.354810 6.662500 m
dup sw 4.550000 exch sub
13 div exch 0.0 exch
gs 1 -1 sc ashow gr
/Helvetica-Bold-latin1 ff 0.700000 scf sf
-(ParameterMutator) 15.906440 8.010000 m
-dup sw 7.622500 exch sub
-16 div exch 0.0 exch
+(DataConversionService) -9.863560 7.630000 m
+dup sw 9.567500 exch sub
+21 div exch 0.0 exch
gs 1 -1 sc ashow gr
0.100000 slw
[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n -8.008560 8.867500 m -8.008560 11.067500 l -0.056060 11.067500 l -0.056060 8.867500 l f
+0.000000 0.000000 0.000000 srgb
+n -8.008560 8.867500 m -8.008560 11.067500 l -0.056060 11.067500 l -0.056060 8.867500 l cp s
+/Courier-latin1 ff 0.560000 scf sf
+(<<interface>>) -6.307310 9.370000 m
+dup sw 4.550000 exch sub
+13 div exch 0.0 exch
+ gs 1 -1 sc ashow gr
+/Helvetica-Bold-latin1 ff 0.700000 scf sf
+(GUIBuilderService) -7.758560 10.337500 m
+dup sw 7.452500 exch sub
+17 div exch 0.0 exch
+ gs 1 -1 sc ashow gr
+0.100000 slw
[] 0 sd
+0 slj
0 slc
-n 19.722633 15.993750 m 19.718022 9.226803 l s
+n 0.002994 7.260000 m 2.047600 7.260000 l 2.047600 12.896000 l 4.410510 12.896000 l s
+/Courier-latin1 ff 0.560000 scf sf
+(Provides Access) 2.147600 9.798000 m
+dup sw 5.250000 exch sub
+15 div exch 0.0 exch
+ gs 1 -1 sc ashow gr
+(1) 0.202994 6.980000 m
+dup sw 0.350000 exch sub
+1 div exch 0.0 exch
+ gs 1 -1 sc ashow gr
+(n) 3.860510 12.616000 m
+dup sw 0.350000 exch sub
+1 div exch 0.0 exch
+ gs 1 -1 sc ashow gr
+0.100000 slw
[] 0 sd
+[] 0 sd
0 slj
0 slc
-n 19.717766 8.851803 m 19.968107 9.351633 l 19.718022 9.226803 l 19.468107 9.351974 l ef
-n 19.717766 8.851803 m 19.968107 9.351633 l 19.718022 9.226803 l 19.468107 9.351974 l cp s
-/Courier-latin1 ff 0.560000 scf sf
-( Optional) 19.720161 12.226875 m
-dup sw 3.150000 exch sub
-9 div exch 0.0 exch
+n 0.053166 10.164762 m -1.041534 11.204562 l 0.052466 11.204562 l ef
+n 0.053166 10.164762 m -1.041534 11.204562 l 0.052466 11.204562 l cp s
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slj
+0 slc
+n 0.043882 12.838512 m -1.050818 13.878312 l 0.043182 13.878312 l ef
+n 0.043882 12.838512 m -1.050818 13.878312 l 0.043182 13.878312 l cp s
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slj
+0 slc
+n 0.052632 15.554762 m -1.042068 16.594562 l 0.051932 16.594562 l ef
+n 0.052632 15.554762 m -1.042068 16.594562 l 0.051932 16.594562 l cp s
+0.100000 slw
+[] 0 sd
+[] 0 sd
+0 slj
+0 slc
+n 0.061382 7.458512 m -1.033318 8.498312 l 0.060682 8.498312 l ef
+n 0.061382 7.458512 m -1.033318 8.498312 l 0.060682 8.498312 l cp s
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n -0.006049 9.967500 m 2.043610 9.967500 l 2.043610 12.896000 l 4.361082 12.896000 l s
+(1) 0.193951 9.687500 m
+dup sw 0.350000 exch sub
+1 div exch 0.0 exch
gs 1 -1 sc ashow gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 0.011290 12.630000 m 2.043610 12.630000 l 2.043610 12.896000 l 4.410510 12.896000 l s
+(1) 0.211290 12.350000 m
+dup sw 0.350000 exch sub
+1 div exch 0.0 exch
+ gs 1 -1 sc ashow gr
+0.100000 slw
+[] 0 sd
+0 slj
+0 slc
+n 0.003286 15.342500 m 2.043610 15.342500 l 2.043610 12.896000 l 4.361082 12.896000 l s
+(1) 0.203286 15.062500 m
+dup sw 0.350000 exch sub
+1 div exch 0.0 exch
+ gs 1 -1 sc ashow gr
showpage
Modified: trunk/core/org.cishell.docs/src/img/cishellInteraction.pdf
===================================================================
(Binary files differ)
Added: trunk/core/org.cishell.docs/src/img/cishellLogo.png
===================================================================
(Binary files differ)
Property changes on: trunk/core/org.cishell.docs/src/img/cishellLogo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/core/org.cishell.docs/src/specification/main.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/main.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/main.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,37 +1,45 @@
%% Cyberinfrastructure Shell (CIShell) Core Specification
%%
+%% Copyright 2006,2007,2008 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.
+%%
%
\documentclass[pdftex,11pt,letterpaper]{report}
\usepackage[top=1in, left=1in, right=1in, bottom=1in]{geometry}
\usepackage[pdftex]{graphicx}
\DeclareGraphicsExtensions{.pdf,.png,.jpg,.mps,.eps}
-\usepackage[pdftex]{hyperref}
\usepackage{color}
+\usepackage{../mystyle}
+\input{./tex/api.tex}
+\packagesheader{}
+
+\usepackage[pdftex]{hyperref}
\hypersetup{
- pdftitle={Cyberinfrastructure Shell (CIShell) Core Specification 1.0}, %
- title pdfsubject={Cyberinfrastructure Shell (CIShell) Core Specification
- 1.0},
- pdfauthor={},
- pdfnewwindow=true, % links in new window
+ pdftitle={Cyberinfrastructure Shell (CIShell) - Core Specification 1.0},
+ pdfsubject={Cyberinfrastructure Shell (CIShell) - Core Specification 1.0},
+ pdfauthor={Bruce W. Herr II},
+ pdfnewwindow=true% links in new window
}
-\usepackage{../mystyle}
-\title{Cyberinfrastructure Shell (CIShell) \\
-Core Specification \\
-1.0 \\
-\textbf{DRAFT}}
-% \author{} % Will fill in later
-% \date{} % ditto
+\raggedright
-\input{./tex/api.tex}
-\packagesheader{}
-
\begin{document}
-\maketitle{}
+\input{./tex/title.tex}
\tableofcontents{}
\input{./tex/introduction.tex}
@@ -45,8 +53,8 @@
\orgcishellframework{}
\orgcishellframeworkalgorithm{}
\orgcishellframeworkdata{}
+\orgcishellframeworkuserprefs{}
-%% Each service gets its own tex file
\input{./tex/dataconversionservice.tex}
\input{./tex/guibuilderservice.tex}
\input{./tex/logservice.tex}
@@ -54,4 +62,6 @@
\input{./tex/datamanagerservice.tex}
\input{./tex/schedulerservice.tex}
+\input{./tex/license.tex}
+
\end{document}
Modified: trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/algorithms.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\section{Algorithm Specification}
\subsection*{\textit{Version 1.0}}
Modified: trunk/core/org.cishell.docs/src/specification/tex/algorithmtypes.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/algorithmtypes.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/algorithmtypes.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\subsection{Algorithm Types}
\label{algConstraints}
\subsubsection{Introduction}
Modified: trunk/core/org.cishell.docs/src/specification/tex/data.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/data.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/data.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\section{Data Specification}
\label{dataSpec}
\subsection*{\textit{Version 1.0}}
Modified: trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/dataconversionservice.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\chapter{Data Conversion Service Specification}
\section*{\textit{Version 1.0}}
\section{Introduction}
Modified: trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/datamanagerservice.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\chapter{Data Manager Application Service Specification}
\section*{\textit{Version 1.0}}
Modified: trunk/core/org.cishell.docs/src/specification/tex/framework.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/framework.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/framework.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\chapter{Framework API}
\section*{\textit{Version 1.0}}
Modified: trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/guibuilderservice.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\chapter{GUI Builder Service Specification}
\section*{\textit{Version 1.0}}
\section{Introduction}
Modified: trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/guidefinition.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\section{User Interface Specification}
\label{GUISpec}
\subsection*{\textit{Version 1.0}}
Modified: trunk/core/org.cishell.docs/src/specification/tex/introduction.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/introduction.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/introduction.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\chapter{Introduction}
The Cyberinfrastructure Shell (CIShell) is an open source, community-driven
@@ -10,12 +28,28 @@
seamlessly; and ultimately (4) end-users to use datasets and algorithms
effectively.
+\section{Acknowledgements}
+
+The Cyberinfrastructure Shell was designed and developed at the
+Cyberinfrastructure for Network Science Center (CNSC) at Indiana University in
+Bloomington, Indiana. The specification and API was designed and authored by
+Bruce W. Herr II, but received input from all members of the CIShell team.
+Important contributors from the CIShell team include Katy B\"{o}rner (director of
+CNSC), Weixia Huang, Russell Duhon, Micah Linnemeier, and Timothy Kelley. Much of
+the design of CIShell draws on previous work by Shashikant Penumarthy, Bruce W.
+Herr II, and Katy B\"{o}rner on the Information Visualization Cyberinfrastructure
+(IVC). Thanks go out to all those who have used or contributed to IVC, CIShell,
+and the Network Workbench (the first project to use CIShell).
+
\section{CIShell Platform Overview}
The CIShell Platform consists of Java interface definitions for algorithms, data,
services for algorithm developers, and services for application developers. Much
of the platform uses metadata and is fully defined.
+This specification and associated Java API are released under the Apache 2.0
+License.
+
%The next version should have this section.
%\section{What is New}
@@ -32,7 +66,7 @@
\item Application developers building on CIShell
\end{itemize}
-The CIShell Specifications assume that the reader has at least one year of
+The CIShell Specification assumes 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\footnote{http://www.osgi.org/Release4/Download}
and thus a working knowledge of OSGi is expected. OSGi (and thus CIShell) is
@@ -71,6 +105,8 @@
Framework Specification & org.cishell.framework & Version 1.0 \\
Algorithm Specification & org.cishell.framework.algorithm & Version 1.0 \\
Data Specification & org.cishell.framework.data & Version 1.0 \\
+User Adjustable Preferences Specification & org.cishell.framework.userprefs &
+Version 1.0 \\
Data Conversion Service Specification & org.cishell.service.conversion &
Version 1.0 \\
GUI Builder Service Specification & org.cishell.service.guibuilder & Version
Added: trunk/core/org.cishell.docs/src/specification/tex/license.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/license.tex (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/license.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -0,0 +1,199 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
+\appendix
+
+\chapter{Apache 2.0 License}
+\begin{verbatim}
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+\end{verbatim}
\ No newline at end of file
Modified: trunk/core/org.cishell.docs/src/specification/tex/logservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/logservice.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/logservice.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\chapter{Log Service Specification}
\label{logService}
\section*{Version 1.3}
Modified: trunk/core/org.cishell.docs/src/specification/tex/osgidependencies.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/osgidependencies.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/osgidependencies.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\section{OSGi Dependencies}
CIShell is built to be run in a fully compliant OSGi Service Platform R4
Modified: trunk/core/org.cishell.docs/src/specification/tex/preferencesservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/preferencesservice.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/preferencesservice.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\chapter{Preferences Service Specification}
\label{preferencesService}
\section*{Version 1.1}
Modified: trunk/core/org.cishell.docs/src/specification/tex/schedulerservice.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/schedulerservice.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/schedulerservice.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
\chapter{Scheduler Application Service Specification}
\section*{Version 1.0}
Added: trunk/core/org.cishell.docs/src/specification/tex/title.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/title.tex (rev 0)
+++ trunk/core/org.cishell.docs/src/specification/tex/title.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -0,0 +1,59 @@
+%% Cyberinfrastructure Shell (CIShell) Core Specification
+%%
+%% Copyright 2006,2007,2008 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.
+%%
+%
+
+\begin{titlepage}
+\begin{center}
+
+\vspace*{1in}
+
+\includegraphics[width=0.7\textwidth]{../img/cishellLogo.png}\\
+{\LARGE Cyberinfrastructure Shell}\\
+{\Large Core Specification 1.0}\\
+%{\Large 1.0}
+\center{\large March 2008}
+
+\vspace*{\fill}
+
+\begin{minipage}{0.7\textwidth}
+\begin{small}
+\definecolor{Gray}{rgb}{0.55,0.55,0.55}
+{\color{Gray}
+
+\center{Copyright \copyright{} 2006, 2007, 2008 Indiana University}
+
+\begin{flushleft}
+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
+\end{flushleft}
+
+\center{http://www.apache.org/licenses/LICENSE-2.0}
+
+\begin{flushleft}
+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.
+\end{flushleft}
+
+}
+\end{small}
+\end{minipage}
+
+\end{center}
+\end{titlepage}
Modified: trunk/core/org.cishell.docs/src/specification/tex/useradjustableprefs.tex
===================================================================
--- trunk/core/org.cishell.docs/src/specification/tex/useradjustableprefs.tex 2008-03-10 22:31:38 UTC (rev 649)
+++ trunk/core/org.cishell.docs/src/specification/tex/useradjustableprefs.tex 2008-03-11 19:35:36 UTC (rev 650)
@@ -1,3 +1,21 @@
+%% Cyberinfrastruc...
[truncated message content] |
