Fix 87293 problems and wrong parts

software/occi-xwiki/software.cfg

@@ -7,8 +7,7 @@ parts =
   instance-occi
   accords
   eggs
-  occi-xwiki-manifest
-  occi-xwiki-os-config
+  occi-manifest
 
 [occi-manifest]
 # Manifest for xwiki

stack/occi/instance-occi.cfg

@@ -22,7 +22,7 @@ os-config = $${pocdirectory:poc}/os-config.xml
 
 # Paths
 manifest = ${occi-manifest:location}/${occi-manifest:filename}
-manifest-destination = ${pocdirectory:poc}/manifest.xml
+manifest-destination = $${pocdirectory:poc}/manifest.xml
 
 # Binary information
 accords = ${accords:location}/bin/parser
@@ -54,30 +54,30 @@ security = $${rootdirectory:poc}/poc/security
 recipe = slapos.cookbook:symbolic.link
 target-directory = $${pocdirectory:poc}
 file-list = 
-  ${accord-source:location}/scripts/accords
-  ${accord-source:location}/scripts/accords-config
-  ${accord-source:location}/scripts/co-broker
-  ${accord-source:location}/scripts/co-command
-  ${accord-source:location}/scripts/co-parser
-  ${accord-source:location}/scripts/cords_user.xml
-  ${accord-source:location}/scripts/co-resolver
-  ${accord-source:location}/scripts/co-start
-  ${accord-source:location}/scripts/co-status
-  ${accord-source:location}/scripts/co-stop
-  ${accord-source:location}/scripts/run-azprocci
-  ${accord-source:location}/scripts/run-broker
-  ${accord-source:location}/scripts/run-coees 
-  ${accord-source:location}/scripts/run-coes
-  ${accord-source:location}/scripts/run-coips 
-  ${accord-source:location}/scripts/run-comons
-  ${accord-source:location}/scripts/run-conets
-  ${accord-source:location}/scripts/run-coobas
-  ${accord-source:location}/scripts/run-cosacs
-  ${accord-source:location}/scripts/run-coss
-  ${accord-source:location}/scripts/run-ezvm 
-  ${accord-source:location}/scripts/run-fileserver
-  ${accord-source:location}/scripts/run-onprocci 
-  ${accord-source:location}/scripts/run-osprocci 
-  ${accord-source:location}/scripts/run-parser 
-  ${accord-source:location}/scripts/run-procci 
-  ${accord-source:location}/scripts/run-publisher
+  ${accords-source:location}/scripts/accords
+  ${accords-source:location}/scripts/accords-config
+  ${accords-source:location}/scripts/co-broker
+  ${accords-source:location}/scripts/co-command
+  ${accords-source:location}/scripts/co-parser
+  ${accords-source:location}/scripts/cords_user.xml
+  ${accords-source:location}/scripts/co-resolver
+  ${accords-source:location}/scripts/co-start
+  ${accords-source:location}/scripts/co-status
+  ${accords-source:location}/scripts/co-stop
+  ${accords-source:location}/scripts/run-azprocci
+  ${accords-source:location}/scripts/run-broker
+  ${accords-source:location}/scripts/run-coees 
+  ${accords-source:location}/scripts/run-coes
+  ${accords-source:location}/scripts/run-coips 
+  ${accords-source:location}/scripts/run-comons
+  ${accords-source:location}/scripts/run-conets
+  ${accords-source:location}/scripts/run-coobas
+  ${accords-source:location}/scripts/run-cosacs
+  ${accords-source:location}/scripts/run-coss
+  ${accords-source:location}/scripts/run-ezvm 
+  ${accords-source:location}/scripts/run-fileserver
+  ${accords-source:location}/scripts/run-onprocci 
+  ${accords-source:location}/scripts/run-osprocci 
+  ${accords-source:location}/scripts/run-parser 
+  ${accords-source:location}/scripts/run-procci 
+  ${accords-source:location}/scripts/run-publisher