Vikram

bin/browser/bin/sorcer-browser.xml

@@ -33,10 +33,11 @@
         <pathelement location="${rio.lib}/groovy-all-${groovy.version}.jar" />
         <pathelement location="${jini.lib}/jsk-lib-${river.version}.jar" />
         <pathelement location="${jini.lib}/jsk-platform-${river.version}.jar" />
+        <pathelement location="${jini.lib}/start-${river.version}.jar" />
         <pathelement location="${jini.lib}/outrigger-dl-${river.version}.jar" />
         <pathelement location="${jini.lib}/serviceui-${river.version}.jar" />
         <pathelement location="${rio.lib}/rio-platform-${rio.version}.jar" />
-        <pathelement location="${rio-dl.lib}/rio-api-${rio.version}.jar" />
+        <pathelement location="${rio.lib}/rio-start-${rio.version}.jar" />
         <pathelement location="${rio.lib}/rio-lib-${rio.version}.jar" />
         <pathelement location="${rio.lib}/logging/slf4j-api-${slf4j.version}.jar" />
         <pathelement location="${rio.lib}/logging/jul-to-slf4j-${slf4j.version}.jar" />
@@ -62,7 +63,7 @@
             <sysproperty key="java.protocol.handler.pkgs" value="net.jini.url|sorcer.util.bdb.sos|org.rioproject.url" />
             <sysproperty key="java.security.policy" value="../policy/ssb.policy" />
             <sysproperty key="rio.home" value="${rio.home}"/>
-            <sysproperty key="org.rioproject.keystore" value="${rio.home}/config/security/rio-cert.ks"/>
+<!--            <sysproperty key="org.rioproject.keystore" value="${rio.home}/config/security/rio-cert.ks"/>-->
             <sysproperty key="java.rmi.server.useCodebaseOnly" value="false" />
             <sysproperty key="java.net.preferIPv4Stack" value="true" />
             <sysproperty key="ssb.logFile" value="${sorcer.home}/bin/browser/logs/browser.log" />

bin/shell/bin/startShell

@@ -169,8 +169,6 @@ fi
 RIO_CLASSPATH="$RIO_HOME/lib/rio-platform-$rio_version.jar:\
 $RIO_HOME/lib/rio-lib-$rio_version.jar:\
 $RIO_HOME/lib/rio-start-$rio_version.jar:\
-$RIO_HOME/lib-dl/rio-api-$rio_version.jar:\
-$RIO_HOME/lib-dl/monitor-api-$rio_version.jar:\
 $RIO_HOME/lib/logging/slf4j-api-$slf4j_version.jar:\
 $RIO_HOME/lib/logging/logback-core-$logback_version.jar:\
 $RIO_HOME/lib/logging/logback-classic-$logback_version.jar:\
@@ -344,7 +342,6 @@ startShell ( ) {
             -Dmodeling.version="$modeling_version" \
             -Dsorcer.home="$SORCER_HOME" \
             -Drio.home="$RIO_HOME" \
-            -Dorg.rioproject.keystore="$RIO_HOME"/config/security/rio-cert.ks \
             -Djava.protocol.handler.pkgs="net.jini.url|sorcer.util.url|org.rioproject.url" \
             -Djava.net.preferIPv4Stack="true" \
             -Dtools.jar="$TOOLS_JAR" \

bin/shell/configs/nsh-init.config

@@ -48,9 +48,9 @@ sorcer.tools.shell.ServiceShell {
 	// application name/startupFile pairs for non-interactive shells, e.g., nsh --browser
 	applications = new String[] { 
 		"browser",  home + "${/}bin${/}browser${/}bin${/}sorcer-browser-spawn.xml",
-		"f1",  home + "${/}modules${/}examples${/}ex6${/}bin${/}f1-req-run.xml",
-		"f5",  home + "${/}modules${/}examples${/}ex6${/}bin${/}f5-req-run.xml",
-		"f5a", home + "${/}modules${/}examples${/}bin${/}f5a-req-run.xml"
+		"f1",  home + "${/}modules${/}examples${/}ex6${/}bin${/}f1-srv-run.xml",
+		"f5",  home + "${/}modules${/}examples${/}ex6${/}bin${/}f5-srv-run.xml",
+		"f5a", home + "${/}modules${/}examples${/}bin${/}f5a-srv-run.xml"
 		};
 
 	exertionDeploymentConfig = "${iGrid.home}/bin/sorcer/jobber/configs/ExertionDeploymentConfig.groovy";

build.gradle

@@ -23,9 +23,7 @@ String ref = new File(rootProject.projectDir, ".git/HEAD").text
 int ndx = ref.lastIndexOf("/")
 String branch = ref.substring(ndx+1).trim()
 String branchRef = branch.equals("master")?"":"-$branch"
-
-version = "8.8.5$branchRef"
-
+version = "8.8.3.107$branchRef"
 apply plugin: 'idea'
 idea {
     project {
@@ -157,7 +155,6 @@ subprojects {
             mavenLocal()
             if (!enclave) {
                 maven { url "https://repo.repsy.io/mvn/mwsobol/sorcersoft"}
-                maven { url "https://dl.bintray.com/dreedyman/maven"}
                 maven { url "https://repo.repsy.io/mvn/dreedy/maven" }
                 mavenCentral()
             } else {
@@ -249,8 +246,7 @@ if (JavaVersion.current().isJava8Compatible()) {
  */
 task allJavadoc(type: Javadoc) {
     options.links = ['http://docs.oracle.com/javase/8/docs/api/',
-                     'https://river.apache.org/doc/api/',
-                     'http://www.rio-project.org/apidocs']
+                     'https://river.apache.org/doc/api/']
     exclude '**/*Test.java'
     exclude '**/edu/*'
     description = 'Creates SORCER API Specification, view them in build/javadoc/index.html'

core/sorcer-dl/src/main/java/sorcer/core/monitor/MonitorUIManagement.java

@@ -23,8 +23,8 @@
 import net.jini.id.Uuid;
 import sorcer.core.UEID;
 import sorcer.service.Exec;
-import sorcer.service.Routine;
 import sorcer.service.ExertionInfo;
+import sorcer.service.Routine;
 import sorcer.service.MonitorException;
 
 import java.rmi.RemoteException;
@@ -52,12 +52,12 @@ public interface MonitorUIManagement {
 	/**
 	 * The spec requires that this method gets all the monitorable exertion
 	 * infos from all the monitor managers and return a Hashtable where
-	 * 
+	 *
 	 * key -> ExertionReferenceID execute -> Some info regarding this exertion
-	 * 
+	 *
 	 * @throws RemoteException
 	 *             if there is a communication error
-	 * 
+	 *
 	 */
 	Map<Uuid, ExertionInfo> getMonitorableExertionInfo(Exec.State aspect, Principal principal)
 		throws RemoteException, MonitorException;

core/sorcer-dl/src/main/java/sorcer/core/monitor/MonitoringManagement.java

@@ -17,11 +17,16 @@
  */
 package sorcer.core.monitor;
 
+import net.jini.id.Uuid;
+import sorcer.service.Exec;
+import sorcer.service.MonitorException;
 import sorcer.service.Monitorable;
 
 import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.security.Principal;
+import java.util.Map;
 
 public interface MonitoringManagement extends Monitorable, MonitorManagement,
 		MonitorSessionManagement, MonitorUIManagement, Remote {
-
 }

core/sorcer-dl/src/main/java/sorcer/core/monitoring/Monitor.java

@@ -25,7 +25,7 @@
  * @author Dennis Reedy
  */
 public interface Monitor {
-    enum Status {SUBMITTED, ACTIVE, COMPLETED, FAILED }
+    enum Status { SUBMITTED, ACTIVE, COMPLETED, FAILED }
 
     /**
      * Clients first register with the {@code Monitor} service in order provide status. Clients are responsible

core/sorcer-dl/src/main/java/sorcer/service/Arg.java

@@ -19,6 +19,7 @@
 
 import sorcer.core.Index;
 import sorcer.core.Tag;
+import sorcer.service.modeling.Conditional;
 import sorcer.service.modeling.Functionality;
 
 import java.io.Serializable;
@@ -50,6 +51,14 @@ public static ContextDomain selectDomain(Arg[] args) {
 		return null;
 	}
 
+	public static Conditional selectCheckpoint(Arg[] args) {
+		for (Arg arg : args) {
+			if (arg instanceof Conditional)
+				return (Conditional) arg;
+		}
+		return null;
+	}
+
 	public static Context selectContext(Arg[] args) {
 		for (Arg arg : args) {
 			if (arg instanceof Context)
@@ -74,8 +83,8 @@ public static Mogram selectMogram(Arg[] args) {
 		return null;
 	}
 
-	public static List<Fidelity> selectFidelities(Arg[] args) {
-		List<Fidelity> fiList = new ArrayList<>();
+	public static List<Fi> selectFidelities(Arg[] args) {
+		List<Fi> fiList = new ArrayList<>();
 		for (Arg arg : args) {
 			if (arg instanceof Fidelity)
 				fiList.add((Fidelity) arg);
@@ -101,6 +110,38 @@ public static Service selectService(Arg[] args) {
 		return null;
 	}
 
+	public static Signature.Type selectSignatureType(Arg[] args) {
+		for (Arg arg : args) {
+			if (arg instanceof Signature.Type)
+				return (Signature.Type) arg;
+		}
+		return null;
+	}
+
+	public static Response.Type selectResponseType(Arg[] args) {
+		for (Arg arg : args) {
+			if (arg instanceof Response.Type)
+				return (Response.Type) arg;
+		}
+		return null;
+	}
+
+	public static Context.Type selectContextType(Arg[] args) {
+		for (Arg arg : args) {
+			if (arg instanceof Context.Type)
+				return (Context.Type) arg;
+		}
+		return null;
+	}
+
+	public static Functionality.Type selectFunctionalityType(Arg[] args) {
+		for (Arg arg : args) {
+			if (arg instanceof Functionality.Type)
+				return (Functionality.Type) arg;
+		}
+		return null;
+	}
+
 	public static Path selectPath(Arg[] args) {
 		for (Arg arg : args) {
 			if (arg instanceof Path)

core/sorcer-dl/src/main/java/sorcer/service/ArgSet.java

@@ -17,6 +17,8 @@
  * limitations under the License.
  */
 
+import sorcer.core.Tag;
+
 import java.rmi.RemoteException;
 import java.util.*;
 
@@ -134,7 +136,14 @@ public Arg[] toArray() {
 		 Arg[] va = new Arg[size()];
 		 return toArray(va);
 	 }
-
+
+	public static ArgSet asSet(Object[] array) {
+		ArgSet vl = new ArgSet();
+		for (Object v : array)
+			vl.add(new Tag(v.toString()));
+		return vl;
+	}
+
 	public static ArgSet asSet(Arg[] array) {
 		ArgSet vl = new ArgSet();
 		for (Arg v : array)

core/sorcer-dl/src/main/java/sorcer/service/Context.java

@@ -192,6 +192,9 @@ public interface Context<T> extends ContextDomain, Selfable, Response, Serializa
 	final static String MDA_PATH = "domain" + SorcerConstants.CPS + "mda"
 		+ SorcerConstants.CPS + "component";
 
+	final static String DEV_PATH = "design" + SorcerConstants.CPS + "dev"
+		+ SorcerConstants.CPS + "component";
+
 	final static String EXPLORER_PATH = "domain" + SorcerConstants.CPS + "explorer"
 		+ SorcerConstants.CPS + "component";
 
@@ -201,6 +204,8 @@ public interface Context<T> extends ContextDomain, Selfable, Response, Serializa
 
 	final static String DOMAIN_OUTPUTS_PATH = "transdomain" + SorcerConstants.CPS + "domain" + SorcerConstants.CPS + "outputs";
 
+	final static String CHECKPOINT_ITERATION = "checkpoint" + SorcerConstants.CPS + "iteration";
+
 	/**
 	 * An object to specify no context execute.
 	 */
@@ -761,10 +766,10 @@ public T getValue(Path path, Arg... args)
 	 *
 	 * @param path
 	 *            the attribute-based path
-	 * @return the value as-is at the path
 	 * @throws ContextException
+	 * @return
 	 */
-	public T asis(String path);
+	public Object asis(String path);
 
 	public T asis(Path path) throws ContextException;
 
@@ -951,7 +956,7 @@ public T putInoutValue(String path, T value, String association)
 
 	public int size();
 
-	Discipline getChild(String name) throws ContextException;
+	Contextion getChild(String name) throws ContextException;
 
 	public Return getContextReturn();
 
@@ -961,8 +966,32 @@ public T putInoutValue(String path, T value, String association)
 
 	public void setContextReturn(Return requestPath);
 
-	public enum Type {
-		ASSOCIATIVE, SHARED, POSITIONAL, LIST, SCOPE, INDEXED, ARRAY
+	public enum Type implements Arg {
+		ASSOCIATIVE, SHARED, POSITIONAL, LIST, SCOPE, INDEXED, ARRAY, DESIGN, CONTEXT, RESPONSE;
+
+		@Override
+		public String getName() {
+			return toString();
+		}
+
+		@Override
+		public Object execute(Arg... args) throws ServiceException, RemoteException {
+			return this;
+		}
+	}
+
+	public enum IntentType implements Arg {
+		DATA, EXEC, EXERT, EVALUATE, DEVELOP, ANALYZE, MDA, SEARCH, OPTIMIZE, OPTI, EXPLORE, MADO, SVISE, HVISE;
+
+		@Override
+		public String getName() {
+			return toString();
+		}
+
+		@Override
+		public Object execute(Arg... args) throws ServiceException, RemoteException {
+			return this;
+		}
 	}
 
 	final static String PARAMETER_TYPES = "context/parameter/types";

core/sorcer-dl/src/main/java/sorcer/service/ContextDomain.java

@@ -75,7 +75,7 @@ public interface ContextDomain extends Domain {
 	ContextDomain add(Identifiable... objects) throws ContextException,
 			RemoteException;
 
-	Path getPath(String path) throws ContextException;
+	Path getPath(String path) throws ContextException, RemoteException;
 
 	Object getValue(Path path, Arg... args) throws ContextException, RemoteException;
 }