Updated Branches:
  refs/heads/master 07152b21e -> d57796b94

Fix XML validation errors


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

Branch: refs/heads/master
Commit: d57796b94f1d2eb066f29929694d61f0cdb52e23
Parents: 07152b2
Author: Hugo Trippaers <[email protected]>
Authored: Tue Aug 13 08:25:30 2013 +0200
Committer: Hugo Trippaers <[email protected]>
Committed: Tue Aug 13 08:25:45 2013 +0200

----------------------------------------------------------------------
 engine/storage/volume/test/resource/testContext.xml               | 2 +-
 framework/ipc/test/resources/SampleManagementServerAppContext.xml | 3 +--
 plugins/hypervisors/kvm/agent-descriptor.xml                      | 2 +-
 utils/test/resources/com/cloud/utils/QualifierTestContext.xml     | 3 +--
 .../com/cloud/utils/db/transactionContextBuilderTest.xml          | 3 +--
 5 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d57796b9/engine/storage/volume/test/resource/testContext.xml
----------------------------------------------------------------------
diff --git a/engine/storage/volume/test/resource/testContext.xml 
b/engine/storage/volume/test/resource/testContext.xml
index 67f2422..67c28fa 100644
--- a/engine/storage/volume/test/resource/testContext.xml
+++ b/engine/storage/volume/test/resource/testContext.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:context="http://www.springframework.org/schema/context";
   xmlns:tx="http://www.springframework.org/schema/tx"; 
xmlns:aop="http://www.springframework.org/schema/aop";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d57796b9/framework/ipc/test/resources/SampleManagementServerAppContext.xml
----------------------------------------------------------------------
diff --git a/framework/ipc/test/resources/SampleManagementServerAppContext.xml 
b/framework/ipc/test/resources/SampleManagementServerAppContext.xml
index 4b1ff3e..2fbb082 100644
--- a/framework/ipc/test/resources/SampleManagementServerAppContext.xml
+++ b/framework/ipc/test/resources/SampleManagementServerAppContext.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
-
 <beans xmlns="http://www.springframework.org/schema/beans";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
   xmlns:context="http://www.springframework.org/schema/context";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d57796b9/plugins/hypervisors/kvm/agent-descriptor.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/agent-descriptor.xml 
b/plugins/hypervisors/kvm/agent-descriptor.xml
index 51024a8..2923c58 100644
--- a/plugins/hypervisors/kvm/agent-descriptor.xml
+++ b/plugins/hypervisors/kvm/agent-descriptor.xml
@@ -23,7 +23,7 @@
   <formats>
     <format>zip</format>
   </formats>
-  <includeBaseDirectory>yes</includeBaseDirectory>
+  <includeBaseDirectory>true</includeBaseDirectory>
   <dependencySets>
     <dependencySet>
       <outputDirectory></outputDirectory>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d57796b9/utils/test/resources/com/cloud/utils/QualifierTestContext.xml
----------------------------------------------------------------------
diff --git a/utils/test/resources/com/cloud/utils/QualifierTestContext.xml 
b/utils/test/resources/com/cloud/utils/QualifierTestContext.xml
index 313e9d9..a475e56 100644
--- a/utils/test/resources/com/cloud/utils/QualifierTestContext.xml
+++ b/utils/test/resources/com/cloud/utils/QualifierTestContext.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
-
 <beans xmlns="http://www.springframework.org/schema/beans";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
   xmlns:context="http://www.springframework.org/schema/context";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d57796b9/utils/test/resources/com/cloud/utils/db/transactionContextBuilderTest.xml
----------------------------------------------------------------------
diff --git 
a/utils/test/resources/com/cloud/utils/db/transactionContextBuilderTest.xml 
b/utils/test/resources/com/cloud/utils/db/transactionContextBuilderTest.xml
index fd82f81..686b67e 100644
--- a/utils/test/resources/com/cloud/utils/db/transactionContextBuilderTest.xml
+++ b/utils/test/resources/com/cloud/utils/db/transactionContextBuilderTest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements. See the NOTICE file
@@ -16,8 +17,6 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
-
 <beans xmlns="http://www.springframework.org/schema/beans";
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
   xmlns:context="http://www.springframework.org/schema/context";

Reply via email to