You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/01/22 20:27:33 UTC

[08/53] [abbrv] git commit: updated refs/heads/rbac to 33cd1ab

Namespaces are important


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/50054fe0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50054fe0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50054fe0

Branch: refs/heads/rbac
Commit: 50054fe0603673d04655362ea515d3b5c5bb3610
Parents: e9e5b84
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Jan 17 15:59:44 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Jan 17 16:00:10 2014 +0100

----------------------------------------------------------------------
 tools/appliance/convert_ovf_vbox_to_esx.xslt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50054fe0/tools/appliance/convert_ovf_vbox_to_esx.xslt
----------------------------------------------------------------------
diff --git a/tools/appliance/convert_ovf_vbox_to_esx.xslt b/tools/appliance/convert_ovf_vbox_to_esx.xslt
index b07454d..384f6a0 100644
--- a/tools/appliance/convert_ovf_vbox_to_esx.xslt
+++ b/tools/appliance/convert_ovf_vbox_to_esx.xslt
@@ -17,18 +17,12 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ovf="http://www.vmware.com/schema/ovf/1/envelope" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vbox="http://www.virtualbox.org/ovf/machine">
+<xsl:stylesheet version="1.0" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vbox="http://www.virtualbox.org/ovf/machine">
 
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="vssd:VirtualSystemType/text()">vmx-06</xsl:template>
+    <xsl:template match="vssd:VirtualSystemType/text()">vmx-07</xsl:template>
   
     <xsl:template match="ovf:Item[./rasd:ResourceType/text()=20]">
-        <ovf:Item>
+        <Item>
         <xsl:copy-of select="rasd:Address"/>
         <xsl:copy-of select="rasd:BusNumber"/>
         <rasd:Caption>scsiController0</rasd:Caption>
@@ -36,7 +30,13 @@
         <xsl:copy-of select="rasd:InstanceId"/>
         <rasd:ResourceSubType>lsilogic</rasd:ResourceSubType>
         <rasd:ResourceType>6</rasd:ResourceType>
-        </ovf:Item>
+        </Item>
     </xsl:template>
 
+    <xsl:template match="node()|@*">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*"/>
+        </xsl:copy>
+    </xsl:template>
+    
 </xsl:stylesheet>