modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml | 5 +--- modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml | 7 ++---- modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml | 11 ++++------ modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml | 5 +--- 4 files changed, 12 insertions(+), 16 deletions(-)
New commits: commit d38adb6b40ef0208b8c4c953b64d17a65e5b80b8 Author: Heiko W. Rupp hwr@redhat.com Date: Wed Dec 15 10:43:59 2010 +0100
Adjust values to follow the recent changes for minimum in the xsd
diff --git a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml index f338aed..db954f5 100644 --- a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml +++ b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml @@ -2,12 +2,11 @@ version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin"> - + <server name="testServer1"> <metric displayName="One" property="connectionCount1" displayType="detail" /> <metric displayName="Two" property="connectionCount2" displayType="detail" /> <metric displayName="Three" property="connectionCount3" displayType="detail" /> - <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="10000" /> + <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="30000" /> </server> </plugin> - \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml index 5a55a14..6ba4994 100644 --- a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml +++ b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml @@ -2,14 +2,13 @@ version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin"> - + <server name="testServer1"> <metric displayName="One" property="connectionCount1" displayType="detail" /> <metric displayName="Two" property="connectionCount2" displayType="detail" /> <metric displayName="Three" property="connectionCount3" displayType="detail" /> - <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="10000" /> - + <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="30000" /> + </server>
</plugin> - \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml index 83ab179..419e171 100644 --- a/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml +++ b/modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml @@ -2,20 +2,19 @@ version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin"> - + <server name="testServer1"> <!-- one is gone --> - + <!-- two stays as is--> <metric displayName="Two" property="connectionCount2" displayType="detail" /> <!-- three is changed (display type) --> <metric displayName="Three" property="connectionCount3" displayType="summary" /> <!-- four is new --> <metric displayName="Four" property="connectionCount4" displayType="detail" /> - <!-- five is changed as well (defaultInterval) --> - <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="20000" /> - + <!-- five is changed as well (defaultInterval) --> + <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="50000" /> + </server>
</plugin> - \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml b/modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml index 494aa9f..614da65 100644 --- a/modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml +++ b/modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml @@ -2,7 +2,7 @@ version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin"> - + <platform name="myPlatform4"> <server name="testServer1"> <metric displayName="One" property="connectionCount1" displayType="detail" /> @@ -10,8 +10,7 @@ <server name="testServer2"> <metric displayName="Two" property="connectionCount2" displayType="detail" /> <metric displayName="Three" property="connectionCount3" displayType="detail" /> - <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="10000" /> + <metric displayName="Five" property="connectionCount5" displayType="detail" defaultInterval="30000" /> </server> </platform> </plugin> - \ No newline at end of file