Menu
▾
▴
[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/wbem ParserTest.java, 1.9.2.15, 1.9.2.16 Common.java, 1.1.2.6, 1.1.2.7 CIMBuilder.java, 1.7.2.16, 1.7.2.17 SVCTest.java, 1.1.2.10, 1.1.2.11
|
From: Dave B. <bla...@us...> - 2012-04-25 02:34:38
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv6022/utst/org/sblim/cimclient/unittest/wbem
Modified Files:
Tag: Experimental
ParserTest.java Common.java CIMBuilder.java SVCTest.java
Log Message:
3521119 - JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
Index: SVCTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/SVCTest.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- SVCTest.java 29 Jul 2010 18:44:20 -0000 1.1.2.10
+++ SVCTest.java 25 Apr 2012 02:34:35 -0000 1.1.2.11
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -20,6 +20,7 @@
* 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 2823494 2009-08-03 rgummada Change Boolean constructor to static
+ * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
*/
package org.sblim.cimclient.unittest.wbem;
@@ -104,11 +105,11 @@
}
private static final CIMQualifierType<?>[] REF_QUALI_TYPE_A = {
- new CIMQualifierType<Boolean>(new CIMObjectPath("BoolQuali", null),
- CIMDataType.BOOLEAN_T, Boolean.FALSE, 0, 0),
- new CIMQualifierType<Integer[]>(new CIMObjectPath("IntAQuali", null),
- CIMDataType.SINT32_ARRAY_T, new Integer[] { new Integer(-5), new Integer(15) },
- 0, 0) };
+ new CIMQualifierType<Boolean>(new CIMObjectPath(null, null, null, null, "BoolQuali",
+ null), CIMDataType.BOOLEAN_T, Boolean.FALSE, 0, 0),
+ new CIMQualifierType<Integer[]>(new CIMObjectPath(null, null, null, null, "IntAQuali",
+ null), CIMDataType.SINT32_ARRAY_T, new Integer[] { new Integer(-5),
+ new Integer(15) }, 0, 0) };
private static final String ENUMQUALIS = "data/SVCEnumQualiTypes.xml";
Index: ParserTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/ParserTest.java,v
retrieving revision 1.9.2.15
retrieving revision 1.9.2.16
diff -u -d -r1.9.2.15 -r1.9.2.16
--- ParserTest.java 3 Aug 2009 20:38:43 -0000 1.9.2.15
+++ ParserTest.java 25 Apr 2012 02:34:35 -0000 1.9.2.16
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -24,9 +24,10 @@
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2204488 2008-10-28 raman_arora Fix code to remove compiler warnings
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 2823494 2009-08-03 rgummada Change Boolean constructor to static
+ * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
*/
package org.sblim.cimclient.unittest.wbem;
@@ -472,16 +473,18 @@
new CIMDataType("IBMTS_Account"),
// String host, String namespace, String objectName,
// CIMProperty[] keys
- new CIMObjectPath("CL3E2289", "root/ibm", "IBMTS_Account", new CIMProperty[] {
- new CIMProperty<String>("SystemName", CIMDataType.STRING_T, "icat",
- false, false, null),
- new CIMProperty<String>("SystemCreationClassName",
- CIMDataType.STRING_T, "IBMTS_Account", false, false, null),
- new CIMProperty<String>("Name", CIMDataType.STRING_T, "dummy1", false,
- false, null),
- new CIMProperty<String>("CreationClassName", CIMDataType.STRING_T,
- "IBMTS_Account", false, false, null) })) },
- "data/SVCMethodRsp.smpl0.xml");
+ new CIMObjectPath(null, "CL3E2289", null, "root/ibm", "IBMTS_Account",
+ new CIMProperty[] {
+ new CIMProperty<String>("SystemName", CIMDataType.STRING_T,
+ "icat", false, false, null),
+ new CIMProperty<String>("SystemCreationClassName",
+ CIMDataType.STRING_T, "IBMTS_Account", false, false,
+ null),
+ new CIMProperty<String>("Name", CIMDataType.STRING_T, "dummy1",
+ false, false, null),
+ new CIMProperty<String>("CreationClassName",
+ CIMDataType.STRING_T, "IBMTS_Account", false, false,
+ null) })) }, "data/SVCMethodRsp.smpl0.xml");
/**
* testSVCMethodRspSmpl0SAX
Index: Common.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/Common.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- Common.java 1 Jun 2009 17:01:07 -0000 1.1.2.6
+++ Common.java 25 Apr 2012 02:34:35 -0000 1.1.2.7
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,6 +18,7 @@
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
* 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
*/
package org.sblim.cimclient.unittest.wbem;
@@ -60,8 +61,8 @@
/**
* LOCALPATH
*/
- public static final LocalPathBuilder LOCALPATH = new LocalPathBuilder(new CIMObjectPath(
- "LocalHost", "root/cimv2", null, null));
+ public static final LocalPathBuilder LOCALPATH = new LocalPathBuilder(new CIMObjectPath(null,
+ "LocalHost", null, "root/cimv2", null, null));
/**
* parseWithDOM
Index: CIMBuilder.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/CIMBuilder.java,v
retrieving revision 1.7.2.16
retrieving revision 1.7.2.17
diff -u -d -r1.7.2.16 -r1.7.2.17
--- CIMBuilder.java 16 Mar 2012 10:58:39 -0000 1.7.2.16
+++ CIMBuilder.java 25 Apr 2012 02:34:35 -0000 1.7.2.17
@@ -27,6 +27,7 @@
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 3411879 2011-09-20 blaschke-oss TCK: CIM element value must match type
* 3500619 2012-03-16 blaschke-oss JSR48 1.0.0: CIMClass association/key clean up
+ * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
*/
package org.sblim.cimclient.unittest.wbem;
@@ -263,8 +264,8 @@
TVPair[] pairs = TVPair.getAll(TVPair.ALL & ~(TVPair.REF | TVPair.NULL | TVPair.EMBOBJ));
for (int i = 0; i < 128; i++) {
TVPair pair = pairs[i % pairs.length];
- cQualiTypeA[i] = new CIMQualifierType<Object>(new CIMObjectPath("QualiType" + i, null),
- pair.getType(), pair.getValue(), i, i % 8);
+ cQualiTypeA[i] = new CIMQualifierType<Object>(new CIMObjectPath(null, null, null, null,
+ "QualiType" + i, null), pair.getType(), pair.getValue(), i, i % 8);
}
return cQualiTypeA;
}
|
