cpee 1.3.106 → 1.3.107

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd73497ca72f1147bc0d7ac9d87726b032da38ab
-  data.tar.gz: 9c396c83518dd1adb4dbba164563e5e894244ec9
+  metadata.gz: d6d2ef5c20ab5c4b9832ca3a64ac93cd5bedbd65
+  data.tar.gz: 256f9915882374a897e2a308ddcc94f409745f00
 SHA512:
-  metadata.gz: f44ab8eb09e0cbcb56eec227fe9eaafda54077855f74236dd89f0b9f2b1f04222467268b748dfec08a8ef2ded0ca3dc810bfb40bbda3fe106f79f22ff180b30b
-  data.tar.gz: 651be957a4d05d14fbf95cbc4e3d54e1d52a27980509e3891e56e8a70c673f4d6cab45999da039fafc3f0377ae4c66d449341cd36cae10d049a06d292c619624
+  metadata.gz: 920c40d108efd8f7c12f7aac2ac4f2412b93155d667b53f11d3c59b17ec15c317e703ee5e8b159007beba4d2dc11dc11652b5f8f1f319cc709f216cdf5c1cda7
+  data.tar.gz: 78944ec5a60ec0db95eb4ae0f46eb267af2962a37033c6335e80f8fa1913e3be93383a72e9873b4f025e23d1f36878634759335487fdfec634106518c0911189

data/Rakefile

@@ -18,8 +18,18 @@ spec = eval(File.read('cpee.gemspec'))
 Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
+  `rm pkg/* -rf`
+  `ln -sf #{pkg.name}.gem pkg/cpee.gem`
 end
 
+task :push => :gem do |r|
+  `gem push pkg/cpee.gem`
+end  
+
+task :install => :gem do |r|
+  `sudo gem install pkg/cpee.gem`
+end  
+
 desc "Clean instances"
 task :clean do
   Dir.glob("server/instances/*").collect{ |i| i if i =~ /\/\d+$/ }.compact.each do |i|

data/cockpit/js/instance.js

@@ -111,15 +111,15 @@ function check_subscription() { // {{{
 }// }}}
 
 function create_instance() {// {{{
-  var name = load ? load : prompt("Instance name?", "Enter name here");
-  if (name != null) {
-    if (name.match(/\S/)) {
+  var info = load ? load : prompt("Instance info?", "Enter info here");
+  if (info != null) {
+    if (info.match(/\S/)) {
       var base = $("input[name=base-url]").val();
       $.ajax({
         type: "POST", 
         url: base,
         dataType: "text",
-        data: "name=" + name, 
+        data: "info=" + info, 
         success: function(res){
           $("input[name=instance-url]").val((base + "//" + res + "/").replace(/\/+/g,"/").replace(/:\//,"://"));
           if (load) monitor_instance();
@@ -129,7 +129,7 @@ function create_instance() {// {{{
         }
       });
     } else {
-      alert("An instance name is necessary!");
+      alert("An instance info is necessary!");
     }
   }  
 }// }}}
@@ -370,7 +370,7 @@ function monitor_instance_state_change(notification) { //{{{
 
     var but = "";
     if (notification == "ready" || notification == "stopped") {
-      but = "<td>⇒</td><td><button onclick='$(this).attr(\"disabled\",\"disabled\");start_instance();'>start</button></td>";
+      but = "<td>⇒</td><td><button onclick='$(this).attr(\"disabled\",\"disabled\");start_instance();'>start</button> / <button onclick='$(this).attr(\"disabled\",\"disabled\");sim_instance();'>simulate</button></td>";
     }
     if (notification == "running") {
       but = "<td>⇒</td><td><button onclick='$(this).attr(\"disabled\",\"disabled\");stop_instance();'>stop</button></td>";
@@ -427,6 +427,15 @@ function start_instance() {// {{{
     error: report_failure
   });
 }// }}}
+function sim_instance() {// {{{
+  var url = $("input[name=current-instance]").val();
+  $.ajax({
+    type: "PUT", 
+    url: url + "/properties/values/state",
+    data: ({value: "simulating"}),
+    error: report_failure
+  });
+}// }}}
 function stop_instance() {// {{{
   var url = $("input[name=current-instance]").val();
   $.ajax({
@@ -554,121 +563,24 @@ function set_testset (testset) {// {{{
     error: report_failure
   });  
 
-  $.ajax({
-    type: "GET", 
-    url: url + "/properties/values/dataelements/",
-    success: function(res){
-      var rcount = 0;
-      var values = $("value > *",res);
-      var length = values.length;
-      values.each(function(){
-        var name = this.nodeName;
-        $.ajax({
-          type: "DELETE", 
-          url: url + "/properties/values/dataelements/" + name,
-          success: function(){
-            rcount += 1;
-            if (rcount == length)
-              load_testset_dataelements(url,testset);
-          },
-          error: report_failure
-        });  
-      });
-      if (length == 0)
-        load_testset_dataelements(url,testset);
-    },
-    error: report_failure
-  });  
-  
-  $.ajax({
-    type: "GET", 
-    url: url + "/properties/values/endpoints/",
-    success: function(res){
-      var rcount = 0;
-      var values = $("value > *",res);
-      var length = values.length;
-      values.each(function(){
-        var name = this.nodeName;
-        $.ajax({
-          type: "DELETE", 
-          url: url + "/properties/values/endpoints/" + name,
-          success: function(){
-            rcount += 1;
-            if (rcount == length)
-              load_testset_endpoints(url,testset);
-          },
-          error: report_failure
-        });  
-      });
-      if (length == 0)
-        load_testset_endpoints(url,testset);
-    },
-    error: report_failure
+  load_testset_dataelements(url,testset);
+  load_testset_endpoints(url,testset);
+  load_testset_pos(url,testset);
+
+  var ser = '';
+  $("testset > transformation > *",testset).each(function(){
+    ser += $(this).serializeXML() + "\n";
   });
-  
+  var val = "<content>" + ser + "</content>";
   $.ajax({
-    type: "GET", 
-    url: url + "/properties/values/positions/",
-    success: function(res){
-      var rcount = 0;
-      var values = $("value > *",res);
-      var length = values.length;
-      values.each(function(){
-        var name = this.nodeName;
-        $.ajax({
-          type: "DELETE", 
-          url: url + "/properties/values/positions/" + name,
-          success: function(){
-            rcount += 1;
-            if (rcount == length)
-              load_testset_pos(url,testset);
-          },
-          error: report_failure
-        });  
-      });
-      if (length == 0)
-        load_testset_pos(url,testset);
+    type: "PUT", 
+    url: url + "/properties/values/transformation",
+    data: ({content: val}),
+    success: function() { 
+      load_testset_des(url,testset); 
     },
     error: report_failure
   });
-
-  $.ajax({
-    type: "GET", 
-    url: url + "/properties/values/transformation/",
-    success: function(res){
-      var values = $("not-existing",res);
-      $("testset > transformation > *",testset).each(function(){
-        var val = "<content>" + $(this).serializeXML() + "</content>";
-        if (values.length > 0) {
-          $.ajax({
-            type: "POST", 
-            url: url + "/properties/values/",
-            data: ({property: "transformation"}),
-            success: function() { 
-              $.ajax({ 
-                type: "PUT", 
-                data: ({content: val}),
-                url: url + "/properties/values/transformation",
-                success: function() {
-                  load_testset_des(url,testset); 
-                },  
-              });
-            },
-            error: report_failure
-          });
-        } else {
-          $.ajax({
-            type: "PUT", 
-            url: url + "/properties/values/transformation",
-            data: ({content: val}),
-            success: function() { load_testset_des(url,testset); },
-            error: report_failure
-          });
-        }
-      });
-    },  
-    error: report_failure
-  });
   
   $.ajax({
     type: "PUT", 
@@ -738,37 +650,43 @@ function load_testset_hw(url,testset) {// {{{
   });
 } // }}}
 function load_testset_dataelements(url,testset) {// {{{
+  var ser = '';
   $("testset > dataelements > *",testset).each(function(){
-    var val = $(this).serializeXML();
-    $.ajax({
-      type: "POST", 
-      url: url + "/properties/values/dataelements/",
-      data: ({value: val}),
-      error: report_failure
-    });  
+    ser += $(this).serializeXML() + "\n";
+  });
+  var val = "<content>" + ser + "</content>";
+  $.ajax({
+    type: "PUT", 
+    url: url + "/properties/values/dataelements",
+    data: ({content: val}),
+    error: report_failure
   });
 }// }}}
 function load_testset_endpoints(url,testset) {// {{{
+  var ser = '';
   $("testset > endpoints > *",testset).each(function(){
-    var val = $(this).serializeXML();
-    $.ajax({
-      type: "POST", 
-      url: url + "/properties/values/endpoints/",
-      data: ({value: val}),
-      error: report_failure
-    });  
+    ser += $(this).serializeXML() + "\n";
   });
+  var val = "<content>" + ser + "</content>";
+  $.ajax({
+    type: "PUT", 
+    url: url + "/properties/values/endpoints/",
+    data: ({content: val}),
+    error: report_failure
+  });  
 }// }}}
 function load_testset_pos(url,testset) {// {{{
+  var ser = '';
   $("testset > positions > *",testset).each(function(){
-    var val = $(this).serializeXML();
-    $.ajax({
-      type: "POST", 
-      url: url + "/properties/values/positions/",
-      data: ({value: val}),
-      error: report_failure
-    });  
+    ser += $(this).serializeXML() + "\n";
   });
+  var val = "<content>" + ser + "</content>";
+  $.ajax({
+    type: "PUT", 
+    url: url + "/properties/values/positions/",
+    data: ({content: val}),
+    error: report_failure
+  });  
 }// }}}
 function load_testset_handlers(url,testset,vals) {// {{{
   $("testset > handlers > *",testset).each(function(){

data/cockpit/testsets/Concurrent.xml

@@ -10,7 +10,7 @@
   <endpoints>
     <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
   </endpoints>
-  <description xmlns="http://cpee.org/ns/description/1.0">
+  <dslx xmlns="http://cpee.org/ns/description/1.0">
     <parallel>
       <loop pre_test="data.persons > 0">
         <parallel_branch pass="data.persons" local="p">
@@ -28,288 +28,10 @@
         <manipulate id="a3">      data.persons -= 1</manipulate>  
       </loop>  
     </parallel>  
-  </description>
+  </dslx>
   <transformation>
-    <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://cpee.org/ns/description/1.0">
-      <xsl:output method="text"/>
-      <xsl:strip-space elements="*"/>
-      <xsl:variable name="myspacemultiplier">2</xsl:variable>
-
-      <xsl:template match="/">
-        <xsl:apply-templates select="//d:description"/>
-      </xsl:template>
-
-      <xsl:template match="//d:description">
-        <xsl:apply-templates>
-          <xsl:with-param name="myspace"><xsl:value-of select="-1*$myspacemultiplier"/></xsl:with-param>
-        </xsl:apply-templates>  
-      </xsl:template>
-
-      <xsl:template match="*">
-        <xsl:param name="myspace"/>
-        <xsl:call-template name="print-space">
-          <xsl:with-param name="i">1</xsl:with-param>
-          <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-        </xsl:call-template>
-        <xsl:if test="name()='call' or name()='manipulate'">
-          <xsl:text>activity :</xsl:text>
-          <xsl:value-of select="@id"/>
-        </xsl:if>
-        <xsl:if test="name()='call'">
-          <xsl:text>, :call, :</xsl:text>
-          <xsl:value-of select="@endpoint"/>
-          <xsl:apply-templates select="d:parameters"/>
-          <xsl:apply-templates select="d:manipulate" mode="part-of-call">
-            <xsl:with-param name="myspace"><xsl:value-of select="$myspace"/></xsl:with-param>
-          </xsl:apply-templates>
-          <xsl:call-template name="print-newline"/>
-        </xsl:if>
-        <xsl:if test="name()='manipulate'">
-          <xsl:text>, :manipulate</xsl:text>
-          <xsl:call-template name="print-content">
-            <xsl:with-param name="myspace"><xsl:value-of select="$myspace"/></xsl:with-param>
-          </xsl:call-template>
-          <xsl:call-template name="print-newline"/>
-        </xsl:if>
-        <xsl:if test="name()='parallel'">
-          <xsl:text>parallel</xsl:text>
-          <xsl:if test="@wait">
-            <xsl:text> :wait => </xsl:text>
-            <xsl:value-of select="@wait"/>
-          </xsl:if>
-          <xsl:text> do</xsl:text>
-          <xsl:call-template name="print-newline"/>
-          <xsl:apply-templates>
-            <xsl:with-param name="myspace"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-          </xsl:apply-templates>
-          <xsl:call-template name="print-space">
-            <xsl:with-param name="i">1</xsl:with-param>
-            <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-          </xsl:call-template>
-          <xsl:text>end</xsl:text>
-          <xsl:call-template name="print-newline"/>
-        </xsl:if>
-        <xsl:if test="name()='loop'">
-          <xsl:text>loop </xsl:text>
-          <xsl:if test="@pre_test">
-            <xsl:text>pre_test{</xsl:text>
-            <xsl:value-of select="@pre_test"/>
-            <xsl:text>} </xsl:text>
-          </xsl:if>
-          <xsl:if test="@post_test">
-            <xsl:text>post_test{</xsl:text>
-            <xsl:value-of select="@post_test"/>
-            <xsl:text>} </xsl:text>
-          </xsl:if>
-          <xsl:text>do</xsl:text>
-          <xsl:call-template name="print-newline"/>
-          <xsl:apply-templates>
-            <xsl:with-param name="myspace"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-          </xsl:apply-templates>
-          <xsl:call-template name="print-space">
-            <xsl:with-param name="i">1</xsl:with-param>
-            <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-          </xsl:call-template>
-          <xsl:text>end</xsl:text>
-          <xsl:call-template name="print-newline"/>
-        </xsl:if>
-        <xsl:if test="name()='choose'">
-          <xsl:text>choose do</xsl:text>
-          <xsl:call-template name="print-newline"/>
-          <xsl:apply-templates>
-            <xsl:with-param name="myspace"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-          </xsl:apply-templates>
-          <xsl:call-template name="print-space">
-            <xsl:with-param name="i">1</xsl:with-param>
-            <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-          </xsl:call-template>
-          <xsl:text>end</xsl:text>
-          <xsl:call-template name="print-newline"/>
-        </xsl:if>
-        <xsl:if test="name()='group'">
-          <xsl:apply-templates>
-            <xsl:with-param name="myspace"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-          </xsl:apply-templates>
-          <xsl:call-template name="print-newline"/>
-        </xsl:if>
-        <xsl:if test="name()='critical'">
-          <xsl:text>critical :</xsl:text>
-          <xsl:value-of select="@sid"/>
-          <xsl:text> do</xsl:text>
-          <xsl:call-template name="print-newline"/>
-          <xsl:apply-templates>
-            <xsl:with-param name="myspace"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-          </xsl:apply-templates>
-          <xsl:call-template name="print-space">
-            <xsl:with-param name="i">1</xsl:with-param>
-            <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-          </xsl:call-template>
-          <xsl:text>end</xsl:text>
-          <xsl:call-template name="print-newline"/>
-        </xsl:if>
-      </xsl:template>
-      
-      <xsl:template match="d:alternative">
-        <xsl:param name="myspace"/>
-        <xsl:call-template name="print-space">
-          <xsl:with-param name="i">1</xsl:with-param>
-          <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>alternative </xsl:text>
-        <xsl:value-of select="@condition"/>
-        <xsl:text> do</xsl:text>
-        <xsl:call-template name="print-newline"/>
-        <xsl:apply-templates>
-          <xsl:with-param name="myspace"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-        </xsl:apply-templates>
-        <xsl:call-template name="print-space">
-          <xsl:with-param name="i">1</xsl:with-param>
-          <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>end</xsl:text>
-        <xsl:call-template name="print-newline"/>
-      </xsl:template>
-
-      <xsl:template match="d:otherwise">
-        <xsl:param name="myspace"/>
-        <xsl:call-template name="print-space">
-          <xsl:with-param name="i">1</xsl:with-param>
-          <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>otherwise do</xsl:text>
-        <xsl:call-template name="print-newline"/>
-        <xsl:apply-templates>
-          <xsl:with-param name="myspace"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-        </xsl:apply-templates>
-        <xsl:call-template name="print-space">
-          <xsl:with-param name="i">1</xsl:with-param>
-          <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>end</xsl:text>
-        <xsl:call-template name="print-newline"/>
-      </xsl:template>
-
-      <xsl:template match="d:parallel_branch">
-        <xsl:param name="myspace"/>
-        <xsl:call-template name="print-space">
-          <xsl:with-param name="i">1</xsl:with-param>
-          <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>parallel_branch</xsl:text>
-        <xsl:if test="@pass">
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="@pass"/>
-        </xsl:if>
-        <xsl:text> do</xsl:text>
-        <xsl:if test="@local">
-          <xsl:text> |</xsl:text>
-          <xsl:value-of select="@local"/>
-          <xsl:text>|</xsl:text>
-        </xsl:if>
-        <xsl:call-template name="print-newline"/>
-        <xsl:apply-templates>
-          <xsl:with-param name="myspace"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-        </xsl:apply-templates>
-        <xsl:call-template name="print-space">
-          <xsl:with-param name="i">1</xsl:with-param>
-          <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>end</xsl:text>
-        <xsl:call-template name="print-newline"/>
-      </xsl:template>
-
-      <xsl:template match="d:parameters">
-        <xsl:apply-templates select="d:*" mode="parameter"/>
-      </xsl:template>
-        
-      <xsl:template match="d:*" mode="parameter">
-        <xsl:text>, :</xsl:text>
-        <xsl:value-of select="name()"/>
-        <xsl:text> => </xsl:text>
-        <xsl:choose>  
-          <xsl:when test="count(*) > 0">
-            <xsl:text>[</xsl:text>
-            <xsl:apply-templates select="d:*" mode="sub-parameter"/>
-            <xsl:text>]</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:choose>
-              <xsl:when test="@type = 'symbolic'">
-                <xsl:value-of select="text()"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>"</xsl:text>
-                <xsl:value-of select="text()"/>
-                <xsl:text>"</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>  
-          </xsl:otherwise>
-        </xsl:choose>  
-      </xsl:template>
-      
-      <xsl:template match="d:*" mode="sub-parameter">
-        <xsl:text> { :</xsl:text>
-        <xsl:value-of select="name()"/>
-        <xsl:text> => </xsl:text>
-        <xsl:value-of select="text()"/>
-        <xsl:text> }</xsl:text>
-        <xsl:choose>  
-          <xsl:when test="generate-id(.) = generate-id(../*[last()])">
-            <xsl:text> </xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>,</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>  
-      </xsl:template>
-
-      <xsl:template match="d:manipulate" mode="part-of-call">
-        <xsl:param name="myspace"/>
-        <xsl:call-template name="print-content">
-          <xsl:with-param name="myspace"><xsl:value-of select="$myspace"/></xsl:with-param>
-        </xsl:call-template>
-      </xsl:template>
-
-      <xsl:template name="print-content">
-        <xsl:param name="myspace"/>
-        <xsl:if test="text()">
-          <xsl:text> do </xsl:text>
-          <xsl:if test="@output">
-            <xsl:text>|</xsl:text>
-            <xsl:value-of select="@output"/>
-            <xsl:text>|</xsl:text>
-          </xsl:if>
-          <xsl:call-template name="print-newline"/>
-          <xsl:value-of select="text()"/>
-          <xsl:call-template name="print-newline"/>
-          <xsl:call-template name="print-space">
-            <xsl:with-param name="i">1</xsl:with-param>
-            <xsl:with-param name="count"><xsl:value-of select="$myspace+$myspacemultiplier"/></xsl:with-param>
-          </xsl:call-template>
-          <xsl:text>end</xsl:text>
-        </xsl:if>
-      </xsl:template>
-
-      <xsl:template name="print-space">
-        <xsl:param name="i"/>
-        <xsl:param name="count"/>
-        <xsl:if test="$i &lt;= $count">
-          <xsl:text> </xsl:text>
-          <xsl:call-template name="print-space">
-            <xsl:with-param name="i">
-              <xsl:value-of select="$i + 1"/>
-            </xsl:with-param>
-            <xsl:with-param name="count">
-              <xsl:value-of select="$count"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:template>
-      <xsl:template name="print-newline">
-        <xsl:text>
-</xsl:text>
-      </xsl:template>
-
-    </xsl:stylesheet>
+    <description type='copy'/>
+    <dataelements type='rest'/>
+    <endpoints type='rest'/>
   </transformation>
 </testset>