Moved log handler to commons

docs/apidocs/apidocs/downloads.html

@@ -116,7 +116,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-json-client.jar">
       <td><span class="downloadfile-name">drip-api-json-client.jar</span></td>
-      <td><span class="downloadfile-size">18.03K</span></td>
+      <td><span class="downloadfile-size">18.04K</span></td>
       <td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td>
     </tr>
     <tr class="clickable-row" data-href="drip-api-json-client-json-sources.jar">
@@ -149,7 +149,7 @@
     </tr>
     <tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar">
       <td><span class="downloadfile-name">drip-api-xml-client-xml-sources.jar</span></td>
-      <td><span class="downloadfile-size">23.27K</span></td>
+      <td><span class="downloadfile-size">23.28K</span></td>
       <td><span class="downloadfile-description">The sources for the Java XML client library.</span></td>
     </tr>
     </tbody>
@@ -184,7 +184,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-js.zip">
       <td><span class="downloadfile-name">drip-api-js.zip</span></td>
-      <td><span class="downloadfile-size">5.91K</span></td>
+      <td><span class="downloadfile-size">6.02K</span></td>
       <td><span class="downloadfile-description">&nbsp;</span></td>
     </tr>
     </tbody>
@@ -213,7 +213,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-php.zip">
       <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">6.67K</span></td>
+      <td><span class="downloadfile-size">6.74K</span></td>
       <td><span class="downloadfile-description">&nbsp;</span></td>
     </tr>
     </tbody>
@@ -245,7 +245,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-php.zip">
       <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">9.61K</span></td>
+      <td><span class="downloadfile-size">9.62K</span></td>
       <td><span class="downloadfile-description">&nbsp;</span></td>
     </tr>
     </tbody>

docs/apidocs/apidocs/json_BenchmarkResult.html

@@ -81,27 +81,27 @@ class</p>
         </thead>
         <tbody>
         <tr>
-          <td>  <span class="property-name">start</span>
+          <td>  <span class="property-name">vmType</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">end</span>
+          <td>  <span class="property-name">cloudDeploymentDomain</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">cloudDeploymentDomain</span>
+          <td>  <span class="property-name">delta</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
           <td>  <span class="property-description"></span>
@@ -117,16 +117,16 @@ class</p>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">vmType</span>
+          <td>  <span class="property-name">end</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">delta</span>
+          <td>  <span class="property-name">start</span>
 </td>
           <td>  <span class="datatype-reference">number
 </span>
@@ -167,12 +167,12 @@ No need to set during a POST</span></td>
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-js example">{
-  &quot;start&quot; : 12345,
-  &quot;end&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
-  &quot;host&quot; : &quot;147.228.242.58&quot;,
   &quot;vmType&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
   &quot;delta&quot; : 12345,
+  &quot;host&quot; : &quot;147.228.242.58&quot;,
+  &quot;end&quot; : 12345,
+  &quot;start&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;timestamp&quot; : 1499793079011

docs/apidocs/apidocs/json_OwnedObject.html

@@ -69,7 +69,7 @@ class</p>
 
       <dl class="dl-horizontal">
         <dt>Subtypes</dt>
-        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_DRIPLogRecord.html">DRIPLogRecord</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_MonitorringMessage.html">MonitorringMessage</a></dd>
+        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_DRIPLogRecord.html">DRIPLogRecord</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_MonitorringMessage.html">MonitorringMessage</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd>
       </dl>
 
       <table class="table datatype-properties">

docs/apidocs/apidocs/ns0.xsd

@@ -821,17 +821,17 @@ class]]>
    <xs:complexContent>
     <xs:extension base="ownedObject">
       <xs:sequence>
-              <xs:element name="start" type="xs:dateTime" minOccurs="0">
+              <xs:element name="host" type="xs:string" minOccurs="0">
+              </xs:element>
+              <xs:element name="vmType" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="delta" type="xs:dateTime" minOccurs="0">
               </xs:element>
-              <xs:element name="host" type="xs:string" minOccurs="0">
-              </xs:element>
               <xs:element name="end" type="xs:dateTime" minOccurs="0">
               </xs:element>
-              <xs:element name="vmType" type="xs:string" minOccurs="0">
+              <xs:element name="start" type="xs:dateTime" minOccurs="0">
               </xs:element>
       </xs:sequence>
     </xs:extension>

docs/apidocs/apidocs/resource_BenchmarkController.html

@@ -144,12 +144,12 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 [ {
-  &quot;start&quot; : 12345,
-  &quot;end&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
-  &quot;host&quot; : &quot;147.228.242.58&quot;,
   &quot;vmType&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
   &quot;delta&quot; : 12345,
+  &quot;host&quot; : &quot;147.228.242.58&quot;,
+  &quot;end&quot; : 12345,
+  &quot;start&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;timestamp&quot; : 1499793079011
@@ -514,12 +514,12 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;start&quot; : 12345,
-  &quot;end&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
-  &quot;host&quot; : &quot;147.228.242.58&quot;,
   &quot;vmType&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
   &quot;delta&quot; : 12345,
+  &quot;host&quot; : &quot;147.228.242.58&quot;,
+  &quot;end&quot; : 12345,
+  &quot;start&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;timestamp&quot; : 1499793079011

docs/apidocs/apidocs/xml_ns0_benchmarkResult.html

@@ -220,12 +220,12 @@ It is created automatically. No need to set during a POST</span></td>
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-xml example">&lt;b-----&gt;
-  &lt;start&gt;...&lt;/start&gt;
+  &lt;host&gt;147.228.242.58&lt;/host&gt;
+  &lt;vmType&gt;...&lt;/vmType&gt;
   &lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
   &lt;delta&gt;...&lt;/delta&gt;
-  &lt;host&gt;147.228.242.58&lt;/host&gt;
   &lt;end&gt;...&lt;/end&gt;
-  &lt;vmType&gt;...&lt;/vmType&gt;
+  &lt;start&gt;...&lt;/start&gt;
   &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/b-----&gt;
 </pre>

docs/apidocs/downloads.html

@@ -116,7 +116,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-json-client.jar">
       <td><span class="downloadfile-name">drip-api-json-client.jar</span></td>
-      <td><span class="downloadfile-size">18.03K</span></td>
+      <td><span class="downloadfile-size">18.04K</span></td>
       <td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td>
     </tr>
     <tr class="clickable-row" data-href="drip-api-json-client-json-sources.jar">
@@ -149,7 +149,7 @@
     </tr>
     <tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar">
       <td><span class="downloadfile-name">drip-api-xml-client-xml-sources.jar</span></td>
-      <td><span class="downloadfile-size">23.27K</span></td>
+      <td><span class="downloadfile-size">23.28K</span></td>
       <td><span class="downloadfile-description">The sources for the Java XML client library.</span></td>
     </tr>
     </tbody>
@@ -184,7 +184,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-js.zip">
       <td><span class="downloadfile-name">drip-api-js.zip</span></td>
-      <td><span class="downloadfile-size">5.91K</span></td>
+      <td><span class="downloadfile-size">6.02K</span></td>
       <td><span class="downloadfile-description">&nbsp;</span></td>
     </tr>
     </tbody>
@@ -213,7 +213,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-php.zip">
       <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">6.67K</span></td>
+      <td><span class="downloadfile-size">6.74K</span></td>
       <td><span class="downloadfile-description">&nbsp;</span></td>
     </tr>
     </tbody>
@@ -245,7 +245,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-php.zip">
       <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">9.61K</span></td>
+      <td><span class="downloadfile-size">9.62K</span></td>
       <td><span class="downloadfile-description">&nbsp;</span></td>
     </tr>
     </tbody>

docs/apidocs/json_BenchmarkResult.html

@@ -81,7 +81,7 @@ class</p>
         </thead>
         <tbody>
         <tr>
-          <td>  <span class="property-name">start</span>
+          <td>  <span class="property-name">delta</span>
 </td>
           <td>  <span class="datatype-reference">number
 </span>
@@ -90,27 +90,27 @@ class</p>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">delta</span>
+          <td>  <span class="property-name">host</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">cloudDeploymentDomain</span>
+          <td>  <span class="property-name">start</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">host</span>
+          <td>  <span class="property-name">end</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
           <td>  <span class="property-description"></span>
@@ -126,9 +126,9 @@ class</p>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">end</span>
+          <td>  <span class="property-name">cloudDeploymentDomain</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
           <td>  <span class="property-description"></span>
@@ -167,12 +167,12 @@ No need to set during a POST</span></td>
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-js example">{
-  &quot;start&quot; : 12345,
   &quot;delta&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
   &quot;host&quot; : &quot;147.228.242.58&quot;,
-  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;start&quot; : 12345,
   &quot;end&quot; : 12345,
+  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
   &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;timestamp&quot; : 1499793079011

docs/apidocs/json_OwnedObject.html

@@ -69,7 +69,7 @@ class</p>
 
       <dl class="dl-horizontal">
         <dt>Subtypes</dt>
-        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_DRIPLogRecord.html">DRIPLogRecord</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_MonitorringMessage.html">MonitorringMessage</a></dd>
+        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_DRIPLogRecord.html">DRIPLogRecord</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_MonitorringMessage.html">MonitorringMessage</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd>
       </dl>
 
       <table class="table datatype-properties">

docs/apidocs/ns0.xsd

@@ -821,18 +821,18 @@ class]]>
    <xs:complexContent>
     <xs:extension base="ownedObject">
       <xs:sequence>
-              <xs:element name="host" type="xs:string" minOccurs="0">
+              <xs:element name="vmType" type="xs:string" minOccurs="0">
+              </xs:element>
+              <xs:element name="delta" type="xs:dateTime" minOccurs="0">
               </xs:element>
               <xs:element name="start" type="xs:dateTime" minOccurs="0">
               </xs:element>
               <xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="delta" type="xs:dateTime" minOccurs="0">
+              <xs:element name="host" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="end" type="xs:dateTime" minOccurs="0">
               </xs:element>
-              <xs:element name="vmType" type="xs:string" minOccurs="0">
-              </xs:element>
       </xs:sequence>
     </xs:extension>
   </xs:complexContent>

docs/apidocs/resource_BenchmarkController.html

@@ -144,12 +144,12 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 [ {
-  &quot;start&quot; : 12345,
   &quot;delta&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
   &quot;host&quot; : &quot;147.228.242.58&quot;,
-  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;start&quot; : 12345,
   &quot;end&quot; : 12345,
+  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
   &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;timestamp&quot; : 1499793079011
@@ -514,12 +514,12 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;start&quot; : 12345,
   &quot;delta&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
   &quot;host&quot; : &quot;147.228.242.58&quot;,
-  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;start&quot; : 12345,
   &quot;end&quot; : 12345,
+  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
   &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;timestamp&quot; : 1499793079011

docs/apidocs/xml_ns0_benchmarkResult.html

@@ -220,12 +220,12 @@ It is created automatically. No need to set during a POST</span></td>
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-xml example">&lt;b-----&gt;
-  &lt;host&gt;147.228.242.58&lt;/host&gt;
+  &lt;vmType&gt;...&lt;/vmType&gt;
+  &lt;delta&gt;...&lt;/delta&gt;
   &lt;start&gt;...&lt;/start&gt;
   &lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
-  &lt;delta&gt;...&lt;/delta&gt;
+  &lt;host&gt;147.228.242.58&lt;/host&gt;
   &lt;end&gt;...&lt;/end&gt;
-  &lt;vmType&gt;...&lt;/vmType&gt;
   &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/b-----&gt;
 </pre>

drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java

@@ -127,7 +127,7 @@ public class DeployService {
         User user = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         String owner = user.getUsername();
         ownedObject.setOwner(owner);
-         
+
         return deployDao.save(ownedObject);
     }
 
@@ -139,7 +139,8 @@ public class DeployService {
                     deployInfo.getConfigurationID(),
                     null,
                     null);
-
+            ;
+            deployerInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
 //            Message response = MessageGenerator.generateArtificialMessage(System.getProperty("user.home")
 //                    + File.separator + "workspace" + File.separator + "DRIP"
 //                    + File.separator + "docs" + File.separator + "json_samples"
@@ -169,6 +170,7 @@ public class DeployService {
                 null,
                 null);
         Map<String, Object> info;
+        deployerInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
         try (DRIPCaller deployer = new DeployerCaller(messageBrokerHost);) {
             Message response = (deployer.call(deployerInvokationMessage));
             List<MessageParameter> params = response.getParameters();
@@ -322,7 +324,7 @@ public class DeployService {
         }
 
         Message message = buildDeployerMessage(deployment.getProvisionID(), "scale", confID, scaleReq.getScaleTargetName(), scaleReq.getNumOfInstances());
-
+        message.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
         try (DRIPCaller deployer = new DeployerCaller(messageBrokerHost);) {
             Message response = (deployer.call(message));
             List<MessageParameter> params = response.getParameters();
@@ -603,7 +605,7 @@ public class DeployService {
             String jsonResp = param.getValue().replaceAll("^\"|\"$", "");
             System.err.println(jsonResp);
             Map<String, Object> kv = Converter.jsonString2Map(jsonResp);
-            
+
             info.putAll(kv);
         }
         return info;

drip-api/src/main/java/nl/uva/sne/drip/api/service/PlannerService.java

@@ -15,6 +15,7 @@
  */
 package nl.uva.sne.drip.api.service;
 
+import nl.uva.sne.drip.commons.utils.DRIPLogHandler;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
@@ -30,6 +31,7 @@ import java.util.logging.Logger;
 import nl.uva.sne.drip.api.dao.PlanDao;
 import nl.uva.sne.drip.api.exception.BadRequestException;
 import nl.uva.sne.drip.api.exception.NotFoundException;
+import nl.uva.sne.drip.api.rpc.DRIPCaller;
 import nl.uva.sne.drip.api.rpc.PlannerCaller;
 import nl.uva.sne.drip.drip.commons.data.internal.Message;
 import nl.uva.sne.drip.drip.commons.data.internal.MessageParameter;
@@ -77,9 +79,10 @@ public class PlannerService {
     }
 
     public PlanResponse getPlan(String toscaId) throws JSONException, UnsupportedEncodingException, IOException, TimeoutException, InterruptedException {
-        try (PlannerCaller planner = new PlannerCaller(messageBrokerHost)) {
+        try (DRIPCaller planner = new PlannerCaller(messageBrokerHost)) {
             Message plannerInvokationMessage = buildPlannerMessage(toscaId);
             logger.log(Level.INFO, "Calling planner");
+            plannerInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
             Message plannerReturnedMessage = (planner.call(plannerInvokationMessage));
             logger.log(Level.INFO, "Got response from planner");
             ObjectMapper mapper = new ObjectMapper();

drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java

@@ -441,7 +441,7 @@ public class ProvisionService {
     private ProvisionResponse callProvisioner0(ProvisionRequest provisionRequest) throws IOException, TimeoutException, JSONException, InterruptedException, Exception {
         try (DRIPCaller provisioner = new ProvisionerCaller0(messageBrokerHost);) {
             Message provisionerInvokationMessage = buildProvisioner0Message(provisionRequest);
-            
+            provisionerInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
             Message response = (provisioner.call(provisionerInvokationMessage));
             
             return parseCreateResourcesResponse(response.getParameters(), provisionRequest, null, true, true);
@@ -453,6 +453,7 @@ public class ProvisionService {
     private ProvisionResponse callProvisioner1(ProvisionRequest provisionRequest) throws IOException, TimeoutException, JSONException, InterruptedException, Exception {
         try (DRIPCaller provisioner = new ProvisionerCaller1(messageBrokerHost);) {
             Message provisionerInvokationMessage = buildProvisioner1Message(provisionRequest);
+            provisionerInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
             Message response = (provisioner.call(provisionerInvokationMessage));
             return parseCreateResourcesResponse(response.getParameters(), provisionRequest, null, true, true);
         }
@@ -462,6 +463,7 @@ public class ProvisionService {
     public void deleteProvisionedResources(ProvisionResponse provisionInfo) throws IOException, TimeoutException, InterruptedException, JSONException {
         try (DRIPCaller provisioner = new ProvisionerCaller1(messageBrokerHost);) {
             Message deleteInvokationMessage = buildTopoplogyModificationMessage(provisionInfo, "kill_topology", null);
+            deleteInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
             Message response = (provisioner.call(deleteInvokationMessage));
             parseDeleteResourcesResponse(response.getParameters(), provisionInfo);
         }
@@ -511,6 +513,7 @@ public class ProvisionService {
                 extra.put("domain", domain);
                 
                 Message scaleMessage = buildTopoplogyModificationMessage(provisionInfo, "scale_topology_down", extra);
+                scaleMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
                 Message response = provisioner.call(scaleMessage);
                 parseCreateResourcesResponse(response.getParameters(), null, provisionInfo, false, false);
             }
@@ -523,6 +526,7 @@ public class ProvisionService {
                 extra.put("domain", domain);
                 
                 Message scaleMessage = buildTopoplogyModificationMessage(provisionInfo, "scale_topology_up", extra);
+                scaleMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
                 Message response = provisioner.call(scaleMessage);
                 parseCreateResourcesResponse(response.getParameters(), null, provisionInfo, false, false);
             }

drip-api/src/main/java/nl/uva/sne/drip/api/service/ToscaService.java

@@ -166,6 +166,7 @@ public class ToscaService {
         String dockerCompose;
         try (DRIPCaller transformer = new TransformerCaller(messageBrokerHost);) {
             Message transformerInvokationMessage = buildDockerComposeMessage(toscaRep);
+            transformerInvokationMessage.setOwner(((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
             Message response = (transformer.call(transformerInvokationMessage));
             dockerCompose = response.getParameters().get(0).getValue();
         }

drip-commons/pom.xml

@@ -86,7 +86,14 @@
             <artifactId>enunciate-core-annotations</artifactId>
             <version>2.9.1</version>
             <type>jar</type>
-        </dependency>        
+        </dependency>     
+        
+        <dependency>
+            <groupId>com.rabbitmq</groupId>
+            <artifactId>amqp-client</artifactId>
+            <version>4.0.2</version>
+        </dependency>
+           
     </dependencies>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

drip-api/src/main/java/nl/uva/sne/drip/api/service/DRIPLogHandler.java → drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/DRIPLogHandler.java

@@ -13,33 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package nl.uva.sne.drip.api.service;
+package nl.uva.sne.drip.commons.utils;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.BuiltinExchangeType;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.MessageProperties;
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
-import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import java.util.logging.StreamHandler;
-import nl.uva.sne.drip.api.dao.CloudCredentialsDao;
 import nl.uva.sne.drip.commons.utils.DRIPLogRecordFactory;
 import nl.uva.sne.drip.drip.commons.data.v1.external.DRIPLogRecord;
 import nl.uva.sne.drip.drip.commons.data.v1.external.User;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
 
 /**
  *

drip-commons/src/main/java/nl/uva/sne/drip/drip/commons/data/internal/Message.java

@@ -31,7 +31,9 @@ import java.util.List;
  *
  * @author S. Koulouzis.
  */
-    public class Message implements Serializable {
+public class Message implements Serializable {
+
+    private String owner;
 
     private Long creationDate;
 
@@ -53,4 +55,18 @@ import java.util.List;
         this.creationDate = creationDate;
     }
 
+    /**
+     * @return the owner
+     */
+    public String getOwner() {
+        return owner;
+    }
+
+    /**
+     * @param owner the owner to set
+     */
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
 }

drip_planner2/src/logging/drip_loggHandler.py

+import logging
+
+class DRIPLogHandler(logging.StreamHandler):
+    
+    def emit(self, record):
+        try:
+            msg = self.format(record)
+            stream = self.stream
+            same_line = hasattr(record, 'same_line')
+            if self.on_same_line and not same_line:
+                stream.write(self.terminator)
+            stream.write(msg)
+            if same_line:
+                stream.write('... ')
+                self.on_same_line = True
+            else:
+                stream.write(self.terminator)
+                self.on_same_line = False
+            self.flush()
+        except (KeyboardInterrupt, SystemExit):
+            raise
+        except:
+            self.handleError(record)
\ No newline at end of file

drip_planner2/src/rpc_server.py

@@ -2,16 +2,16 @@
 # To change this template file, choose Tools | Templates
 # and open the template in the editor.
 
+import json
+import logging
 import os
 import os.path
+from os.path import expanduser
 import pika
+from planner.dum_planner import *
 import sys
 import tempfile
 import time
-import json
-from planner.dum_planner import *
-from os.path import expanduser
-import logging
 
 logger = logging.getLogger(__name__)
 if not getattr(logger, 'handler_set', None):
@@ -57,8 +57,9 @@ def on_request(ch, method, props, body):
 def handle_delivery(message):
     parsed_json_message = json.loads(message)
     params = parsed_json_message["parameters"]
+    owner = parsed_json_message['owner']
     param = params[0]
-    value = json.loads( param['value'])
+    value = json.loads(param['value'])
     tosca_file_name = param["name"]
     current_milli_time = lambda: int(round(time.time() * 1000))
     
@@ -94,7 +95,7 @@ if __name__ == "__main__":
 #    home = expanduser("~")
 #    planner = DumpPlanner(home+"/workspace/DRIP/docs/input_tosca_files/BEIA_cardif2.yml")
 #    print planner.plan()
-    logger.info("Input args: "+sys.argv[0]+' '+sys.argv[1]+' '+sys.argv[2]) 
+    logger.info("Input args: " + sys.argv[0] + ' ' + sys.argv[1] + ' ' + sys.argv[2]) 
     channel = init_chanel(sys.argv)
     global queue_name
     queue_name = sys.argv[2]