From 3200faa2a2a16940e4f24e61af4c7cf3c4c67d7c Mon Sep 17 00:00:00 2001 From: Elyes Cherfa Date: Fri, 28 Mar 2025 17:35:34 +0100 Subject: [PATCH 1/6] Issue #35: Rebrand Codebase from Sentry Software to MetricsHub * Updated `pom.xml` & `site.xml` to change sentrysoftware occurrences by metricshub. * Upgraded some dependencies versions. * Updated `site.xml` to update the logo and upgrade the `sentry-maven-skin` version. * Updated chestyle.xml. * Tested that everything is working fine. --- .github/workflows/build.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/release.yml | 2 +- README.md | 10 +- checkstyle.origin.xml | 222 + checkstyle.xml | 60 +- pom.xml | 50 +- .../wbem/client/Utils.java | 210 +- .../wbem/client/WbemCimDataHandler.java | 368 +- .../wbem/client/WbemClient.java | 456 +- .../wbem/client/WbemExecutor.java | 386 +- .../wbem/client/WbemQueryResult.java | 104 +- .../wbem/client/WqlQuery.java | 274 +- .../exceptions/WqlQuerySyntaxException.java | 38 + .../wbem/javax/cim/CIMArgument.java | 202 +- .../wbem/javax/cim/CIMClass.java | 1148 ++- .../wbem/javax/cim/CIMClassProperty.java | 524 +- .../wbem/javax/cim/CIMDataType.java | 1472 ++-- .../wbem/javax/cim/CIMDateTime.java | 272 +- .../wbem/javax/cim/CIMDateTimeAbsolute.java | 806 +- .../wbem/javax/cim/CIMDateTimeInterval.java | 1128 ++- .../wbem/javax/cim/CIMElement.java | 294 +- .../wbem/javax/cim/CIMFlavor.java | 176 +- .../wbem/javax/cim/CIMInstance.java | 734 +- .../wbem/javax/cim/CIMMethod.java | 608 +- .../javax/cim/CIMNamedElementInterface.java | 120 +- .../wbem/javax/cim/CIMObjectPath.java | 1346 ++- .../wbem/javax/cim/CIMParameter.java | 460 +- .../wbem/javax/cim/CIMProperty.java | 336 +- .../cim/CIMQualifiedElementInterface.java | 246 +- .../wbem/javax/cim/CIMQualifier.java | 360 +- .../wbem/javax/cim/CIMQualifierType.java | 346 +- .../wbem/javax/cim/CIMScope.java | 224 +- .../wbem/javax/cim/CIMTypedElement.java | 252 +- .../wbem/javax/cim/CIMValuedElement.java | 308 +- .../wbem/javax/cim/UnsignedInteger16.java | 492 +- .../wbem/javax/cim/UnsignedInteger32.java | 490 +- .../wbem/javax/cim/UnsignedInteger64.java | 554 +- .../wbem/javax/cim/UnsignedInteger8.java | 496 +- .../wbem/javax/cim/package.html | 0 .../wbem/javax/wbem/CloseableIterator.java | 162 +- .../wbem/javax/wbem/WBEMException.java | 774 +- .../javax/wbem/client/EnumerateResponse.java | 234 +- .../javax/wbem/client/PasswordCredential.java | 270 +- .../javax/wbem/client/RoleCredential.java | 248 +- .../wbem/javax/wbem/client/RolePrincipal.java | 294 +- .../wbem/javax/wbem/client/UserPrincipal.java | 330 +- .../wbem/javax/wbem/client/WBEMClient.java | 4506 +++++----- .../wbem/client/WBEMClientConstants.java | 318 +- .../javax/wbem/client/WBEMClientFactory.java | 229 +- .../wbem/javax/wbem/client/package.html | 0 .../wbem/listener/IndicationListener.java | 138 +- .../javax/wbem/listener/WBEMListener.java | 246 +- .../wbem/listener/WBEMListenerConstants.java | 160 +- .../wbem/listener/WBEMListenerFactory.java | 214 +- .../wbem/javax/wbem/listener/package.html | 0 .../wbem/javax/wbem/package.html | 0 .../sblim/cimclient/CIMXMLTraceListener.java | 134 +- .../wbem/sblim/cimclient/GenericExts.java | 208 +- .../cimclient/IndicationListenerSBLIM.java | 152 +- .../sblim/cimclient/LogAndTraceManager.java | 438 +- .../wbem/sblim/cimclient/LogListener.java | 134 +- .../wbem/sblim/cimclient/TraceListener.java | 164 +- .../wbem/sblim/cimclient/WBEMClientSBLIM.java | 555 +- .../WBEMConfigurationProperties.java | 2306 +++-- .../sblim/cimclient/WBEMListenerSBLIM.java | 927 +- .../discovery/AdvertisementCatalog.java | 1119 ++- .../sblim/cimclient/discovery/Discoverer.java | 144 +- .../discovery/DiscovererFactory.java | 184 +- .../cimclient/discovery/WBEMProtocol.java | 286 +- .../discovery/WBEMServiceAdvertisement.java | 687 +- .../sblim/cimclient/discovery/package.html | 0 .../cimclient/doc-files/bestpractise.html | 0 .../cimclient/doc-files/configuration.html | 0 .../cimclient/doc-files/development.html | 0 .../sblim/cimclient/doc-files/discovery.html | 0 .../sblim/cimclient/doc-files/embedded.html | 0 .../sblim/cimclient/doc-files/firststeps.html | 0 .../sblim/cimclient/doc-files/history.html | 0 .../doc-files/indication_threading.png | Bin .../cimclient/doc-files/indications.html | 0 .../sblim/cimclient/doc-files/logging.html | 0 .../sblim/cimclient/doc-files/secure.html | 0 .../doc-files/secure_indications.html | 0 .../cimclient/doc-files/terminology.html | 0 .../sblim/cimclient/doc-files/unittest.html | 0 .../internal/cim/CIMElementSorter.java | 244 +- .../cimclient/internal/cim/CIMHelper.java | 695 +- .../internal/cim/CIMInstanceBuilder.java | 310 +- .../internal/cim/CIMOctetString.java | 966 +- .../cim/CIMQualifiedElementInterfaceImpl.java | 656 +- .../cimclient/internal/cim/CIMVersion.java | 314 +- .../internal/cim/DTStringReader.java | 414 +- .../internal/cim/DTStringWriter.java | 266 +- .../sblim/cimclient/internal/cim/package.html | 0 .../cimxml/CIMClientXML_HelperImpl.java | 5269 ++++++----- .../cimclient/internal/cimxml/CIMMessage.java | 396 +- .../cimclient/internal/cimxml/CIMRequest.java | 334 +- .../internal/cimxml/CIMResponse.java | 456 +- .../internal/cimxml/CIMXMLBuilderImpl.java | 4599 +++++----- .../internal/cimxml/CIMXMLParseException.java | 146 +- .../internal/cimxml/CIMXMLParserImpl.java | 7765 ++++++++--------- .../internal/cimxml/CimXmlSerializer.java | 784 +- .../internal/cimxml/LocalPathBuilder.java | 426 +- .../cimclient/internal/cimxml/TypedValue.java | 168 +- .../cimclient/internal/cimxml/package.html | 0 .../internal/cimxml/sax/CIMObjectFactory.java | 1182 ++- .../internal/cimxml/sax/EmbObjHandler.java | 699 +- .../internal/cimxml/sax/NodeConstIf.java | 1856 ++-- .../internal/cimxml/sax/NodeFactory.java | 982 ++- .../internal/cimxml/sax/NodePool.java | 320 +- .../internal/cimxml/sax/SAXHelper.java | 208 +- .../internal/cimxml/sax/SAXSession.java | 171 +- .../cimxml/sax/XMLDefaultHandlerImpl.java | 589 +- .../sax/node/AbstractArrayValueNode.java | 118 +- .../cimxml/sax/node/AbstractMessageNode.java | 136 +- .../sax/node/AbstractMethodCallNode.java | 415 +- .../cimxml/sax/node/AbstractMultiRspNode.java | 146 +- .../cimxml/sax/node/AbstractObjectNode.java | 126 +- .../sax/node/AbstractObjectPathNode.java | 116 +- .../sax/node/AbstractParamValueNode.java | 138 +- .../sax/node/AbstractParameterNode.java | 249 +- .../cimxml/sax/node/AbstractPathNode.java | 132 +- .../cimxml/sax/node/AbstractPropertyNode.java | 325 +- .../cimxml/sax/node/AbstractResponseNode.java | 116 +- .../sax/node/AbstractScalarValueNode.java | 122 +- .../sax/node/AbstractSimpleRspNode.java | 145 +- .../cimxml/sax/node/AbstractValueNode.java | 118 +- .../internal/cimxml/sax/node/ArrayIf.java | 126 +- .../internal/cimxml/sax/node/CIMNode.java | 312 +- .../cimxml/sax/node/ClassNameNode.java | 241 +- .../internal/cimxml/sax/node/ClassNode.java | 365 +- .../cimxml/sax/node/ClassPathNode.java | 277 +- .../cimxml/sax/node/CorrelatorNode.java | 237 +- .../internal/cimxml/sax/node/ErrorIf.java | 114 +- .../internal/cimxml/sax/node/ErrorNode.java | 265 +- .../cimxml/sax/node/ExpMethodCallNode.java | 260 +- .../sax/node/ExpMethodResponseNode.java | 290 +- .../cimxml/sax/node/ExpParamValueNode.java | 246 +- .../internal/cimxml/sax/node/HostNode.java | 224 +- .../cimxml/sax/node/IMethodCallNode.java | 156 +- .../cimxml/sax/node/IMethodResponseNode.java | 409 +- .../cimxml/sax/node/IParamValueNode.java | 335 +- .../cimxml/sax/node/IReturnValueNode.java | 312 +- .../cimxml/sax/node/InstanceNameNode.java | 325 +- .../cimxml/sax/node/InstanceNode.java | 329 +- .../cimxml/sax/node/InstancePathNode.java | 295 +- .../cimxml/sax/node/KeyBindingNode.java | 257 +- .../cimxml/sax/node/KeyValueNode.java | 445 +- .../cimxml/sax/node/LocalClassPathNode.java | 269 +- .../sax/node/LocalInstancePathNode.java | 287 +- .../sax/node/LocalNameSpacePathNode.java | 279 +- .../internal/cimxml/sax/node/MessageNode.java | 270 +- .../cimxml/sax/node/MethodCallNode.java | 156 +- .../internal/cimxml/sax/node/MethodNode.java | 353 +- .../cimxml/sax/node/MethodResponseNode.java | 397 +- .../cimxml/sax/node/MultiExpReqNode.java | 208 +- .../cimxml/sax/node/MultiExpRspNode.java | 210 +- .../cimxml/sax/node/MultiReqNode.java | 226 +- .../cimxml/sax/node/MultiRspNode.java | 208 +- .../cimxml/sax/node/NameSpaceNode.java | 226 +- .../cimxml/sax/node/NameSpacePathNode.java | 286 +- .../internal/cimxml/sax/node/Node.java | 787 +- .../cimxml/sax/node/NonVolatileIf.java | 116 +- .../cimxml/sax/node/ObjectPathIf.java | 112 +- .../cimxml/sax/node/ObjectPathNode.java | 225 +- .../cimxml/sax/node/ParamValueNode.java | 361 +- .../cimxml/sax/node/ParameterArrayNode.java | 181 +- .../cimxml/sax/node/ParameterNode.java | 173 +- .../sax/node/ParameterRefArrayNode.java | 175 +- .../sax/node/ParameterReferenceNode.java | 163 +- .../cimxml/sax/node/PropertyArrayNode.java | 281 +- .../cimxml/sax/node/PropertyNode.java | 275 +- .../sax/node/PropertyReferenceNode.java | 239 +- .../cimxml/sax/node/QualiDeclNode.java | 443 +- .../cimxml/sax/node/QualifiedNodeHandler.java | 397 +- .../cimxml/sax/node/QualifierNode.java | 375 +- .../cimxml/sax/node/RetValPipeIf.java | 124 +- .../cimxml/sax/node/ReturnValueNode.java | 287 +- .../internal/cimxml/sax/node/ScopeNode.java | 258 +- .../cimxml/sax/node/SimpleExpReqNode.java | 214 +- .../cimxml/sax/node/SimpleExpRspNode.java | 261 +- .../cimxml/sax/node/SimpleReqNode.java | 242 +- .../cimxml/sax/node/SimpleRspNode.java | 285 +- .../internal/cimxml/sax/node/TypedIf.java | 112 +- .../cimxml/sax/node/ValueArrayNode.java | 311 +- .../internal/cimxml/sax/node/ValueIf.java | 114 +- .../sax/node/ValueInstanceWithPathNode.java | 295 +- .../sax/node/ValueNamedInstanceNode.java | 319 +- .../internal/cimxml/sax/node/ValueNode.java | 265 +- .../cimxml/sax/node/ValueNullNode.java | 229 +- .../cimxml/sax/node/ValueObjectNode.java | 251 +- .../node/ValueObjectWithLocalPathNode.java | 321 +- .../sax/node/ValueObjectWithPathNode.java | 313 +- .../cimxml/sax/node/ValueRefArrayNode.java | 283 +- .../cimxml/sax/node/ValueReferenceNode.java | 291 +- .../internal/cimxml/sax/node/package.html | 0 .../internal/cimxml/sax/package.html | 0 .../cimclient/internal/discovery/package.html | 0 .../internal/discovery/slp/DiscovererSLP.java | 510 +- .../slp/WBEMServiceAdvertisementSLP.java | 588 +- .../internal/discovery/slp/package.html | 0 .../internal/http/AuthorizationHandler.java | 240 +- .../internal/http/AuthorizationInfo.java | 1028 ++- .../internal/http/BASE64Encoder.java | 284 +- .../cimclient/internal/http/Challenge.java | 562 +- .../cimclient/internal/http/HttpClient.java | 2578 +++--- .../internal/http/HttpClientMethod.java | 400 +- .../internal/http/HttpClientPool.java | 662 +- .../internal/http/HttpConnectionHandler.java | 570 +- .../internal/http/HttpContentHandler.java | 158 +- .../internal/http/HttpException.java | 232 +- .../cimclient/internal/http/HttpHeader.java | 1073 ++- .../internal/http/HttpHeaderParser.java | 488 +- .../cimclient/internal/http/HttpMethod.java | 238 +- .../internal/http/HttpParseException.java | 142 +- .../internal/http/HttpServerConnection.java | 886 +- .../internal/http/HttpServerMethod.java | 356 +- .../internal/http/HttpServerWorker.java | 166 +- .../internal/http/HttpSocketFactory.java | 992 ++- .../internal/http/HttpUrlConnection.java | 540 +- .../internal/http/MessageReader.java | 402 +- .../internal/http/MessageWriter.java | 400 +- .../internal/http/PegasusLocalAuthInfo.java | 362 +- .../cimclient/internal/http/WwwAuthInfo.java | 720 +- .../internal/http/io/ASCIIPrintStream.java | 856 +- .../internal/http/io/BoundedInputStream.java | 310 +- .../internal/http/io/ChunkedInputStream.java | 432 +- .../internal/http/io/ChunkedOutputStream.java | 244 +- .../internal/http/io/DebugInputStream.java | 342 +- .../http/io/KeepAliveInputStream.java | 236 +- .../http/io/PersistentInputStream.java | 184 +- .../http/io/PersistentOutputStream.java | 182 +- .../internal/http/io/TrailerException.java | 159 +- .../cimclient/internal/http/io/package.html | 0 .../cimclient/internal/http/package.html | 0 .../internal/logging/LogAndTraceBroker.java | 1912 ++-- .../internal/logging/LogFormatter.java | 166 +- .../internal/logging/MessageLoader.java | 278 +- .../cimclient/internal/logging/Messages.java | 502 +- .../cimclient/internal/logging/TimeStamp.java | 238 +- .../internal/logging/TraceFormatter.java | 188 +- .../cimclient/internal/logging/package.html | 0 .../sblim/cimclient/internal/package.html | 0 .../internal/pullparser/XMLPullParser.java | 2542 +++--- .../pullparser/XMLPullParserException.java | 152 +- .../internal/pullparser/package.html | 0 .../cimclient/internal/uri/Authority.java | 426 +- .../cimclient/internal/uri/BooleanValue.java | 260 +- .../cimclient/internal/uri/CharValue.java | 356 +- .../cimclient/internal/uri/DateTimeValue.java | 266 +- .../cimclient/internal/uri/IntegerValue.java | 668 +- .../cimclient/internal/uri/KeyValuePair.java | 250 +- .../cimclient/internal/uri/KeyValuePairs.java | 208 +- .../internal/uri/NamespaceHandle.java | 318 +- .../cimclient/internal/uri/NamespacePath.java | 328 +- .../cimclient/internal/uri/QuotedValue.java | 112 +- .../cimclient/internal/uri/RealValue.java | 384 +- .../internal/uri/ReferenceValue.java | 188 +- .../cimclient/internal/uri/StringValue.java | 266 +- .../sblim/cimclient/internal/uri/Test.java | 366 +- .../sblim/cimclient/internal/uri/URI.java | 740 +- .../cimclient/internal/uri/URIString.java | 730 +- .../sblim/cimclient/internal/uri/Value.java | 400 +- .../sblim/cimclient/internal/uri/package.html | 0 .../sblim/cimclient/internal/util/MOF.java | 1900 ++-- .../cimclient/internal/util/StringSorter.java | 192 +- .../cimclient/internal/util/ThreadPool.java | 692 +- .../sblim/cimclient/internal/util/Util.java | 278 +- .../internal/util/WBEMConfiguration.java | 2478 +++--- .../util/WBEMConfigurationDefaults.java | 732 +- .../internal/util/WBEMConstants.java | 388 +- .../cimclient/internal/util/XMLHostStr.java | 370 +- .../cimclient/internal/util/package.html | 0 .../cimclient/internal/wbem/CIMError.java | 392 +- .../internal/wbem/CloseableIteratorDOM.java | 400 +- .../wbem/CloseableIteratorGeneric.java | 222 +- .../internal/wbem/CloseableIteratorPULL.java | 447 +- .../internal/wbem/CloseableIteratorSAX.java | 346 +- .../internal/wbem/EnumerateResponseDOM.java | 272 +- .../internal/wbem/EnumerateResponsePULL.java | 272 +- .../internal/wbem/EnumerateResponseSAX.java | 280 +- .../internal/wbem/WBEMClientCIMXML.java | 5753 ++++++------ .../internal/wbem/indications/CIMEvent.java | 264 +- .../wbem/indications/CIMEventDispatcher.java | 415 +- .../indications/CIMIndicationHandler.java | 1659 ++-- .../wbem/indications/RIHandlerTest.txt | 0 .../ReliableIndicationHandler.java | 1319 ++- .../internal/wbem/indications/package.html | 0 .../wbem/operations/CIMAssociatorNamesOp.java | 242 +- .../wbem/operations/CIMAssociatorsOp.java | 318 +- .../wbem/operations/CIMCreateClassOp.java | 158 +- .../wbem/operations/CIMCreateInstanceOp.java | 160 +- .../wbem/operations/CIMCreateNameSpaceOp.java | 126 +- .../operations/CIMCreateQualifierTypeOp.java | 162 +- .../wbem/operations/CIMDeleteClassOp.java | 130 +- .../wbem/operations/CIMDeleteInstanceOp.java | 130 +- .../wbem/operations/CIMDeleteNameSpaceOp.java | 130 +- .../operations/CIMDeleteQualifierTypeOp.java | 130 +- .../wbem/operations/CIMEnumClassNamesOp.java | 158 +- .../wbem/operations/CIMEnumClassesOp.java | 238 +- .../operations/CIMEnumInstanceNamesOp.java | 130 +- .../wbem/operations/CIMEnumInstancesOp.java | 264 +- .../wbem/operations/CIMEnumNameSpaceOp.java | 128 +- .../operations/CIMEnumQualifierTypesOp.java | 130 +- .../wbem/operations/CIMExecQueryOp.java | 184 +- .../wbem/operations/CIMGetClassOp.java | 240 +- .../wbem/operations/CIMGetInstanceOp.java | 238 +- .../wbem/operations/CIMGetPropertyOp.java | 158 +- .../operations/CIMGetQualifierTypeOp.java | 158 +- .../wbem/operations/CIMInvokeMethodOp.java | 216 +- .../wbem/operations/CIMOperation.java | 264 +- .../wbem/operations/CIMReferenceNamesOp.java | 184 +- .../wbem/operations/CIMReferencesOp.java | 262 +- .../wbem/operations/CIMSetClassOp.java | 160 +- .../wbem/operations/CIMSetInstanceOp.java | 214 +- .../wbem/operations/CIMSetPropertyOp.java | 184 +- .../operations/CIMSetQualifierTypeOp.java | 162 +- .../operations/CIMSingleResultOperation.java | 142 +- .../internal/wbem/operations/package.html | 0 .../cimclient/internal/wbem/package.html | 0 .../wbem/sblim/cimclient/package.html | 0 .../wbem/sblim/slp/Advertiser.java | 258 +- .../wbem/sblim/slp/Locator.java | 554 +- .../wbem/sblim/slp/SLPConfigProperties.java | 920 +- .../sblim/slp/ServiceLocationAttribute.java | 810 +- .../ServiceLocationAttributeDescriptor.java | 330 +- .../slp/ServiceLocationAttributeVerifier.java | 308 +- .../sblim/slp/ServiceLocationEnumeration.java | 182 +- .../sblim/slp/ServiceLocationException.java | 522 +- .../sblim/slp/ServiceLocationManager.java | 242 +- .../wbem/sblim/slp/ServiceType.java | 540 +- .../wbem/sblim/slp/ServiceURL.java | 680 +- .../wbem/sblim/slp/TemplateRegistry.java | 284 +- .../sblim/slp/internal/AdvertiserImpl.java | 371 +- .../sblim/slp/internal/AttributeHandler.java | 256 +- .../wbem/sblim/slp/internal/Convert.java | 344 +- .../internal/IPv6MulticastAddressFactory.java | 336 +- .../wbem/sblim/slp/internal/Net.java | 214 +- .../wbem/sblim/slp/internal/SLPConfig.java | 1230 ++- .../wbem/sblim/slp/internal/SLPDefaults.java | 436 +- .../wbem/sblim/slp/internal/SLPLimits.java | 244 +- .../wbem/sblim/slp/internal/SLPString.java | 240 +- .../wbem/sblim/slp/internal/TRC.java | 604 +- .../slp/internal/msg/AttributeReply.java | 304 +- .../slp/internal/msg/AttributeRequest.java | 354 +- .../wbem/sblim/slp/internal/msg/DAAdvert.java | 404 +- .../sblim/slp/internal/msg/DADescriptor.java | 338 +- .../sblim/slp/internal/msg/FunctionIDs.java | 228 +- .../sblim/slp/internal/msg/MsgFactory.java | 456 +- .../sblim/slp/internal/msg/MsgHeader.java | 680 +- .../sblim/slp/internal/msg/ReplyMessage.java | 226 +- .../slp/internal/msg/RequestMessage.java | 412 +- .../wbem/sblim/slp/internal/msg/SAAdvert.java | 346 +- .../slp/internal/msg/SLPInputStream.java | 1006 ++- .../sblim/slp/internal/msg/SLPMessage.java | 445 +- .../slp/internal/msg/SLPOutputStream.java | 882 +- .../slp/internal/msg/SerializeOption.java | 110 +- .../internal/msg/ServiceAcknowledgment.java | 242 +- .../internal/msg/ServiceDeregistration.java | 332 +- .../slp/internal/msg/ServiceRegistration.java | 392 +- .../sblim/slp/internal/msg/ServiceReply.java | 368 +- .../slp/internal/msg/ServiceRequest.java | 376 +- .../slp/internal/msg/ServiceTypeReply.java | 286 +- .../slp/internal/msg/ServiceTypeRequest.java | 304 +- .../wbem/sblim/slp/internal/msg/Util.java | 130 +- .../wbem/sblim/slp/internal/package.html | 0 .../sblim/slp/internal/sa/DatagramThread.java | 246 +- .../sblim/slp/internal/sa/MessageTable.java | 510 +- .../sblim/slp/internal/sa/RecieverThread.java | 352 +- .../sblim/slp/internal/sa/ServiceAgent.java | 724 +- .../sblim/slp/internal/sa/ServiceTable.java | 840 +- .../wbem/sblim/slp/internal/sa/TCPThread.java | 232 +- .../wbem/sblim/slp/internal/ua/DACache.java | 348 +- .../slp/internal/ua/DatagramRequester.java | 836 +- .../sblim/slp/internal/ua/LocatorImpl.java | 282 +- .../sblim/slp/internal/ua/ResponseCache.java | 250 +- .../sblim/slp/internal/ua/ResultTable.java | 468 +- .../slp/internal/ua/SLEnumerationImpl.java | 512 +- .../sblim/slp/internal/ua/TCPRequester.java | 304 +- .../wbem/sblim/slp/package.html | 0 .../exceptions/WqlQuerySyntaxException.java | 40 - src/site/markdown/index.md | 10 +- src/site/resources/images/metricshub-logo.png | Bin 0 -> 6041 bytes .../resources/images/sentry-logo-179x75px.png | Bin 4321 -> 0 bytes src/site/site.xml | 8 +- .../wbem/WbemCimDataHandlerTest.java | 315 +- .../wbem/WbemClientTest.java | 326 +- .../wbem/WbemExecutorTest.java | 164 +- .../wbem/WqlQueryTest.java | 152 +- 390 files changed, 80616 insertions(+), 81195 deletions(-) create mode 100644 checkstyle.origin.xml rename src/main/java/org/{sentrysoftware => metricshub}/wbem/client/Utils.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/client/WbemCimDataHandler.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/client/WbemClient.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/client/WbemExecutor.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/client/WbemQueryResult.java (51%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/client/WqlQuery.java (79%) create mode 100644 src/main/java/org/metricshub/wbem/client/exceptions/WqlQuerySyntaxException.java rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMArgument.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMClass.java (92%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMClassProperty.java (89%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMDataType.java (92%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMDateTime.java (84%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMDateTimeAbsolute.java (91%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMDateTimeInterval.java (93%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMElement.java (84%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMFlavor.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMInstance.java (89%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMMethod.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMNamedElementInterface.java (67%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMObjectPath.java (90%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMParameter.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMProperty.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMQualifiedElementInterface.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMQualifier.java (85%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMQualifierType.java (85%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMScope.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMTypedElement.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/CIMValuedElement.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/UnsignedInteger16.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/UnsignedInteger32.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/UnsignedInteger64.java (89%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/UnsignedInteger8.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/cim/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/CloseableIterator.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/WBEMException.java (90%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/client/EnumerateResponse.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/client/PasswordCredential.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/client/RoleCredential.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/client/RolePrincipal.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/client/UserPrincipal.java (84%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/client/WBEMClient.java (97%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/client/WBEMClientConstants.java (85%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/client/WBEMClientFactory.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/client/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/listener/IndicationListener.java (70%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/listener/WBEMListener.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/listener/WBEMListenerConstants.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/listener/WBEMListenerFactory.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/listener/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/javax/wbem/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/CIMXMLTraceListener.java (68%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/GenericExts.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/IndicationListenerSBLIM.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/LogAndTraceManager.java (84%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/LogListener.java (67%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/TraceListener.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/WBEMClientSBLIM.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/WBEMConfigurationProperties.java (95%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/WBEMListenerSBLIM.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java (91%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/discovery/Discoverer.java (71%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/discovery/DiscovererFactory.java (69%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/discovery/WBEMProtocol.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java (91%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/discovery/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/bestpractise.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/configuration.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/development.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/discovery.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/embedded.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/firststeps.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/history.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/indication_threading.png (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/indications.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/logging.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/secure.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/secure_indications.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/terminology.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/doc-files/unittest.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cim/CIMHelper.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cim/CIMOctetString.java (91%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cim/CIMVersion.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cim/DTStringReader.java (84%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cim/DTStringWriter.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cim/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java (93%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java (93%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java (65%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java (95%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java (89%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/TypedValue.java (63%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java (85%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java (92%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java (89%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java (65%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java (64%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java (63%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java (65%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java (67%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java (61%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java (63%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java (64%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java (64%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java (62%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java (65%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java (62%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java (63%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java (61%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java (69%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java (70%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java (58%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java (71%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java (71%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java (87%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java (63%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java (58%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java (69%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java (69%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java (71%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java (68%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java (62%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java (59%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java (62%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java (68%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/node/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/cimxml/sax/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/discovery/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/discovery/slp/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java (87%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/BASE64Encoder.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/Challenge.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpClient.java (93%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpClientMethod.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpClientPool.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpContentHandler.java (71%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpException.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpHeader.java (89%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpMethod.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpParseException.java (66%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpServerConnection.java (89%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpServerMethod.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpServerWorker.java (65%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java (91%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java (85%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/MessageReader.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/MessageWriter.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java (90%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/io/TrailerException.java (66%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/io/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/http/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java (93%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/logging/LogFormatter.java (71%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/logging/MessageLoader.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/logging/Messages.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/logging/TimeStamp.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/logging/TraceFormatter.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/logging/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java (93%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/pullparser/XMLPullParserException.java (67%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/pullparser/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/Authority.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/BooleanValue.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/CharValue.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/DateTimeValue.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/IntegerValue.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/KeyValuePair.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/KeyValuePairs.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/NamespaceHandle.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/NamespacePath.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/QuotedValue.java (61%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/RealValue.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/ReferenceValue.java (64%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/StringValue.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/Test.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/URI.java (89%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/URIString.java (87%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/Value.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/uri/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/util/MOF.java (90%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/util/StringSorter.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/util/ThreadPool.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/util/Util.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/util/WBEMConfiguration.java (94%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/util/WBEMConfigurationDefaults.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/util/WBEMConstants.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/util/XMLHostStr.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/util/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/CIMError.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/CloseableIteratorDOM.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/CloseableIteratorGeneric.java (71%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/CloseableIteratorPULL.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/CloseableIteratorSAX.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/EnumerateResponseDOM.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/EnumerateResponsePULL.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/EnumerateResponseSAX.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java (94%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java (89%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/indications/RIHandlerTest.txt (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java (92%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/indications/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java (63%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java (63%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java (63%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java (65%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java (61%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java (61%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java (64%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java (62%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java (64%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java (62%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java (64%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java (62%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java (67%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java (65%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java (65%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java (69%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java (71%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java (67%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java (63%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java (69%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java (67%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java (65%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java (66%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/operations/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/internal/wbem/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/cimclient/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/Advertiser.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/Locator.java (91%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/SLPConfigProperties.java (93%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/ServiceLocationAttribute.java (90%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/ServiceLocationAttributeVerifier.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/ServiceLocationEnumeration.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/ServiceLocationException.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/ServiceLocationManager.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/ServiceType.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/ServiceURL.java (89%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/TemplateRegistry.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/AdvertiserImpl.java (75%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/AttributeHandler.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/Convert.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java (77%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/Net.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/SLPConfig.java (91%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/SLPDefaults.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/SLPLimits.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/SLPString.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/TRC.java (85%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/AttributeReply.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/AttributeRequest.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/DAAdvert.java (84%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/DADescriptor.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/FunctionIDs.java (69%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/MsgFactory.java (84%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/MsgHeader.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/ReplyMessage.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/RequestMessage.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/SAAdvert.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/SLPInputStream.java (88%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/SLPMessage.java (79%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/SLPOutputStream.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/SerializeOption.java (61%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java (73%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/ServiceDeregistration.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/ServiceRegistration.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/ServiceReply.java (81%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/ServiceRequest.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/ServiceTypeReply.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/msg/Util.java (64%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/package.html (100%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/sa/DatagramThread.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/sa/MessageTable.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/sa/RecieverThread.java (74%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/sa/ServiceAgent.java (78%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/sa/ServiceTable.java (85%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/sa/TCPThread.java (71%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/ua/DACache.java (80%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/ua/DatagramRequester.java (86%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/ua/LocatorImpl.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/ua/ResponseCache.java (76%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/ua/ResultTable.java (83%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java (82%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/internal/ua/TCPRequester.java (72%) rename src/main/java/org/{sentrysoftware => metricshub}/wbem/sblim/slp/package.html (100%) delete mode 100644 src/main/java/org/sentrysoftware/wbem/client/exceptions/WqlQuerySyntaxException.java create mode 100644 src/site/resources/images/metricshub-logo.png delete mode 100644 src/site/resources/images/sentry-logo-179x75px.png rename src/test/java/org/{sentrysoftware => metricshub}/wbem/WbemCimDataHandlerTest.java (90%) rename src/test/java/org/{sentrysoftware => metricshub}/wbem/WbemClientTest.java (89%) rename src/test/java/org/{sentrysoftware => metricshub}/wbem/WbemExecutorTest.java (92%) rename src/test/java/org/{sentrysoftware => metricshub}/wbem/WqlQueryTest.java (95%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55aed6a..62baa53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ on: jobs: build: - uses: sentrysoftware/workflows/.github/workflows/maven-build.yml@v3 + uses: metricshub/workflows/.github/workflows/maven-build.yml@v2 with: jdkVersion: "17" debug: ${{ github.event_name == 'workflow_dispatch' && inputs.debug }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5a72abb..cf17156 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,7 +10,7 @@ on: jobs: deploy: - uses: sentrysoftware/workflows/.github/workflows/maven-central-deploy.yml@v3 + uses: metricshub/workflows/.github/workflows/maven-central-deploy.yml@v2 with: jdkVersion: "17" secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14d640c..ba8ec25 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ on: jobs: release: - uses: sentrysoftware/workflows/.github/workflows/maven-central-release.yml@v3 + uses: metricshub/workflows/.github/workflows/maven-central-release.yml@v2 with: releaseVersion: ${{ inputs.releaseVersion }} developmentVersion: ${{ inputs.developmentVersion }} diff --git a/README.md b/README.md index 62df03a..6845666 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # WBEM Java Client -![GitHub release (with filter)](https://img.shields.io/github/v/release/sentrysoftware/wbem) -![Build](https://img.shields.io/github/actions/workflow/status/sentrysoftware/wbem/deploy.yml) -![GitHub top language](https://img.shields.io/github/languages/top/sentrysoftware/wbem) -![License](https://img.shields.io/github/license/sentrysoftware/wbem) +![GitHub release (with filter)](https://img.shields.io/github/v/release/metricshub/wbem-java) +![Build](https://img.shields.io/github/actions/workflow/status/metricshub/wbem-java/deploy.yml) +![GitHub top language](https://img.shields.io/github/languages/top/metricshub/wbem-java) +![License](https://img.shields.io/github/license/metricshub/wbem-java) This project is a fork of the excellent [Standards Based Linux Instrumentation](https://sourceforge.net/projects/sblim/) ([see also](https://sblim.sourceforge.net/wiki/index.php/Main_Page)). -See **[Project Documentation](https://sentrysoftware.org/wbem)** and the [Javadoc](https://sentrysoftware.org/wbem/apidocs) for more information on how to use this library in your code. +See **[Project Documentation](https://metricshub.org/wbem-java)** and the [Javadoc](https://metricshub.org/wbem-java/apidocs) for more information on how to use this library in your code. The Web-Based Enterprise Management (WBEM) Java Client is a library that enables to: * Connect to a WBEM Server diff --git a/checkstyle.origin.xml b/checkstyle.origin.xml new file mode 100644 index 0000000..2098fe6 --- /dev/null +++ b/checkstyle.origin.xml @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/checkstyle.xml b/checkstyle.xml index 2098fe6..cf46deb 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -46,30 +46,18 @@ - + - - - - - - - - - - - - @@ -92,15 +80,8 @@ - - - - - - - @@ -123,19 +104,13 @@ - - - - - - @@ -143,33 +118,24 @@ - - - - - - - - - + - @@ -179,43 +145,21 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 438686f..1108870 100644 --- a/pom.xml +++ b/pom.xml @@ -2,24 +2,24 @@ 4.0.0 - org.sentrysoftware + org.metricshub oss-parent 2 - org.sentrysoftware - wbem + org.metricshub + wbem-java 1.1.00-SNAPSHOT WBEM Java Client WBEM Java Client - Sentry Software - https://sentrysoftware.com + MetricsHub + https://metricshub.com - https://sentrysoftware.org/wbem + https://metricshub.org/wbem 2023 @@ -32,40 +32,33 @@ GitHub - https://github.com/sentrysoftware/wbem/issues/ + https://github.com/MetricsHub/wbem-java/issues/ - scm:git:https://github.com/sentrysoftware/wbem.git - https://github.com/sentrysoftware/wbem + scm:git:https://github.com/MetricsHub/wbem-java.git + https://github.com/metricshub/wbem-java HEAD Bertrand Martin (@bertysentry) - bertrand@sentrysoftware.com + bertrand@metricshub.com maintainer Nassim BOUTEKEDJIRET (@NassimBtk) - nassim@sentrysoftware.com - - maintainer - - - - Kawtar Bakour (@KawtarBK9) - kawtar@sentrysoftware.com + nassim@metricshub.com maintainer Elyes Cherfa (@CherfaElyes) - elyes@sentrysoftware.com + elyes@metricshub.com maintainer @@ -126,30 +119,13 @@ ${maven.compiler.target} public true - org.sentrysoftware.wbem.javax.*:org.sentrysoftware.wbem.sblim.* + org.metricshub.wbem-java.javax.*:org.metricshub.wbem-java.sblim.* - - - - - - maven-site-plugin - - - org.sentrysoftware.maven - maven-skin-tools - 1.2.00 - - - - - - diff --git a/src/main/java/org/sentrysoftware/wbem/client/Utils.java b/src/main/java/org/metricshub/wbem/client/Utils.java similarity index 76% rename from src/main/java/org/sentrysoftware/wbem/client/Utils.java rename to src/main/java/org/metricshub/wbem/client/Utils.java index a1c27ff..835e14f 100644 --- a/src/main/java/org/sentrysoftware/wbem/client/Utils.java +++ b/src/main/java/org/metricshub/wbem/client/Utils.java @@ -1,106 +1,104 @@ -package org.sentrysoftware.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.time.LocalDateTime; -import java.time.OffsetDateTime; -import java.time.ZoneOffset; -import java.time.format.DateTimeFormatter; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class Utils { - - /** - * Check if the required argument is not null. - * - * @param argument - * @param name - * @throws IllegalArgumentException if the argument is null - */ - public static void checkNonNull(final T argument, final String name) { - if (argument == null) { - throw new IllegalArgumentException(name + " must not be null."); - } - } - - /** - * Default separator for array values - */ - public static final String DEFAULT_ARRAY_SEPARATOR = "|"; - - public static final String EMPTY = ""; - - /** - * Formatter/Parser of the first part of CIM_DATETIME - */ - public static final DateTimeFormatter WBEM_CIM_DATETIME_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); - - /** - * Regex that matches with a CIM_DATETIME string format See - * https://docs.microsoft.com/en-us/windows/win32/wmisdk/cim-datetime - *
    - *
  • group(1): yyyymmddHHMMSS - *
  • group(2): optional fraction of seconds - *
  • group(3): timezone offset... in minutes (sigh) - */ - private static final Pattern CIM_DATETIME_PATTERN = Pattern - .compile("^([0-9]{14})(?:\\.([0-9]{3,6}))?([+-][0-9]{3})$"); - - /** - * Convert a String holding a CIM_DATETIME (i.e. a string in the form of - * yyyymmddHHMMSS.mmmmmmsUUU) to an OffsetDateTime object - * - * @param stringValue String value with a CIM_DATETIME - * @return OffsetDateTime instance - */ - public static OffsetDateTime convertCimDateTime(final String stringValue) { - - if (stringValue == null) { - return null; - } - - final Matcher dateTimeMatcher = CIM_DATETIME_PATTERN.matcher(stringValue); - if (!dateTimeMatcher.find()) { - throw new IllegalArgumentException("Not a valid CIM_DATETIME value: " + stringValue); - } - - // LocalDateTime - final LocalDateTime localDateTime = LocalDateTime.parse(dateTimeMatcher.group(1), WBEM_CIM_DATETIME_FORMATTER); - - // Note: we're not taking the milliseconds and microseconds into account from - // group(2) - - // Zone Offset - final String zoneOffset = dateTimeMatcher.group(3); - if (zoneOffset == null) { - throw new IllegalStateException( - "Unable to get the timezone offset from CIM_DATETIME value: " + stringValue); - } - final int secondsOffset = Integer.parseInt(zoneOffset) * 60; - final ZoneOffset offset = ZoneOffset.ofTotalSeconds(secondsOffset); - - return OffsetDateTime.of(localDateTime, offset); - } - -} +package org.metricshub.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.time.LocalDateTime; +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class Utils { + + /** + * Check if the required argument is not null. + * + * @param argument + * @param name + * @throws IllegalArgumentException if the argument is null + */ + public static void checkNonNull(final T argument, final String name) { + if (argument == null) { + throw new IllegalArgumentException(name + " must not be null."); + } + } + + /** + * Default separator for array values + */ + public static final String DEFAULT_ARRAY_SEPARATOR = "|"; + + public static final String EMPTY = ""; + + /** + * Formatter/Parser of the first part of CIM_DATETIME + */ + public static final DateTimeFormatter WBEM_CIM_DATETIME_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); + + /** + * Regex that matches with a CIM_DATETIME string format See + * https://docs.microsoft.com/en-us/windows/win32/wmisdk/cim-datetime + *
      + *
    • group(1): yyyymmddHHMMSS + *
    • group(2): optional fraction of seconds + *
    • group(3): timezone offset... in minutes (sigh) + */ + private static final Pattern CIM_DATETIME_PATTERN = Pattern + .compile("^([0-9]{14})(?:\\.([0-9]{3,6}))?([+-][0-9]{3})$"); + + /** + * Convert a String holding a CIM_DATETIME (i.e. a string in the form of + * yyyymmddHHMMSS.mmmmmmsUUU) to an OffsetDateTime object + * + * @param stringValue String value with a CIM_DATETIME + * @return OffsetDateTime instance + */ + public static OffsetDateTime convertCimDateTime(final String stringValue) { + + if (stringValue == null) { + return null; + } + + final Matcher dateTimeMatcher = CIM_DATETIME_PATTERN.matcher(stringValue); + if (!dateTimeMatcher.find()) { + throw new IllegalArgumentException("Not a valid CIM_DATETIME value: " + stringValue); + } + + // LocalDateTime + final LocalDateTime localDateTime = LocalDateTime.parse(dateTimeMatcher.group(1), WBEM_CIM_DATETIME_FORMATTER); + + // Note: we're not taking the milliseconds and microseconds into account from + // group(2) + + // Zone Offset + final String zoneOffset = dateTimeMatcher.group(3); + if (zoneOffset == null) { + throw new IllegalStateException( + "Unable to get the timezone offset from CIM_DATETIME value: " + stringValue); + } + final int secondsOffset = Integer.parseInt(zoneOffset) * 60; + final ZoneOffset offset = ZoneOffset.ofTotalSeconds(secondsOffset); + + return OffsetDateTime.of(localDateTime, offset); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/client/WbemCimDataHandler.java b/src/main/java/org/metricshub/wbem/client/WbemCimDataHandler.java similarity index 81% rename from src/main/java/org/sentrysoftware/wbem/client/WbemCimDataHandler.java rename to src/main/java/org/metricshub/wbem/client/WbemCimDataHandler.java index e97dfc3..538e136 100644 --- a/src/main/java/org/sentrysoftware/wbem/client/WbemCimDataHandler.java +++ b/src/main/java/org/metricshub/wbem/client/WbemCimDataHandler.java @@ -1,185 +1,183 @@ -package org.sentrysoftware.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.sentrysoftware.wbem.javax.cim.CIMDataType; -import org.sentrysoftware.wbem.javax.cim.CIMDateTimeAbsolute; -import org.sentrysoftware.wbem.javax.cim.CIMDateTimeInterval; -import org.sentrysoftware.wbem.javax.cim.CIMInstance; -import org.sentrysoftware.wbem.javax.cim.CIMObjectPath; -import org.sentrysoftware.wbem.javax.cim.CIMProperty; - -/** - * Handler for CIMProperty conversion to string. - * - */ -public class WbemCimDataHandler { - - private WbemCimDataHandler() { } - - public static final String PATH_PROPERTY = "__Path"; - - private static final Map> CONVERT_MAP; - static { - final Map> map = new HashMap<>(); - map.put(CIMDataType.STRING, String::valueOf); - map.put(CIMDataType.BOOLEAN, String::valueOf); - map.put(CIMDataType.SINT8, String::valueOf); - map.put(CIMDataType.SINT16, String::valueOf); - map.put(CIMDataType.SINT32, String::valueOf); - map.put(CIMDataType.SINT64, String::valueOf); - map.put(CIMDataType.CHAR16, String::valueOf); - map.put(CIMDataType.REAL32, String::valueOf); - map.put(CIMDataType.REAL64, String::valueOf); - map.put(CIMDataType.OBJECT, String::valueOf); - map.put(CIMDataType.DATETIME, WbemCimDataHandler::convertDateTime); - map.put(CIMDataType.UINT8, String::valueOf); - map.put(CIMDataType.UINT16, String::valueOf); - map.put(CIMDataType.UINT32, String::valueOf); - map.put(CIMDataType.UINT64, String::valueOf); - map.put(CIMDataType.REFERENCE, WbemCimDataHandler::convertReference); - CONVERT_MAP = Collections.unmodifiableMap(map); - } - - /** - * Get the value of the CIM property. - * - * @param property The property name. - * @param cimInstance The CIM instance. - * @param arraySeparator The array separator value. default value '|' - * @return - */ - public static String getCimPropertyAsString( - final String property, - final CIMInstance cimInstance, - final String arraySeparator) { - Utils.checkNonNull(property, "property"); - Utils.checkNonNull(cimInstance, "cimInstance"); - - if (PATH_PROPERTY.equalsIgnoreCase(property)) { - final CIMObjectPath objectPath = cimInstance.getObjectPath(); - Utils.checkNonNull(objectPath, "objectPath"); - return convertReference(objectPath); - } - - // first check getProperty - CIMProperty cimProperty = cimInstance.getProperty(property); - - // then, if null, check getKeys - final String separator = arraySeparator == null? Utils.DEFAULT_ARRAY_SEPARATOR : arraySeparator; - if (cimProperty == null && cimInstance.getKeys() != null) { - return Stream.of(cimInstance.getKeys()) - .filter(key -> key.getName() != null && key.getName().equalsIgnoreCase(property)) - .findFirst() - .map(cp -> convertCimPropertyValue(cp, separator)) - .orElse(Utils.EMPTY); - } - - return cimProperty == null ? - Utils.EMPTY : convertCimPropertyValue(cimProperty, separator); - } - - /** - * Convert the CIM property value into a String. - * - * @param cimProperty The CIM property. - * @param arraySeparator The array separator value. - * @return - */ - private static String convertCimPropertyValue( - final CIMProperty cimProperty, - final String arraySeparator) { - final Object cimPropertyValue = cimProperty.getValue(); - if (cimPropertyValue == null) { - return Utils.EMPTY; - } - - final CIMDataType dataType = cimProperty.getDataType(); - if (dataType == null) { - return cimPropertyValue.toString(); - } - - return dataType.isArray() ? - convertArray(cimProperty, arraySeparator) : - CONVERT_MAP.getOrDefault(dataType.getType(), Object::toString).apply(cimPropertyValue); - } - - /** - * Convert a CIM property value array. - * - * @param cimProperty The CIM property. - * @param arraySeparator The array separator value. - * @return - */ - private static String convertArray( - final CIMProperty cimProperty, - final String arraySeparator) { - return Arrays.stream((Object[]) cimProperty.getValue()) - .map(obj -> (obj == null) ? Utils.EMPTY : CONVERT_MAP.getOrDefault(cimProperty.getDataType().getType(), Object::toString).apply(obj)) - .collect(Collectors.joining(arraySeparator, Utils.EMPTY, arraySeparator)); - } - - /** - * Convert a CIMObjectPath reference to string: - *
    • take the part after ':'
      • - *
    • escape back slash
      • - *
    • escape double quotes
      • - * - * @param cimPropertyValue - * @return - */ - private static String convertReference(final Object cimPropertyValue) { - final CIMObjectPath objectPath = (CIMObjectPath) cimPropertyValue; - final String str = objectPath.toString(); - return str - .substring(str.indexOf(':') + 1) // take the part after : (if exists) - .replace("\\\\", "\\") // Replace \\ by \ - .replace("\\\"", "\""); // Replace \" by " - } - - /** - * Convert a CIMDateTime into a string containing to Epoch time milliseconds. - * - * @param cimPropertyValue - * @return - */ - private static String convertDateTime(final Object cimPropertyValue) { - if (cimPropertyValue == null) { - return Utils.EMPTY; - } - - if (cimPropertyValue instanceof CIMDateTimeAbsolute) { - final String dateTimeString = ((CIMDateTimeAbsolute) cimPropertyValue).getDateTimeString(); - return String.valueOf(Utils.convertCimDateTime(dateTimeString).toInstant().toEpochMilli()); - } - return String.valueOf(((CIMDateTimeInterval) cimPropertyValue).getTotalMilliseconds()); - } -} +package org.metricshub.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.metricshub.wbem.javax.cim.CIMDataType; +import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute; +import org.metricshub.wbem.javax.cim.CIMDateTimeInterval; +import org.metricshub.wbem.javax.cim.CIMInstance; +import org.metricshub.wbem.javax.cim.CIMObjectPath; +import org.metricshub.wbem.javax.cim.CIMProperty; + +/** + * Handler for CIMProperty conversion to string. + * + */ +public class WbemCimDataHandler { + + private WbemCimDataHandler() { } + + public static final String PATH_PROPERTY = "__Path"; + + private static final Map> CONVERT_MAP; + static { + final Map> map = new HashMap<>(); + map.put(CIMDataType.STRING, String::valueOf); + map.put(CIMDataType.BOOLEAN, String::valueOf); + map.put(CIMDataType.SINT8, String::valueOf); + map.put(CIMDataType.SINT16, String::valueOf); + map.put(CIMDataType.SINT32, String::valueOf); + map.put(CIMDataType.SINT64, String::valueOf); + map.put(CIMDataType.CHAR16, String::valueOf); + map.put(CIMDataType.REAL32, String::valueOf); + map.put(CIMDataType.REAL64, String::valueOf); + map.put(CIMDataType.OBJECT, String::valueOf); + map.put(CIMDataType.DATETIME, WbemCimDataHandler::convertDateTime); + map.put(CIMDataType.UINT8, String::valueOf); + map.put(CIMDataType.UINT16, String::valueOf); + map.put(CIMDataType.UINT32, String::valueOf); + map.put(CIMDataType.UINT64, String::valueOf); + map.put(CIMDataType.REFERENCE, WbemCimDataHandler::convertReference); + CONVERT_MAP = Collections.unmodifiableMap(map); + } + + /** + * Get the value of the CIM property. + * + * @param property The property name. + * @param cimInstance The CIM instance. + * @param arraySeparator The array separator value. default value '|' + * @return + */ + public static String getCimPropertyAsString( + final String property, + final CIMInstance cimInstance, + final String arraySeparator) { + Utils.checkNonNull(property, "property"); + Utils.checkNonNull(cimInstance, "cimInstance"); + + if (PATH_PROPERTY.equalsIgnoreCase(property)) { + final CIMObjectPath objectPath = cimInstance.getObjectPath(); + Utils.checkNonNull(objectPath, "objectPath"); + return convertReference(objectPath); + } + + // first check getProperty + CIMProperty cimProperty = cimInstance.getProperty(property); + + // then, if null, check getKeys + final String separator = arraySeparator == null? Utils.DEFAULT_ARRAY_SEPARATOR : arraySeparator; + if (cimProperty == null && cimInstance.getKeys() != null) { + return Stream.of(cimInstance.getKeys()) + .filter(key -> key.getName() != null && key.getName().equalsIgnoreCase(property)) + .findFirst() + .map(cp -> convertCimPropertyValue(cp, separator)) + .orElse(Utils.EMPTY); + } + + return cimProperty == null ? + Utils.EMPTY : convertCimPropertyValue(cimProperty, separator); + } + + /** + * Convert the CIM property value into a String. + * + * @param cimProperty The CIM property. + * @param arraySeparator The array separator value. + * @return + */ + private static String convertCimPropertyValue( + final CIMProperty cimProperty, + final String arraySeparator) { + final Object cimPropertyValue = cimProperty.getValue(); + if (cimPropertyValue == null) { + return Utils.EMPTY; + } + + final CIMDataType dataType = cimProperty.getDataType(); + if (dataType == null) { + return cimPropertyValue.toString(); + } + + return dataType.isArray() ? + convertArray(cimProperty, arraySeparator) : + CONVERT_MAP.getOrDefault(dataType.getType(), Object::toString).apply(cimPropertyValue); + } + + /** + * Convert a CIM property value array. + * + * @param cimProperty The CIM property. + * @param arraySeparator The array separator value. + * @return + */ + private static String convertArray( + final CIMProperty cimProperty, + final String arraySeparator) { + return Arrays.stream((Object[]) cimProperty.getValue()) + .map(obj -> (obj == null) ? Utils.EMPTY : CONVERT_MAP.getOrDefault(cimProperty.getDataType().getType(), Object::toString).apply(obj)) + .collect(Collectors.joining(arraySeparator, Utils.EMPTY, arraySeparator)); + } + + /** + * Convert a CIMObjectPath reference to string: + *
    • take the part after ':'
      • + *
    • escape back slash
      • + *
    • escape double quotes
      • + * + * @param cimPropertyValue + * @return + */ + private static String convertReference(final Object cimPropertyValue) { + final CIMObjectPath objectPath = (CIMObjectPath) cimPropertyValue; + final String str = objectPath.toString(); + return str + .substring(str.indexOf(':') + 1) // take the part after : (if exists) + .replace("\\\\", "\\") // Replace \\ by \ + .replace("\\\"", "\""); // Replace \" by " + } + + /** + * Convert a CIMDateTime into a string containing to Epoch time milliseconds. + * + * @param cimPropertyValue + * @return + */ + private static String convertDateTime(final Object cimPropertyValue) { + if (cimPropertyValue == null) { + return Utils.EMPTY; + } + + if (cimPropertyValue instanceof CIMDateTimeAbsolute) { + final String dateTimeString = ((CIMDateTimeAbsolute) cimPropertyValue).getDateTimeString(); + return String.valueOf(Utils.convertCimDateTime(dateTimeString).toInstant().toEpochMilli()); + } + return String.valueOf(((CIMDateTimeInterval) cimPropertyValue).getTotalMilliseconds()); + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/client/WbemClient.java b/src/main/java/org/metricshub/wbem/client/WbemClient.java similarity index 76% rename from src/main/java/org/sentrysoftware/wbem/client/WbemClient.java rename to src/main/java/org/metricshub/wbem/client/WbemClient.java index 6dfbdd7..1ed9248 100644 --- a/src/main/java/org/sentrysoftware/wbem/client/WbemClient.java +++ b/src/main/java/org/metricshub/wbem/client/WbemClient.java @@ -1,229 +1,227 @@ -package org.sentrysoftware.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.net.URL; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.security.auth.Subject; - -import org.sentrysoftware.wbem.javax.cim.CIMInstance; -import org.sentrysoftware.wbem.javax.cim.CIMObjectPath; -import org.sentrysoftware.wbem.javax.cim.CIMProperty; -import org.sentrysoftware.wbem.javax.wbem.CloseableIterator; -import org.sentrysoftware.wbem.javax.wbem.WBEMException; -import org.sentrysoftware.wbem.javax.wbem.client.EnumerateResponse; -import org.sentrysoftware.wbem.javax.wbem.client.PasswordCredential; -import org.sentrysoftware.wbem.javax.wbem.client.UserPrincipal; -import org.sentrysoftware.wbem.javax.wbem.client.WBEMClient; -import org.sentrysoftware.wbem.javax.wbem.client.WBEMClientConstants; -import org.sentrysoftware.wbem.javax.wbem.client.WBEMClientFactory; - -/** - * Matsya WBEM client for query execution. - * - */ -public class WbemClient implements AutoCloseable { - - private static final Locale[] FIXED_AVAILABLE_LOCALES_ARRAY = {Locale.ENGLISH}; - - private WBEMClient client; - - private CloseableIterator iterator; - - /** - * Connect to WBEM client. - * - * @param url - * @param username - * @param password - * @param timeout - * @throws WBEMException - */ - public void connect( - final URL url, - final String username, - final char[] password, - int timeout) throws WBEMException { - - Utils.checkNonNull(url, "url"); - Utils.checkNonNull(username, "username"); - Utils.checkNonNull(password, "password"); - - final CIMObjectPath cimObjectPath = new CIMObjectPath( - url.getProtocol(), - url.getHost(), - String.valueOf(url.getPort()), - null, - null, - null); - - final Subject subject = new Subject(); - subject.getPrincipals().add(new UserPrincipal(username)); - subject.getPrivateCredentials().add(new PasswordCredential(password)); - - // Create and initialize a WBEM client. - client = WBEMClientFactory.getClient("CIM-XML"); - client.setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout)); - client.initialize(cimObjectPath, subject, FIXED_AVAILABLE_LOCALES_ARRAY); - } - - @Override - public void close() { - if (iterator != null) { - iterator.close(); - } - - if (client != null) { - client.close(); - } - } - - /** - * Execute a WQL query on remote. - * @param wqlQuery The query handler. - * @param namespace The WBEM namespace. - * @param arraySeparator The array separator value. default value '|' - * @return - * @throws WBEMException - */ - public WbemQueryResult executeWql( - final WqlQuery wqlQuery, - final String namespace, - final String arraySeparator) throws WBEMException { - - Utils.checkNonNull(wqlQuery, "wqlQuery"); - Utils.checkNonNull(namespace, "namespace"); - - if (client == null) { - throw new IllegalStateException("client must be connected first."); - } - - iterator = client.enumerateInstances( - new CIMObjectPath(null, null, null, namespace, wqlQuery.getClassName(), null), - true, - false, - true, - wqlQuery.getPropertiesArray()); - - return enumerateInstances(wqlQuery, iterator, arraySeparator); - } - - /** - * Get associators. - * @param wqlQuery The query handler. - * @param objectPathAssociators The object path for ASSOCIATORS. - * @param arraySeparator The array separator value. default value '|' - * @return - * @throws WBEMException - */ - public WbemQueryResult getAssociators( - final WqlQuery wqlQuery, - final String objectPathAssociators, - final String arraySeparator) throws WBEMException { - - Utils.checkNonNull(wqlQuery, "wqlQuery"); - Utils.checkNonNull(objectPathAssociators, "objectPathAssociators"); - - if (client == null) { - throw new IllegalStateException("client must be connected first."); - } - - final EnumerateResponse response = client.associators( - new CIMObjectPath(objectPathAssociators), - wqlQuery.getClassName(), - null, - null, - null, - false, - wqlQuery.getPropertiesArray(), - null, - null, - null, - false, - null); - iterator = response.getResponses(); - - return enumerateInstances(wqlQuery, iterator, arraySeparator); - } - - public static WbemQueryResult enumerateInstances( - final WqlQuery wqlQuery, - final CloseableIterator iterator, - final String arraySeparator) { - if (iterator == null) { - return new WbemQueryResult(new ArrayList<>(), new ArrayList<>()); - } - - Set properties = null; - List originalProperties = null; - final List> values = new ArrayList<>(); - - while (iterator.hasNext()) { - final CIMInstance cimInstance = iterator.next(); - - if (properties == null) { - properties = - wqlQuery.getProperties().isEmpty() ? - Stream.of(cimInstance.getProperties()) - .map(CIMProperty::getName) - .collect(Collectors.toCollection(LinkedHashSet::new)) : - wqlQuery.getProperties(); - } - - if (originalProperties == null) { - originalProperties = wqlQuery.hasDuplicateProperties() ? - wqlQuery.getOriginalProperties() : - properties.stream().collect(Collectors.toList()); - } - - final List row; - if (wqlQuery.hasDuplicateProperties()) { - - final Map cimProperties = properties.stream().collect(Collectors.toMap( - String::toLowerCase, - property -> WbemCimDataHandler.getCimPropertyAsString(property, cimInstance, arraySeparator))); - - row = originalProperties.stream() - .map(property -> cimProperties.get(property.toLowerCase())) - .collect(Collectors.toList()); - - } else { - row = properties.stream() - .map(property -> WbemCimDataHandler.getCimPropertyAsString(property, cimInstance, arraySeparator)) - .collect(Collectors.toList()); - } - - values.add(row); - } - - return new WbemQueryResult(originalProperties, values); - } -} +package org.metricshub.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.net.URL; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import javax.security.auth.Subject; + +import org.metricshub.wbem.javax.cim.CIMInstance; +import org.metricshub.wbem.javax.cim.CIMObjectPath; +import org.metricshub.wbem.javax.wbem.CloseableIterator; +import org.metricshub.wbem.javax.wbem.WBEMException; +import org.metricshub.wbem.javax.wbem.client.EnumerateResponse; +import org.metricshub.wbem.javax.wbem.client.PasswordCredential; +import org.metricshub.wbem.javax.wbem.client.UserPrincipal; +import org.metricshub.wbem.javax.wbem.client.WBEMClient; +import org.metricshub.wbem.javax.wbem.client.WBEMClientConstants; +import org.metricshub.wbem.javax.wbem.client.WBEMClientFactory; +import org.metricshub.wbem.javax.cim.CIMProperty; + +/** + * Matsya WBEM client for query execution. + * + */ +public class WbemClient implements AutoCloseable { + + private static final Locale[] FIXED_AVAILABLE_LOCALES_ARRAY = {Locale.ENGLISH}; + + private WBEMClient client; + + private CloseableIterator iterator; + + /** + * Connect to WBEM client. + * + * @param url + * @param username + * @param password + * @param timeout + * @throws WBEMException + */ + public void connect( + final URL url, + final String username, + final char[] password, + int timeout) throws WBEMException { + + Utils.checkNonNull(url, "url"); + Utils.checkNonNull(username, "username"); + Utils.checkNonNull(password, "password"); + + final CIMObjectPath cimObjectPath = new CIMObjectPath( + url.getProtocol(), + url.getHost(), + String.valueOf(url.getPort()), + null, + null, + null); + + final Subject subject = new Subject(); + subject.getPrincipals().add(new UserPrincipal(username)); + subject.getPrivateCredentials().add(new PasswordCredential(password)); + + // Create and initialize a WBEM client. + client = WBEMClientFactory.getClient("CIM-XML"); + client.setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout)); + client.initialize(cimObjectPath, subject, FIXED_AVAILABLE_LOCALES_ARRAY); + } + + @Override + public void close() { + if (iterator != null) { + iterator.close(); + } + + if (client != null) { + client.close(); + } + } + + /** + * Execute a WQL query on remote. + * @param wqlQuery The query handler. + * @param namespace The WBEM namespace. + * @param arraySeparator The array separator value. default value '|' + * @return + * @throws WBEMException + */ + public WbemQueryResult executeWql( + final WqlQuery wqlQuery, + final String namespace, + final String arraySeparator) throws WBEMException { + + Utils.checkNonNull(wqlQuery, "wqlQuery"); + Utils.checkNonNull(namespace, "namespace"); + + if (client == null) { + throw new IllegalStateException("client must be connected first."); + } + + iterator = client.enumerateInstances( + new CIMObjectPath(null, null, null, namespace, wqlQuery.getClassName(), null), + true, + false, + true, + wqlQuery.getPropertiesArray()); + + return enumerateInstances(wqlQuery, iterator, arraySeparator); + } + + /** + * Get associators. + * @param wqlQuery The query handler. + * @param objectPathAssociators The object path for ASSOCIATORS. + * @param arraySeparator The array separator value. default value '|' + * @return + * @throws WBEMException + */ + public WbemQueryResult getAssociators( + final WqlQuery wqlQuery, + final String objectPathAssociators, + final String arraySeparator) throws WBEMException { + + Utils.checkNonNull(wqlQuery, "wqlQuery"); + Utils.checkNonNull(objectPathAssociators, "objectPathAssociators"); + + if (client == null) { + throw new IllegalStateException("client must be connected first."); + } + + final EnumerateResponse response = client.associators( + new CIMObjectPath(objectPathAssociators), + wqlQuery.getClassName(), + null, + null, + null, + false, + wqlQuery.getPropertiesArray(), + null, + null, + null, + false, + null); + iterator = response.getResponses(); + + return enumerateInstances(wqlQuery, iterator, arraySeparator); + } + + public static WbemQueryResult enumerateInstances( + final WqlQuery wqlQuery, + final CloseableIterator iterator, + final String arraySeparator) { + if (iterator == null) { + return new WbemQueryResult(new ArrayList<>(), new ArrayList<>()); + } + + Set properties = null; + List originalProperties = null; + final List> values = new ArrayList<>(); + + while (iterator.hasNext()) { + final CIMInstance cimInstance = iterator.next(); + + if (properties == null) { + properties = + wqlQuery.getProperties().isEmpty() ? + Stream.of(cimInstance.getProperties()) + .map(CIMProperty::getName) + .collect(Collectors.toCollection(LinkedHashSet::new)) : + wqlQuery.getProperties(); + } + + if (originalProperties == null) { + originalProperties = wqlQuery.hasDuplicateProperties() ? + wqlQuery.getOriginalProperties() : + properties.stream().collect(Collectors.toList()); + } + + final List row; + if (wqlQuery.hasDuplicateProperties()) { + + final Map cimProperties = properties.stream().collect(Collectors.toMap( + String::toLowerCase, + property -> WbemCimDataHandler.getCimPropertyAsString(property, cimInstance, arraySeparator))); + + row = originalProperties.stream() + .map(property -> cimProperties.get(property.toLowerCase())) + .collect(Collectors.toList()); + + } else { + row = properties.stream() + .map(property -> WbemCimDataHandler.getCimPropertyAsString(property, cimInstance, arraySeparator)) + .collect(Collectors.toList()); + } + + values.add(row); + } + + return new WbemQueryResult(originalProperties, values); + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/client/WbemExecutor.java b/src/main/java/org/metricshub/wbem/client/WbemExecutor.java similarity index 81% rename from src/main/java/org/sentrysoftware/wbem/client/WbemExecutor.java rename to src/main/java/org/metricshub/wbem/client/WbemExecutor.java index b9212d9..08014b8 100644 --- a/src/main/java/org/sentrysoftware/wbem/client/WbemExecutor.java +++ b/src/main/java/org/metricshub/wbem/client/WbemExecutor.java @@ -1,194 +1,192 @@ -package org.sentrysoftware.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.net.URL; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import org.sentrysoftware.wbem.client.exceptions.WqlQuerySyntaxException; -import org.sentrysoftware.wbem.javax.wbem.WBEMException; - -/** - * Functions to execute WBEM query. - * - */ -public class WbemExecutor { - - private WbemExecutor() { } - - /** - * Execute a WBEM query on remote. - * - * @param url The remote URL. - * @param namespace The WBEM namespace. - * @param username The user name. - * @param password The Password. - * @param query The WQL Query to execute. - * @param timeout Timeout in milliseconds. - * @param arraySeparator The array separator value. default value '|' - * @return - * @throws WqlQuerySyntaxException On WQL syntax errors. - * @throws WBEMException On WBEM errors. - * @throws TimeoutException To notify userName of timeout. - * @throws InterruptedException - */ - public static WbemQueryResult executeWql( - final URL url, - final String namespace, - final String username, - final char[] password, - final String query, - int timeout, - final String arraySeparator) - throws WqlQuerySyntaxException, - WBEMException, - TimeoutException, - InterruptedException { - return executeMethod( - url, - namespace, - username, - password, - query, - null, - timeout, - arraySeparator); - } - - /** - * Execute WBEM get associators on remote. - * - * @param url The remote URL. - * @param username The user name. - * @param password The Password. - * @param query The WQL Query to execute. - * @param objectPathAssociators The object path for ASSOCIATORS. - * @param timeout Timeout in milliseconds. - * @param arraySeparator The array separator value. default value '|' - * @return - * @throws WqlQuerySyntaxException On WQL syntax errors. - * @throws WBEMException On WBEM errors. - * @throws TimeoutException To notify userName of timeout. - * @throws InterruptedException - */ - public static WbemQueryResult getAssociators( - final URL url, - final String username, - final char[] password, - final String query, - final String objectPathAssociators, - int timeout, - final String arraySeparator) - throws WqlQuerySyntaxException, - WBEMException, - TimeoutException, - InterruptedException { - return executeMethod( - url, - null, - username, - password, - query, - objectPathAssociators, - timeout, - arraySeparator); - } - - /** - * Execute the WBEM method with timeout. - * - * @param url - * @param namespace - * @param username - * @param password - * @param query - * @param objectPathAssociators - * @param timeout - * @param arraySeparator - * @return - * @throws InterruptedException - * @throws TimeoutException - * @throws WBEMException - * @throws WqlQuerySyntaxException - */ - private static WbemQueryResult executeMethod( - final URL url, - final String namespace, - final String username, - final char[] password, - final String query, - final String objectPathAssociators, - int timeout, - final String arraySeparator) - throws InterruptedException, - TimeoutException, - WBEMException, - WqlQuerySyntaxException { - - Utils.checkNonNull(url, "url"); - Utils.checkNonNull(username, "username"); - Utils.checkNonNull(password, "password"); - - final WqlQuery wqlQuery = WqlQuery.parseQuery(query); - - final ExecutorService executor = Executors.newSingleThreadExecutor(); - - final Future future = executor.submit(() -> { - try (final WbemClient matsyaWbemClient = new WbemClient()) { - matsyaWbemClient.connect(url, username, password, timeout); - - return objectPathAssociators == null ? - matsyaWbemClient.executeWql(wqlQuery, namespace, arraySeparator) : - matsyaWbemClient.getAssociators(wqlQuery, objectPathAssociators, arraySeparator); - } - }); - - try { - return future.get(timeout, TimeUnit.MILLISECONDS); - - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw (InterruptedException) e; - - } catch (TimeoutException e) { - future.cancel(true); - throw e; - - } catch (ExecutionException e) { - if (e.getCause() instanceof WBEMException) { - throw (WBEMException) e.getCause(); - } - // else should be RunTimeException as matsyaWbemClient only thrown - // WBEMException as checked exceptions. - throw (RuntimeException) e.getCause(); - } - finally { - executor.shutdownNow(); - } - } -} +package org.metricshub.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.net.URL; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.metricshub.wbem.client.exceptions.WqlQuerySyntaxException; +import org.metricshub.wbem.javax.wbem.WBEMException; + +/** + * Functions to execute WBEM query. + * + */ +public class WbemExecutor { + + private WbemExecutor() { } + + /** + * Execute a WBEM query on remote. + * + * @param url The remote URL. + * @param namespace The WBEM namespace. + * @param username The user name. + * @param password The Password. + * @param query The WQL Query to execute. + * @param timeout Timeout in milliseconds. + * @param arraySeparator The array separator value. default value '|' + * @return + * @throws WqlQuerySyntaxException On WQL syntax errors. + * @throws WBEMException On WBEM errors. + * @throws TimeoutException To notify userName of timeout. + * @throws InterruptedException + */ + public static WbemQueryResult executeWql( + final URL url, + final String namespace, + final String username, + final char[] password, + final String query, + int timeout, + final String arraySeparator) + throws WqlQuerySyntaxException, + WBEMException, + TimeoutException, + InterruptedException { + return executeMethod( + url, + namespace, + username, + password, + query, + null, + timeout, + arraySeparator); + } + + /** + * Execute WBEM get associators on remote. + * + * @param url The remote URL. + * @param username The user name. + * @param password The Password. + * @param query The WQL Query to execute. + * @param objectPathAssociators The object path for ASSOCIATORS. + * @param timeout Timeout in milliseconds. + * @param arraySeparator The array separator value. default value '|' + * @return + * @throws WqlQuerySyntaxException On WQL syntax errors. + * @throws WBEMException On WBEM errors. + * @throws TimeoutException To notify userName of timeout. + * @throws InterruptedException + */ + public static WbemQueryResult getAssociators( + final URL url, + final String username, + final char[] password, + final String query, + final String objectPathAssociators, + int timeout, + final String arraySeparator) + throws WqlQuerySyntaxException, + WBEMException, + TimeoutException, + InterruptedException { + return executeMethod( + url, + null, + username, + password, + query, + objectPathAssociators, + timeout, + arraySeparator); + } + + /** + * Execute the WBEM method with timeout. + * + * @param url + * @param namespace + * @param username + * @param password + * @param query + * @param objectPathAssociators + * @param timeout + * @param arraySeparator + * @return + * @throws InterruptedException + * @throws TimeoutException + * @throws WBEMException + * @throws WqlQuerySyntaxException + */ + private static WbemQueryResult executeMethod( + final URL url, + final String namespace, + final String username, + final char[] password, + final String query, + final String objectPathAssociators, + int timeout, + final String arraySeparator) + throws InterruptedException, + TimeoutException, + WBEMException, + WqlQuerySyntaxException { + + Utils.checkNonNull(url, "url"); + Utils.checkNonNull(username, "username"); + Utils.checkNonNull(password, "password"); + + final WqlQuery wqlQuery = WqlQuery.parseQuery(query); + + final ExecutorService executor = Executors.newSingleThreadExecutor(); + + final Future future = executor.submit(() -> { + try (final WbemClient matsyaWbemClient = new WbemClient()) { + matsyaWbemClient.connect(url, username, password, timeout); + + return objectPathAssociators == null ? + matsyaWbemClient.executeWql(wqlQuery, namespace, arraySeparator) : + matsyaWbemClient.getAssociators(wqlQuery, objectPathAssociators, arraySeparator); + } + }); + + try { + return future.get(timeout, TimeUnit.MILLISECONDS); + + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw (InterruptedException) e; + + } catch (TimeoutException e) { + future.cancel(true); + throw e; + + } catch (ExecutionException e) { + if (e.getCause() instanceof WBEMException) { + throw (WBEMException) e.getCause(); + } + // else should be RunTimeException as matsyaWbemClient only thrown + // WBEMException as checked exceptions. + throw (RuntimeException) e.getCause(); + } + finally { + executor.shutdownNow(); + } + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/client/WbemQueryResult.java b/src/main/java/org/metricshub/wbem/client/WbemQueryResult.java similarity index 51% rename from src/main/java/org/sentrysoftware/wbem/client/WbemQueryResult.java rename to src/main/java/org/metricshub/wbem/client/WbemQueryResult.java index 91b01c8..c402f41 100644 --- a/src/main/java/org/sentrysoftware/wbem/client/WbemQueryResult.java +++ b/src/main/java/org/metricshub/wbem/client/WbemQueryResult.java @@ -1,53 +1,51 @@ -package org.sentrysoftware.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.util.List; - -/** - * Wrapper class for WBEM query result. - * - */ -public class WbemQueryResult { - - /** List of the properties of the query. */ - private final List properties; - - /** Query results. */ - private final List> values; - - public WbemQueryResult( - final List properties, - final List> values) { - this.properties = properties; - this.values = values; - } - - public List getProperties() { - return properties; - } - - public List> getValues() { - return values; - } -} +package org.metricshub.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.util.List; + +/** + * Wrapper class for WBEM query result. + * + */ +public class WbemQueryResult { + + /** List of the properties of the query. */ + private final List properties; + + /** Query results. */ + private final List> values; + + public WbemQueryResult( + final List properties, + final List> values) { + this.properties = properties; + this.values = values; + } + + public List getProperties() { + return properties; + } + + public List> getValues() { + return values; + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/client/WqlQuery.java b/src/main/java/org/metricshub/wbem/client/WqlQuery.java similarity index 79% rename from src/main/java/org/sentrysoftware/wbem/client/WqlQuery.java rename to src/main/java/org/metricshub/wbem/client/WqlQuery.java index ec2405a..489326a 100644 --- a/src/main/java/org/sentrysoftware/wbem/client/WqlQuery.java +++ b/src/main/java/org/metricshub/wbem/client/WqlQuery.java @@ -1,138 +1,136 @@ -package org.sentrysoftware.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.sentrysoftware.wbem.client.exceptions.WqlQuerySyntaxException; - -/** - * Handler for WQL query. - * - */ -public class WqlQuery { - - private WqlQuery() { } - - private static final String ID = "[^\\s]+"; - private static final String LIST_SEPARATOR = "\\s*,\\s*"; - - private static final Pattern CHECK_SELECT_PATTERN = Pattern.compile( - "^\\s*SELECT\\s+(\\*|(?!SELECT|FROM|WHERE)\\w+|((?!SELECT|FROM|WHERE)\\w+\\s*,\\s*)+((?!SELECT|FROM|WHERE)\\w+))\\s+FROM\\s+((?!SELECT|WHERE|FROM)\\w+)\\s*?$", - Pattern.CASE_INSENSITIVE); - - private static final Pattern EXTRACT_SELECT_PATTERN= Pattern.compile( - "^\\s*SELECT\\s+(.+)\\s+FROM\\s+("+ID+")\\s*$", - Pattern.CASE_INSENSITIVE); - private static final int SELECT_GROUP_CLASSNAME = 2; - private static final int SELECT_GROUP_FIELDS = 1; - private static final int SELECT_GROUP_COUNT = 2; - - private String className; - private Set properties; - private List originalProperties; - - /** - * Constructor for WQL query. - * - * @param query the WQL query. - * @throws WqlQuerySyntaxException On WQL Syntax exception. - */ - public static WqlQuery parseQuery(final String query) throws WqlQuerySyntaxException { - - Utils.checkNonNull(query, "query"); - - if (CHECK_SELECT_PATTERN.matcher(query).find()) { - final WqlQuery wqlQuery = new WqlQuery(); - wqlQuery.parseSelect(query); - return wqlQuery; - } - throw new WqlQuerySyntaxException(query); - } - - public String getClassName() { - return className; - } - - public String[] getPropertiesArray() { - return properties.isEmpty() ? - null : - properties.stream() - .filter(property -> !WbemCimDataHandler.PATH_PROPERTY.equalsIgnoreCase(property)) - .toArray(String[]::new); - } - - public Set getProperties() { - return properties; - } - - public List getOriginalProperties() { - return originalProperties; - } - - public boolean hasDuplicateProperties() { - return properties != null && originalProperties != null && properties.size() != originalProperties.size(); - } - - private void parseSelect( - final String query) throws WqlQuerySyntaxException { - - final Matcher matcher = EXTRACT_SELECT_PATTERN.matcher(query); - if (!matcher.find()) { - throw new WqlQuerySyntaxException(query); - } - if (matcher.groupCount() < SELECT_GROUP_COUNT) { - throw new WqlQuerySyntaxException(query); - } - - className = matcher.group(SELECT_GROUP_CLASSNAME); - - final String fieldsList = matcher.group(SELECT_GROUP_FIELDS); - final String[] fieldArray = Optional.ofNullable(fieldsList) - .filter(s -> !"*".equals(s)) - .map(s -> s.split(LIST_SEPARATOR)) - .orElse(new String[0]); - - originalProperties = Stream.of(fieldArray) - .map(String::trim) - .collect(Collectors.toList()); - - // using a map, so the properties will keep the case and the order of the query. - final Map originalMap = new HashMap<>(); - originalProperties.stream().forEach( - property -> originalMap.computeIfAbsent(property.toLowerCase(), prop -> property)); - - properties = originalProperties.stream() - .map(property -> originalMap.get(property.toLowerCase())) - .collect(Collectors.toCollection(LinkedHashSet::new)); - } -} +package org.metricshub.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import org.metricshub.wbem.client.exceptions.WqlQuerySyntaxException; + +/** + * Handler for WQL query. + * + */ +public class WqlQuery { + + private WqlQuery() { } + + private static final String ID = "[^\\s]+"; + private static final String LIST_SEPARATOR = "\\s*,\\s*"; + + private static final Pattern CHECK_SELECT_PATTERN = Pattern.compile( + "^\\s*SELECT\\s+(\\*|(?!SELECT|FROM|WHERE)\\w+|((?!SELECT|FROM|WHERE)\\w+\\s*,\\s*)+((?!SELECT|FROM|WHERE)\\w+))\\s+FROM\\s+((?!SELECT|WHERE|FROM)\\w+)\\s*?$", + Pattern.CASE_INSENSITIVE); + + private static final Pattern EXTRACT_SELECT_PATTERN= Pattern.compile( + "^\\s*SELECT\\s+(.+)\\s+FROM\\s+("+ID+")\\s*$", + Pattern.CASE_INSENSITIVE); + private static final int SELECT_GROUP_CLASSNAME = 2; + private static final int SELECT_GROUP_FIELDS = 1; + private static final int SELECT_GROUP_COUNT = 2; + + private String className; + private Set properties; + private List originalProperties; + + /** + * Constructor for WQL query. + * + * @param query the WQL query. + * @throws WqlQuerySyntaxException On WQL Syntax exception. + */ + public static WqlQuery parseQuery(final String query) throws WqlQuerySyntaxException { + + Utils.checkNonNull(query, "query"); + + if (CHECK_SELECT_PATTERN.matcher(query).find()) { + final WqlQuery wqlQuery = new WqlQuery(); + wqlQuery.parseSelect(query); + return wqlQuery; + } + throw new WqlQuerySyntaxException(query); + } + + public String getClassName() { + return className; + } + + public String[] getPropertiesArray() { + return properties.isEmpty() ? + null : + properties.stream() + .filter(property -> !WbemCimDataHandler.PATH_PROPERTY.equalsIgnoreCase(property)) + .toArray(String[]::new); + } + + public Set getProperties() { + return properties; + } + + public List getOriginalProperties() { + return originalProperties; + } + + public boolean hasDuplicateProperties() { + return properties != null && originalProperties != null && properties.size() != originalProperties.size(); + } + + private void parseSelect( + final String query) throws WqlQuerySyntaxException { + + final Matcher matcher = EXTRACT_SELECT_PATTERN.matcher(query); + if (!matcher.find()) { + throw new WqlQuerySyntaxException(query); + } + if (matcher.groupCount() < SELECT_GROUP_COUNT) { + throw new WqlQuerySyntaxException(query); + } + + className = matcher.group(SELECT_GROUP_CLASSNAME); + + final String fieldsList = matcher.group(SELECT_GROUP_FIELDS); + final String[] fieldArray = Optional.ofNullable(fieldsList) + .filter(s -> !"*".equals(s)) + .map(s -> s.split(LIST_SEPARATOR)) + .orElse(new String[0]); + + originalProperties = Stream.of(fieldArray) + .map(String::trim) + .collect(Collectors.toList()); + + // using a map, so the properties will keep the case and the order of the query. + final Map originalMap = new HashMap<>(); + originalProperties.stream().forEach( + property -> originalMap.computeIfAbsent(property.toLowerCase(), prop -> property)); + + properties = originalProperties.stream() + .map(property -> originalMap.get(property.toLowerCase())) + .collect(Collectors.toCollection(LinkedHashSet::new)); + } +} diff --git a/src/main/java/org/metricshub/wbem/client/exceptions/WqlQuerySyntaxException.java b/src/main/java/org/metricshub/wbem/client/exceptions/WqlQuerySyntaxException.java new file mode 100644 index 0000000..08c7189 --- /dev/null +++ b/src/main/java/org/metricshub/wbem/client/exceptions/WqlQuerySyntaxException.java @@ -0,0 +1,38 @@ +package org.metricshub.wbem.client.exceptions; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +/** + * Exception for a syntax error in the WQL Query parameter. + * + */ +public class WqlQuerySyntaxException extends Exception { + + private static final long serialVersionUID = 1L; + + public WqlQuerySyntaxException(final String wqlQuery) { + super("Syntax error in WQL Query: " + wqlQuery); + } + + public WqlQuerySyntaxException(final Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMArgument.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMArgument.java similarity index 80% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMArgument.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMArgument.java index 6c11b0d..fc076cb 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMArgument.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMArgument.java @@ -1,102 +1,100 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2944839 2010-02-08 blaschke-oss Remove redundant toString() methods - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 -/** - * This class represents an instance of a CIMParameter used for a - * method invocation. A CIMArgument has a name, data type and - * value. A CIMArgument corresponds to a CIMParameter - * defined for a CIMMethod. - * - * @param - * Type parameter. - * - * @see CIMParameter - */ -public class CIMArgument extends CIMValuedElement { - - private static final long serialVersionUID = 4727439564059428267L; - - /** - * Constructs a CIMArgument to be used for method invocations. - * A CIMArgument corresponds to a CIMParameter. - * For each CIMParameter being populated during a method - * invocation a CIMArgument object must be created. - * - * @param pName - * Name of the CIM argument. - * @param pType - * CIMDataType of the argument. - * @param pValue - * Value of the argument. - * @throws IllegalArgumentException - * If the value does not match the type. - * @see CIMParameter - */ - public CIMArgument(String pName, CIMDataType pType, E pValue) throws IllegalArgumentException { - super(pName, pType, pValue); - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null - * and is a CIMArgument that represents the same name, type and - * value as this CIMArgument. - * - * @param pObj - * The object to compare with. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMArgument)) return false; - return super.equals(pObj); - } -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2944839 2010-02-08 blaschke-oss Remove redundant toString() methods + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 +/** + * This class represents an instance of a CIMParameter used for a + * method invocation. A CIMArgument has a name, data type and + * value. A CIMArgument corresponds to a CIMParameter + * defined for a CIMMethod. + * + * @param + * Type parameter. + * + * @see CIMParameter + */ +public class CIMArgument extends CIMValuedElement { + + private static final long serialVersionUID = 4727439564059428267L; + + /** + * Constructs a CIMArgument to be used for method invocations. + * A CIMArgument corresponds to a CIMParameter. + * For each CIMParameter being populated during a method + * invocation a CIMArgument object must be created. + * + * @param pName + * Name of the CIM argument. + * @param pType + * CIMDataType of the argument. + * @param pValue + * Value of the argument. + * @throws IllegalArgumentException + * If the value does not match the type. + * @see CIMParameter + */ + public CIMArgument(String pName, CIMDataType pType, E pValue) throws IllegalArgumentException { + super(pName, pType, pValue); + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null + * and is a CIMArgument that represents the same name, type and + * value as this CIMArgument. + * + * @param pObj + * The object to compare with. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMArgument)) return false; + return super.equals(pObj); + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMClass.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMClass.java similarity index 92% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMClass.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMClass.java index 24f06e5..30ea988 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMClass.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMClass.java @@ -1,575 +1,573 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() - * 1737123 2007-06-15 ebak Differences to JSR48 public review draft - * 1783288 2007-09-10 ebak CIMClass.isAssociation() not working for retrieved classes. - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 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) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2823494 2009-08-03 rgummada Change Boolean constructor to static - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException - * 2975917 2010-03-24 blaschke-oss TCK: CIMClass.getProperty() does not handle null property - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final - * 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 - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.TreeSet; - -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMElementSorter; -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl; -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF; - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * This class represents a CIM class as defined by the Distributed Management - * Task Force (DMTF) CIM Infrastructure - * Specification (DSP004). A CIMClass has the following attributes: - *
        - *
      • an object path describing the location and name of the class
        • - *
      • superclass name (can be null if no superclass)
        • - *
      • an array of qualifiers for the class
        • - *
      • an array of properties
        • - *
      • an array of methods
        • - *
      - */ -public class CIMClass extends CIMElement implements CIMQualifiedElementInterface, - CIMNamedElementInterface { - - private static final long serialVersionUID = -5634561913210025100L; - - private CIMQualifiedElementInterfaceImpl iQualiImpl; - - private CIMObjectPath iObjPath; - - private String iSuperClass; - - private CIMClassProperty[] iProps; - - private CIMMethod[] iMethods; - - private boolean iIsKeyed; - - private boolean iIsAssoc; - - /** - * Creates and instantiates a Java object representing a CIM Class. This - * method may or may not validate the pIsAssociation and - * pIsKeyed parameters. If an invalid value is supplied (i.e. - * the class is an association, but the pIsAssociation was set - * to false), it may or may not be corrected. - * - * @param pPath - * Object Name of the CIM class. - * @param pSuperClass - * Name of the superclass. - * @param pQualifiers - * List of qualifiers of the CIM class. - * @param pProperties - * List of properties of the CIM class. - * @param pMethods - * List of methods of the CIM class. - * @param pIsAssociation - * true if the CIM class is an Association, - * false otherwise. - * @param pIsKeyed - * true if the CIM class has Keys, - * false otherwise. - * @throws IllegalArgumentException - * If pPath is null. - * - */ - public CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQualifiers, - CIMClassProperty[] pProperties, CIMMethod[] pMethods, boolean pIsAssociation, - boolean pIsKeyed) { - this(pPath, pSuperClass, pQualifiers, pProperties, pMethods); - // if (this.isAssociation() != pIsAssociation) { - // throw new IllegalArgumentException( - // "pIsAssociation does not match pQualifiers! pIsAssociation is " + - // pIsAssociation - // + " while pQualifiers " - // + (this.isAssociation() ? "contains" : "does not contain") - // + " qualifier with association in class " + - // this.iObjPath.getObjectName()); - // } - // if (this.isKeyed() != pIsKeyed) { - // throw new IllegalArgumentException( - // "pIsKeyed does not match pProperties! pIsKeyed is " + pIsKeyed - // + " while pProperties " - // + (this.isKeyed() ? "contains" : "does not contain") - // + " property with key qualifier in class " + - // this.iObjPath.getObjectName()); - // } - } - - /** - * Creates and instantiates a Java object representing a CIM Class. This - * constructor will inspect the class to determine if it is an association - * or has keys. - * - * @param pName - * Name of the CIM class. - * @param pSuperClass - * Name of the superclass. - * @param pQualifiers - * List of qualifiers of the CIM class. - * @param pProperties - * List of properties of the CIM class. - * @param pMethods - * List of methods of the CIM class. - * @throws IllegalArgumentException - * If pName is null. - */ - public CIMClass(String pName, String pSuperClass, CIMQualifier[] pQualifiers, - CIMClassProperty[] pProperties, CIMMethod[] pMethods) { - this(new CIMObjectPath(null, null, null, null, pName, null), pSuperClass, pQualifiers, - pProperties, pMethods); - } - - /** - * This private constructor does the actual work for the two public - * constructors and sets the iIsAssoc and iIsKeyed instance variables based - * on whether there is qualifier with name="Association" and value=true and - * a property with a qualifier with name="Key" and value=true, respectively. - */ - private CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQualifiers, - CIMClassProperty[] pProperties, CIMMethod[] pMethods) { - super(pPath == null ? null : pPath.getObjectName()); - this.iObjPath = pPath; - this.iSuperClass = pSuperClass; - this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers); - this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProperties); - this.iMethods = (CIMMethod[]) CIMElementSorter.sort(pMethods); - this.iIsAssoc = this.iQualiImpl.hasQualifierValue("Association", Boolean.TRUE); - this.iIsKeyed = hasKey(pProperties); - } - - /** - * Indicates whether the specified CIMClass is equal to this - * CIMClass. - * - * @param pObj - * The CIMClass object with which to compare. - * @return true if this object is the same as the - * pObj argument; false otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMClass)) return false; - CIMClass that = (CIMClass) pObj; - if (!super.equals(that)) return false; - if (this.iSuperClass == null ? that.iSuperClass != null : !this.iSuperClass - .equalsIgnoreCase(that.iSuperClass)) return false; - if (!this.iQualiImpl.equals(that.iQualiImpl) || !Arrays.equals(this.iProps, that.iProps) - || !Arrays.equals(this.iMethods, that.iMethods) || this.iIsAssoc != that.iIsAssoc - || isKeyed() != that.isKeyed()) return false; - return true; - } - - /** - * This method returns a new CIMClass with properties filtered - * according to the input parameters. Inclusion of class origin and - * qualifiers can also be controlled. Methods will not be included in the - * class returned. - * - * @param pLocalOnly - * If true only the elements defined in this class - * are included; otherwise all elements are included. - * @param pIncludeQualifiers - * If true qualifiers are included on all elements; - * otherwise no qualifiers are included. - * @param pIncludeClassOrigin - * If true, the ClassOrigin attribute is included. - * @param pPropertyList - * If the PropertyList input parameter is not - * null, the members of the array define one or more - * Property names. The CIMClass returned does not - * include elements for any Properties missing from this list. If - * the PropertyList input parameter is an empty - * array this signifies that no Properties are included in the - * class returned. If the PropertyList input - * parameter is null this specifies that all - * Properties are included in the class returned. If the - * PropertyList contains duplicate elements or - * invalid property names, they are ignored. - * @return CIMClass matching the requested criteria. - */ - public CIMClass filterProperties(boolean pLocalOnly, boolean pIncludeQualifiers, - boolean pIncludeClassOrigin, String[] pPropertyList) { - ArrayList> newPropAList = new ArrayList>(); - // place pPropertyList into a set, for easy and fast search - TreeSet set; - if (pPropertyList != null) { - set = new TreeSet(); - for (int i = 0; i < pPropertyList.length; i++) - set.add(pPropertyList[i].toUpperCase()); - } else set = null; - for (int i = 0; i < getPropertyCount(); i++) { - CIMClassProperty refProp = getProperty(i); - if (pLocalOnly && refProp.isPropagated()) continue; - if (set == null || set.contains(refProp.getName().toUpperCase())) newPropAList - .add(new CIMClassProperty(refProp.getName(), refProp.getDataType(), - refProp.getValue(), - pIncludeQualifiers ? refProp.getQualifiers() : null, - pIncludeQualifiers ? refProp.isKey() : false, // FIXME: - // Should it depend on pIncludeQualifiers? - refProp.isPropagated(), pIncludeClassOrigin ? refProp.getOriginClass() - : null)); - } - return new CIMClass(getObjectPath(), getSuperClassName(), getQualifiers(), newPropAList - .toArray(new CIMClassProperty[0]), null, isAssociation(), isKeyed()); - } - - /** - * Returns a list of key properties for this CIM class. - * - * @return The list of CIM properties that are keys for this CIM class. - */ - public CIMClassProperty[] getKeys() { - ArrayList> keyAList = new ArrayList>(); - for (int i = 0; i < getPropertyCount(); i++) { - CIMClassProperty prop = getProperty(i); - if (prop.isKey()) keyAList.add(prop); - } - return keyAList.toArray(new CIMClassProperty[0]); - } - - /** - * Get a method by index. - * - * @param pIndex - * The index of the method to retrieve. - * @return The CIMMethod at the specified index. - * @throws ArrayIndexOutOfBoundsException - */ - public CIMMethod getMethod(int pIndex) throws ArrayIndexOutOfBoundsException { - return this.iMethods[pIndex]; - } - - /** - * Returns the specified CIM method in this CIM class. - * - * @param pName - * The string name of the method to retrieve. The name may be - * specified in the form "originClass.methodName". - * @return The CIM method specified or null if the method does - * not exist. - */ - - public CIMMethod getMethod(String pName) { - return getMethod(pName, null); - } - - /** - * Returns the CIM method specified by its name and optionally, its origin - * class. The origin class is the class in which the method is defined. - * - * @param pName - * The string name of the method to get. - * @param pOriginClass - * (Optional) The class in which the method was defined. - * @return The CIM method specified or null if the method does - * not exist. - */ - public CIMMethod getMethod(String pName, String pOriginClass) { - CIMMethod method = (CIMMethod) CIMElementSorter.find(this.iMethods, pName); - if (method == null) return null; - if (pOriginClass == null || pOriginClass.equalsIgnoreCase(method.getOriginClass())) return method; - return null; - } - - /** - * Get the number of methods defined in this CIM class. - * - * @return The number of methods defined in the CIM class. - */ - public int getMethodCount() { - return this.iMethods == null ? 0 : this.iMethods.length; - } - - /** - * Get the CIM methods defined in this CIM class. - * - * @return The methods in this CIM class. - */ - public CIMMethod[] getMethods() { - return this.iMethods != null ? this.iMethods : new CIMMethod[0]; - } - - /** - * This method returns the CIMObjectPath that represents this - * CIM class. - * - * @return The CIMObjectPath that represents this CIM class. - */ - public CIMObjectPath getObjectPath() { - return this.iObjPath; - } - - /** - * Get the properties defined for this CIM class. - * - * @return The properties for this class. - */ - public CIMClassProperty[] getProperties() { - return this.iProps != null ? this.iProps : new CIMClassProperty[0]; - } - - /** - * Get a class property by index. - * - * @param pIndex - * The index of the class property to retrieve. - * @return The CIMClassProperty at the specified index. - * @throws ArrayIndexOutOfBoundsException - */ - public CIMClassProperty getProperty(int pIndex) throws ArrayIndexOutOfBoundsException { - return this.iProps[pIndex]; - } - - /** - * Gets the specified property. - * - * @param pName - * The text string for the name of the property. - * @return The property requested or null if the property does - * not exist. - */ - public CIMClassProperty getProperty(String pName) { - return (CIMClassProperty) CIMElementSorter.find(this.iProps, pName); - } - - /** - * Gets the specified property. - * - * @param pName - * The string name of the property to get. - * @param pOriginClass - * (Optional) The string name of the class in which the property - * was defined. - * @return The property requested or null if the property does - * not exist. - */ - public CIMClassProperty getProperty(String pName, String pOriginClass) { - CIMClassProperty prop = (CIMClassProperty) CIMElementSorter.find(this.iProps, pName); - if (prop == null || pOriginClass == null) return prop; - return pOriginClass.equalsIgnoreCase(prop.getOriginClass()) ? prop : null; - } - - /** - * Get the number of properties defined in this CIMClass. - * - * @return The number of properties defined in the CIMClass. - */ - public int getPropertyCount() { - return this.iProps != null ? this.iProps.length : 0; - } - - /** - * Get a qualifier by index. - * - * @param pIndex - * The index of the qualifier to retrieve. - * @return The qualifier at the specified index. - * @throws ArrayIndexOutOfBoundsException - */ - public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsException { - return this.iQualiImpl.getQualifier(pIndex); - } - - /** - * Gets a qualifier by name. - * - * @param pName - * The name of the qualifier to get. - * @return The qualifier requested or null if the qualifier - * does not exist. - */ - public CIMQualifier getQualifier(String pName) { - return this.iQualiImpl.getQualifier(pName); - } - - /** - * Get the number of qualifiers defined in this CIM class. - * - * @return The number of qualifiers defined in the CIM class. - */ - public int getQualifierCount() { - return this.iQualiImpl.getQualifierCount(); - } - - /** - * Returns the list of qualifiers for the CIM class. - * - * @return Qualifiers for this class. - */ - public CIMQualifier[] getQualifiers() { - return this.iQualiImpl.getQualifiers(); - } - - /** - * Gets a qualifier value by name. - * - * @param pName - * The name of the qualifier to get. - * @return null if the qualifier does not exist or value is - * null, otherwise returns the reference to the - * qualifier. - */ - public Object getQualifierValue(String pName) { - return this.iQualiImpl.getQualifierValue(pName); - } - - /** - * Gets the name of the parent of this CIM class. - * - * @return The name of the parent class. - */ - public String getSuperClassName() { - return this.iSuperClass; - } - - /** - * Checks whether the specified qualifier is one of the qualifiers in this - * CIM class. - * - * @param pName - * The name of the qualifier. - * @return true if the qualifier exists in this CIM class, - * otherwise false. - */ - public boolean hasQualifier(String pName) { - return this.iQualiImpl.hasQualifier(pName); - } - - /** - * Checks whether the specified qualifier is one of the qualifiers defined - * for this class with the specified value. This method will return - * false if the qualifier is not applied or if the value does - * not match. - * - * @param pName - * The name of the qualifier. - * @param pValue - * The value to be tested. - * @return true if the qualifier exists and has the value, - * otherwise false. - */ - public boolean hasQualifierValue(String pName, Object pValue) { - return this.iQualiImpl.hasQualifierValue(pName, pValue); - } - - /** - * Identifies whether or not this CIM class is an association. An - * association is a relationship between two or more classes or instances of - * two or more classes. The properties of an association class include - * references, or pointers, to the two or more instances. All CIM classes - * can be included in one or more associations. - * - * @return true if this CIM class is an association; otherwise, - * false. - */ - public boolean isAssociation() { - return this.iIsAssoc; - } - - /** - * Identifies whether or not this class is keyed. Only keyed classes can - * have instances. Returns true if this CIM class has one or - * more key properties. Otherwise, returns false. - * - * @return true if this CIM class has a key property, otherwise - * returns false. - */ - public boolean isKeyed() { - return this.iIsKeyed; - } - - /** - * Returns a new CIM instance initialized with the default CIM properties, - * values and name of this CIM class. - * - * @return A CIM instance of this CIM class. - */ - public CIMInstance newInstance() { - return new CIMInstance(this.iObjPath, this.iProps); - } - - /** - * Returns a String representation of the CIM class. This - * method is intended to be used only for debugging purposes, and the format - * of the returned string may vary between implementations. The returned - * string may be empty but may not be null. - * - * @return A String representation of this CIM class. - */ - @Override - public String toString() { - return MOF.classDeclaration(this, MOF.EMPTY); - } - - /** - * Checks whether an array of properties contains a key. - * - * @param pProps - * Array of properties. - * @return true if at least one of the class properties is a - * key, false otherwise. - */ - private static boolean hasKey(CIMClassProperty[] pProps) { - if (pProps == null) return false; - for (int i = 0; i < pProps.length; i++) - if (pProps[i].isKey()) return true; - return false; - } - -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() + * 1737123 2007-06-15 ebak Differences to JSR48 public review draft + * 1783288 2007-09-10 ebak CIMClass.isAssociation() not working for retrieved classes. + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 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) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2823494 2009-08-03 rgummada Change Boolean constructor to static + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException + * 2975917 2010-03-24 blaschke-oss TCK: CIMClass.getProperty() does not handle null property + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final + * 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 + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.TreeSet; + +import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMElementSorter; +import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl; +import org.metricshub.wbem.sblim.cimclient.internal.util.MOF; + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * This class represents a CIM class as defined by the Distributed Management + * Task Force (DMTF) CIM Infrastructure + * Specification (DSP004). A CIMClass has the following attributes: + *
        + *
      • an object path describing the location and name of the class
        • + *
      • superclass name (can be null if no superclass)
        • + *
      • an array of qualifiers for the class
        • + *
      • an array of properties
        • + *
      • an array of methods
        • + *
      + */ +public class CIMClass extends CIMElement implements CIMQualifiedElementInterface, + CIMNamedElementInterface { + + private static final long serialVersionUID = -5634561913210025100L; + + private CIMQualifiedElementInterfaceImpl iQualiImpl; + + private CIMObjectPath iObjPath; + + private String iSuperClass; + + private CIMClassProperty[] iProps; + + private CIMMethod[] iMethods; + + private boolean iIsKeyed; + + private boolean iIsAssoc; + + /** + * Creates and instantiates a Java object representing a CIM Class. This + * method may or may not validate the pIsAssociation and + * pIsKeyed parameters. If an invalid value is supplied (i.e. + * the class is an association, but the pIsAssociation was set + * to false), it may or may not be corrected. + * + * @param pPath + * Object Name of the CIM class. + * @param pSuperClass + * Name of the superclass. + * @param pQualifiers + * List of qualifiers of the CIM class. + * @param pProperties + * List of properties of the CIM class. + * @param pMethods + * List of methods of the CIM class. + * @param pIsAssociation + * true if the CIM class is an Association, + * false otherwise. + * @param pIsKeyed + * true if the CIM class has Keys, + * false otherwise. + * @throws IllegalArgumentException + * If pPath is null. + * + */ + public CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQualifiers, + CIMClassProperty[] pProperties, CIMMethod[] pMethods, boolean pIsAssociation, + boolean pIsKeyed) { + this(pPath, pSuperClass, pQualifiers, pProperties, pMethods); + // if (this.isAssociation() != pIsAssociation) { + // throw new IllegalArgumentException( + // "pIsAssociation does not match pQualifiers! pIsAssociation is " + + // pIsAssociation + // + " while pQualifiers " + // + (this.isAssociation() ? "contains" : "does not contain") + // + " qualifier with association in class " + + // this.iObjPath.getObjectName()); + // } + // if (this.isKeyed() != pIsKeyed) { + // throw new IllegalArgumentException( + // "pIsKeyed does not match pProperties! pIsKeyed is " + pIsKeyed + // + " while pProperties " + // + (this.isKeyed() ? "contains" : "does not contain") + // + " property with key qualifier in class " + + // this.iObjPath.getObjectName()); + // } + } + + /** + * Creates and instantiates a Java object representing a CIM Class. This + * constructor will inspect the class to determine if it is an association + * or has keys. + * + * @param pName + * Name of the CIM class. + * @param pSuperClass + * Name of the superclass. + * @param pQualifiers + * List of qualifiers of the CIM class. + * @param pProperties + * List of properties of the CIM class. + * @param pMethods + * List of methods of the CIM class. + * @throws IllegalArgumentException + * If pName is null. + */ + public CIMClass(String pName, String pSuperClass, CIMQualifier[] pQualifiers, + CIMClassProperty[] pProperties, CIMMethod[] pMethods) { + this(new CIMObjectPath(null, null, null, null, pName, null), pSuperClass, pQualifiers, + pProperties, pMethods); + } + + /** + * This private constructor does the actual work for the two public + * constructors and sets the iIsAssoc and iIsKeyed instance variables based + * on whether there is qualifier with name="Association" and value=true and + * a property with a qualifier with name="Key" and value=true, respectively. + */ + private CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQualifiers, + CIMClassProperty[] pProperties, CIMMethod[] pMethods) { + super(pPath == null ? null : pPath.getObjectName()); + this.iObjPath = pPath; + this.iSuperClass = pSuperClass; + this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers); + this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProperties); + this.iMethods = (CIMMethod[]) CIMElementSorter.sort(pMethods); + this.iIsAssoc = this.iQualiImpl.hasQualifierValue("Association", Boolean.TRUE); + this.iIsKeyed = hasKey(pProperties); + } + + /** + * Indicates whether the specified CIMClass is equal to this + * CIMClass. + * + * @param pObj + * The CIMClass object with which to compare. + * @return true if this object is the same as the + * pObj argument; false otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMClass)) return false; + CIMClass that = (CIMClass) pObj; + if (!super.equals(that)) return false; + if (this.iSuperClass == null ? that.iSuperClass != null : !this.iSuperClass + .equalsIgnoreCase(that.iSuperClass)) return false; + if (!this.iQualiImpl.equals(that.iQualiImpl) || !Arrays.equals(this.iProps, that.iProps) + || !Arrays.equals(this.iMethods, that.iMethods) || this.iIsAssoc != that.iIsAssoc + || isKeyed() != that.isKeyed()) return false; + return true; + } + + /** + * This method returns a new CIMClass with properties filtered + * according to the input parameters. Inclusion of class origin and + * qualifiers can also be controlled. Methods will not be included in the + * class returned. + * + * @param pLocalOnly + * If true only the elements defined in this class + * are included; otherwise all elements are included. + * @param pIncludeQualifiers + * If true qualifiers are included on all elements; + * otherwise no qualifiers are included. + * @param pIncludeClassOrigin + * If true, the ClassOrigin attribute is included. + * @param pPropertyList + * If the PropertyList input parameter is not + * null, the members of the array define one or more + * Property names. The CIMClass returned does not + * include elements for any Properties missing from this list. If + * the PropertyList input parameter is an empty + * array this signifies that no Properties are included in the + * class returned. If the PropertyList input + * parameter is null this specifies that all + * Properties are included in the class returned. If the + * PropertyList contains duplicate elements or + * invalid property names, they are ignored. + * @return CIMClass matching the requested criteria. + */ + public CIMClass filterProperties(boolean pLocalOnly, boolean pIncludeQualifiers, + boolean pIncludeClassOrigin, String[] pPropertyList) { + ArrayList> newPropAList = new ArrayList>(); + // place pPropertyList into a set, for easy and fast search + TreeSet set; + if (pPropertyList != null) { + set = new TreeSet(); + for (int i = 0; i < pPropertyList.length; i++) + set.add(pPropertyList[i].toUpperCase()); + } else set = null; + for (int i = 0; i < getPropertyCount(); i++) { + CIMClassProperty refProp = getProperty(i); + if (pLocalOnly && refProp.isPropagated()) continue; + if (set == null || set.contains(refProp.getName().toUpperCase())) newPropAList + .add(new CIMClassProperty(refProp.getName(), refProp.getDataType(), + refProp.getValue(), + pIncludeQualifiers ? refProp.getQualifiers() : null, + pIncludeQualifiers ? refProp.isKey() : false, // FIXME: + // Should it depend on pIncludeQualifiers? + refProp.isPropagated(), pIncludeClassOrigin ? refProp.getOriginClass() + : null)); + } + return new CIMClass(getObjectPath(), getSuperClassName(), getQualifiers(), newPropAList + .toArray(new CIMClassProperty[0]), null, isAssociation(), isKeyed()); + } + + /** + * Returns a list of key properties for this CIM class. + * + * @return The list of CIM properties that are keys for this CIM class. + */ + public CIMClassProperty[] getKeys() { + ArrayList> keyAList = new ArrayList>(); + for (int i = 0; i < getPropertyCount(); i++) { + CIMClassProperty prop = getProperty(i); + if (prop.isKey()) keyAList.add(prop); + } + return keyAList.toArray(new CIMClassProperty[0]); + } + + /** + * Get a method by index. + * + * @param pIndex + * The index of the method to retrieve. + * @return The CIMMethod at the specified index. + * @throws ArrayIndexOutOfBoundsException + */ + public CIMMethod getMethod(int pIndex) throws ArrayIndexOutOfBoundsException { + return this.iMethods[pIndex]; + } + + /** + * Returns the specified CIM method in this CIM class. + * + * @param pName + * The string name of the method to retrieve. The name may be + * specified in the form "originClass.methodName". + * @return The CIM method specified or null if the method does + * not exist. + */ + + public CIMMethod getMethod(String pName) { + return getMethod(pName, null); + } + + /** + * Returns the CIM method specified by its name and optionally, its origin + * class. The origin class is the class in which the method is defined. + * + * @param pName + * The string name of the method to get. + * @param pOriginClass + * (Optional) The class in which the method was defined. + * @return The CIM method specified or null if the method does + * not exist. + */ + public CIMMethod getMethod(String pName, String pOriginClass) { + CIMMethod method = (CIMMethod) CIMElementSorter.find(this.iMethods, pName); + if (method == null) return null; + if (pOriginClass == null || pOriginClass.equalsIgnoreCase(method.getOriginClass())) return method; + return null; + } + + /** + * Get the number of methods defined in this CIM class. + * + * @return The number of methods defined in the CIM class. + */ + public int getMethodCount() { + return this.iMethods == null ? 0 : this.iMethods.length; + } + + /** + * Get the CIM methods defined in this CIM class. + * + * @return The methods in this CIM class. + */ + public CIMMethod[] getMethods() { + return this.iMethods != null ? this.iMethods : new CIMMethod[0]; + } + + /** + * This method returns the CIMObjectPath that represents this + * CIM class. + * + * @return The CIMObjectPath that represents this CIM class. + */ + public CIMObjectPath getObjectPath() { + return this.iObjPath; + } + + /** + * Get the properties defined for this CIM class. + * + * @return The properties for this class. + */ + public CIMClassProperty[] getProperties() { + return this.iProps != null ? this.iProps : new CIMClassProperty[0]; + } + + /** + * Get a class property by index. + * + * @param pIndex + * The index of the class property to retrieve. + * @return The CIMClassProperty at the specified index. + * @throws ArrayIndexOutOfBoundsException + */ + public CIMClassProperty getProperty(int pIndex) throws ArrayIndexOutOfBoundsException { + return this.iProps[pIndex]; + } + + /** + * Gets the specified property. + * + * @param pName + * The text string for the name of the property. + * @return The property requested or null if the property does + * not exist. + */ + public CIMClassProperty getProperty(String pName) { + return (CIMClassProperty) CIMElementSorter.find(this.iProps, pName); + } + + /** + * Gets the specified property. + * + * @param pName + * The string name of the property to get. + * @param pOriginClass + * (Optional) The string name of the class in which the property + * was defined. + * @return The property requested or null if the property does + * not exist. + */ + public CIMClassProperty getProperty(String pName, String pOriginClass) { + CIMClassProperty prop = (CIMClassProperty) CIMElementSorter.find(this.iProps, pName); + if (prop == null || pOriginClass == null) return prop; + return pOriginClass.equalsIgnoreCase(prop.getOriginClass()) ? prop : null; + } + + /** + * Get the number of properties defined in this CIMClass. + * + * @return The number of properties defined in the CIMClass. + */ + public int getPropertyCount() { + return this.iProps != null ? this.iProps.length : 0; + } + + /** + * Get a qualifier by index. + * + * @param pIndex + * The index of the qualifier to retrieve. + * @return The qualifier at the specified index. + * @throws ArrayIndexOutOfBoundsException + */ + public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsException { + return this.iQualiImpl.getQualifier(pIndex); + } + + /** + * Gets a qualifier by name. + * + * @param pName + * The name of the qualifier to get. + * @return The qualifier requested or null if the qualifier + * does not exist. + */ + public CIMQualifier getQualifier(String pName) { + return this.iQualiImpl.getQualifier(pName); + } + + /** + * Get the number of qualifiers defined in this CIM class. + * + * @return The number of qualifiers defined in the CIM class. + */ + public int getQualifierCount() { + return this.iQualiImpl.getQualifierCount(); + } + + /** + * Returns the list of qualifiers for the CIM class. + * + * @return Qualifiers for this class. + */ + public CIMQualifier[] getQualifiers() { + return this.iQualiImpl.getQualifiers(); + } + + /** + * Gets a qualifier value by name. + * + * @param pName + * The name of the qualifier to get. + * @return null if the qualifier does not exist or value is + * null, otherwise returns the reference to the + * qualifier. + */ + public Object getQualifierValue(String pName) { + return this.iQualiImpl.getQualifierValue(pName); + } + + /** + * Gets the name of the parent of this CIM class. + * + * @return The name of the parent class. + */ + public String getSuperClassName() { + return this.iSuperClass; + } + + /** + * Checks whether the specified qualifier is one of the qualifiers in this + * CIM class. + * + * @param pName + * The name of the qualifier. + * @return true if the qualifier exists in this CIM class, + * otherwise false. + */ + public boolean hasQualifier(String pName) { + return this.iQualiImpl.hasQualifier(pName); + } + + /** + * Checks whether the specified qualifier is one of the qualifiers defined + * for this class with the specified value. This method will return + * false if the qualifier is not applied or if the value does + * not match. + * + * @param pName + * The name of the qualifier. + * @param pValue + * The value to be tested. + * @return true if the qualifier exists and has the value, + * otherwise false. + */ + public boolean hasQualifierValue(String pName, Object pValue) { + return this.iQualiImpl.hasQualifierValue(pName, pValue); + } + + /** + * Identifies whether or not this CIM class is an association. An + * association is a relationship between two or more classes or instances of + * two or more classes. The properties of an association class include + * references, or pointers, to the two or more instances. All CIM classes + * can be included in one or more associations. + * + * @return true if this CIM class is an association; otherwise, + * false. + */ + public boolean isAssociation() { + return this.iIsAssoc; + } + + /** + * Identifies whether or not this class is keyed. Only keyed classes can + * have instances. Returns true if this CIM class has one or + * more key properties. Otherwise, returns false. + * + * @return true if this CIM class has a key property, otherwise + * returns false. + */ + public boolean isKeyed() { + return this.iIsKeyed; + } + + /** + * Returns a new CIM instance initialized with the default CIM properties, + * values and name of this CIM class. + * + * @return A CIM instance of this CIM class. + */ + public CIMInstance newInstance() { + return new CIMInstance(this.iObjPath, this.iProps); + } + + /** + * Returns a String representation of the CIM class. This + * method is intended to be used only for debugging purposes, and the format + * of the returned string may vary between implementations. The returned + * string may be empty but may not be null. + * + * @return A String representation of this CIM class. + */ + @Override + public String toString() { + return MOF.classDeclaration(this, MOF.EMPTY); + } + + /** + * Checks whether an array of properties contains a key. + * + * @param pProps + * Array of properties. + * @return true if at least one of the class properties is a + * key, false otherwise. + */ + private static boolean hasKey(CIMClassProperty[] pProps) { + if (pProps == null) return false; + for (int i = 0; i < pProps.length; i++) + if (pProps[i].isKey()) return true; + return false; + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMClassProperty.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMClassProperty.java similarity index 89% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMClassProperty.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMClassProperty.java index c6a90f4..b6a8d2f 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMClassProperty.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMClassProperty.java @@ -1,263 +1,261 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1660756 2007-02-22 ebak Embedded object support - * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() - * 1737123 2007-06-15 ebak Differences to JSR48 public review draft - * 1737141 2007-06-18 ebak Sync up with JSR48 evolution - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2823494 2009-08-03 rgummada Change Boolean constructor to static - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2944839 2010-02-08 blaschke-oss Remove redundant toString() methods - * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 -/** - * This class represents a CIM property (when used for a CIMClass) - * as defined by the Distributed Management Task Force (DMTF) CIM Infrastructure Specification (DSP004). This class is to be used for all CIMClass - * properties. NOTE: For instance properties, use the class - * CIMProperty. - * - * @param - * Type parameter. - * - */ -public class CIMClassProperty extends CIMProperty implements CIMQualifiedElementInterface { - - private static final long serialVersionUID = -1455588144409014311L; - - private CIMQualifiedElementInterfaceImpl iQualiImpl; - - /** - * This method constructs an instance of CIMClassProperty. - * - * @param pName - * The name of the property. - * @param pType - * The data type of the property. - * @param pValue - * The value of the property. - * @param pQualifiers - * The qualifiers for the property. - * @param pKey - * true if the property is a key, otherwise - * false. - * @param pPropagated - * true if the property was inherited, otherwise - * false. - * @param pOriginClass - * The original class in which the property was defined. - */ - public CIMClassProperty(String pName, CIMDataType pType, E pValue, - CIMQualifier[] pQualifiers, boolean pKey, boolean pPropagated, String pOriginClass) { - super(pName, pType, pValue, pKey | hasKey(pQualifiers), pPropagated, pOriginClass); - this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers, pKey, true); - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null and is a - * CIMClassProperty that represents the same name, type and - * value as this object. - * - * @param pObj - * The object to compare with. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMClassProperty)) return false; - if (!super.equals(pObj)) return false; - return this.iQualiImpl.equals(((CIMClassProperty) pObj).iQualiImpl); - } - - /** - * Returns a CIMClassProperty filtered as specified. - * - * @param pIncludeQualifiers - * If true all qualifiers are returned; otherwise no - * qualifiers. - * @param pIncludeClassOrigin - * If true the class origin is included; otherwise - * no class origin is present. - * @return A filtered CIMClassProperty. - */ - public CIMClassProperty filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin) { - return filter(pIncludeQualifiers, pIncludeClassOrigin, false); - } - - /** - * Returns a CIMClassProperty filtered as specified. - * - * @param pIncludeQualifiers - * If true all qualifiers are returned; otherwise no - * qualifiers. - * @param pIncludeClassOrigin - * If true the class origin is included; otherwise - * no class origin is present. - * @param pLocalOnly - * If true only the qualifiers that were not - * propagated will be included. - * @return CIMClassProperty A filtered CIMClassProperty. - */ - public CIMClassProperty filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin, - boolean pLocalOnly) { - // FIXME: should key depend on pIncludeQualifiers? - return new CIMClassProperty(getName(), getDataType(), getValue(), - pIncludeQualifiers ? this.iQualiImpl.getQualifiers(pLocalOnly) : null, isKey(), - isPropagated(), pIncludeClassOrigin ? getOriginClass() : null); - } - - /** - * Get a qualifier by index. - * - * @param pIndex - * The index of the qualifier to retrieve. - * @return The qualifier at the specified index. - * @throws ArrayIndexOutOfBoundsException - */ - public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsException { - return this.iQualiImpl.getQualifier(pIndex); - } - - /** - * Gets a qualifier by name. - * - * @param pName - * The name of the qualifier to get. - * @return The qualifier requested or null if the qualifier - * does not exist. - */ - public CIMQualifier getQualifier(String pName) { - return this.iQualiImpl.getQualifier(pName); - } - - /** - * Get the number of qualifiers defined for this property. - * - * @return The number of qualifiers defined for this property. - */ - public int getQualifierCount() { - return this.iQualiImpl.getQualifierCount(); - } - - /** - * Returns the list of qualifiers for this property. - * - * @return Qualifiers for this property. - */ - public CIMQualifier[] getQualifiers() { - return this.iQualiImpl.getQualifiers(); - } - - /** - * Gets a qualifier value by name. - * - * @param pName - * The name of the qualifier to get. - * @return null if the qualifier does not exist or value is - * null, otherwise returns the reference to the - * qualifier. - */ - public Object getQualifierValue(String pName) { - return this.iQualiImpl.getQualifierValue(pName); - } - - /** - * Checks whether the specified qualifier is one of the qualifiers defined - * for this property. - * - * @param pName - * The name of the qualifier. - * @return true if the qualifier exists in this property, - * otherwise false. - */ - public boolean hasQualifier(String pName) { - return this.iQualiImpl.hasQualifier(pName); - } - - /** - * Checks whether the specified qualifier is one of the qualifiers defined - * for this property with the specified value. This method will return - * false if the qualifier is not applied or if the value does - * not match. - * - * @param pName - * The name of the qualifier. - * @param pValue - * The value to be tested. - * @return true if the qualifier exists in this property, - * otherwise false. - */ - public boolean hasQualifierValue(String pName, Object pValue) { - return this.iQualiImpl.hasQualifierValue(pName, pValue); - } - - /** - * Checks whether an array of qualifiers contains a key. - * - * @param pQualiA - * Array of qualifiers. - * - * @return true if at least one of the qualifiers is a key, - * false otherwise. - */ - private static boolean hasKey(CIMQualifier[] pQualiA) { - if (pQualiA == null) return false; - Boolean trueBool = Boolean.TRUE; - for (int i = 0; i < pQualiA.length; i++) { - CIMQualifier quali = pQualiA[i]; - if ("key".equalsIgnoreCase(quali.getName())) { return trueBool.equals(quali.getValue()); } - } - return false; - } - -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1660756 2007-02-22 ebak Embedded object support + * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() + * 1737123 2007-06-15 ebak Differences to JSR48 public review draft + * 1737141 2007-06-18 ebak Sync up with JSR48 evolution + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2823494 2009-08-03 rgummada Change Boolean constructor to static + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2944839 2010-02-08 blaschke-oss Remove redundant toString() methods + * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 +/** + * This class represents a CIM property (when used for a CIMClass) + * as defined by the Distributed Management Task Force (DMTF) CIM Infrastructure Specification (DSP004). This class is to be used for all CIMClass + * properties. NOTE: For instance properties, use the class + * CIMProperty. + * + * @param + * Type parameter. + * + */ +public class CIMClassProperty extends CIMProperty implements CIMQualifiedElementInterface { + + private static final long serialVersionUID = -1455588144409014311L; + + private CIMQualifiedElementInterfaceImpl iQualiImpl; + + /** + * This method constructs an instance of CIMClassProperty. + * + * @param pName + * The name of the property. + * @param pType + * The data type of the property. + * @param pValue + * The value of the property. + * @param pQualifiers + * The qualifiers for the property. + * @param pKey + * true if the property is a key, otherwise + * false. + * @param pPropagated + * true if the property was inherited, otherwise + * false. + * @param pOriginClass + * The original class in which the property was defined. + */ + public CIMClassProperty(String pName, CIMDataType pType, E pValue, + CIMQualifier[] pQualifiers, boolean pKey, boolean pPropagated, String pOriginClass) { + super(pName, pType, pValue, pKey | hasKey(pQualifiers), pPropagated, pOriginClass); + this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers, pKey, true); + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null and is a + * CIMClassProperty that represents the same name, type and + * value as this object. + * + * @param pObj + * The object to compare with. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMClassProperty)) return false; + if (!super.equals(pObj)) return false; + return this.iQualiImpl.equals(((CIMClassProperty) pObj).iQualiImpl); + } + + /** + * Returns a CIMClassProperty filtered as specified. + * + * @param pIncludeQualifiers + * If true all qualifiers are returned; otherwise no + * qualifiers. + * @param pIncludeClassOrigin + * If true the class origin is included; otherwise + * no class origin is present. + * @return A filtered CIMClassProperty. + */ + public CIMClassProperty filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin) { + return filter(pIncludeQualifiers, pIncludeClassOrigin, false); + } + + /** + * Returns a CIMClassProperty filtered as specified. + * + * @param pIncludeQualifiers + * If true all qualifiers are returned; otherwise no + * qualifiers. + * @param pIncludeClassOrigin + * If true the class origin is included; otherwise + * no class origin is present. + * @param pLocalOnly + * If true only the qualifiers that were not + * propagated will be included. + * @return CIMClassProperty A filtered CIMClassProperty. + */ + public CIMClassProperty filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin, + boolean pLocalOnly) { + // FIXME: should key depend on pIncludeQualifiers? + return new CIMClassProperty(getName(), getDataType(), getValue(), + pIncludeQualifiers ? this.iQualiImpl.getQualifiers(pLocalOnly) : null, isKey(), + isPropagated(), pIncludeClassOrigin ? getOriginClass() : null); + } + + /** + * Get a qualifier by index. + * + * @param pIndex + * The index of the qualifier to retrieve. + * @return The qualifier at the specified index. + * @throws ArrayIndexOutOfBoundsException + */ + public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsException { + return this.iQualiImpl.getQualifier(pIndex); + } + + /** + * Gets a qualifier by name. + * + * @param pName + * The name of the qualifier to get. + * @return The qualifier requested or null if the qualifier + * does not exist. + */ + public CIMQualifier getQualifier(String pName) { + return this.iQualiImpl.getQualifier(pName); + } + + /** + * Get the number of qualifiers defined for this property. + * + * @return The number of qualifiers defined for this property. + */ + public int getQualifierCount() { + return this.iQualiImpl.getQualifierCount(); + } + + /** + * Returns the list of qualifiers for this property. + * + * @return Qualifiers for this property. + */ + public CIMQualifier[] getQualifiers() { + return this.iQualiImpl.getQualifiers(); + } + + /** + * Gets a qualifier value by name. + * + * @param pName + * The name of the qualifier to get. + * @return null if the qualifier does not exist or value is + * null, otherwise returns the reference to the + * qualifier. + */ + public Object getQualifierValue(String pName) { + return this.iQualiImpl.getQualifierValue(pName); + } + + /** + * Checks whether the specified qualifier is one of the qualifiers defined + * for this property. + * + * @param pName + * The name of the qualifier. + * @return true if the qualifier exists in this property, + * otherwise false. + */ + public boolean hasQualifier(String pName) { + return this.iQualiImpl.hasQualifier(pName); + } + + /** + * Checks whether the specified qualifier is one of the qualifiers defined + * for this property with the specified value. This method will return + * false if the qualifier is not applied or if the value does + * not match. + * + * @param pName + * The name of the qualifier. + * @param pValue + * The value to be tested. + * @return true if the qualifier exists in this property, + * otherwise false. + */ + public boolean hasQualifierValue(String pName, Object pValue) { + return this.iQualiImpl.hasQualifierValue(pName, pValue); + } + + /** + * Checks whether an array of qualifiers contains a key. + * + * @param pQualiA + * Array of qualifiers. + * + * @return true if at least one of the qualifiers is a key, + * false otherwise. + */ + private static boolean hasKey(CIMQualifier[] pQualiA) { + if (pQualiA == null) return false; + Boolean trueBool = Boolean.TRUE; + for (int i = 0; i < pQualiA.length; i++) { + CIMQualifier quali = pQualiA[i]; + if ("key".equalsIgnoreCase(quali.getName())) { return trueBool.equals(quali.getValue()); } + } + return false; + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDataType.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java similarity index 92% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDataType.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java index 4ffa30d..aca33c9 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDataType.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java @@ -1,737 +1,735 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1663270 2007-02-19 ebak Minor performance problems - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1660756 2007-02-22 ebak Embedded object support - * 1669225 2007-04-16 lupusalex Ctor CIMDataType(int) shall be private - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2870455 2009-09-30 blaschke-oss Missing CLASS_ARRAY_T in CIMDataType - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 3004779 2010-06-16 blaschke-oss TCK: CIMDataType not throwing IllegalArgumentException - * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1 - * 3513349 2012-03-31 blaschke-oss TCK: CIMDataType must not accept null string - * 3517503 2012-04-13 blaschke-oss Missing parm in CIMDataType ctor javadoc - * 3521131 2012-04-24 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II - * 2632 2013-05-02 blaschke-oss Potential Null Point Exception in CIMDataType - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.io.Serializable; - -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF; - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_02) on Sun Apr 22 15:31:53 EDT 2012 -/** - * This class represents a CIM data type as defined by the Distributed - * Management Task Force (DMTF) CIM - * Infrastructure Specification (DSP004). The specification only allows a set number of data types. This - * class defines the mapping of CIM data types to Java objects.
      - *
      - * Note: CIM allows the fixed size of an array as part of the data type. The - * predefined classes are unbounded.
      - *
      - * The following table shows the mapping of CIM data type to Java.
      - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
      CIM Data TypeJava Representation
      uint8UnsignedInteger8
      sint8Byte
      uint16UnsignedInteger16
      sint16Short
      uint32UnsignedInteger32
      sint32Integer
      uint64UnsignedInteger64
      sint64Long
      stringString
      booleanBoolean
      real32Float
      real64Double
      datetimeCIMDataTimeAbsolute
      - * CIMDataTimeInterval
      <classname> refCIMObjectPath
      char16Character
      mapping of CIM data type to Java
      - */ -public class CIMDataType extends Object implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * Boolean - * - * @see Boolean - */ - public static final int BOOLEAN = 9; - - /** - * Boolean unbounded array data type - * - * @see Boolean - */ - public static final CIMDataType BOOLEAN_ARRAY_T = new CIMDataType(BOOLEAN, true); - - /** - * Boolean data type - * - * @see Boolean - */ - public static final CIMDataType BOOLEAN_T = new CIMDataType(BOOLEAN, false); - - /** - * 16-bit UCS-2 character - * - * @see Character - */ - public static final int CHAR16 = 13; - - /** - * 16-bit UCS-2 character unbounded Array type - * - * @see Character - */ - public static final CIMDataType CHAR16_ARRAY_T = new CIMDataType(CHAR16, true); - - /** - * 16-bit UCS-2 character data type - * - * @see Character - */ - public static final CIMDataType CHAR16_T = new CIMDataType(CHAR16, false); - - /** - * CIMClass type - */ - public static final int CLASS = 17; - - /** - * CIMClass unbounded Array type - * - * @see CIMClass - */ - public static final CIMDataType CLASS_ARRAY_T = new CIMDataType(CLASS, true); - - /** - * CIMClass type - * - * @see CIMClass - */ - public static final CIMDataType CLASS_T = new CIMDataType(CLASS, false); - - /** - * A string containing the date-time - * - * @see CIMDateTimeInterval CIMDateTimeAbsolute - */ - public static final int DATETIME = 12; - - /** - * A date-time unbounded array data type - * - * @see CIMDateTimeInterval CIMDateTimeAbsolute - */ - public static final CIMDataType DATETIME_ARRAY_T = new CIMDataType(DATETIME, true); - - /** - * A date-time data type - * - * @see CIMDateTimeInterval CIMDateTimeAbsolute - */ - public static final CIMDataType DATETIME_T = new CIMDataType(DATETIME, false); - - /** - * Invalid type - */ - public static final int INVALID = -1; - - /** - * Invalid data type - */ - public static final CIMDataType INVALID_T = new CIMDataType(INVALID, false); - - /** - * Null type - */ - public static final int NULL = 16; - - /** - * CIMInstance type - * - * @see CIMInstance - */ - public static final int OBJECT = 15; - - /** - * CIMInstance unbounded Array type - * - * @see CIMInstance - */ - public static final CIMDataType OBJECT_ARRAY_T = new CIMDataType(OBJECT, true); - - /** - * CIMInstance type data type (Note: For CIMV2, this can only be used when - * the property has either an EmbeddedInstance or EmbeddedObject qualifier) - * - * @see CIMInstance - */ - public static final CIMDataType OBJECT_T = new CIMDataType(OBJECT, false); - - /** - * IEEE 4-byte floating-point - * - * @see Float - */ - public static final int REAL32 = 10; - - /** - * IEEE 4-byte floating-point unbounded array data type - * - * @see Float - */ - public static final CIMDataType REAL32_ARRAY_T = new CIMDataType(REAL32, true); - - /** - * IEEE 4-byte floating-point data type - * - * @see Float - */ - public static final CIMDataType REAL32_T = new CIMDataType(REAL32, false); - - /** - * IEEE 8-byte floating-point - * - * @see Double - */ - public static final int REAL64 = 11; - - /** - * IEEE 8-byte floating-point unbounded array data type - * - * @see Double - */ - public static final CIMDataType REAL64_ARRAY_T = new CIMDataType(REAL64, true); - - /** - * IEEE 8-byte floating-point data type - * - * @see Double - */ - public static final CIMDataType REAL64_T = new CIMDataType(REAL64, false); - - /** - * Reference type - * - * @see CIMObjectPath - */ - public static final int REFERENCE = 14; - - /** - * Signed 16-bit integer - * - * @see Short - */ - public static final int SINT16 = 3; - - /** - * Signed 16-bit integer unbounded array data type - * - * @see Short - */ - public static final CIMDataType SINT16_ARRAY_T = new CIMDataType(SINT16, true); - - /** - * Signed 16-bit integer data type - * - * @see Short - */ - public static final CIMDataType SINT16_T = new CIMDataType(SINT16, false); - - /** - * Signed 32-bit integer - * - * @see Integer - */ - public static final int SINT32 = 5; - - /** - * Signed 32-bit integer unbounded array data type - * - * @see Integer - */ - public static final CIMDataType SINT32_ARRAY_T = new CIMDataType(SINT32, true); - - /** - * Signed 32-bit integer data type - * - * @see Integer - */ - public static final CIMDataType SINT32_T = new CIMDataType(SINT32, false); - - /** - * Signed 64-bit integer - */ - public static final int SINT64 = 7; - - /** - * Signed 64-bit integer unbounded array data type - * - * @see Long - */ - public static final CIMDataType SINT64_ARRAY_T = new CIMDataType(SINT64, true); - - /** - * Signed 64-bit integer data type - * - * @see Long - */ - public static final CIMDataType SINT64_T = new CIMDataType(SINT64, false); - - /** - * Signed 8-bit integer - * - * @see Byte - */ - public static final int SINT8 = 1; - - /** - * Signed 8-bit integer unbounded array data type - * - * @see Byte - */ - public static final CIMDataType SINT8_ARRAY_T = new CIMDataType(SINT8, true); - - /** - * Signed 8-bit integer data type - * - * @see Byte - */ - public static final CIMDataType SINT8_T = new CIMDataType(SINT8, false); - - /** - * UCS-2 string - * - * @see String - */ - public static final int STRING = 8; - - /** - * UCS-2 string unbounded array data type - * - * @see String - */ - public static final CIMDataType STRING_ARRAY_T = new CIMDataType(STRING, true); - - /** - * UCS-2 string data type - * - * @see String - */ - public static final CIMDataType STRING_T = new CIMDataType(STRING, false); - - /** - * Unsigned 16-bit integer - * - * @see UnsignedInteger16 - */ - public static final int UINT16 = 2; - - /** - * Unsigned 16-bit integer unbounded array data type - * - * @see UnsignedInteger16 - */ - public static final CIMDataType UINT16_ARRAY_T = new CIMDataType(UINT16, true); - - /** - * Unsigned 16-bit integer data type - * - * @see UnsignedInteger16 - */ - public static final CIMDataType UINT16_T = new CIMDataType(UINT16, false); - - /** - * Unsigned 32-bit integer - * - * @see UnsignedInteger32 - */ - public static final int UINT32 = 4; - - /** - * Unsigned 32-bit integer unbounded array data type - * - * @see UnsignedInteger32 - */ - public static final CIMDataType UINT32_ARRAY_T = new CIMDataType(UINT32, true); - - /** - * Unsigned 32-bit integer data type - * - * @see UnsignedInteger32 - */ - public static final CIMDataType UINT32_T = new CIMDataType(UINT32, false); - - /** - * Unsigned 64-bit integer - * - * @see UnsignedInteger64 - */ - public static final int UINT64 = 6; - - /** - * Unsigned 64-bit integer unbounded array data type - * - * @see UnsignedInteger64 - */ - public static final CIMDataType UINT64_ARRAY_T = new CIMDataType(UINT64, true); - - /** - * Unsigned 64-bit integer data type - * - * @see UnsignedInteger64 - */ - public static final CIMDataType UINT64_T = new CIMDataType(UINT64, false); - - /** - * Unsigned 8-bit integer - * - * @see UnsignedInteger8 - */ - public static final int UINT8 = 0; - - /** - * Unsigned 8-bit integer unbounded array data type - * - * @see UnsignedInteger8 - */ - public static final CIMDataType UINT8_ARRAY_T = new CIMDataType(UINT8, true); - - /** - * Unsigned 8-bit integer data type - * - * @see UnsignedInteger8 - */ - public static final CIMDataType UINT8_T = new CIMDataType(UINT8, false); - - private int iTypeCode; - - /** - * non array if <0
      - * unbounded if =0
      - * bounded if >0 - */ - private int iBound; - - private String iRefClassName; - - /** - * Sets the data type (non-array). - * - * @param pType - * The data type of the class. - */ - private void setType(int pType) { - this.iTypeCode = pType; - this.iBound = -1; - } - - /** - * Sets the data type (array). - * - * @param pType - * The data type of the class. - * @param pBound - * Array bounds or unbounded if zero. - * - */ - private void setType(int pType, int pBound) { - this.iTypeCode = pType; - this.iBound = pBound; - } - - /** - * Constructs a CIMDataType. - * - * @param pType - * The data type as defined in the CIM class. - * @param pIsArray - * true if data type is unbounded array, - * false if data type is scalar. - * @throws IllegalArgumentException - */ - public CIMDataType(int pType, boolean pIsArray) throws IllegalArgumentException { - if (pIsArray) { - setType(pType, 0); - } else { - setType(pType); - } - } - - /** - * Constructs a CIMDataType array object of the specified type - * and size. This should only be used when the size is being limited/defined - * as part of the data type. - * - * @param pType - * The data type as defined in the CIM class. - * @param pSize - * The maximum number of elements in the array. - * @throws IllegalArgumentException - * If the pSize value specified is not a positive - * integer. - */ - public CIMDataType(int pType, int pSize) throws IllegalArgumentException { - if (pSize <= 0) throw new IllegalArgumentException( - "Maximum number of elements must be positive integer!"); - setType(pType, pSize); - } - - /** - * Creates a new CIM REFERENCE data type object with the specified class - * reference. - * - * @param pClassName - * The CIM class reference name. - * @throws IllegalArgumentException - * If the pClassName is null. - */ - public CIMDataType(String pClassName) { - if (pClassName == null) throw new IllegalArgumentException("Class name must not be null!"); - setType(REFERENCE); - this.iRefClassName = pClassName; - } - - /** - * Creates a new CIM REFERENCE array data type object with the specified - * class reference. - * - * @param pClassName - * The CIM class reference name. - * @param pSize - * The size of the array. 0 indicates the array is unbounded. - * @throws IllegalArgumentException - * If the pClassName is null. - */ - public CIMDataType(String pClassName, int pSize) { - if (pClassName == null) throw new IllegalArgumentException("Class name must not be null!"); - if (pSize < 0) throw new IllegalArgumentException( - "Maximum number of elements cannot be negative integer!"); - setType(REFERENCE, pSize); - this.iRefClassName = pClassName; - } - - /** - * Checks that the specified CIMDataType is equal to this - * CIMDataType. - * - * @param pObj - * The object to compare. - * @return true if the specified object is equal to this - * CIMDataType; false otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (this == pObj) return true; - if (!(pObj instanceof CIMDataType)) return false; - CIMDataType that = (CIMDataType) pObj; - if (this.iRefClassName == null && that.iRefClassName != null) return false; - boolean refMatch = (this.iRefClassName == null ? true : this.iRefClassName - .equals(that.iRefClassName)); - return (this.iTypeCode == that.iTypeCode && isArray() == that.isArray() && refMatch); - } - - /** - * Get the data type of an object. - * - * @param pObj - * The object whose data type is to be returned. - * @return The data type of the specified object. - * @throws IllegalArgumentException - * If pObj is not a valid CIM Type. - */ - public static final CIMDataType getDataType(Object pObj) throws IllegalArgumentException { - if (pObj instanceof Byte) { return SINT8_T; } - if (pObj instanceof Byte[]) { return SINT8_ARRAY_T; } - if (pObj instanceof Short) { return SINT16_T; } - if (pObj instanceof Short[]) { return SINT16_ARRAY_T; } - if (pObj instanceof Integer) { return SINT32_T; } - if (pObj instanceof Integer[]) { return SINT32_ARRAY_T; } - if (pObj instanceof Long) { return SINT64_T; } - if (pObj instanceof Long[]) { return SINT64_ARRAY_T; } - if (pObj instanceof UnsignedInteger8) { return UINT8_T; } - if (pObj instanceof UnsignedInteger8[]) { return UINT8_ARRAY_T; } - if (pObj instanceof UnsignedInteger16) { return UINT16_T; } - if (pObj instanceof UnsignedInteger16[]) { return UINT16_ARRAY_T; } - if (pObj instanceof UnsignedInteger32) { return UINT32_T; } - if (pObj instanceof UnsignedInteger32[]) { return UINT32_ARRAY_T; } - if (pObj instanceof UnsignedInteger64) { return UINT64_T; } - if (pObj instanceof UnsignedInteger64[]) { return UINT64_ARRAY_T; } - if (pObj instanceof Boolean) { return BOOLEAN_T; } - if (pObj instanceof Boolean[]) { return BOOLEAN_ARRAY_T; } - if (pObj instanceof Character) { return CHAR16_T; } - if (pObj instanceof Character[]) { return CHAR16_ARRAY_T; } - if (pObj instanceof String) { return STRING_T; } - if (pObj instanceof String[]) { return STRING_ARRAY_T; } - if (pObj instanceof Float) { return REAL32_T; } - if (pObj instanceof Float[]) { return REAL32_ARRAY_T; } - if (pObj instanceof Double) { return REAL64_T; } - if (pObj instanceof Double[]) { return REAL64_ARRAY_T; } - if (pObj instanceof CIMDateTime) { return DATETIME_T; } - if (pObj instanceof CIMDateTime[]) { return DATETIME_ARRAY_T; } - if (pObj instanceof CIMClass) { return CLASS_T; } - if (pObj instanceof CIMClass[]) { return CLASS_ARRAY_T; } - if (pObj instanceof CIMInstance) { return OBJECT_T; } - if (pObj instanceof CIMInstance[]) { return OBJECT_ARRAY_T; } - if (pObj instanceof CIMObjectPath) { - CIMObjectPath op = (CIMObjectPath) pObj; - return new CIMDataType(op.getObjectName()); - } - if (pObj instanceof CIMObjectPath[]) { - CIMObjectPath[] ops = (CIMObjectPath[]) pObj; - for (int i = 0; i < ops.length; i++) - if (ops[i] != null) return new CIMDataType(ops[i].getObjectName(), 0); - } - // TODO: tracing - /* - * String msg= "Cannot determine the CIMDataType of class:"+ - * pObj.getClass().getName()+"!"; - */ - throw new IllegalArgumentException("Invalid CIM Type!"); - } - - /** - * Returns the class name of the CIM REFERENCE data type. - * - * @return The CIM REFERENCE class name. - */ - public String getRefClassName() { - return this.iRefClassName; - } - - /** - * Returns the size of the maximum number of elements an array data type may - * hold. - * - * @return The maximum size of the array data type. - */ - public int getSize() { - return this.iBound; - } - - /** - * Returns the data type. - * - * @return The data type. - */ - public int getType() { - return this.iTypeCode; - } - - /** - * Checks if the data type is an array type. - * - * @return true if the data type is an array type, - * false otherwise. - */ - public boolean isArray() { - return this.iBound >= 0; - } - - /** - * Returns a String representation of the - * CIMDataType. This method is intended to be used only for - * debugging purposes, and the format of the returned string may vary - * between implementations. The returned string may be empty but may not be - * null. - * - * @return A string representation of this data type. - */ - @Override - public String toString() { - return MOF.dataType(this); - } -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1663270 2007-02-19 ebak Minor performance problems + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1660756 2007-02-22 ebak Embedded object support + * 1669225 2007-04-16 lupusalex Ctor CIMDataType(int) shall be private + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2870455 2009-09-30 blaschke-oss Missing CLASS_ARRAY_T in CIMDataType + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 3004779 2010-06-16 blaschke-oss TCK: CIMDataType not throwing IllegalArgumentException + * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1 + * 3513349 2012-03-31 blaschke-oss TCK: CIMDataType must not accept null string + * 3517503 2012-04-13 blaschke-oss Missing parm in CIMDataType ctor javadoc + * 3521131 2012-04-24 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II + * 2632 2013-05-02 blaschke-oss Potential Null Point Exception in CIMDataType + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.io.Serializable; + +import org.metricshub.wbem.sblim.cimclient.internal.util.MOF; + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_02) on Sun Apr 22 15:31:53 EDT 2012 +/** + * This class represents a CIM data type as defined by the Distributed + * Management Task Force (DMTF) CIM + * Infrastructure Specification (DSP004). The specification only allows a set number of data types. This + * class defines the mapping of CIM data types to Java objects.
      + *
      + * Note: CIM allows the fixed size of an array as part of the data type. The + * predefined classes are unbounded.
      + *
      + * The following table shows the mapping of CIM data type to Java.
      + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
      CIM Data TypeJava Representation
      uint8UnsignedInteger8
      sint8Byte
      uint16UnsignedInteger16
      sint16Short
      uint32UnsignedInteger32
      sint32Integer
      uint64UnsignedInteger64
      sint64Long
      stringString
      booleanBoolean
      real32Float
      real64Double
      datetimeCIMDataTimeAbsolute
      + * CIMDataTimeInterval
      <classname> refCIMObjectPath
      char16Character
      mapping of CIM data type to Java
      + */ +public class CIMDataType extends Object implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * Boolean + * + * @see Boolean + */ + public static final int BOOLEAN = 9; + + /** + * Boolean unbounded array data type + * + * @see Boolean + */ + public static final CIMDataType BOOLEAN_ARRAY_T = new CIMDataType(BOOLEAN, true); + + /** + * Boolean data type + * + * @see Boolean + */ + public static final CIMDataType BOOLEAN_T = new CIMDataType(BOOLEAN, false); + + /** + * 16-bit UCS-2 character + * + * @see Character + */ + public static final int CHAR16 = 13; + + /** + * 16-bit UCS-2 character unbounded Array type + * + * @see Character + */ + public static final CIMDataType CHAR16_ARRAY_T = new CIMDataType(CHAR16, true); + + /** + * 16-bit UCS-2 character data type + * + * @see Character + */ + public static final CIMDataType CHAR16_T = new CIMDataType(CHAR16, false); + + /** + * CIMClass type + */ + public static final int CLASS = 17; + + /** + * CIMClass unbounded Array type + * + * @see CIMClass + */ + public static final CIMDataType CLASS_ARRAY_T = new CIMDataType(CLASS, true); + + /** + * CIMClass type + * + * @see CIMClass + */ + public static final CIMDataType CLASS_T = new CIMDataType(CLASS, false); + + /** + * A string containing the date-time + * + * @see CIMDateTimeInterval CIMDateTimeAbsolute + */ + public static final int DATETIME = 12; + + /** + * A date-time unbounded array data type + * + * @see CIMDateTimeInterval CIMDateTimeAbsolute + */ + public static final CIMDataType DATETIME_ARRAY_T = new CIMDataType(DATETIME, true); + + /** + * A date-time data type + * + * @see CIMDateTimeInterval CIMDateTimeAbsolute + */ + public static final CIMDataType DATETIME_T = new CIMDataType(DATETIME, false); + + /** + * Invalid type + */ + public static final int INVALID = -1; + + /** + * Invalid data type + */ + public static final CIMDataType INVALID_T = new CIMDataType(INVALID, false); + + /** + * Null type + */ + public static final int NULL = 16; + + /** + * CIMInstance type + * + * @see CIMInstance + */ + public static final int OBJECT = 15; + + /** + * CIMInstance unbounded Array type + * + * @see CIMInstance + */ + public static final CIMDataType OBJECT_ARRAY_T = new CIMDataType(OBJECT, true); + + /** + * CIMInstance type data type (Note: For CIMV2, this can only be used when + * the property has either an EmbeddedInstance or EmbeddedObject qualifier) + * + * @see CIMInstance + */ + public static final CIMDataType OBJECT_T = new CIMDataType(OBJECT, false); + + /** + * IEEE 4-byte floating-point + * + * @see Float + */ + public static final int REAL32 = 10; + + /** + * IEEE 4-byte floating-point unbounded array data type + * + * @see Float + */ + public static final CIMDataType REAL32_ARRAY_T = new CIMDataType(REAL32, true); + + /** + * IEEE 4-byte floating-point data type + * + * @see Float + */ + public static final CIMDataType REAL32_T = new CIMDataType(REAL32, false); + + /** + * IEEE 8-byte floating-point + * + * @see Double + */ + public static final int REAL64 = 11; + + /** + * IEEE 8-byte floating-point unbounded array data type + * + * @see Double + */ + public static final CIMDataType REAL64_ARRAY_T = new CIMDataType(REAL64, true); + + /** + * IEEE 8-byte floating-point data type + * + * @see Double + */ + public static final CIMDataType REAL64_T = new CIMDataType(REAL64, false); + + /** + * Reference type + * + * @see CIMObjectPath + */ + public static final int REFERENCE = 14; + + /** + * Signed 16-bit integer + * + * @see Short + */ + public static final int SINT16 = 3; + + /** + * Signed 16-bit integer unbounded array data type + * + * @see Short + */ + public static final CIMDataType SINT16_ARRAY_T = new CIMDataType(SINT16, true); + + /** + * Signed 16-bit integer data type + * + * @see Short + */ + public static final CIMDataType SINT16_T = new CIMDataType(SINT16, false); + + /** + * Signed 32-bit integer + * + * @see Integer + */ + public static final int SINT32 = 5; + + /** + * Signed 32-bit integer unbounded array data type + * + * @see Integer + */ + public static final CIMDataType SINT32_ARRAY_T = new CIMDataType(SINT32, true); + + /** + * Signed 32-bit integer data type + * + * @see Integer + */ + public static final CIMDataType SINT32_T = new CIMDataType(SINT32, false); + + /** + * Signed 64-bit integer + */ + public static final int SINT64 = 7; + + /** + * Signed 64-bit integer unbounded array data type + * + * @see Long + */ + public static final CIMDataType SINT64_ARRAY_T = new CIMDataType(SINT64, true); + + /** + * Signed 64-bit integer data type + * + * @see Long + */ + public static final CIMDataType SINT64_T = new CIMDataType(SINT64, false); + + /** + * Signed 8-bit integer + * + * @see Byte + */ + public static final int SINT8 = 1; + + /** + * Signed 8-bit integer unbounded array data type + * + * @see Byte + */ + public static final CIMDataType SINT8_ARRAY_T = new CIMDataType(SINT8, true); + + /** + * Signed 8-bit integer data type + * + * @see Byte + */ + public static final CIMDataType SINT8_T = new CIMDataType(SINT8, false); + + /** + * UCS-2 string + * + * @see String + */ + public static final int STRING = 8; + + /** + * UCS-2 string unbounded array data type + * + * @see String + */ + public static final CIMDataType STRING_ARRAY_T = new CIMDataType(STRING, true); + + /** + * UCS-2 string data type + * + * @see String + */ + public static final CIMDataType STRING_T = new CIMDataType(STRING, false); + + /** + * Unsigned 16-bit integer + * + * @see UnsignedInteger16 + */ + public static final int UINT16 = 2; + + /** + * Unsigned 16-bit integer unbounded array data type + * + * @see UnsignedInteger16 + */ + public static final CIMDataType UINT16_ARRAY_T = new CIMDataType(UINT16, true); + + /** + * Unsigned 16-bit integer data type + * + * @see UnsignedInteger16 + */ + public static final CIMDataType UINT16_T = new CIMDataType(UINT16, false); + + /** + * Unsigned 32-bit integer + * + * @see UnsignedInteger32 + */ + public static final int UINT32 = 4; + + /** + * Unsigned 32-bit integer unbounded array data type + * + * @see UnsignedInteger32 + */ + public static final CIMDataType UINT32_ARRAY_T = new CIMDataType(UINT32, true); + + /** + * Unsigned 32-bit integer data type + * + * @see UnsignedInteger32 + */ + public static final CIMDataType UINT32_T = new CIMDataType(UINT32, false); + + /** + * Unsigned 64-bit integer + * + * @see UnsignedInteger64 + */ + public static final int UINT64 = 6; + + /** + * Unsigned 64-bit integer unbounded array data type + * + * @see UnsignedInteger64 + */ + public static final CIMDataType UINT64_ARRAY_T = new CIMDataType(UINT64, true); + + /** + * Unsigned 64-bit integer data type + * + * @see UnsignedInteger64 + */ + public static final CIMDataType UINT64_T = new CIMDataType(UINT64, false); + + /** + * Unsigned 8-bit integer + * + * @see UnsignedInteger8 + */ + public static final int UINT8 = 0; + + /** + * Unsigned 8-bit integer unbounded array data type + * + * @see UnsignedInteger8 + */ + public static final CIMDataType UINT8_ARRAY_T = new CIMDataType(UINT8, true); + + /** + * Unsigned 8-bit integer data type + * + * @see UnsignedInteger8 + */ + public static final CIMDataType UINT8_T = new CIMDataType(UINT8, false); + + private int iTypeCode; + + /** + * non array if <0
      + * unbounded if =0
      + * bounded if >0 + */ + private int iBound; + + private String iRefClassName; + + /** + * Sets the data type (non-array). + * + * @param pType + * The data type of the class. + */ + private void setType(int pType) { + this.iTypeCode = pType; + this.iBound = -1; + } + + /** + * Sets the data type (array). + * + * @param pType + * The data type of the class. + * @param pBound + * Array bounds or unbounded if zero. + * + */ + private void setType(int pType, int pBound) { + this.iTypeCode = pType; + this.iBound = pBound; + } + + /** + * Constructs a CIMDataType. + * + * @param pType + * The data type as defined in the CIM class. + * @param pIsArray + * true if data type is unbounded array, + * false if data type is scalar. + * @throws IllegalArgumentException + */ + public CIMDataType(int pType, boolean pIsArray) throws IllegalArgumentException { + if (pIsArray) { + setType(pType, 0); + } else { + setType(pType); + } + } + + /** + * Constructs a CIMDataType array object of the specified type + * and size. This should only be used when the size is being limited/defined + * as part of the data type. + * + * @param pType + * The data type as defined in the CIM class. + * @param pSize + * The maximum number of elements in the array. + * @throws IllegalArgumentException + * If the pSize value specified is not a positive + * integer. + */ + public CIMDataType(int pType, int pSize) throws IllegalArgumentException { + if (pSize <= 0) throw new IllegalArgumentException( + "Maximum number of elements must be positive integer!"); + setType(pType, pSize); + } + + /** + * Creates a new CIM REFERENCE data type object with the specified class + * reference. + * + * @param pClassName + * The CIM class reference name. + * @throws IllegalArgumentException + * If the pClassName is null. + */ + public CIMDataType(String pClassName) { + if (pClassName == null) throw new IllegalArgumentException("Class name must not be null!"); + setType(REFERENCE); + this.iRefClassName = pClassName; + } + + /** + * Creates a new CIM REFERENCE array data type object with the specified + * class reference. + * + * @param pClassName + * The CIM class reference name. + * @param pSize + * The size of the array. 0 indicates the array is unbounded. + * @throws IllegalArgumentException + * If the pClassName is null. + */ + public CIMDataType(String pClassName, int pSize) { + if (pClassName == null) throw new IllegalArgumentException("Class name must not be null!"); + if (pSize < 0) throw new IllegalArgumentException( + "Maximum number of elements cannot be negative integer!"); + setType(REFERENCE, pSize); + this.iRefClassName = pClassName; + } + + /** + * Checks that the specified CIMDataType is equal to this + * CIMDataType. + * + * @param pObj + * The object to compare. + * @return true if the specified object is equal to this + * CIMDataType; false otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (this == pObj) return true; + if (!(pObj instanceof CIMDataType)) return false; + CIMDataType that = (CIMDataType) pObj; + if (this.iRefClassName == null && that.iRefClassName != null) return false; + boolean refMatch = (this.iRefClassName == null ? true : this.iRefClassName + .equals(that.iRefClassName)); + return (this.iTypeCode == that.iTypeCode && isArray() == that.isArray() && refMatch); + } + + /** + * Get the data type of an object. + * + * @param pObj + * The object whose data type is to be returned. + * @return The data type of the specified object. + * @throws IllegalArgumentException + * If pObj is not a valid CIM Type. + */ + public static final CIMDataType getDataType(Object pObj) throws IllegalArgumentException { + if (pObj instanceof Byte) { return SINT8_T; } + if (pObj instanceof Byte[]) { return SINT8_ARRAY_T; } + if (pObj instanceof Short) { return SINT16_T; } + if (pObj instanceof Short[]) { return SINT16_ARRAY_T; } + if (pObj instanceof Integer) { return SINT32_T; } + if (pObj instanceof Integer[]) { return SINT32_ARRAY_T; } + if (pObj instanceof Long) { return SINT64_T; } + if (pObj instanceof Long[]) { return SINT64_ARRAY_T; } + if (pObj instanceof UnsignedInteger8) { return UINT8_T; } + if (pObj instanceof UnsignedInteger8[]) { return UINT8_ARRAY_T; } + if (pObj instanceof UnsignedInteger16) { return UINT16_T; } + if (pObj instanceof UnsignedInteger16[]) { return UINT16_ARRAY_T; } + if (pObj instanceof UnsignedInteger32) { return UINT32_T; } + if (pObj instanceof UnsignedInteger32[]) { return UINT32_ARRAY_T; } + if (pObj instanceof UnsignedInteger64) { return UINT64_T; } + if (pObj instanceof UnsignedInteger64[]) { return UINT64_ARRAY_T; } + if (pObj instanceof Boolean) { return BOOLEAN_T; } + if (pObj instanceof Boolean[]) { return BOOLEAN_ARRAY_T; } + if (pObj instanceof Character) { return CHAR16_T; } + if (pObj instanceof Character[]) { return CHAR16_ARRAY_T; } + if (pObj instanceof String) { return STRING_T; } + if (pObj instanceof String[]) { return STRING_ARRAY_T; } + if (pObj instanceof Float) { return REAL32_T; } + if (pObj instanceof Float[]) { return REAL32_ARRAY_T; } + if (pObj instanceof Double) { return REAL64_T; } + if (pObj instanceof Double[]) { return REAL64_ARRAY_T; } + if (pObj instanceof CIMDateTime) { return DATETIME_T; } + if (pObj instanceof CIMDateTime[]) { return DATETIME_ARRAY_T; } + if (pObj instanceof CIMClass) { return CLASS_T; } + if (pObj instanceof CIMClass[]) { return CLASS_ARRAY_T; } + if (pObj instanceof CIMInstance) { return OBJECT_T; } + if (pObj instanceof CIMInstance[]) { return OBJECT_ARRAY_T; } + if (pObj instanceof CIMObjectPath) { + CIMObjectPath op = (CIMObjectPath) pObj; + return new CIMDataType(op.getObjectName()); + } + if (pObj instanceof CIMObjectPath[]) { + CIMObjectPath[] ops = (CIMObjectPath[]) pObj; + for (int i = 0; i < ops.length; i++) + if (ops[i] != null) return new CIMDataType(ops[i].getObjectName(), 0); + } + // TODO: tracing + /* + * String msg= "Cannot determine the CIMDataType of class:"+ + * pObj.getClass().getName()+"!"; + */ + throw new IllegalArgumentException("Invalid CIM Type!"); + } + + /** + * Returns the class name of the CIM REFERENCE data type. + * + * @return The CIM REFERENCE class name. + */ + public String getRefClassName() { + return this.iRefClassName; + } + + /** + * Returns the size of the maximum number of elements an array data type may + * hold. + * + * @return The maximum size of the array data type. + */ + public int getSize() { + return this.iBound; + } + + /** + * Returns the data type. + * + * @return The data type. + */ + public int getType() { + return this.iTypeCode; + } + + /** + * Checks if the data type is an array type. + * + * @return true if the data type is an array type, + * false otherwise. + */ + public boolean isArray() { + return this.iBound >= 0; + } + + /** + * Returns a String representation of the + * CIMDataType. This method is intended to be used only for + * debugging purposes, and the format of the returned string may vary + * between implementations. The returned string may be empty but may not be + * null. + * + * @return A string representation of this data type. + */ + @Override + public String toString() { + return MOF.dataType(this); + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDateTime.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java similarity index 84% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDateTime.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java index 9e4612f..1c44ded 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDateTime.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java @@ -1,137 +1,135 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2204488 2008-10-28 raman_arora Fix code to remove compiler warnings - * 2227442 2008-11-05 blaschke-oss Add missing serialVersionUID - * 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) - * 2795671 2009-05-22 raman_arora Add Type to Comparable - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.io.Serializable; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 -/** - * This abstract class represents a CIM Datetime data type as defined by the - * Distributed Management Task Force (DMTF) CIM - * Infrastructure Specification (DSP004). It is in the format yyyyMMddHHmmss.SSSSSSsutc where: - *
        - *
      • yyyy - is a 4 digit year
        • - *
      • MM - is the month
        • - *
      • dd - is the day of the month
        • - *
      • HH - is the hour (24 hour clock)
        • - *
      • mm - is the minute
        • - *
      • ss - is the second
        • - *
      • SSSSSS - is the number of microseconds
        • - *
      • s - is "+" or "-", indicating the sign of the UTC (Universal Coordinated - * Time; for all intents and purposes the same as Greenwich Mean Time) - * correction field, or a ":". In the case of a ":" the value is interpreted as - * a time interval, and yyyyMM are interpreted as days.
        • - *
      • utc - is the offset from UTC in minutes (using the sign indicated by s). - * It is ignored for a time interval.
        • - *
      - * - * For example, the absolute datetime for Monday, May 25, 1998, at 1:30 PM EST - * would be represented as: 19980525133015.000000-300. Values must be - * zero-padded so that the entire string is always the same 25-character length. - * Fields which are not significant must be replaced with asterisk characters. - * Similarly, intervals use the same format, except that the interpretation of - * the fields is based on elapsed time.
      - * For example, the interval datetime for an elapsed time of 1 day, 13 hours, 23 - * minutes, 12 seconds would be: 00000001132312.000000:000. A UTC offset of zero - * is always used for interval properties. - */ -public abstract class CIMDateTime extends Object implements Serializable, Comparable { - - private static final long serialVersionUID = 3424668043014662166L; - - /** - * Creates a CIMDateTime object using a string. - * - * @param pDateString - * A string in the format of yyyyMMddHHmmss.SSSSSSsutc. - * @throws IllegalArgumentException - * If string is not in the correct format. - */ - public CIMDateTime(String pDateString) throws IllegalArgumentException { - // FIXME: what to do here? - } - - protected CIMDateTime() { - // FIXME: what to do here? - } - - /** - * Determines whether the CIMDateTime that is passed in is - * equal to the current CIMDateTime object. - * - * @param pObj - * The CIMDateTime object to compare to. - * @return true if this CIMDateTime object is equal to the one - * that was passed in, otherwise false. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMDateTime)) return false; - CIMDateTime that = (CIMDateTime) pObj; - return getDateTimeString().equals(that.getDateTimeString()); - } - - /** - * Gets the internal string representation of this object. - * - * @return The internal representation of the CIMDateTime - * object. - */ - public abstract String getDateTimeString(); - - /** - * Returns the hash code for this object. - * - * @return A hash code value for this object. - * @see java.lang.Object#hashCode() - */ - @Override - public abstract int hashCode(); -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2204488 2008-10-28 raman_arora Fix code to remove compiler warnings + * 2227442 2008-11-05 blaschke-oss Add missing serialVersionUID + * 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) + * 2795671 2009-05-22 raman_arora Add Type to Comparable + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.io.Serializable; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 +/** + * This abstract class represents a CIM Datetime data type as defined by the + * Distributed Management Task Force (DMTF) CIM + * Infrastructure Specification (DSP004). It is in the format yyyyMMddHHmmss.SSSSSSsutc where: + *
        + *
      • yyyy - is a 4 digit year
        • + *
      • MM - is the month
        • + *
      • dd - is the day of the month
        • + *
      • HH - is the hour (24 hour clock)
        • + *
      • mm - is the minute
        • + *
      • ss - is the second
        • + *
      • SSSSSS - is the number of microseconds
        • + *
      • s - is "+" or "-", indicating the sign of the UTC (Universal Coordinated + * Time; for all intents and purposes the same as Greenwich Mean Time) + * correction field, or a ":". In the case of a ":" the value is interpreted as + * a time interval, and yyyyMM are interpreted as days.
        • + *
      • utc - is the offset from UTC in minutes (using the sign indicated by s). + * It is ignored for a time interval.
        • + *
      + * + * For example, the absolute datetime for Monday, May 25, 1998, at 1:30 PM EST + * would be represented as: 19980525133015.000000-300. Values must be + * zero-padded so that the entire string is always the same 25-character length. + * Fields which are not significant must be replaced with asterisk characters. + * Similarly, intervals use the same format, except that the interpretation of + * the fields is based on elapsed time.
      + * For example, the interval datetime for an elapsed time of 1 day, 13 hours, 23 + * minutes, 12 seconds would be: 00000001132312.000000:000. A UTC offset of zero + * is always used for interval properties. + */ +public abstract class CIMDateTime extends Object implements Serializable, Comparable { + + private static final long serialVersionUID = 3424668043014662166L; + + /** + * Creates a CIMDateTime object using a string. + * + * @param pDateString + * A string in the format of yyyyMMddHHmmss.SSSSSSsutc. + * @throws IllegalArgumentException + * If string is not in the correct format. + */ + public CIMDateTime(String pDateString) throws IllegalArgumentException { + // FIXME: what to do here? + } + + protected CIMDateTime() { + // FIXME: what to do here? + } + + /** + * Determines whether the CIMDateTime that is passed in is + * equal to the current CIMDateTime object. + * + * @param pObj + * The CIMDateTime object to compare to. + * @return true if this CIMDateTime object is equal to the one + * that was passed in, otherwise false. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMDateTime)) return false; + CIMDateTime that = (CIMDateTime) pObj; + return getDateTimeString().equals(that.getDateTimeString()); + } + + /** + * Gets the internal string representation of this object. + * + * @return The internal representation of the CIMDateTime + * object. + */ + public abstract String getDateTimeString(); + + /** + * Returns the hash code for this object. + * + * @return A hash code value for this object. + * @see java.lang.Object#hashCode() + */ + @Override + public abstract int hashCode(); +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDateTimeAbsolute.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeAbsolute.java similarity index 91% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDateTimeAbsolute.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeAbsolute.java index e54ee6d..510a514 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDateTimeAbsolute.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeAbsolute.java @@ -1,404 +1,402 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1678807 2007-03-12 ebak Minor CIMDateTime suggestions - * 1931621 2008-04-02 blaschke-oss CIMDateTimeAbsolute(Calendar) does not respect DST - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 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) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2795671 2009-05-22 raman_arora Add Type to Comparable - * 2806362 2009-06-14 blaschke-oss Missing new CIMDateTimeAbsolute.getUTCOffset() method - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2944826 2010-02-08 blaschke-oss getUTCOffset() incorrect if not significant field - * 2973300 2010-03-19 blaschke-oss TCK: CIMDateTimeXXX.compareTo() does not handle null - * 3022501 2010-06-30 blaschke-oss Possible integer overflow in getTotalUSec - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - * 2674 2013-09-26 blaschke-oss Null pointer exception in CIMDateTime(String) - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.util.Calendar; - -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.DTStringReader; -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.DTStringWriter; - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * This class represents the datetime data type when used as a time value as - * specified in the CIM Infrastructure specification. It is in the format - * yyyyMMddHHmmss.SSSSSSsutc where: - *
        - *
      • yyyy - is a 4 digit year
        • - *
      • MM - is the month
        • - *
      • dd - is the day of the month
        • - *
      • HH - is the hour (24 hour clock)
        • - *
      • mm - is the minute
        • - *
      • ss - is the second
        • - *
      • SSSSSS - is the number of microseconds
        • - *
      • s - is "+" or "-", indicating the sign of the UTC (Universal Coordinated - * Time; for all intents and purposes the same as Greenwich Mean Time)
        • - *
      • utc - is the offset from UTC in minutes (using the sign indicated by s).
        • - *
      - * For example Monday, May 25, 1998, at 1:30 PM EST would be represented as: - * 19980525133015.000000-300. Values must be zero-padded so that the entire - * string is always the same 25-character length. Fields which are not - * significant must be replaced with asterisk characters. - */ -public class CIMDateTimeAbsolute extends CIMDateTime { - - private static final long serialVersionUID = 7556792806296945178l; - - private int iYear, iMonth, iDay, iHour, iMin, iSec, iUSec, iUtc; - - private boolean iUnsignificantUtc; - - private String iStr; - - /** - * Create a CIMDateTimeAbsolute object using the current - * Time/Date of the system. - */ - public CIMDateTimeAbsolute() { - set(Calendar.getInstance()); - } - - /** - * Create a CIMDateTimeAbsolute object using a - * Calendar object. - * - * @param pCalendar - * A Calendar object used to initialize this object. - * @throws IllegalArgumentException - * If Calendar object is null. - */ - public CIMDateTimeAbsolute(Calendar pCalendar) throws IllegalArgumentException { - if (pCalendar == null) throw new IllegalArgumentException("Null Calendar is not allowed!"); - if (pCalendar.get(Calendar.YEAR) > 9999) throw new IllegalArgumentException( - "The year field cannot be greater than 9999!"); - set(pCalendar); - } - - /** - * Creates a CIMDateTimeAbsolute object using a string. - * - * @param pDateTime - * A string in the format of yyyyMMddHHmmss.SSSSSSsutc. - * @throws IllegalArgumentException - * If string is not in the correct format or null. - */ - public CIMDateTimeAbsolute(String pDateTime) throws IllegalArgumentException { - if (pDateTime == null) throw new IllegalArgumentException("Null DateTime is not allowed!"); - DTStringReader reader = new DTStringReader(pDateTime); - this.iYear = reader.readAndCheck(4, "year", 0, 9999, true); - this.iMonth = reader.readAndCheck(2, "month", 1, 12, true); - this.iDay = reader.readAndCheck(2, "day", 1, 31, true); - this.iHour = reader.readAndCheck(2, "hour", 0, 23, true); - this.iMin = reader.readAndCheck(2, "minute", 0, 59, true); - this.iSec = reader.readAndCheck(2, "second", 0, 59, true); - reader.read('.'); - this.iUSec = reader.readAndCheck(6, "microSeconds", 0, 999999, true); - char sign = reader.read(); - if (sign != '+' && sign != '-') { - String msg = "Illegal character '" + sign + "' at position " + reader.getPos() - + "! '+' or '-' is expected."; - throw new IllegalArgumentException(msg); - } - this.iUtc = reader.read(3, "utc", true); - if (reader.isUnsignificant()) { - this.iUnsignificantUtc = true; - } else if (sign == '-') { - this.iUtc = -this.iUtc; - } - if (reader.read() != 0) throw new IllegalArgumentException("Extra character at the end of " - + pDateTime + " !"); - this.iStr = pDateTime; - } - - /** - * Compares the CIMDateTimeAbsolute object with this one. If - * either date has "Not Significant" fields then we can only compare the - * significant fields. - * - * @param pDateTime - * The CIMDateTimeAbsolute to be compared with this - * one. - * @return -1, zero, or 1 as this date is less than, equal to, or greater - * than the specified date. - * @throws IllegalArgumentException - * If the object passed in is not an instance of - * CIMDataTimeAbsolute. - */ - public int compareTo(CIMDateTime pDateTime) throws IllegalArgumentException { - if (!(pDateTime instanceof CIMDateTimeAbsolute)) { - String msg = "pDateTime must be a CIMDateTimeAbsolute instance while it is a " - + (pDateTime == null ? "null!" : pDateTime.getClass().getName() + " instance!"); - throw new IllegalArgumentException(msg); - } - - CIMDateTimeAbsolute that = (CIMDateTimeAbsolute) pDateTime; - /* - * Comparison: 1. building Calendars from both dates. If a field is not - * significant it and it's corresponding pair is cleared. - */ - int mask = getMask() & that.getMask(); - long thisMicros = getTotalUSec(mask); - long thatMicros = that.getTotalUSec(mask); - long val = thisMicros - thatMicros; - if (val == 0) return 0; - return val < 0 ? -1 : 1; - } - - /** - * Gets the internal string representation of the date/time object. - * - * @return The internal representation of the date/time object. - */ - @Override - public String getDateTimeString() { - if (this.iStr != null) return this.iStr; - // yyyyMMddHHmmss.uuuuuuSutc - DTStringWriter dTWriter = new DTStringWriter(); - dTWriter.write(4, this.iYear); - dTWriter.write(2, this.iMonth); - dTWriter.write(2, this.iDay); - dTWriter.write(2, this.iHour); - dTWriter.write(2, this.iMin); - dTWriter.write(2, this.iSec); - dTWriter.write('.'); - dTWriter.write(6, this.iUSec); - if (this.iUnsignificantUtc) dTWriter.write("+***"); - else dTWriter.writeSigned(3, this.iUtc); - return this.iStr = dTWriter.toString(); - } - - /** - * Returns day value of this date. - * - * @return If day field "not significant" this returns -1, otherwise returns - * day of this date. - */ - public int getDay() { - return this.iDay; - } - - /** - * Returns hour value of this date. - * - * @return If hour field "not significant" this returns -1, otherwise - * returns hour of this date. - */ - public int getHour() { - return this.iHour; - } - - /** - * Returns microsecond value of this date. - * - * @return If microsecond field "not significant" this returns -1, otherwise - * returns microseconds of this date. - */ - public int getMicrosecond() { - return this.iUSec; - } - - /** - * Returns minute value of this date. - * - * @return If minute field "not significant" this returns -1, otherwise - * returns minute of this date. - */ - public int getMinute() { - return this.iMin; - } - - /** - * Returns month value of this date. - * - * @return If month field "not significant" this returns -1, otherwise - * returns the month of this date. - */ - public int getMonth() { - return this.iMonth; - } - - /** - * Returns second value of this date. - * - * @return If second field "not significant" this returns -1, otherwise - * returns second of this date. - */ - public int getSecond() { - return this.iSec; - } - - /** - * Returns UTC offset value of this date. - * - * @return UTC offset of this date. - */ - public int getUTCOffset() { - return this.iUnsignificantUtc ? -1 : this.iUtc; - } - - /** - * Returns year value of this Date. - * - * @return If year field "not significant" this returns -1, otherwise - * returns the year of this date. - */ - public int getYear() { - return this.iYear; - } - - /** - * Returns the hash code for this object. - * - * @return A hash code value for this object. - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return getDateTimeString().hashCode(); - } - - /** - * Returns a String representation of the - * CIMDateTimeAbsolute. This method is intended to be used only - * for debugging purposes, and the format of the returned string may vary - * between implementations. The returned string may be empty but may not be - * null. - * - * @return String representation of this datetime. - */ - @Override - public String toString() { - return getDateTimeString(); - } - - private static final int YEAR = 1, MONTH = 2, DAY = 4, HOUR = 8, MIN = 16, SEC = 32, USEC = 64, - UTC = 128; - - /** - * Get mask of this CIMDateTimeAbsolute where bit is set if the - * corresponding field is significant or clear if it is not significant. - * - * @return Mask of significant fields in datetime object. - */ - private int getMask() { - int mask = 0; - if (this.iYear != -1) mask |= YEAR; - if (this.iMonth != -1) mask |= MONTH; - if (this.iDay != -1) mask |= DAY; - if (this.iHour != -1) mask |= HOUR; - if (this.iMin != -1) mask |= MIN; - if (this.iSec != -1) mask |= SEC; - if (this.iUSec != -1) mask |= USEC; - if (!this.iUnsignificantUtc) mask |= UTC; - return mask; - } - - /** - * Get value of a field based on mask. - * - * @param pMask - * Mask of significant fields. - * @param pField - * Field. - * @param pValue - * Value of field. - * @param pInitValue - * Initial value of field. - * @return Value of field if field significant, otherwise initial value. - */ - private int mask(int pMask, int pField, int pValue, int pInitValue) { - return ((pMask & pField) > 0) ? pValue : pInitValue; - } - - /** - * Get total microseconds of CIMDateTimeAbsolute object where - * only significant fields are used in calculation. - * - * @param pMask - * Mask of significant fields. - * @return Total microseconds of significant fields in datetime. - */ - private long getTotalUSec(int pMask) { - Calendar cal = Calendar.getInstance(); - cal.set(Calendar.YEAR, mask(pMask, YEAR, this.iYear, 0)); - cal.set(Calendar.MONTH, mask(pMask, MONTH, this.iMonth - 1, 0)); - cal.set(Calendar.DAY_OF_MONTH, mask(pMask, DAY, this.iDay, 1)); - cal.set(Calendar.HOUR_OF_DAY, mask(pMask, HOUR, this.iHour, 0)); - cal.set(Calendar.MINUTE, mask(pMask, MIN, this.iMin, 0)); - cal.set(Calendar.SECOND, mask(pMask, SEC, this.iSec, 0)); - int millis = this.iUSec / 1000, micros = this.iUSec % 1000; - cal.set(Calendar.MILLISECOND, mask(pMask, USEC, millis, 0)); - long totalMicros = cal.getTimeInMillis() * 1000; - if ((pMask & USEC) > 0) totalMicros += micros; - /* - * UTC is added to the calculated micros - */ - if ((pMask & UTC) > 0) totalMicros += this.iUtc * 60000000L; - return totalMicros; - } - - /** - * Initializes this CIMDateTimeAbsolute object from the - * Calendar passed in. - * - * @param pCal - * Calendar object. - */ - private void set(Calendar pCal) { - this.iYear = pCal.get(Calendar.YEAR); - this.iMonth = pCal.get(Calendar.MONTH) + 1; - this.iDay = pCal.get(Calendar.DAY_OF_MONTH); - this.iHour = pCal.get(Calendar.HOUR_OF_DAY); - this.iMin = pCal.get(Calendar.MINUTE); - this.iSec = pCal.get(Calendar.SECOND); - this.iUSec = pCal.get(Calendar.MILLISECOND) * 1000; - if (pCal.getTimeZone().inDaylightTime(pCal.getTime())) { - this.iUtc = (pCal.get(Calendar.ZONE_OFFSET) + pCal.get(Calendar.DST_OFFSET)) / 60000; - } else { - this.iUtc = pCal.get(Calendar.ZONE_OFFSET) / 60000; - } - } - -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1678807 2007-03-12 ebak Minor CIMDateTime suggestions + * 1931621 2008-04-02 blaschke-oss CIMDateTimeAbsolute(Calendar) does not respect DST + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 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) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2795671 2009-05-22 raman_arora Add Type to Comparable + * 2806362 2009-06-14 blaschke-oss Missing new CIMDateTimeAbsolute.getUTCOffset() method + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2944826 2010-02-08 blaschke-oss getUTCOffset() incorrect if not significant field + * 2973300 2010-03-19 blaschke-oss TCK: CIMDateTimeXXX.compareTo() does not handle null + * 3022501 2010-06-30 blaschke-oss Possible integer overflow in getTotalUSec + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + * 2674 2013-09-26 blaschke-oss Null pointer exception in CIMDateTime(String) + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.util.Calendar; + +import org.metricshub.wbem.sblim.cimclient.internal.cim.DTStringReader; +import org.metricshub.wbem.sblim.cimclient.internal.cim.DTStringWriter; + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * This class represents the datetime data type when used as a time value as + * specified in the CIM Infrastructure specification. It is in the format + * yyyyMMddHHmmss.SSSSSSsutc where: + *
        + *
      • yyyy - is a 4 digit year
        • + *
      • MM - is the month
        • + *
      • dd - is the day of the month
        • + *
      • HH - is the hour (24 hour clock)
        • + *
      • mm - is the minute
        • + *
      • ss - is the second
        • + *
      • SSSSSS - is the number of microseconds
        • + *
      • s - is "+" or "-", indicating the sign of the UTC (Universal Coordinated + * Time; for all intents and purposes the same as Greenwich Mean Time)
        • + *
      • utc - is the offset from UTC in minutes (using the sign indicated by s).
        • + *
      + * For example Monday, May 25, 1998, at 1:30 PM EST would be represented as: + * 19980525133015.000000-300. Values must be zero-padded so that the entire + * string is always the same 25-character length. Fields which are not + * significant must be replaced with asterisk characters. + */ +public class CIMDateTimeAbsolute extends CIMDateTime { + + private static final long serialVersionUID = 7556792806296945178l; + + private int iYear, iMonth, iDay, iHour, iMin, iSec, iUSec, iUtc; + + private boolean iUnsignificantUtc; + + private String iStr; + + /** + * Create a CIMDateTimeAbsolute object using the current + * Time/Date of the system. + */ + public CIMDateTimeAbsolute() { + set(Calendar.getInstance()); + } + + /** + * Create a CIMDateTimeAbsolute object using a + * Calendar object. + * + * @param pCalendar + * A Calendar object used to initialize this object. + * @throws IllegalArgumentException + * If Calendar object is null. + */ + public CIMDateTimeAbsolute(Calendar pCalendar) throws IllegalArgumentException { + if (pCalendar == null) throw new IllegalArgumentException("Null Calendar is not allowed!"); + if (pCalendar.get(Calendar.YEAR) > 9999) throw new IllegalArgumentException( + "The year field cannot be greater than 9999!"); + set(pCalendar); + } + + /** + * Creates a CIMDateTimeAbsolute object using a string. + * + * @param pDateTime + * A string in the format of yyyyMMddHHmmss.SSSSSSsutc. + * @throws IllegalArgumentException + * If string is not in the correct format or null. + */ + public CIMDateTimeAbsolute(String pDateTime) throws IllegalArgumentException { + if (pDateTime == null) throw new IllegalArgumentException("Null DateTime is not allowed!"); + DTStringReader reader = new DTStringReader(pDateTime); + this.iYear = reader.readAndCheck(4, "year", 0, 9999, true); + this.iMonth = reader.readAndCheck(2, "month", 1, 12, true); + this.iDay = reader.readAndCheck(2, "day", 1, 31, true); + this.iHour = reader.readAndCheck(2, "hour", 0, 23, true); + this.iMin = reader.readAndCheck(2, "minute", 0, 59, true); + this.iSec = reader.readAndCheck(2, "second", 0, 59, true); + reader.read('.'); + this.iUSec = reader.readAndCheck(6, "microSeconds", 0, 999999, true); + char sign = reader.read(); + if (sign != '+' && sign != '-') { + String msg = "Illegal character '" + sign + "' at position " + reader.getPos() + + "! '+' or '-' is expected."; + throw new IllegalArgumentException(msg); + } + this.iUtc = reader.read(3, "utc", true); + if (reader.isUnsignificant()) { + this.iUnsignificantUtc = true; + } else if (sign == '-') { + this.iUtc = -this.iUtc; + } + if (reader.read() != 0) throw new IllegalArgumentException("Extra character at the end of " + + pDateTime + " !"); + this.iStr = pDateTime; + } + + /** + * Compares the CIMDateTimeAbsolute object with this one. If + * either date has "Not Significant" fields then we can only compare the + * significant fields. + * + * @param pDateTime + * The CIMDateTimeAbsolute to be compared with this + * one. + * @return -1, zero, or 1 as this date is less than, equal to, or greater + * than the specified date. + * @throws IllegalArgumentException + * If the object passed in is not an instance of + * CIMDataTimeAbsolute. + */ + public int compareTo(CIMDateTime pDateTime) throws IllegalArgumentException { + if (!(pDateTime instanceof CIMDateTimeAbsolute)) { + String msg = "pDateTime must be a CIMDateTimeAbsolute instance while it is a " + + (pDateTime == null ? "null!" : pDateTime.getClass().getName() + " instance!"); + throw new IllegalArgumentException(msg); + } + + CIMDateTimeAbsolute that = (CIMDateTimeAbsolute) pDateTime; + /* + * Comparison: 1. building Calendars from both dates. If a field is not + * significant it and it's corresponding pair is cleared. + */ + int mask = getMask() & that.getMask(); + long thisMicros = getTotalUSec(mask); + long thatMicros = that.getTotalUSec(mask); + long val = thisMicros - thatMicros; + if (val == 0) return 0; + return val < 0 ? -1 : 1; + } + + /** + * Gets the internal string representation of the date/time object. + * + * @return The internal representation of the date/time object. + */ + @Override + public String getDateTimeString() { + if (this.iStr != null) return this.iStr; + // yyyyMMddHHmmss.uuuuuuSutc + DTStringWriter dTWriter = new DTStringWriter(); + dTWriter.write(4, this.iYear); + dTWriter.write(2, this.iMonth); + dTWriter.write(2, this.iDay); + dTWriter.write(2, this.iHour); + dTWriter.write(2, this.iMin); + dTWriter.write(2, this.iSec); + dTWriter.write('.'); + dTWriter.write(6, this.iUSec); + if (this.iUnsignificantUtc) dTWriter.write("+***"); + else dTWriter.writeSigned(3, this.iUtc); + return this.iStr = dTWriter.toString(); + } + + /** + * Returns day value of this date. + * + * @return If day field "not significant" this returns -1, otherwise returns + * day of this date. + */ + public int getDay() { + return this.iDay; + } + + /** + * Returns hour value of this date. + * + * @return If hour field "not significant" this returns -1, otherwise + * returns hour of this date. + */ + public int getHour() { + return this.iHour; + } + + /** + * Returns microsecond value of this date. + * + * @return If microsecond field "not significant" this returns -1, otherwise + * returns microseconds of this date. + */ + public int getMicrosecond() { + return this.iUSec; + } + + /** + * Returns minute value of this date. + * + * @return If minute field "not significant" this returns -1, otherwise + * returns minute of this date. + */ + public int getMinute() { + return this.iMin; + } + + /** + * Returns month value of this date. + * + * @return If month field "not significant" this returns -1, otherwise + * returns the month of this date. + */ + public int getMonth() { + return this.iMonth; + } + + /** + * Returns second value of this date. + * + * @return If second field "not significant" this returns -1, otherwise + * returns second of this date. + */ + public int getSecond() { + return this.iSec; + } + + /** + * Returns UTC offset value of this date. + * + * @return UTC offset of this date. + */ + public int getUTCOffset() { + return this.iUnsignificantUtc ? -1 : this.iUtc; + } + + /** + * Returns year value of this Date. + * + * @return If year field "not significant" this returns -1, otherwise + * returns the year of this date. + */ + public int getYear() { + return this.iYear; + } + + /** + * Returns the hash code for this object. + * + * @return A hash code value for this object. + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + return getDateTimeString().hashCode(); + } + + /** + * Returns a String representation of the + * CIMDateTimeAbsolute. This method is intended to be used only + * for debugging purposes, and the format of the returned string may vary + * between implementations. The returned string may be empty but may not be + * null. + * + * @return String representation of this datetime. + */ + @Override + public String toString() { + return getDateTimeString(); + } + + private static final int YEAR = 1, MONTH = 2, DAY = 4, HOUR = 8, MIN = 16, SEC = 32, USEC = 64, + UTC = 128; + + /** + * Get mask of this CIMDateTimeAbsolute where bit is set if the + * corresponding field is significant or clear if it is not significant. + * + * @return Mask of significant fields in datetime object. + */ + private int getMask() { + int mask = 0; + if (this.iYear != -1) mask |= YEAR; + if (this.iMonth != -1) mask |= MONTH; + if (this.iDay != -1) mask |= DAY; + if (this.iHour != -1) mask |= HOUR; + if (this.iMin != -1) mask |= MIN; + if (this.iSec != -1) mask |= SEC; + if (this.iUSec != -1) mask |= USEC; + if (!this.iUnsignificantUtc) mask |= UTC; + return mask; + } + + /** + * Get value of a field based on mask. + * + * @param pMask + * Mask of significant fields. + * @param pField + * Field. + * @param pValue + * Value of field. + * @param pInitValue + * Initial value of field. + * @return Value of field if field significant, otherwise initial value. + */ + private int mask(int pMask, int pField, int pValue, int pInitValue) { + return ((pMask & pField) > 0) ? pValue : pInitValue; + } + + /** + * Get total microseconds of CIMDateTimeAbsolute object where + * only significant fields are used in calculation. + * + * @param pMask + * Mask of significant fields. + * @return Total microseconds of significant fields in datetime. + */ + private long getTotalUSec(int pMask) { + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.YEAR, mask(pMask, YEAR, this.iYear, 0)); + cal.set(Calendar.MONTH, mask(pMask, MONTH, this.iMonth - 1, 0)); + cal.set(Calendar.DAY_OF_MONTH, mask(pMask, DAY, this.iDay, 1)); + cal.set(Calendar.HOUR_OF_DAY, mask(pMask, HOUR, this.iHour, 0)); + cal.set(Calendar.MINUTE, mask(pMask, MIN, this.iMin, 0)); + cal.set(Calendar.SECOND, mask(pMask, SEC, this.iSec, 0)); + int millis = this.iUSec / 1000, micros = this.iUSec % 1000; + cal.set(Calendar.MILLISECOND, mask(pMask, USEC, millis, 0)); + long totalMicros = cal.getTimeInMillis() * 1000; + if ((pMask & USEC) > 0) totalMicros += micros; + /* + * UTC is added to the calculated micros + */ + if ((pMask & UTC) > 0) totalMicros += this.iUtc * 60000000L; + return totalMicros; + } + + /** + * Initializes this CIMDateTimeAbsolute object from the + * Calendar passed in. + * + * @param pCal + * Calendar object. + */ + private void set(Calendar pCal) { + this.iYear = pCal.get(Calendar.YEAR); + this.iMonth = pCal.get(Calendar.MONTH) + 1; + this.iDay = pCal.get(Calendar.DAY_OF_MONTH); + this.iHour = pCal.get(Calendar.HOUR_OF_DAY); + this.iMin = pCal.get(Calendar.MINUTE); + this.iSec = pCal.get(Calendar.SECOND); + this.iUSec = pCal.get(Calendar.MILLISECOND) * 1000; + if (pCal.getTimeZone().inDaylightTime(pCal.getTime())) { + this.iUtc = (pCal.get(Calendar.ZONE_OFFSET) + pCal.get(Calendar.DST_OFFSET)) / 60000; + } else { + this.iUtc = pCal.get(Calendar.ZONE_OFFSET) / 60000; + } + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDateTimeInterval.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeInterval.java similarity index 93% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDateTimeInterval.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeInterval.java index 4488470..d36ea4f 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMDateTimeInterval.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeInterval.java @@ -1,565 +1,563 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1678807 2007-03-12 ebak Minor CIMDateTime suggestions - * 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) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors - * 2795671 2009-05-22 raman_arora Add Type to Comparable - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2944830 2010-02-08 blaschke-oss Fix spelling of checkGranurality() - * 2973300 2010-03-19 blaschke-oss TCK: CIMDateTimeXXX.compareTo() does not handle null - * 2989367 2010-04-29 blaschke-oss CIMDateTimeInterval(long) constructor range wrong - * 2989424 2010-04-29 blaschke-oss TCK: CIMDateTimeInterval constructor - * 2992349 2010-04-29 blaschke-oss CIMDateTimeInterval hr/min/sec max is 23/59/59, not 24/60/60 - * 2994249 2010-04-30 blaschke-oss CIMDateTimeInterval(long) calculates milliseconds - * 3018178 2010-06-18 blaschke-oss CIMDateTimeInterval clean up - * 3026302 2010-07-07 blaschke-oss CIMDateTimeInterval uses # constructor instead of valueOf - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - * 2674 2013-09-26 blaschke-oss Null pointer exception in CIMDateTime(String) - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.DTStringReader; -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.DTStringWriter; - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * This class represents the datetime data type when used as a time value as - * specified by the Distributed Management Task Force (DMTF) CIM Infrastructure Specification (DSP004). It is in the format ddddddddHHMMSS.mmmmmm:000 where: - *
        - *
      • dddddddd - is the days in interval
        • - *
      • HH - is the hours in interval
        • - *
      • MM - is the minutes in interval
        • - *
      • SS - is the seconds in interval
        • - *
      • mmmmmm - is the microseconds in interval
        • - *
      - * For example, an elapsed time of 1 day, 13 hours, 23 minutes, 12 seconds would - * be: 00000001132312.000000:000. A UTC offset of zero is always used for - * interval properties.
      - * Fields that are not significant MUST be replaced with asterisk ("*") - * characters. Not significant fields are those that are beyond the resolution - * of the data source. This is used to indicate the precision of the value and - * can only be done for an adjacent set of fields, starting with the least - * significant field (mmmmmm), and continuing to more significant fields. The - * granularity of using asterisks is always the entire field, except for the - * mmmmmm field where the granularity is single digits. The UTC offset field - * MUST NOT contain asterisks.
      - * For example, if an interval of 1 day, 13 hours, 23 minutes, 12 seconds, and - * 125 milliseconds was measured with a precision of 1 millisecond, the format - * would be: 00000001132312.125***:000. - * - */ -public class CIMDateTimeInterval extends CIMDateTime { - - private static final long serialVersionUID = -7362881414085831668l; - - private int iDays, iHours, iMinutes, iSeconds, iUSeconds; - - private String iStr; - - private boolean iTotalMicrosCalced; - - private long iTotalMicros; - - private int iUnsignificantUSecDigits; - - private static final int MAX_DAY = 99999999, MAX_HOUR = 23, MAX_MIN = 59, MAX_SEC = 59, - MAX_MILLISEC = 999, MAX_MICROSEC = 999999; - - private static final long MAX_INTERVAL = ((((long) MAX_DAY * 24 * 60 * 60) - + ((long) MAX_HOUR * 60 * 60) + ((long) MAX_MIN * 60) + MAX_SEC) * 1000) - + MAX_MILLISEC; - - private static final long MILLISEC_ACCURACY_DIV = 1000, - SEC_ACCURACY_DIV = 1000 * MILLISEC_ACCURACY_DIV, - MIN_ACCURACY_DIV = 60 * SEC_ACCURACY_DIV, HOUR_ACCURACY_DIV = 60 * MIN_ACCURACY_DIV, - DAY_ACCURACY_DIV = 24 * HOUR_ACCURACY_DIV, - NO_ACCURACY_DIV = 100000000 * DAY_ACCURACY_DIV; - - private static final long[] USEC_ACCURACY_DIV_A = { 1, 10, 100, MILLISEC_ACCURACY_DIV, 10000, - 100000, SEC_ACCURACY_DIV }; - - private long iAccuracyDivisor = 1; - - /** - * Constructs a CIMDateTimeInterval using the individual values - * of the interval (day, hours, minutes, seconds and microseconds). Any - * property that has a -1 will make that field "not significant" (i.e. that - * field has asterisks in the datetime string). - * - * @param pDays - * Number of days in the interval (-1 - 99999999). - * @param pHours - * Number of hours in the interval (-1 - 23). - * @param pMinutes - * Number of minutes in the interval (-1 - 59). - * @param pSeconds - * Number of seconds in the interval (-1 - 59). - * @param pMicroseconds - * Number of microseconds in the interval (-1 - 999999). - * @throws IllegalArgumentException - * If any value is not valid. - */ - public CIMDateTimeInterval(int pDays, int pHours, int pMinutes, int pSeconds, int pMicroseconds) - throws IllegalArgumentException { - boolean notSignificant = checkLimits("pDays", pDays, 0, MAX_DAY, false); - if (notSignificant) this.iAccuracyDivisor = NO_ACCURACY_DIV; - notSignificant = checkLimits("pHours", pHours, 0, MAX_HOUR, notSignificant); - if (notSignificant && this.iAccuracyDivisor == 1) this.iAccuracyDivisor = DAY_ACCURACY_DIV; - notSignificant = checkLimits("pMinutes", pMinutes, 0, MAX_MIN, notSignificant); - if (notSignificant && this.iAccuracyDivisor == 1) this.iAccuracyDivisor = HOUR_ACCURACY_DIV; - notSignificant = checkLimits("pSeconds", pSeconds, 0, MAX_SEC, notSignificant); - if (notSignificant && this.iAccuracyDivisor == 1) this.iAccuracyDivisor = MIN_ACCURACY_DIV; - notSignificant = checkLimits("pMicroseconds", pMicroseconds, 0, MAX_MICROSEC, - notSignificant); - if (notSignificant) { - this.iUnsignificantUSecDigits = 6; - if (this.iAccuracyDivisor == 1) this.iAccuracyDivisor = USEC_ACCURACY_DIV_A[this.iUnsignificantUSecDigits]; - } else { - this.iUnsignificantUSecDigits = 0; - } - - this.iDays = pDays; - this.iHours = pHours; - this.iMinutes = pMinutes; - this.iSeconds = pSeconds; - this.iUSeconds = pMicroseconds; - - debug("CIMDateTimeInterval(" + pDays + "," + pHours + "," + pMinutes + "," + pSeconds + "," - + pMicroseconds + "): days=" + this.iDays + ", hours=" + this.iHours + ", mins=" - + this.iMinutes + ", secs=" + this.iSeconds + ", usecs=" + this.iUSeconds - + ", acc div=" + this.iAccuracyDivisor + ", unsig digits=" - + this.iUnsignificantUSecDigits); - } - - /** - * Constructs a CIMDateTimeInterval using a milliseconds value. - * - * @param pMilliseconds - * Number of milliseconds in the interval (0 - 8639999999999999). - * @throws IllegalArgumentException - */ - public CIMDateTimeInterval(long pMilliseconds) throws IllegalArgumentException { - if (pMilliseconds < 0 || pMilliseconds > MAX_INTERVAL) throw new IllegalArgumentException( - "pMilliseconds must be between 0 and " + MAX_INTERVAL + ". " + pMilliseconds - + " is illegal!"); - long totalUSecs = pMilliseconds * 1000; - long totalSecs = pMilliseconds / 1000; - long totalMins = totalSecs / 60; - long totalHours = totalMins / 60; - long totalDays = totalHours / 24; - - this.iUSeconds = (int) (totalUSecs % 1000000); - this.iSeconds = (int) (totalSecs % 60); - this.iMinutes = (int) (totalMins % 60); - this.iHours = (int) (totalHours % 24); - this.iDays = (int) totalDays; - - this.iUnsignificantUSecDigits = 3; - this.iAccuracyDivisor = USEC_ACCURACY_DIV_A[this.iUnsignificantUSecDigits]; - - this.iTotalMicrosCalced = true; - this.iTotalMicros = pMilliseconds * 1000; - - debug("CIMDateTimeInterval(" + pMilliseconds + "): days=" + this.iDays + ", hours=" - + this.iHours + ", mins=" + this.iMinutes + ", secs=" + this.iSeconds + ", usecs=" - + this.iUSeconds + ", acc div=" + this.iAccuracyDivisor + ", unsig digits=" - + this.iUnsignificantUSecDigits); - } - - /** - * Creates a CIMDateTimeInterval object using a string. - * - * @param pIntervalString - * A string in the format of ddddddddHHMMSS.mmmmmm:000. - * @throws IllegalArgumentException - * If string is not in the correct format or null. - */ - public CIMDateTimeInterval(String pIntervalString) throws IllegalArgumentException { - if (pIntervalString == null) throw new IllegalArgumentException( - "Null IntervalString is not allowed!"); - if (pIntervalString.length() != LENGTH) throw new IllegalArgumentException("Length of " - + pIntervalString + " must be " + LENGTH + ", " + pIntervalString.length() - + " is not valid!"); - String intervalStr = setAccuracy(pIntervalString); - DTStringReader dtReader = new DTStringReader(intervalStr); - this.iDays = dtReader.readAndCheck(8, "days", 0, MAX_DAY, true); - this.iHours = dtReader.readAndCheck(2, "hours", 0, MAX_HOUR, true); - this.iMinutes = dtReader.readAndCheck(2, "minutes", 0, MAX_MIN, true); - this.iSeconds = dtReader.readAndCheck(2, "seconds", 0, MAX_SEC, true); - dtReader.read('.'); - this.iUSeconds = dtReader.readAndCheck(6, "microseconds", 0, MAX_MICROSEC, false); - if (this.iAccuracyDivisor >= SEC_ACCURACY_DIV) this.iUSeconds = -1; - dtReader.read(':'); - int zeros = dtReader.read(3, "zeros", false); - if (zeros != 0) { - String msg = "In " + pIntervalString - + " the last 3 characters after ':' must be zeros!"; - throw new IllegalArgumentException(msg); - } - - debug("CIMDateTimeInterval(\"" + pIntervalString + "\"): days=" + this.iDays + ", hours=" - + this.iHours + ", mins=" + this.iMinutes + ", secs=" + this.iSeconds + ", usecs=" - + this.iUSeconds + ", acc div=" + this.iAccuracyDivisor + ", unsig digits=" - + this.iUnsignificantUSecDigits); - } - - /** - * Compares the CIMDateTimeInterval object with this one. If - * either interval has "Not Significant" fields then we only compare the - * significant fields. - * - * @param pObj - * The CIMDateTimeInterval to be compared with this - * one. - * @return -1, zero, or 1 as this interval is less than, equal to, or - * greater than the specified interval. - * @throws IllegalArgumentException - * If the object passed in is not an instance of - * CIMDataTimeInterval. - */ - public int compareTo(CIMDateTime pObj) throws IllegalArgumentException { - if (!(pObj instanceof CIMDateTimeInterval)) { - String msg = "This method requires a CIMDateTimeInterval instance, while it has received a " - + (pObj == null ? "null!" : pObj.getClass().getName() + " instance!"); - throw new IllegalArgumentException(msg); - } - CIMDateTimeInterval that = (CIMDateTimeInterval) pObj; - long accuracyDivisor = Math.max(this.iAccuracyDivisor, that.iAccuracyDivisor); - debug("this.acDiv=" + this.iAccuracyDivisor + ", that.acDiv=" + that.iAccuracyDivisor - + ", acDiv=" + accuracyDivisor); - Long thisMicros = Long.valueOf(calcMicros(accuracyDivisor)); - Long thatMicros = Long.valueOf(that.calcMicros(accuracyDivisor)); - debug("thisUs=" + thisMicros + ", thatUs=" + thatMicros); - return thisMicros.compareTo(thatMicros); - } - - /** - * Gets the internal string representation of this object. - * - * @return The internal representation of the - * CIMDateTimeInterval object. - */ - @Override - public String getDateTimeString() { - if (this.iStr != null) return this.iStr; - // ddddddddHHMMSS.mmmmmm:000 - DTStringWriter dtWriter = new DTStringWriter(); - dtWriter.write(8, this.iDays); - dtWriter.write(2, this.iHours); - dtWriter.write(2, this.iMinutes); - dtWriter.write(2, this.iSeconds); - dtWriter.write('.'); - dtWriter.writeUSec(this.iUSeconds / (int) this.iAccuracyDivisor, - this.iUnsignificantUSecDigits); - dtWriter.write(":000"); - return dtWriter.toString(); - } - - /** - * Returns days value of this interval. - * - * @return If days field "not significant" this returns -1, otherwise - * returns number of days in the interval. - */ - public int getDays() { - return this.iDays; - } - - /** - * Returns hours value of this interval. - * - * @return If hours field "not significant" this returns -1, otherwise - * returns number of hours in the interval. - */ - public int getHours() { - return this.iHours; - } - - /** - * Returns microseconds value of this interval. - * - * @return If microseconds field "not significant" this returns -1, - * otherwise returns number of microseconds in the interval. - */ - public int getMicroseconds() { - return this.iUSeconds; - } - - /** - * Returns minutes value of this interval. - * - * @return If minutes field "not significant" this returns -1, otherwise - * returns number of minutes in the interval. - */ - public int getMinutes() { - return this.iMinutes; - } - - /** - * Returns seconds value of this interval. - * - * @return If seconds field "not significant" this returns -1, otherwise - * returns number of seconds in the interval. - */ - public int getSeconds() { - return this.iSeconds; - } - - /** - * Returns the total length of the interval in milliseconds. - * - * @return The length of the interval in milliseconds. - */ - public long getTotalMilliseconds() { - return getTotalMicros() / 1000; - } - - /** - * Returns the hash code for this object. - * - * @return A hash code value for this object. - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return getDateTimeString().hashCode(); - } - - /** - * Returns a String representation of the - * CIMDateTimeInterval. This method is intended to be used only - * for debugging purposes, and the format of the returned string may vary - * between implementations. The returned string may be empty but may not be - * null. - * - * @return String representation of this datetime. - */ - @Override - public String toString() { - return getDateTimeString(); - } - - // ddddddddHHMMSS.mmmmmm:000 - - private static final int DAY_START_IDX = 0, HOUR_START_IDX = 8, MIN_START_IDX = 10, - SEC_START_IDX = 12, DOT_IDX = 14, USEC_START_IDX = 15, UTC_START_IDX = 21, LENGTH = 25; - - /** - * Checks the granularity of the CIMDateTimeAbsolute precision. - * - * @param pIdx - * Index of first asterisk in datetime string. - * @param pFieldName - * Name of field. - * @param pFieldStartIdx - * Index of first character in field of datetime string. - * @param pNextStartIdx - * Index of first character in subsequent field of datetime - * string. - * @return true if field is completely unsignificant, - * false otherwise. - * @throws IllegalArgumentException - * If field is not completely significant or completely - * unsignificant (mix of asterisks and digits). - */ - private boolean checkGranularity(int pIdx, String pFieldName, int pFieldStartIdx, - int pNextStartIdx) throws IllegalArgumentException { - if (pIdx > pFieldStartIdx && pIdx < pNextStartIdx) throw new IllegalArgumentException( - "Partial unsignificant digits are not allowed for field " + pFieldName + " in " - + this.iStr + "!"); - return pIdx == pFieldStartIdx; - } - - /** - * Find index of first asterisk within string. - * - * @param pIvStr - * Time interval string. - * @return Index of first asterisk or -1 if asterisk does not exist. - */ - private static int findStar(String pIvStr) { - for (int i = 0; i < UTC_START_IDX; i++) - if (pIvStr.charAt(i) == '*') return i; - return -1; - } - - /** - * Verify that all characters in the string after the starting index are - * asterisks. - * - * @param pIvStr - * Time interval string. - * @param pStartIdx - * Starting index. - */ - private static void checkStars(String pIvStr, int pStartIdx) { - for (int i = pStartIdx; i < UTC_START_IDX; i++) { - char ch = pIvStr.charAt(i); - if (i != DOT_IDX && ch != '*') throw new IllegalArgumentException("In " + pIvStr - + " every digit character after the first '*' character must " + "be '*', '" - + ch + "' is invalid!"); - } - } - - /** - * Determines the accuracy (precision) of the interval string and replaces - * all asterisks in microsecond field with zeros. - * - * @param pIntervalStr - * Time interval string. - * @return Corrected time interval string with iAccuracyDivisor - * set. - */ - private String setAccuracy(String pIntervalStr) throws IllegalArgumentException { - this.iStr = pIntervalStr; - /* - * String transformation. Checking the correct location of '*' - * characters. '*' characters in usec field are replaced into '0' - * characters - */ - int startIdx = findStar(this.iStr); - if (startIdx < 0) return this.iStr; - // all remaining digit fields must contain '*' characters except for utc - checkStars(this.iStr, startIdx + 1); - if (checkGranularity(startIdx, "Day", DAY_START_IDX, HOUR_START_IDX)) { - this.iAccuracyDivisor = NO_ACCURACY_DIV; - } else if (checkGranularity(startIdx, "Hour", HOUR_START_IDX, MIN_START_IDX)) { - this.iAccuracyDivisor = DAY_ACCURACY_DIV; - } else if (checkGranularity(startIdx, "Minute", MIN_START_IDX, SEC_START_IDX)) { - this.iAccuracyDivisor = HOUR_ACCURACY_DIV; - } else if (checkGranularity(startIdx, "Second", SEC_START_IDX, DOT_IDX)) { - this.iAccuracyDivisor = MIN_ACCURACY_DIV; - } else { - // dealing with usec granularity - this.iUnsignificantUSecDigits = UTC_START_IDX - startIdx; - this.iAccuracyDivisor = USEC_ACCURACY_DIV_A[this.iUnsignificantUSecDigits]; - } - // all '*' in usec field is replaced into '0' - char[] buf = this.iStr.toCharArray(); - if (startIdx < USEC_START_IDX) startIdx = USEC_START_IDX; - for (int i = startIdx; i < UTC_START_IDX; i++) { - if (i == DOT_IDX) continue; - if (this.iStr.charAt(i) != '*') throw new IllegalArgumentException( - "All remaining digits must be marked as unsignificant in " + this.iStr + " !"); - buf[i] = '0'; - } - return new String(buf); - } - - /** - * Get total microseconds of CIMDateTimeInterval object. - * - * @return Total microseconds of time interval. - */ - private long getTotalMicros() { - if (this.iTotalMicrosCalced) return this.iTotalMicros; - this.iTotalMicrosCalced = true; - // iTotalMicros = iUSeconds + 1000000 * (iSeconds + 60 * (iMinutes + 60 - // * (iHours + 24 * iDays))); - this.iTotalMicros = this.iUSeconds > 0 ? this.iUSeconds : 0; - if (this.iSeconds > 0) this.iTotalMicros += SEC_ACCURACY_DIV * this.iSeconds; - if (this.iMinutes > 0) this.iTotalMicros += MIN_ACCURACY_DIV * this.iMinutes; - if (this.iHours > 0) this.iTotalMicros += HOUR_ACCURACY_DIV * this.iHours; - if (this.iDays > 0) this.iTotalMicros += DAY_ACCURACY_DIV * this.iDays; - debug("days=" + this.iDays + " ,hours=" + this.iHours + " ,mins=" + this.iMinutes - + ", secs=" + this.iSeconds + ", usecs=" + this.iUSeconds + ", totalMicros=" - + this.iTotalMicros); - return this.iTotalMicros; - } - - /** - * Calculates microseconds of CIMDateTimeInterval object taking - * accuracy (precision) into consideration. - * - * @param pAccuracyDivisor - * Accuracy divisor of time interval. - * @return Total microseconds of time interval rounded down to precision. - */ - private long calcMicros(long pAccuracyDivisor) { - long remainder = getTotalMicros() % pAccuracyDivisor; - return getTotalMicros() - remainder; - } - - /** - * Checks validity of time interval field, making sure value is between - * minimum and maximum values and is not significant if following an - * unsignifcant field. - * - * @param pName - * Name of field. - * @param pValue - * Value of field. - * @param pLow - * Minimum value of field. - * @param pHigh - * Maximum value of field. - * @param pNotSignificant - * trueif previous field not significant. - * @return true if field is not significant, false - * otherwise. - * @throws IllegalArgumentException - */ - private static boolean checkLimits(String pName, int pValue, int pLow, int pHigh, - boolean pNotSignificant) throws IllegalArgumentException { - if (pValue == -1) return true; - if (pNotSignificant) throw new IllegalArgumentException( - "Not significant fields must be followed by not significant fields!"); - if (pValue < pLow || pValue > pHigh) throw new IllegalArgumentException(pName - + " must be between " + pLow + " and " + pHigh + ". " + pValue + " is invalid!"); - return false; - } - - /** - * Prints debug message. - * - * @param pMsg - * Debug message. - */ - private static void debug(String pMsg) { - // System.out.println(pMsg); - } -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1678807 2007-03-12 ebak Minor CIMDateTime suggestions + * 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) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors + * 2795671 2009-05-22 raman_arora Add Type to Comparable + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2944830 2010-02-08 blaschke-oss Fix spelling of checkGranurality() + * 2973300 2010-03-19 blaschke-oss TCK: CIMDateTimeXXX.compareTo() does not handle null + * 2989367 2010-04-29 blaschke-oss CIMDateTimeInterval(long) constructor range wrong + * 2989424 2010-04-29 blaschke-oss TCK: CIMDateTimeInterval constructor + * 2992349 2010-04-29 blaschke-oss CIMDateTimeInterval hr/min/sec max is 23/59/59, not 24/60/60 + * 2994249 2010-04-30 blaschke-oss CIMDateTimeInterval(long) calculates milliseconds + * 3018178 2010-06-18 blaschke-oss CIMDateTimeInterval clean up + * 3026302 2010-07-07 blaschke-oss CIMDateTimeInterval uses # constructor instead of valueOf + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + * 2674 2013-09-26 blaschke-oss Null pointer exception in CIMDateTime(String) + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import org.metricshub.wbem.sblim.cimclient.internal.cim.DTStringReader; +import org.metricshub.wbem.sblim.cimclient.internal.cim.DTStringWriter; + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * This class represents the datetime data type when used as a time value as + * specified by the Distributed Management Task Force (DMTF) CIM Infrastructure Specification (DSP004). It is in the format ddddddddHHMMSS.mmmmmm:000 where: + *
        + *
      • dddddddd - is the days in interval
        • + *
      • HH - is the hours in interval
        • + *
      • MM - is the minutes in interval
        • + *
      • SS - is the seconds in interval
        • + *
      • mmmmmm - is the microseconds in interval
        • + *
      + * For example, an elapsed time of 1 day, 13 hours, 23 minutes, 12 seconds would + * be: 00000001132312.000000:000. A UTC offset of zero is always used for + * interval properties.
      + * Fields that are not significant MUST be replaced with asterisk ("*") + * characters. Not significant fields are those that are beyond the resolution + * of the data source. This is used to indicate the precision of the value and + * can only be done for an adjacent set of fields, starting with the least + * significant field (mmmmmm), and continuing to more significant fields. The + * granularity of using asterisks is always the entire field, except for the + * mmmmmm field where the granularity is single digits. The UTC offset field + * MUST NOT contain asterisks.
      + * For example, if an interval of 1 day, 13 hours, 23 minutes, 12 seconds, and + * 125 milliseconds was measured with a precision of 1 millisecond, the format + * would be: 00000001132312.125***:000. + * + */ +public class CIMDateTimeInterval extends CIMDateTime { + + private static final long serialVersionUID = -7362881414085831668l; + + private int iDays, iHours, iMinutes, iSeconds, iUSeconds; + + private String iStr; + + private boolean iTotalMicrosCalced; + + private long iTotalMicros; + + private int iUnsignificantUSecDigits; + + private static final int MAX_DAY = 99999999, MAX_HOUR = 23, MAX_MIN = 59, MAX_SEC = 59, + MAX_MILLISEC = 999, MAX_MICROSEC = 999999; + + private static final long MAX_INTERVAL = ((((long) MAX_DAY * 24 * 60 * 60) + + ((long) MAX_HOUR * 60 * 60) + ((long) MAX_MIN * 60) + MAX_SEC) * 1000) + + MAX_MILLISEC; + + private static final long MILLISEC_ACCURACY_DIV = 1000, + SEC_ACCURACY_DIV = 1000 * MILLISEC_ACCURACY_DIV, + MIN_ACCURACY_DIV = 60 * SEC_ACCURACY_DIV, HOUR_ACCURACY_DIV = 60 * MIN_ACCURACY_DIV, + DAY_ACCURACY_DIV = 24 * HOUR_ACCURACY_DIV, + NO_ACCURACY_DIV = 100000000 * DAY_ACCURACY_DIV; + + private static final long[] USEC_ACCURACY_DIV_A = { 1, 10, 100, MILLISEC_ACCURACY_DIV, 10000, + 100000, SEC_ACCURACY_DIV }; + + private long iAccuracyDivisor = 1; + + /** + * Constructs a CIMDateTimeInterval using the individual values + * of the interval (day, hours, minutes, seconds and microseconds). Any + * property that has a -1 will make that field "not significant" (i.e. that + * field has asterisks in the datetime string). + * + * @param pDays + * Number of days in the interval (-1 - 99999999). + * @param pHours + * Number of hours in the interval (-1 - 23). + * @param pMinutes + * Number of minutes in the interval (-1 - 59). + * @param pSeconds + * Number of seconds in the interval (-1 - 59). + * @param pMicroseconds + * Number of microseconds in the interval (-1 - 999999). + * @throws IllegalArgumentException + * If any value is not valid. + */ + public CIMDateTimeInterval(int pDays, int pHours, int pMinutes, int pSeconds, int pMicroseconds) + throws IllegalArgumentException { + boolean notSignificant = checkLimits("pDays", pDays, 0, MAX_DAY, false); + if (notSignificant) this.iAccuracyDivisor = NO_ACCURACY_DIV; + notSignificant = checkLimits("pHours", pHours, 0, MAX_HOUR, notSignificant); + if (notSignificant && this.iAccuracyDivisor == 1) this.iAccuracyDivisor = DAY_ACCURACY_DIV; + notSignificant = checkLimits("pMinutes", pMinutes, 0, MAX_MIN, notSignificant); + if (notSignificant && this.iAccuracyDivisor == 1) this.iAccuracyDivisor = HOUR_ACCURACY_DIV; + notSignificant = checkLimits("pSeconds", pSeconds, 0, MAX_SEC, notSignificant); + if (notSignificant && this.iAccuracyDivisor == 1) this.iAccuracyDivisor = MIN_ACCURACY_DIV; + notSignificant = checkLimits("pMicroseconds", pMicroseconds, 0, MAX_MICROSEC, + notSignificant); + if (notSignificant) { + this.iUnsignificantUSecDigits = 6; + if (this.iAccuracyDivisor == 1) this.iAccuracyDivisor = USEC_ACCURACY_DIV_A[this.iUnsignificantUSecDigits]; + } else { + this.iUnsignificantUSecDigits = 0; + } + + this.iDays = pDays; + this.iHours = pHours; + this.iMinutes = pMinutes; + this.iSeconds = pSeconds; + this.iUSeconds = pMicroseconds; + + debug("CIMDateTimeInterval(" + pDays + "," + pHours + "," + pMinutes + "," + pSeconds + "," + + pMicroseconds + "): days=" + this.iDays + ", hours=" + this.iHours + ", mins=" + + this.iMinutes + ", secs=" + this.iSeconds + ", usecs=" + this.iUSeconds + + ", acc div=" + this.iAccuracyDivisor + ", unsig digits=" + + this.iUnsignificantUSecDigits); + } + + /** + * Constructs a CIMDateTimeInterval using a milliseconds value. + * + * @param pMilliseconds + * Number of milliseconds in the interval (0 - 8639999999999999). + * @throws IllegalArgumentException + */ + public CIMDateTimeInterval(long pMilliseconds) throws IllegalArgumentException { + if (pMilliseconds < 0 || pMilliseconds > MAX_INTERVAL) throw new IllegalArgumentException( + "pMilliseconds must be between 0 and " + MAX_INTERVAL + ". " + pMilliseconds + + " is illegal!"); + long totalUSecs = pMilliseconds * 1000; + long totalSecs = pMilliseconds / 1000; + long totalMins = totalSecs / 60; + long totalHours = totalMins / 60; + long totalDays = totalHours / 24; + + this.iUSeconds = (int) (totalUSecs % 1000000); + this.iSeconds = (int) (totalSecs % 60); + this.iMinutes = (int) (totalMins % 60); + this.iHours = (int) (totalHours % 24); + this.iDays = (int) totalDays; + + this.iUnsignificantUSecDigits = 3; + this.iAccuracyDivisor = USEC_ACCURACY_DIV_A[this.iUnsignificantUSecDigits]; + + this.iTotalMicrosCalced = true; + this.iTotalMicros = pMilliseconds * 1000; + + debug("CIMDateTimeInterval(" + pMilliseconds + "): days=" + this.iDays + ", hours=" + + this.iHours + ", mins=" + this.iMinutes + ", secs=" + this.iSeconds + ", usecs=" + + this.iUSeconds + ", acc div=" + this.iAccuracyDivisor + ", unsig digits=" + + this.iUnsignificantUSecDigits); + } + + /** + * Creates a CIMDateTimeInterval object using a string. + * + * @param pIntervalString + * A string in the format of ddddddddHHMMSS.mmmmmm:000. + * @throws IllegalArgumentException + * If string is not in the correct format or null. + */ + public CIMDateTimeInterval(String pIntervalString) throws IllegalArgumentException { + if (pIntervalString == null) throw new IllegalArgumentException( + "Null IntervalString is not allowed!"); + if (pIntervalString.length() != LENGTH) throw new IllegalArgumentException("Length of " + + pIntervalString + " must be " + LENGTH + ", " + pIntervalString.length() + + " is not valid!"); + String intervalStr = setAccuracy(pIntervalString); + DTStringReader dtReader = new DTStringReader(intervalStr); + this.iDays = dtReader.readAndCheck(8, "days", 0, MAX_DAY, true); + this.iHours = dtReader.readAndCheck(2, "hours", 0, MAX_HOUR, true); + this.iMinutes = dtReader.readAndCheck(2, "minutes", 0, MAX_MIN, true); + this.iSeconds = dtReader.readAndCheck(2, "seconds", 0, MAX_SEC, true); + dtReader.read('.'); + this.iUSeconds = dtReader.readAndCheck(6, "microseconds", 0, MAX_MICROSEC, false); + if (this.iAccuracyDivisor >= SEC_ACCURACY_DIV) this.iUSeconds = -1; + dtReader.read(':'); + int zeros = dtReader.read(3, "zeros", false); + if (zeros != 0) { + String msg = "In " + pIntervalString + + " the last 3 characters after ':' must be zeros!"; + throw new IllegalArgumentException(msg); + } + + debug("CIMDateTimeInterval(\"" + pIntervalString + "\"): days=" + this.iDays + ", hours=" + + this.iHours + ", mins=" + this.iMinutes + ", secs=" + this.iSeconds + ", usecs=" + + this.iUSeconds + ", acc div=" + this.iAccuracyDivisor + ", unsig digits=" + + this.iUnsignificantUSecDigits); + } + + /** + * Compares the CIMDateTimeInterval object with this one. If + * either interval has "Not Significant" fields then we only compare the + * significant fields. + * + * @param pObj + * The CIMDateTimeInterval to be compared with this + * one. + * @return -1, zero, or 1 as this interval is less than, equal to, or + * greater than the specified interval. + * @throws IllegalArgumentException + * If the object passed in is not an instance of + * CIMDataTimeInterval. + */ + public int compareTo(CIMDateTime pObj) throws IllegalArgumentException { + if (!(pObj instanceof CIMDateTimeInterval)) { + String msg = "This method requires a CIMDateTimeInterval instance, while it has received a " + + (pObj == null ? "null!" : pObj.getClass().getName() + " instance!"); + throw new IllegalArgumentException(msg); + } + CIMDateTimeInterval that = (CIMDateTimeInterval) pObj; + long accuracyDivisor = Math.max(this.iAccuracyDivisor, that.iAccuracyDivisor); + debug("this.acDiv=" + this.iAccuracyDivisor + ", that.acDiv=" + that.iAccuracyDivisor + + ", acDiv=" + accuracyDivisor); + Long thisMicros = Long.valueOf(calcMicros(accuracyDivisor)); + Long thatMicros = Long.valueOf(that.calcMicros(accuracyDivisor)); + debug("thisUs=" + thisMicros + ", thatUs=" + thatMicros); + return thisMicros.compareTo(thatMicros); + } + + /** + * Gets the internal string representation of this object. + * + * @return The internal representation of the + * CIMDateTimeInterval object. + */ + @Override + public String getDateTimeString() { + if (this.iStr != null) return this.iStr; + // ddddddddHHMMSS.mmmmmm:000 + DTStringWriter dtWriter = new DTStringWriter(); + dtWriter.write(8, this.iDays); + dtWriter.write(2, this.iHours); + dtWriter.write(2, this.iMinutes); + dtWriter.write(2, this.iSeconds); + dtWriter.write('.'); + dtWriter.writeUSec(this.iUSeconds / (int) this.iAccuracyDivisor, + this.iUnsignificantUSecDigits); + dtWriter.write(":000"); + return dtWriter.toString(); + } + + /** + * Returns days value of this interval. + * + * @return If days field "not significant" this returns -1, otherwise + * returns number of days in the interval. + */ + public int getDays() { + return this.iDays; + } + + /** + * Returns hours value of this interval. + * + * @return If hours field "not significant" this returns -1, otherwise + * returns number of hours in the interval. + */ + public int getHours() { + return this.iHours; + } + + /** + * Returns microseconds value of this interval. + * + * @return If microseconds field "not significant" this returns -1, + * otherwise returns number of microseconds in the interval. + */ + public int getMicroseconds() { + return this.iUSeconds; + } + + /** + * Returns minutes value of this interval. + * + * @return If minutes field "not significant" this returns -1, otherwise + * returns number of minutes in the interval. + */ + public int getMinutes() { + return this.iMinutes; + } + + /** + * Returns seconds value of this interval. + * + * @return If seconds field "not significant" this returns -1, otherwise + * returns number of seconds in the interval. + */ + public int getSeconds() { + return this.iSeconds; + } + + /** + * Returns the total length of the interval in milliseconds. + * + * @return The length of the interval in milliseconds. + */ + public long getTotalMilliseconds() { + return getTotalMicros() / 1000; + } + + /** + * Returns the hash code for this object. + * + * @return A hash code value for this object. + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + return getDateTimeString().hashCode(); + } + + /** + * Returns a String representation of the + * CIMDateTimeInterval. This method is intended to be used only + * for debugging purposes, and the format of the returned string may vary + * between implementations. The returned string may be empty but may not be + * null. + * + * @return String representation of this datetime. + */ + @Override + public String toString() { + return getDateTimeString(); + } + + // ddddddddHHMMSS.mmmmmm:000 + + private static final int DAY_START_IDX = 0, HOUR_START_IDX = 8, MIN_START_IDX = 10, + SEC_START_IDX = 12, DOT_IDX = 14, USEC_START_IDX = 15, UTC_START_IDX = 21, LENGTH = 25; + + /** + * Checks the granularity of the CIMDateTimeAbsolute precision. + * + * @param pIdx + * Index of first asterisk in datetime string. + * @param pFieldName + * Name of field. + * @param pFieldStartIdx + * Index of first character in field of datetime string. + * @param pNextStartIdx + * Index of first character in subsequent field of datetime + * string. + * @return true if field is completely unsignificant, + * false otherwise. + * @throws IllegalArgumentException + * If field is not completely significant or completely + * unsignificant (mix of asterisks and digits). + */ + private boolean checkGranularity(int pIdx, String pFieldName, int pFieldStartIdx, + int pNextStartIdx) throws IllegalArgumentException { + if (pIdx > pFieldStartIdx && pIdx < pNextStartIdx) throw new IllegalArgumentException( + "Partial unsignificant digits are not allowed for field " + pFieldName + " in " + + this.iStr + "!"); + return pIdx == pFieldStartIdx; + } + + /** + * Find index of first asterisk within string. + * + * @param pIvStr + * Time interval string. + * @return Index of first asterisk or -1 if asterisk does not exist. + */ + private static int findStar(String pIvStr) { + for (int i = 0; i < UTC_START_IDX; i++) + if (pIvStr.charAt(i) == '*') return i; + return -1; + } + + /** + * Verify that all characters in the string after the starting index are + * asterisks. + * + * @param pIvStr + * Time interval string. + * @param pStartIdx + * Starting index. + */ + private static void checkStars(String pIvStr, int pStartIdx) { + for (int i = pStartIdx; i < UTC_START_IDX; i++) { + char ch = pIvStr.charAt(i); + if (i != DOT_IDX && ch != '*') throw new IllegalArgumentException("In " + pIvStr + + " every digit character after the first '*' character must " + "be '*', '" + + ch + "' is invalid!"); + } + } + + /** + * Determines the accuracy (precision) of the interval string and replaces + * all asterisks in microsecond field with zeros. + * + * @param pIntervalStr + * Time interval string. + * @return Corrected time interval string with iAccuracyDivisor + * set. + */ + private String setAccuracy(String pIntervalStr) throws IllegalArgumentException { + this.iStr = pIntervalStr; + /* + * String transformation. Checking the correct location of '*' + * characters. '*' characters in usec field are replaced into '0' + * characters + */ + int startIdx = findStar(this.iStr); + if (startIdx < 0) return this.iStr; + // all remaining digit fields must contain '*' characters except for utc + checkStars(this.iStr, startIdx + 1); + if (checkGranularity(startIdx, "Day", DAY_START_IDX, HOUR_START_IDX)) { + this.iAccuracyDivisor = NO_ACCURACY_DIV; + } else if (checkGranularity(startIdx, "Hour", HOUR_START_IDX, MIN_START_IDX)) { + this.iAccuracyDivisor = DAY_ACCURACY_DIV; + } else if (checkGranularity(startIdx, "Minute", MIN_START_IDX, SEC_START_IDX)) { + this.iAccuracyDivisor = HOUR_ACCURACY_DIV; + } else if (checkGranularity(startIdx, "Second", SEC_START_IDX, DOT_IDX)) { + this.iAccuracyDivisor = MIN_ACCURACY_DIV; + } else { + // dealing with usec granularity + this.iUnsignificantUSecDigits = UTC_START_IDX - startIdx; + this.iAccuracyDivisor = USEC_ACCURACY_DIV_A[this.iUnsignificantUSecDigits]; + } + // all '*' in usec field is replaced into '0' + char[] buf = this.iStr.toCharArray(); + if (startIdx < USEC_START_IDX) startIdx = USEC_START_IDX; + for (int i = startIdx; i < UTC_START_IDX; i++) { + if (i == DOT_IDX) continue; + if (this.iStr.charAt(i) != '*') throw new IllegalArgumentException( + "All remaining digits must be marked as unsignificant in " + this.iStr + " !"); + buf[i] = '0'; + } + return new String(buf); + } + + /** + * Get total microseconds of CIMDateTimeInterval object. + * + * @return Total microseconds of time interval. + */ + private long getTotalMicros() { + if (this.iTotalMicrosCalced) return this.iTotalMicros; + this.iTotalMicrosCalced = true; + // iTotalMicros = iUSeconds + 1000000 * (iSeconds + 60 * (iMinutes + 60 + // * (iHours + 24 * iDays))); + this.iTotalMicros = this.iUSeconds > 0 ? this.iUSeconds : 0; + if (this.iSeconds > 0) this.iTotalMicros += SEC_ACCURACY_DIV * this.iSeconds; + if (this.iMinutes > 0) this.iTotalMicros += MIN_ACCURACY_DIV * this.iMinutes; + if (this.iHours > 0) this.iTotalMicros += HOUR_ACCURACY_DIV * this.iHours; + if (this.iDays > 0) this.iTotalMicros += DAY_ACCURACY_DIV * this.iDays; + debug("days=" + this.iDays + " ,hours=" + this.iHours + " ,mins=" + this.iMinutes + + ", secs=" + this.iSeconds + ", usecs=" + this.iUSeconds + ", totalMicros=" + + this.iTotalMicros); + return this.iTotalMicros; + } + + /** + * Calculates microseconds of CIMDateTimeInterval object taking + * accuracy (precision) into consideration. + * + * @param pAccuracyDivisor + * Accuracy divisor of time interval. + * @return Total microseconds of time interval rounded down to precision. + */ + private long calcMicros(long pAccuracyDivisor) { + long remainder = getTotalMicros() % pAccuracyDivisor; + return getTotalMicros() - remainder; + } + + /** + * Checks validity of time interval field, making sure value is between + * minimum and maximum values and is not significant if following an + * unsignifcant field. + * + * @param pName + * Name of field. + * @param pValue + * Value of field. + * @param pLow + * Minimum value of field. + * @param pHigh + * Maximum value of field. + * @param pNotSignificant + * trueif previous field not significant. + * @return true if field is not significant, false + * otherwise. + * @throws IllegalArgumentException + */ + private static boolean checkLimits(String pName, int pValue, int pLow, int pHigh, + boolean pNotSignificant) throws IllegalArgumentException { + if (pValue == -1) return true; + if (pNotSignificant) throw new IllegalArgumentException( + "Not significant fields must be followed by not significant fields!"); + if (pValue < pLow || pValue > pHigh) throw new IllegalArgumentException(pName + + " must be between " + pLow + " and " + pHigh + ". " + pValue + " is invalid!"); + return false; + } + + /** + * Prints debug message. + * + * @param pMsg + * Debug message. + */ + private static void debug(String pMsg) { + // System.out.println(pMsg); + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMElement.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java similarity index 84% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMElement.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java index 3393264..27888fa 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMElement.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java @@ -1,148 +1,146 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-09-26 lupusalex Make SBLIM client JSR48 compliant - * 1737141 2007-06-18 ebak Sync up with JSR48 evolution - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2227442 2008-11-05 blaschke-oss Add missing serialVersionUID - * 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) - * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors - * 2795671 2009-05-22 raman_arora Add Type to Comparable - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 3410126 2011-09-15 blaschke-oss TCK: CIM element name cannot be null - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.io.Serializable; - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * CIMElement is an abstract base class that represents a CIM - * Element as defined by the Distributed Management Task Force (DMTF) CIM Infrastructure Specification (DSP004). - */ -public abstract class CIMElement extends Object implements Serializable, Comparable { - - private static final long serialVersionUID = -3310480832682118922L; - - private String iName; - - /** - * Creates a new CIM element with the given name. - * - * @param pName - * The string for the name of the element. - * @throws IllegalArgumentException - * If name is null. - */ - public CIMElement(String pName) { - if (pName == null) throw new IllegalArgumentException("CIM element name cannot be null"); - this.iName = pName; - } - - /** - * Compares this element name to the CIMElement passed in. - * - * @param pObj - * The CIMElement to be compared. - * @return A negative integer, zero, or a positive integer as this object is - * less than, equal to, or greater than the specified object. - */ - public int compareTo(CIMElement pObj) { - if (pObj == null) return -1; - CIMElement that = pObj; - return this.iName.compareToIgnoreCase(that.iName); - } - - /** - * Takes a CIM element and returns true if it is equal to this - * CIM element. Otherwise, it returns false. Useful for - * comparing two CIM elements, for example, to determine whether a CIM - * element exists in a Collection. - * - * @param pObj - * The object to be compared a CIM element. - * @return true indicates the specified CIM element equals this - * CIM element, false indicates the CIM element does - * not equal this CIM element. - */ - @Override - public boolean equals(Object pObj) { - if (pObj instanceof CIMElement) { return this.iName - .equalsIgnoreCase(((CIMElement) pObj).iName); } - return false; - } - - /** - * Returns a string representing the name of a CIM element instance. - * - * @return The name of this CIM element. - */ - public String getName() { - return this.iName; - } - - /** - * Returns a hash code value for the CIM element. This method is supported - * for the benefit of hashtables such as those provided by - * java.util.Hashtable. - * - * @return A hash code value for this CIM element. - */ - @Override - public int hashCode() { - return this.iName.hashCode(); - } - - /** - * Returns a String representation of the - * CIMElement. This method is intended to be used only for - * debugging purposes. The format of the returned string may vary between - * implementations. The returned string may be empty but may not be - * null - * - * @return String representation of this CIM element. - */ - @Override - public String toString() { - return this.iName; - } -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-09-26 lupusalex Make SBLIM client JSR48 compliant + * 1737141 2007-06-18 ebak Sync up with JSR48 evolution + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2227442 2008-11-05 blaschke-oss Add missing serialVersionUID + * 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) + * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors + * 2795671 2009-05-22 raman_arora Add Type to Comparable + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 3410126 2011-09-15 blaschke-oss TCK: CIM element name cannot be null + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.io.Serializable; + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * CIMElement is an abstract base class that represents a CIM + * Element as defined by the Distributed Management Task Force (DMTF) CIM Infrastructure Specification (DSP004). + */ +public abstract class CIMElement extends Object implements Serializable, Comparable { + + private static final long serialVersionUID = -3310480832682118922L; + + private String iName; + + /** + * Creates a new CIM element with the given name. + * + * @param pName + * The string for the name of the element. + * @throws IllegalArgumentException + * If name is null. + */ + public CIMElement(String pName) { + if (pName == null) throw new IllegalArgumentException("CIM element name cannot be null"); + this.iName = pName; + } + + /** + * Compares this element name to the CIMElement passed in. + * + * @param pObj + * The CIMElement to be compared. + * @return A negative integer, zero, or a positive integer as this object is + * less than, equal to, or greater than the specified object. + */ + public int compareTo(CIMElement pObj) { + if (pObj == null) return -1; + CIMElement that = pObj; + return this.iName.compareToIgnoreCase(that.iName); + } + + /** + * Takes a CIM element and returns true if it is equal to this + * CIM element. Otherwise, it returns false. Useful for + * comparing two CIM elements, for example, to determine whether a CIM + * element exists in a Collection. + * + * @param pObj + * The object to be compared a CIM element. + * @return true indicates the specified CIM element equals this + * CIM element, false indicates the CIM element does + * not equal this CIM element. + */ + @Override + public boolean equals(Object pObj) { + if (pObj instanceof CIMElement) { return this.iName + .equalsIgnoreCase(((CIMElement) pObj).iName); } + return false; + } + + /** + * Returns a string representing the name of a CIM element instance. + * + * @return The name of this CIM element. + */ + public String getName() { + return this.iName; + } + + /** + * Returns a hash code value for the CIM element. This method is supported + * for the benefit of hashtables such as those provided by + * java.util.Hashtable. + * + * @return A hash code value for this CIM element. + */ + @Override + public int hashCode() { + return this.iName.hashCode(); + } + + /** + * Returns a String representation of the + * CIMElement. This method is intended to be used only for + * debugging purposes. The format of the returned string may vary between + * implementations. The returned string may be empty but may not be + * null + * + * @return String representation of this CIM element. + */ + @Override + public String toString() { + return this.iName; + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMFlavor.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java similarity index 75% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMFlavor.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java index b8bb603..fd9faac 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMFlavor.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java @@ -1,89 +1,87 @@ -/* - (C) Copyright IBM Corp. 2006, 2010 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1737123 2007-06-15 ebak Differences to JSR48 public review draft - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 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 - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.io.Serializable; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 -/** - * This class represents a CIM Flavor as defined by the Distributed Management - * Task Force (DMTF) CIM Infrastructure - * Specification (DSP004). CIM flavors specify overriding and inheritance rules. These - * rules specify how qualifiers are transmitted from classes to derived classes. - */ -public class CIMFlavor extends Object implements Serializable { - - private static final long serialVersionUID = -4177389103635687939l; - - /** - * The qualifier cannot be overridden. - */ - public static final int DISABLEOVERRIDE = 1; - - /** - * The qualifier applies only to the class in which it is declared. - */ - public static final int RESTRICTED = 2; - - /** - * The qualifier can be specified in multiple locales (language and country - * combination). - */ - public static final int TRANSLATE = 4; - - private static final int[] flavors = { DISABLEOVERRIDE, RESTRICTED, TRANSLATE }; - - /** - * Returns an array of possible flavors. - * - * @return All possible flavors. - */ - public static int[] getFlavors() { - return flavors; - } - -} +/* + (C) Copyright IBM Corp. 2006, 2010 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1737123 2007-06-15 ebak Differences to JSR48 public review draft + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 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 + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.io.Serializable; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 +/** + * This class represents a CIM Flavor as defined by the Distributed Management + * Task Force (DMTF) CIM Infrastructure + * Specification (DSP004). CIM flavors specify overriding and inheritance rules. These + * rules specify how qualifiers are transmitted from classes to derived classes. + */ +public class CIMFlavor extends Object implements Serializable { + + private static final long serialVersionUID = -4177389103635687939l; + + /** + * The qualifier cannot be overridden. + */ + public static final int DISABLEOVERRIDE = 1; + + /** + * The qualifier applies only to the class in which it is declared. + */ + public static final int RESTRICTED = 2; + + /** + * The qualifier can be specified in multiple locales (language and country + * combination). + */ + public static final int TRANSLATE = 4; + + private static final int[] flavors = { DISABLEOVERRIDE, RESTRICTED, TRANSLATE }; + + /** + * Returns an array of possible flavors. + * + * @return All possible flavors. + */ + public static int[] getFlavors() { + return flavors; + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMInstance.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java similarity index 89% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMInstance.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java index f9954ef..3380ff9 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMInstance.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java @@ -1,368 +1,366 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() - * 1776114 2007-08-21 ebak Cannot derive instance of class CIM_IndicationSubscription - * 1855726 2008-02-11 blaschke-oss CIMInstance.deriveInstance is setting wrong CIMObjectPath - * 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) - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException - * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.logging.Level; - -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMElementSorter; -import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker; -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF; -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.StringSorter; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 -/** - * This class represents a CIM instance as defined by the Distributed Management - * Task Force (DMTF) CIM Infrastructure - * Specification (DSP004). - */ -public class CIMInstance extends Object implements CIMNamedElementInterface, Serializable { - - private static final long serialVersionUID = -249160087013230559L; - - private static final CIMProperty[] EMPTY_PROP_A = new CIMProperty[0]; - - private CIMObjectPath iObjPath; - - private CIMProperty[] iProps; - - /** - * Constructs a CIMInstance object using the name and - * properties specified. - * - * @param pName - * The CIMObjectPath for this - * CIMInstance. - * @param pProps - * The properties for this CIMInstance. - * @throws IllegalArgumentException - * If pName is null or - * pName.getObjectName() is null.
      - * [OPTIONAL] - If the key property values do not match the - * values in the property array. This is optional due to the - * cost of the verification. Some implementations may leave it - * up to the developer to ensure that the values match. - */ - public CIMInstance(CIMObjectPath pName, CIMProperty[] pProps) - throws IllegalArgumentException { - if (pName == null) { - String msg = "CIMObjectPath parameter cannot be null!"; - // TODO: tracing - throw new IllegalArgumentException(msg); - } - if (pName.getObjectName() == null) { - String msg = "ObjectName cannot be null!"; - // TODO: tracing - throw new IllegalArgumentException(msg); - } - - this.iObjPath = pName; - if (pProps != null) { - this.iProps = pProps; - CIMElementSorter.sort(this.iProps); - } else { - this.iProps = new CIMProperty[0]; - } - } - - /** - * Returns a CIMInstance with the updated - * CIMObjectPath. - * - * @param pPath - * The complete CIMObjectPath for this instance. - * @return A new CIMInstance with the updated - * CIMObjectPath. - */ - public CIMInstance deriveInstance(CIMObjectPath pPath) { - return new CIMInstance(pPath, this.iProps); - } - - /** - * Returns a CIMInstance with the updated values for the - * properties in pPropA. Any new properties are ignored. - * - * @param pPropA - * The array of properties to update. - * @return A new instance with the updated properties. - */ - public CIMInstance deriveInstance(CIMProperty[] pPropA) { - if (pPropA == null || pPropA.length == 0) return this; - CIMProperty[] newPropA = new CIMProperty[getPropertyCount()]; - for (int i = 0; i < newPropA.length; i++) - newPropA[i] = this.iProps[i]; - for (int i = 0; i < pPropA.length; i++) { - CIMProperty newProp = pPropA[i]; - int idx = CIMElementSorter.findIdx(newPropA, newProp.getName()); - if (idx < 0) continue; - CIMProperty oldProp = newPropA[idx]; - /* - * 1776114 -> reference type comparison shouldn't be sensitive to - * the referenced class name due to derivation - */ - if (!typesEqual(oldProp, newProp)) { - LogAndTraceBroker.getBroker().trace( - Level.FINE, - "CIMInstance.deriveInstance() can update only property " - + "values but not property types!\n" + "original property: " - + oldProp + "\nnew property: " + newProp); - continue; - } - newPropA[idx] = new CIMProperty(oldProp.getName(), newProp.getDataType(), - newProp.getValue(), oldProp.isKey(), oldProp.isPropagated(), oldProp - .getOriginClass()); - } - return new CIMInstance(this.iObjPath, newPropA); - } - - /** - * Indicates whether some other instance is equal to this one. Two - * CIMInstances are considered equal if the names are the same. - * This method does NOT compare each property value. - * - * @param pObj - * The object to compare. - * @return true if the specified path references the same - * instance, otherwise false. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMInstance)) return false; - CIMInstance that = (CIMInstance) pObj; - return this.iObjPath.equals(that.iObjPath); - } - - /** - * This method returns a new CIMInstance with properties - * filtered according to the input parameters. Inclusion of class origin and - * qualifiers can also be controlled. - * - * @param pLocalOnly - * Include only the properties values that were instantiated in - * this instance. - * @param pIncludeClassOrigin - * classOrigins are only included if true. - * @param pPropertyList - * If the pPropertyList input parameter is not - * null, the members of the array define one or more - * Property names. The returned Instance does not include - * elements for any Properties missing from this list. If the - * pPropertyList input parameter is an empty array - * this signifies that no Properties are included in each - * returned class. If the pPropertyList input - * parameter is null this specifies that all - * Properties are included in each returned class. If the - * pPropertyList contains duplicate elements or - * invalid property names, they are ignored. - * @return CIMInstance matching the input filter. - */ - public CIMInstance filterProperties(boolean pLocalOnly, boolean pIncludeClassOrigin, - String[] pPropertyList) { - StringSorter.sort(pPropertyList); - ArrayList> propAList = new ArrayList>(); - for (int i = 0; i < getPropertyCount(); i++) { - CIMProperty prop = getProperty(i); - if (pLocalOnly && prop.isPropagated()) continue; - if (pPropertyList != null && !StringSorter.find(pPropertyList, prop.getName())) continue; - propAList.add(new CIMProperty(prop.getName(), prop.getDataType(), prop - .getValue(), prop.isKey(), prop.isPropagated(), pIncludeClassOrigin ? prop - .getOriginClass() : null)); - } - return new CIMInstance(this.iObjPath, propAList.toArray(EMPTY_PROP_A)); - } - - /** - * Get the name of the class that instantiates this CIM instance. - * - * @return Name of class that instantiates this CIM instance. - */ - public String getClassName() { - return this.iObjPath.getObjectName(); - } - - /** - * Get the key properties for this instance. - * - * @return An array of key properties. - */ - public CIMProperty[] getKeys() { - return this.iObjPath.getKeys(); - } - - /** - * Returns the CIMObjectPath that represents this instance. - * - * @return The CIMObjectPath that represents this instance. - */ - public CIMObjectPath getObjectPath() { - return this.iObjPath; - } - - /** - * Retrieve an array of the properties for this instance. - * - * @return An array of the CIM properties for this instance. - */ - public CIMProperty[] getProperties() { - return this.iProps == null ? new CIMProperty[0] : this.iProps; - } - - /** - * Get a class property by index. - * - * @param pIndex - * The index of the class property to retrieve. - * @return The CIMProperty at the specified index. - * @throws ArrayIndexOutOfBoundsException - */ - public CIMProperty getProperty(int pIndex) throws ArrayIndexOutOfBoundsException { - return this.iProps[pIndex]; - } - - /** - * Returns the specified property. - * - * @param pName - * The text string for the name of the property. - * @return The property requested or null if the property does - * not exist. - */ - public CIMProperty getProperty(String pName) { - return getProperty(pName, null); - } - - /** - * Returns the specified CIMProperty. - * - * @param pName - * The string name of the property to get. - * @param pOriginClass - * (Optional) The string name of the class in which the property - * was defined. - * @return null if the property does not exist, otherwise - * returns the CIM property. - */ - public CIMProperty getProperty(String pName, String pOriginClass) { - CIMProperty prop = (CIMProperty) CIMElementSorter.find(this.iProps, pName); - if (prop == null) return null; - if (pOriginClass == null) return prop; - if (pOriginClass.equalsIgnoreCase(prop.getOriginClass())) return prop; - return null; - } - - /** - * Get the number of properties defined in this CIMInstance. - * - * @return The number of properties defined in the CIMInstance. - */ - public int getPropertyCount() { - return this.iProps == null ? 0 : this.iProps.length; - } - - /** - * Returns the value of a property of this CIM Instance. - * - * @param name - * The name of the property. - * @return The value for the specified property name or null if - * the property does not exist. - */ - public Object getPropertyValue(String name) { - CIMProperty prop = getProperty(name); - return prop == null ? null : prop.getValue(); - } - - /** - * Computes the hash code for this instance. The hash code will be the - * object path of the instance not including the host or namespace - * information. - * - * @return The integer representing the hash code for this object path. - */ - @Override - public int hashCode() { - return toString().hashCode(); - } - - /** - * Returns a String representation of the - * CIMInstance. This method is intended to be used only for - * debugging purposes, and the format of the returned string may vary - * between implementations. The returned string may be empty but may not be - * null. - * - * @return String representation of this instance. - */ - @Override - public String toString() { - return MOF.instanceDeclaration(this, MOF.EMPTY); - } - - /** - * Indicates whether the data types of the two properties are equal. - * - * @param pProp0 - * First property. - *@param pProp1 - * Second property. - * @return true if the data types are the same, - * false otherwise. - */ - private static boolean typesEqual(CIMProperty pProp0, CIMProperty pProp1) { - CIMDataType type0 = pProp0.getDataType(), type1 = pProp0.getDataType(); - return type0.getType() == type1.getType() && type0.isArray() == type1.isArray(); - - } - -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() + * 1776114 2007-08-21 ebak Cannot derive instance of class CIM_IndicationSubscription + * 1855726 2008-02-11 blaschke-oss CIMInstance.deriveInstance is setting wrong CIMObjectPath + * 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) + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException + * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.logging.Level; + +import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMElementSorter; +import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker; +import org.metricshub.wbem.sblim.cimclient.internal.util.MOF; +import org.metricshub.wbem.sblim.cimclient.internal.util.StringSorter; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010 +/** + * This class represents a CIM instance as defined by the Distributed Management + * Task Force (DMTF) CIM Infrastructure + * Specification (DSP004). + */ +public class CIMInstance extends Object implements CIMNamedElementInterface, Serializable { + + private static final long serialVersionUID = -249160087013230559L; + + private static final CIMProperty[] EMPTY_PROP_A = new CIMProperty[0]; + + private CIMObjectPath iObjPath; + + private CIMProperty[] iProps; + + /** + * Constructs a CIMInstance object using the name and + * properties specified. + * + * @param pName + * The CIMObjectPath for this + * CIMInstance. + * @param pProps + * The properties for this CIMInstance. + * @throws IllegalArgumentException + * If pName is null or + * pName.getObjectName() is null.
      + * [OPTIONAL] - If the key property values do not match the + * values in the property array. This is optional due to the + * cost of the verification. Some implementations may leave it + * up to the developer to ensure that the values match. + */ + public CIMInstance(CIMObjectPath pName, CIMProperty[] pProps) + throws IllegalArgumentException { + if (pName == null) { + String msg = "CIMObjectPath parameter cannot be null!"; + // TODO: tracing + throw new IllegalArgumentException(msg); + } + if (pName.getObjectName() == null) { + String msg = "ObjectName cannot be null!"; + // TODO: tracing + throw new IllegalArgumentException(msg); + } + + this.iObjPath = pName; + if (pProps != null) { + this.iProps = pProps; + CIMElementSorter.sort(this.iProps); + } else { + this.iProps = new CIMProperty[0]; + } + } + + /** + * Returns a CIMInstance with the updated + * CIMObjectPath. + * + * @param pPath + * The complete CIMObjectPath for this instance. + * @return A new CIMInstance with the updated + * CIMObjectPath. + */ + public CIMInstance deriveInstance(CIMObjectPath pPath) { + return new CIMInstance(pPath, this.iProps); + } + + /** + * Returns a CIMInstance with the updated values for the + * properties in pPropA. Any new properties are ignored. + * + * @param pPropA + * The array of properties to update. + * @return A new instance with the updated properties. + */ + public CIMInstance deriveInstance(CIMProperty[] pPropA) { + if (pPropA == null || pPropA.length == 0) return this; + CIMProperty[] newPropA = new CIMProperty[getPropertyCount()]; + for (int i = 0; i < newPropA.length; i++) + newPropA[i] = this.iProps[i]; + for (int i = 0; i < pPropA.length; i++) { + CIMProperty newProp = pPropA[i]; + int idx = CIMElementSorter.findIdx(newPropA, newProp.getName()); + if (idx < 0) continue; + CIMProperty oldProp = newPropA[idx]; + /* + * 1776114 -> reference type comparison shouldn't be sensitive to + * the referenced class name due to derivation + */ + if (!typesEqual(oldProp, newProp)) { + LogAndTraceBroker.getBroker().trace( + Level.FINE, + "CIMInstance.deriveInstance() can update only property " + + "values but not property types!\n" + "original property: " + + oldProp + "\nnew property: " + newProp); + continue; + } + newPropA[idx] = new CIMProperty(oldProp.getName(), newProp.getDataType(), + newProp.getValue(), oldProp.isKey(), oldProp.isPropagated(), oldProp + .getOriginClass()); + } + return new CIMInstance(this.iObjPath, newPropA); + } + + /** + * Indicates whether some other instance is equal to this one. Two + * CIMInstances are considered equal if the names are the same. + * This method does NOT compare each property value. + * + * @param pObj + * The object to compare. + * @return true if the specified path references the same + * instance, otherwise false. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMInstance)) return false; + CIMInstance that = (CIMInstance) pObj; + return this.iObjPath.equals(that.iObjPath); + } + + /** + * This method returns a new CIMInstance with properties + * filtered according to the input parameters. Inclusion of class origin and + * qualifiers can also be controlled. + * + * @param pLocalOnly + * Include only the properties values that were instantiated in + * this instance. + * @param pIncludeClassOrigin + * classOrigins are only included if true. + * @param pPropertyList + * If the pPropertyList input parameter is not + * null, the members of the array define one or more + * Property names. The returned Instance does not include + * elements for any Properties missing from this list. If the + * pPropertyList input parameter is an empty array + * this signifies that no Properties are included in each + * returned class. If the pPropertyList input + * parameter is null this specifies that all + * Properties are included in each returned class. If the + * pPropertyList contains duplicate elements or + * invalid property names, they are ignored. + * @return CIMInstance matching the input filter. + */ + public CIMInstance filterProperties(boolean pLocalOnly, boolean pIncludeClassOrigin, + String[] pPropertyList) { + StringSorter.sort(pPropertyList); + ArrayList> propAList = new ArrayList>(); + for (int i = 0; i < getPropertyCount(); i++) { + CIMProperty prop = getProperty(i); + if (pLocalOnly && prop.isPropagated()) continue; + if (pPropertyList != null && !StringSorter.find(pPropertyList, prop.getName())) continue; + propAList.add(new CIMProperty(prop.getName(), prop.getDataType(), prop + .getValue(), prop.isKey(), prop.isPropagated(), pIncludeClassOrigin ? prop + .getOriginClass() : null)); + } + return new CIMInstance(this.iObjPath, propAList.toArray(EMPTY_PROP_A)); + } + + /** + * Get the name of the class that instantiates this CIM instance. + * + * @return Name of class that instantiates this CIM instance. + */ + public String getClassName() { + return this.iObjPath.getObjectName(); + } + + /** + * Get the key properties for this instance. + * + * @return An array of key properties. + */ + public CIMProperty[] getKeys() { + return this.iObjPath.getKeys(); + } + + /** + * Returns the CIMObjectPath that represents this instance. + * + * @return The CIMObjectPath that represents this instance. + */ + public CIMObjectPath getObjectPath() { + return this.iObjPath; + } + + /** + * Retrieve an array of the properties for this instance. + * + * @return An array of the CIM properties for this instance. + */ + public CIMProperty[] getProperties() { + return this.iProps == null ? new CIMProperty[0] : this.iProps; + } + + /** + * Get a class property by index. + * + * @param pIndex + * The index of the class property to retrieve. + * @return The CIMProperty at the specified index. + * @throws ArrayIndexOutOfBoundsException + */ + public CIMProperty getProperty(int pIndex) throws ArrayIndexOutOfBoundsException { + return this.iProps[pIndex]; + } + + /** + * Returns the specified property. + * + * @param pName + * The text string for the name of the property. + * @return The property requested or null if the property does + * not exist. + */ + public CIMProperty getProperty(String pName) { + return getProperty(pName, null); + } + + /** + * Returns the specified CIMProperty. + * + * @param pName + * The string name of the property to get. + * @param pOriginClass + * (Optional) The string name of the class in which the property + * was defined. + * @return null if the property does not exist, otherwise + * returns the CIM property. + */ + public CIMProperty getProperty(String pName, String pOriginClass) { + CIMProperty prop = (CIMProperty) CIMElementSorter.find(this.iProps, pName); + if (prop == null) return null; + if (pOriginClass == null) return prop; + if (pOriginClass.equalsIgnoreCase(prop.getOriginClass())) return prop; + return null; + } + + /** + * Get the number of properties defined in this CIMInstance. + * + * @return The number of properties defined in the CIMInstance. + */ + public int getPropertyCount() { + return this.iProps == null ? 0 : this.iProps.length; + } + + /** + * Returns the value of a property of this CIM Instance. + * + * @param name + * The name of the property. + * @return The value for the specified property name or null if + * the property does not exist. + */ + public Object getPropertyValue(String name) { + CIMProperty prop = getProperty(name); + return prop == null ? null : prop.getValue(); + } + + /** + * Computes the hash code for this instance. The hash code will be the + * object path of the instance not including the host or namespace + * information. + * + * @return The integer representing the hash code for this object path. + */ + @Override + public int hashCode() { + return toString().hashCode(); + } + + /** + * Returns a String representation of the + * CIMInstance. This method is intended to be used only for + * debugging purposes, and the format of the returned string may vary + * between implementations. The returned string may be empty but may not be + * null. + * + * @return String representation of this instance. + */ + @Override + public String toString() { + return MOF.instanceDeclaration(this, MOF.EMPTY); + } + + /** + * Indicates whether the data types of the two properties are equal. + * + * @param pProp0 + * First property. + *@param pProp1 + * Second property. + * @return true if the data types are the same, + * false otherwise. + */ + private static boolean typesEqual(CIMProperty pProp0, CIMProperty pProp1) { + CIMDataType type0 = pProp0.getDataType(), type1 = pProp0.getDataType(); + return type0.getType() == type1.getType() && type0.isArray() == type1.isArray(); + + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMMethod.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMMethod.java similarity index 88% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMMethod.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMMethod.java index de77c23..0c4624c 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMMethod.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMMethod.java @@ -1,305 +1,303 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Change History - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1660756 2007-02-22 ebak Embedded object support - * 1737141 2007-06-18 ebak Sync up with JSR48 evolution - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException - * 3001333 2010-05-19 blaschke-oss CIMMethod class ignores propagated parameter - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.util.Arrays; - -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMElementSorter; -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl; -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * This class represents a CIM Method as defined by the Distributed Management - * Task Force (DMTF) CIM Infrastructure - * Specification (DSP004). - * - * @param - * Type parameter. - */ -public class CIMMethod extends CIMTypedElement implements CIMQualifiedElementInterface { - - private static final long serialVersionUID = -3920536802046705977L; - - private CIMQualifiedElementInterfaceImpl iQualiImpl; - - private CIMParameter[] iParams; - - private boolean iPropagated; - - private String iOriginClass; - - /** - * Constructs a CIMMethod object with the specified - * information. - * - * @param pName - * The name of the method. - * @param pType - * The data type of the method. - * @param pQualis - * The method qualifiers. - * @param pParams - * The array of parameters for this method. - * @param pPropagated - * Is this method propagated from the superclass. - * @param pOriginClass - * The class this method was defined or overridden in. - */ - public CIMMethod(String pName, CIMDataType pType, CIMQualifier[] pQualis, - CIMParameter[] pParams, boolean pPropagated, String pOriginClass) { - super(pName, pType); - this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualis, false, true); - this.iParams = (CIMParameter[]) CIMElementSorter.sort(pParams); - this.iPropagated = pPropagated; - this.iOriginClass = pOriginClass; - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null - * and is a CIMMethod object that represents the same value as - * this object. - * - * @param pObj - * The object to compare. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMMethod)) return false; - if (!super.equals(pObj)) return false; - CIMMethod that = (CIMMethod) pObj; - if (!this.iQualiImpl.equals(that.iQualiImpl)) return false; - if (this.iPropagated != that.iPropagated) return false; - return Arrays.equals(getParameters(), that.getParameters()); - } - - /** - * Returns a CIMMethod filtered as specified. - * - * @param pIncludeQualifiers - * If true all qualifiers are returned; otherwise no - * qualifiers. - * @param pIncludeClassOrigin - * If true the class origin is included; otherwise - * no class origin is present. - * @return A filtered CIMMethod. - */ - public CIMMethod filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin) { - return filter(pIncludeQualifiers, pIncludeClassOrigin, false); - } - - /** - * Returns a CIMMethod filtered as specified. - * - * @param pIncludeQualifiers - * If true all qualifiers are returned; otherwise no - * qualifiers. - * @param pIncludeClassOrigin - * If true the class origin is included; otherwise - * no class origin is present - * @param pLocalOnly - * If true only the qualifiers defined on this class - * are included; otherwise all qualifiers are included. - * - * @return A filtered CIMMethod. - */ - public CIMMethod filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin, - boolean pLocalOnly) { - return new CIMMethod(getName(), getDataType(), pIncludeQualifiers ? this.iQualiImpl - .getQualifiers(pLocalOnly) : null, this.iParams, this.iPropagated, - pIncludeClassOrigin ? this.iOriginClass : null); - } - - /** - * Returns the class name in which this method was defined or overridden. - * - * @return Name of class where this property was defined. - */ - public String getOriginClass() { - return this.iOriginClass; - } - - /** - * Get the parameter that matches the specified name. - * - * @param pName - * The name of the CIMParameter to retrieve. - * @return CIMParameter matching the name specified; otherwise - * null. - */ - public CIMParameter getParameter(String pName) { - return (CIMParameter) CIMElementSorter.find(this.iParams, pName); - } - - /** - * Returns an array of the parameters for this method. - * - * @return The parameters for this method. - */ - public CIMParameter[] getParameters() { - return this.iParams == null ? new CIMParameter[0] : this.iParams; - } - - /** - * Get a qualifier by index. - * - * @param pIndex - * The index of the qualifier. - * @return The Qualifier at index pIndex. - * @throws ArrayIndexOutOfBoundsException - */ - public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsException { - return this.iQualiImpl.getQualifier(pIndex); - } - - /** - * Gets a qualifier by name. - * - * @param pName - * The name of the qualifier to get. - * @return null if the qualifier does not exist, otherwise - * returns the reference to the qualifier. - */ - public CIMQualifier getQualifier(String pName) { - return this.iQualiImpl.getQualifier(pName); - } - - /** - * Get the number of qualifiers defined for this CIM Method. - * - * @return The number of qualifiers. - */ - public int getQualifierCount() { - return this.iQualiImpl.getQualifierCount(); - } - - /** - * Returns the list of qualifiers for this class. - * - * @return Qualifiers for this class. - */ - public CIMQualifier[] getQualifiers() { - return this.iQualiImpl.getQualifiers(); - } - - /** - * Gets a qualifier value by name. - * - * @param pName - * The name of the qualifier to get. - * @return null if the qualifier does not exist or value is - * null, otherwise returns the reference to the - * qualifier. - */ - public Object getQualifierValue(String pName) { - return this.iQualiImpl.getQualifierValue(pName); - } - - /** - * Checks whether the specified qualifier is one of the qualifiers in this - * CIM method. - * - * @param pName - * The name of the qualifier. - * @return true if the qualifier exists in this CIM method, - * otherwise false. - */ - public boolean hasQualifier(String pName) { - return this.iQualiImpl.hasQualifier(pName); - } - - /** - * Checks whether the specified qualifier is one of the qualifiers defined - * for this method with the specified value. This method will return - * false if the qualifier is not applied or if the value does - * not match. - * - * @param pName - * The name of the qualifier. - * @param pValue - * The value to be tested. - * @return true if the qualifier exists and has this value, - * otherwise false. - */ - public boolean hasQualifierValue(String pName, Object pValue) { - return this.iQualiImpl.hasQualifierValue(pName, pValue); - } - - /** - * Determines if this method is Propagated. - * - * @return true if this method is propagated. - */ - public boolean isPropagated() { - return this.iPropagated; - } - - /** - * Returns a String representation of the - * CIMMethod. This method is intended to be used only for - * debugging purposes, and the format of the returned string may vary - * between implementations. The returned string may be empty but may not be - * null. - * - * @return The string representation of this method. - */ - @Override - public String toString() { - return MOF.methodDeclaration(this, MOF.EMPTY); - } - -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Change History + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1660756 2007-02-22 ebak Embedded object support + * 1737141 2007-06-18 ebak Sync up with JSR48 evolution + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException + * 3001333 2010-05-19 blaschke-oss CIMMethod class ignores propagated parameter + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.util.Arrays; + +import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMElementSorter; +import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl; +import org.metricshub.wbem.sblim.cimclient.internal.util.MOF; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * This class represents a CIM Method as defined by the Distributed Management + * Task Force (DMTF) CIM Infrastructure + * Specification (DSP004). + * + * @param + * Type parameter. + */ +public class CIMMethod extends CIMTypedElement implements CIMQualifiedElementInterface { + + private static final long serialVersionUID = -3920536802046705977L; + + private CIMQualifiedElementInterfaceImpl iQualiImpl; + + private CIMParameter[] iParams; + + private boolean iPropagated; + + private String iOriginClass; + + /** + * Constructs a CIMMethod object with the specified + * information. + * + * @param pName + * The name of the method. + * @param pType + * The data type of the method. + * @param pQualis + * The method qualifiers. + * @param pParams + * The array of parameters for this method. + * @param pPropagated + * Is this method propagated from the superclass. + * @param pOriginClass + * The class this method was defined or overridden in. + */ + public CIMMethod(String pName, CIMDataType pType, CIMQualifier[] pQualis, + CIMParameter[] pParams, boolean pPropagated, String pOriginClass) { + super(pName, pType); + this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualis, false, true); + this.iParams = (CIMParameter[]) CIMElementSorter.sort(pParams); + this.iPropagated = pPropagated; + this.iOriginClass = pOriginClass; + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null + * and is a CIMMethod object that represents the same value as + * this object. + * + * @param pObj + * The object to compare. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMMethod)) return false; + if (!super.equals(pObj)) return false; + CIMMethod that = (CIMMethod) pObj; + if (!this.iQualiImpl.equals(that.iQualiImpl)) return false; + if (this.iPropagated != that.iPropagated) return false; + return Arrays.equals(getParameters(), that.getParameters()); + } + + /** + * Returns a CIMMethod filtered as specified. + * + * @param pIncludeQualifiers + * If true all qualifiers are returned; otherwise no + * qualifiers. + * @param pIncludeClassOrigin + * If true the class origin is included; otherwise + * no class origin is present. + * @return A filtered CIMMethod. + */ + public CIMMethod filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin) { + return filter(pIncludeQualifiers, pIncludeClassOrigin, false); + } + + /** + * Returns a CIMMethod filtered as specified. + * + * @param pIncludeQualifiers + * If true all qualifiers are returned; otherwise no + * qualifiers. + * @param pIncludeClassOrigin + * If true the class origin is included; otherwise + * no class origin is present + * @param pLocalOnly + * If true only the qualifiers defined on this class + * are included; otherwise all qualifiers are included. + * + * @return A filtered CIMMethod. + */ + public CIMMethod filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin, + boolean pLocalOnly) { + return new CIMMethod(getName(), getDataType(), pIncludeQualifiers ? this.iQualiImpl + .getQualifiers(pLocalOnly) : null, this.iParams, this.iPropagated, + pIncludeClassOrigin ? this.iOriginClass : null); + } + + /** + * Returns the class name in which this method was defined or overridden. + * + * @return Name of class where this property was defined. + */ + public String getOriginClass() { + return this.iOriginClass; + } + + /** + * Get the parameter that matches the specified name. + * + * @param pName + * The name of the CIMParameter to retrieve. + * @return CIMParameter matching the name specified; otherwise + * null. + */ + public CIMParameter getParameter(String pName) { + return (CIMParameter) CIMElementSorter.find(this.iParams, pName); + } + + /** + * Returns an array of the parameters for this method. + * + * @return The parameters for this method. + */ + public CIMParameter[] getParameters() { + return this.iParams == null ? new CIMParameter[0] : this.iParams; + } + + /** + * Get a qualifier by index. + * + * @param pIndex + * The index of the qualifier. + * @return The Qualifier at index pIndex. + * @throws ArrayIndexOutOfBoundsException + */ + public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsException { + return this.iQualiImpl.getQualifier(pIndex); + } + + /** + * Gets a qualifier by name. + * + * @param pName + * The name of the qualifier to get. + * @return null if the qualifier does not exist, otherwise + * returns the reference to the qualifier. + */ + public CIMQualifier getQualifier(String pName) { + return this.iQualiImpl.getQualifier(pName); + } + + /** + * Get the number of qualifiers defined for this CIM Method. + * + * @return The number of qualifiers. + */ + public int getQualifierCount() { + return this.iQualiImpl.getQualifierCount(); + } + + /** + * Returns the list of qualifiers for this class. + * + * @return Qualifiers for this class. + */ + public CIMQualifier[] getQualifiers() { + return this.iQualiImpl.getQualifiers(); + } + + /** + * Gets a qualifier value by name. + * + * @param pName + * The name of the qualifier to get. + * @return null if the qualifier does not exist or value is + * null, otherwise returns the reference to the + * qualifier. + */ + public Object getQualifierValue(String pName) { + return this.iQualiImpl.getQualifierValue(pName); + } + + /** + * Checks whether the specified qualifier is one of the qualifiers in this + * CIM method. + * + * @param pName + * The name of the qualifier. + * @return true if the qualifier exists in this CIM method, + * otherwise false. + */ + public boolean hasQualifier(String pName) { + return this.iQualiImpl.hasQualifier(pName); + } + + /** + * Checks whether the specified qualifier is one of the qualifiers defined + * for this method with the specified value. This method will return + * false if the qualifier is not applied or if the value does + * not match. + * + * @param pName + * The name of the qualifier. + * @param pValue + * The value to be tested. + * @return true if the qualifier exists and has this value, + * otherwise false. + */ + public boolean hasQualifierValue(String pName, Object pValue) { + return this.iQualiImpl.hasQualifierValue(pName, pValue); + } + + /** + * Determines if this method is Propagated. + * + * @return true if this method is propagated. + */ + public boolean isPropagated() { + return this.iPropagated; + } + + /** + * Returns a String representation of the + * CIMMethod. This method is intended to be used only for + * debugging purposes, and the format of the returned string may vary + * between implementations. The returned string may be empty but may not be + * null. + * + * @return The string representation of this method. + */ + @Override + public String toString() { + return MOF.methodDeclaration(this, MOF.EMPTY); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMNamedElementInterface.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMNamedElementInterface.java similarity index 67% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMNamedElementInterface.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMNamedElementInterface.java index 318a916..7b78352 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMNamedElementInterface.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMNamedElementInterface.java @@ -1,61 +1,59 @@ -/* - (C) Copyright IBM Corp. 2006, 2010 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Change History - * Flag Date Prog Description - *------------------------------------------------------------------------------------------------- - * 2006-04-25 ebak Initial commit - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * The NamedElementInterface is used by CIM Elements that are named. For - * example, CIM Qualifier Types, CIM Classes and CIM Instances are all named and - * can be retrieved by a WBEM client. - */ -public interface CIMNamedElementInterface { - - /** - * Retrieve the ObjectPath that represents the name for this element. - * - * @return The Object Path that represents the element. - */ - CIMObjectPath getObjectPath(); - -} +/* + (C) Copyright IBM Corp. 2006, 2010 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Change History + * Flag Date Prog Description + *------------------------------------------------------------------------------------------------- + * 2006-04-25 ebak Initial commit + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * The NamedElementInterface is used by CIM Elements that are named. For + * example, CIM Qualifier Types, CIM Classes and CIM Instances are all named and + * can be retrieved by a WBEM client. + */ +public interface CIMNamedElementInterface { + + /** + * Retrieve the ObjectPath that represents the name for this element. + * + * @return The Object Path that represents the element. + */ + CIMObjectPath getObjectPath(); + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMObjectPath.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java similarity index 90% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMObjectPath.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java index a44e867..3db7a92 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMObjectPath.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java @@ -1,674 +1,672 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() - * 1716991 2006-05-11 lupusalex FVT: CIMObjectPath.equals() should ignore host name - * 1737141 2007-06-18 ebak Sync up with JSR48 evolution - * 1917321 2008-05-29 rgummada javadoc update to constructors with 2 and more parms - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 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 - * 2845128 2009-09-24 blaschke-oss CIMObjectPath.toString() misses host - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2944824 2010-02-08 blaschke-oss Missing getXmlSchemaName() in CIMObjectPath - * 2975975 2010-03-24 blaschke-oss TCK: CIMObjectPath(String) does not handle null - * 3023141 2010-07-01 blaschke-oss CIMObjectPath uses # constructor instead of valueOf - * 3496349 2012-03-02 blaschke-oss JSR48 1.0.0: add CIMObjectPath getKeyValue - * 3510090 2012-03-23 blaschke-oss Fix CIMObjectPath.toString() inconsistencies - * 3513343 2012-03-31 blaschke-oss TCK: CIMObjectPath must validate XML schema name - * 3513347 2012-03-31 blaschke-oss TCK: CIMObjectPath allows empty string - * 3521131 2012-04-24 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II - * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors - * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP - * 2660 2013-09-04 blaschke-oss CIMObjectPath.equalsModelPath same as equals - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.io.Serializable; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Arrays; - -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMElementSorter; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.BooleanValue; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.CharValue; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.DateTimeValue; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.IntegerValue; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.KeyValuePair; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.KeyValuePairs; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.RealValue; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.ReferenceValue; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.StringValue; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.URI; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.URIString; -import org.sentrysoftware.wbem.sblim.cimclient.internal.uri.Value; -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF; - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * This class represents the CIM Object Path as defined by the Distributed - * Management Task Force (DMTF) CIM - * Infrastructure Specification (DSP004). In order to uniquely identify a given object, a CIM object path - * includes the host, namespace, object name and keys (if the object is an - * instance).
      - *
      - * For example, the object path:
      - *
      - * - * http://myserver/root/cimv2:My_ComputerSystem.Name=mycomputer, - * CreationClassName=My_ComputerSystem - *
      - *
      - * has two parts:
      - *
      - *
      • Namespace Path
        • - *
      • - * http://myserver/root/cimv2 - * JSR48 defines the namespace path to include the scheme, host, port (optional) - * and namespace - * The example specifies the "root/cimv2" namespace on the host - * myserver.
      • Model Path
        • - *
      • My_ComputerSystem.Name=mycomputer,CreationClassName=My_ComputerSystem - *
        - * DSP0004 defines the model path for a class or qualifier type as the name of - * the class/qualifier type
        - * DSP0004 defines the model path for an instance as the class - * name.(key=value),*
        - * The example specifies an instance for the class - * My_ComputerSystem which is uniquely identified by two key - * properties and values:
      • Name=mycomputer
        • - *
      • - * CreationClassName=My_ComputerSystem
      - */ -public class CIMObjectPath extends Object implements Serializable { - - private static final long serialVersionUID = 4593259690658425064L; - - private String iScheme, iHost, iPort, iNamespace, iObjectName, iXmlSchemaName; - - private CIMProperty[] iKeys; - - /** - * Class TypeValuePair represents a type-value pair with special - * identification functionality for integer and real numbers. - * - */ - private static class TypeValuePair { - - private CIMDataType iType; - - private Object iValue; - - /** - * Constructs a type-value pair with the specified type and value. - * - * @param pType - * Type. - * @param pValue - * Value. - */ - public TypeValuePair(CIMDataType pType, Object pValue) { - this.iType = pType; - this.iValue = pValue; - } - - /** - * Constructs a type-value pair with the specified integer value. - * - * @param intVal - * Integer value. - */ - public TypeValuePair(IntegerValue intVal) { - if (intVal.isSigned()) { - switch (intVal.getBitWidth()) { - case 8: - this.iType = CIMDataType.SINT8_T; - this.iValue = Byte.valueOf(intVal.byteValue()); - break; - case 16: - this.iType = CIMDataType.SINT16_T; - this.iValue = Short.valueOf(intVal.shortValue()); - break; - case 32: - this.iType = CIMDataType.SINT32_T; - this.iValue = Integer.valueOf(intVal.intValue()); - break; - default: - this.iType = CIMDataType.SINT64_T; - this.iValue = Long.valueOf(intVal.longValue()); - } - - } else { // unsigned integers - switch (intVal.getBitWidth()) { - case 8: - this.iType = CIMDataType.UINT8_T; - this.iValue = new UnsignedInteger8(intVal.shortValue()); - break; - case 16: - this.iType = CIMDataType.UINT16_T; - this.iValue = new UnsignedInteger16(intVal.intValue()); - break; - case 32: - this.iType = CIMDataType.UINT32_T; - this.iValue = new UnsignedInteger32(intVal.longValue()); - break; - default: - this.iType = CIMDataType.UINT64_T; - this.iValue = new UnsignedInteger64(intVal.bigIntValue()); - } - } - } - - /** - * Constructs a type-value pair with the specified real value. - * - * @param pRealVal - * Real value. - */ - public TypeValuePair(RealValue pRealVal) { - // TODO: handle precision - if (pRealVal.isDouble()) { - this.iType = CIMDataType.REAL64_T; - this.iValue = new Double(pRealVal.doubleValue()); - } else { - this.iType = CIMDataType.REAL32_T; - this.iValue = new Float(pRealVal.floatValue()); - } - } - - /** - * Returns the type of the type-value pair. - * - * @return Type of type-value pair. - */ - public CIMDataType getType() { - return this.iType; - } - - /** - * Returns the value of the type-value pair. - * - * @return Value of type-value pair. - */ - public Object getValue() { - return this.iValue; - } - - } - - /** - * Extracts and returns sorted list of key-value pairs from the URI. - * - * @param pURI - * The Uniform Resource Identifier. - * @return Sorted array of keys in URI. - */ - private CIMProperty[] getKeysFromURI(URI pURI) { - KeyValuePairs pairs = pURI.getKeyValuePairs(); - if (pairs == null) return null; - CIMProperty[] keys = new CIMProperty[pairs.size()]; - for (int i = 0; i < pairs.size(); i++) { - KeyValuePair pair = (KeyValuePair) pairs.elementAt(i); - String name = pair.getKey(); - Value uriVal = pair.getValue(); - TypeValuePair typeValue; - if (uriVal instanceof StringValue) { - typeValue = new TypeValuePair(CIMDataType.STRING_T, uriVal.toString()); - } else if (uriVal instanceof ReferenceValue) { - ReferenceValue refVal = (ReferenceValue) uriVal; - CIMObjectPath op = new CIMObjectPath(refVal.getRef()); - typeValue = new TypeValuePair(new CIMDataType(op.getObjectName()), op); - } else if (uriVal instanceof BooleanValue) { - typeValue = new TypeValuePair(CIMDataType.BOOLEAN_T, ((BooleanValue) uriVal) - .getBoolean()); - } else if (uriVal instanceof CharValue) { - typeValue = new TypeValuePair(CIMDataType.CHAR16_T, ((CharValue) uriVal) - .getCharacter()); - } else if (uriVal instanceof IntegerValue) { - typeValue = new TypeValuePair((IntegerValue) uriVal); - } else if (uriVal instanceof RealValue) { - typeValue = new TypeValuePair((RealValue) uriVal); - } else if (uriVal instanceof DateTimeValue) { - typeValue = new TypeValuePair(CIMDataType.DATETIME_T, ((DateTimeValue) uriVal) - .getDateTime()); - } else { - // TODO: error or warning tracing - typeValue = new TypeValuePair(CIMDataType.INVALID_T, null); - } - keys[i] = new CIMProperty(name, typeValue.getType(), typeValue.getValue(), - true, false, null); - } - return (CIMProperty[]) CIMElementSorter.sort(keys); - } - - /** - * Initializes the elements of the CIMObjectPath from the given - * URI. - * - * @param pURI - * The Uniform Resource Identifier. - */ - private void setURI(URI pURI) { - this.iNamespace = pURI.getNamespaceName(); - this.iScheme = pURI.getNamespaceType(); - this.iHost = pURI.getHost(); - this.iPort = pURI.getPort(); - this.iObjectName = pURI.getClassName(); - this.iKeys = getKeysFromURI(pURI); - } - - /** - * Constructs a CIM Object Path referencing an instance of the specified CIM - * element in the given URI. - * - * @param pURI - * The Uniform Resource Identifier. - */ - private CIMObjectPath(URI pURI) { - setURI(pURI); - } - - /** - * Constructs a CIM Object Path referencing a CIM element. The name can - * refer to a class name or a qualifier type name, depending on the - * particular CIM element identified. In order to refer to an instance, the - * key properties and their corresponding values must be set.
      - *
      - * Should be able to handle strings, like:
      - * - * http://myserver.org:5066/root/cimv2:My_ComputerSystem.Name="mycmp",CreationClassName="My_ComputerSystem" - *
      - * http://myserver.org/root/cimv2:My_ComputerSystem.Name="mycmp",CreationClassName="My_ComputerSystem" - *
      - * //myserver.org/root/cimv2:My_ComputerSystem
      - * /root/cimv2:My_ComputerSystem - *       - * - * @param pObjectPath - * The string representation of an object path for a CIM element - * that will be parsed and used to initialize the object. - * @throws IllegalArgumentException - * If the pObjectPath is null or an - * empty string. - */ - public CIMObjectPath(String pObjectPath) { - URI uri; - - if (pObjectPath == null) throw new IllegalArgumentException("ObjectPath is null!"); - if (pObjectPath.trim().length() == 0) throw new IllegalArgumentException( - "ObjectPath is empty!"); - - try { - uri = URI.parse(pObjectPath); - } catch (IllegalArgumentException asURI) { - try { - uri = URI.parseRef(new URIString(pObjectPath), false); - } catch (IllegalArgumentException asUntypedRef) { - try { - uri = URI.parseRef(new URIString(pObjectPath), true); - } catch (IllegalArgumentException asTypedRef) { - String msg = "Parsing of ObjectPath string has failed!\n" - + "Nested error messages:\n" + "When parsing as normal URI string:\n" - + asURI.getMessage() + "When parsing as untyped reference:\n" - + asUntypedRef.getMessage() + "When parsing as typed reference:\n" - + asTypedRef.getMessage(); - // TODO: tracing - throw new IllegalArgumentException(msg); - } - } - } - setURI(uri); - } - - /** - * Constructs a CIM Object Path referencing an instance of the specified CIM - * element as defined in the specified namespace on the specified host and - * identified by the given key properties and their corresponding values. - * Note that the connection mechanism and the port number to which a client - * connection is established are also specified.
      - *
      - * NOTE: When using this API against OpenPegasus CIMOM, do not provide the - * preceding '/' in the namespace parameter. For example, OpenPegasus will - * accept "root/cimv2" as a namespace but will not accept - * "/root/cimv2". - * - * @param pScheme - * The connection scheme to the host (e.g. http, https, ...) - * @param pHost - * The host name or IP Address. - * @param pPort - * The port on the host to which the connection was established. - * @param pNamespace - * The namepace in which the CIM element is defined. - * @param pObjectName - * The name of the CIM element referenced. - * @param pKeys - * The keys and their corresponding values that identify an - * instance of the CIM element. - */ - public CIMObjectPath(String pScheme, String pHost, String pPort, String pNamespace, - String pObjectName, CIMProperty[] pKeys) { - this.iScheme = pScheme; - this.iHost = pHost; - this.iPort = pPort; - this.iNamespace = pNamespace; - this.iObjectName = pObjectName; - if (pKeys != null) { - for (int i = 0; i < pKeys.length; i++) - if (!pKeys[i].isKey()) throw new IllegalArgumentException( - "All CIMObjectPath properties must be keys!"); - } - this.iKeys = (CIMProperty[]) CIMElementSorter.sort(pKeys); - } - - /** - * Constructs a CIM Object Path referencing an instance of the specified CIM - * element as defined in the specified namespace on the specified host and - * identified by the given key properties and their corresponding values. - * Note that the connection mechanism and the port number to which a client - * connection is established are also specified.
      - *
      - * NOTE: When using this API against OpenPegasus CIMOM, do not provide the - * preceding '/' in the namespace parameter. For example, OpenPegasus will - * accept "root/cimv2" as a namespace but will not accept - * "/root/cimv2". - * - * @param pScheme - * The connection scheme to the host (e.g. http, https, ...) - * @param pHost - * The host name or IP Address. - * @param pPort - * The port on the host to which the connection was established. - * @param pNamespace - * The namepace in which the CIM element is defined. - * @param pObjectName - * The name of the CIM element referenced. - * @param pKeys - * The keys and their corresponding values that identify an - * instance of the CIM element. - * @param pXmlSchemaName - * The name of the XML Schema for this object. This is only - * needed for protocols that require this information. - */ - public CIMObjectPath(String pScheme, String pHost, String pPort, String pNamespace, - String pObjectName, CIMProperty[] pKeys, String pXmlSchemaName) { - this(pScheme, pHost, pPort, pNamespace, pObjectName, pKeys); - if (pXmlSchemaName != null) { - try { - new URL(pXmlSchemaName); - } catch (MalformedURLException e) { - throw new IllegalArgumentException(e); - } - } - this.iXmlSchemaName = pXmlSchemaName; - } - - /** - * Compares this CIM object path with the specified CIM object path for - * equality. - * - * @param pObj - * The object to compare to this CIM object path. Only the model - * paths are compared. - * @return true if the specified path references the same - * object, otherwise false is returned. - */ - @Override - public boolean equals(Object pObj) { - return equalsWorker(pObj, true); - } - - private boolean equalsWorker(Object pObj, boolean pIncludeNamespacePath) { - if (!(pObj instanceof CIMObjectPath)) return false; - CIMObjectPath that = (CIMObjectPath) pObj; - // hostname information is not any longer part of the comparison, since - // there is no reliable way to attach hostnames - if (pIncludeNamespacePath) { - boolean namespaceEqual = (this.iNamespace == null ? that.iNamespace == null - : this.iNamespace.equalsIgnoreCase(that.iNamespace)); - if (!namespaceEqual) return false; - } - return (this.iObjectName == null ? that.iObjectName == null : this.iObjectName - .equalsIgnoreCase(that.iObjectName)) - && keysEqual(that); - } - - /** - * Compares this CIM object path's keys with the specified CIM object path's - * keys for equality.
      - *
      - * NOTE: CIMProperty.equals() shouldn't be used for keys, - * because the XML doesn't contain originClass and propagated information. - * - * @param pThat - * The object path whose keys are to be compared to this CIM - * object path's keys. - * @return true if the keys are the same, otherwise - * false is returned. - */ - private boolean keysEqual(CIMObjectPath pThat) { - if (pThat == this) return true; - if (this.iKeys == null) return pThat.iKeys == null; - if (pThat.iKeys == null) return false; - if (this.iKeys.length != pThat.iKeys.length) return false; - for (int i = 0; i < this.iKeys.length; i++) { - CIMProperty thisKey = this.iKeys[i], thatKey = pThat.iKeys[i]; - if (!equals(thisKey, thatKey)) { return false; } - } - return true; - } - - /** - * Compares two properties for equality. - * - * @param pThis - * First property. - * @param pThat - * Second property. - * @return true if the properties are equal, false - * otherwise. - */ - private boolean equals(CIMProperty pThis, CIMProperty pThat) { - if (pThis.getDataType() != null && pThis.getDataType().isArray()) { return ncEqualsIC(pThis - .getName(), pThat.getName()) - && ncEquals(pThis.getDataType(), pThat.getDataType()) - && Arrays.equals((Object[]) pThis.getValue(), (Object[]) pThat.getValue()); - - } - return ncEqualsIC(pThis.getName(), pThat.getName()) - && ncEquals(pThis.getDataType(), pThat.getDataType()) - && ncEquals(pThis.getValue(), pThat.getValue()); - } - - /** - * Compares two objects for equality. - * - * @param pThis - * First object. - * @param pThat - * Second object. - * @return true if the objects are equal, false - * otherwise. - */ - private boolean ncEquals(Object pThis, Object pThat) { - return pThis == null ? pThat == null : pThis.equals(pThat); - } - - /** - * Compares two strings for equality, ignoring case. - * - * @param pThis - * First string. - * @param pThat - * Second string. - * @return true if the strings are equal, false - * otherwise. - */ - private boolean ncEqualsIC(String pThis, String pThat) { - return pThis == null ? pThat == null : pThis.equalsIgnoreCase(pThat); - } - - /** - * Compares this model path with the specified model path for equality. If - * the model path includes references, then the references will also be - * compared for the model path (i.e. the namespace part of the object path - * will be ignored). - * - * @param pModelPath - * The object to compare. - * @return true if the specified path references the same - * object, otherwise false. - */ - public boolean equalsModelPath(CIMObjectPath pModelPath) { - return equalsWorker(pModelPath, false); - } - - /** - * Gets the host. - * - * @return The name of the host. - */ - public String getHost() { - return this.iHost; - } - - /** - * Gets a key property by name. - * - * @param pName - * The name of the key property to retrieve. - * @return The CIMProperty with the given name, or - * null if it is not found. - */ - public CIMProperty getKey(String pName) { - return (CIMProperty) CIMElementSorter.find(this.iKeys, pName); - } - - /** - * Gets all key properties. - * - * @return The container of key properties. - */ - public CIMProperty[] getKeys() { - return this.iKeys == null ? new CIMProperty[0] : this.iKeys; - } - - /** - * @param pName - * The name of the key property to retrieve. - * @return The value of the key property. - */ - public Object getKeyValue(String pName) { - CIMProperty prop = getKey(pName); - return prop == null ? prop : prop.getValue(); - } - - /** - * Gets the namespace. - * - * @return The name of the namespace. - */ - public String getNamespace() { - return this.iNamespace; - } - - /** - * Gets the object name. Depending on the type of CIM element referenced, - * this may be either a class name or a qualifier type name. - * - * @return The name of this CIM element. - */ - public String getObjectName() { - return this.iObjectName; - } - - /** - * Gets the the port on the host to which the connection was established. - * - * @return The port on the host. - */ - public String getPort() { - return this.iPort; - } - - /** - * Get the connection scheme. - * - * @return The connection scheme (e.g. http, https,...) - */ - public String getScheme() { - return this.iScheme; - } - - /** - * Get the XML Schema for this object (optional). - * - * @return The XML Schema name. - */ - public String getXmlSchemaName() { - return this.iXmlSchemaName; - } - - /** - * Computes the hash code for this object path. - * - * @return The integer representing the hash code for this object path. - */ - @Override - public int hashCode() { - return toString().hashCode(); - } - - /** - * Returns a String representation of the CIM object path. This - * method is intended to be used only for debugging purposes. The format of - * the value returned may vary between implementations. The string returned - * may be empty but may not be null. - * - * @return A string representation of this CIM object path. - */ - @Override - public String toString() { - return MOF.objectHandle(this, false, false); - } - -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() + * 1716991 2006-05-11 lupusalex FVT: CIMObjectPath.equals() should ignore host name + * 1737141 2007-06-18 ebak Sync up with JSR48 evolution + * 1917321 2008-05-29 rgummada javadoc update to constructors with 2 and more parms + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 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 + * 2845128 2009-09-24 blaschke-oss CIMObjectPath.toString() misses host + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2944824 2010-02-08 blaschke-oss Missing getXmlSchemaName() in CIMObjectPath + * 2975975 2010-03-24 blaschke-oss TCK: CIMObjectPath(String) does not handle null + * 3023141 2010-07-01 blaschke-oss CIMObjectPath uses # constructor instead of valueOf + * 3496349 2012-03-02 blaschke-oss JSR48 1.0.0: add CIMObjectPath getKeyValue + * 3510090 2012-03-23 blaschke-oss Fix CIMObjectPath.toString() inconsistencies + * 3513343 2012-03-31 blaschke-oss TCK: CIMObjectPath must validate XML schema name + * 3513347 2012-03-31 blaschke-oss TCK: CIMObjectPath allows empty string + * 3521131 2012-04-24 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II + * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors + * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP + * 2660 2013-09-04 blaschke-oss CIMObjectPath.equalsModelPath same as equals + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.io.Serializable; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Arrays; + +import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMElementSorter; +import org.metricshub.wbem.sblim.cimclient.internal.uri.BooleanValue; +import org.metricshub.wbem.sblim.cimclient.internal.uri.CharValue; +import org.metricshub.wbem.sblim.cimclient.internal.uri.DateTimeValue; +import org.metricshub.wbem.sblim.cimclient.internal.uri.IntegerValue; +import org.metricshub.wbem.sblim.cimclient.internal.uri.KeyValuePair; +import org.metricshub.wbem.sblim.cimclient.internal.uri.KeyValuePairs; +import org.metricshub.wbem.sblim.cimclient.internal.uri.RealValue; +import org.metricshub.wbem.sblim.cimclient.internal.uri.ReferenceValue; +import org.metricshub.wbem.sblim.cimclient.internal.uri.StringValue; +import org.metricshub.wbem.sblim.cimclient.internal.uri.URI; +import org.metricshub.wbem.sblim.cimclient.internal.uri.URIString; +import org.metricshub.wbem.sblim.cimclient.internal.uri.Value; +import org.metricshub.wbem.sblim.cimclient.internal.util.MOF; + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * This class represents the CIM Object Path as defined by the Distributed + * Management Task Force (DMTF) CIM + * Infrastructure Specification (DSP004). In order to uniquely identify a given object, a CIM object path + * includes the host, namespace, object name and keys (if the object is an + * instance).
      + *
      + * For example, the object path:
      + *
      + * + * http://myserver/root/cimv2:My_ComputerSystem.Name=mycomputer, + * CreationClassName=My_ComputerSystem + *
      + *
      + * has two parts:
      + *
      + *
      • Namespace Path
        • + *
      • + * http://myserver/root/cimv2 + * JSR48 defines the namespace path to include the scheme, host, port (optional) + * and namespace + * The example specifies the "root/cimv2" namespace on the host + * myserver.
      • Model Path
        • + *
      • My_ComputerSystem.Name=mycomputer,CreationClassName=My_ComputerSystem + *
        + * DSP0004 defines the model path for a class or qualifier type as the name of + * the class/qualifier type
        + * DSP0004 defines the model path for an instance as the class + * name.(key=value),*
        + * The example specifies an instance for the class + * My_ComputerSystem which is uniquely identified by two key + * properties and values:
      • Name=mycomputer
        • + *
      • + * CreationClassName=My_ComputerSystem
      + */ +public class CIMObjectPath extends Object implements Serializable { + + private static final long serialVersionUID = 4593259690658425064L; + + private String iScheme, iHost, iPort, iNamespace, iObjectName, iXmlSchemaName; + + private CIMProperty[] iKeys; + + /** + * Class TypeValuePair represents a type-value pair with special + * identification functionality for integer and real numbers. + * + */ + private static class TypeValuePair { + + private CIMDataType iType; + + private Object iValue; + + /** + * Constructs a type-value pair with the specified type and value. + * + * @param pType + * Type. + * @param pValue + * Value. + */ + public TypeValuePair(CIMDataType pType, Object pValue) { + this.iType = pType; + this.iValue = pValue; + } + + /** + * Constructs a type-value pair with the specified integer value. + * + * @param intVal + * Integer value. + */ + public TypeValuePair(IntegerValue intVal) { + if (intVal.isSigned()) { + switch (intVal.getBitWidth()) { + case 8: + this.iType = CIMDataType.SINT8_T; + this.iValue = Byte.valueOf(intVal.byteValue()); + break; + case 16: + this.iType = CIMDataType.SINT16_T; + this.iValue = Short.valueOf(intVal.shortValue()); + break; + case 32: + this.iType = CIMDataType.SINT32_T; + this.iValue = Integer.valueOf(intVal.intValue()); + break; + default: + this.iType = CIMDataType.SINT64_T; + this.iValue = Long.valueOf(intVal.longValue()); + } + + } else { // unsigned integers + switch (intVal.getBitWidth()) { + case 8: + this.iType = CIMDataType.UINT8_T; + this.iValue = new UnsignedInteger8(intVal.shortValue()); + break; + case 16: + this.iType = CIMDataType.UINT16_T; + this.iValue = new UnsignedInteger16(intVal.intValue()); + break; + case 32: + this.iType = CIMDataType.UINT32_T; + this.iValue = new UnsignedInteger32(intVal.longValue()); + break; + default: + this.iType = CIMDataType.UINT64_T; + this.iValue = new UnsignedInteger64(intVal.bigIntValue()); + } + } + } + + /** + * Constructs a type-value pair with the specified real value. + * + * @param pRealVal + * Real value. + */ + public TypeValuePair(RealValue pRealVal) { + // TODO: handle precision + if (pRealVal.isDouble()) { + this.iType = CIMDataType.REAL64_T; + this.iValue = new Double(pRealVal.doubleValue()); + } else { + this.iType = CIMDataType.REAL32_T; + this.iValue = new Float(pRealVal.floatValue()); + } + } + + /** + * Returns the type of the type-value pair. + * + * @return Type of type-value pair. + */ + public CIMDataType getType() { + return this.iType; + } + + /** + * Returns the value of the type-value pair. + * + * @return Value of type-value pair. + */ + public Object getValue() { + return this.iValue; + } + + } + + /** + * Extracts and returns sorted list of key-value pairs from the URI. + * + * @param pURI + * The Uniform Resource Identifier. + * @return Sorted array of keys in URI. + */ + private CIMProperty[] getKeysFromURI(URI pURI) { + KeyValuePairs pairs = pURI.getKeyValuePairs(); + if (pairs == null) return null; + CIMProperty[] keys = new CIMProperty[pairs.size()]; + for (int i = 0; i < pairs.size(); i++) { + KeyValuePair pair = (KeyValuePair) pairs.elementAt(i); + String name = pair.getKey(); + Value uriVal = pair.getValue(); + TypeValuePair typeValue; + if (uriVal instanceof StringValue) { + typeValue = new TypeValuePair(CIMDataType.STRING_T, uriVal.toString()); + } else if (uriVal instanceof ReferenceValue) { + ReferenceValue refVal = (ReferenceValue) uriVal; + CIMObjectPath op = new CIMObjectPath(refVal.getRef()); + typeValue = new TypeValuePair(new CIMDataType(op.getObjectName()), op); + } else if (uriVal instanceof BooleanValue) { + typeValue = new TypeValuePair(CIMDataType.BOOLEAN_T, ((BooleanValue) uriVal) + .getBoolean()); + } else if (uriVal instanceof CharValue) { + typeValue = new TypeValuePair(CIMDataType.CHAR16_T, ((CharValue) uriVal) + .getCharacter()); + } else if (uriVal instanceof IntegerValue) { + typeValue = new TypeValuePair((IntegerValue) uriVal); + } else if (uriVal instanceof RealValue) { + typeValue = new TypeValuePair((RealValue) uriVal); + } else if (uriVal instanceof DateTimeValue) { + typeValue = new TypeValuePair(CIMDataType.DATETIME_T, ((DateTimeValue) uriVal) + .getDateTime()); + } else { + // TODO: error or warning tracing + typeValue = new TypeValuePair(CIMDataType.INVALID_T, null); + } + keys[i] = new CIMProperty(name, typeValue.getType(), typeValue.getValue(), + true, false, null); + } + return (CIMProperty[]) CIMElementSorter.sort(keys); + } + + /** + * Initializes the elements of the CIMObjectPath from the given + * URI. + * + * @param pURI + * The Uniform Resource Identifier. + */ + private void setURI(URI pURI) { + this.iNamespace = pURI.getNamespaceName(); + this.iScheme = pURI.getNamespaceType(); + this.iHost = pURI.getHost(); + this.iPort = pURI.getPort(); + this.iObjectName = pURI.getClassName(); + this.iKeys = getKeysFromURI(pURI); + } + + /** + * Constructs a CIM Object Path referencing an instance of the specified CIM + * element in the given URI. + * + * @param pURI + * The Uniform Resource Identifier. + */ + private CIMObjectPath(URI pURI) { + setURI(pURI); + } + + /** + * Constructs a CIM Object Path referencing a CIM element. The name can + * refer to a class name or a qualifier type name, depending on the + * particular CIM element identified. In order to refer to an instance, the + * key properties and their corresponding values must be set.
      + *
      + * Should be able to handle strings, like:
      + * + * http://myserver.org:5066/root/cimv2:My_ComputerSystem.Name="mycmp",CreationClassName="My_ComputerSystem" + *
      + * http://myserver.org/root/cimv2:My_ComputerSystem.Name="mycmp",CreationClassName="My_ComputerSystem" + *
      + * //myserver.org/root/cimv2:My_ComputerSystem
      + * /root/cimv2:My_ComputerSystem + *       + * + * @param pObjectPath + * The string representation of an object path for a CIM element + * that will be parsed and used to initialize the object. + * @throws IllegalArgumentException + * If the pObjectPath is null or an + * empty string. + */ + public CIMObjectPath(String pObjectPath) { + URI uri; + + if (pObjectPath == null) throw new IllegalArgumentException("ObjectPath is null!"); + if (pObjectPath.trim().length() == 0) throw new IllegalArgumentException( + "ObjectPath is empty!"); + + try { + uri = URI.parse(pObjectPath); + } catch (IllegalArgumentException asURI) { + try { + uri = URI.parseRef(new URIString(pObjectPath), false); + } catch (IllegalArgumentException asUntypedRef) { + try { + uri = URI.parseRef(new URIString(pObjectPath), true); + } catch (IllegalArgumentException asTypedRef) { + String msg = "Parsing of ObjectPath string has failed!\n" + + "Nested error messages:\n" + "When parsing as normal URI string:\n" + + asURI.getMessage() + "When parsing as untyped reference:\n" + + asUntypedRef.getMessage() + "When parsing as typed reference:\n" + + asTypedRef.getMessage(); + // TODO: tracing + throw new IllegalArgumentException(msg); + } + } + } + setURI(uri); + } + + /** + * Constructs a CIM Object Path referencing an instance of the specified CIM + * element as defined in the specified namespace on the specified host and + * identified by the given key properties and their corresponding values. + * Note that the connection mechanism and the port number to which a client + * connection is established are also specified.
      + *
      + * NOTE: When using this API against OpenPegasus CIMOM, do not provide the + * preceding '/' in the namespace parameter. For example, OpenPegasus will + * accept "root/cimv2" as a namespace but will not accept + * "/root/cimv2". + * + * @param pScheme + * The connection scheme to the host (e.g. http, https, ...) + * @param pHost + * The host name or IP Address. + * @param pPort + * The port on the host to which the connection was established. + * @param pNamespace + * The namepace in which the CIM element is defined. + * @param pObjectName + * The name of the CIM element referenced. + * @param pKeys + * The keys and their corresponding values that identify an + * instance of the CIM element. + */ + public CIMObjectPath(String pScheme, String pHost, String pPort, String pNamespace, + String pObjectName, CIMProperty[] pKeys) { + this.iScheme = pScheme; + this.iHost = pHost; + this.iPort = pPort; + this.iNamespace = pNamespace; + this.iObjectName = pObjectName; + if (pKeys != null) { + for (int i = 0; i < pKeys.length; i++) + if (!pKeys[i].isKey()) throw new IllegalArgumentException( + "All CIMObjectPath properties must be keys!"); + } + this.iKeys = (CIMProperty[]) CIMElementSorter.sort(pKeys); + } + + /** + * Constructs a CIM Object Path referencing an instance of the specified CIM + * element as defined in the specified namespace on the specified host and + * identified by the given key properties and their corresponding values. + * Note that the connection mechanism and the port number to which a client + * connection is established are also specified.
      + *
      + * NOTE: When using this API against OpenPegasus CIMOM, do not provide the + * preceding '/' in the namespace parameter. For example, OpenPegasus will + * accept "root/cimv2" as a namespace but will not accept + * "/root/cimv2". + * + * @param pScheme + * The connection scheme to the host (e.g. http, https, ...) + * @param pHost + * The host name or IP Address. + * @param pPort + * The port on the host to which the connection was established. + * @param pNamespace + * The namepace in which the CIM element is defined. + * @param pObjectName + * The name of the CIM element referenced. + * @param pKeys + * The keys and their corresponding values that identify an + * instance of the CIM element. + * @param pXmlSchemaName + * The name of the XML Schema for this object. This is only + * needed for protocols that require this information. + */ + public CIMObjectPath(String pScheme, String pHost, String pPort, String pNamespace, + String pObjectName, CIMProperty[] pKeys, String pXmlSchemaName) { + this(pScheme, pHost, pPort, pNamespace, pObjectName, pKeys); + if (pXmlSchemaName != null) { + try { + new URL(pXmlSchemaName); + } catch (MalformedURLException e) { + throw new IllegalArgumentException(e); + } + } + this.iXmlSchemaName = pXmlSchemaName; + } + + /** + * Compares this CIM object path with the specified CIM object path for + * equality. + * + * @param pObj + * The object to compare to this CIM object path. Only the model + * paths are compared. + * @return true if the specified path references the same + * object, otherwise false is returned. + */ + @Override + public boolean equals(Object pObj) { + return equalsWorker(pObj, true); + } + + private boolean equalsWorker(Object pObj, boolean pIncludeNamespacePath) { + if (!(pObj instanceof CIMObjectPath)) return false; + CIMObjectPath that = (CIMObjectPath) pObj; + // hostname information is not any longer part of the comparison, since + // there is no reliable way to attach hostnames + if (pIncludeNamespacePath) { + boolean namespaceEqual = (this.iNamespace == null ? that.iNamespace == null + : this.iNamespace.equalsIgnoreCase(that.iNamespace)); + if (!namespaceEqual) return false; + } + return (this.iObjectName == null ? that.iObjectName == null : this.iObjectName + .equalsIgnoreCase(that.iObjectName)) + && keysEqual(that); + } + + /** + * Compares this CIM object path's keys with the specified CIM object path's + * keys for equality.
      + *
      + * NOTE: CIMProperty.equals() shouldn't be used for keys, + * because the XML doesn't contain originClass and propagated information. + * + * @param pThat + * The object path whose keys are to be compared to this CIM + * object path's keys. + * @return true if the keys are the same, otherwise + * false is returned. + */ + private boolean keysEqual(CIMObjectPath pThat) { + if (pThat == this) return true; + if (this.iKeys == null) return pThat.iKeys == null; + if (pThat.iKeys == null) return false; + if (this.iKeys.length != pThat.iKeys.length) return false; + for (int i = 0; i < this.iKeys.length; i++) { + CIMProperty thisKey = this.iKeys[i], thatKey = pThat.iKeys[i]; + if (!equals(thisKey, thatKey)) { return false; } + } + return true; + } + + /** + * Compares two properties for equality. + * + * @param pThis + * First property. + * @param pThat + * Second property. + * @return true if the properties are equal, false + * otherwise. + */ + private boolean equals(CIMProperty pThis, CIMProperty pThat) { + if (pThis.getDataType() != null && pThis.getDataType().isArray()) { return ncEqualsIC(pThis + .getName(), pThat.getName()) + && ncEquals(pThis.getDataType(), pThat.getDataType()) + && Arrays.equals((Object[]) pThis.getValue(), (Object[]) pThat.getValue()); + + } + return ncEqualsIC(pThis.getName(), pThat.getName()) + && ncEquals(pThis.getDataType(), pThat.getDataType()) + && ncEquals(pThis.getValue(), pThat.getValue()); + } + + /** + * Compares two objects for equality. + * + * @param pThis + * First object. + * @param pThat + * Second object. + * @return true if the objects are equal, false + * otherwise. + */ + private boolean ncEquals(Object pThis, Object pThat) { + return pThis == null ? pThat == null : pThis.equals(pThat); + } + + /** + * Compares two strings for equality, ignoring case. + * + * @param pThis + * First string. + * @param pThat + * Second string. + * @return true if the strings are equal, false + * otherwise. + */ + private boolean ncEqualsIC(String pThis, String pThat) { + return pThis == null ? pThat == null : pThis.equalsIgnoreCase(pThat); + } + + /** + * Compares this model path with the specified model path for equality. If + * the model path includes references, then the references will also be + * compared for the model path (i.e. the namespace part of the object path + * will be ignored). + * + * @param pModelPath + * The object to compare. + * @return true if the specified path references the same + * object, otherwise false. + */ + public boolean equalsModelPath(CIMObjectPath pModelPath) { + return equalsWorker(pModelPath, false); + } + + /** + * Gets the host. + * + * @return The name of the host. + */ + public String getHost() { + return this.iHost; + } + + /** + * Gets a key property by name. + * + * @param pName + * The name of the key property to retrieve. + * @return The CIMProperty with the given name, or + * null if it is not found. + */ + public CIMProperty getKey(String pName) { + return (CIMProperty) CIMElementSorter.find(this.iKeys, pName); + } + + /** + * Gets all key properties. + * + * @return The container of key properties. + */ + public CIMProperty[] getKeys() { + return this.iKeys == null ? new CIMProperty[0] : this.iKeys; + } + + /** + * @param pName + * The name of the key property to retrieve. + * @return The value of the key property. + */ + public Object getKeyValue(String pName) { + CIMProperty prop = getKey(pName); + return prop == null ? prop : prop.getValue(); + } + + /** + * Gets the namespace. + * + * @return The name of the namespace. + */ + public String getNamespace() { + return this.iNamespace; + } + + /** + * Gets the object name. Depending on the type of CIM element referenced, + * this may be either a class name or a qualifier type name. + * + * @return The name of this CIM element. + */ + public String getObjectName() { + return this.iObjectName; + } + + /** + * Gets the the port on the host to which the connection was established. + * + * @return The port on the host. + */ + public String getPort() { + return this.iPort; + } + + /** + * Get the connection scheme. + * + * @return The connection scheme (e.g. http, https,...) + */ + public String getScheme() { + return this.iScheme; + } + + /** + * Get the XML Schema for this object (optional). + * + * @return The XML Schema name. + */ + public String getXmlSchemaName() { + return this.iXmlSchemaName; + } + + /** + * Computes the hash code for this object path. + * + * @return The integer representing the hash code for this object path. + */ + @Override + public int hashCode() { + return toString().hashCode(); + } + + /** + * Returns a String representation of the CIM object path. This + * method is intended to be used only for debugging purposes. The format of + * the value returned may vary between implementations. The string returned + * may be empty but may not be null. + * + * @return A string representation of this CIM object path. + */ + @Override + public String toString() { + return MOF.objectHandle(this, false, false); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMParameter.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMParameter.java similarity index 86% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMParameter.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMParameter.java index eac1e7d..b1c6d22 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMParameter.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMParameter.java @@ -1,231 +1,229 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1660756 2007-02-22 ebak Embedded object support - * 1737141 2007-06-19 ebak Sync up with JSR48 evolution - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl; -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * This class represents a CIM Parameter. A CIM Parameter is a schema item, thus - * it can only be part of a CIMMethod definition for a - * CIMClass. A parameter can be used to define an input, output or - * input/output parameter. A CIMParameter consists of a name, data - * type and qualifiers. CIMParameters do not have values - so you - * can not set a default value. CIM Parameters are defined by the Distributed - * Management Task Force (DMTF) CIM - * Infrastructure Specification (DSP004). To invoke a method, you would use CIMArgument. - * - * @param - * Type parameter. - * - * @see CIMMethod - */ -public class CIMParameter extends CIMTypedElement implements CIMQualifiedElementInterface { - - private static final long serialVersionUID = -4741931597423829396L; - - private CIMQualifiedElementInterfaceImpl iQualiImpl; - - /** - * Constructs a CIMParameter object using the specified name, - * data type and qualifiers. Takes a string for the name of an existing CIM - * parameter and creates a new instance of a CIM parameter, using the name - * and identifier of the existing CIM parameter. - * - * @param pName - * Name of this parameter. - * @param pType - * Data type of this parameter. - * @param pQualifiers - * Qualifiers for this parameter. - */ - public CIMParameter(String pName, CIMDataType pType, CIMQualifier[] pQualifiers) { - super(pName, pType); - this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers, false, true); - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null - * and is a CIMParameter object that represents the same value - * as this object. - * - * @param pObj - * The object to compare. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMParameter)) return false; - if (!super.equals(pObj)) return false; - CIMParameter that = (CIMParameter) pObj; - return this.iQualiImpl.equals(that.iQualiImpl); - } - - /** - * Returns a CIMParameter filtered as specified. - * - * @param pIncludeQualifiers - * If true all qualifiers are returned; otherwise no - * qualifiers. - * @param pLocalOnly - * If true only the qualifiers that were not - * propagated will be included. - * @return A filtered CIMParameter. - */ - public CIMParameter filter(boolean pIncludeQualifiers, boolean pLocalOnly) { - return new CIMParameter(getName(), getDataType(), pIncludeQualifiers ? this.iQualiImpl - .getQualifiers(pLocalOnly) : null); - } - - /** - * Get a qualifier by index. - * - * @param pIndex - * The index of the qualifier. - * @return The Qualifier at index pIndex. - * @throws ArrayIndexOutOfBoundsException - */ - public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsException { - return this.iQualiImpl.getQualifier(pIndex); - } - - /** - * Gets a qualifier by name. - * - * @param pName - * The name of the qualifier to get. - * @return null if the qualifier does not exist, otherwise - * returns the reference to the qualifier. - */ - public CIMQualifier getQualifier(String pName) { - return this.iQualiImpl.getQualifier(pName); - } - - /** - * Get the number of qualifiers defined for this CIM Parameter. - * - * @return The number of qualifiers. - */ - public int getQualifierCount() { - return this.iQualiImpl.getQualifierCount(); - } - - /** - * Returns the list of qualifiers for this class. - * - * @return Qualifiers for this class. - */ - public CIMQualifier[] getQualifiers() { - return this.iQualiImpl.getQualifiers(); - } - - /** - * Gets a qualifier value by name. - * - * @param pName - * The name of the qualifier to get. - * @return null if the qualifier does not exist or value is - * null, otherwise returns the reference to the - * qualifier. - */ - public Object getQualifierValue(String pName) { - return this.iQualiImpl.getQualifierValue(pName); - } - - /** - * Checks whether the specified qualifier is one of the qualifiers in this - * CIM element. - * - * @param pName - * The name of the qualifier. - * @return true if the qualifier exists in this CIM parameter, - * otherwise false. - */ - public boolean hasQualifier(String pName) { - return this.iQualiImpl.hasQualifier(pName); - } - - /** - * Checks whether the specified qualifier is one of the qualifiers defined - * for this parameter with the specified value. This method will return - * false if the qualifier is not applied or if the value does - * not match. - * - * @param pName - * The name of the qualifier. - * @param pValue - * The value to be tested. - * @return true if the qualifier exists in this property, - * otherwise false. - */ - public boolean hasQualifierValue(String pName, Object pValue) { - return this.iQualiImpl.hasQualifierValue(pName, pValue); - } - - /** - * Returns a String representation of the - * CIMParameter. This method is intended to be used only for - * debugging purposes, and the format of the returned string may vary - * between implementations. The returned string may be empty but may not be - * null. - * - * @return String representation of this parameter. - */ - @Override - public String toString() { - return MOF.parameter(this, MOF.EMPTY); - } - -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1660756 2007-02-22 ebak Embedded object support + * 1737141 2007-06-19 ebak Sync up with JSR48 evolution + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl; +import org.metricshub.wbem.sblim.cimclient.internal.util.MOF; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * This class represents a CIM Parameter. A CIM Parameter is a schema item, thus + * it can only be part of a CIMMethod definition for a + * CIMClass. A parameter can be used to define an input, output or + * input/output parameter. A CIMParameter consists of a name, data + * type and qualifiers. CIMParameters do not have values - so you + * can not set a default value. CIM Parameters are defined by the Distributed + * Management Task Force (DMTF) CIM + * Infrastructure Specification (DSP004). To invoke a method, you would use CIMArgument. + * + * @param + * Type parameter. + * + * @see CIMMethod + */ +public class CIMParameter extends CIMTypedElement implements CIMQualifiedElementInterface { + + private static final long serialVersionUID = -4741931597423829396L; + + private CIMQualifiedElementInterfaceImpl iQualiImpl; + + /** + * Constructs a CIMParameter object using the specified name, + * data type and qualifiers. Takes a string for the name of an existing CIM + * parameter and creates a new instance of a CIM parameter, using the name + * and identifier of the existing CIM parameter. + * + * @param pName + * Name of this parameter. + * @param pType + * Data type of this parameter. + * @param pQualifiers + * Qualifiers for this parameter. + */ + public CIMParameter(String pName, CIMDataType pType, CIMQualifier[] pQualifiers) { + super(pName, pType); + this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers, false, true); + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null + * and is a CIMParameter object that represents the same value + * as this object. + * + * @param pObj + * The object to compare. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMParameter)) return false; + if (!super.equals(pObj)) return false; + CIMParameter that = (CIMParameter) pObj; + return this.iQualiImpl.equals(that.iQualiImpl); + } + + /** + * Returns a CIMParameter filtered as specified. + * + * @param pIncludeQualifiers + * If true all qualifiers are returned; otherwise no + * qualifiers. + * @param pLocalOnly + * If true only the qualifiers that were not + * propagated will be included. + * @return A filtered CIMParameter. + */ + public CIMParameter filter(boolean pIncludeQualifiers, boolean pLocalOnly) { + return new CIMParameter(getName(), getDataType(), pIncludeQualifiers ? this.iQualiImpl + .getQualifiers(pLocalOnly) : null); + } + + /** + * Get a qualifier by index. + * + * @param pIndex + * The index of the qualifier. + * @return The Qualifier at index pIndex. + * @throws ArrayIndexOutOfBoundsException + */ + public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsException { + return this.iQualiImpl.getQualifier(pIndex); + } + + /** + * Gets a qualifier by name. + * + * @param pName + * The name of the qualifier to get. + * @return null if the qualifier does not exist, otherwise + * returns the reference to the qualifier. + */ + public CIMQualifier getQualifier(String pName) { + return this.iQualiImpl.getQualifier(pName); + } + + /** + * Get the number of qualifiers defined for this CIM Parameter. + * + * @return The number of qualifiers. + */ + public int getQualifierCount() { + return this.iQualiImpl.getQualifierCount(); + } + + /** + * Returns the list of qualifiers for this class. + * + * @return Qualifiers for this class. + */ + public CIMQualifier[] getQualifiers() { + return this.iQualiImpl.getQualifiers(); + } + + /** + * Gets a qualifier value by name. + * + * @param pName + * The name of the qualifier to get. + * @return null if the qualifier does not exist or value is + * null, otherwise returns the reference to the + * qualifier. + */ + public Object getQualifierValue(String pName) { + return this.iQualiImpl.getQualifierValue(pName); + } + + /** + * Checks whether the specified qualifier is one of the qualifiers in this + * CIM element. + * + * @param pName + * The name of the qualifier. + * @return true if the qualifier exists in this CIM parameter, + * otherwise false. + */ + public boolean hasQualifier(String pName) { + return this.iQualiImpl.hasQualifier(pName); + } + + /** + * Checks whether the specified qualifier is one of the qualifiers defined + * for this parameter with the specified value. This method will return + * false if the qualifier is not applied or if the value does + * not match. + * + * @param pName + * The name of the qualifier. + * @param pValue + * The value to be tested. + * @return true if the qualifier exists in this property, + * otherwise false. + */ + public boolean hasQualifierValue(String pName, Object pValue) { + return this.iQualiImpl.hasQualifierValue(pName, pValue); + } + + /** + * Returns a String representation of the + * CIMParameter. This method is intended to be used only for + * debugging purposes, and the format of the returned string may vary + * between implementations. The returned string may be empty but may not be + * null. + * + * @return String representation of this parameter. + */ + @Override + public String toString() { + return MOF.parameter(this, MOF.EMPTY); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMProperty.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMProperty.java similarity index 86% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMProperty.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMProperty.java index 6a69a50..c37c0c5 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMProperty.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMProperty.java @@ -1,169 +1,167 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1737141 2007-06-18 ebak Sync up with JSR48 evolution - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 -/** - * This class represents a CIM Property as defined by the Distributed Management - * Task Force (DMTF) CIM Infrastructure - * Specification (DSP004). A CIM Property Object consists of a name, data type and value. - * The CIM Property object also includes a flag to signify whether the property - * is a key property (used as part of the name of the CIM element), a flag to - * signify whether it was propagated from a parent class and the class origin - * information (where the property was originally defined). - * - * @param - * Type parameter. - */ -public class CIMProperty extends CIMValuedElement { - - private static final long serialVersionUID = -4741931597423829396L; - - private boolean iKey, iPropagated; - - private String iOriginClass; - - /** - * Constructs a CIMProperty to be used in instances. For a - * CIMClass, CIMClassProperty shall be used. This - * can only be used for non-Key properties, non-propagated properties and - * when the the origin class is not needed. - * - * @param pName - * The name of the property. - * @param pType - * The CIMDataType of the property. - * @param pValue - * The value of the property. - */ - public CIMProperty(String pName, CIMDataType pType, E pValue) { - this(pName, pType, pValue, false, false, null); - } - - /** - * Constructs a CIMProperty to be used in instances. For a - * CIMClass, CIMClassProperty shall be used. - * - * @param pName - * The name of the property. - * @param pType - * The CIMDataType of the property. - * @param pValue - * The value of the property. - * @param pKey - * true if the property is a key; otherwise - * false. - * @param pPropagated - * true if the value was propagated from the class. - * @param pOriginClass - * The class in which this property was defined or overridden. - */ - public CIMProperty(String pName, CIMDataType pType, E pValue, boolean pKey, - boolean pPropagated, String pOriginClass) { - super(pName, pType, pValue); - this.iKey = pKey; - this.iPropagated = pPropagated; - this.iOriginClass = pOriginClass; - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null - * and is a CIMProperty that represents the same name, type and - * value as this object. - * - * @param pObj - * The object to compare with. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMProperty)) return false; - if (!super.equals(pObj)) return false; - CIMProperty that = (CIMProperty) pObj; - return this.iKey == that.iKey - && this.iPropagated == that.iPropagated - && (this.iOriginClass == null ? that.iOriginClass == null : this.iOriginClass - .equalsIgnoreCase(that.iOriginClass)); - } - - /** - * Returns the class in which this property was defined or overridden. - * - * @return Name of class where this property was defined. - */ - public String getOriginClass() { - return this.iOriginClass; - } - - /** - * Convenience method for determining if this property is a Key. - * - * @return true if this property is a key. - */ - public boolean isKey() { - return this.iKey; - } - - /** - * Determines if this property is Propagated. When this property is part of - * a class, this value designates that the class origin value is the same as - * the class name. - * - * @return true if this property is propagated. - */ - public boolean isPropagated() { - return this.iPropagated; - } - -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1737141 2007-06-18 ebak Sync up with JSR48 evolution + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 +/** + * This class represents a CIM Property as defined by the Distributed Management + * Task Force (DMTF) CIM Infrastructure + * Specification (DSP004). A CIM Property Object consists of a name, data type and value. + * The CIM Property object also includes a flag to signify whether the property + * is a key property (used as part of the name of the CIM element), a flag to + * signify whether it was propagated from a parent class and the class origin + * information (where the property was originally defined). + * + * @param + * Type parameter. + */ +public class CIMProperty extends CIMValuedElement { + + private static final long serialVersionUID = -4741931597423829396L; + + private boolean iKey, iPropagated; + + private String iOriginClass; + + /** + * Constructs a CIMProperty to be used in instances. For a + * CIMClass, CIMClassProperty shall be used. This + * can only be used for non-Key properties, non-propagated properties and + * when the the origin class is not needed. + * + * @param pName + * The name of the property. + * @param pType + * The CIMDataType of the property. + * @param pValue + * The value of the property. + */ + public CIMProperty(String pName, CIMDataType pType, E pValue) { + this(pName, pType, pValue, false, false, null); + } + + /** + * Constructs a CIMProperty to be used in instances. For a + * CIMClass, CIMClassProperty shall be used. + * + * @param pName + * The name of the property. + * @param pType + * The CIMDataType of the property. + * @param pValue + * The value of the property. + * @param pKey + * true if the property is a key; otherwise + * false. + * @param pPropagated + * true if the value was propagated from the class. + * @param pOriginClass + * The class in which this property was defined or overridden. + */ + public CIMProperty(String pName, CIMDataType pType, E pValue, boolean pKey, + boolean pPropagated, String pOriginClass) { + super(pName, pType, pValue); + this.iKey = pKey; + this.iPropagated = pPropagated; + this.iOriginClass = pOriginClass; + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null + * and is a CIMProperty that represents the same name, type and + * value as this object. + * + * @param pObj + * The object to compare with. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMProperty)) return false; + if (!super.equals(pObj)) return false; + CIMProperty that = (CIMProperty) pObj; + return this.iKey == that.iKey + && this.iPropagated == that.iPropagated + && (this.iOriginClass == null ? that.iOriginClass == null : this.iOriginClass + .equalsIgnoreCase(that.iOriginClass)); + } + + /** + * Returns the class in which this property was defined or overridden. + * + * @return Name of class where this property was defined. + */ + public String getOriginClass() { + return this.iOriginClass; + } + + /** + * Convenience method for determining if this property is a Key. + * + * @return true if this property is a key. + */ + public boolean isKey() { + return this.iKey; + } + + /** + * Determines if this property is Propagated. When this property is part of + * a class, this value designates that the class origin value is the same as + * the class name. + * + * @return true if this property is propagated. + */ + public boolean isPropagated() { + return this.iPropagated; + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMQualifiedElementInterface.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifiedElementInterface.java similarity index 80% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMQualifiedElementInterface.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMQualifiedElementInterface.java index cf82a7f..5097df7 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMQualifiedElementInterface.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifiedElementInterface.java @@ -1,124 +1,122 @@ -/* - (C) Copyright IBM Corp. 2006, 2010 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * The CIMQualifiedElementInterface is used by CIM Elements that - * have qualifiers. For example, CIM Classes, CIM Properties, CIM Methods and - * CIM Parameters are all CIM Elements that have qualifiers. - */ -public interface CIMQualifiedElementInterface { - - /** - * Get a qualifier by index. - * - * @param pIndex - * The index of the qualifier. - * @return The Qualifier at index pIndex. - */ - public CIMQualifier getQualifier(int pIndex); - - /** - * Gets a qualifier by name. - * - * @param pName - * The name of the qualifier to get. - * @return null if the qualifier does not exist, otherwise - * returns the reference to the qualifier. - */ - public CIMQualifier getQualifier(String pName); - - /** - * Get the number of qualifiers defined for this CIM Element. - * - * @return The number of qualifiers. - */ - public int getQualifierCount(); - - /** - * Returns the list of qualifiers for this class. - * - * @return Qualifiers for this class. - */ - public CIMQualifier[] getQualifiers(); - - /** - * Gets a qualifier value by name. - * - * @param pName - * The name of the qualifier to get. - * @return null if the qualifier does not exist or value is - * null, otherwise returns the reference to the - * qualifier. - */ - public Object getQualifierValue(String pName); - - /** - * Checks whether the specified qualifier is one of the qualifiers in this - * CIM element. - * - * @param pName - * The name of the qualifier. - * @return true if the qualifier exists in this CIM element, - * otherwise false. - */ - public boolean hasQualifier(String pName); - - /** - * Checks whether the specified qualifier is one of the qualifiers defined - * for this property with the specified value. This method will return - * false if the qualifier is not applied or if the value does - * not match. - * - * @param pName - * The name of the qualifier. - * @param pValue - * The value to be tested. - * @return true if the qualifier exists and has the value, - * otherwise false. - */ - public boolean hasQualifierValue(String pName, Object pValue); - -} +/* + (C) Copyright IBM Corp. 2006, 2010 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * The CIMQualifiedElementInterface is used by CIM Elements that + * have qualifiers. For example, CIM Classes, CIM Properties, CIM Methods and + * CIM Parameters are all CIM Elements that have qualifiers. + */ +public interface CIMQualifiedElementInterface { + + /** + * Get a qualifier by index. + * + * @param pIndex + * The index of the qualifier. + * @return The Qualifier at index pIndex. + */ + public CIMQualifier getQualifier(int pIndex); + + /** + * Gets a qualifier by name. + * + * @param pName + * The name of the qualifier to get. + * @return null if the qualifier does not exist, otherwise + * returns the reference to the qualifier. + */ + public CIMQualifier getQualifier(String pName); + + /** + * Get the number of qualifiers defined for this CIM Element. + * + * @return The number of qualifiers. + */ + public int getQualifierCount(); + + /** + * Returns the list of qualifiers for this class. + * + * @return Qualifiers for this class. + */ + public CIMQualifier[] getQualifiers(); + + /** + * Gets a qualifier value by name. + * + * @param pName + * The name of the qualifier to get. + * @return null if the qualifier does not exist or value is + * null, otherwise returns the reference to the + * qualifier. + */ + public Object getQualifierValue(String pName); + + /** + * Checks whether the specified qualifier is one of the qualifiers in this + * CIM element. + * + * @param pName + * The name of the qualifier. + * @return true if the qualifier exists in this CIM element, + * otherwise false. + */ + public boolean hasQualifier(String pName); + + /** + * Checks whether the specified qualifier is one of the qualifiers defined + * for this property with the specified value. This method will return + * false if the qualifier is not applied or if the value does + * not match. + * + * @param pName + * The name of the qualifier. + * @param pValue + * The value to be tested. + * @return true if the qualifier exists and has the value, + * otherwise false. + */ + public boolean hasQualifierValue(String pName, Object pValue); + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMQualifier.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifier.java similarity index 85% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMQualifier.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMQualifier.java index c89b9ab..0e0051f 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMQualifier.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifier.java @@ -1,181 +1,179 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1737141 2007-06-18 ebak Sync up with JSR48 evolution - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * This class represents a CIM qualifier as defined by the Distributed - * Management Task Force (DMTF) CIM - * Infrastructure Specification (DSP004). A qualifier provides additional information about classes, - * associations, methods, parameters, properties, and/or references. A - * CIMQualifier must have a CIM Qualifier Type. A qualifier and its - * qualifier type must have the same name and data type. CIM Qualifiers can only - * be applied to elements that are allowed by the scope defined by the CIM - * Qualifier Type. - * - * @param - * Type parameter. - * @see CIMQualifierType - */ -public class CIMQualifier extends CIMValuedElement { - - private static final long serialVersionUID = 3568987946093931214L; - - private int iFlavor; - - private boolean iPropagated; - - /** - * Constructs a CIM qualifier with the specified name, type, value, and - * flavors. - * - * @param pName - * The name of the qualifier. - * @param pType - * The data type of the qualifier. - * @param pValue - * The value of the qualifier. - * @param pFlavor - * A list of override permissions. Flavors can be overridden from - * the Qualifier Type definition to either restrict the - * subclassing of a qualifier or to allow it. For the list of CIM - * Flavors see the CIMFlavor class. - * @see CIMFlavor - */ - public CIMQualifier(String pName, CIMDataType pType, E pValue, int pFlavor) { - this(pName, pType, pValue, pFlavor, false); - } - - /** - * Constructs a CIM qualifier with the specified name, type, value, and - * flavors. - * - * @param pName - * The name of the qualifier. - * @param pType - * The data type of the qualifier. - * @param pValue - * The value of the qualifier. - * @param pFlavor - * A list of override permissions. Flavors can be overridden from - * the Qualifier Type definition to either restrict the - * subclassing of a qualifier or to allow it. For the list of CIM - * Flavors see the CIMFlavor class. - * @param pIsPropagated - * true if the qualifier was propagated; - * false otherwise. - * @see CIMFlavor - */ - public CIMQualifier(String pName, CIMDataType pType, E pValue, int pFlavor, - boolean pIsPropagated) { - super(pName, pType, pValue); - this.iFlavor = pFlavor; - this.iPropagated = pIsPropagated; - } - - /** - * Compares this CIMQualifier against the specified - * CIMQualifier. The result is true if and only if - * the argument is not null and is a CIMQualifier - * that represents the same name, type and value as this - * CIMQualifier. - * - * @param pObj - * The object to compare. - * @return true if the input qualifier is equal, otherwise - * false. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMQualifier)) return false; - if (!super.equals(pObj)) return false; - CIMQualifier that = (CIMQualifier) pObj; - return this.iFlavor == that.iFlavor && this.iPropagated == that.iPropagated; - } - - /** - * Returns the CIM flavors for this CIM qualifier. - * - * @return A BitSet of CIM flavors in this CIM qualifier. - */ - public int getFlavor() { - return this.iFlavor; - } - - /** - * Determines if this qualifier is propagated. If the qualifier was - * inherited, this value will be true. If the qualifier was - * applied to the element directly, this value will be false. - * - * @return true if this property is propagated; - * false otherwise. - */ - public boolean isPropagated() { - return this.iPropagated; - } - - /** - * Returns a String representation of the - * CIMQualifier. This method is intended to be used only for - * debugging purposes, and the format of the returned string may vary - * between implementations. The returned string may be empty but may not be - * null. - * - * @return A string representation of this qualifier. - */ - @Override - public String toString() { - return MOF.qualifier(this); - } - -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1737141 2007-06-18 ebak Sync up with JSR48 evolution + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import org.metricshub.wbem.sblim.cimclient.internal.util.MOF; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * This class represents a CIM qualifier as defined by the Distributed + * Management Task Force (DMTF) CIM + * Infrastructure Specification (DSP004). A qualifier provides additional information about classes, + * associations, methods, parameters, properties, and/or references. A + * CIMQualifier must have a CIM Qualifier Type. A qualifier and its + * qualifier type must have the same name and data type. CIM Qualifiers can only + * be applied to elements that are allowed by the scope defined by the CIM + * Qualifier Type. + * + * @param + * Type parameter. + * @see CIMQualifierType + */ +public class CIMQualifier extends CIMValuedElement { + + private static final long serialVersionUID = 3568987946093931214L; + + private int iFlavor; + + private boolean iPropagated; + + /** + * Constructs a CIM qualifier with the specified name, type, value, and + * flavors. + * + * @param pName + * The name of the qualifier. + * @param pType + * The data type of the qualifier. + * @param pValue + * The value of the qualifier. + * @param pFlavor + * A list of override permissions. Flavors can be overridden from + * the Qualifier Type definition to either restrict the + * subclassing of a qualifier or to allow it. For the list of CIM + * Flavors see the CIMFlavor class. + * @see CIMFlavor + */ + public CIMQualifier(String pName, CIMDataType pType, E pValue, int pFlavor) { + this(pName, pType, pValue, pFlavor, false); + } + + /** + * Constructs a CIM qualifier with the specified name, type, value, and + * flavors. + * + * @param pName + * The name of the qualifier. + * @param pType + * The data type of the qualifier. + * @param pValue + * The value of the qualifier. + * @param pFlavor + * A list of override permissions. Flavors can be overridden from + * the Qualifier Type definition to either restrict the + * subclassing of a qualifier or to allow it. For the list of CIM + * Flavors see the CIMFlavor class. + * @param pIsPropagated + * true if the qualifier was propagated; + * false otherwise. + * @see CIMFlavor + */ + public CIMQualifier(String pName, CIMDataType pType, E pValue, int pFlavor, + boolean pIsPropagated) { + super(pName, pType, pValue); + this.iFlavor = pFlavor; + this.iPropagated = pIsPropagated; + } + + /** + * Compares this CIMQualifier against the specified + * CIMQualifier. The result is true if and only if + * the argument is not null and is a CIMQualifier + * that represents the same name, type and value as this + * CIMQualifier. + * + * @param pObj + * The object to compare. + * @return true if the input qualifier is equal, otherwise + * false. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMQualifier)) return false; + if (!super.equals(pObj)) return false; + CIMQualifier that = (CIMQualifier) pObj; + return this.iFlavor == that.iFlavor && this.iPropagated == that.iPropagated; + } + + /** + * Returns the CIM flavors for this CIM qualifier. + * + * @return A BitSet of CIM flavors in this CIM qualifier. + */ + public int getFlavor() { + return this.iFlavor; + } + + /** + * Determines if this qualifier is propagated. If the qualifier was + * inherited, this value will be true. If the qualifier was + * applied to the element directly, this value will be false. + * + * @return true if this property is propagated; + * false otherwise. + */ + public boolean isPropagated() { + return this.iPropagated; + } + + /** + * Returns a String representation of the + * CIMQualifier. This method is intended to be used only for + * debugging purposes, and the format of the returned string may vary + * between implementations. The returned string may be empty but may not be + * null. + * + * @return A string representation of this qualifier. + */ + @Override + public String toString() { + return MOF.qualifier(this); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMQualifierType.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifierType.java similarity index 85% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMQualifierType.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMQualifierType.java index e215e40..7cad6a2 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMQualifierType.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifierType.java @@ -1,174 +1,172 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2975989 2010-03-24 blaschke-oss TCK: CIMQualifierType constructor does not handle null - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * The CIMQualifierType class represents a CIM Qualifier Type as defined by the - * Distributed Management Task Force (DMTF) CIM - * Infrastructure Specification (DSP004). A Qualifier Type supplies the definition/rules for a qualifier. - * A qualifier must have a qualifier type. CIMQualifierType has the following - * components: - *
        - *
      • Name - The name of the qualifier type.
        • - *
      • Data Type - The data type of the qualifier type.
        • - *
      • Value - The default value of the qualifier type (can be - * null/uninitialized)
        • - *
      • Scopes - The scopes applicable to this qualifier type. In - * other words what CIM Elements can the qualifier based on this type be applied - * to.
        • - *
      • Flavors - The flavors applicable to this qualifier type. - * Flavors describe the propagation and override rules for a qualifier.
        • - *
      - * - * @param - * Type parameter. - * @see CIMScope - * @see CIMFlavor - * @see CIMQualifier - */ -public class CIMQualifierType extends CIMValuedElement implements CIMNamedElementInterface { - - private static final long serialVersionUID = -4563643521754840535L; - - private CIMObjectPath iObjPath; - - private int iScope, iFlavor; - - /** - * Constructs a new CIM qualifier type, using the name, type of the - * specified CIM qualifier type. - * - * @param pPath - * The CIMObjectPath of a CIM qualifier type. - * @param pType - * The CIMDataType of the qualifier type. - * @param pValue - * The default value or null if no default value. - * @param pScope - * The applicable scopes for the qualifier type. - * @param pFlavor - * The applicable flavors for the qualifier type. - * @throws IllegalArgumentException - * If the value/data type does not match. - */ - public CIMQualifierType(CIMObjectPath pPath, CIMDataType pType, E pValue, int pScope, - int pFlavor) throws IllegalArgumentException { - super(pPath == null ? null : pPath.getObjectName(), pType, pValue); - this.iObjPath = pPath; - this.iScope = pScope; - this.iFlavor = pFlavor; - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null - * and is a CIMQualifierType object that represents the same - * value as this object. - * - * @param pObj - * The object to compare. - * @return true if the specified object it is the same as this - * CIMQualifierType. Otherwise, false. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMQualifierType)) return false; - if (!super.equals(pObj)) return false; - CIMQualifierType that = (CIMQualifierType) pObj; - return this.iObjPath.equals(that.iObjPath) && this.iScope == that.iScope; - } - - /** - * Returns the flavors of this qualifier type as a BitSet. - * - * @return BitSet of flavors for this qualifier type. - */ - public int getFlavor() { - return this.iFlavor; - } - - /** - * Get the object path for this CIMQualifierType. - * - * @return The CIMObjectPath that represents this qualifier - * type. - */ - public CIMObjectPath getObjectPath() { - return this.iObjPath; - } - - /** - * Returns the scopes of this qualifier type as a bit set. - * - * @return Bit set of CIM element scopes for which this qualifier type is - * applicable. - */ - public int getScope() { - return this.iScope; - } - - /** - * Returns a String representation of the - * CIMQualifierType This method is intended to be used only for - * debugging purposes, and the format of the returned string may vary - * between implementations. The returned string may be empty but may not be - * null. - * - * @return A string representation of this qualifier type. - */ - @Override - public String toString() { - return MOF.qualifierDeclaration(this); - } - -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2975989 2010-03-24 blaschke-oss TCK: CIMQualifierType constructor does not handle null + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import org.metricshub.wbem.sblim.cimclient.internal.util.MOF; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * The CIMQualifierType class represents a CIM Qualifier Type as defined by the + * Distributed Management Task Force (DMTF) CIM + * Infrastructure Specification (DSP004). A Qualifier Type supplies the definition/rules for a qualifier. + * A qualifier must have a qualifier type. CIMQualifierType has the following + * components: + *
        + *
      • Name - The name of the qualifier type.
        • + *
      • Data Type - The data type of the qualifier type.
        • + *
      • Value - The default value of the qualifier type (can be + * null/uninitialized)
        • + *
      • Scopes - The scopes applicable to this qualifier type. In + * other words what CIM Elements can the qualifier based on this type be applied + * to.
        • + *
      • Flavors - The flavors applicable to this qualifier type. + * Flavors describe the propagation and override rules for a qualifier.
        • + *
      + * + * @param + * Type parameter. + * @see CIMScope + * @see CIMFlavor + * @see CIMQualifier + */ +public class CIMQualifierType extends CIMValuedElement implements CIMNamedElementInterface { + + private static final long serialVersionUID = -4563643521754840535L; + + private CIMObjectPath iObjPath; + + private int iScope, iFlavor; + + /** + * Constructs a new CIM qualifier type, using the name, type of the + * specified CIM qualifier type. + * + * @param pPath + * The CIMObjectPath of a CIM qualifier type. + * @param pType + * The CIMDataType of the qualifier type. + * @param pValue + * The default value or null if no default value. + * @param pScope + * The applicable scopes for the qualifier type. + * @param pFlavor + * The applicable flavors for the qualifier type. + * @throws IllegalArgumentException + * If the value/data type does not match. + */ + public CIMQualifierType(CIMObjectPath pPath, CIMDataType pType, E pValue, int pScope, + int pFlavor) throws IllegalArgumentException { + super(pPath == null ? null : pPath.getObjectName(), pType, pValue); + this.iObjPath = pPath; + this.iScope = pScope; + this.iFlavor = pFlavor; + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null + * and is a CIMQualifierType object that represents the same + * value as this object. + * + * @param pObj + * The object to compare. + * @return true if the specified object it is the same as this + * CIMQualifierType. Otherwise, false. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMQualifierType)) return false; + if (!super.equals(pObj)) return false; + CIMQualifierType that = (CIMQualifierType) pObj; + return this.iObjPath.equals(that.iObjPath) && this.iScope == that.iScope; + } + + /** + * Returns the flavors of this qualifier type as a BitSet. + * + * @return BitSet of flavors for this qualifier type. + */ + public int getFlavor() { + return this.iFlavor; + } + + /** + * Get the object path for this CIMQualifierType. + * + * @return The CIMObjectPath that represents this qualifier + * type. + */ + public CIMObjectPath getObjectPath() { + return this.iObjPath; + } + + /** + * Returns the scopes of this qualifier type as a bit set. + * + * @return Bit set of CIM element scopes for which this qualifier type is + * applicable. + */ + public int getScope() { + return this.iScope; + } + + /** + * Returns a String representation of the + * CIMQualifierType This method is intended to be used only for + * debugging purposes, and the format of the returned string may vary + * between implementations. The returned string may be empty but may not be + * null. + * + * @return A string representation of this qualifier type. + */ + @Override + public String toString() { + return MOF.qualifierDeclaration(this); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMScope.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java similarity index 78% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMScope.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java index e76bc81..f0c082d 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMScope.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java @@ -1,113 +1,111 @@ -/* - (C) Copyright IBM Corp. 2006, 2010 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1737123 2007-06-15 ebak Differences to JSR48 public review draft - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.io.Serializable; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * This class represents a CIM Scope as defined by the Distributed Management - * Task Force (DMTF) CIM Infrastructure - * Specification (DSP004). This class is used in a CIMQualifierType to define - * what elements the qualifier can be applied to. - */ -public class CIMScope extends Object implements Serializable { - - private static final long serialVersionUID = -4563643521754840535l; - - /** - * Scope representing a qualifier that can be applied to any element. - */ - public static final int ANY = 127; - - /** - * Scope representing a qualifier that can be applied to an association. - */ - public static final int ASSOCIATION = 2; - - /** - * Scope representing a qualifier that can be applied to a CIM class. - */ - public static final int CLASS = 1; - - /** - * Scope representing a qualifier that can be applied to an indication. - */ - public static final int INDICATION = 4; - - /** - * Scope representing a qualifier that can be applied to a method. - */ - public static final int METHOD = 32; - - /** - * Scope representing a qualifier that can be applied to a parameter. - */ - public static final int PARAMETER = 64; - - /** - * Scope representing a qualifier that can be applied to a property. - */ - public static final int PROPERTY = 8; - - /** - * Scope representing a qualifier that can be applied to a reference. - */ - public static final int REFERENCE = 16; - - private static final int[] SCOPES = { ANY, ASSOCIATION, CLASS, INDICATION, METHOD, PARAMETER, - PROPERTY, REFERENCE }; - - /** - * Returns the complete set of possible scopes. - * - * @return An int array of all scopes. - */ - public static int[] getScopes() { - return SCOPES; - } - -} +/* + (C) Copyright IBM Corp. 2006, 2010 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1737123 2007-06-15 ebak Differences to JSR48 public review draft + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.io.Serializable; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * This class represents a CIM Scope as defined by the Distributed Management + * Task Force (DMTF) CIM Infrastructure + * Specification (DSP004). This class is used in a CIMQualifierType to define + * what elements the qualifier can be applied to. + */ +public class CIMScope extends Object implements Serializable { + + private static final long serialVersionUID = -4563643521754840535l; + + /** + * Scope representing a qualifier that can be applied to any element. + */ + public static final int ANY = 127; + + /** + * Scope representing a qualifier that can be applied to an association. + */ + public static final int ASSOCIATION = 2; + + /** + * Scope representing a qualifier that can be applied to a CIM class. + */ + public static final int CLASS = 1; + + /** + * Scope representing a qualifier that can be applied to an indication. + */ + public static final int INDICATION = 4; + + /** + * Scope representing a qualifier that can be applied to a method. + */ + public static final int METHOD = 32; + + /** + * Scope representing a qualifier that can be applied to a parameter. + */ + public static final int PARAMETER = 64; + + /** + * Scope representing a qualifier that can be applied to a property. + */ + public static final int PROPERTY = 8; + + /** + * Scope representing a qualifier that can be applied to a reference. + */ + public static final int REFERENCE = 16; + + private static final int[] SCOPES = { ANY, ASSOCIATION, CLASS, INDICATION, METHOD, PARAMETER, + PROPERTY, REFERENCE }; + + /** + * Returns the complete set of possible scopes. + * + * @return An int array of all scopes. + */ + public static int[] getScopes() { + return SCOPES; + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMTypedElement.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMTypedElement.java similarity index 79% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMTypedElement.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMTypedElement.java index 653f563..2a42582 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMTypedElement.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMTypedElement.java @@ -1,127 +1,125 @@ -/* - (C) Copyright IBM Corp. 2006, 2011 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2227442 2008-11-05 blaschke-oss Add missing serialVersionUID - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * CIMTypedElement is an abstract class that represents a CIM - * element that contains just the data type, but no value. - */ -public abstract class CIMTypedElement extends CIMElement { - - private static final long serialVersionUID = -8839964536590822815L; - - private CIMDataType iType; - - /** - * Constructs a CIMTypedElement with the given name and data - * type. - * - * @param pName - * Name of the element. - * @param pType - * Data type of the element. - */ - public CIMTypedElement(String pName, CIMDataType pType) { - super(pName); - this.iType = pType; - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null - * and is a CIMTypedElement that represents the same name and - * type as this object. - * - * @param pObj - * The object to compare with. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMTypedElement)) return false; - CIMTypedElement that = (CIMTypedElement) pObj; - if (!super.equals(that)) return false; - return this.iType.equals(that.iType); - } - - /** - * Returns the CIMDataType for this CIM Element. - * - * @return CIMDataType of this CIM element. - */ - public CIMDataType getDataType() { - return this.iType; - } - - /** - * Returns a hash code value for the CIM typed element. This method is - * supported for the benefit of hashtables such as those provided by - * java.util.Hashtable. - * - * @return A hash code value for this CIM typed element. - */ - @Override - public int hashCode() { - return toString().hashCode(); - } - - /** - * Returns a String representation of the CIM Element. This - * method is intended to be used only for debugging purposes, and the format - * of the returned string may vary between implementations. The returned - * string may be empty but may not be null. - * - * @return String representation of this element. - */ - @Override - public String toString() { - return MOF.typedElement(this, MOF.EMPTY); - } -} +/* + (C) Copyright IBM Corp. 2006, 2011 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2227442 2008-11-05 blaschke-oss Add missing serialVersionUID + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import org.metricshub.wbem.sblim.cimclient.internal.util.MOF; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * CIMTypedElement is an abstract class that represents a CIM + * element that contains just the data type, but no value. + */ +public abstract class CIMTypedElement extends CIMElement { + + private static final long serialVersionUID = -8839964536590822815L; + + private CIMDataType iType; + + /** + * Constructs a CIMTypedElement with the given name and data + * type. + * + * @param pName + * Name of the element. + * @param pType + * Data type of the element. + */ + public CIMTypedElement(String pName, CIMDataType pType) { + super(pName); + this.iType = pType; + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null + * and is a CIMTypedElement that represents the same name and + * type as this object. + * + * @param pObj + * The object to compare with. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMTypedElement)) return false; + CIMTypedElement that = (CIMTypedElement) pObj; + if (!super.equals(that)) return false; + return this.iType.equals(that.iType); + } + + /** + * Returns the CIMDataType for this CIM Element. + * + * @return CIMDataType of this CIM element. + */ + public CIMDataType getDataType() { + return this.iType; + } + + /** + * Returns a hash code value for the CIM typed element. This method is + * supported for the benefit of hashtables such as those provided by + * java.util.Hashtable. + * + * @return A hash code value for this CIM typed element. + */ + @Override + public int hashCode() { + return toString().hashCode(); + } + + /** + * Returns a String representation of the CIM Element. This + * method is intended to be used only for debugging purposes, and the format + * of the returned string may vary between implementations. The returned + * string may be empty but may not be null. + * + * @return String representation of this element. + */ + @Override + public String toString() { + return MOF.typedElement(this, MOF.EMPTY); + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMValuedElement.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMValuedElement.java similarity index 83% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMValuedElement.java rename to src/main/java/org/metricshub/wbem/javax/cim/CIMValuedElement.java index ccc0f9d..9e4f5f6 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMValuedElement.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMValuedElement.java @@ -1,155 +1,153 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant - * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues - * 3411879 2011-09-20 blaschke-oss TCK: CIM element value must match type - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.util.Arrays; - -import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF; - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * CIMValuedElement is a base class used by any element that - * contains a name, type and value. - * - * @param - * Type parameter. - */ -public abstract class CIMValuedElement extends CIMTypedElement { - - private static final long serialVersionUID = 4234L; - - private E iValue; - - /** - * Creates a new CIM element with the given name, type and value. - * - * @param pName - * The string for the name for this element. - * @param pType - * The data type for this element. - * @param pValue - * The value for this element. null is a valid - * value. - * @throws IllegalArgumentException - * If the value does not match the data type. - */ - protected CIMValuedElement(String pName, CIMDataType pType, E pValue) { - super(pName, pType); - - if (pType != null && pValue != null) { - CIMDataType valueDataType; - try { - valueDataType = CIMDataType.getDataType(pValue); - } catch (IllegalArgumentException e) { - // Value has unknown data type, cannot validate - valueDataType = null; - } - if (valueDataType != null && valueDataType.getType() != pType.getType()) throw new IllegalArgumentException( - "CIM value does not match type: " + valueDataType.getType() + " != " - + pType.getType()); - } - - this.iValue = pValue; - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null - * and is a CIMValuedElement that represents the same name, - * type and value as this object. - * - * @param pObj - * The object to compare with. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof CIMValuedElement)) return false; - CIMValuedElement that = (CIMValuedElement) pObj; - if (!super.equals(that)) return false; - if (getDataType().isArray()) { return Arrays.equals((Object[]) this.iValue, - (Object[]) that.iValue); } - return this.iValue == null ? that.iValue == null : this.iValue.equals(that.iValue); - } - - /** - * Returns the value for this CIM Element. - * - * @return The value of the CIM Element. null is a valid value. - */ - public E getValue() { - return this.iValue; - } - - /** - * Returns a hash code value for the CIM valued element. This method is - * supported for the benefit of hashtables such as those provided by - * java.util.Hashtable. - * - * @return A hash code value for this CIM valued element. - */ - @Override - public int hashCode() { - return toString().hashCode(); - } - - /** - * Returns a String representation of the CIM Element. This - * method is intended to be used only for debugging purposes, and the format - * of the returned string may vary between implementations. The returned - * string may be empty but may not be null. - * - * @return String representation of this element. - */ - @Override - public String toString() { - return MOF.valuedElement(this, MOF.EMPTY); - } - -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant + * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType() + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues + * 3411879 2011-09-20 blaschke-oss TCK: CIM element value must match type + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.util.Arrays; + +import org.metricshub.wbem.sblim.cimclient.internal.util.MOF; + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * CIMValuedElement is a base class used by any element that + * contains a name, type and value. + * + * @param + * Type parameter. + */ +public abstract class CIMValuedElement extends CIMTypedElement { + + private static final long serialVersionUID = 4234L; + + private E iValue; + + /** + * Creates a new CIM element with the given name, type and value. + * + * @param pName + * The string for the name for this element. + * @param pType + * The data type for this element. + * @param pValue + * The value for this element. null is a valid + * value. + * @throws IllegalArgumentException + * If the value does not match the data type. + */ + protected CIMValuedElement(String pName, CIMDataType pType, E pValue) { + super(pName, pType); + + if (pType != null && pValue != null) { + CIMDataType valueDataType; + try { + valueDataType = CIMDataType.getDataType(pValue); + } catch (IllegalArgumentException e) { + // Value has unknown data type, cannot validate + valueDataType = null; + } + if (valueDataType != null && valueDataType.getType() != pType.getType()) throw new IllegalArgumentException( + "CIM value does not match type: " + valueDataType.getType() + " != " + + pType.getType()); + } + + this.iValue = pValue; + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null + * and is a CIMValuedElement that represents the same name, + * type and value as this object. + * + * @param pObj + * The object to compare with. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof CIMValuedElement)) return false; + CIMValuedElement that = (CIMValuedElement) pObj; + if (!super.equals(that)) return false; + if (getDataType().isArray()) { return Arrays.equals((Object[]) this.iValue, + (Object[]) that.iValue); } + return this.iValue == null ? that.iValue == null : this.iValue.equals(that.iValue); + } + + /** + * Returns the value for this CIM Element. + * + * @return The value of the CIM Element. null is a valid value. + */ + public E getValue() { + return this.iValue; + } + + /** + * Returns a hash code value for the CIM valued element. This method is + * supported for the benefit of hashtables such as those provided by + * java.util.Hashtable. + * + * @return A hash code value for this CIM valued element. + */ + @Override + public int hashCode() { + return toString().hashCode(); + } + + /** + * Returns a String representation of the CIM Element. This + * method is intended to be used only for debugging purposes, and the format + * of the returned string may vary between implementations. The returned + * string may be empty but may not be null. + * + * @return String representation of this element. + */ + @Override + public String toString() { + return MOF.valuedElement(this, MOF.EMPTY); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger16.java b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger16.java similarity index 88% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger16.java rename to src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger16.java index 96b0dbf..433742b 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger16.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger16.java @@ -1,247 +1,245 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-09 ebak Make SBLIM client JSR48 compliant - * 1737123 2007-06-15 ebak Differences to JSR48 public review draft - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 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) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2795671 2009-05-22 raman_arora Add Type to Comparable - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working - * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * This class represents an UnsignedInteger16. A - * uint16 data type is defined by the (DMTF) CIM Infrastructure Specification (DSP004). - */ -public class UnsignedInteger16 extends Number implements Comparable { - - private static final long serialVersionUID = -4992164525643467216L; - - /** - * The maximum value for an UnsignedInteger16. - */ - public static final int MAX_VALUE = 65535; - - /** - * The minimum value for an UnsignedInteger16. - */ - public static final int MIN_VALUE = 0; - - private int iValue; - - /** - * Sets the value of this integer object if it falls within the range of - * minimum and maximum values. - * - * @param pValue - * The integer. - * @throws NumberFormatException - * If the integer is out of range. - */ - private void setValue(int pValue) throws NumberFormatException { - if (pValue > MAX_VALUE || pValue < MIN_VALUE) { - String msg = "uint16:" + pValue + " is out of range!"; - throw new NumberFormatException(msg); - } - this.iValue = pValue; - } - - /** - * Constructs an unsigned 16-bit integer object for the specified int value. - * Only the lower 16 bits are considered. - * - * @param pValue - * The integer to be represented as an unsigned 16-bit integer. - * @throws NumberFormatException - * If the number is out of range. - */ - public UnsignedInteger16(int pValue) throws NumberFormatException { - setValue(pValue); - } - - /** - * Constructs an unsigned 16-bit integer object for the specified string. - * Only the lower 16 bits are considered. - * - * @param pValue - * The string to be represented as an unsigned 16-bit integer. - * @throws NumberFormatException - * If the number is out of range. - * @throws IllegalArgumentException - * If value is null. - */ - public UnsignedInteger16(String pValue) throws NumberFormatException { - if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); - setValue(Integer.parseInt(pValue)); - } - - /** - * Compares this object with the specified object for order. Returns a - * negative integer, zero, or a positive integer as this object is less - * than, equal to, or greater than the specified object. - * - * @param pOther - * The Object to be compared. - * @return A negative integer, zero, or a positive integer as this object is - * less than, equal to, or greater than the specified object. - * @throws ClassCastException - * If the specified object's type prevents it from being - * compared to this Object. - * @throws IllegalArgumentException - * If value is null. - */ - public int compareTo(UnsignedInteger16 pOther) { - if (pOther == null) throw new IllegalArgumentException( - "Other UnsignedInteger16 cannot be null!"); - UnsignedInteger16 that = pOther; - int d = this.iValue - that.iValue; - if (d == 0) return 0; - return d < 0 ? -1 : 1; - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null and is an - * UnsignedInteger16 object that represents the same value as - * this object. - * - * @param pObj - * The object to compare. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof UnsignedInteger16)) return false; - return this.iValue == ((UnsignedInteger16) pObj).iValue; - } - - /** - * Returns the value of this unsigned integer object as a byte. - * - * @return The byte value of this unsigned integer object. - */ - @Override - public byte byteValue() { - return (byte) this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a - * double. - * - * @return Value of this unsigned integer object as a double. - */ - @Override - public double doubleValue() { - return this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a float - * . - * - * @return Value of this unsigned integer object as a float. - */ - @Override - public float floatValue() { - return this.iValue; - } - - /** - * Computes the hash code for this unsigned integer object. - * - * @return The integer representing the hash code for this unsigned integer - * object. - */ - @Override - public int hashCode() { - return Integer.valueOf(this.iValue).hashCode(); - } - - /** - * Returns the value of this unsigned integer object as an int. - * - * @return Value of this unsigned integer object as an int. - */ - @Override - public int intValue() { - return this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a long. - * - * @return Value of this unsigned integer object as a long. - */ - @Override - public long longValue() { - return this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a short - * . - * - * @return Value of this unsigned integer object as a short. - */ - @Override - public short shortValue() { - return (short) this.iValue; - } - - /** - * Returns the text representation of this unsigned integer object. - * - * @return Text representation of this unsigned integer. - */ - @Override - public String toString() { - return Integer.toString(this.iValue); - } - -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-09 ebak Make SBLIM client JSR48 compliant + * 1737123 2007-06-15 ebak Differences to JSR48 public review draft + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 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) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2795671 2009-05-22 raman_arora Add Type to Comparable + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working + * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * This class represents an UnsignedInteger16. A + * uint16 data type is defined by the (DMTF) CIM Infrastructure Specification (DSP004). + */ +public class UnsignedInteger16 extends Number implements Comparable { + + private static final long serialVersionUID = -4992164525643467216L; + + /** + * The maximum value for an UnsignedInteger16. + */ + public static final int MAX_VALUE = 65535; + + /** + * The minimum value for an UnsignedInteger16. + */ + public static final int MIN_VALUE = 0; + + private int iValue; + + /** + * Sets the value of this integer object if it falls within the range of + * minimum and maximum values. + * + * @param pValue + * The integer. + * @throws NumberFormatException + * If the integer is out of range. + */ + private void setValue(int pValue) throws NumberFormatException { + if (pValue > MAX_VALUE || pValue < MIN_VALUE) { + String msg = "uint16:" + pValue + " is out of range!"; + throw new NumberFormatException(msg); + } + this.iValue = pValue; + } + + /** + * Constructs an unsigned 16-bit integer object for the specified int value. + * Only the lower 16 bits are considered. + * + * @param pValue + * The integer to be represented as an unsigned 16-bit integer. + * @throws NumberFormatException + * If the number is out of range. + */ + public UnsignedInteger16(int pValue) throws NumberFormatException { + setValue(pValue); + } + + /** + * Constructs an unsigned 16-bit integer object for the specified string. + * Only the lower 16 bits are considered. + * + * @param pValue + * The string to be represented as an unsigned 16-bit integer. + * @throws NumberFormatException + * If the number is out of range. + * @throws IllegalArgumentException + * If value is null. + */ + public UnsignedInteger16(String pValue) throws NumberFormatException { + if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); + setValue(Integer.parseInt(pValue)); + } + + /** + * Compares this object with the specified object for order. Returns a + * negative integer, zero, or a positive integer as this object is less + * than, equal to, or greater than the specified object. + * + * @param pOther + * The Object to be compared. + * @return A negative integer, zero, or a positive integer as this object is + * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is null. + */ + public int compareTo(UnsignedInteger16 pOther) { + if (pOther == null) throw new IllegalArgumentException( + "Other UnsignedInteger16 cannot be null!"); + UnsignedInteger16 that = pOther; + int d = this.iValue - that.iValue; + if (d == 0) return 0; + return d < 0 ? -1 : 1; + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null and is an + * UnsignedInteger16 object that represents the same value as + * this object. + * + * @param pObj + * The object to compare. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof UnsignedInteger16)) return false; + return this.iValue == ((UnsignedInteger16) pObj).iValue; + } + + /** + * Returns the value of this unsigned integer object as a byte. + * + * @return The byte value of this unsigned integer object. + */ + @Override + public byte byteValue() { + return (byte) this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a + * double. + * + * @return Value of this unsigned integer object as a double. + */ + @Override + public double doubleValue() { + return this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a float + * . + * + * @return Value of this unsigned integer object as a float. + */ + @Override + public float floatValue() { + return this.iValue; + } + + /** + * Computes the hash code for this unsigned integer object. + * + * @return The integer representing the hash code for this unsigned integer + * object. + */ + @Override + public int hashCode() { + return Integer.valueOf(this.iValue).hashCode(); + } + + /** + * Returns the value of this unsigned integer object as an int. + * + * @return Value of this unsigned integer object as an int. + */ + @Override + public int intValue() { + return this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a long. + * + * @return Value of this unsigned integer object as a long. + */ + @Override + public long longValue() { + return this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a short + * . + * + * @return Value of this unsigned integer object as a short. + */ + @Override + public short shortValue() { + return (short) this.iValue; + } + + /** + * Returns the text representation of this unsigned integer object. + * + * @return Text representation of this unsigned integer. + */ + @Override + public String toString() { + return Integer.toString(this.iValue); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger32.java b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger32.java similarity index 88% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger32.java rename to src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger32.java index c14fc95..7722dce 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger32.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger32.java @@ -1,246 +1,244 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-09 ebak Make SBLIM client JSR48 compliant - * 1737123 2007-06-15 ebak Differences to JSR48 public review draft - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 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) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2795671 2009-05-22 raman_arora Add Type to Comparable - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working - * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * This class represents an UnsignedInteger32. A - * uint32 data type is defined by the (DMTF) CIM Infrastructure Specification (DSP004). - */ -public class UnsignedInteger32 extends Number implements Comparable { - - private static final long serialVersionUID = -8861436527534071393L; - - /** - * The maximum value for an UnsignedInteger32. - */ - public static final long MAX_VALUE = 4294967295l; - - /** - * The minimum value for an UnsignedInteger32. - */ - public static final long MIN_VALUE = 0l; - - private long iValue; - - /** - * Sets the value of this integer object if it falls within the range of - * minimum and maximum values. - * - * @param pValue - * The integer. - * @throws NumberFormatException - * If the integer is out of range. - */ - private void setValue(long pValue) throws NumberFormatException { - if (pValue > MAX_VALUE || pValue < MIN_VALUE) { - String msg = "uint32:" + pValue + " is out of range!"; - throw new NumberFormatException(msg); - } - this.iValue = pValue; - } - - /** - * Constructs an unsigned 32-bit integer object for the specified long - * value. Only the lower 32 bits are considered. - * - * @param pValue - * The long to be represented as an unsigned 32-bit integer. - * @throws NumberFormatException - * If the number is out of range. - */ - public UnsignedInteger32(long pValue) throws NumberFormatException { - setValue(pValue); - } - - /** - * Constructs an unsigned 32-bit integer object for the specified string. - * Only the lower 32 bits are considered. - * - * @param pValue - * The string to be represented as an unsigned 32-bit integer. - * @throws NumberFormatException - * If the number is out of range. - * @throws IllegalArgumentException - * If value is null. - */ - public UnsignedInteger32(String pValue) throws NumberFormatException { - if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); - setValue(Long.parseLong(pValue)); - } - - /** - * Compares this object with the specified object for order. Returns a - * negative integer, zero, or a positive integer as this object is less - * than, equal to, or greater than the specified object. - * - * @param pOther - * The Object to be compared. - * @return A negative integer, zero, or a positive integer as this object is - * less than, equal to, or greater than the specified object. - * @throws ClassCastException - * If the specified object's type prevents it from being - * compared to this Object. - * @throws IllegalArgumentException - * If value is null. - */ - public int compareTo(UnsignedInteger32 pOther) { - if (pOther == null) throw new IllegalArgumentException( - "Other UnsignedInteger32 cannot be null!"); - UnsignedInteger32 that = pOther; - long d = this.iValue - that.iValue; - if (d == 0) return 0; - return d < 0 ? -1 : 1; - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null and is an - * UnsignedInteger32 object that represents the same value as this object. - * - * @param pObj - * The object to compare. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof UnsignedInteger32)) return false; - return this.iValue == ((UnsignedInteger32) pObj).iValue; - } - - /** - * Returns the value of this unsigned integer object as a byte. - * - * @return The byte value of this unsigned integer object. - */ - @Override - public byte byteValue() { - return (byte) this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a - * double. - * - * @return Value of this unsigned integer object as a double. - */ - @Override - public double doubleValue() { - return this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a float - * . - * - * @return Value of this unsigned integer object as a float. - */ - @Override - public float floatValue() { - return this.iValue; - } - - /** - * Computes the hash code for this unsigned integer object. - * - * @return The integer representing the hash code for this unsigned integer - * object. - */ - @Override - public int hashCode() { - return Long.valueOf(this.iValue).hashCode(); - } - - /** - * Returns the value of this unsigned integer object as an int. - * - * @return Value of this unsigned integer object as an int. - */ - @Override - public int intValue() { - return (int) this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a long. - * - * @return Value of this unsigned integer object as a long. - */ - @Override - public long longValue() { - return this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a short - * . - * - * @return Value of this unsigned integer object as a short. - */ - @Override - public short shortValue() { - return (short) this.iValue; - } - - /** - * Returns the text representation of this unsigned integer object. - * - * @return Text representation of this unsigned integer. - */ - @Override - public String toString() { - return Long.toString(this.iValue); - } - -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-09 ebak Make SBLIM client JSR48 compliant + * 1737123 2007-06-15 ebak Differences to JSR48 public review draft + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 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) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2795671 2009-05-22 raman_arora Add Type to Comparable + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working + * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * This class represents an UnsignedInteger32. A + * uint32 data type is defined by the (DMTF) CIM Infrastructure Specification (DSP004). + */ +public class UnsignedInteger32 extends Number implements Comparable { + + private static final long serialVersionUID = -8861436527534071393L; + + /** + * The maximum value for an UnsignedInteger32. + */ + public static final long MAX_VALUE = 4294967295l; + + /** + * The minimum value for an UnsignedInteger32. + */ + public static final long MIN_VALUE = 0l; + + private long iValue; + + /** + * Sets the value of this integer object if it falls within the range of + * minimum and maximum values. + * + * @param pValue + * The integer. + * @throws NumberFormatException + * If the integer is out of range. + */ + private void setValue(long pValue) throws NumberFormatException { + if (pValue > MAX_VALUE || pValue < MIN_VALUE) { + String msg = "uint32:" + pValue + " is out of range!"; + throw new NumberFormatException(msg); + } + this.iValue = pValue; + } + + /** + * Constructs an unsigned 32-bit integer object for the specified long + * value. Only the lower 32 bits are considered. + * + * @param pValue + * The long to be represented as an unsigned 32-bit integer. + * @throws NumberFormatException + * If the number is out of range. + */ + public UnsignedInteger32(long pValue) throws NumberFormatException { + setValue(pValue); + } + + /** + * Constructs an unsigned 32-bit integer object for the specified string. + * Only the lower 32 bits are considered. + * + * @param pValue + * The string to be represented as an unsigned 32-bit integer. + * @throws NumberFormatException + * If the number is out of range. + * @throws IllegalArgumentException + * If value is null. + */ + public UnsignedInteger32(String pValue) throws NumberFormatException { + if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); + setValue(Long.parseLong(pValue)); + } + + /** + * Compares this object with the specified object for order. Returns a + * negative integer, zero, or a positive integer as this object is less + * than, equal to, or greater than the specified object. + * + * @param pOther + * The Object to be compared. + * @return A negative integer, zero, or a positive integer as this object is + * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is null. + */ + public int compareTo(UnsignedInteger32 pOther) { + if (pOther == null) throw new IllegalArgumentException( + "Other UnsignedInteger32 cannot be null!"); + UnsignedInteger32 that = pOther; + long d = this.iValue - that.iValue; + if (d == 0) return 0; + return d < 0 ? -1 : 1; + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null and is an + * UnsignedInteger32 object that represents the same value as this object. + * + * @param pObj + * The object to compare. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof UnsignedInteger32)) return false; + return this.iValue == ((UnsignedInteger32) pObj).iValue; + } + + /** + * Returns the value of this unsigned integer object as a byte. + * + * @return The byte value of this unsigned integer object. + */ + @Override + public byte byteValue() { + return (byte) this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a + * double. + * + * @return Value of this unsigned integer object as a double. + */ + @Override + public double doubleValue() { + return this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a float + * . + * + * @return Value of this unsigned integer object as a float. + */ + @Override + public float floatValue() { + return this.iValue; + } + + /** + * Computes the hash code for this unsigned integer object. + * + * @return The integer representing the hash code for this unsigned integer + * object. + */ + @Override + public int hashCode() { + return Long.valueOf(this.iValue).hashCode(); + } + + /** + * Returns the value of this unsigned integer object as an int. + * + * @return Value of this unsigned integer object as an int. + */ + @Override + public int intValue() { + return (int) this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a long. + * + * @return Value of this unsigned integer object as a long. + */ + @Override + public long longValue() { + return this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a short + * . + * + * @return Value of this unsigned integer object as a short. + */ + @Override + public short shortValue() { + return (short) this.iValue; + } + + /** + * Returns the text representation of this unsigned integer object. + * + * @return Text representation of this unsigned integer. + */ + @Override + public String toString() { + return Long.toString(this.iValue); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger64.java b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger64.java similarity index 89% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger64.java rename to src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger64.java index f07f7c1..ced03b6 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger64.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger64.java @@ -1,278 +1,276 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-09 ebak Make SBLIM client JSR48 compliant - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 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) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2795671 2009-05-22 raman_arora Add Type to Comparable - * 2935258 2010-01-19 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2973230 2010-03-19 blaschke-oss TCK: UnsignedInteger64.equals() does not handle null - * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.math.BigInteger; - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * This class represents an UnsignedInteger64. A - * uint64 data type is defined by the (DMTF) CIM Infrastructure Specification (DSP004). - */ -public class UnsignedInteger64 extends Number implements Comparable { - - private static final long serialVersionUID = -3734165689168941119L; - - /** - * The maximum value for an UnsignedInteger64. - */ - public static final BigInteger MAX_VALUE = new BigInteger("18446744073709551615"); - - /** - * The minimum value for an UnsignedInteger64. - */ - public static final BigInteger MIN_VALUE = BigInteger.ZERO; - - private BigInteger iValue; - - /** - * Sets the value of this integer object if it falls within the range of - * minimum and maximum values. - * - * @param pValue - * The integer. - * @throws NumberFormatException - * If the integer is out of range. - */ - private void setValue(BigInteger pValue) throws NumberFormatException { - if (pValue.compareTo(MAX_VALUE) > 0 || pValue.compareTo(MIN_VALUE) < 0) { - String msg = "uint64:" + pValue + " is out of range!"; - throw new NumberFormatException(msg); - } - this.iValue = pValue; - } - - /** - * Constructs an unsigned 64-bit integer object for the specified - * BigInteger. Only the lower 64 bits are considered. - * - * @param pValue - * The BigInteger to be represented as an unsigned - * 64-bit integer. - * @throws NumberFormatException - * If the number is out of range. - * @throws IllegalArgumentException - * If value is null. - */ - public UnsignedInteger64(BigInteger pValue) throws NumberFormatException { - if (pValue == null) throw new IllegalArgumentException("BigInteger value cannot be null!"); - setValue(pValue); - } - - /** - * Constructs an unsigned 64-bit integer object for the specified array of - * bytes. Only the lower 64 bits are considered. - * - * @param pValue - * The byte array to be represented as an unsigned 64-bit - * integer. - * @throws NumberFormatException - * If the number is out of range. - * @throws IllegalArgumentException - * If value is null. - */ - public UnsignedInteger64(byte[] pValue) throws NumberFormatException { - if (pValue == null) throw new IllegalArgumentException("byte[] value cannot be null!"); - setValue(new BigInteger(pValue)); - } - - /** - * Constructs an unsigned 64-bit integer object from the specified string. - * Only the lower 64 bits are considered. - * - * @param pValue - * The string to be represented as an unsigned 64-bit integer. - * @throws NumberFormatException - * If the number is out of range. - * @throws IllegalArgumentException - * If value is null. - */ - public UnsignedInteger64(String pValue) throws NumberFormatException { - if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); - setValue(new BigInteger(pValue)); - } - - /** - * Get the value as a BigInteger. - * - * @return BigInteger representation of this object. - */ - public BigInteger bigIntegerValue() { - return this.iValue; - } - - /** - * Compares this object with the specified object for order. Returns a - * negative integer, zero, or a positive integer as this object is less - * than, equal to, or greater than the specified object. - * - * @param pOther - * The Object to be compared. - * @return A negative integer, zero, or a positive integer as this object is - * less than, equal to, or greater than the specified object. - * @throws ClassCastException - * If the specified object's type prevents it from being - * compared to this Object. - * @throws IllegalArgumentException - * If value is null. - */ - public int compareTo(UnsignedInteger64 pOther) { - if (pOther == null) throw new IllegalArgumentException( - "Other UnsignedInteger64 cannot be null!"); - UnsignedInteger64 that = pOther; - int d = this.iValue.compareTo(that.iValue); - if (d == 0) return 0; - return d < 0 ? -1 : 1; - } - - /** - * Compares this object against the specified object. The result is - * true if and only if the argument is not null - * and is an UnsignedInteger64 object that represents the same - * value as this object. - * - * @param pOther - * The object to compare. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pOther) { - if (!(pOther instanceof UnsignedInteger64)) return false; - return this.iValue.equals(((UnsignedInteger64) pOther).iValue); - } - - /** - * Returns the value of this unsigned integer object as a byte. - * - * @return The byte value of this unsigned integer object. - */ - @Override - public byte byteValue() { - return this.iValue.byteValue(); - } - - /** - * Returns the value of this unsigned integer object as a - * double. - * - * @return Value of this unsigned integer object as a double. - */ - @Override - public double doubleValue() { - return this.iValue.doubleValue(); - } - - /** - * Returns the value of this unsigned integer object as a float - * . - * - * @return Value of this unsigned integer object as a float. - */ - @Override - public float floatValue() { - return this.iValue.floatValue(); - } - - /** - * Computes the hash code for this unsigned integer object. - * - * @return The integer representing the hash code for this unsigned integer - * object. - */ - @Override - public int hashCode() { - return this.iValue.hashCode(); - } - - /** - * Returns the value of this unsigned integer object as an int. - * - * @return Value of this unsigned integer object as an int. - */ - @Override - public int intValue() { - return this.iValue.intValue(); - } - - /** - * Returns the value of this unsigned integer object as a long. - * - * @return Value of this unsigned integer object as a long. - */ - @Override - public long longValue() { - return this.iValue.longValue(); - } - - /** - * Returns the value of this unsigned integer object as a short - * . - * - * @return Value of this unsigned integer object as a short. - */ - @Override - public short shortValue() { - return this.iValue.shortValue(); - } - - /** - * Returns the text representation of this unsigned integer object. - * - * @return Text representation of this unsigned integer. - */ - @Override - public String toString() { - return this.iValue.toString(); - } - -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-09 ebak Make SBLIM client JSR48 compliant + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 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) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2795671 2009-05-22 raman_arora Add Type to Comparable + * 2935258 2010-01-19 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2973230 2010-03-19 blaschke-oss TCK: UnsignedInteger64.equals() does not handle null + * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.math.BigInteger; + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * This class represents an UnsignedInteger64. A + * uint64 data type is defined by the (DMTF) CIM Infrastructure Specification (DSP004). + */ +public class UnsignedInteger64 extends Number implements Comparable { + + private static final long serialVersionUID = -3734165689168941119L; + + /** + * The maximum value for an UnsignedInteger64. + */ + public static final BigInteger MAX_VALUE = new BigInteger("18446744073709551615"); + + /** + * The minimum value for an UnsignedInteger64. + */ + public static final BigInteger MIN_VALUE = BigInteger.ZERO; + + private BigInteger iValue; + + /** + * Sets the value of this integer object if it falls within the range of + * minimum and maximum values. + * + * @param pValue + * The integer. + * @throws NumberFormatException + * If the integer is out of range. + */ + private void setValue(BigInteger pValue) throws NumberFormatException { + if (pValue.compareTo(MAX_VALUE) > 0 || pValue.compareTo(MIN_VALUE) < 0) { + String msg = "uint64:" + pValue + " is out of range!"; + throw new NumberFormatException(msg); + } + this.iValue = pValue; + } + + /** + * Constructs an unsigned 64-bit integer object for the specified + * BigInteger. Only the lower 64 bits are considered. + * + * @param pValue + * The BigInteger to be represented as an unsigned + * 64-bit integer. + * @throws NumberFormatException + * If the number is out of range. + * @throws IllegalArgumentException + * If value is null. + */ + public UnsignedInteger64(BigInteger pValue) throws NumberFormatException { + if (pValue == null) throw new IllegalArgumentException("BigInteger value cannot be null!"); + setValue(pValue); + } + + /** + * Constructs an unsigned 64-bit integer object for the specified array of + * bytes. Only the lower 64 bits are considered. + * + * @param pValue + * The byte array to be represented as an unsigned 64-bit + * integer. + * @throws NumberFormatException + * If the number is out of range. + * @throws IllegalArgumentException + * If value is null. + */ + public UnsignedInteger64(byte[] pValue) throws NumberFormatException { + if (pValue == null) throw new IllegalArgumentException("byte[] value cannot be null!"); + setValue(new BigInteger(pValue)); + } + + /** + * Constructs an unsigned 64-bit integer object from the specified string. + * Only the lower 64 bits are considered. + * + * @param pValue + * The string to be represented as an unsigned 64-bit integer. + * @throws NumberFormatException + * If the number is out of range. + * @throws IllegalArgumentException + * If value is null. + */ + public UnsignedInteger64(String pValue) throws NumberFormatException { + if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); + setValue(new BigInteger(pValue)); + } + + /** + * Get the value as a BigInteger. + * + * @return BigInteger representation of this object. + */ + public BigInteger bigIntegerValue() { + return this.iValue; + } + + /** + * Compares this object with the specified object for order. Returns a + * negative integer, zero, or a positive integer as this object is less + * than, equal to, or greater than the specified object. + * + * @param pOther + * The Object to be compared. + * @return A negative integer, zero, or a positive integer as this object is + * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is null. + */ + public int compareTo(UnsignedInteger64 pOther) { + if (pOther == null) throw new IllegalArgumentException( + "Other UnsignedInteger64 cannot be null!"); + UnsignedInteger64 that = pOther; + int d = this.iValue.compareTo(that.iValue); + if (d == 0) return 0; + return d < 0 ? -1 : 1; + } + + /** + * Compares this object against the specified object. The result is + * true if and only if the argument is not null + * and is an UnsignedInteger64 object that represents the same + * value as this object. + * + * @param pOther + * The object to compare. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pOther) { + if (!(pOther instanceof UnsignedInteger64)) return false; + return this.iValue.equals(((UnsignedInteger64) pOther).iValue); + } + + /** + * Returns the value of this unsigned integer object as a byte. + * + * @return The byte value of this unsigned integer object. + */ + @Override + public byte byteValue() { + return this.iValue.byteValue(); + } + + /** + * Returns the value of this unsigned integer object as a + * double. + * + * @return Value of this unsigned integer object as a double. + */ + @Override + public double doubleValue() { + return this.iValue.doubleValue(); + } + + /** + * Returns the value of this unsigned integer object as a float + * . + * + * @return Value of this unsigned integer object as a float. + */ + @Override + public float floatValue() { + return this.iValue.floatValue(); + } + + /** + * Computes the hash code for this unsigned integer object. + * + * @return The integer representing the hash code for this unsigned integer + * object. + */ + @Override + public int hashCode() { + return this.iValue.hashCode(); + } + + /** + * Returns the value of this unsigned integer object as an int. + * + * @return Value of this unsigned integer object as an int. + */ + @Override + public int intValue() { + return this.iValue.intValue(); + } + + /** + * Returns the value of this unsigned integer object as a long. + * + * @return Value of this unsigned integer object as a long. + */ + @Override + public long longValue() { + return this.iValue.longValue(); + } + + /** + * Returns the value of this unsigned integer object as a short + * . + * + * @return Value of this unsigned integer object as a short. + */ + @Override + public short shortValue() { + return this.iValue.shortValue(); + } + + /** + * Returns the text representation of this unsigned integer object. + * + * @return Text representation of this unsigned integer. + */ + @Override + public String toString() { + return this.iValue.toString(); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger8.java b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger8.java similarity index 88% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger8.java rename to src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger8.java index 3382f78..9b97880 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/cim/UnsignedInteger8.java +++ b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger8.java @@ -1,249 +1,247 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-10-09 ebak Make SBLIM client JSR48 compliant - * 1737123 2007-06-15 ebak Differences to JSR48 public review draft - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 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) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2795671 2009-05-22 raman_arora Add Type to Comparable - * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 - * 2944833 2010-02-08 blaschke-oss Need private setValue in UnsignedInteger8 - * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working - * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.cim; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * This class represents an UnsignedInteger8. A uint8 - * data type is defined by the (DMTF) CIM - * Infrastructure Specification (DSP004). - */ -public class UnsignedInteger8 extends Number implements Comparable { - - private static final long serialVersionUID = 4392496278679167896L; - - /** - * The maximum possible value for an UnsignedInteger8. - */ - public static final short MAX_VALUE = 255; - - /** - * The minimum possible value for an UnsignedInteger8. - */ - public static final short MIN_VALUE = 0; - - private short iValue; - - /** - * Sets the value of this integer object if it falls within the range of - * minimum and maximum values. - * - * @param pValue - * The integer. - * @throws NumberFormatException - * If the integer is out of range. - */ - private void setValue(short pValue) throws NumberFormatException { - if (pValue > MAX_VALUE || pValue < MIN_VALUE) { - String msg = "uint8:" + pValue + " is out of range!"; - throw new NumberFormatException(msg); - } - this.iValue = pValue; - } - - /** - * Constructs an unsigned 8-bit integer object for the specified short - * value. Only the lower 8 bits are considered. - * - * @param pValue - * The short to be represented as an unsigned 8-bit integer - * object. - * @throws NumberFormatException - * If the number is out of range. - */ - public UnsignedInteger8(short pValue) throws NumberFormatException { - setValue(pValue); - } - - /** - * Constructs an unsigned 8-bit integer object for the specified string. - * Only the lower 8 bits are considered. - * - * @param pValue - * The string to be represented as an unsigned 8-bit integer. - * @throws NumberFormatException - * If the number is out of range. - * @throws IllegalArgumentException - * If value is null. - */ - public UnsignedInteger8(String pValue) throws NumberFormatException { - if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); - setValue(Short.parseShort(pValue)); - } - - /** - * Compares this object with the specified object for order. Returns a - * negative integer, zero, or a positive integer as this object is less - * than, equal to, or greater than the specified object. - * - * @param pOther - * The Object to be compared. - * @return A negative integer, zero, or a positive integer as this object is - * less than, equal to, or greater than the specified object. - * @throws ClassCastException - * If the specified object's type prevents it from being - * compared to this Object. - * @throws IllegalArgumentException - * If value is null. - */ - public int compareTo(UnsignedInteger8 pOther) { - if (pOther == null) throw new IllegalArgumentException( - "Other UnsignedInteger8 cannot be null!"); - UnsignedInteger8 that = pOther; - int d = this.iValue - that.iValue; - if (d == 0) return 0; - return d < 0 ? -1 : 1; - } - - /** - * Compares this object against the specified object. The result is true if - * and only if the argument is not null and is an - * UnsignedInteger8 object that represents the same value as - * this object. - * - * @param pObj - * The object to compare. - * @return true if the objects are the same; false - * otherwise. - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof UnsignedInteger8)) return false; - return this.iValue == ((UnsignedInteger8) pObj).iValue; - } - - /** - * Returns the value of this unsigned integer object as a byte. - * - * @return The byte value of this unsigned integer object. - */ - @Override - public byte byteValue() { - return (byte) this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a - * double. - * - * @return Value of this unsigned integer object as a double. - */ - @Override - public double doubleValue() { - return this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a float - * . - * - * @return Value of this unsigned integer object as a float. - */ - @Override - public float floatValue() { - return this.iValue; - } - - /** - * Computes the hash code for this unsigned integer object. - * - * @return The integer representing the hash code for this unsigned integer - * object. - */ - @Override - public int hashCode() { - return Short.valueOf(this.iValue).hashCode(); - } - - /** - * Returns the value of this unsigned integer object as an int. - * - * @return Value of this unsigned integer object as an int. - */ - @Override - public int intValue() { - return this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a long. - * - * @return Value of this unsigned integer object as a long. - */ - @Override - public long longValue() { - return this.iValue; - } - - /** - * Returns the value of this unsigned integer object as a short - * . - * - * @return Value of this unsigned integer object as a short. - */ - @Override - public short shortValue() { - return this.iValue; - } - - /** - * Returns the text representation of this unsigned integer object. - * - * @return Text representation of this unsigned integer. - */ - @Override - public String toString() { - return Short.toString(this.iValue); - } - -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-10-09 ebak Make SBLIM client JSR48 compliant + * 1737123 2007-06-15 ebak Differences to JSR48 public review draft + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 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) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2795671 2009-05-22 raman_arora Add Type to Comparable + * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0 + * 2944833 2010-02-08 blaschke-oss Need private setValue in UnsignedInteger8 + * 2973233 2010-03-19 blaschke-oss TCK: UnsignedIntegerNN.hashCode() not working + * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.cim; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * This class represents an UnsignedInteger8. A uint8 + * data type is defined by the (DMTF) CIM + * Infrastructure Specification (DSP004). + */ +public class UnsignedInteger8 extends Number implements Comparable { + + private static final long serialVersionUID = 4392496278679167896L; + + /** + * The maximum possible value for an UnsignedInteger8. + */ + public static final short MAX_VALUE = 255; + + /** + * The minimum possible value for an UnsignedInteger8. + */ + public static final short MIN_VALUE = 0; + + private short iValue; + + /** + * Sets the value of this integer object if it falls within the range of + * minimum and maximum values. + * + * @param pValue + * The integer. + * @throws NumberFormatException + * If the integer is out of range. + */ + private void setValue(short pValue) throws NumberFormatException { + if (pValue > MAX_VALUE || pValue < MIN_VALUE) { + String msg = "uint8:" + pValue + " is out of range!"; + throw new NumberFormatException(msg); + } + this.iValue = pValue; + } + + /** + * Constructs an unsigned 8-bit integer object for the specified short + * value. Only the lower 8 bits are considered. + * + * @param pValue + * The short to be represented as an unsigned 8-bit integer + * object. + * @throws NumberFormatException + * If the number is out of range. + */ + public UnsignedInteger8(short pValue) throws NumberFormatException { + setValue(pValue); + } + + /** + * Constructs an unsigned 8-bit integer object for the specified string. + * Only the lower 8 bits are considered. + * + * @param pValue + * The string to be represented as an unsigned 8-bit integer. + * @throws NumberFormatException + * If the number is out of range. + * @throws IllegalArgumentException + * If value is null. + */ + public UnsignedInteger8(String pValue) throws NumberFormatException { + if (pValue == null) throw new IllegalArgumentException("String value cannot be null!"); + setValue(Short.parseShort(pValue)); + } + + /** + * Compares this object with the specified object for order. Returns a + * negative integer, zero, or a positive integer as this object is less + * than, equal to, or greater than the specified object. + * + * @param pOther + * The Object to be compared. + * @return A negative integer, zero, or a positive integer as this object is + * less than, equal to, or greater than the specified object. + * @throws ClassCastException + * If the specified object's type prevents it from being + * compared to this Object. + * @throws IllegalArgumentException + * If value is null. + */ + public int compareTo(UnsignedInteger8 pOther) { + if (pOther == null) throw new IllegalArgumentException( + "Other UnsignedInteger8 cannot be null!"); + UnsignedInteger8 that = pOther; + int d = this.iValue - that.iValue; + if (d == 0) return 0; + return d < 0 ? -1 : 1; + } + + /** + * Compares this object against the specified object. The result is true if + * and only if the argument is not null and is an + * UnsignedInteger8 object that represents the same value as + * this object. + * + * @param pObj + * The object to compare. + * @return true if the objects are the same; false + * otherwise. + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof UnsignedInteger8)) return false; + return this.iValue == ((UnsignedInteger8) pObj).iValue; + } + + /** + * Returns the value of this unsigned integer object as a byte. + * + * @return The byte value of this unsigned integer object. + */ + @Override + public byte byteValue() { + return (byte) this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a + * double. + * + * @return Value of this unsigned integer object as a double. + */ + @Override + public double doubleValue() { + return this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a float + * . + * + * @return Value of this unsigned integer object as a float. + */ + @Override + public float floatValue() { + return this.iValue; + } + + /** + * Computes the hash code for this unsigned integer object. + * + * @return The integer representing the hash code for this unsigned integer + * object. + */ + @Override + public int hashCode() { + return Short.valueOf(this.iValue).hashCode(); + } + + /** + * Returns the value of this unsigned integer object as an int. + * + * @return Value of this unsigned integer object as an int. + */ + @Override + public int intValue() { + return this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a long. + * + * @return Value of this unsigned integer object as a long. + */ + @Override + public long longValue() { + return this.iValue; + } + + /** + * Returns the value of this unsigned integer object as a short + * . + * + * @return Value of this unsigned integer object as a short. + */ + @Override + public short shortValue() { + return this.iValue; + } + + /** + * Returns the text representation of this unsigned integer object. + * + * @return Text representation of this unsigned integer. + */ + @Override + public String toString() { + return Short.toString(this.iValue); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/package.html b/src/main/java/org/metricshub/wbem/javax/cim/package.html similarity index 100% rename from src/main/java/org/sentrysoftware/wbem/javax/cim/package.html rename to src/main/java/org/metricshub/wbem/javax/cim/package.html diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/CloseableIterator.java b/src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java similarity index 76% rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/CloseableIterator.java rename to src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java index f1c3225..e77a71b 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/CloseableIterator.java +++ b/src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java @@ -1,82 +1,80 @@ -/* - (C) Copyright IBM Corp. 2006, 2010 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-11-08 lupusalex Make SBLIM client JSR48 compliant - * 1737141 2007-06-18 ebak Sync up with JSR48 evolution - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 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) - * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics - * 2912104 2009-12-10 blaschke-oss Sync up javax.wbem.* with JSR48 1.0.0 - * 2958941 2010-02-25 blaschke-oss Sync up javax.wbem.* javadoc with JSR48 1.0.0 - */ -package org.sentrysoftware.wbem.javax.wbem; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.util.Iterator; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * A CloseableIterator is a subclass of Iterator that - * adds support for allowing the underlying implementation to serve up the - * elements as they become available. The methods hasNext() and - * next() may block while waiting for elements from the underlying - * implementation. Since next() or hasNext() can only - * throw runtime exceptions, if a consumer receives a runtime exception for one - * of these methods they must call getWBEMException() to get the - * actual WBEMException. - * - * @param - * Type parameter. - */ -public interface CloseableIterator extends Iterator { - - /** - * Closes the Iterator. This allows the underlying - * implementation to do any cleanup and disconnect from any source that it - * may be using. - */ - public void close(); - - /** - * If next() or hasNext() throws a - * RuntimeException, this method must be called to get the - * WBEMException. - * - * @return The WBEMException or null if one was not thrown. - */ - public WBEMException getWBEMException(); - -} +/* + (C) Copyright IBM Corp. 2006, 2010 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-11-08 lupusalex Make SBLIM client JSR48 compliant + * 1737141 2007-06-18 ebak Sync up with JSR48 evolution + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 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) + * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2912104 2009-12-10 blaschke-oss Sync up javax.wbem.* with JSR48 1.0.0 + * 2958941 2010-02-25 blaschke-oss Sync up javax.wbem.* javadoc with JSR48 1.0.0 + */ +package org.metricshub.wbem.javax.wbem; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.util.Iterator; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * A CloseableIterator is a subclass of Iterator that + * adds support for allowing the underlying implementation to serve up the + * elements as they become available. The methods hasNext() and + * next() may block while waiting for elements from the underlying + * implementation. Since next() or hasNext() can only + * throw runtime exceptions, if a consumer receives a runtime exception for one + * of these methods they must call getWBEMException() to get the + * actual WBEMException. + * + * @param + * Type parameter. + */ +public interface CloseableIterator extends Iterator { + + /** + * Closes the Iterator. This allows the underlying + * implementation to do any cleanup and disconnect from any source that it + * may be using. + */ + public void close(); + + /** + * If next() or hasNext() throws a + * RuntimeException, this method must be called to get the + * WBEMException. + * + * @return The WBEMException or null if one was not thrown. + */ + public WBEMException getWBEMException(); + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/WBEMException.java b/src/main/java/org/metricshub/wbem/javax/wbem/WBEMException.java similarity index 90% rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/WBEMException.java rename to src/main/java/org/metricshub/wbem/javax/wbem/WBEMException.java index 8ae2f20..c8f325e 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/WBEMException.java +++ b/src/main/java/org/metricshub/wbem/javax/wbem/WBEMException.java @@ -1,388 +1,386 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-11-08 lupusalex Make SBLIM client JSR48 compliant - * 1715482 2007-05-10 lupusalex CIM_ERR_FAILED thrown when access denied - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al - * 2912104 2009-12-10 blaschke-oss Sync up javax.wbem.* with JSR48 1.0.0 - * 2958941 2010-02-25 blaschke-oss Sync up javax.wbem.* javadoc with JSR48 1.0.0 - * 2958990 2010-02-25 blaschke-oss Remove WBEMException.CIM_ERR_TYPE_MISMATCH - * 2959039 2010-02-25 blaschke-oss Fix WBEMException.toString() logic - * 3490032 2012-02-21 blaschke-oss TCK: WBEMException must validate error ID - * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final - * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods - */ - -package org.sentrysoftware.wbem.javax.wbem; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import org.sentrysoftware.wbem.javax.cim.CIMInstance; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 -/** - * WBEMException is returned when there is a WBEM Operations error. - * WBEMException includes the following:
      - *
        - *
      • ID - The ID of the exception
        • - *
      • Description - Brief description of the exception
        • - *
      • CIMInstance[] - Optional array of CIM_Error - * instances
        • - *
      - */ -public class WBEMException extends Exception { - - private static final long serialVersionUID = 1224653110826327234L; - - /** - * Access Denied Exception. Thrown when the principal is not authenticated - * or authorized. - */ - public static final int CIM_ERR_ACCESS_DENIED = 2; - - /** - * Element already exists. - */ - public static final int CIM_ERR_ALREADY_EXISTS = 11; - - /** - * Class has subclasses. The exception is thrown by the WBEM Server to - * disallow invalidation of the subclasses by the super class deletion. - * Clients must explicitly delete the subclasses first. The check for - * subclasses is made before the check for class instances. - */ - public static final int CIM_ERR_CLASS_HAS_CHILDREN = 8; - - /** - * Class has instances. The exception is thrown by the WBEM Server to - * disallow invalidation of the instances by the class deletion. Clients - * must explicitly delete the instances first. The check for subclasses is - * made before the check for class instances i.e. - * CIM_ERR_CLASS_HAS_CHILDREN is thrown before - * CIM_ERR_CLASS_HAS_INSTANCES - */ - public static final int CIM_ERR_CLASS_HAS_INSTANCES = 9; - - /** - * The WBEM Server does not support continuation on error. - */ - public static final int CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED = 26; - - /** - * General Exception. If no other error IDs match the error, this one should - * be returned. - */ - public static final int CIM_ERR_FAILED = 1; - - /** - * Using a filter in the enumeration is not supported by the WBEM Server. - */ - public static final int CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED = 25; - - /** - * Invalid class specified. For e.g. when one tries to add an instance for a - * class that does not exist. This error message uses one parameter, the - * invalid class name. - */ - public static final int CIM_ERR_INVALID_CLASS = 5; - - /** - * The enumeration identified by the specified context cannot be found, is - * in a closed state, does not exist, or is otherwise invalid. - */ - public static final int CIM_ERR_INVALID_ENUMERATION_CONTEXT = 21; - - /** - * Invalid namespace Exception. Thrown when the specified namespace does not - * exist. - */ - public static final int CIM_ERR_INVALID_NAMESPACE = 3; - - /** - * The specified operation timeout is not supported by the WBEM Server. - */ - public static final int CIM_ERR_INVALID_OPERATION_TIMEOUT = 22; - - /** - * Invalid parameter is passed to a method. This error message uses one - * parameter, the parameter which caused the exception. - */ - public static final int CIM_ERR_INVALID_PARAMETER = 4; - - /** - * Invalid query. This error message has two parameters, the invalid snippet - * of the query, and additional info with the actual error in the query. - */ - public static final int CIM_ERR_INVALID_QUERY = 15; - - /** - * The destination is invalid. - */ - public static final int CIM_ERR_INVALID_RESPONSE_DESTINATION = 19; - - /** - * The super class does not exist. - */ - public static final int CIM_ERR_INVALID_SUPERCLASS = 10; - - /** - * The method is not available. - */ - public static final int CIM_ERR_METHOD_NOT_AVAILABLE = 16; - - /** - * The method is not found. - */ - public static final int CIM_ERR_METHOD_NOT_FOUND = 17; - - /** - * The namespace is not empty. - */ - public static final int CIM_ERR_NAMESPACE_NOT_EMPTY = 20; - - /** - * The property does not exist in the class/instance being manipulated. This - * error message uses one parameter, the name of the property that does not - * exist. - */ - public static final int CIM_ERR_NO_SUCH_PROPERTY = 12; - - /** - * Element cannot be found. This error message uses one parameter, the - * element that cannot be found. - */ - public static final int CIM_ERR_NOT_FOUND = 6; - - /** - * The action is not supported. This can be thrown by a provider or the WBEM - * Server itself when it does not support a particular method. - */ - public static final int CIM_ERR_NOT_SUPPORTED = 7; - - /** - * The attempt to abandon a concurrent Pull operation on the same - * enumeration failed, the concurrent Pull operation proceeds normally. - */ - public static final int CIM_ERR_PULL_CANNOT_BE_ABANDONED = 24; - - /** - * The Pull operation has been abandoned due to execution of a concurrent - * CloseEnumeration operation on the same enumeration. - */ - public static final int CIM_ERR_PULL_HAS_BEEN_ABANDONED = 23; - - /** - * The requested query language is not recognized. This error message has - * one parameter, the invalid query language string. - */ - public static final int CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED = 14; - - /** - * The WBEM Server is in the process of shutting down and cannot process the - * operation at this time. - */ - public static final int CIM_ERR_SERVER_IS_SHUTTING_DOWN = 28; - - /** - * The WBEM Server has failed the operation based upon exceeding server - * limits. - */ - public static final int CIM_ERR_SERVER_LIMITS_EXCEEDED = 27; - - private static final String[] MESSAGES = new String[] { - /* 00 */"SUCCESS", - /* 01 */"CIM_ERR_FAILED", - /* 02 */"CIM_ERR_ACCESS_DENIED", - /* 03 */"CIM_ERR_INVALID_NAMESPACE", - /* 04 */"CIM_ERR_INVALID_PARAMETER", - /* 05 */"CIM_ERR_INVALID_CLASS", - /* 06 */"CIM_ERR_NOT_FOUND", - /* 07 */"CIM_ERR_NOT_SUPPORTED", - /* 08 */"CIM_ERR_CLASS_HAS_CHILDREN", - /* 09 */"CIM_ERR_CLASS_HAS_INSTANCES", - /* 10 */"CIM_ERR_INVALID_SUPERCLASS", - /* 11 */"CIM_ERR_ALREADY_EXISTS", - /* 12 */"CIM_ERR_NO_SUCH_PROPERTY", - /* 13 */null, - /* 14 */"CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED", - /* 15 */"CIM_ERR_INVALID_QUERY", - /* 16 */"CIM_ERR_METHOD_NOT_AVAILABLE", - /* 17 */"CIM_ERR_METHOD_NOT_FOUND", - /* 18 */null, - /* 19 */"CIM_ERR_INVALID_RESPONSE_DESTINATION", - /* 20 */"CIM_ERR_NAMESPACE_NOT_EMPTY", - /* 21 */"CIM_ERR_INVALID_ENUMERATION_CONTEXT", - /* 22 */"CIM_ERR_INVALID_OPERATION_TIMEOUT", - /* 23 */"CIM_ERR_PULL_HAS_BEEN_ABANDONED", - /* 24 */"CIM_ERR_PULL_CANNOT_BE_ABANDONED", - /* 25 */"CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED", - /* 26 */"CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED", - /* 27 */"CIM_ERR_SERVER_LIMITS_EXCEEDED", - /* 28 */"CIM_ERR_SERVER_IS_SHUTTING_DOWN" }; - - private int iErrorID; - - private CIMInstance[] iCimErrors; - - /** - * Constructs a new exception using the specified ID. The detailed message - * will be null. - * - * @param pID - * The Error ID to use. - * @throws IllegalArgumentException - * If the pID does not match one of the predefined messages. - */ - public WBEMException(int pID) { - this(pID, null, null, null); - } - - /** - * Constructs a new exception using the specified ID and detailed message. - * - * @param pID - * The error ID. - * @param pMessage - * The detailed message. - * @throws IllegalArgumentException - * If the pID does not match one of the predefined messages. - */ - public WBEMException(int pID, String pMessage) { - this(pID, pMessage, null, null); - } - - /** - * Constructs a new exception using the specified ID, detailed message and - * CIM_Error instances. - * - * @param pID - * The error ID. - * @param pMessage - * The detailed message. - * @param pErrors - * Array of CIM_Error instances. - * @throws IllegalArgumentException - * If the pID does not match one of the predefined messages. - */ - public WBEMException(int pID, String pMessage, CIMInstance[] pErrors) { - this(pID, pMessage, pErrors, null); - } - - /** - * Constructs a new exception using the specified ID, detailed message, - * CIM_Error instances and cause. - * - * @param pID - * The error ID. - * @param pMessage - * The detailed message. - * @param pErrors - * Array of CIM_Error instances. - * @param pCause - * Throwable cause. - * @throws IllegalArgumentException - * If the pID does not match one of the predefined messages. - */ - public WBEMException(int pID, String pMessage, CIMInstance[] pErrors, Throwable pCause) { - super(pMessage, pCause); - if (!isValidID(pID)) throw new IllegalArgumentException("Invalid error ID!"); - this.iErrorID = pID; - this.iCimErrors = pErrors; - } - - /** - * Constructs a new exception using the specified detailed message. The - * ID will be CIM_ERR_FAILED. - * - * @param pMessage - * The detailed message. - */ - public WBEMException(String pMessage) { - this(CIM_ERR_FAILED, pMessage, null, null); - } - - /** - * Get the CIM Error Instances. - * - * @return Any CIM Error instances associated with this exception; - * null if none. - */ - public CIMInstance[] getCIMErrors() { - return this.iCimErrors; - } - - /** - * Returns the ID of the error. - * - * @return The ID of the error. - */ - public int getID() { - return this.iErrorID; - } - - /** - * Prints out the ID and the optional detailed message. - * - * @return A String representation of the exception. - */ - @Override - public String toString() { - return "WBEMException: " + getCIMMessage() - + (super.getMessage() != null ? " (" + super.getMessage() + ")" : ""); - } - - /** - * Returns a string representation of the exception ID. - * - * @return A String representation of the exception ID. - */ - private String getCIMMessage() { - return isValidID(this.iErrorID) ? MESSAGES[this.iErrorID] : String.valueOf(this.iErrorID); - } - - /** - * Returns validity of error ID. - * - * @param pID - * The error ID. - * - * @return true if error ID is valid, false - * otherwise. - */ - private boolean isValidID(int pID) { - return pID >= 0 && pID < MESSAGES.length && MESSAGES[pID] != null; - } -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-11-08 lupusalex Make SBLIM client JSR48 compliant + * 1715482 2007-05-10 lupusalex CIM_ERR_FAILED thrown when access denied + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al + * 2912104 2009-12-10 blaschke-oss Sync up javax.wbem.* with JSR48 1.0.0 + * 2958941 2010-02-25 blaschke-oss Sync up javax.wbem.* javadoc with JSR48 1.0.0 + * 2958990 2010-02-25 blaschke-oss Remove WBEMException.CIM_ERR_TYPE_MISMATCH + * 2959039 2010-02-25 blaschke-oss Fix WBEMException.toString() logic + * 3490032 2012-02-21 blaschke-oss TCK: WBEMException must validate error ID + * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final + * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods + */ + +package org.metricshub.wbem.javax.wbem; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import org.metricshub.wbem.javax.cim.CIMInstance; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 +/** + * WBEMException is returned when there is a WBEM Operations error. + * WBEMException includes the following:
      + *
        + *
      • ID - The ID of the exception
        • + *
      • Description - Brief description of the exception
        • + *
      • CIMInstance[] - Optional array of CIM_Error + * instances
        • + *
      + */ +public class WBEMException extends Exception { + + private static final long serialVersionUID = 1224653110826327234L; + + /** + * Access Denied Exception. Thrown when the principal is not authenticated + * or authorized. + */ + public static final int CIM_ERR_ACCESS_DENIED = 2; + + /** + * Element already exists. + */ + public static final int CIM_ERR_ALREADY_EXISTS = 11; + + /** + * Class has subclasses. The exception is thrown by the WBEM Server to + * disallow invalidation of the subclasses by the super class deletion. + * Clients must explicitly delete the subclasses first. The check for + * subclasses is made before the check for class instances. + */ + public static final int CIM_ERR_CLASS_HAS_CHILDREN = 8; + + /** + * Class has instances. The exception is thrown by the WBEM Server to + * disallow invalidation of the instances by the class deletion. Clients + * must explicitly delete the instances first. The check for subclasses is + * made before the check for class instances i.e. + * CIM_ERR_CLASS_HAS_CHILDREN is thrown before + * CIM_ERR_CLASS_HAS_INSTANCES + */ + public static final int CIM_ERR_CLASS_HAS_INSTANCES = 9; + + /** + * The WBEM Server does not support continuation on error. + */ + public static final int CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED = 26; + + /** + * General Exception. If no other error IDs match the error, this one should + * be returned. + */ + public static final int CIM_ERR_FAILED = 1; + + /** + * Using a filter in the enumeration is not supported by the WBEM Server. + */ + public static final int CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED = 25; + + /** + * Invalid class specified. For e.g. when one tries to add an instance for a + * class that does not exist. This error message uses one parameter, the + * invalid class name. + */ + public static final int CIM_ERR_INVALID_CLASS = 5; + + /** + * The enumeration identified by the specified context cannot be found, is + * in a closed state, does not exist, or is otherwise invalid. + */ + public static final int CIM_ERR_INVALID_ENUMERATION_CONTEXT = 21; + + /** + * Invalid namespace Exception. Thrown when the specified namespace does not + * exist. + */ + public static final int CIM_ERR_INVALID_NAMESPACE = 3; + + /** + * The specified operation timeout is not supported by the WBEM Server. + */ + public static final int CIM_ERR_INVALID_OPERATION_TIMEOUT = 22; + + /** + * Invalid parameter is passed to a method. This error message uses one + * parameter, the parameter which caused the exception. + */ + public static final int CIM_ERR_INVALID_PARAMETER = 4; + + /** + * Invalid query. This error message has two parameters, the invalid snippet + * of the query, and additional info with the actual error in the query. + */ + public static final int CIM_ERR_INVALID_QUERY = 15; + + /** + * The destination is invalid. + */ + public static final int CIM_ERR_INVALID_RESPONSE_DESTINATION = 19; + + /** + * The super class does not exist. + */ + public static final int CIM_ERR_INVALID_SUPERCLASS = 10; + + /** + * The method is not available. + */ + public static final int CIM_ERR_METHOD_NOT_AVAILABLE = 16; + + /** + * The method is not found. + */ + public static final int CIM_ERR_METHOD_NOT_FOUND = 17; + + /** + * The namespace is not empty. + */ + public static final int CIM_ERR_NAMESPACE_NOT_EMPTY = 20; + + /** + * The property does not exist in the class/instance being manipulated. This + * error message uses one parameter, the name of the property that does not + * exist. + */ + public static final int CIM_ERR_NO_SUCH_PROPERTY = 12; + + /** + * Element cannot be found. This error message uses one parameter, the + * element that cannot be found. + */ + public static final int CIM_ERR_NOT_FOUND = 6; + + /** + * The action is not supported. This can be thrown by a provider or the WBEM + * Server itself when it does not support a particular method. + */ + public static final int CIM_ERR_NOT_SUPPORTED = 7; + + /** + * The attempt to abandon a concurrent Pull operation on the same + * enumeration failed, the concurrent Pull operation proceeds normally. + */ + public static final int CIM_ERR_PULL_CANNOT_BE_ABANDONED = 24; + + /** + * The Pull operation has been abandoned due to execution of a concurrent + * CloseEnumeration operation on the same enumeration. + */ + public static final int CIM_ERR_PULL_HAS_BEEN_ABANDONED = 23; + + /** + * The requested query language is not recognized. This error message has + * one parameter, the invalid query language string. + */ + public static final int CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED = 14; + + /** + * The WBEM Server is in the process of shutting down and cannot process the + * operation at this time. + */ + public static final int CIM_ERR_SERVER_IS_SHUTTING_DOWN = 28; + + /** + * The WBEM Server has failed the operation based upon exceeding server + * limits. + */ + public static final int CIM_ERR_SERVER_LIMITS_EXCEEDED = 27; + + private static final String[] MESSAGES = new String[] { + /* 00 */"SUCCESS", + /* 01 */"CIM_ERR_FAILED", + /* 02 */"CIM_ERR_ACCESS_DENIED", + /* 03 */"CIM_ERR_INVALID_NAMESPACE", + /* 04 */"CIM_ERR_INVALID_PARAMETER", + /* 05 */"CIM_ERR_INVALID_CLASS", + /* 06 */"CIM_ERR_NOT_FOUND", + /* 07 */"CIM_ERR_NOT_SUPPORTED", + /* 08 */"CIM_ERR_CLASS_HAS_CHILDREN", + /* 09 */"CIM_ERR_CLASS_HAS_INSTANCES", + /* 10 */"CIM_ERR_INVALID_SUPERCLASS", + /* 11 */"CIM_ERR_ALREADY_EXISTS", + /* 12 */"CIM_ERR_NO_SUCH_PROPERTY", + /* 13 */null, + /* 14 */"CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED", + /* 15 */"CIM_ERR_INVALID_QUERY", + /* 16 */"CIM_ERR_METHOD_NOT_AVAILABLE", + /* 17 */"CIM_ERR_METHOD_NOT_FOUND", + /* 18 */null, + /* 19 */"CIM_ERR_INVALID_RESPONSE_DESTINATION", + /* 20 */"CIM_ERR_NAMESPACE_NOT_EMPTY", + /* 21 */"CIM_ERR_INVALID_ENUMERATION_CONTEXT", + /* 22 */"CIM_ERR_INVALID_OPERATION_TIMEOUT", + /* 23 */"CIM_ERR_PULL_HAS_BEEN_ABANDONED", + /* 24 */"CIM_ERR_PULL_CANNOT_BE_ABANDONED", + /* 25 */"CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED", + /* 26 */"CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED", + /* 27 */"CIM_ERR_SERVER_LIMITS_EXCEEDED", + /* 28 */"CIM_ERR_SERVER_IS_SHUTTING_DOWN" }; + + private int iErrorID; + + private CIMInstance[] iCimErrors; + + /** + * Constructs a new exception using the specified ID. The detailed message + * will be null. + * + * @param pID + * The Error ID to use. + * @throws IllegalArgumentException + * If the pID does not match one of the predefined messages. + */ + public WBEMException(int pID) { + this(pID, null, null, null); + } + + /** + * Constructs a new exception using the specified ID and detailed message. + * + * @param pID + * The error ID. + * @param pMessage + * The detailed message. + * @throws IllegalArgumentException + * If the pID does not match one of the predefined messages. + */ + public WBEMException(int pID, String pMessage) { + this(pID, pMessage, null, null); + } + + /** + * Constructs a new exception using the specified ID, detailed message and + * CIM_Error instances. + * + * @param pID + * The error ID. + * @param pMessage + * The detailed message. + * @param pErrors + * Array of CIM_Error instances. + * @throws IllegalArgumentException + * If the pID does not match one of the predefined messages. + */ + public WBEMException(int pID, String pMessage, CIMInstance[] pErrors) { + this(pID, pMessage, pErrors, null); + } + + /** + * Constructs a new exception using the specified ID, detailed message, + * CIM_Error instances and cause. + * + * @param pID + * The error ID. + * @param pMessage + * The detailed message. + * @param pErrors + * Array of CIM_Error instances. + * @param pCause + * Throwable cause. + * @throws IllegalArgumentException + * If the pID does not match one of the predefined messages. + */ + public WBEMException(int pID, String pMessage, CIMInstance[] pErrors, Throwable pCause) { + super(pMessage, pCause); + if (!isValidID(pID)) throw new IllegalArgumentException("Invalid error ID!"); + this.iErrorID = pID; + this.iCimErrors = pErrors; + } + + /** + * Constructs a new exception using the specified detailed message. The + * ID will be CIM_ERR_FAILED. + * + * @param pMessage + * The detailed message. + */ + public WBEMException(String pMessage) { + this(CIM_ERR_FAILED, pMessage, null, null); + } + + /** + * Get the CIM Error Instances. + * + * @return Any CIM Error instances associated with this exception; + * null if none. + */ + public CIMInstance[] getCIMErrors() { + return this.iCimErrors; + } + + /** + * Returns the ID of the error. + * + * @return The ID of the error. + */ + public int getID() { + return this.iErrorID; + } + + /** + * Prints out the ID and the optional detailed message. + * + * @return A String representation of the exception. + */ + @Override + public String toString() { + return "WBEMException: " + getCIMMessage() + + (super.getMessage() != null ? " (" + super.getMessage() + ")" : ""); + } + + /** + * Returns a string representation of the exception ID. + * + * @return A String representation of the exception ID. + */ + private String getCIMMessage() { + return isValidID(this.iErrorID) ? MESSAGES[this.iErrorID] : String.valueOf(this.iErrorID); + } + + /** + * Returns validity of error ID. + * + * @param pID + * The error ID. + * + * @return true if error ID is valid, false + * otherwise. + */ + private boolean isValidID(int pID) { + return pID >= 0 && pID < MESSAGES.length && MESSAGES[pID] != null; + } +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/EnumerateResponse.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/EnumerateResponse.java similarity index 76% rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/client/EnumerateResponse.java rename to src/main/java/org/metricshub/wbem/javax/wbem/client/EnumerateResponse.java index e5ffc70..ee5f83f 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/EnumerateResponse.java +++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/EnumerateResponse.java @@ -1,118 +1,116 @@ -/* - (C) Copyright IBM Corp. 2006, 2010 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Ramandeep S Arora, IBM, arorar@us.ibm.com - * - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 2845211 2009-08-27 raman_arora Pull Enumeration Feature (SAX Parser) - * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 - */ -package org.sentrysoftware.wbem.javax.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import org.sentrysoftware.wbem.javax.wbem.CloseableIterator; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * This class is a container that stores the information from a Pull request. - * - * @param - * Type parameter. - */ -public class EnumerateResponse { - - private String iContext; - - private CloseableIterator iResponses; - - private boolean iEnd; - - /** - * Creates an EnumerateResponse. - * - * @param pContext - * The enumeration context returned. This will be used for any - * future calls for this particular enumeration. - * @param pResponses - * The results of the operation. - * @param pEnd - * true if this is the last of the results; - * false otherwise. - */ - public EnumerateResponse(String pContext, CloseableIterator pResponses, boolean pEnd) { - this.iContext = pContext; - this.iResponses = pResponses; - this.iEnd = pEnd; - } - - /** - * Get the context that can be used for a subsequent pull request. - * - * @return The Enumeration Context returned from the server. - */ - public String getContext() { - return this.iContext; - } - - /** - * Get the CloseableIterator for the returned CIM Elements. - * - * @return CloseableIterator for the elements returned. - */ - public CloseableIterator getResponses() { - return this.iResponses; - } - - /** - * If true, there are no more elements to be returned. - * - * @return true if this is the last of the results; - * false otherwise. - */ - public boolean isEnd() { - return this.iEnd; - } - - /* - This iterates over the responses. As a side effect, - CloseableIterator.hasNext() will not return anything after this is - called. - - public void debug() { CloseableIterator iterator = - this.getResponses(); while (iterator.hasNext()) - System.out.println(iterator.next()); - - System.out.println("Enum Context =" + this.getContext()); - System.out.println("Is End = " + this.isEnd()); - System.out.println("Done...\n"); } - */ -} +/* + (C) Copyright IBM Corp. 2006, 2010 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Ramandeep S Arora, IBM, arorar@us.ibm.com + * + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 2845211 2009-08-27 raman_arora Pull Enumeration Feature (SAX Parser) + * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 + */ +package org.metricshub.wbem.javax.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import org.metricshub.wbem.javax.wbem.CloseableIterator; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * This class is a container that stores the information from a Pull request. + * + * @param + * Type parameter. + */ +public class EnumerateResponse { + + private String iContext; + + private CloseableIterator iResponses; + + private boolean iEnd; + + /** + * Creates an EnumerateResponse. + * + * @param pContext + * The enumeration context returned. This will be used for any + * future calls for this particular enumeration. + * @param pResponses + * The results of the operation. + * @param pEnd + * true if this is the last of the results; + * false otherwise. + */ + public EnumerateResponse(String pContext, CloseableIterator pResponses, boolean pEnd) { + this.iContext = pContext; + this.iResponses = pResponses; + this.iEnd = pEnd; + } + + /** + * Get the context that can be used for a subsequent pull request. + * + * @return The Enumeration Context returned from the server. + */ + public String getContext() { + return this.iContext; + } + + /** + * Get the CloseableIterator for the returned CIM Elements. + * + * @return CloseableIterator for the elements returned. + */ + public CloseableIterator getResponses() { + return this.iResponses; + } + + /** + * If true, there are no more elements to be returned. + * + * @return true if this is the last of the results; + * false otherwise. + */ + public boolean isEnd() { + return this.iEnd; + } + + /* + This iterates over the responses. As a side effect, + CloseableIterator.hasNext() will not return anything after this is + called. + + public void debug() { CloseableIterator iterator = + this.getResponses(); while (iterator.hasNext()) + System.out.println(iterator.next()); + + System.out.println("Enum Context =" + this.getContext()); + System.out.println("Is End = " + this.isEnd()); + System.out.println("Done...\n"); } + */ +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/PasswordCredential.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java similarity index 81% rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/client/PasswordCredential.java rename to src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java index f5c90ee..5978798 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/PasswordCredential.java +++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java @@ -1,136 +1,134 @@ -/* - (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 - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Change History - * Flag Date Prog Description - *------------------------------------------------------------------------------------------------- - * 2006-04-25 ebak Initial commit - * 2006-04-27 wolfalex Full implementation - * 1737141 2007-06-18 ebak Sync up with JSR48 evolution - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2899389 2009-11-18 blaschke-oss Password maximum length of 16? - * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 - * 2978722 2010-03-29 blaschke-oss PasswordCredential(char[]) constructor is wrong - * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final - */ - -package org.sentrysoftware.wbem.javax.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 -/** - * PasswordCredential implements a password based credential. This - * is used with UserPrincipal. PasswordCredential - * includes the password and optionally the host information for which the - * password is used to authenticate the UserPrincipal. - * - */ -public class PasswordCredential extends Object { - - private String iPw; - - private String iHostname; - - /** - * Creates a PasswordCredential using the supplied password. - * - * @param pCredential - * The user login password in clear text. - * @throws IllegalArgumentException - * If the credential is null. - */ - public PasswordCredential(char[] pCredential) { - if (pCredential != null) { - this.iPw = new String(pCredential); - } else { - throw new IllegalArgumentException("Invalid password"); - } - } - - /** - * Creates a PasswordCredential using the supplied password. - * - * @param pCredential - * The user login password in clear text. - * @throws IllegalArgumentException - * If the credential is null. - */ - public PasswordCredential(String pCredential) { - if (pCredential != null) { - this.iPw = pCredential; - } else { - throw new IllegalArgumentException("Invalid password"); - } - } - - /** - * Creates a PasswordCredential using the supplied password and - * host name. - * - * @param pCredential - * The user login password in clear text. - * @param pHostname - * The host name information for which the password is used to - * authenticate. - * @throws IllegalArgumentException - * If the credential is null. - */ - public PasswordCredential(String pCredential, String pHostname) { - if (pCredential != null) { - this.iPw = pCredential; - } else { - throw new IllegalArgumentException("Invalid password"); - } - this.iHostname = pHostname; - } - - /** - * Get the host name for which the password is used to authenticate. - * - * @return The host name. - */ - public String getHostName() { - return this.iHostname; - } - - /** - * Return the user login password in clear text. - * - * @return The user login password. - */ - public char[] getUserPassword() { - return this.iPw.toCharArray(); - } - -} +/* + (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 + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Change History + * Flag Date Prog Description + *------------------------------------------------------------------------------------------------- + * 2006-04-25 ebak Initial commit + * 2006-04-27 wolfalex Full implementation + * 1737141 2007-06-18 ebak Sync up with JSR48 evolution + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2899389 2009-11-18 blaschke-oss Password maximum length of 16? + * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 + * 2978722 2010-03-29 blaschke-oss PasswordCredential(char[]) constructor is wrong + * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final + */ + +package org.metricshub.wbem.javax.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 +/** + * PasswordCredential implements a password based credential. This + * is used with UserPrincipal. PasswordCredential + * includes the password and optionally the host information for which the + * password is used to authenticate the UserPrincipal. + * + */ +public class PasswordCredential extends Object { + + private String iPw; + + private String iHostname; + + /** + * Creates a PasswordCredential using the supplied password. + * + * @param pCredential + * The user login password in clear text. + * @throws IllegalArgumentException + * If the credential is null. + */ + public PasswordCredential(char[] pCredential) { + if (pCredential != null) { + this.iPw = new String(pCredential); + } else { + throw new IllegalArgumentException("Invalid password"); + } + } + + /** + * Creates a PasswordCredential using the supplied password. + * + * @param pCredential + * The user login password in clear text. + * @throws IllegalArgumentException + * If the credential is null. + */ + public PasswordCredential(String pCredential) { + if (pCredential != null) { + this.iPw = pCredential; + } else { + throw new IllegalArgumentException("Invalid password"); + } + } + + /** + * Creates a PasswordCredential using the supplied password and + * host name. + * + * @param pCredential + * The user login password in clear text. + * @param pHostname + * The host name information for which the password is used to + * authenticate. + * @throws IllegalArgumentException + * If the credential is null. + */ + public PasswordCredential(String pCredential, String pHostname) { + if (pCredential != null) { + this.iPw = pCredential; + } else { + throw new IllegalArgumentException("Invalid password"); + } + this.iHostname = pHostname; + } + + /** + * Get the host name for which the password is used to authenticate. + * + * @return The host name. + */ + public String getHostName() { + return this.iHostname; + } + + /** + * Return the user login password in clear text. + * + * @return The user login password. + */ + public char[] getUserPassword() { + return this.iPw.toCharArray(); + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/RoleCredential.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java similarity index 81% rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/client/RoleCredential.java rename to src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java index 8ff1641..f87ae5f 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/RoleCredential.java +++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java @@ -1,125 +1,123 @@ -/* - (C) Copyright IBM Corp. 2006, 2010 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Change History - * Flag Date Prog Description - *------------------------------------------------------------------------------------------------- - * 2006-04-25 ebak Initial commit - * 1737141 2007-06-18 ebak Sync up with JSR48 evolution - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2899859 2009-11-18 blaschke-oss javax.wbem.client missing JSR48 credential/principal APIs - * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 - * 2978722 2010-03-29 blaschke-oss PasswordCredential(char[]) constructor is wrong - */ - -package org.sentrysoftware.wbem.javax.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -//Sync'd against JSR48 1.0.0 (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * RoleCredential implements a password based credential for a - * role. RoleCredential includes the credential (e.g. password) and - * optionally the host information for which the password is used to - * authenticate the RolePrincipal. RoleCredential - * should be used in conjunction with the RolePrincipal instance. - * This should only be used when a client is assuming a role on a WBEM Server - * that requires a password. - */ -public class RoleCredential extends Object { - - private String iCredential; - - private String iHostname; - - /** - * Creates a role credential using the supplied credential. - * - * @param pCredential - * The role credential in clear text. - * @throws IllegalArgumentException - * If the credential is null. - */ - public RoleCredential(char[] pCredential) throws IllegalArgumentException { - if (pCredential == null) throw new IllegalArgumentException("credential cannot be null!"); - this.iCredential = new String(pCredential); - } - - /** - * Creates a role credential using the supplied credential. - * - * @param pCredential - * The role credential in clear text. - * @throws IllegalArgumentException - * If the credential is null. - */ - public RoleCredential(String pCredential) throws IllegalArgumentException { - if (pCredential == null) throw new IllegalArgumentException("credential cannot be null!"); - this.iCredential = pCredential; - } - - /** - * Creates a role credential using the supplied credential and host name. - * - * @param pCredential - * The role credential in clear text. - * @param pHostname - * - The host name for this credential. - * @throws IllegalArgumentException - * If the credential is null. - */ - public RoleCredential(String pCredential, String pHostname) throws IllegalArgumentException { - if (pCredential == null) throw new IllegalArgumentException("credential cannot be null!"); - this.iCredential = pCredential; - this.iHostname = pHostname; - } - - /** - * Return the role credential in clear text. - * - * @return The role credential. - */ - public char[] getCredential() { - return this.iCredential.toCharArray(); - } - - /** - * Get the host name for which the password is used to authenticate. - * - * @return The host name. - */ - public String getHostName() { - return this.iHostname; - } - -} +/* + (C) Copyright IBM Corp. 2006, 2010 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Change History + * Flag Date Prog Description + *------------------------------------------------------------------------------------------------- + * 2006-04-25 ebak Initial commit + * 1737141 2007-06-18 ebak Sync up with JSR48 evolution + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2899859 2009-11-18 blaschke-oss javax.wbem.client missing JSR48 credential/principal APIs + * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 + * 2978722 2010-03-29 blaschke-oss PasswordCredential(char[]) constructor is wrong + */ + +package org.metricshub.wbem.javax.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +//Sync'd against JSR48 1.0.0 (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * RoleCredential implements a password based credential for a + * role. RoleCredential includes the credential (e.g. password) and + * optionally the host information for which the password is used to + * authenticate the RolePrincipal. RoleCredential + * should be used in conjunction with the RolePrincipal instance. + * This should only be used when a client is assuming a role on a WBEM Server + * that requires a password. + */ +public class RoleCredential extends Object { + + private String iCredential; + + private String iHostname; + + /** + * Creates a role credential using the supplied credential. + * + * @param pCredential + * The role credential in clear text. + * @throws IllegalArgumentException + * If the credential is null. + */ + public RoleCredential(char[] pCredential) throws IllegalArgumentException { + if (pCredential == null) throw new IllegalArgumentException("credential cannot be null!"); + this.iCredential = new String(pCredential); + } + + /** + * Creates a role credential using the supplied credential. + * + * @param pCredential + * The role credential in clear text. + * @throws IllegalArgumentException + * If the credential is null. + */ + public RoleCredential(String pCredential) throws IllegalArgumentException { + if (pCredential == null) throw new IllegalArgumentException("credential cannot be null!"); + this.iCredential = pCredential; + } + + /** + * Creates a role credential using the supplied credential and host name. + * + * @param pCredential + * The role credential in clear text. + * @param pHostname + * - The host name for this credential. + * @throws IllegalArgumentException + * If the credential is null. + */ + public RoleCredential(String pCredential, String pHostname) throws IllegalArgumentException { + if (pCredential == null) throw new IllegalArgumentException("credential cannot be null!"); + this.iCredential = pCredential; + this.iHostname = pHostname; + } + + /** + * Return the role credential in clear text. + * + * @return The role credential. + */ + public char[] getCredential() { + return this.iCredential.toCharArray(); + } + + /** + * Get the host name for which the password is used to authenticate. + * + * @return The host name. + */ + public String getHostName() { + return this.iHostname; + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/RolePrincipal.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java similarity index 81% rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/client/RolePrincipal.java rename to src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java index 9dccf45..137cb3d 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/RolePrincipal.java +++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java @@ -1,148 +1,146 @@ -/* - (C) Copyright IBM Corp. 2006, 2010 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Change History - * Flag Date Prog Description - *------------------------------------------------------------------------------------------------- - * 2006-04-25 ebak Initial commit - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2899859 2009-11-18 blaschke-oss javax.wbem.client missing JSR48 credential/principal APIs - * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 - */ - -package org.sentrysoftware.wbem.javax.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.security.Principal; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * RolePrincipal implements a Principal identity for a role. That - * is, it represents the role name to be assumed on a system. - * RolePrincipal includes the role and optionally the host - * information for which the role is used to authenticate. - */ -public class RolePrincipal extends Object implements Principal { - - private String iRole; - - private String iHost; - - /** - * This constructor accepts the role name. - * - * @param pRole - * The role name. - */ - public RolePrincipal(String pRole) { - this.iRole = pRole; - } - - /** - * This constructor accepts the role name and host name. - * - * @param pRole - * The role name. - * @param pHost - * The host name. - */ - public RolePrincipal(String pRole, String pHost) { - this.iRole = pRole; - this.iHost = pHost; - } - - /** - * The equals method checks if the specified principal is the - * same principal as this object. The principals are equal if the specified - * object is an instance of RolePrincipal and the user name and - * host name are the same. - * - * @param pObj - * The Principal to compare for equality. - * @return true if they are equal, otherwise false - * . - */ - @Override - public boolean equals(Object pObj) { - if (!(pObj instanceof RolePrincipal)) return false; - RolePrincipal that = (RolePrincipal) pObj; - return (this.iRole == null ? that.iRole == null : this.iRole.equalsIgnoreCase(that.iRole)) - && (this.iHost == null ? that.iHost == null : this.iHost - .equalsIgnoreCase(that.iHost)); - } - - /** - * Get the host for which the principal uses to authenticate. - * - * @return The host name. - */ - public String getHostName() { - return this.iHost; - } - - /** - * Return the name of this principal identity; that is, return the login - * name. - * - * @return The name of this principal identity. - * @see java.security.Principal#getName() - */ - public String getName() { - return this.iRole; - } - - /** - * The hashCode() method returns an integer hash code to - * represent this principal. - * - * @return An integer hash code representing the principal. - */ - @Override - public int hashCode() { - return this.iRole == null ? 0 : this.iRole.hashCode(); - } - - /** - * The toString() method returns a string representation of the - * principal suitable for displaying in messages. It should not be used for - * making authorization checks. - * - * @return A printable string form of the role principal. - */ - @Override - public String toString() { - return this.iRole; - } - -} +/* + (C) Copyright IBM Corp. 2006, 2010 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Change History + * Flag Date Prog Description + *------------------------------------------------------------------------------------------------- + * 2006-04-25 ebak Initial commit + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2899859 2009-11-18 blaschke-oss javax.wbem.client missing JSR48 credential/principal APIs + * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 + */ + +package org.metricshub.wbem.javax.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.security.Principal; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * RolePrincipal implements a Principal identity for a role. That + * is, it represents the role name to be assumed on a system. + * RolePrincipal includes the role and optionally the host + * information for which the role is used to authenticate. + */ +public class RolePrincipal extends Object implements Principal { + + private String iRole; + + private String iHost; + + /** + * This constructor accepts the role name. + * + * @param pRole + * The role name. + */ + public RolePrincipal(String pRole) { + this.iRole = pRole; + } + + /** + * This constructor accepts the role name and host name. + * + * @param pRole + * The role name. + * @param pHost + * The host name. + */ + public RolePrincipal(String pRole, String pHost) { + this.iRole = pRole; + this.iHost = pHost; + } + + /** + * The equals method checks if the specified principal is the + * same principal as this object. The principals are equal if the specified + * object is an instance of RolePrincipal and the user name and + * host name are the same. + * + * @param pObj + * The Principal to compare for equality. + * @return true if they are equal, otherwise false + * . + */ + @Override + public boolean equals(Object pObj) { + if (!(pObj instanceof RolePrincipal)) return false; + RolePrincipal that = (RolePrincipal) pObj; + return (this.iRole == null ? that.iRole == null : this.iRole.equalsIgnoreCase(that.iRole)) + && (this.iHost == null ? that.iHost == null : this.iHost + .equalsIgnoreCase(that.iHost)); + } + + /** + * Get the host for which the principal uses to authenticate. + * + * @return The host name. + */ + public String getHostName() { + return this.iHost; + } + + /** + * Return the name of this principal identity; that is, return the login + * name. + * + * @return The name of this principal identity. + * @see java.security.Principal#getName() + */ + public String getName() { + return this.iRole; + } + + /** + * The hashCode() method returns an integer hash code to + * represent this principal. + * + * @return An integer hash code representing the principal. + */ + @Override + public int hashCode() { + return this.iRole == null ? 0 : this.iRole.hashCode(); + } + + /** + * The toString() method returns a string representation of the + * principal suitable for displaying in messages. It should not be used for + * making authorization checks. + * + * @return A printable string form of the role principal. + */ + @Override + public String toString() { + return this.iRole; + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/UserPrincipal.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java similarity index 84% rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/client/UserPrincipal.java rename to src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java index 4dd3804..d874fe8 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/UserPrincipal.java +++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java @@ -1,166 +1,164 @@ -/* - (C) Copyright IBM Corp. 2006, 2010 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Endre Bak, ebak@de.ibm.com - * - * Change History - * Flag Date Prog Description - *------------------------------------------------------------------------------------------------- - * 2006-04-25 ebak Initial commit - * 2006-04-27 wolfalex Full implementation - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) - * 2899859 2009-11-18 blaschke-oss javax.wbem.client missing JSR48 credential/principal APIs - * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 - */ -package org.sentrysoftware.wbem.javax.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.security.Principal; - -//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 -/** - * UserPrincipal implements a Principal identity for a client user - * identity that authenticates with a username and password. In other words, it - * represents the user's login identity on the remote system. - * UserPrincipal includes the username and optionally the host - * information for which the username is used to authenticate. - */ -public class UserPrincipal extends Object implements Principal { - - private String iUserName; - - private String iHostName; - - /** - * This constructor accepts the user name. - * - * @param pUserName - * The user login name. - * @throws IllegalArgumentException - * If the is null. - */ - public UserPrincipal(String pUserName) throws IllegalArgumentException { - if (pUserName == null) throw new IllegalArgumentException("userName is null!"); - this.iUserName = pUserName; - } - - /** - * This constructor accepts the user name and host name. - * - * @param pUserName - * The user login name. - * @param pHostName - * The host name for this principal. - * @throws IllegalArgumentException - * If the pUserName is null. - */ - public UserPrincipal(String pUserName, String pHostName) throws IllegalArgumentException { - if (pUserName == null) throw new IllegalArgumentException("userName is null!"); - this.iUserName = pUserName; - this.iHostName = pHostName; - } - - /** - * The equals method checks if the specified object is the same - * principal as this object. The principals are equal if the specified - * object is an instance of UserPrincipal and the user name and - * authentication host name are the same. - * - * @param pOtherPrincipal - * Principal instance to compare for equality. - * @return true if the object are equal; false - * otherwise. - */ - @Override - public boolean equals(Object pOtherPrincipal) { - if (!(pOtherPrincipal instanceof UserPrincipal)) return false; - UserPrincipal that = (UserPrincipal) pOtherPrincipal; - return (this.iUserName == null ? that.iUserName == null : this.iUserName - .equalsIgnoreCase(that.iUserName)) - && (this.iHostName == null ? that.iHostName == null : this.iHostName - .equalsIgnoreCase(that.iHostName)); - } - - /** - * Return the host name associated with this principal. - * - * @return The host name. - */ - public String getHostName() { - return this.iHostName; - } - - /** - * Return the name of this principal identity; that is, return the login - * name. - * - * @return The name of this principal identity. - * @see java.security.Principal#getName() - */ - public String getName() { - return this.iUserName; - } - - /** - * Return the principal's login user name. - * - * @return The user login name. - */ - public String getUserName() { - return this.iUserName; - } - - /** - * The hashCode method returns an integer hash code to - * represent this principal. It can be used to test for non-equality, or as - * an index key in a hash table. - * - * @return An integer hash code representing the principal. - */ - @Override - public int hashCode() { - return this.iUserName != null ? this.iUserName.hashCode() : 0; - } - - /** - * The toString method returns a string representation of the - * principal suitable for displaying in messages. It should not be used for - * making authorization checks, however. - * - * @return A printable string form of the principal identity. - */ - @Override - public String toString() { - return this.iUserName; - } - -} +/* + (C) Copyright IBM Corp. 2006, 2010 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Endre Bak, ebak@de.ibm.com + * + * Change History + * Flag Date Prog Description + *------------------------------------------------------------------------------------------------- + * 2006-04-25 ebak Initial commit + * 2006-04-27 wolfalex Full implementation + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2899859 2009-11-18 blaschke-oss javax.wbem.client missing JSR48 credential/principal APIs + * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 + */ +package org.metricshub.wbem.javax.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.security.Principal; + +//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010 +/** + * UserPrincipal implements a Principal identity for a client user + * identity that authenticates with a username and password. In other words, it + * represents the user's login identity on the remote system. + * UserPrincipal includes the username and optionally the host + * information for which the username is used to authenticate. + */ +public class UserPrincipal extends Object implements Principal { + + private String iUserName; + + private String iHostName; + + /** + * This constructor accepts the user name. + * + * @param pUserName + * The user login name. + * @throws IllegalArgumentException + * If the is null. + */ + public UserPrincipal(String pUserName) throws IllegalArgumentException { + if (pUserName == null) throw new IllegalArgumentException("userName is null!"); + this.iUserName = pUserName; + } + + /** + * This constructor accepts the user name and host name. + * + * @param pUserName + * The user login name. + * @param pHostName + * The host name for this principal. + * @throws IllegalArgumentException + * If the pUserName is null. + */ + public UserPrincipal(String pUserName, String pHostName) throws IllegalArgumentException { + if (pUserName == null) throw new IllegalArgumentException("userName is null!"); + this.iUserName = pUserName; + this.iHostName = pHostName; + } + + /** + * The equals method checks if the specified object is the same + * principal as this object. The principals are equal if the specified + * object is an instance of UserPrincipal and the user name and + * authentication host name are the same. + * + * @param pOtherPrincipal + * Principal instance to compare for equality. + * @return true if the object are equal; false + * otherwise. + */ + @Override + public boolean equals(Object pOtherPrincipal) { + if (!(pOtherPrincipal instanceof UserPrincipal)) return false; + UserPrincipal that = (UserPrincipal) pOtherPrincipal; + return (this.iUserName == null ? that.iUserName == null : this.iUserName + .equalsIgnoreCase(that.iUserName)) + && (this.iHostName == null ? that.iHostName == null : this.iHostName + .equalsIgnoreCase(that.iHostName)); + } + + /** + * Return the host name associated with this principal. + * + * @return The host name. + */ + public String getHostName() { + return this.iHostName; + } + + /** + * Return the name of this principal identity; that is, return the login + * name. + * + * @return The name of this principal identity. + * @see java.security.Principal#getName() + */ + public String getName() { + return this.iUserName; + } + + /** + * Return the principal's login user name. + * + * @return The user login name. + */ + public String getUserName() { + return this.iUserName; + } + + /** + * The hashCode method returns an integer hash code to + * represent this principal. It can be used to test for non-equality, or as + * an index key in a hash table. + * + * @return An integer hash code representing the principal. + */ + @Override + public int hashCode() { + return this.iUserName != null ? this.iUserName.hashCode() : 0; + } + + /** + * The toString method returns a string representation of the + * principal suitable for displaying in messages. It should not be used for + * making authorization checks, however. + * + * @return A printable string form of the principal identity. + */ + @Override + public String toString() { + return this.iUserName; + } + +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/WBEMClient.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClient.java similarity index 97% rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/client/WBEMClient.java rename to src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClient.java index 6bf4b2d..185c156 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/WBEMClient.java +++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClient.java @@ -1,2254 +1,2252 @@ -/* - (C) Copyright IBM Corp. 2006, 2013 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com - * - * Change History - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 1565892 2006-11-08 lupusalex Make SBLIM client JSR48 compliant - * 1686000 2007-04-19 ebak modifyInstance() missing from WBEMClient - * 1737141 2007-06-18 ebak Sync up with JSR48 evolution - * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL - * 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 - * 2845211 2009-08-27 raman_arora Pull Enumeration Feature (SAX Parser) - * 2858933 2009-10-12 raman_arora JSR48 new APIs: associatorClasses & associatorInstances - * 2886829 2009-11-18 raman_arora JSR48 new APIs: referenceClasses & referenceInstances - * 2959586 2010-03-01 blaschke-oss Sync up WBEMClient javadoc with JSR48 1.0.0 - * 2961592 2010-03-01 blaschke-oss Remove WBEMClient.setLocales() UnsupportedOperationException - * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final - * 3496343 2012-03-02 blaschke-oss JSR48 1.0.0: deprecate WBEMClient associators and references - * 3514537 2012-04-03 blaschke-oss TCK: execQueryInstances requires boolean, not Boolean - * 3521131 2012-04-24 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II - * 3521328 2012-04-25 blaschke-oss JSR48 1.0.0: remove WBEMClient associators and references - * 3525657 2012-05-10 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final III - * 3555752 2012-09-13 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final IV - * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V - */ - -package org.sentrysoftware.wbem.javax.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -import java.util.Locale; - -import org.sentrysoftware.wbem.javax.cim.CIMArgument; -import org.sentrysoftware.wbem.javax.cim.CIMClass; -import org.sentrysoftware.wbem.javax.cim.CIMInstance; -import org.sentrysoftware.wbem.javax.cim.CIMObjectPath; -import org.sentrysoftware.wbem.javax.cim.CIMQualifierType; -import org.sentrysoftware.wbem.javax.cim.UnsignedInteger32; -import org.sentrysoftware.wbem.javax.cim.UnsignedInteger64; -import javax.security.auth.Subject; -import org.sentrysoftware.wbem.javax.wbem.CloseableIterator; -import org.sentrysoftware.wbem.javax.wbem.WBEMException; - -//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 -/** - * The WBEMClient interface is used to invoke WBEM operations - * against a WBEM Server. A WBEMClient implementation can be - * retrieved from the WBEMClientFactory specifying the protocol to - * be used. - * - * @see WBEMClientFactory - */ -public interface WBEMClient { - - /** - * Enumerates CIM classes that are associated to a specified source CIM - * class. - * - * @param pObjectName - * CIMObjectPath defining the source CIM Class whose - * associated classes are to be returned. The - * pObjectName shall include the host, namespace and - * object name. The keys shall not be populated. - * @param pAssociationClass - * This string shall contain a valid CIM Association class name - * or be null. It filters the classes returned to - * contain only classes associated to the source Object via this - * CIM Association class or one of its subclasses. - * @param pResultClass - * This string shall either contain a valid CIM Class name or be - * null. It filters the classes returned to contain - * only the classes of this class name or one of its subclasses. - * @param pRole - * This string shall either contain a valid Property name or be - * null. It filters the classes returned to contain - * only classes associated to the source class via an Association - * class in which the source class plays the specified - * role. (i.e. the Property name in the Association class that - * refers to the source class matches this value) For - * example, if "Antecedent" is specified, then only Associations - * in which the source class is the "Antecedent" reference are - * examined. - * @param pResultRole - * This string shall either contain a valid Property name or be - * null. It filters the classes returned to contain - * only classes associated to the source class via an Association - * class in which the class returned plays the specified - * role. (i.e. the Property name in the Association class that - * refers to the class returned matches this value) - * @param pIncludeQualifiers - * If true, all Qualifiers for each class (including - * Qualifiers on the Object and on any returned Properties) MUST - * be included in the classes returned. If false, no - * Qualifiers are present in each class returned. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property or method. If true, the - * class origin attribute shall be present for each property and - * method on all classes returned. If false, the - * class origin shall not be present. - * @param pPropertyList - * An array of property names used to filter what is contained in - * the classes returned. Each CIMClass returned - * shall only contain elements for the properties of the names - * specified. Duplicate and invalid property names are ignored - * and the request is otherwise processed normally. An empty - * array indicates that no properties should be included in the - * classes returned. A null value indicates that all - * properties should be contained in the classes returned. - * @return If successful, a CloseableIterator containing zero - * or more CIMClasses meeting the specified criteria - * are returned. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes shall be - * returned along with zero or more instances of - * CIM_Error. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CloseableIterator associatorClasses(CIMObjectPath pObjectName, - String pAssociationClass, String pResultClass, String pRole, String pResultRole, - boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList) - throws WBEMException; - - /** - * Enumerates CIM Instances associated to a specified source CIM Instance. - * - * @param pObjectName - * CIMObjectPath defining the source CIM Instance - * whose associated instances are to be returned. The - * pObjectName must contain the host, namespace, - * object name and keys for the instance. - * @param pAssociationClass - * This string shall either contain a valid CIM Association class - * name or be null. It filters the instances - * returned to contain only instances associated to the source - * instance via this CIM Association class or one of its - * subclasses. - * @param pResultClass - * This string shall either contain a valid CIM Class name or be - * null. It filters the instances returned to - * contain only the instances of this Class name or one of its - * subclasses. - * @param pRole - * This string shall either contain a valid Property name or be - * null. It filters the Objects returned to contain - * only Objects associated to the source Object via an - * Association class in which the source Object plays the - * specified role. (i.e. the Property name in the Association - * class that refers to the source Object matches this - * value) If "Antecedent" is specified, then only Associations in - * which the source Object is the "Antecedent" reference are - * examined. - * @param pResultRole - * This string shall either contain a valid Property name or be - * null. It filters the instances returned to - * contain only instances associated to the source instance via - * an Association class in which the instance returned - * plays the specified role. (i.e. the Property name in the - * Association class that refers to the instance returned - * matches this value) For example, if "Dependent" is specified, - * then only Associations in which the instance returned is the - * "Dependent" reference are examined. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property. If true, the class origin - * attribute may be present for each property on all instances - * returned, even if requested the server may ignore the request - * and not return the class origin. If false, the - * class origin shall not be present. - * @param pPropertyList - * An array of property names used to filter what is contained in - * the Objects returned. Each CIMInstance returned - * only contains elements for the properties of the names - * specified. Duplicate and invalid property names are ignored - * and the request is otherwise processed normally. An empty - * array indicates that no properties should be included in the - * instances returned. A null value indicates that - * all properties should be contained in the instances returned. - * @return If successful, a CloseableIterator containing zero - * or more CIMInstances meeting the specified criteria - * is returned. - * @throws WBEMException - * If unsuccessful, one of the following status codes shall be - * returned along with zero or more instances of - * CIM_Error. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CloseableIterator associatorInstances(CIMObjectPath pObjectName, - String pAssociationClass, String pResultClass, String pRole, String pResultRole, - boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException; - - /** - * Enumerates the CIMObjectPaths of CIM Objects that are - * associated to a particular source CIM Object. If the source Object is a - * CIM Class, then a CloseableIterator of - * CIMObjectPath s of the classes associated to the source - * Object is returned. If the source Object is a CIM Instance, then a - * CloseableIterator of CIMObjectPaths of the - * CIMInstance objects associated to the source Object is - * returned. - * - * @param pObjectName - * CIMObjectPath defining the source CIM Object - * whose associated Objects are to be returned. This argument may - * contain either a Class name or the modelpath of an Instance. - * (i.e. Keys populated) - * @param pAssociationClass - * This string MUST either contain a valid CIM Association class - * name or be null. It filters the Objects returned - * to contain only Objects associated to the source Object via - * this CIM Association class or one of its subclasses. - * @param pResultClass - * This string MUST either contain a valid CIM Class name or be - * null. It filters the Objects returned to contain - * only the Objects of this Class name or one of its subclasses. - * @param pRole - * This string MUST either contain a valid Property name or be - * null. It filters the Objects returned to contain - * only Objects associated to the source Object via an - * Association class in which the source Object plays the - * specified role. (i.e. the Property name in the Association - * class that refers to the source Object matches this - * value) If "Antecedent" is specified, then only Associations in - * which the source Object is the "Antecedent" reference are - * examined. - * @param pResultRole - * This string MUST either contain a valid Property name or be - * null. It filters the Objects returned to contain - * only Objects associated to the source Object via an - * Association class in which the Object returned plays - * the specified role. (i.e. the Property name in the Association - * class that refers to the Object returned matches this - * value) If "Dependent" is specified, then only Associations in - * which the Object returned is the "Dependent" reference are - * examined. - * @return If successful, a CloseableIterator containing zero - * or more CIMObjectPath objects of the CIM Classes or - * CIM Instances meeting the specified criteria is returned. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CloseableIterator associatorNames(CIMObjectPath pObjectName, - String pAssociationClass, String pResultClass, String pRole, String pResultRole) - throws WBEMException; - - /** - * associatorPaths shall start an enumeration session for - * traversing associations starting from the instance defined in the - * pInstancePath parameter using any specified filtering - * criteria and return zero or more CIMObjectPath objects. - * - * @param pInstancePath - * The CIMObjectPath for the instance for which the - * enumeration is to be performed. - * @param pAssociationClass - * This string MUST either contain a valid CIM Association class - * name or be null. It filters the Objects returned - * to contain only Objects associated to the source Object via - * this CIM Association class or one of its subclasses. - * @param pResultClass - * This string MUST either contain a valid CIM Class name or be - * null. It filters the Objects returned to contain - * only the Objects of this Class name or one of its subclasses. - * @param pRole - * This string MUST either contain a valid Property name or be - * null. It filters the Objects returned to contain - * only Objects associated to the source Object via an - * Association class in which the source Object plays the - * specified role. (i.e. the Property name in the Association - * class that refers to the source Object matches this - * value) If "Antecedent" is specified, then only Associations in - * which the source Object is the "Antecedent" reference are - * examined. - * @param pResultRole - * This string MUST either contain a valid Property name or be - * null. It filters the Objects returned to contain - * only Objects associated to the source Object via an - * Association class in which the Object returned plays - * the specified role. (i.e. the Property name in the Association - * class that refers to the Object returned matches this - * value) If "Dependent" is specified, then only Associations in - * which the Object returned is the "Dependent" reference are - * examined. - * @param pFilterQueryLanguage - * The pFilterQueryLanguage represents the query - * language for the pFilterQuery argument. This must - * be left null if a pFilterQuery is - * not supplied. If the implementation does not support the query - * language specified, the - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall - * be returned. If the implementation does not support filtered - * enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pFilterQuery - * The pFilterQuery specifies a query in the form of - * the query language specified by the - * pFilterQueryLanguage parameter. If this value is - * not null, the pFilterQueryLanguage - * parameter must be non-null. This value shall act - * as an additional filter on the result set. If the - * implementation does not support the query language specified, - * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error - * shall be returned. If the implementation does not support - * filtered enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pTimeout - * This input parameter determines the minimum time the CIM - * server shall maintain the open enumeration session after the - * last Open or Pull operation (unless the enumeration session is - * closed). If the operation timeout is exceeded, the - * implementation may close the enumeration session at any time, - * releasing any resources allocated to the enumeration session. - * A pTimeout of 0 means that there is no operation - * timeout. That is, the enumeration session is never closed - * based on time. If pTimeout is null, - * the implementation shall choose an operation timeout. All - * other values for pTimeout specify the operation - * timeout in seconds. A implementation may restrict the set of - * allowable values for pTimeout. Specifically, the - * implementation may not allow 0 (no timeout). If the specified - * value is not an allowable value, the implementation shall - * return failure with the status code - * CIM_ERR_INVALID_OPERATION_TIMEOUT. - * @param pContinueOnError - * If true, requests that the operation resume when - * an error is received. If a implementation does not support - * continuation on error and pContinueOnError is - * true, it shall throw a WBEMException - * with the status code - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a - * implementation supports continuation on error and - * pContinueOnError is true, the - * enumeration session shall remain open when a Pull operation - * fails, and any subsequent successful Pull operations shall - * return the set of elements that would have been returned if - * the failing Pull operations were successful. This behavior is - * subject to the consistency rules defined for pulled - * enumerations. If pContinueOnError is - * false, the enumeration session shall be closed - * when either the operation completes successfully or when a - * WBEMExcetpion is thrown. - * @param pMaxObjects - * Defines the maximum number of elements that this Open - * operation can return. The implementation may deliver any - * number of elements up to pMaxObjects but shall - * not deliver more than pMaxObjects elements. An - * implementation may choose to never return any elements during - * an Open operation, regardless of the value of - * pMaxObjects. Note that a CIM client can use a - * pMaxObjects value of 0 to specify that it does - * not want to retrieve any instances in the Open operation. - * @return The return value of a successful Open operation is an array of - * enumerated elements with a number of entries from 0 up to a - * maximum defined by pMaxObjects. These entries meet - * the criteria defined in the Open operation. Note that returning - * no entries in the array does not imply that the enumeration - * session is exhausted. Client must evaluate the - * EnumerateResponse.isEnd() to determine if there are - * more elements. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_OPERATION_TIMEOUT - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED - * CIM_ERR_INVALID_PARAMETER - * CIM_ERR_NOT_FOUND (the source instance was not found) - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED - * CIM_ERR_INVALID_QUERY - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public EnumerateResponse associatorPaths(CIMObjectPath pInstancePath, - String pAssociationClass, String pResultClass, String pRole, String pResultRole, - String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout, - boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException; - - /** - * associators shall start an enumeration session for - * traversing associations starting from the instance defined in the - * pInstancePath parameter using any specified filtering - * criteria and return zero or more CIMInstance objects. - * - * @param pInstancePath - * The CIMObjectPath for the instance for which the - * enumeration is to be performed. - * @param pAssociationClass - * This string MUST either contain a valid CIM Association class - * name or be null. It filters the Objects returned - * to contain only Objects associated to the source Object via - * this CIM Association class or one of its subclasses. - * @param pResultClass - * This string MUST either contain a valid CIM Class name or be - * null. It filters the Objects returned to contain - * only the Objects of this Class name or one of its subclasses. - * @param pRole - * This string MUST either contain a valid Property name or be - * null. It filters the Objects returned to contain - * only Objects associated to the source Object via an - * Association class in which the source Object plays the - * specified role. (i.e. the Property name in the Association - * class that refers to the source Object matches this - * value) If "Antecedent" is specified, then only Associations in - * which the source Object is the "Antecedent" reference are - * examined. - * @param pResultRole - * This string MUST either contain a valid Property name or be - * null. It filters the Objects returned to contain - * only Objects associated to the source Object via an - * Association class in which the Object returned plays - * the specified role. (i.e. the Property name in the Association - * class that refers to the Object returned matches this - * value) If "Dependent" is specified, then only Associations in - * which the Object returned is the "Dependent" reference are - * examined. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property. If true, the class origin - * attribute may be present for each property on all instances - * returned, even if requested the server may ignore the request - * and not return the class origin. If false, the - * class origin shall not be present. - * @param pPropertyList - * An array of property names used to filter what is contained in - * the Objects returned. Each CIMClass or - * CIMInstance returned only contains elements for - * the properties of the names specified. Duplicate and invalid - * property names are ignored and the request is otherwise - * processed normally. An empty array indicates that no - * properties should be included in the Objects returned. A - * null value indicates that all properties should - * be contained in the Objects returned. NOTE: Properties - * should not be specified in this parameter unless a non- - * null value is specified in the - * pResultClass parameter. - * @param pFilterQueryLanguage - * The pFilterQueryLanguage represents the query - * language for the pFilterQuery argument. This must - * be left null if a filterQuery is not supplied. If - * the implementation does not support the query language - * specified, the - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall - * be returned. If the implementation does not support filtered - * enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pFilterQuery - * The pFilterQuery specifies a query in the form of - * the query language specified by the - * pFilterQueryLanguage parameter. If this value is - * not null, the pFilterQueryLanguage - * parameter must be non-null. This value shall act - * as an additional filter on the result set. If the - * implementation does not support the query language specified, - * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error - * shall be returned. If the implementation does not support - * filtered enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pTimeout - * This input parameter determines the minimum time the CIM - * server shall maintain the open enumeration session after the - * last Open or Pull operation (unless the enumeration session is - * closed). If the operation timeout is exceeded, the - * implementation may close the enumeration session at any time, - * releasing any resources allocated to the enumeration session. - * A pTimeout of 0 means that there is no operation - * timeout. That is, the enumeration session is never closed - * based on time. If pTimeout is null, - * the implementation shall choose an operation timeout. All - * other values for pTimeout specify the operation - * timeout in seconds. A implementation may restrict the set of - * allowable values for pTimeout. Specifically, the - * implementation may not allow 0 (no timeout). If the specified - * value is not an allowable value, the implementation shall - * return failure with the status code - * CIM_ERR_INVALID_OPERATION_TIMEOUT. - * @param pContinueOnError - * If true, requests that the operation resume when - * an error is received. If a implementation does not support - * continuation on error and pContinueOnError is - * true, it shall throw a WBEMException - * with the status code - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a - * implementation supports continuation on error and - * pContinueOnError is true, the - * enumeration session shall remain open when a Pull operation - * fails, and any subsequent successful Pull operations shall - * return the set of elements that would have been returned if - * the failing Pull operations were successful. This behavior is - * subject to the consistency rules defined for pulled - * enumerations. If pContinueOnError is - * false, the enumeration session shall be closed - * when either the operation completes successfully or when a - * WBEMExcetpion is thrown. - * @param pMaxObjects - * Defines the maximum number of elements that this Open - * operation can return. The implementation may deliver any - * number of elements up to pMaxObjects but shall - * not deliver more than pMaxObjects elements. An - * implementation may choose to never return any elements during - * an Open operation, regardless of the value of - * pMaxObjects. Note that a CIM client can use a - * pMaxObjects value of 0 to specify that it does - * not want to retrieve any instances in the Open operation. - * @return The return value of a successful Open operation is an array of - * enumerated elements with a number of entries from 0 up to a - * maximum defined by pMaxObjects. These entries meet - * the criteria defined in the Open operation. Note that returning - * no entries in the array does not imply that the enumeration - * session is exhausted. Client must evaluate the - * EnumerateResponse.isEnd() to determine if there are - * more elements. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_OPERATION_TIMEOUT - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED - * CIM_ERR_INVALID_PARAMETER - * CIM_ERR_NOT_FOUND (The source instance was not found) - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED - * CIM_ERR_INVALID_QUERY - * CIM_ERR_FAILED (Some other unspecified error occurred) - * - */ - public EnumerateResponse associators(CIMObjectPath pInstancePath, - String pAssociationClass, String pResultClass, String pRole, String pResultRole, - boolean pIncludeClassOrigin, String[] pPropertyList, String pFilterQueryLanguage, - String pFilterQuery, UnsignedInteger32 pTimeout, boolean pContinueOnError, - UnsignedInteger32 pMaxObjects) throws WBEMException; - - /** - * Closes the WBEMClient session. - */ - public void close(); - - /** - * closeEnumeration shall close an enumeration session that has - * been previously started but not yet completed. Clients should always use - * this method when an enumeration session has been started and the client - * does not retrieve all the results. If a client has started an enumeration - * session and retrieves all the results until the - * EnumerationResponse.isEnd() is true, this method shall not - * be called. - * - * @param pPath - * The CIMObjectPath representing the namespace to - * be used. - * @param pContext - * The enumeration context to close. - * @throws WBEMException - */ - public void closeEnumeration(CIMObjectPath pPath, String pContext) throws WBEMException; - - /** - * Create a CIM class. The namespace from the - * CIMClass.getObjectPath() shall be used. - * - * @param pClass - * The CIMClass to be created. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_ALREADY_EXISTS (the CIM Class already exists) - * CIM_ERR_INVALID_SUPERCLASS (the putative CIM Class declares a - * non-existent superclass) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public void createClass(CIMClass pClass) throws WBEMException; - - /** - * Create a CIM Instance. The namespace from the - * CIMInstance.getObjectPath() shall be used. The keys of the - * CIMInstance may be modified by the implementation and the - * client must use the returned object path to determine the name of the - * instance. It is possible for a client to leave keys of instances empty/ - * null and the provider can fill them in. This is - * implementation specific unless specified by a CIM Schema or in a DMTF - * Profile. - * - * @param pInstance - * The CIMInstance to be created. - * @return CIMObjectPath of the instance created. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED (provider does not support this method) - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (for this method) - * CIM_ERR_INVALID_CLASS (in this namespace) - * CIM_ERR_ALREADY_EXISTS - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CIMObjectPath createInstance(CIMInstance pInstance) throws WBEMException; - - /** - * Deletes the CIM class for the object specified by the CIM object path. - * - * @param pPath - * The CIMObjectPath identifying the namespace and - * class name to delete. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_NOT_FOUND (the CIM Class to be deleted does not exist) - * CIM_ERR_CLASS_HAS_CHILDREN (the CIM Class has one or more subclasses - * which cannot be deleted) - * CIM_ERR_CLASS_HAS_INSTANCES (the CIM Class has one or more instances - * which cannot be deleted) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public void deleteClass(CIMObjectPath pPath) throws WBEMException; - - /** - * Delete the CIM instance specified by the CIM object path. - * - * @param pPath - * The object path of the instance to be deleted. It must include - * all of the keys. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED (provider does not support this method) - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (for this method) - * CIM_ERR_INVALID_CLASS (in this namespace) - * CIM_ERR_NOT_FOUND (if the instance does not exist) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public void deleteInstance(CIMObjectPath pPath) throws WBEMException; - - /** - * Delete a CIM Qualifier type. - * - * @param pPath - * The CIMObjectPath identifying the name and - * namespace of the CIM qualifier type to delete. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (for this method) - * CIM_ERR_NOT_FOUND (the Qualifier did not exist) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public void deleteQualifierType(CIMObjectPath pPath) throws WBEMException; - - /** - * Enumerate CIM Classes. - * - * @param pPath - * The object path of the class to be enumerated. Only the - * namespace and object name should be populated. If the object - * name is set to an empty string (i.e. ""), then all base - * classes in the target namespace are returned. - * @param pDeep - * If true, the classes returned shall include - * subclasses. If false, the classes returned shall - * not include subclasses. - * @param pLocalOnly - * If true, only elements (properties, methods and - * qualifiers) defined in, or overridden in the class are - * included in the response. If false, all elements - * of the class definition are returned. - * @param pIncludeQualifiers - * If true, all Qualifiers for each Class and its - * elements (properties, methods, references) are included. If - * false, no Qualifiers are present in the classes - * returned. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property or method. If true, the - * class origin attribute shall be present for each property and - * method on all returned CIMClasses. If - * false, the class origin shall not be present. - * @return A CloseableIterator of CIMClasses. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_INVALID_CLASS (the CIM Class that is the basis for this - * enumeration does not exist) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CloseableIterator enumerateClasses(CIMObjectPath pPath, boolean pDeep, - boolean pLocalOnly, boolean pIncludeQualifiers, boolean pIncludeClassOrigin) - throws WBEMException; - - /** - * Enumerate the names of CIM Classes. - * - * @param pPath - * The CIMObjectPath identifying the class to be - * enumerated. If the class name in the object path specified is - * an empty string (i.e. ""), all base classes in the target - * namespace are returned. Note that only the namespace and the - * name components should be populated. - * @param pDeep - * If true, the enumeration returned shall contain - * the names of all classes derived from the class being - * enumerated. If false, the enumeration returned - * contains only the names of the first level children of the - * class. - * @return A CloseableIterator of CIMObjectPaths. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_INVALID_CLASS (the CIM Class that is the basis for this - * enumeration does not exist) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CloseableIterator enumerateClassNames(CIMObjectPath pPath, boolean pDeep) - throws WBEMException; - - /** - * Enumerate the names of the instances for a specified class. The names of - * all subclass instances are returned. - * - * @param pPath - * The CIMObjectPath identifying the class whose - * instances are to be enumerated. Only the namespace and class - * name components are used. All other information (e.g. Keys) is - * ignored. - * @return CloseabelIterator of CIMObjectPaths. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED (provider does not support this method) - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (for this method) - * CIM_ERR_INVALID_CLASS (in this namespace) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CloseableIterator enumerateInstanceNames(CIMObjectPath pPath) - throws WBEMException; - - /** - * enumerateInstancePaths shall enumerate the instances of the - * specified class in pClassPath and return zero or more - * CIMObjectPaths. - * - * @param pClassPath - * The CIMObjectPath for the class for which the - * enumeration is to be performed. - * @param pFilterQueryLanguage - * The pFilterQueryLanguage represents the query - * language for the pFilterQuery argument. This must - * be left null if a pFilterQuery is - * not supplied. If the implementation does not support the query - * language specified, the - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall - * be returned. If the implementation does not support filtered - * enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pFilterQuery - * The pFilterQuery specifies a query in the form of - * the query language specified by the - * pFilterQueryLanguage parameter. If this value is - * not null, the pFilterQueryLanguage - * parameter must be non-null. This value shall act - * as an additional filter on the result set. If the - * implementation does not support the query language specified, - * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error - * shall be returned. If the implementation does not support - * filtered enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pTimeout - * This input parameter determines the minimum time the CIM - * server shall maintain the open enumeration session after the - * last Open or Pull operation (unless the enumeration session is - * closed). If the operation timeout is exceeded, the - * implementation may close the enumeration session at any time, - * releasing any resources allocated to the enumeration session. - * A pTimeout of 0 means that there is no operation - * timeout. That is, the enumeration session is never closed - * based on time. If pTimeout is null, - * the implementation shall choose an operation timeout. All - * other values for pTimeout specify the operation - * timeout in seconds. A implementation may restrict the set of - * allowable values for pTimeout. Specifically, the - * implementation may not allow 0 (no timeout). If the specified - * value is not an allowable value, the implementation shall - * return failure with the status code - * CIM_ERR_INVALID_OPERATION_TIMEOUT. - * @param pContinueOnError - * If true, requests that the operation resume when - * an error is received. If a implementation does not support - * continuation on error and pContinueOnError is - * true, it shall throw a WBEMException - * with the status code - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a - * implementation supports continuation on error and - * pContinueOnError is true, the - * enumeration session shall remain open when a Pull operation - * fails, and any subsequent successful Pull operations shall - * return the set of elements that would have been returned if - * the failing Pull operations were successful. This behavior is - * subject to the consistency rules defined for pulled - * enumerations. If pContinueOnError is - * false, the enumeration session shall be closed - * when either the operation completes successfully or when a - * WBEMExcetpion is thrown. - * @param pMaxObjects - * Defines the maximum number of elements that this Open - * operation can return. The implementation may deliver any - * number of elements up to pMaxObjects but shall - * not deliver more than pMaxObjects elements. An - * implementation may choose to never return any elements during - * an Open operation, regardless of the value of - * pMaxObjects. Note that a CIM client can use a - * pMaxObjects value of 0 to specify that it does - * not want to retrieve any instances in the Open operation. - * @return The return value of a successful Open operation is an array of - * enumerated elements with a number of entries from 0 up to a - * maximum defined by pMaxObjects. These entries meet - * the criteria defined in the Open operation. Note that returning - * no entries in the array does not imply that the enumeration - * session is exhausted. Client must evaluate the - * EnumerateResponse.isEnd() to determine if there are - * more elements. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_OPERATION_TIMEOUT - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED - * CIM_ERR_INVALID_PARAMETER - * CIM_ERR_INVALID_CLASS (the source class does not exist) - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED - * CIM_ERR_INVALID_QUERY - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public EnumerateResponse enumerateInstancePaths(CIMObjectPath pClassPath, - String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout, - boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException; - - /** - * Enumerate the instances of a class. The instances of all subclasses are - * also returned. - * - * @param pPath - * The object path of the class to be enumerated. Only the - * namespace and class name components are used. Any other - * information (e.g. Keys) is ignored. - * @param pDeep - * If true, this specifies that, for each returned - * Instance of the Class, all properties of the Instance must be - * present (subject to constraints imposed by the other - * parameters), including any which were added by subclassing the - * specified Class. If false, each returned Instance - * includes only properties defined for the specified Class in - * path. - * @param pLocalOnly - * If true, only properties that were instantiated - * in the instance are returned. WBEM Servers may ignore this - * parameter and return all properties. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property. If true, the class origin - * attribute may be present for each property on all returned - * CIMInstances, even if requested the server may ignore the - * request and not return the class origin. If false - * , the class origin shall not be present. - * @param pPropertyList - * An array of property names used to filter what is contained in - * the instances returned. Each instance returned only contains - * elements for the properties of the names specified. Duplicate - * and invalid property names are ignored and the request is - * otherwise processed normally. An empty array indicates that no - * properties should be returned. A null value indicates - * that all properties should be returned. - * @return A CloseableIterator of CIMInstances. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (for this method) - * CIM_ERR_INVALID_CLASS (in this namespace) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CloseableIterator enumerateInstances(CIMObjectPath pPath, boolean pDeep, - boolean pLocalOnly, boolean pIncludeClassOrigin, String[] pPropertyList) - throws WBEMException; - - /** - * enumerateInstances shall enumerate the instances of the - * specified class in pClassPath and return zero or more - * CIMInstances. - * - * @param pClassPath - * The CIMObjectPath for the class for which the - * enumeration is to be performed. - * @param pDeepInheritance - * If true, this specifies that, for each returned - * Instance of the Class, all properties of the Instance must be - * present (subject to constraints imposed by the other - * parameters), including any which were added by subclassing the - * specified Class. If false, each returned Instance - * includes only properties defined for the specified Class in - * path. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property. If true, the class origin - * attribute may be present for each property on all instances - * returned, even if requested the server may ignore the request - * and not return the class origin. If false, the - * class origin shall not be present. - * @param pPropertyList - * An array of property names used to filter what is contained in - * the Objects returned. Each CIMInstance returned - * only contains elements for the properties of the names - * specified. Duplicate and invalid property names are ignored - * and the request is otherwise processed normally. An empty - * array indicates that no properties should be included in the - * Objects returned. A null value indicates that all - * properties should be contained in the Objects returned. - * @param pFilterQueryLanguage - * The pFilterQueryLanguage represents the query - * language for the pFilterQuery argument. This must - * be left null if a pFilterQuery is - * not supplied. If the implementation does not support the query - * language specified, the - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall - * be returned. If the implementation does not support filtered - * enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pFilterQuery - * The pFilterQuery specifies a query in the form of - * the query language specified by the - * pFilterQueryLanguage parameter. If this value is - * not null, the pFilterQueryLanguage - * parameter must be non-null. This value shall act - * as an additional filter on the result set. If the - * implementation does not support the query language specified, - * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error - * shall be returned. If the implementation does not support - * filtered enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pTimeout - * This input parameter determines the minimum time the CIM - * server shall maintain the open enumeration session after the - * last Open or Pull operation (unless the enumeration session is - * closed). If the operation timeout is exceeded, the - * implementation may close the enumeration session at any time, - * releasing any resources allocated to the enumeration session. - * A pTimeout of 0 means that there is no operation - * timeout. That is, the enumeration session is never closed - * based on time. If pTimeout is null, - * the implementation shall choose an operation timeout. All - * other values for pTimeout specify the operation - * timeout in seconds. A implementation may restrict the set of - * allowable values for pTimeout. Specifically, the - * implementation may not allow 0 (no timeout). If the specified - * value is not an allowable value, the implementation shall - * return failure with the status code - * CIM_ERR_INVALID_OPERATION_TIMEOUT. - * @param pContinueOnError - * If true, requests that the operation resume when - * an error is received. If a implementation does not support - * continuation on error and pContinueOnError is - * true, it shall throw a WBEMException - * with the status code - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a - * implementation supports continuation on error and - * pContinueOnError is true, the - * enumeration session shall remain open when a Pull operation - * fails, and any subsequent successful Pull operations shall - * return the set of elements that would have been returned if - * the failing Pull operations were successful. This behavior is - * subject to the consistency rules defined for pulled - * enumerations. If pContinueOnError is - * false, the enumeration session shall be closed - * when either the operation completes successfully or when a - * WBEMExcetpion is thrown. - * @param pMaxObjects - * Defines the maximum number of elements that this Open - * operation can return. The implementation may deliver any - * number of elements up to pMaxObjects but shall - * not deliver more than pMaxObjects elements. An - * implementation may choose to never return any elements during - * an Open operation, regardless of the value of - * pMaxObjects. Note that a CIM client can use a - * pMaxObjects value of 0 to specify that it does - * not want to retrieve any instances in the Open operation. - * @return The return value of a successful Open operation is an array of - * enumerated elements with a number of entries from 0 up to a - * maximum defined by pMaxObjects. These entries meet - * the criteria defined in the Open operation. Note that returning - * no entries in the array does not imply that the enumeration - * session is exhausted. Client must evaluate the - * EnumerateResponse.isEnd() to determine if there are - * more elements. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_OPERATION_TIMEOUT - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED - * CIM_ERR_INVALID_PARAMETER - * CIM_ERR_INVALID_CLASS (the source class does not exist) - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED - * CIM_ERR_INVALID_QUERY - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public EnumerateResponse enumerateInstances(CIMObjectPath pClassPath, - boolean pDeepInheritance, boolean pIncludeClassOrigin, String[] pPropertyList, - String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout, - boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException; - - /** - * Enumerates the CIM Qualifier types for a specific namespace. - * - * @param pPath - * The CIMObjectPath identifying the namespace whose - * qualifier types are to be enumerated. - * @return A CloseableIterator of CIMQualifierType - * s. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CloseableIterator> enumerateQualifierTypes(CIMObjectPath pPath) - throws WBEMException; - - /** - * enumerationCount provides an estimated count of the total - * number of objects in an open enumeration session represented by an - * enumeration context. - * - * @param pPath - * The namespace for the enumeration context. - * @param pEnumerationContext - * The enumeration context to count. - * @return The estimated number of objects. - * @throws UnsupportedOperationException - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER - * CIM_ERR_INVALID_ENUMERATION_CONTEXT - * CIM_ERR_SERVER_LIMITS_EXCEEDED - * CIM_ERR_FAILED - * - * - */ - public UnsignedInteger64 enumerationCount(CIMObjectPath pPath, String pEnumerationContext) - throws WBEMException; - - /** - * execQuery shall execute a query to retrieve objects. - * - * @param pPath - * CIMObjectPath identifying the class to query. - * Only the namespace and class name components are used. All - * other information (e.g. Keys) is ignored. - * @param pQuery - * A string containing the text of the query. - * @param pQueryLanguage - * A string that identifies the query language to use to parse - * the query string specified. - * @return A CloseableIterator of CIMInstances. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED (provider does not support this method) - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED (the requested query language - * is not recognized) - * CIM_ERR_INVALID_QUERY (the query is not a valid query in the specified - * query language) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CloseableIterator execQuery(CIMObjectPath pPath, String pQuery, - String pQueryLanguage) throws WBEMException; - - /** - * execQueryInstances shall execute a query to retrieve - * instances. - * - * @param pObjectName - * The CIMObjectPath representing the namespace to - * be used. - * @param pFilterQuery - * The pFilterQuery specifies a query in the form of - * the query language specified by the - * pFilterQueryLanguage parameter. If this value is - * not null, the pFilterQueryLanguage - * parameter must be non-null. This value shall act - * as an additional filter on the result set. If the - * implementation does not support the query language specified, - * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error - * shall be returned. If the implementation does not support - * filtered enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pFilterQueryLanguage - * The pFilterQueryLanguage represents the query - * language for the pFilterQuery argument. This must - * be left null if a pFilterQuery is - * not supplied. If the implementation does not support the query - * language specified, the - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall - * be returned. If the implementation does not support filtered - * enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pReturnQueryResultClass - * The pReturnQueryResultClass controls whether a - * class definition is returned in pQueryResultClass - * . If it is set to false, - * pQueryResultClass shall be set to - * null on output. If it is set to true - * , the value of the pQueryResultClass on output - * shall be a class definition that defines the properties - * (columns) of each row of the query result. - * @param pTimeout - * This input parameter determines the minimum time the CIM - * server shall maintain the open enumeration session after the - * last Open or Pull operation (unless the enumeration session is - * closed). If the operation timeout is exceeded, the - * implementation may close the enumeration session at any time, - * releasing any resources allocated to the enumeration session. - * A pTimeout of 0 means that there is no operation - * timeout. That is, the enumeration session is never closed - * based on time. If pTimeout is null, - * the implementation shall choose an operation timeout. All - * other values for pTimeout specify the operation - * timeout in seconds. A implementation may restrict the set of - * allowable values for pTimeout. Specifically, the - * implementation may not allow 0 (no timeout). If the specified - * value is not an allowable value, the implementation shall - * return failure with the status code - * CIM_ERR_INVALID_OPERATION_TIMEOUT. - * @param pContinueOnError - * If true, requests that the operation resume when - * an error is received. If a implementation does not support - * continuation on error and pContinueOnError is - * true, it shall throw a WBEMException - * with the status code - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a - * implementation supports continuation on error and - * pContinueOnError is true, the - * enumeration session shall remain open when a Pull operation - * fails, and any subsequent successful Pull operations shall - * return the set of elements that would have been returned if - * the failing Pull operations were successful. This behavior is - * subject to the consistency rules defined for pulled - * enumerations. If pContinueOnError is - * false, the enumeration session shall be closed - * when either the operation completes successfully or when a - * WBEMExcetpion is thrown. - * @param pMaxObjects - * Defines the maximum number of elements that this Open - * operation can return. The implementation may deliver any - * number of elements up to pMaxObjects but shall - * not deliver more than pMaxObjects elements. An - * implementation may choose to never return any elements during - * an Open operation, regardless of the value of - * pMaxObjects. Note that a CIM client can use a - * pMaxObjects value of 0 to specify that it does - * not want to retrieve any instances in the Open operation. - * @param pQueryResultClass - * The pQueryResultClass is an output argument. It - * shall be null if the - * pReturnQueryResultClass input parameter is set to - * false. Otherwise, it shall return a class - * definition where each property of the class corresponds to one - * entry of the query select list. The class definition - * corresponds to one row of the query result. The class name of - * this returned class shall be "CIM_QueryResult". This class - * definition is valid only in the context of this enumeration. - * @return The return value of a successful Open operation is an array of - * enumerated elements with a number of entries from 0 up to a - * maximum defined by pMaxObjects. These entries meet - * the criteria defined in the Open operation. Note that returning - * no entries in the array does not imply that the enumeration - * session is exhausted. Client must evaluate the - * EnumerateResponse.isEnd() to determine if there are - * more elements. - * @throws UnsupportedOperationException - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_OPERATION_TIMEOUT - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED (the requested filter query - * language is not recognized) - * CIM_ERR_INVALID_QUERY (the filter query is not a valid query in the - * specified filter query language) - * CIM_ERR_QUERY_FEATURE_NOT_SUPPORTED (the query requires support for - * features that are not supported) - * CIM_ERR_FAILED (Some other unspecified error occurred) - * - */ - public EnumerateResponse execQueryInstances(CIMObjectPath pObjectName, - String pFilterQuery, String pFilterQueryLanguage, boolean pReturnQueryResultClass, - UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects, - CIMClass pQueryResultClass) throws WBEMException; - - /** - * Returns the CIMClass for the specified - * CIMObjectPath. - * - * @param pName - * The object path of the class to be returned. Only the name - * space and class name components are used. All other - * information (e.g. keys) is ignored. - * @param pLocalOnly - * If true, only elements (properties, methods, - * references) overridden or defined in the class are included in - * the CIMClassreturned. If false, all - * elements of the class definition are returned. - * @param pIncludeQualifiers - * If true, all Qualifiers for the class and its - * elements are included in the CIMClass returned. - * If false, no Qualifier information is contained - * in the CIMClass returned. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property or method. If true, the - * class origin attribute shall be present for each property and - * method on all returned CIMClasses. If - * false, the class origin shall not be present. - * @param pPropertyList - * An array of property names used to filter what is contained in - * the CIMClass returned. The CIMClass - * returned only contains elements for the properties of the - * names specified. Duplicate and invalid property names are - * ignored and the request is otherwise processed normally. An - * empty array indicates that no properties should be returned. A - * null value indicates that all properties should - * be returned. - * @return CIMClass meeting the criteria specified. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_NOT_FOUND (the requested CIM Class does not exist in the - * specified namespace) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CIMClass getClass(CIMObjectPath pName, boolean pLocalOnly, boolean pIncludeQualifiers, - boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException; - - /** - * Get a CIMInstance. - * - * @param pName - * The object path of the instance to be returned. The Keys in - * this CIMObjectPath must be populated. - * @param pLocalOnly - * If true, only properties overridden or defined in - * the class are included in the CIMInstance - * returned. If false, all properties of the class - * definition are returned. WBEM Servers may ignore this - * parameter and return all properties. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property. If true, the class origin - * attribute may be present for each property of the - * CIMInstance, even if requested the server may - * ignore the request and not return the class origin. If - * false, the class origin shall not be present. - * @param pPropertyList - * An array of property names used to filter what is contained in - * the CIMClass returned. The CIMClass - * returned only contains elements for the properties of the - * names specified. Duplicate and invalid property names are - * ignored and the request is otherwise processed normally. An - * empty array indicates that no properties should be returned. A - * null value indicates that all properties should - * be returned. - * @return CIMInstance identified by the - * CIMObjectPath specified. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED (provider does not support this method) - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (for this method) - * CIM_ERR_INVALID_CLASS (in this namespace) - * CIM_ERR_NOT_FOUND (if instance does not exist) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CIMInstance getInstance(CIMObjectPath pName, boolean pLocalOnly, - boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException; - - /** - * getInstancePaths shall get the CIMObjectPaths - * using an enumeration context. - * - * @param pPath - * The CIMObjectPath representing the namespace to - * be used. - * @param pContext - * The enumeration context value for the enumeration session to - * be used. - * @param pMaxObjects - * Defines the maximum number of elements that this Open - * operation can return. The implementation may deliver any - * number of elements up to pMaxObjects but shall - * not deliver more than pMaxObjects elements. An - * implementation may choose to never return any elements during - * an Open operation, regardless of the value of - * pMaxObjects. - * @return EnumerateResponse that includes zero or more - * CIMObjectPath objects. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER - * CIM_ERR_INVALID_ENUMERATION_CONTEXT - * CIM_ERR_SERVER_LIMITS_EXCEEDED - * CIM_ERR_PULL_HAS_BEEN_ABANDONED - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public EnumerateResponse getInstancePaths(CIMObjectPath pPath, String pContext, - UnsignedInteger32 pMaxObjects) throws WBEMException; - - /** - * getInstances shall get the instances from an enumeration - * session started by execQueryInstances. - * - * @param pPath - * The CIMObjectPath representing the namespace to - * be used. - * @param pContext - * The enumeration context value for the enumeration session to - * be used. - * @param pMaxObjects - * Defines the maximum number of elements that this Open - * operation can return. The implementation may deliver any - * number of elements up to pMaxObjects but shall - * not deliver more than pMaxObjects elements. An - * implementation may choose to never return any elements during - * an Open operation, regardless of the value of - * pMaxObjects. Note that a CIM client can use a - * pMaxObjects value of 0 to specify that it does - * not want to retrieve any instances in the Open operation. - * @return EnumerateResponse that includes zero or more - * CIMObjectPath objects. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER - * CIM_ERR_INVALID_ENUMERATION_CONTEXT - * CIM_ERR_SERVER_LIMITS_EXCEEDED - * CIM_ERR_PULL_HAS_BEEN_ABANDONED - * CIM_ERR_FAILED - * - */ - public EnumerateResponse getInstances(CIMObjectPath pPath, String pContext, - UnsignedInteger32 pMaxObjects) throws WBEMException; - - /** - * getInstancesWithPath shall use the enumeration context - * provided to get the next set of instances for the enumeration session. - * - * @param pPath - * The CIMObjectPath representing the namespace to - * be used. - * @param pContext - * The enumeration context value for the enumeration session to - * be used. - * @param pMaxObjects - * Defines the maximum number of elements that this Open - * operation can return. The implementation may deliver any - * number of elements up to pMaxObjects but shall - * not deliver more than pMaxObjects elements. An - * implementation may choose to never return any elements during - * an Open operation, regardless of the value of - * pMaxObjects. - * @return EnumerateResponse that includes zero or more - * CIMObjectPath. objects. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER - * CIM_ERR_INVALID_ENUMERATION_CONTEXT - * CIM_ERR_SERVER_LIMITS_EXCEEDED - * CIM_ERR_PULL_HAS_BEEN_ABANDONED - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public EnumerateResponse getInstancesWithPath(CIMObjectPath pPath, - String pContext, UnsignedInteger32 pMaxObjects) throws WBEMException; - - /** - * Get property values. See WBEMClientConstants for a list of - * standard properties. - * - * @param pKey - * The name of the property. - * @return The value of the property. - * @see WBEMClientConstants - */ - public String getProperty(String pKey); - - /** - * Get a CIMQualifierType. - * - * @param pName - * CIMObjectPath that identifies the - * CIMQualifierType to return. - * @return The CIMQualifierType object. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_NOT_FOUND (the requested Qualifier declaration did not exist) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CIMQualifierType getQualifierType(CIMObjectPath pName) throws WBEMException; - - /** - * Initialize the client connection. This must be called before any - * operations. This must only be called once. - * - * @param pName - * The protocol and host to use (e.g. http://192.168.1.128/). Any - * other fields shall be ignored. - * @param pSubject - * The principal/credential pairs for this connection. - * @param pLocales - * An array of locales in order of priority of preference. - * @throws IllegalArgumentException - * If the host or scheme portion of the object path is null, or - * if the protocol is not supported. - * @throws WBEMException - * If the protocol adapter or security cannot be initialized. - */ - public void initialize(CIMObjectPath pName, Subject pSubject, Locale[] pLocales) - throws IllegalArgumentException, WBEMException; - - /** - * Executes the specified method on the specified object. - * - * @param pName - * CIM object path of the object whose method must be invoked. It - * must include all of the keys. - * @param pMethodName - * The name of the method to be invoked. - * @param pInputArguments - * The CIMArgument array of method input parameters. - *

      - * @param pOutputArguments - * The CIMArgument array of method output - * parameters. The array should be allocated large enough to hold - * all returned parameters. - * @return The return value of the specified method. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED (implementation DOES NOT support ANY - * Extrinsic Method Invocation) - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (for this method) - * CIM_ERR_NOT_FOUND (if instance does not exist) - * CIM_ERR_METHOD_NOT_FOUND - * CIM_ERR_METHOD_NOT_AVAILABLE - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public Object invokeMethod(CIMObjectPath pName, String pMethodName, - CIMArgument[] pInputArguments, CIMArgument[] pOutputArguments) - throws WBEMException; - - /** - * Modify the CIMClass. - * - * @param pClass - * CIMClass to be modified. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_INVALID_SUPERCLASS (the putative CIM Class declares a - * non-existent superclass) - * CIM_ERR_CLASS_HAS_CHILDREN (the modification could not be performed - * because it was not possible to update the subclasses of the Class - * in a consistent fashion) - * CIM_ERR_CLASS_HAS_INSTANCES (the modification could not be performed - * because it was not possible to update the instances of the Class in - * a consistent fashion) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public void modifyClass(CIMClass pClass) throws WBEMException; - - /** - * Modify some or all of the properties of the specified - * CIMInstance. - * - * @param pInstance - * CIMInstance to be modified. All Keys must be - * populated. - * @param pPropertyList - * An array of property names used to specify which values from - * the CIMInstance specified to set. Properties not - * specified in this list but set in the CIMInstance - * specified are not modified. Duplicate property names are - * ignored and the request is otherwise processed normally. If - * the pPropertyList contains invalid property names - * for the instance to be modified, the server shall reject the - * request. An empty array indicates that no properties should be - * modified. A null value indicates that all - * properties should be modified. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED (provider does not support this method) - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (for this method) - * CIM_ERR_INVALID_CLASS (in this namespace) - * CIM_ERR_NOT_FOUND (if instance does not exist) - * CIM_ERR_NO_SUCH_PROPERTY (in this instance) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public void modifyInstance(CIMInstance pInstance, String[] pPropertyList) throws WBEMException; - - /** - * Enumerates the Association classes that refer to a specified source CIM - * Class. - * - * @param pObjectName - * CIMObjectPath defining the source CIM class whose - * referring classes are to be returned. pObjectName - * shall contain the scheme, host, namespace and object name - * (class name). - * @param pResultClass - * This string shall either contain a valid CIM Class name or be - * null. The pResultClass filters the - * classes returned to contain only the classes of this Class - * name or one of its subclasses. - * @param pRole - * This string MUST either contain a valid Property name or be - * null. It filters the Objects returned to contain - * only Objects referring to the source Object via a Property - * with the specified name. If "Antecedent" is specified, then - * only Associations in which the source Object is the - * "Antecedent" reference are returned. - * @param pIncludeQualifiers - * If true, all Qualifiers for each Object - * (including Qualifiers on the Object and on any returned - * Properties) shall be included in the classes returned. If - * false, no Qualifiers shall be present in each - * class returned. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property or method. If true, the - * class Origin attribute shall be present for each property and - * method on all classes returned. If false, the - * class origin shall not be present. - * @param pPropertyList - * An array of property names used to filter what is contained in - * the Objects returned. Each CIMClass returned - * shall only contains elements for the properties of the names - * specified. Duplicate and invalid property names are ignored - * and the request is otherwise processed normally. An empty - * array indicates that no properties should be included in the - * classes returned. A null value indicates that all - * properties should be contained in the classes returned. - * @return If successful, a CloseableIterator referencing zero - * or more CIMClasses meeting the specified criteria. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes shall be - * returned along with zero or more instance of - * CIM_Error. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - - CloseableIterator referenceClasses(CIMObjectPath pObjectName, String pResultClass, - String pRole, boolean pIncludeQualifiers, boolean pIncludeClassOrigin, - String[] pPropertyList) throws WBEMException; - - /** - * Enumerates the Association instances that refer to a specified source CIM - * Instance. - * - * @param pObjectName - * CIMObjectPath defining the source CIM Instance - * whose referring instances are to be returned. The - * pObjectName shall include the host, object name - * and keys. - * @param pResultClass - * This string shall either contain a valid CIM Class name or be - * null. It filters the instances returned to - * contain only the instances of this Class name or one of its - * subclasses. - * @param pRole - * This string shall either contain a valid Property name or be - * null. The role filters the instances returned to - * contain only instances referring to the source instance via a - * property with the specified name. For example, If "Antecedent" - * is specified, then only Associations in which the source - * instance is the "Antecedent" reference are returned. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property. If true, the class origin - * attribute may be present for each property and on all - * instances returned, even if requested the server may ignore - * the request and not return the class origin. If - * false, the class origin shall not be present. - * @param pPropertyList - * An array of property names used to filter what is contained in - * the instances returned. Each CIMInstance returned - * shall only contain elements for the properties of the names - * specified. Duplicate and invalid property names are ignored - * and the request is otherwise processed normally. An empty - * array indicates that no properties should be included in the - * instances returned. A null value indicates that - * all properties supported shall be contained in the instance - * returned. - * @return If successful, a CloseableIterator referencing zero - * or more CIMInstances meeting the specified criteria. - * @throws WBEMException - * If unsuccessful, one of the following status codes shall be - * returned along with zero or more CIM_Error - * instances. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - CloseableIterator referenceInstances(CIMObjectPath pObjectName, - String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList) - throws WBEMException; - - /** - * Enumerates the CIMObjectPaths of Association Objects that - * refer to a particular source CIM Object. If the source Object is a CIM - * Class, then a CloseableIterator of - * CIMObjectPaths of the Association classes that refer to the - * source Object is returned. If the source Object is a CIM Instance, then a - * CloseableIterator of CIMObjectPaths of the - * CIMInstance objects that refer to the source Object is - * returned. - * - * @param pObjectName - * CIMObjectPath defining the source CIM Object - * whose referring Objects are to be returned. This argument may - * contain either a Class name or the modelpath of an Instance. - * (i.e. Keys populated) - * @param pResultClass - * This string MUST either contain a valid CIM Class name or be - * null. It filters the Objects returned to contain - * only the Objects of this Class name or one of its subclasses. - * @param pRole - * This string MUST either contain a valid Property name or be - * null. It filters the Objects returned to contain - * only Objects referring to the source Object via a Property - * with the specified name. If "Antecedent" is specified, then - * only Associations in which the source Object is the - * "Antecedent" reference are returned. - * @return If successful, a CloseableIterator referencing zero - * or more CIMObjectPaths of CIMClasses or - * CIMInstances meeting the specified criteria. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public CloseableIterator referenceNames(CIMObjectPath pObjectName, - String pResultClass, String pRole) throws WBEMException; - - /** - * referencePaths shall start an enumeration session for - * association instances that have references that refer to the instance - * defined in the pInstancePath parameter and return zero or - * more CIMObjectPath objects. - * - * @param pInstancePath - * The CIMObjectPath for the instance for which the - * enumeration is to be performed. - * @param pResultClass - * This string MUST either contain a valid CIM Class name or be - * null. It filters the Objects returned to contain - * only the Objects of this Class name or one of its subclasses. - * @param pRole - * This string MUST either contain a valid Property name or be - * null. It filters the Objects returned to contain - * only Objects referring to the source Object via a Property - * with the specified name. If "Antecedent" is specified, then - * only Associations in which the source Object is the - * "Antecedent" reference are returned. - * @param pFilterQueryLanguage - * The pFilterQueryLanguage represents the query - * language for the pFilterQuery argument. This must - * be left null if a pFilterQuery is - * not supplied. If the implementation does not support the query - * language specified, the - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall - * be returned. If the implementation does not support filtered - * enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pFilterQuery - * The pFilterQuery specifies a query in the form of - * the query language specified by the - * pFilterQueryLanguage parameter. If this value is - * not null, the pFilterQueryLanguage - * parameter must be non-null. This value shall act - * as an additional filter on the result set. If the - * implementation does not support the query language specified, - * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error - * shall be returned. If the implementation does not support - * filtered enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pTimeout - * This input parameter determines the minimum time the CIM - * server shall maintain the open enumeration session after the - * last Open or Pull operation (unless the enumeration session is - * closed). If the operation timeout is exceeded, the - * implementation may close the enumeration session at any time, - * releasing any resources allocated to the enumeration session. - * A pTimeout of 0 means that there is no operation - * timeout. That is, the enumeration session is never closed - * based on time. If pTimeout is null, - * the implementation shall choose an operation timeout. All - * other values for pTimeout specify the operation - * timeout in seconds. A implementation may restrict the set of - * allowable values for pTimeout. Specifically, the - * implementation may not allow 0 (no timeout). If the specified - * value is not an allowable value, the implementation shall - * return failure with the status code - * CIM_ERR_INVALID_OPERATION_TIMEOUT. - * @param pContinueOnError - * If true, requests that the operation resume when - * an error is received. If a implementation does not support - * continuation on error and pContinueOnError is - * true, it shall throw a WBEMException - * with the status code - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a - * implementation supports continuation on error and - * pContinueOnError is true, the - * enumeration session shall remain open when a Pull operation - * fails, and any subsequent successful Pull operations shall - * return the set of elements that would have been returned if - * the failing Pull operations were successful. This behavior is - * subject to the consistency rules defined for pulled - * enumerations. If pContinueOnError is - * false, the enumeration session shall be closed - * when either the operation completes successfully or when a - * WBEMExcetpion is thrown. - * @param pMaxObjects - * Defines the maximum number of elements that this Open - * operation can return. The implementation may deliver any - * number of elements up to pMaxObjects but shall - * not deliver more than pMaxObjects elements. An - * implementation may choose to never return any elements during - * an Open operation, regardless of the value of - * pMaxObjects. Note that a CIM client can use a - * pMaxObjects value of 0 to specify that it does - * not want to retrieve any instances in the Open operation. - * @return The return value of a successful Open operation is an array of - * enumerated elements with a number of entries from 0 up to a - * maximum defined by pMaxObjects. These entries meet - * the criteria defined in the Open operation. Note that returning - * no entries in the array does not imply that the enumeration - * session is exhausted. Client must evaluate the - * EnumerateResponse.isEnd() to determine if there are - * more elements. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_OPERATION_TIMEOUT - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED - * CIM_ERR_INVALID_PARAMETER - * CIM_ERR_NOT_FOUND (the source instance was not found) - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED - * CIM_ERR_INVALID_QUERY - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public EnumerateResponse referencePaths(CIMObjectPath pInstancePath, - String pResultClass, String pRole, String pFilterQueryLanguage, String pFilterQuery, - UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects) - throws WBEMException; - - /** - * references shall start an enumeration session for - * association instances that have references that refer to the instance - * defined in the pInstancePath parameter and return zero or - * more CIMInstance objects. - * - * @param pInstancePath - * The CIMObjectPath for the instance for which the - * enumeration is to be performed. - * @param pResultClass - * This string shall either contain a CIM Class name or be - * null. It filters the instances returned to - * contain only the instances of this Class name or one of its - * subclasses. - * @param pRole - * This string shall either contain a Property name or be - * null. It filters the instances returned to - * contain only instances referring to the source instance via a - * Property with the specified name. If "Antecedent" is - * specified, then only Associations in which the source instance - * is the "Antecedent" reference are returned. - * @param pIncludeClassOrigin - * The class origin attribute is the name of the class that first - * defined the property. If true, the class origin - * attribute may be present for each property on all instances - * returned, even if requested the server may ignore the request - * and not return the class origin. If false, the - * class origin shall not be present. - * @param pPropertyList - * An array of property names used to filter what is contained in - * the instances returned. Each CIMInstance returned - * only contains elements for the properties of the names - * specified. Duplicate and invalid property names are ignored - * and the request is otherwise processed normally. An empty - * array indicates that no properties should be included in the - * Objects returned. A null value indicates that all - * non-null properties of the instance are included. - * @param pFilterQueryLanguage - * The pFilterQueryLanguage represents the query - * language for the pFilterQuery argument. This must - * be left null if a pFilterQuery is - * not supplied. If the implementation does not support the query - * language specified, the - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall - * be returned. If the implementation does not support filtered - * enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pFilterQuery - * The pFilterQuery specifies a query in the form of - * the query language specified by the - * pFilterQueryLanguage parameter. If this value is - * not null, the pFilterQueryLanguage - * parameter must be non-null. This value shall act - * as an additional filter on the result set. If the - * implementation does not support the query language specified, - * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error - * shall be returned. If the implementation does not support - * filtered enumerations, the - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error - * shall be returned. - * @param pTimeout - * This input parameter determines the minimum time the CIM - * server shall maintain the open enumeration session after the - * last Open or Pull operation (unless the enumeration session is - * closed). If the operation timeout is exceeded, the - * implementation may close the enumeration session at any time, - * releasing any resources allocated to the enumeration session. - * A pTimeout of 0 means that there is no operation - * timeout. That is, the enumeration session is never closed - * based on time. If pTimeout is null, - * the implementation shall choose an operation timeout. All - * other values for pTimeout specify the operation - * timeout in seconds. A implementation may restrict the set of - * allowable values for pTimeout. Specifically, the - * implementation may not allow 0 (no timeout). If the specified - * value is not an allowable value, the implementation shall - * return failure with the status code - * CIM_ERR_INVALID_OPERATION_TIMEOUT. - * @param pContinueOnError - * If true, requests that the operation resume when - * an error is received. If a implementation does not support - * continuation on error and pContinueOnError is - * true, it shall throw a WBEMException - * with the status code - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a - * implementation supports continuation on error and - * pContinueOnError is true, the - * enumeration session shall remain open when a Pull operation - * fails, and any subsequent successful Pull operations shall - * return the set of elements that would have been returned if - * the failing Pull operations were successful. This behavior is - * subject to the consistency rules defined for pulled - * enumerations. If pContinueOnError is - * false, the enumeration session shall be closed - * when either the operation completes successfully or when a - * WBEMExcetpion is thrown. - * @param pMaxObjects - * Defines the maximum number of elements that this Open - * operation can return. The implementation may deliver any - * number of elements up to pMaxObjects but shall - * not deliver more than pMaxObjects elements. An - * implementation may choose to never return any elements during - * an Open operation, regardless of the value of - * pMaxObjects. Note that a CIM client can use a - * pMaxObjects value of 0 to specify that it does - * not want to retrieve any instances in the Open operation. - * @return The return value of a successful Open operation is an array of - * enumerated elements with a number of entries from 0 up to a - * maximum defined by pMaxObjects. These entries meet - * the criteria defined in the Open operation. Note that returning - * no entries in the array does not imply that the enumeration - * session is exhausted. Client must evaluate the - * EnumerateResponse.isEnd() to determine if there are - * more elements. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_SERVER_IS_SHUTTING_DOWN - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_OPERATION_TIMEOUT - * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED - * CIM_ERR_INVALID_PARAMETER - * CIM_ERR_NOT_FOUND (the source instance was not found) - * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED - * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED - * CIM_ERR_INVALID_QUERY - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public EnumerateResponse references(CIMObjectPath pInstancePath, - String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList, - String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout, - boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException; - - /** - * Change the locales that were provided during initialization. - * - * @param pLocales - * An array of locales in order of priority of preference. - */ - public void setLocales(Locale[] pLocales); - - /** - * Set properties that enable options or protocol specific properties. See - * WBEMClientConstants for a list of standard properties. - * - * @param pKey - * The name of the property. - * @param pValue - * The value of the property. - * @throws IllegalArgumentException - * If the name is not a supported property name. - * @see WBEMClientConstants - */ - public void setProperty(String pKey, String pValue); - - /** - * Add a CIMQualifierType to the specified namespace if it does - * not already exist. Otherwise, it modifies the qualifier type to the value - * specified. - * - * @param pQualifierType - * The CIM qualifier type to be added. - * @throws UnsupportedOperationException - * If the client implementation (or protocol) does not support - * the operation. - * @throws WBEMException - * If unsuccessful, one of the following status codes must be - * returned. The ORDERED list is: - * - * - * CIM_ERR_ACCESS_DENIED - * CIM_ERR_NOT_SUPPORTED - * CIM_ERR_INVALID_NAMESPACE - * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized - * or otherwise incorrect parameters) - * CIM_ERR_FAILED (some other unspecified error occurred) - * - */ - public void setQualifierType(CIMQualifierType pQualifierType) throws WBEMException; -} +/* + (C) Copyright IBM Corp. 2006, 2013 + + THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE + ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE + CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. + + You can obtain a current copy of the Eclipse Public License from + http://www.opensource.org/licenses/eclipse-1.0.php + + @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com + * + * Change History + * Flag Date Prog Description + * ------------------------------------------------------------------------------- + * 1565892 2006-11-08 lupusalex Make SBLIM client JSR48 compliant + * 1686000 2007-04-19 ebak modifyInstance() missing from WBEMClient + * 1737141 2007-06-18 ebak Sync up with JSR48 evolution + * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL + * 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 + * 2845211 2009-08-27 raman_arora Pull Enumeration Feature (SAX Parser) + * 2858933 2009-10-12 raman_arora JSR48 new APIs: associatorClasses & associatorInstances + * 2886829 2009-11-18 raman_arora JSR48 new APIs: referenceClasses & referenceInstances + * 2959586 2010-03-01 blaschke-oss Sync up WBEMClient javadoc with JSR48 1.0.0 + * 2961592 2010-03-01 blaschke-oss Remove WBEMClient.setLocales() UnsupportedOperationException + * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final + * 3496343 2012-03-02 blaschke-oss JSR48 1.0.0: deprecate WBEMClient associators and references + * 3514537 2012-04-03 blaschke-oss TCK: execQueryInstances requires boolean, not Boolean + * 3521131 2012-04-24 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II + * 3521328 2012-04-25 blaschke-oss JSR48 1.0.0: remove WBEMClient associators and references + * 3525657 2012-05-10 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final III + * 3555752 2012-09-13 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final IV + * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V + */ + +package org.metricshub.wbem.javax.wbem.client; + +/*- + * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ + * WBEM Java Client + * ჻჻჻჻჻჻ + * Copyright 2023 - 2025 MetricsHub + * ჻჻჻჻჻჻ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ + */ + +import java.util.Locale; + +import org.metricshub.wbem.javax.cim.CIMArgument; +import org.metricshub.wbem.javax.cim.CIMClass; +import org.metricshub.wbem.javax.cim.CIMInstance; +import org.metricshub.wbem.javax.cim.CIMObjectPath; +import org.metricshub.wbem.javax.cim.CIMQualifierType; +import org.metricshub.wbem.javax.wbem.CloseableIterator; +import org.metricshub.wbem.javax.wbem.WBEMException; +import org.metricshub.wbem.javax.cim.UnsignedInteger32; +import org.metricshub.wbem.javax.cim.UnsignedInteger64; +import javax.security.auth.Subject; + +//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013 +/** + * The WBEMClient interface is used to invoke WBEM operations + * against a WBEM Server. A WBEMClient implementation can be + * retrieved from the WBEMClientFactory specifying the protocol to + * be used. + * + * @see WBEMClientFactory + */ +public interface WBEMClient { + + /** + * Enumerates CIM classes that are associated to a specified source CIM + * class. + * + * @param pObjectName + * CIMObjectPath defining the source CIM Class whose + * associated classes are to be returned. The + * pObjectName shall include the host, namespace and + * object name. The keys shall not be populated. + * @param pAssociationClass + * This string shall contain a valid CIM Association class name + * or be null. It filters the classes returned to + * contain only classes associated to the source Object via this + * CIM Association class or one of its subclasses. + * @param pResultClass + * This string shall either contain a valid CIM Class name or be + * null. It filters the classes returned to contain + * only the classes of this class name or one of its subclasses. + * @param pRole + * This string shall either contain a valid Property name or be + * null. It filters the classes returned to contain + * only classes associated to the source class via an Association + * class in which the source class plays the specified + * role. (i.e. the Property name in the Association class that + * refers to the source class matches this value) For + * example, if "Antecedent" is specified, then only Associations + * in which the source class is the "Antecedent" reference are + * examined. + * @param pResultRole + * This string shall either contain a valid Property name or be + * null. It filters the classes returned to contain + * only classes associated to the source class via an Association + * class in which the class returned plays the specified + * role. (i.e. the Property name in the Association class that + * refers to the class returned matches this value) + * @param pIncludeQualifiers + * If true, all Qualifiers for each class (including + * Qualifiers on the Object and on any returned Properties) MUST + * be included in the classes returned. If false, no + * Qualifiers are present in each class returned. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property or method. If true, the + * class origin attribute shall be present for each property and + * method on all classes returned. If false, the + * class origin shall not be present. + * @param pPropertyList + * An array of property names used to filter what is contained in + * the classes returned. Each CIMClass returned + * shall only contain elements for the properties of the names + * specified. Duplicate and invalid property names are ignored + * and the request is otherwise processed normally. An empty + * array indicates that no properties should be included in the + * classes returned. A null value indicates that all + * properties should be contained in the classes returned. + * @return If successful, a CloseableIterator containing zero + * or more CIMClasses meeting the specified criteria + * are returned. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes shall be + * returned along with zero or more instances of + * CIM_Error. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CloseableIterator associatorClasses(CIMObjectPath pObjectName, + String pAssociationClass, String pResultClass, String pRole, String pResultRole, + boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList) + throws WBEMException; + + /** + * Enumerates CIM Instances associated to a specified source CIM Instance. + * + * @param pObjectName + * CIMObjectPath defining the source CIM Instance + * whose associated instances are to be returned. The + * pObjectName must contain the host, namespace, + * object name and keys for the instance. + * @param pAssociationClass + * This string shall either contain a valid CIM Association class + * name or be null. It filters the instances + * returned to contain only instances associated to the source + * instance via this CIM Association class or one of its + * subclasses. + * @param pResultClass + * This string shall either contain a valid CIM Class name or be + * null. It filters the instances returned to + * contain only the instances of this Class name or one of its + * subclasses. + * @param pRole + * This string shall either contain a valid Property name or be + * null. It filters the Objects returned to contain + * only Objects associated to the source Object via an + * Association class in which the source Object plays the + * specified role. (i.e. the Property name in the Association + * class that refers to the source Object matches this + * value) If "Antecedent" is specified, then only Associations in + * which the source Object is the "Antecedent" reference are + * examined. + * @param pResultRole + * This string shall either contain a valid Property name or be + * null. It filters the instances returned to + * contain only instances associated to the source instance via + * an Association class in which the instance returned + * plays the specified role. (i.e. the Property name in the + * Association class that refers to the instance returned + * matches this value) For example, if "Dependent" is specified, + * then only Associations in which the instance returned is the + * "Dependent" reference are examined. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property. If true, the class origin + * attribute may be present for each property on all instances + * returned, even if requested the server may ignore the request + * and not return the class origin. If false, the + * class origin shall not be present. + * @param pPropertyList + * An array of property names used to filter what is contained in + * the Objects returned. Each CIMInstance returned + * only contains elements for the properties of the names + * specified. Duplicate and invalid property names are ignored + * and the request is otherwise processed normally. An empty + * array indicates that no properties should be included in the + * instances returned. A null value indicates that + * all properties should be contained in the instances returned. + * @return If successful, a CloseableIterator containing zero + * or more CIMInstances meeting the specified criteria + * is returned. + * @throws WBEMException + * If unsuccessful, one of the following status codes shall be + * returned along with zero or more instances of + * CIM_Error. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CloseableIterator associatorInstances(CIMObjectPath pObjectName, + String pAssociationClass, String pResultClass, String pRole, String pResultRole, + boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException; + + /** + * Enumerates the CIMObjectPaths of CIM Objects that are + * associated to a particular source CIM Object. If the source Object is a + * CIM Class, then a CloseableIterator of + * CIMObjectPath s of the classes associated to the source + * Object is returned. If the source Object is a CIM Instance, then a + * CloseableIterator of CIMObjectPaths of the + * CIMInstance objects associated to the source Object is + * returned. + * + * @param pObjectName + * CIMObjectPath defining the source CIM Object + * whose associated Objects are to be returned. This argument may + * contain either a Class name or the modelpath of an Instance. + * (i.e. Keys populated) + * @param pAssociationClass + * This string MUST either contain a valid CIM Association class + * name or be null. It filters the Objects returned + * to contain only Objects associated to the source Object via + * this CIM Association class or one of its subclasses. + * @param pResultClass + * This string MUST either contain a valid CIM Class name or be + * null. It filters the Objects returned to contain + * only the Objects of this Class name or one of its subclasses. + * @param pRole + * This string MUST either contain a valid Property name or be + * null. It filters the Objects returned to contain + * only Objects associated to the source Object via an + * Association class in which the source Object plays the + * specified role. (i.e. the Property name in the Association + * class that refers to the source Object matches this + * value) If "Antecedent" is specified, then only Associations in + * which the source Object is the "Antecedent" reference are + * examined. + * @param pResultRole + * This string MUST either contain a valid Property name or be + * null. It filters the Objects returned to contain + * only Objects associated to the source Object via an + * Association class in which the Object returned plays + * the specified role. (i.e. the Property name in the Association + * class that refers to the Object returned matches this + * value) If "Dependent" is specified, then only Associations in + * which the Object returned is the "Dependent" reference are + * examined. + * @return If successful, a CloseableIterator containing zero + * or more CIMObjectPath objects of the CIM Classes or + * CIM Instances meeting the specified criteria is returned. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CloseableIterator associatorNames(CIMObjectPath pObjectName, + String pAssociationClass, String pResultClass, String pRole, String pResultRole) + throws WBEMException; + + /** + * associatorPaths shall start an enumeration session for + * traversing associations starting from the instance defined in the + * pInstancePath parameter using any specified filtering + * criteria and return zero or more CIMObjectPath objects. + * + * @param pInstancePath + * The CIMObjectPath for the instance for which the + * enumeration is to be performed. + * @param pAssociationClass + * This string MUST either contain a valid CIM Association class + * name or be null. It filters the Objects returned + * to contain only Objects associated to the source Object via + * this CIM Association class or one of its subclasses. + * @param pResultClass + * This string MUST either contain a valid CIM Class name or be + * null. It filters the Objects returned to contain + * only the Objects of this Class name or one of its subclasses. + * @param pRole + * This string MUST either contain a valid Property name or be + * null. It filters the Objects returned to contain + * only Objects associated to the source Object via an + * Association class in which the source Object plays the + * specified role. (i.e. the Property name in the Association + * class that refers to the source Object matches this + * value) If "Antecedent" is specified, then only Associations in + * which the source Object is the "Antecedent" reference are + * examined. + * @param pResultRole + * This string MUST either contain a valid Property name or be + * null. It filters the Objects returned to contain + * only Objects associated to the source Object via an + * Association class in which the Object returned plays + * the specified role. (i.e. the Property name in the Association + * class that refers to the Object returned matches this + * value) If "Dependent" is specified, then only Associations in + * which the Object returned is the "Dependent" reference are + * examined. + * @param pFilterQueryLanguage + * The pFilterQueryLanguage represents the query + * language for the pFilterQuery argument. This must + * be left null if a pFilterQuery is + * not supplied. If the implementation does not support the query + * language specified, the + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall + * be returned. If the implementation does not support filtered + * enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pFilterQuery + * The pFilterQuery specifies a query in the form of + * the query language specified by the + * pFilterQueryLanguage parameter. If this value is + * not null, the pFilterQueryLanguage + * parameter must be non-null. This value shall act + * as an additional filter on the result set. If the + * implementation does not support the query language specified, + * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error + * shall be returned. If the implementation does not support + * filtered enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pTimeout + * This input parameter determines the minimum time the CIM + * server shall maintain the open enumeration session after the + * last Open or Pull operation (unless the enumeration session is + * closed). If the operation timeout is exceeded, the + * implementation may close the enumeration session at any time, + * releasing any resources allocated to the enumeration session. + * A pTimeout of 0 means that there is no operation + * timeout. That is, the enumeration session is never closed + * based on time. If pTimeout is null, + * the implementation shall choose an operation timeout. All + * other values for pTimeout specify the operation + * timeout in seconds. A implementation may restrict the set of + * allowable values for pTimeout. Specifically, the + * implementation may not allow 0 (no timeout). If the specified + * value is not an allowable value, the implementation shall + * return failure with the status code + * CIM_ERR_INVALID_OPERATION_TIMEOUT. + * @param pContinueOnError + * If true, requests that the operation resume when + * an error is received. If a implementation does not support + * continuation on error and pContinueOnError is + * true, it shall throw a WBEMException + * with the status code + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a + * implementation supports continuation on error and + * pContinueOnError is true, the + * enumeration session shall remain open when a Pull operation + * fails, and any subsequent successful Pull operations shall + * return the set of elements that would have been returned if + * the failing Pull operations were successful. This behavior is + * subject to the consistency rules defined for pulled + * enumerations. If pContinueOnError is + * false, the enumeration session shall be closed + * when either the operation completes successfully or when a + * WBEMExcetpion is thrown. + * @param pMaxObjects + * Defines the maximum number of elements that this Open + * operation can return. The implementation may deliver any + * number of elements up to pMaxObjects but shall + * not deliver more than pMaxObjects elements. An + * implementation may choose to never return any elements during + * an Open operation, regardless of the value of + * pMaxObjects. Note that a CIM client can use a + * pMaxObjects value of 0 to specify that it does + * not want to retrieve any instances in the Open operation. + * @return The return value of a successful Open operation is an array of + * enumerated elements with a number of entries from 0 up to a + * maximum defined by pMaxObjects. These entries meet + * the criteria defined in the Open operation. Note that returning + * no entries in the array does not imply that the enumeration + * session is exhausted. Client must evaluate the + * EnumerateResponse.isEnd() to determine if there are + * more elements. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_OPERATION_TIMEOUT + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED + * CIM_ERR_INVALID_PARAMETER + * CIM_ERR_NOT_FOUND (the source instance was not found) + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED + * CIM_ERR_INVALID_QUERY + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public EnumerateResponse associatorPaths(CIMObjectPath pInstancePath, + String pAssociationClass, String pResultClass, String pRole, String pResultRole, + String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout, + boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException; + + /** + * associators shall start an enumeration session for + * traversing associations starting from the instance defined in the + * pInstancePath parameter using any specified filtering + * criteria and return zero or more CIMInstance objects. + * + * @param pInstancePath + * The CIMObjectPath for the instance for which the + * enumeration is to be performed. + * @param pAssociationClass + * This string MUST either contain a valid CIM Association class + * name or be null. It filters the Objects returned + * to contain only Objects associated to the source Object via + * this CIM Association class or one of its subclasses. + * @param pResultClass + * This string MUST either contain a valid CIM Class name or be + * null. It filters the Objects returned to contain + * only the Objects of this Class name or one of its subclasses. + * @param pRole + * This string MUST either contain a valid Property name or be + * null. It filters the Objects returned to contain + * only Objects associated to the source Object via an + * Association class in which the source Object plays the + * specified role. (i.e. the Property name in the Association + * class that refers to the source Object matches this + * value) If "Antecedent" is specified, then only Associations in + * which the source Object is the "Antecedent" reference are + * examined. + * @param pResultRole + * This string MUST either contain a valid Property name or be + * null. It filters the Objects returned to contain + * only Objects associated to the source Object via an + * Association class in which the Object returned plays + * the specified role. (i.e. the Property name in the Association + * class that refers to the Object returned matches this + * value) If "Dependent" is specified, then only Associations in + * which the Object returned is the "Dependent" reference are + * examined. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property. If true, the class origin + * attribute may be present for each property on all instances + * returned, even if requested the server may ignore the request + * and not return the class origin. If false, the + * class origin shall not be present. + * @param pPropertyList + * An array of property names used to filter what is contained in + * the Objects returned. Each CIMClass or + * CIMInstance returned only contains elements for + * the properties of the names specified. Duplicate and invalid + * property names are ignored and the request is otherwise + * processed normally. An empty array indicates that no + * properties should be included in the Objects returned. A + * null value indicates that all properties should + * be contained in the Objects returned. NOTE: Properties + * should not be specified in this parameter unless a non- + * null value is specified in the + * pResultClass parameter. + * @param pFilterQueryLanguage + * The pFilterQueryLanguage represents the query + * language for the pFilterQuery argument. This must + * be left null if a filterQuery is not supplied. If + * the implementation does not support the query language + * specified, the + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall + * be returned. If the implementation does not support filtered + * enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pFilterQuery + * The pFilterQuery specifies a query in the form of + * the query language specified by the + * pFilterQueryLanguage parameter. If this value is + * not null, the pFilterQueryLanguage + * parameter must be non-null. This value shall act + * as an additional filter on the result set. If the + * implementation does not support the query language specified, + * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error + * shall be returned. If the implementation does not support + * filtered enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pTimeout + * This input parameter determines the minimum time the CIM + * server shall maintain the open enumeration session after the + * last Open or Pull operation (unless the enumeration session is + * closed). If the operation timeout is exceeded, the + * implementation may close the enumeration session at any time, + * releasing any resources allocated to the enumeration session. + * A pTimeout of 0 means that there is no operation + * timeout. That is, the enumeration session is never closed + * based on time. If pTimeout is null, + * the implementation shall choose an operation timeout. All + * other values for pTimeout specify the operation + * timeout in seconds. A implementation may restrict the set of + * allowable values for pTimeout. Specifically, the + * implementation may not allow 0 (no timeout). If the specified + * value is not an allowable value, the implementation shall + * return failure with the status code + * CIM_ERR_INVALID_OPERATION_TIMEOUT. + * @param pContinueOnError + * If true, requests that the operation resume when + * an error is received. If a implementation does not support + * continuation on error and pContinueOnError is + * true, it shall throw a WBEMException + * with the status code + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a + * implementation supports continuation on error and + * pContinueOnError is true, the + * enumeration session shall remain open when a Pull operation + * fails, and any subsequent successful Pull operations shall + * return the set of elements that would have been returned if + * the failing Pull operations were successful. This behavior is + * subject to the consistency rules defined for pulled + * enumerations. If pContinueOnError is + * false, the enumeration session shall be closed + * when either the operation completes successfully or when a + * WBEMExcetpion is thrown. + * @param pMaxObjects + * Defines the maximum number of elements that this Open + * operation can return. The implementation may deliver any + * number of elements up to pMaxObjects but shall + * not deliver more than pMaxObjects elements. An + * implementation may choose to never return any elements during + * an Open operation, regardless of the value of + * pMaxObjects. Note that a CIM client can use a + * pMaxObjects value of 0 to specify that it does + * not want to retrieve any instances in the Open operation. + * @return The return value of a successful Open operation is an array of + * enumerated elements with a number of entries from 0 up to a + * maximum defined by pMaxObjects. These entries meet + * the criteria defined in the Open operation. Note that returning + * no entries in the array does not imply that the enumeration + * session is exhausted. Client must evaluate the + * EnumerateResponse.isEnd() to determine if there are + * more elements. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_OPERATION_TIMEOUT + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED + * CIM_ERR_INVALID_PARAMETER + * CIM_ERR_NOT_FOUND (The source instance was not found) + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED + * CIM_ERR_INVALID_QUERY + * CIM_ERR_FAILED (Some other unspecified error occurred) + * + */ + public EnumerateResponse associators(CIMObjectPath pInstancePath, + String pAssociationClass, String pResultClass, String pRole, String pResultRole, + boolean pIncludeClassOrigin, String[] pPropertyList, String pFilterQueryLanguage, + String pFilterQuery, UnsignedInteger32 pTimeout, boolean pContinueOnError, + UnsignedInteger32 pMaxObjects) throws WBEMException; + + /** + * Closes the WBEMClient session. + */ + public void close(); + + /** + * closeEnumeration shall close an enumeration session that has + * been previously started but not yet completed. Clients should always use + * this method when an enumeration session has been started and the client + * does not retrieve all the results. If a client has started an enumeration + * session and retrieves all the results until the + * EnumerationResponse.isEnd() is true, this method shall not + * be called. + * + * @param pPath + * The CIMObjectPath representing the namespace to + * be used. + * @param pContext + * The enumeration context to close. + * @throws WBEMException + */ + public void closeEnumeration(CIMObjectPath pPath, String pContext) throws WBEMException; + + /** + * Create a CIM class. The namespace from the + * CIMClass.getObjectPath() shall be used. + * + * @param pClass + * The CIMClass to be created. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_ALREADY_EXISTS (the CIM Class already exists) + * CIM_ERR_INVALID_SUPERCLASS (the putative CIM Class declares a + * non-existent superclass) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public void createClass(CIMClass pClass) throws WBEMException; + + /** + * Create a CIM Instance. The namespace from the + * CIMInstance.getObjectPath() shall be used. The keys of the + * CIMInstance may be modified by the implementation and the + * client must use the returned object path to determine the name of the + * instance. It is possible for a client to leave keys of instances empty/ + * null and the provider can fill them in. This is + * implementation specific unless specified by a CIM Schema or in a DMTF + * Profile. + * + * @param pInstance + * The CIMInstance to be created. + * @return CIMObjectPath of the instance created. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED (provider does not support this method) + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (for this method) + * CIM_ERR_INVALID_CLASS (in this namespace) + * CIM_ERR_ALREADY_EXISTS + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CIMObjectPath createInstance(CIMInstance pInstance) throws WBEMException; + + /** + * Deletes the CIM class for the object specified by the CIM object path. + * + * @param pPath + * The CIMObjectPath identifying the namespace and + * class name to delete. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_NOT_FOUND (the CIM Class to be deleted does not exist) + * CIM_ERR_CLASS_HAS_CHILDREN (the CIM Class has one or more subclasses + * which cannot be deleted) + * CIM_ERR_CLASS_HAS_INSTANCES (the CIM Class has one or more instances + * which cannot be deleted) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public void deleteClass(CIMObjectPath pPath) throws WBEMException; + + /** + * Delete the CIM instance specified by the CIM object path. + * + * @param pPath + * The object path of the instance to be deleted. It must include + * all of the keys. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED (provider does not support this method) + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (for this method) + * CIM_ERR_INVALID_CLASS (in this namespace) + * CIM_ERR_NOT_FOUND (if the instance does not exist) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public void deleteInstance(CIMObjectPath pPath) throws WBEMException; + + /** + * Delete a CIM Qualifier type. + * + * @param pPath + * The CIMObjectPath identifying the name and + * namespace of the CIM qualifier type to delete. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (for this method) + * CIM_ERR_NOT_FOUND (the Qualifier did not exist) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public void deleteQualifierType(CIMObjectPath pPath) throws WBEMException; + + /** + * Enumerate CIM Classes. + * + * @param pPath + * The object path of the class to be enumerated. Only the + * namespace and object name should be populated. If the object + * name is set to an empty string (i.e. ""), then all base + * classes in the target namespace are returned. + * @param pDeep + * If true, the classes returned shall include + * subclasses. If false, the classes returned shall + * not include subclasses. + * @param pLocalOnly + * If true, only elements (properties, methods and + * qualifiers) defined in, or overridden in the class are + * included in the response. If false, all elements + * of the class definition are returned. + * @param pIncludeQualifiers + * If true, all Qualifiers for each Class and its + * elements (properties, methods, references) are included. If + * false, no Qualifiers are present in the classes + * returned. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property or method. If true, the + * class origin attribute shall be present for each property and + * method on all returned CIMClasses. If + * false, the class origin shall not be present. + * @return A CloseableIterator of CIMClasses. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_INVALID_CLASS (the CIM Class that is the basis for this + * enumeration does not exist) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CloseableIterator enumerateClasses(CIMObjectPath pPath, boolean pDeep, + boolean pLocalOnly, boolean pIncludeQualifiers, boolean pIncludeClassOrigin) + throws WBEMException; + + /** + * Enumerate the names of CIM Classes. + * + * @param pPath + * The CIMObjectPath identifying the class to be + * enumerated. If the class name in the object path specified is + * an empty string (i.e. ""), all base classes in the target + * namespace are returned. Note that only the namespace and the + * name components should be populated. + * @param pDeep + * If true, the enumeration returned shall contain + * the names of all classes derived from the class being + * enumerated. If false, the enumeration returned + * contains only the names of the first level children of the + * class. + * @return A CloseableIterator of CIMObjectPaths. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_INVALID_CLASS (the CIM Class that is the basis for this + * enumeration does not exist) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CloseableIterator enumerateClassNames(CIMObjectPath pPath, boolean pDeep) + throws WBEMException; + + /** + * Enumerate the names of the instances for a specified class. The names of + * all subclass instances are returned. + * + * @param pPath + * The CIMObjectPath identifying the class whose + * instances are to be enumerated. Only the namespace and class + * name components are used. All other information (e.g. Keys) is + * ignored. + * @return CloseabelIterator of CIMObjectPaths. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED (provider does not support this method) + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (for this method) + * CIM_ERR_INVALID_CLASS (in this namespace) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CloseableIterator enumerateInstanceNames(CIMObjectPath pPath) + throws WBEMException; + + /** + * enumerateInstancePaths shall enumerate the instances of the + * specified class in pClassPath and return zero or more + * CIMObjectPaths. + * + * @param pClassPath + * The CIMObjectPath for the class for which the + * enumeration is to be performed. + * @param pFilterQueryLanguage + * The pFilterQueryLanguage represents the query + * language for the pFilterQuery argument. This must + * be left null if a pFilterQuery is + * not supplied. If the implementation does not support the query + * language specified, the + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall + * be returned. If the implementation does not support filtered + * enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pFilterQuery + * The pFilterQuery specifies a query in the form of + * the query language specified by the + * pFilterQueryLanguage parameter. If this value is + * not null, the pFilterQueryLanguage + * parameter must be non-null. This value shall act + * as an additional filter on the result set. If the + * implementation does not support the query language specified, + * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error + * shall be returned. If the implementation does not support + * filtered enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pTimeout + * This input parameter determines the minimum time the CIM + * server shall maintain the open enumeration session after the + * last Open or Pull operation (unless the enumeration session is + * closed). If the operation timeout is exceeded, the + * implementation may close the enumeration session at any time, + * releasing any resources allocated to the enumeration session. + * A pTimeout of 0 means that there is no operation + * timeout. That is, the enumeration session is never closed + * based on time. If pTimeout is null, + * the implementation shall choose an operation timeout. All + * other values for pTimeout specify the operation + * timeout in seconds. A implementation may restrict the set of + * allowable values for pTimeout. Specifically, the + * implementation may not allow 0 (no timeout). If the specified + * value is not an allowable value, the implementation shall + * return failure with the status code + * CIM_ERR_INVALID_OPERATION_TIMEOUT. + * @param pContinueOnError + * If true, requests that the operation resume when + * an error is received. If a implementation does not support + * continuation on error and pContinueOnError is + * true, it shall throw a WBEMException + * with the status code + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a + * implementation supports continuation on error and + * pContinueOnError is true, the + * enumeration session shall remain open when a Pull operation + * fails, and any subsequent successful Pull operations shall + * return the set of elements that would have been returned if + * the failing Pull operations were successful. This behavior is + * subject to the consistency rules defined for pulled + * enumerations. If pContinueOnError is + * false, the enumeration session shall be closed + * when either the operation completes successfully or when a + * WBEMExcetpion is thrown. + * @param pMaxObjects + * Defines the maximum number of elements that this Open + * operation can return. The implementation may deliver any + * number of elements up to pMaxObjects but shall + * not deliver more than pMaxObjects elements. An + * implementation may choose to never return any elements during + * an Open operation, regardless of the value of + * pMaxObjects. Note that a CIM client can use a + * pMaxObjects value of 0 to specify that it does + * not want to retrieve any instances in the Open operation. + * @return The return value of a successful Open operation is an array of + * enumerated elements with a number of entries from 0 up to a + * maximum defined by pMaxObjects. These entries meet + * the criteria defined in the Open operation. Note that returning + * no entries in the array does not imply that the enumeration + * session is exhausted. Client must evaluate the + * EnumerateResponse.isEnd() to determine if there are + * more elements. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_OPERATION_TIMEOUT + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED + * CIM_ERR_INVALID_PARAMETER + * CIM_ERR_INVALID_CLASS (the source class does not exist) + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED + * CIM_ERR_INVALID_QUERY + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public EnumerateResponse enumerateInstancePaths(CIMObjectPath pClassPath, + String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout, + boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException; + + /** + * Enumerate the instances of a class. The instances of all subclasses are + * also returned. + * + * @param pPath + * The object path of the class to be enumerated. Only the + * namespace and class name components are used. Any other + * information (e.g. Keys) is ignored. + * @param pDeep + * If true, this specifies that, for each returned + * Instance of the Class, all properties of the Instance must be + * present (subject to constraints imposed by the other + * parameters), including any which were added by subclassing the + * specified Class. If false, each returned Instance + * includes only properties defined for the specified Class in + * path. + * @param pLocalOnly + * If true, only properties that were instantiated + * in the instance are returned. WBEM Servers may ignore this + * parameter and return all properties. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property. If true, the class origin + * attribute may be present for each property on all returned + * CIMInstances, even if requested the server may ignore the + * request and not return the class origin. If false + * , the class origin shall not be present. + * @param pPropertyList + * An array of property names used to filter what is contained in + * the instances returned. Each instance returned only contains + * elements for the properties of the names specified. Duplicate + * and invalid property names are ignored and the request is + * otherwise processed normally. An empty array indicates that no + * properties should be returned. A null value indicates + * that all properties should be returned. + * @return A CloseableIterator of CIMInstances. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (for this method) + * CIM_ERR_INVALID_CLASS (in this namespace) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CloseableIterator enumerateInstances(CIMObjectPath pPath, boolean pDeep, + boolean pLocalOnly, boolean pIncludeClassOrigin, String[] pPropertyList) + throws WBEMException; + + /** + * enumerateInstances shall enumerate the instances of the + * specified class in pClassPath and return zero or more + * CIMInstances. + * + * @param pClassPath + * The CIMObjectPath for the class for which the + * enumeration is to be performed. + * @param pDeepInheritance + * If true, this specifies that, for each returned + * Instance of the Class, all properties of the Instance must be + * present (subject to constraints imposed by the other + * parameters), including any which were added by subclassing the + * specified Class. If false, each returned Instance + * includes only properties defined for the specified Class in + * path. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property. If true, the class origin + * attribute may be present for each property on all instances + * returned, even if requested the server may ignore the request + * and not return the class origin. If false, the + * class origin shall not be present. + * @param pPropertyList + * An array of property names used to filter what is contained in + * the Objects returned. Each CIMInstance returned + * only contains elements for the properties of the names + * specified. Duplicate and invalid property names are ignored + * and the request is otherwise processed normally. An empty + * array indicates that no properties should be included in the + * Objects returned. A null value indicates that all + * properties should be contained in the Objects returned. + * @param pFilterQueryLanguage + * The pFilterQueryLanguage represents the query + * language for the pFilterQuery argument. This must + * be left null if a pFilterQuery is + * not supplied. If the implementation does not support the query + * language specified, the + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall + * be returned. If the implementation does not support filtered + * enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pFilterQuery + * The pFilterQuery specifies a query in the form of + * the query language specified by the + * pFilterQueryLanguage parameter. If this value is + * not null, the pFilterQueryLanguage + * parameter must be non-null. This value shall act + * as an additional filter on the result set. If the + * implementation does not support the query language specified, + * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error + * shall be returned. If the implementation does not support + * filtered enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pTimeout + * This input parameter determines the minimum time the CIM + * server shall maintain the open enumeration session after the + * last Open or Pull operation (unless the enumeration session is + * closed). If the operation timeout is exceeded, the + * implementation may close the enumeration session at any time, + * releasing any resources allocated to the enumeration session. + * A pTimeout of 0 means that there is no operation + * timeout. That is, the enumeration session is never closed + * based on time. If pTimeout is null, + * the implementation shall choose an operation timeout. All + * other values for pTimeout specify the operation + * timeout in seconds. A implementation may restrict the set of + * allowable values for pTimeout. Specifically, the + * implementation may not allow 0 (no timeout). If the specified + * value is not an allowable value, the implementation shall + * return failure with the status code + * CIM_ERR_INVALID_OPERATION_TIMEOUT. + * @param pContinueOnError + * If true, requests that the operation resume when + * an error is received. If a implementation does not support + * continuation on error and pContinueOnError is + * true, it shall throw a WBEMException + * with the status code + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a + * implementation supports continuation on error and + * pContinueOnError is true, the + * enumeration session shall remain open when a Pull operation + * fails, and any subsequent successful Pull operations shall + * return the set of elements that would have been returned if + * the failing Pull operations were successful. This behavior is + * subject to the consistency rules defined for pulled + * enumerations. If pContinueOnError is + * false, the enumeration session shall be closed + * when either the operation completes successfully or when a + * WBEMExcetpion is thrown. + * @param pMaxObjects + * Defines the maximum number of elements that this Open + * operation can return. The implementation may deliver any + * number of elements up to pMaxObjects but shall + * not deliver more than pMaxObjects elements. An + * implementation may choose to never return any elements during + * an Open operation, regardless of the value of + * pMaxObjects. Note that a CIM client can use a + * pMaxObjects value of 0 to specify that it does + * not want to retrieve any instances in the Open operation. + * @return The return value of a successful Open operation is an array of + * enumerated elements with a number of entries from 0 up to a + * maximum defined by pMaxObjects. These entries meet + * the criteria defined in the Open operation. Note that returning + * no entries in the array does not imply that the enumeration + * session is exhausted. Client must evaluate the + * EnumerateResponse.isEnd() to determine if there are + * more elements. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_OPERATION_TIMEOUT + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED + * CIM_ERR_INVALID_PARAMETER + * CIM_ERR_INVALID_CLASS (the source class does not exist) + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED + * CIM_ERR_INVALID_QUERY + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public EnumerateResponse enumerateInstances(CIMObjectPath pClassPath, + boolean pDeepInheritance, boolean pIncludeClassOrigin, String[] pPropertyList, + String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout, + boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException; + + /** + * Enumerates the CIM Qualifier types for a specific namespace. + * + * @param pPath + * The CIMObjectPath identifying the namespace whose + * qualifier types are to be enumerated. + * @return A CloseableIterator of CIMQualifierType + * s. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CloseableIterator> enumerateQualifierTypes(CIMObjectPath pPath) + throws WBEMException; + + /** + * enumerationCount provides an estimated count of the total + * number of objects in an open enumeration session represented by an + * enumeration context. + * + * @param pPath + * The namespace for the enumeration context. + * @param pEnumerationContext + * The enumeration context to count. + * @return The estimated number of objects. + * @throws UnsupportedOperationException + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER + * CIM_ERR_INVALID_ENUMERATION_CONTEXT + * CIM_ERR_SERVER_LIMITS_EXCEEDED + * CIM_ERR_FAILED + * + * + */ + public UnsignedInteger64 enumerationCount(CIMObjectPath pPath, String pEnumerationContext) + throws WBEMException; + + /** + * execQuery shall execute a query to retrieve objects. + * + * @param pPath + * CIMObjectPath identifying the class to query. + * Only the namespace and class name components are used. All + * other information (e.g. Keys) is ignored. + * @param pQuery + * A string containing the text of the query. + * @param pQueryLanguage + * A string that identifies the query language to use to parse + * the query string specified. + * @return A CloseableIterator of CIMInstances. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED (provider does not support this method) + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED (the requested query language + * is not recognized) + * CIM_ERR_INVALID_QUERY (the query is not a valid query in the specified + * query language) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CloseableIterator execQuery(CIMObjectPath pPath, String pQuery, + String pQueryLanguage) throws WBEMException; + + /** + * execQueryInstances shall execute a query to retrieve + * instances. + * + * @param pObjectName + * The CIMObjectPath representing the namespace to + * be used. + * @param pFilterQuery + * The pFilterQuery specifies a query in the form of + * the query language specified by the + * pFilterQueryLanguage parameter. If this value is + * not null, the pFilterQueryLanguage + * parameter must be non-null. This value shall act + * as an additional filter on the result set. If the + * implementation does not support the query language specified, + * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error + * shall be returned. If the implementation does not support + * filtered enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pFilterQueryLanguage + * The pFilterQueryLanguage represents the query + * language for the pFilterQuery argument. This must + * be left null if a pFilterQuery is + * not supplied. If the implementation does not support the query + * language specified, the + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall + * be returned. If the implementation does not support filtered + * enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pReturnQueryResultClass + * The pReturnQueryResultClass controls whether a + * class definition is returned in pQueryResultClass + * . If it is set to false, + * pQueryResultClass shall be set to + * null on output. If it is set to true + * , the value of the pQueryResultClass on output + * shall be a class definition that defines the properties + * (columns) of each row of the query result. + * @param pTimeout + * This input parameter determines the minimum time the CIM + * server shall maintain the open enumeration session after the + * last Open or Pull operation (unless the enumeration session is + * closed). If the operation timeout is exceeded, the + * implementation may close the enumeration session at any time, + * releasing any resources allocated to the enumeration session. + * A pTimeout of 0 means that there is no operation + * timeout. That is, the enumeration session is never closed + * based on time. If pTimeout is null, + * the implementation shall choose an operation timeout. All + * other values for pTimeout specify the operation + * timeout in seconds. A implementation may restrict the set of + * allowable values for pTimeout. Specifically, the + * implementation may not allow 0 (no timeout). If the specified + * value is not an allowable value, the implementation shall + * return failure with the status code + * CIM_ERR_INVALID_OPERATION_TIMEOUT. + * @param pContinueOnError + * If true, requests that the operation resume when + * an error is received. If a implementation does not support + * continuation on error and pContinueOnError is + * true, it shall throw a WBEMException + * with the status code + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a + * implementation supports continuation on error and + * pContinueOnError is true, the + * enumeration session shall remain open when a Pull operation + * fails, and any subsequent successful Pull operations shall + * return the set of elements that would have been returned if + * the failing Pull operations were successful. This behavior is + * subject to the consistency rules defined for pulled + * enumerations. If pContinueOnError is + * false, the enumeration session shall be closed + * when either the operation completes successfully or when a + * WBEMExcetpion is thrown. + * @param pMaxObjects + * Defines the maximum number of elements that this Open + * operation can return. The implementation may deliver any + * number of elements up to pMaxObjects but shall + * not deliver more than pMaxObjects elements. An + * implementation may choose to never return any elements during + * an Open operation, regardless of the value of + * pMaxObjects. Note that a CIM client can use a + * pMaxObjects value of 0 to specify that it does + * not want to retrieve any instances in the Open operation. + * @param pQueryResultClass + * The pQueryResultClass is an output argument. It + * shall be null if the + * pReturnQueryResultClass input parameter is set to + * false. Otherwise, it shall return a class + * definition where each property of the class corresponds to one + * entry of the query select list. The class definition + * corresponds to one row of the query result. The class name of + * this returned class shall be "CIM_QueryResult". This class + * definition is valid only in the context of this enumeration. + * @return The return value of a successful Open operation is an array of + * enumerated elements with a number of entries from 0 up to a + * maximum defined by pMaxObjects. These entries meet + * the criteria defined in the Open operation. Note that returning + * no entries in the array does not imply that the enumeration + * session is exhausted. Client must evaluate the + * EnumerateResponse.isEnd() to determine if there are + * more elements. + * @throws UnsupportedOperationException + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_OPERATION_TIMEOUT + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED (the requested filter query + * language is not recognized) + * CIM_ERR_INVALID_QUERY (the filter query is not a valid query in the + * specified filter query language) + * CIM_ERR_QUERY_FEATURE_NOT_SUPPORTED (the query requires support for + * features that are not supported) + * CIM_ERR_FAILED (Some other unspecified error occurred) + * + */ + public EnumerateResponse execQueryInstances(CIMObjectPath pObjectName, + String pFilterQuery, String pFilterQueryLanguage, boolean pReturnQueryResultClass, + UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects, + CIMClass pQueryResultClass) throws WBEMException; + + /** + * Returns the CIMClass for the specified + * CIMObjectPath. + * + * @param pName + * The object path of the class to be returned. Only the name + * space and class name components are used. All other + * information (e.g. keys) is ignored. + * @param pLocalOnly + * If true, only elements (properties, methods, + * references) overridden or defined in the class are included in + * the CIMClassreturned. If false, all + * elements of the class definition are returned. + * @param pIncludeQualifiers + * If true, all Qualifiers for the class and its + * elements are included in the CIMClass returned. + * If false, no Qualifier information is contained + * in the CIMClass returned. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property or method. If true, the + * class origin attribute shall be present for each property and + * method on all returned CIMClasses. If + * false, the class origin shall not be present. + * @param pPropertyList + * An array of property names used to filter what is contained in + * the CIMClass returned. The CIMClass + * returned only contains elements for the properties of the + * names specified. Duplicate and invalid property names are + * ignored and the request is otherwise processed normally. An + * empty array indicates that no properties should be returned. A + * null value indicates that all properties should + * be returned. + * @return CIMClass meeting the criteria specified. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_NOT_FOUND (the requested CIM Class does not exist in the + * specified namespace) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CIMClass getClass(CIMObjectPath pName, boolean pLocalOnly, boolean pIncludeQualifiers, + boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException; + + /** + * Get a CIMInstance. + * + * @param pName + * The object path of the instance to be returned. The Keys in + * this CIMObjectPath must be populated. + * @param pLocalOnly + * If true, only properties overridden or defined in + * the class are included in the CIMInstance + * returned. If false, all properties of the class + * definition are returned. WBEM Servers may ignore this + * parameter and return all properties. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property. If true, the class origin + * attribute may be present for each property of the + * CIMInstance, even if requested the server may + * ignore the request and not return the class origin. If + * false, the class origin shall not be present. + * @param pPropertyList + * An array of property names used to filter what is contained in + * the CIMClass returned. The CIMClass + * returned only contains elements for the properties of the + * names specified. Duplicate and invalid property names are + * ignored and the request is otherwise processed normally. An + * empty array indicates that no properties should be returned. A + * null value indicates that all properties should + * be returned. + * @return CIMInstance identified by the + * CIMObjectPath specified. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED (provider does not support this method) + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (for this method) + * CIM_ERR_INVALID_CLASS (in this namespace) + * CIM_ERR_NOT_FOUND (if instance does not exist) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CIMInstance getInstance(CIMObjectPath pName, boolean pLocalOnly, + boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException; + + /** + * getInstancePaths shall get the CIMObjectPaths + * using an enumeration context. + * + * @param pPath + * The CIMObjectPath representing the namespace to + * be used. + * @param pContext + * The enumeration context value for the enumeration session to + * be used. + * @param pMaxObjects + * Defines the maximum number of elements that this Open + * operation can return. The implementation may deliver any + * number of elements up to pMaxObjects but shall + * not deliver more than pMaxObjects elements. An + * implementation may choose to never return any elements during + * an Open operation, regardless of the value of + * pMaxObjects. + * @return EnumerateResponse that includes zero or more + * CIMObjectPath objects. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER + * CIM_ERR_INVALID_ENUMERATION_CONTEXT + * CIM_ERR_SERVER_LIMITS_EXCEEDED + * CIM_ERR_PULL_HAS_BEEN_ABANDONED + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public EnumerateResponse getInstancePaths(CIMObjectPath pPath, String pContext, + UnsignedInteger32 pMaxObjects) throws WBEMException; + + /** + * getInstances shall get the instances from an enumeration + * session started by execQueryInstances. + * + * @param pPath + * The CIMObjectPath representing the namespace to + * be used. + * @param pContext + * The enumeration context value for the enumeration session to + * be used. + * @param pMaxObjects + * Defines the maximum number of elements that this Open + * operation can return. The implementation may deliver any + * number of elements up to pMaxObjects but shall + * not deliver more than pMaxObjects elements. An + * implementation may choose to never return any elements during + * an Open operation, regardless of the value of + * pMaxObjects. Note that a CIM client can use a + * pMaxObjects value of 0 to specify that it does + * not want to retrieve any instances in the Open operation. + * @return EnumerateResponse that includes zero or more + * CIMObjectPath objects. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER + * CIM_ERR_INVALID_ENUMERATION_CONTEXT + * CIM_ERR_SERVER_LIMITS_EXCEEDED + * CIM_ERR_PULL_HAS_BEEN_ABANDONED + * CIM_ERR_FAILED + * + */ + public EnumerateResponse getInstances(CIMObjectPath pPath, String pContext, + UnsignedInteger32 pMaxObjects) throws WBEMException; + + /** + * getInstancesWithPath shall use the enumeration context + * provided to get the next set of instances for the enumeration session. + * + * @param pPath + * The CIMObjectPath representing the namespace to + * be used. + * @param pContext + * The enumeration context value for the enumeration session to + * be used. + * @param pMaxObjects + * Defines the maximum number of elements that this Open + * operation can return. The implementation may deliver any + * number of elements up to pMaxObjects but shall + * not deliver more than pMaxObjects elements. An + * implementation may choose to never return any elements during + * an Open operation, regardless of the value of + * pMaxObjects. + * @return EnumerateResponse that includes zero or more + * CIMObjectPath. objects. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER + * CIM_ERR_INVALID_ENUMERATION_CONTEXT + * CIM_ERR_SERVER_LIMITS_EXCEEDED + * CIM_ERR_PULL_HAS_BEEN_ABANDONED + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public EnumerateResponse getInstancesWithPath(CIMObjectPath pPath, + String pContext, UnsignedInteger32 pMaxObjects) throws WBEMException; + + /** + * Get property values. See WBEMClientConstants for a list of + * standard properties. + * + * @param pKey + * The name of the property. + * @return The value of the property. + * @see WBEMClientConstants + */ + public String getProperty(String pKey); + + /** + * Get a CIMQualifierType. + * + * @param pName + * CIMObjectPath that identifies the + * CIMQualifierType to return. + * @return The CIMQualifierType object. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_NOT_FOUND (the requested Qualifier declaration did not exist) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CIMQualifierType getQualifierType(CIMObjectPath pName) throws WBEMException; + + /** + * Initialize the client connection. This must be called before any + * operations. This must only be called once. + * + * @param pName + * The protocol and host to use (e.g. http://192.168.1.128/). Any + * other fields shall be ignored. + * @param pSubject + * The principal/credential pairs for this connection. + * @param pLocales + * An array of locales in order of priority of preference. + * @throws IllegalArgumentException + * If the host or scheme portion of the object path is null, or + * if the protocol is not supported. + * @throws WBEMException + * If the protocol adapter or security cannot be initialized. + */ + public void initialize(CIMObjectPath pName, Subject pSubject, Locale[] pLocales) + throws IllegalArgumentException, WBEMException; + + /** + * Executes the specified method on the specified object. + * + * @param pName + * CIM object path of the object whose method must be invoked. It + * must include all of the keys. + * @param pMethodName + * The name of the method to be invoked. + * @param pInputArguments + * The CIMArgument array of method input parameters. + *

      + * @param pOutputArguments + * The CIMArgument array of method output + * parameters. The array should be allocated large enough to hold + * all returned parameters. + * @return The return value of the specified method. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED (implementation DOES NOT support ANY + * Extrinsic Method Invocation) + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (for this method) + * CIM_ERR_NOT_FOUND (if instance does not exist) + * CIM_ERR_METHOD_NOT_FOUND + * CIM_ERR_METHOD_NOT_AVAILABLE + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public Object invokeMethod(CIMObjectPath pName, String pMethodName, + CIMArgument[] pInputArguments, CIMArgument[] pOutputArguments) + throws WBEMException; + + /** + * Modify the CIMClass. + * + * @param pClass + * CIMClass to be modified. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_INVALID_SUPERCLASS (the putative CIM Class declares a + * non-existent superclass) + * CIM_ERR_CLASS_HAS_CHILDREN (the modification could not be performed + * because it was not possible to update the subclasses of the Class + * in a consistent fashion) + * CIM_ERR_CLASS_HAS_INSTANCES (the modification could not be performed + * because it was not possible to update the instances of the Class in + * a consistent fashion) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public void modifyClass(CIMClass pClass) throws WBEMException; + + /** + * Modify some or all of the properties of the specified + * CIMInstance. + * + * @param pInstance + * CIMInstance to be modified. All Keys must be + * populated. + * @param pPropertyList + * An array of property names used to specify which values from + * the CIMInstance specified to set. Properties not + * specified in this list but set in the CIMInstance + * specified are not modified. Duplicate property names are + * ignored and the request is otherwise processed normally. If + * the pPropertyList contains invalid property names + * for the instance to be modified, the server shall reject the + * request. An empty array indicates that no properties should be + * modified. A null value indicates that all + * properties should be modified. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED (provider does not support this method) + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (for this method) + * CIM_ERR_INVALID_CLASS (in this namespace) + * CIM_ERR_NOT_FOUND (if instance does not exist) + * CIM_ERR_NO_SUCH_PROPERTY (in this instance) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public void modifyInstance(CIMInstance pInstance, String[] pPropertyList) throws WBEMException; + + /** + * Enumerates the Association classes that refer to a specified source CIM + * Class. + * + * @param pObjectName + * CIMObjectPath defining the source CIM class whose + * referring classes are to be returned. pObjectName + * shall contain the scheme, host, namespace and object name + * (class name). + * @param pResultClass + * This string shall either contain a valid CIM Class name or be + * null. The pResultClass filters the + * classes returned to contain only the classes of this Class + * name or one of its subclasses. + * @param pRole + * This string MUST either contain a valid Property name or be + * null. It filters the Objects returned to contain + * only Objects referring to the source Object via a Property + * with the specified name. If "Antecedent" is specified, then + * only Associations in which the source Object is the + * "Antecedent" reference are returned. + * @param pIncludeQualifiers + * If true, all Qualifiers for each Object + * (including Qualifiers on the Object and on any returned + * Properties) shall be included in the classes returned. If + * false, no Qualifiers shall be present in each + * class returned. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property or method. If true, the + * class Origin attribute shall be present for each property and + * method on all classes returned. If false, the + * class origin shall not be present. + * @param pPropertyList + * An array of property names used to filter what is contained in + * the Objects returned. Each CIMClass returned + * shall only contains elements for the properties of the names + * specified. Duplicate and invalid property names are ignored + * and the request is otherwise processed normally. An empty + * array indicates that no properties should be included in the + * classes returned. A null value indicates that all + * properties should be contained in the classes returned. + * @return If successful, a CloseableIterator referencing zero + * or more CIMClasses meeting the specified criteria. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes shall be + * returned along with zero or more instance of + * CIM_Error. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + + CloseableIterator referenceClasses(CIMObjectPath pObjectName, String pResultClass, + String pRole, boolean pIncludeQualifiers, boolean pIncludeClassOrigin, + String[] pPropertyList) throws WBEMException; + + /** + * Enumerates the Association instances that refer to a specified source CIM + * Instance. + * + * @param pObjectName + * CIMObjectPath defining the source CIM Instance + * whose referring instances are to be returned. The + * pObjectName shall include the host, object name + * and keys. + * @param pResultClass + * This string shall either contain a valid CIM Class name or be + * null. It filters the instances returned to + * contain only the instances of this Class name or one of its + * subclasses. + * @param pRole + * This string shall either contain a valid Property name or be + * null. The role filters the instances returned to + * contain only instances referring to the source instance via a + * property with the specified name. For example, If "Antecedent" + * is specified, then only Associations in which the source + * instance is the "Antecedent" reference are returned. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property. If true, the class origin + * attribute may be present for each property and on all + * instances returned, even if requested the server may ignore + * the request and not return the class origin. If + * false, the class origin shall not be present. + * @param pPropertyList + * An array of property names used to filter what is contained in + * the instances returned. Each CIMInstance returned + * shall only contain elements for the properties of the names + * specified. Duplicate and invalid property names are ignored + * and the request is otherwise processed normally. An empty + * array indicates that no properties should be included in the + * instances returned. A null value indicates that + * all properties supported shall be contained in the instance + * returned. + * @return If successful, a CloseableIterator referencing zero + * or more CIMInstances meeting the specified criteria. + * @throws WBEMException + * If unsuccessful, one of the following status codes shall be + * returned along with zero or more CIM_Error + * instances. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + CloseableIterator referenceInstances(CIMObjectPath pObjectName, + String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList) + throws WBEMException; + + /** + * Enumerates the CIMObjectPaths of Association Objects that + * refer to a particular source CIM Object. If the source Object is a CIM + * Class, then a CloseableIterator of + * CIMObjectPaths of the Association classes that refer to the + * source Object is returned. If the source Object is a CIM Instance, then a + * CloseableIterator of CIMObjectPaths of the + * CIMInstance objects that refer to the source Object is + * returned. + * + * @param pObjectName + * CIMObjectPath defining the source CIM Object + * whose referring Objects are to be returned. This argument may + * contain either a Class name or the modelpath of an Instance. + * (i.e. Keys populated) + * @param pResultClass + * This string MUST either contain a valid CIM Class name or be + * null. It filters the Objects returned to contain + * only the Objects of this Class name or one of its subclasses. + * @param pRole + * This string MUST either contain a valid Property name or be + * null. It filters the Objects returned to contain + * only Objects referring to the source Object via a Property + * with the specified name. If "Antecedent" is specified, then + * only Associations in which the source Object is the + * "Antecedent" reference are returned. + * @return If successful, a CloseableIterator referencing zero + * or more CIMObjectPaths of CIMClasses or + * CIMInstances meeting the specified criteria. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public CloseableIterator referenceNames(CIMObjectPath pObjectName, + String pResultClass, String pRole) throws WBEMException; + + /** + * referencePaths shall start an enumeration session for + * association instances that have references that refer to the instance + * defined in the pInstancePath parameter and return zero or + * more CIMObjectPath objects. + * + * @param pInstancePath + * The CIMObjectPath for the instance for which the + * enumeration is to be performed. + * @param pResultClass + * This string MUST either contain a valid CIM Class name or be + * null. It filters the Objects returned to contain + * only the Objects of this Class name or one of its subclasses. + * @param pRole + * This string MUST either contain a valid Property name or be + * null. It filters the Objects returned to contain + * only Objects referring to the source Object via a Property + * with the specified name. If "Antecedent" is specified, then + * only Associations in which the source Object is the + * "Antecedent" reference are returned. + * @param pFilterQueryLanguage + * The pFilterQueryLanguage represents the query + * language for the pFilterQuery argument. This must + * be left null if a pFilterQuery is + * not supplied. If the implementation does not support the query + * language specified, the + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall + * be returned. If the implementation does not support filtered + * enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pFilterQuery + * The pFilterQuery specifies a query in the form of + * the query language specified by the + * pFilterQueryLanguage parameter. If this value is + * not null, the pFilterQueryLanguage + * parameter must be non-null. This value shall act + * as an additional filter on the result set. If the + * implementation does not support the query language specified, + * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error + * shall be returned. If the implementation does not support + * filtered enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pTimeout + * This input parameter determines the minimum time the CIM + * server shall maintain the open enumeration session after the + * last Open or Pull operation (unless the enumeration session is + * closed). If the operation timeout is exceeded, the + * implementation may close the enumeration session at any time, + * releasing any resources allocated to the enumeration session. + * A pTimeout of 0 means that there is no operation + * timeout. That is, the enumeration session is never closed + * based on time. If pTimeout is null, + * the implementation shall choose an operation timeout. All + * other values for pTimeout specify the operation + * timeout in seconds. A implementation may restrict the set of + * allowable values for pTimeout. Specifically, the + * implementation may not allow 0 (no timeout). If the specified + * value is not an allowable value, the implementation shall + * return failure with the status code + * CIM_ERR_INVALID_OPERATION_TIMEOUT. + * @param pContinueOnError + * If true, requests that the operation resume when + * an error is received. If a implementation does not support + * continuation on error and pContinueOnError is + * true, it shall throw a WBEMException + * with the status code + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a + * implementation supports continuation on error and + * pContinueOnError is true, the + * enumeration session shall remain open when a Pull operation + * fails, and any subsequent successful Pull operations shall + * return the set of elements that would have been returned if + * the failing Pull operations were successful. This behavior is + * subject to the consistency rules defined for pulled + * enumerations. If pContinueOnError is + * false, the enumeration session shall be closed + * when either the operation completes successfully or when a + * WBEMExcetpion is thrown. + * @param pMaxObjects + * Defines the maximum number of elements that this Open + * operation can return. The implementation may deliver any + * number of elements up to pMaxObjects but shall + * not deliver more than pMaxObjects elements. An + * implementation may choose to never return any elements during + * an Open operation, regardless of the value of + * pMaxObjects. Note that a CIM client can use a + * pMaxObjects value of 0 to specify that it does + * not want to retrieve any instances in the Open operation. + * @return The return value of a successful Open operation is an array of + * enumerated elements with a number of entries from 0 up to a + * maximum defined by pMaxObjects. These entries meet + * the criteria defined in the Open operation. Note that returning + * no entries in the array does not imply that the enumeration + * session is exhausted. Client must evaluate the + * EnumerateResponse.isEnd() to determine if there are + * more elements. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_OPERATION_TIMEOUT + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED + * CIM_ERR_INVALID_PARAMETER + * CIM_ERR_NOT_FOUND (the source instance was not found) + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED + * CIM_ERR_INVALID_QUERY + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public EnumerateResponse referencePaths(CIMObjectPath pInstancePath, + String pResultClass, String pRole, String pFilterQueryLanguage, String pFilterQuery, + UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects) + throws WBEMException; + + /** + * references shall start an enumeration session for + * association instances that have references that refer to the instance + * defined in the pInstancePath parameter and return zero or + * more CIMInstance objects. + * + * @param pInstancePath + * The CIMObjectPath for the instance for which the + * enumeration is to be performed. + * @param pResultClass + * This string shall either contain a CIM Class name or be + * null. It filters the instances returned to + * contain only the instances of this Class name or one of its + * subclasses. + * @param pRole + * This string shall either contain a Property name or be + * null. It filters the instances returned to + * contain only instances referring to the source instance via a + * Property with the specified name. If "Antecedent" is + * specified, then only Associations in which the source instance + * is the "Antecedent" reference are returned. + * @param pIncludeClassOrigin + * The class origin attribute is the name of the class that first + * defined the property. If true, the class origin + * attribute may be present for each property on all instances + * returned, even if requested the server may ignore the request + * and not return the class origin. If false, the + * class origin shall not be present. + * @param pPropertyList + * An array of property names used to filter what is contained in + * the instances returned. Each CIMInstance returned + * only contains elements for the properties of the names + * specified. Duplicate and invalid property names are ignored + * and the request is otherwise processed normally. An empty + * array indicates that no properties should be included in the + * Objects returned. A null value indicates that all + * non-null properties of the instance are included. + * @param pFilterQueryLanguage + * The pFilterQueryLanguage represents the query + * language for the pFilterQuery argument. This must + * be left null if a pFilterQuery is + * not supplied. If the implementation does not support the query + * language specified, the + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error shall + * be returned. If the implementation does not support filtered + * enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pFilterQuery + * The pFilterQuery specifies a query in the form of + * the query language specified by the + * pFilterQueryLanguage parameter. If this value is + * not null, the pFilterQueryLanguage + * parameter must be non-null. This value shall act + * as an additional filter on the result set. If the + * implementation does not support the query language specified, + * the CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED error + * shall be returned. If the implementation does not support + * filtered enumerations, the + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED error + * shall be returned. + * @param pTimeout + * This input parameter determines the minimum time the CIM + * server shall maintain the open enumeration session after the + * last Open or Pull operation (unless the enumeration session is + * closed). If the operation timeout is exceeded, the + * implementation may close the enumeration session at any time, + * releasing any resources allocated to the enumeration session. + * A pTimeout of 0 means that there is no operation + * timeout. That is, the enumeration session is never closed + * based on time. If pTimeout is null, + * the implementation shall choose an operation timeout. All + * other values for pTimeout specify the operation + * timeout in seconds. A implementation may restrict the set of + * allowable values for pTimeout. Specifically, the + * implementation may not allow 0 (no timeout). If the specified + * value is not an allowable value, the implementation shall + * return failure with the status code + * CIM_ERR_INVALID_OPERATION_TIMEOUT. + * @param pContinueOnError + * If true, requests that the operation resume when + * an error is received. If a implementation does not support + * continuation on error and pContinueOnError is + * true, it shall throw a WBEMException + * with the status code + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. If a + * implementation supports continuation on error and + * pContinueOnError is true, the + * enumeration session shall remain open when a Pull operation + * fails, and any subsequent successful Pull operations shall + * return the set of elements that would have been returned if + * the failing Pull operations were successful. This behavior is + * subject to the consistency rules defined for pulled + * enumerations. If pContinueOnError is + * false, the enumeration session shall be closed + * when either the operation completes successfully or when a + * WBEMExcetpion is thrown. + * @param pMaxObjects + * Defines the maximum number of elements that this Open + * operation can return. The implementation may deliver any + * number of elements up to pMaxObjects but shall + * not deliver more than pMaxObjects elements. An + * implementation may choose to never return any elements during + * an Open operation, regardless of the value of + * pMaxObjects. Note that a CIM client can use a + * pMaxObjects value of 0 to specify that it does + * not want to retrieve any instances in the Open operation. + * @return The return value of a successful Open operation is an array of + * enumerated elements with a number of entries from 0 up to a + * maximum defined by pMaxObjects. These entries meet + * the criteria defined in the Open operation. Note that returning + * no entries in the array does not imply that the enumeration + * session is exhausted. Client must evaluate the + * EnumerateResponse.isEnd() to determine if there are + * more elements. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_SERVER_IS_SHUTTING_DOWN + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_OPERATION_TIMEOUT + * CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED + * CIM_ERR_INVALID_PARAMETER + * CIM_ERR_NOT_FOUND (the source instance was not found) + * CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED + * CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED + * CIM_ERR_INVALID_QUERY + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public EnumerateResponse references(CIMObjectPath pInstancePath, + String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList, + String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout, + boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException; + + /** + * Change the locales that were provided during initialization. + * + * @param pLocales + * An array of locales in order of priority of preference. + */ + public void setLocales(Locale[] pLocales); + + /** + * Set properties that enable options or protocol specific properties. See + * WBEMClientConstants for a list of standard properties. + * + * @param pKey + * The name of the property. + * @param pValue + * The value of the property. + * @throws IllegalArgumentException + * If the name is not a supported property name. + * @see WBEMClientConstants + */ + public void setProperty(String pKey, String pValue); + + /** + * Add a CIMQualifierType to the specified namespace if it does + * not already exist. Otherwise, it modifies the qualifier type to the value + * specified. + * + * @param pQualifierType + * The CIM qualifier type to be added. + * @throws UnsupportedOperationException + * If the client implementation (or protocol) does not support + * the operation. + * @throws WBEMException + * If unsuccessful, one of the following status codes must be + * returned. The ORDERED list is: + * + * + * CIM_ERR_ACCESS_DENIED + * CIM_ERR_NOT_SUPPORTED + * CIM_ERR_INVALID_NAMESPACE + * CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized + * or otherwise incorrect parameters) + * CIM_ERR_FAILED (some other unspecified error occurred) + * + */ + public void setQualifierType(CIMQualifierType pQualifierType) throws WBEMException; +} diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/WBEMClientConstants.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientConstants.java similarity index 85% rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/client/WBEMClientConstants.java rename to src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientConstants.java index becaeab..5d4ecf9 100644 --- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/WBEMClientConstants.java +++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientConstants.java @@ -1,160 +1,158 @@ -/* - (C) Copyright IBM Corp. 2009, 2012 - - THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE - ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE - CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT. - - You can obtain a current copy of the Eclipse Public License from - http://www.opensource.org/licenses/eclipse-1.0.php - - @author : Dave Blaschke, blaschke@us.ibm.com - * - * Change History - * Flag Date Prog Description - * ------------------------------------------------------------------------------- - * 2882448 2009-10-21 blaschke-oss Add WBEMClientConstants from JSR48 - * 2884718 2009-10-23 blaschke-oss Merge JSR48 and SBLIM client properties - * 2930341 2010-01-12 blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0 - * 2959264 2010-02-25 blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0 - * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final - * 3496355 2012-03-02 blaschke-oss JSR48 1.0.0: add new WBEMClientConstants - * 3521157 2012-05-10 blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1 - */ -package org.sentrysoftware.wbem.javax.wbem.client; - -/*- - * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲ - * WBEM Java Client - * ჻჻჻჻჻჻ - * Copyright (C) 2023 Sentry Software - * ჻჻჻჻჻჻ - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱ - */ - -//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012 -/** - * This class defines the constants used for WBEMClient - * configuration. If a property is tagged as optional an implementation may or - * may not support the property. If the implementation does not support the - * property, it must throw an IllegalArgumentException if the - * property value is attempted to be set. - */ -public class WBEMClientConstants { - - /** - * Use this property to set the list of ciphers the client will support. - * Setting this value to null will use the default set of ciphers provided - * by the version of Java being used. Optional. - */ - public static final String PROP_CLIENT_CIPHERS = "javax.wbem.client.ciphers"; - - /** - * This property along with the PROP_CLIENT_KEYSTORE_PASSWORD and - * PROP_CLIENT_TRUSTSTORE are used to configure mutual authentication. This - * property is used to provide the filename of the keystore. The path can be - * relative or full. Optional. - */ - public static final String PROP_CLIENT_KEYSTORE = "javax.wbem.client.keyStore"; - - /** - * This property along with the PROP_CLIENT_KEYSTORE and - * PROP_CLIENT_TRUSTSTORE are used to configure mutual authentication. This - * property is used to provide the password of the keystore. Optional. - */ - public static final String PROP_CLIENT_KEYSTORE_PASSWORD = "javax.wbem.client.keyStorePassword"; - - /** - * This property along with the PROP_CLIENT_KEYSTORE and - * PROP_CLIENT_KEYSTORE_PASSWORD are used to configure mutual - * authentication. This property is used to provide the filename of the - * truststore. The path can be relative or full. Optional. - */ - public static final String PROP_CLIENT_TRUSTSTORE = "javax.wbem.client.trustStore"; - - /** - * The value for this property is the level of debug requested. - */ - public static final String PROP_ENABLE_CONSOLE_LOGGING = "javax.wbem.client.log.console.enabled"; - - /** - * The value for this property is the level of debug requested. - */ - public static final String PROP_ENABLE_FILE_LOGGING = "javax.wbem.client.log.file.enabled"; - - /** - * The maximum size in bytes for each log file. The default is 5MB. Note - * that when the last entry is written, it may go past the limit. - */ - public static final String PROP_LOG_BYTE_LIMIT = "javax.wbem.client.log.maxfilesize"; - - /** - * Set this property to the directory where the log files are created. The - * default is the directory in which the WBEM client program is run. - */ - public static final String PROP_LOG_DIR = "javax.wbem.client.log.dir"; - - /** - * The name of the client log file. For a WBEM client using the CIM-XML or - * WS-Management protocol the default is cimclient_log_N.txt where N is the - * logfile number. The first client log file number is 0. - */ - public static final String PROP_LOG_FILENAME = "javax.wbem.client.log.filename"; - - /** - * The number of log files that will be used. They will be used in - * round-robin fashion. The default is 3. - */ - public static final String PROP_LOG_NUM_FILES = "javax.wbem.client.log.numfiles"; - - /** - * The timeout for the client to wait for connections. This value is in - * milliseconds. The default is 0 - unlimited. This value must be a valid - * integer. - */ - public static final String PROP_TIMEOUT = "javax.wbem.client.timeout"; - - /** - * This property will enable HTTP chunking for a client request. Set this - * property to "1" to use chunking. Set to "0" to not use chunking. The - * default is 1. Optional. - */ - public static final String PROPERTY_WBEM_CHUNKING = "javax.wbem.chunking"; - - /** - * The CIM-XML Protocol as defined by the DMTF in the following - * specifications: - * - * 
      -	 * DSP0200 - CIM Operations over HTTP 
-	 * DSP0201 - Representation of CIM Using XML 
-	 * DSP0203 - CIM DTD
-	 * 
-	 */
-	public static final String PROTOCOL_CIMXML = "CIM-XML";
-
-	/**
-	 * The WS-Management Protocol as defined by the DMTF in the following
-	 * specifications:
-	 * 
-	 * 
      -	 * DSP0226 - WS-Management 
-	 * DSP0227 - WS-Management CIM Binding Specification 
-	 * DSP0230 - WS-CIM Mapping Specification
-	 * 
-	 */
-	public static final String PROTOCOL_WSMANAGEMENT = "WS-Management";
-}
+/*
+  (C) Copyright IBM Corp. 2009, 2012
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Dave Blaschke, blaschke@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 2882448    2009-10-21  blaschke-oss Add WBEMClientConstants from JSR48
+ * 2884718    2009-10-23  blaschke-oss Merge JSR48 and SBLIM client properties
+ * 2930341    2010-01-12  blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0
+ * 2959264    2010-02-25  blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0
+ * 3496301    2012-03-02  blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
+ * 3496355    2012-03-02  blaschke-oss JSR48 1.0.0: add new WBEMClientConstants
+ * 3521157    2012-05-10  blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
+ */
+package org.metricshub.wbem.javax.wbem.client;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
+/**
+ * This class defines the constants used for WBEMClient
+ * configuration. If a property is tagged as optional an implementation may or
+ * may not support the property. If the implementation does not support the
+ * property, it must throw an IllegalArgumentException if the
+ * property value is attempted to be set.
+ */
+public class WBEMClientConstants {
+
+	/**
+	 * Use this property to set the list of ciphers the client will support.
+	 * Setting this value to null will use the default set of ciphers provided
+	 * by the version of Java being used. Optional.
+	 */
+	public static final String PROP_CLIENT_CIPHERS = "javax.wbem.client.ciphers";
+
+	/**
+	 * This property along with the PROP_CLIENT_KEYSTORE_PASSWORD and
+	 * PROP_CLIENT_TRUSTSTORE are used to configure mutual authentication. This
+	 * property is used to provide the filename of the keystore. The path can be
+	 * relative or full. Optional.
+	 */
+	public static final String PROP_CLIENT_KEYSTORE = "javax.wbem.client.keyStore";
+
+	/**
+	 * This property along with the PROP_CLIENT_KEYSTORE and
+	 * PROP_CLIENT_TRUSTSTORE are used to configure mutual authentication. This
+	 * property is used to provide the password of the keystore. Optional.
+	 */
+	public static final String PROP_CLIENT_KEYSTORE_PASSWORD = "javax.wbem.client.keyStorePassword";
+
+	/**
+	 * This property along with the PROP_CLIENT_KEYSTORE and
+	 * PROP_CLIENT_KEYSTORE_PASSWORD are used to configure mutual
+	 * authentication. This property is used to provide the filename of the
+	 * truststore. The path can be relative or full. Optional.
+	 */
+	public static final String PROP_CLIENT_TRUSTSTORE = "javax.wbem.client.trustStore";
+
+	/**
+	 * The value for this property is the level of debug requested.
+	 */
+	public static final String PROP_ENABLE_CONSOLE_LOGGING = "javax.wbem.client.log.console.enabled";
+
+	/**
+	 * The value for this property is the level of debug requested.
+	 */
+	public static final String PROP_ENABLE_FILE_LOGGING = "javax.wbem.client.log.file.enabled";
+
+	/**
+	 * The maximum size in bytes for each log file. The default is 5MB. Note
+	 * that when the last entry is written, it may go past the limit.
+	 */
+	public static final String PROP_LOG_BYTE_LIMIT = "javax.wbem.client.log.maxfilesize";
+
+	/**
+	 * Set this property to the directory where the log files are created. The
+	 * default is the directory in which the WBEM client program is run.
+	 */
+	public static final String PROP_LOG_DIR = "javax.wbem.client.log.dir";
+
+	/**
+	 * The name of the client log file. For a WBEM client using the CIM-XML or
+	 * WS-Management protocol the default is cimclient_log_N.txt where N is the
+	 * logfile number. The first client log file number is 0.
+	 */
+	public static final String PROP_LOG_FILENAME = "javax.wbem.client.log.filename";
+
+	/**
+	 * The number of log files that will be used. They will be used in
+	 * round-robin fashion. The default is 3.
+	 */
+	public static final String PROP_LOG_NUM_FILES = "javax.wbem.client.log.numfiles";
+
+	/**
+	 * The timeout for the client to wait for connections. This value is in
+	 * milliseconds. The default is 0 - unlimited. This value must be a valid
+	 * integer.
+	 */
+	public static final String PROP_TIMEOUT = "javax.wbem.client.timeout";
+
+	/**
+	 * This property will enable HTTP chunking for a client request. Set this
+	 * property to "1" to use chunking. Set to "0" to not use chunking. The
+	 * default is 1. Optional.
+	 */
+	public static final String PROPERTY_WBEM_CHUNKING = "javax.wbem.chunking";
+
+	/**
+	 * The CIM-XML Protocol as defined by the DMTF in the following
+	 * specifications:
+	 * 
+	 * 
      +	 * DSP0200 - CIM Operations over HTTP 
+	 * DSP0201 - Representation of CIM Using XML 
+	 * DSP0203 - CIM DTD
+	 * 
+	 */
+	public static final String PROTOCOL_CIMXML = "CIM-XML";
+
+	/**
+	 * The WS-Management Protocol as defined by the DMTF in the following
+	 * specifications:
+	 * 
+	 * 
      +	 * DSP0226 - WS-Management 
+	 * DSP0227 - WS-Management CIM Binding Specification 
+	 * DSP0230 - WS-CIM Mapping Specification
+	 * 
+	 */
+	public static final String PROTOCOL_WSMANAGEMENT = "WS-Management";
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/WBEMClientFactory.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/client/WBEMClientFactory.java
rename to src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java
index ec48a00..b896b10 100644
--- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/WBEMClientFactory.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java
@@ -1,116 +1,113 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-11-08  lupusalex    Make SBLIM client JSR48 compliant
- * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
- * 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)
- * 2882448    2009-10-21  blaschke-oss Add WBEMClientConstants from JSR48
- * 2959264    2010-02-25  blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0
- * 3490355    2012-02-21  blaschke-oss TCK: Cannot instantiate WBEMClientFactory
- */
-
-package org.sentrysoftware.wbem.javax.wbem.client;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.WBEMClientCIMXML;
-
-//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010
-/**
- * This class defines the functionality of a WBEMClient factory,
- * which is used to retrieve a WBEMClient for a specified protocol.
- * An example of how to use the factory is included below.
- * 
- * 
      - *   ...
- *   WBEMClient cc = null;
- *   
- *   try {
- *     cc = WBEMClientFactory.getClient(WBEMClientConstants.PROTOCOL_CIMXML);
- *   } catch (Exception e) {
- *     System.out.println("Received error when trying to retrieve client handle");
- *     System.exit(-1);
- *   }
- *   
- *   // initialize the client 
- *   cc.initialize(cns, s, null);
- *   ...
- * 
      
- */
-
-public class WBEMClientFactory extends Object {
-
-	private static final String[] cProtocols = { WBEMClientConstants.PROTOCOL_CIMXML };
-
-	/**
-	 *
-	 */
-	public WBEMClientFactory() { /**/}
-
-	/**
-	 * Get a WBEMClient for a protocol.
-	 * 
-	 * @param pProtocol
-	 *            The protocol name (e.g. "CIM-XML").
-	 * @return The WBEMClient implementation for the protocol
-	 *         specified.
-	 * @throws IllegalArgumentException
-	 *             
       
      If the protocol is
-	 *             null or empty.
       
      If the protocol is not
-	 *             supported.
       
      
-	 * @throws WBEMException
-	 *             If the protocol implementation could not be loaded.
-	 */
-	public static WBEMClient getClient(String pProtocol) throws WBEMException {
-
-		if (WBEMClientConstants.PROTOCOL_CIMXML.equalsIgnoreCase(pProtocol)) { return new WBEMClientCIMXML(); }
-
-		throw new IllegalArgumentException("\"" + pProtocol + "\" is not a supported protocol");
-	}
-
-	/**
-	 * Get the names of the supported protocols.
-	 * 
-	 * @return A string array of the supported protocols.
-	 */
-	public static String[] getSupportedProtocols() {
-		return cProtocols;
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-11-08  lupusalex    Make SBLIM client JSR48 compliant
+ * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
+ * 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)
+ * 2882448    2009-10-21  blaschke-oss Add WBEMClientConstants from JSR48
+ * 2959264    2010-02-25  blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0
+ * 3490355    2012-02-21  blaschke-oss TCK: Cannot instantiate WBEMClientFactory
+ */
+
+package org.metricshub.wbem.javax.wbem.client;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.WBEMClientCIMXML;
+
+//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010
+/**
+ * This class defines the functionality of a WBEMClient factory,
+ * which is used to retrieve a WBEMClient for a specified protocol.
+ * An example of how to use the factory is included below.
+ * 
+ * 
      + *   ...
+ *   WBEMClient cc = null;
+ *   
+ *   try {
+ *     cc = WBEMClientFactory.getClient(WBEMClientConstants.PROTOCOL_CIMXML);
+ *   } catch (Exception e) {
+ *     System.out.println("Received error when trying to retrieve client handle");
+ *     System.exit(-1);
+ *   }
+ *   
+ *   // initialize the client 
+ *   cc.initialize(cns, s, null);
+ *   ...
+ * 
      
+ */
+
+public class WBEMClientFactory extends Object {
+
+	private static final String[] cProtocols = { WBEMClientConstants.PROTOCOL_CIMXML };
+
+	/**
+	 *
+	 */
+	public WBEMClientFactory() { /**/}
+
+	/**
+	 * Get a WBEMClient for a protocol.
+	 * 
+	 * @param pProtocol
+	 *            The protocol name (e.g. "CIM-XML").
+	 * @return The WBEMClient implementation for the protocol
+	 *         specified.
+	 * @throws IllegalArgumentException
+	 *             
       
      If the protocol is
+	 *             null or empty.
       
      If the protocol is not
+	 *             supported.
       
      
+	 * @throws WBEMException
+	 *             If the protocol implementation could not be loaded.
+	 */
+	public static WBEMClient getClient(String pProtocol) throws WBEMException {
+
+		if (WBEMClientConstants.PROTOCOL_CIMXML.equalsIgnoreCase(pProtocol)) { return new WBEMClientCIMXML(); }
+
+		throw new IllegalArgumentException("\"" + pProtocol + "\" is not a supported protocol");
+	}
+
+	/**
+	 * Get the names of the supported protocols.
+	 * 
+	 * @return A string array of the supported protocols.
+	 */
+	public static String[] getSupportedProtocols() {
+		return cProtocols;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/client/package.html b/src/main/java/org/metricshub/wbem/javax/wbem/client/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/client/package.html
rename to src/main/java/org/metricshub/wbem/javax/wbem/client/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/IndicationListener.java b/src/main/java/org/metricshub/wbem/javax/wbem/listener/IndicationListener.java
similarity index 70%
rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/IndicationListener.java
rename to src/main/java/org/metricshub/wbem/javax/wbem/listener/IndicationListener.java
index 5fc1a9e..137e86c 100644
--- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/IndicationListener.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/listener/IndicationListener.java
@@ -1,70 +1,68 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-12-14  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2959240    2010-02-25  blaschke-oss Sync up javax.listener.* javadoc with JSR48 1.0.0
- */
-
-package org.sentrysoftware.wbem.javax.wbem.listener;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.EventListener;
-
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-
-//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010
-/**
- * This interface is implemented by the code that wants to create a listener for
- * indications. See the WBEMListenerFactory class for an example.
- */
-public interface IndicationListener extends EventListener {
-
-	/**
-	 * Called when an indication has been received by the listener
-	 * 
-	 * @param pIndicationURL
-	 *            The URL to which the indication was posted. For example if the
-	 *            indication was delivered over the https protocol to the
-	 *            destination listener https://hostname:6111/, pIndicationURL
-	 *            would be set to https://hostname:6111/.
-	 * @param pIndication
-	 *            The indication received.
-	 */
-	public void indicationOccured(String pIndicationURL, CIMInstance pIndication);
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-12-14  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2959240    2010-02-25  blaschke-oss Sync up javax.listener.* javadoc with JSR48 1.0.0
+ */
+
+package org.metricshub.wbem.javax.wbem.listener;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.EventListener;
+
+import org.metricshub.wbem.javax.cim.CIMInstance;
+
+//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010
+/**
+ * This interface is implemented by the code that wants to create a listener for
+ * indications. See the WBEMListenerFactory class for an example.
+ */
+public interface IndicationListener extends EventListener {
+
+	/**
+	 * Called when an indication has been received by the listener
+	 * 
+	 * @param pIndicationURL
+	 *            The URL to which the indication was posted. For example if the
+	 *            indication was delivered over the https protocol to the
+	 *            destination listener https://hostname:6111/, pIndicationURL
+	 *            would be set to https://hostname:6111/.
+	 * @param pIndication
+	 *            The indication received.
+	 */
+	public void indicationOccured(String pIndicationURL, CIMInstance pIndication);
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/WBEMListener.java b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListener.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/WBEMListener.java
rename to src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListener.java
index f7cbce3..7b09f81 100644
--- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/WBEMListener.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListener.java
@@ -1,124 +1,122 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-12-14  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2959240    2010-02-25  blaschke-oss Sync up javax.listener.* javadoc with JSR48 1.0.0
- * 3496385    2012-03-02  blaschke-oss JSR48 1.0.0: add WBEMListener get/setProperty
- */
-
-package org.sentrysoftware.wbem.javax.wbem.listener;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-
-//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
-/**
- * The WBEMListener interface is used to add/remove WBEM Indication
- * Listeners. The implementation of a WBEMListener can be retrieved
- * from the WBEMListenerFactor by specifying the protocol to use to
- * listen for indications.
- */
-public interface WBEMListener {
-
-	/**
-	 * Add a new listener using the specified port.
-	 * 
-	 * @param pListener
-	 *            The Indication Listener that will be called when an indication
-	 *            is received.
-	 * @param pPort
-	 *            The port to listen on. Use 0 to specify any available port.
-	 * @param pTransport
-	 *            The transport to use (e.g. HTTP or HTTPS).
-	 * @return The port that was used.
-	 * @throws IOException
-	 *             If the port is already in use.
-	 */
-	public int addListener(IndicationListener pListener, int pPort, String pTransport)
-			throws IOException;
-
-	/**
-	 * Add a new listener using the specified port.
-	 * 
-	 * @param pListener
-	 *            The Indication Listener that will be called when an indication
-	 *            is received.
-	 * @param pPort
-	 *            The port to listen on. Use 0 to specify any available port.
-	 * @param pTransport
-	 *            The transport to use (e.g. HTTP or HTTPS).
-	 * @param localAddr
-	 *            The local IP address to bind to. This is only needed in
-	 *            multi-homed systems.
-	 * @return The port that was used.
-	 * @throws IOException
-	 *             If the port is already in use.
-	 */
-	public int addListener(IndicationListener pListener, int pPort, String pTransport,
-			String localAddr) throws IOException;
-
-	/**
-	 * Get a property value.
-	 * 
-	 * @param pName
-	 *            The name of the property.
-	 * @return The value of the property.
-	 */
-	public String getProperty(String pName);
-
-	/**
-	 * Remove the listener associated with the specified port.
-	 * 
-	 * @param pPort
-	 *            The port.
-	 */
-	public void removeListener(int pPort);
-
-	/**
-	 * Set a property for the WBEM Listener.
-	 * 
-	 * @param pName
-	 *            The name of the property.
-	 * @param pValue
-	 *            The value of the property.
-	 * @throws IllegalArgumentException
-	 *             If the name is not a supported property name.
-	 */
-	public void setProperty(String pName, String pValue);
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-12-14  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2959240    2010-02-25  blaschke-oss Sync up javax.listener.* javadoc with JSR48 1.0.0
+ * 3496385    2012-03-02  blaschke-oss JSR48 1.0.0: add WBEMListener get/setProperty
+ */
+
+package org.metricshub.wbem.javax.wbem.listener;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+
+//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
+/**
+ * The WBEMListener interface is used to add/remove WBEM Indication
+ * Listeners. The implementation of a WBEMListener can be retrieved
+ * from the WBEMListenerFactor by specifying the protocol to use to
+ * listen for indications.
+ */
+public interface WBEMListener {
+
+	/**
+	 * Add a new listener using the specified port.
+	 * 
+	 * @param pListener
+	 *            The Indication Listener that will be called when an indication
+	 *            is received.
+	 * @param pPort
+	 *            The port to listen on. Use 0 to specify any available port.
+	 * @param pTransport
+	 *            The transport to use (e.g. HTTP or HTTPS).
+	 * @return The port that was used.
+	 * @throws IOException
+	 *             If the port is already in use.
+	 */
+	public int addListener(IndicationListener pListener, int pPort, String pTransport)
+			throws IOException;
+
+	/**
+	 * Add a new listener using the specified port.
+	 * 
+	 * @param pListener
+	 *            The Indication Listener that will be called when an indication
+	 *            is received.
+	 * @param pPort
+	 *            The port to listen on. Use 0 to specify any available port.
+	 * @param pTransport
+	 *            The transport to use (e.g. HTTP or HTTPS).
+	 * @param localAddr
+	 *            The local IP address to bind to. This is only needed in
+	 *            multi-homed systems.
+	 * @return The port that was used.
+	 * @throws IOException
+	 *             If the port is already in use.
+	 */
+	public int addListener(IndicationListener pListener, int pPort, String pTransport,
+			String localAddr) throws IOException;
+
+	/**
+	 * Get a property value.
+	 * 
+	 * @param pName
+	 *            The name of the property.
+	 * @return The value of the property.
+	 */
+	public String getProperty(String pName);
+
+	/**
+	 * Remove the listener associated with the specified port.
+	 * 
+	 * @param pPort
+	 *            The port.
+	 */
+	public void removeListener(int pPort);
+
+	/**
+	 * Set a property for the WBEM Listener.
+	 * 
+	 * @param pName
+	 *            The name of the property.
+	 * @param pValue
+	 *            The value of the property.
+	 * @throws IllegalArgumentException
+	 *             If the name is not a supported property name.
+	 */
+	public void setProperty(String pName, String pValue);
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/WBEMListenerConstants.java b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerConstants.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/WBEMListenerConstants.java
rename to src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerConstants.java
index 3408129..4645fa0 100644
--- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/WBEMListenerConstants.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerConstants.java
@@ -1,81 +1,79 @@
-/*
-  (C) Copyright IBM Corp. 2012
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Dave Blaschke, blaschke@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 3496380    2012-03-02  blaschke-oss JSR48 1.0.0: add new WBEMListenerConstants
- */
-package org.sentrysoftware.wbem.javax.wbem.listener;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
-/**
- * This class defines the constants used for WBEMListener
- * configuration. If a property is tagged as optional an implementation may or
- * may not support the property. If the implementation does not support the
- * property, it must throw an IllegalArgumentException if the
- * property value is attempted to be set.
- */
-public class WBEMListenerConstants {
-
-	/**
-	 * Use this property to set the list of ciphers the listener will support.
-	 * Setting this value to null will use the default set of ciphers provided
-	 * by the version of Java being used. Optional.
-	 */
-	public static final String PROP_LISTENER_CIPHERS = "javax.wbem.listener.ciphers";
-
-	/**
-	 * This property along with the PROP_LISTENER_KEYSTORE_PASSWORD and
-	 * PROP_LISTENER_TRUSTSTORE are used to configure mutual authentication.
-	 * This property is used to provide the filename of the keystore. The path
-	 * can be relative or full. Optional.
-	 */
-	public static final String PROP_LISTENER_KEYSTORE = "javax.wbem.listener.keyStore";
-
-	/**
-	 * This property along with the PROP_LISTENER_KEYSTORE and
-	 * PROP_LISTENER_TRUSTSTORE are used to configure mutual authentication.
-	 * This property is used to provide the password of the keystore. Optional.
-	 */
-	public static final String PROP_LISTENER_KEYSTORE_PASSWORD = "javax.wbem.listener.keyStorePassword";
-
-	/**
-	 * This property along with the PROP_LISTENER_KEYSTORE and
-	 * PROP_LISTENER_KEYSTORE_PASSWORD are used to configure mutual
-	 * authentication. This property is used to provide the filename of the
-	 * truststore. The path can be relative or full. Optional.
-	 */
-	public static final String PROP_LISTENER_TRUSTSTORE = "javax.wbem.listener.trustStore";
-}
+/*
+  (C) Copyright IBM Corp. 2012
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Dave Blaschke, blaschke@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 3496380    2012-03-02  blaschke-oss JSR48 1.0.0: add new WBEMListenerConstants
+ */
+package org.metricshub.wbem.javax.wbem.listener;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
+/**
+ * This class defines the constants used for WBEMListener
+ * configuration. If a property is tagged as optional an implementation may or
+ * may not support the property. If the implementation does not support the
+ * property, it must throw an IllegalArgumentException if the
+ * property value is attempted to be set.
+ */
+public class WBEMListenerConstants {
+
+	/**
+	 * Use this property to set the list of ciphers the listener will support.
+	 * Setting this value to null will use the default set of ciphers provided
+	 * by the version of Java being used. Optional.
+	 */
+	public static final String PROP_LISTENER_CIPHERS = "javax.wbem.listener.ciphers";
+
+	/**
+	 * This property along with the PROP_LISTENER_KEYSTORE_PASSWORD and
+	 * PROP_LISTENER_TRUSTSTORE are used to configure mutual authentication.
+	 * This property is used to provide the filename of the keystore. The path
+	 * can be relative or full. Optional.
+	 */
+	public static final String PROP_LISTENER_KEYSTORE = "javax.wbem.listener.keyStore";
+
+	/**
+	 * This property along with the PROP_LISTENER_KEYSTORE and
+	 * PROP_LISTENER_TRUSTSTORE are used to configure mutual authentication.
+	 * This property is used to provide the password of the keystore. Optional.
+	 */
+	public static final String PROP_LISTENER_KEYSTORE_PASSWORD = "javax.wbem.listener.keyStorePassword";
+
+	/**
+	 * This property along with the PROP_LISTENER_KEYSTORE and
+	 * PROP_LISTENER_KEYSTORE_PASSWORD are used to configure mutual
+	 * authentication. This property is used to provide the filename of the
+	 * truststore. The path can be relative or full. Optional.
+	 */
+	public static final String PROP_LISTENER_TRUSTSTORE = "javax.wbem.listener.trustStore";
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/WBEMListenerFactory.java b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/WBEMListenerFactory.java
rename to src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java
index d52009b..3e20ed4 100644
--- a/src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/WBEMListenerFactory.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java
@@ -1,108 +1,106 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-12-14  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2798931	  2009-06-01  raman_arora  Fix spelling of getPROTOCOLS()
- * 2882448    2009-10-21  blaschke-oss Add WBEMClientConstants from JSR48
- * 2959240    2010-02-25  blaschke-oss Sync up javax.listener.* javadoc with JSR48 1.0.0
- * 3490009    2012-02-21  blaschke-oss TCK: Too many WBEMListenerFactory class methods
- * 3529062    2012-05-23  blaschke-oss WBEMListenerFactory should return new instance
- */
-
-package org.sentrysoftware.wbem.javax.wbem.listener;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.wbem.client.WBEMClientConstants;
-
-import org.sentrysoftware.wbem.sblim.cimclient.WBEMListenerSBLIM;
-
-//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010
-/**
- * This class is a factory for getting a WBEMListener
- * implementation for a specified protocol. An example of how to use the factory
- * is included below.
- * 
- * 
      - * ...
- * class MyListener implements IndicationListener {
- * 
- *   public void indicationOccured(String pIndicationURL, CIMInstance pIndication) {
- *     System.out.println(pIndication);
- * 	 }
- * }
- * 
- * String protocol = WBEMClientConstants.PROTOCOL_CIMXML;
- * WBEMListener api = WBEMListenerFactory.getListener(protocol);
- * int port = api.addListener(MyListener, 1234, protocol);
- * 
      
- */
-public class WBEMListenerFactory extends Object {
-
-	private static final String[] PROTOCOLS = { WBEMClientConstants.PROTOCOL_CIMXML };
-
-	/**
-	 *
-	 */
-	public WBEMListenerFactory() { /**/}
-
-	/**
-	 * Get a WBEM Listener implementation for the specified protocol.
-	 * 
-	 * @param pProtocol
-	 *            The protocol name.
-	 * @return Implementation of WBEMListener.
-	 * @throws IllegalArgumentException
-	 *             Could not load protocol implementation.
-	 */
-	public static WBEMListener getListener(String pProtocol) throws IllegalArgumentException {
-
-		if (WBEMClientConstants.PROTOCOL_CIMXML.equalsIgnoreCase(pProtocol)) { return new WBEMListenerSBLIM(); }
-		throw new IllegalArgumentException("Protocol: " + pProtocol
-				+ " is not supported! Invoke getProtocols() for the list of "
-				+ "supported protocols.");
-	}
-
-	/**
-	 * Get the names of the supported protocols.
-	 * 
-	 * @return A string array of the protocol names supported.
-	 */
-	public static String[] getProtocols() {
-		return PROTOCOLS;
-	}
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-12-14  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2798931	  2009-06-01  raman_arora  Fix spelling of getPROTOCOLS()
+ * 2882448    2009-10-21  blaschke-oss Add WBEMClientConstants from JSR48
+ * 2959240    2010-02-25  blaschke-oss Sync up javax.listener.* javadoc with JSR48 1.0.0
+ * 3490009    2012-02-21  blaschke-oss TCK: Too many WBEMListenerFactory class methods
+ * 3529062    2012-05-23  blaschke-oss WBEMListenerFactory should return new instance
+ */
+
+package org.metricshub.wbem.javax.wbem.listener;
+
+import org.metricshub.wbem.sblim.cimclient.WBEMListenerSBLIM;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.wbem.client.WBEMClientConstants;
+
+//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010
+/**
+ * This class is a factory for getting a WBEMListener
+ * implementation for a specified protocol. An example of how to use the factory
+ * is included below.
+ * 
+ * 
      + * ...
+ * class MyListener implements IndicationListener {
+ * 
+ *   public void indicationOccured(String pIndicationURL, CIMInstance pIndication) {
+ *     System.out.println(pIndication);
+ * 	 }
+ * }
+ * 
+ * String protocol = WBEMClientConstants.PROTOCOL_CIMXML;
+ * WBEMListener api = WBEMListenerFactory.getListener(protocol);
+ * int port = api.addListener(MyListener, 1234, protocol);
+ * 
      
+ */
+public class WBEMListenerFactory extends Object {
+
+	private static final String[] PROTOCOLS = { WBEMClientConstants.PROTOCOL_CIMXML };
+
+	/**
+	 *
+	 */
+	public WBEMListenerFactory() { /**/}
+
+	/**
+	 * Get a WBEM Listener implementation for the specified protocol.
+	 * 
+	 * @param pProtocol
+	 *            The protocol name.
+	 * @return Implementation of WBEMListener.
+	 * @throws IllegalArgumentException
+	 *             Could not load protocol implementation.
+	 */
+	public static WBEMListener getListener(String pProtocol) throws IllegalArgumentException {
+
+		if (WBEMClientConstants.PROTOCOL_CIMXML.equalsIgnoreCase(pProtocol)) { return new WBEMListenerSBLIM(); }
+		throw new IllegalArgumentException("Protocol: " + pProtocol
+				+ " is not supported! Invoke getProtocols() for the list of "
+				+ "supported protocols.");
+	}
+
+	/**
+	 * Get the names of the supported protocols.
+	 * 
+	 * @return A string array of the protocol names supported.
+	 */
+	public static String[] getProtocols() {
+		return PROTOCOLS;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/package.html b/src/main/java/org/metricshub/wbem/javax/wbem/listener/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/listener/package.html
rename to src/main/java/org/metricshub/wbem/javax/wbem/listener/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/javax/wbem/package.html b/src/main/java/org/metricshub/wbem/javax/wbem/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/javax/wbem/package.html
rename to src/main/java/org/metricshub/wbem/javax/wbem/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/CIMXMLTraceListener.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/CIMXMLTraceListener.java
similarity index 68%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/CIMXMLTraceListener.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/CIMXMLTraceListener.java
index 18cfdf6..c789c16 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/CIMXMLTraceListener.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/CIMXMLTraceListener.java
@@ -1,68 +1,66 @@
-/*
-  (C) Copyright IBM Corp. 2012
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- *           Dave Blaschke, IBM, blaschke@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.logging.Level;
-
-/**
- * The interface CIMXMLTraceListener must be implemented if you want to attach
- * your own CIM-XML logging framework to the CIM Client.
- * 
- * @see LogAndTraceManager
- */
-public interface CIMXMLTraceListener {
-
-	/**
-	 * Receive a CIM-XML trace message.
-	 * 
-	 * @param pLevel
-	 *            One of the message level identifiers, e.g. FINE
-	 * @param pMessage
-	 *            The CIM-XML message text
-	 * @param pOutgoing
-	 *            true if CIM-XML is outgoing (being sent from
-	 *            client to server), false if CIM-XML is incoming
-	 *            (being sent from server to client)
-	 */
-	public void traceCIMXML(Level pLevel, String pMessage, boolean pOutgoing);
-
-}
+/*
+  (C) Copyright IBM Corp. 2012
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ *           Dave Blaschke, IBM, blaschke@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
+ */
+
+package org.metricshub.wbem.sblim.cimclient;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.logging.Level;
+
+/**
+ * The interface CIMXMLTraceListener must be implemented if you want to attach
+ * your own CIM-XML logging framework to the CIM Client.
+ * 
+ * @see LogAndTraceManager
+ */
+public interface CIMXMLTraceListener {
+
+	/**
+	 * Receive a CIM-XML trace message.
+	 * 
+	 * @param pLevel
+	 *            One of the message level identifiers, e.g. FINE
+	 * @param pMessage
+	 *            The CIM-XML message text
+	 * @param pOutgoing
+	 *            true if CIM-XML is outgoing (being sent from
+	 *            client to server), false if CIM-XML is incoming
+	 *            (being sent from server to client)
+	 */
+	public void traceCIMXML(Level pLevel, String pMessage, boolean pOutgoing);
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/GenericExts.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/GenericExts.java
similarity index 75%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/GenericExts.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/GenericExts.java
index a807115..e9689f2 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/GenericExts.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/GenericExts.java
@@ -1,105 +1,103 @@
-/*
-  (C) Copyright IBM Corp. 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Ramandeep Arora, arorar@us.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2) 
- * 2797696    2009-05-27  raman_arora  Input files use unsafe operations
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-import java.util.Vector;
-
-/**
- * Class GenericExts is responsible for generic initialization
- */
-public class GenericExts {
-
-	/**
-	 * initArrayList : If arrayList is null then it will return the new
-	 * arrayList of same type if it is not null then it will clear the arrayList
-	 * 
-	 * @param 
-	 *            : Type Parameter
-	 * 
-	 * @param pAL
-	 *            : ArrayList to be initialized
-	 * @return ArrayList : initialized ArrayList
-	 */
-	public static  ArrayList initClearArrayList(ArrayList pAL) {
-		if (pAL == null) return new ArrayList();
-		pAL.clear();
-		return pAL;
-	}
-
-	/**
-	 * initArrayList : If arrayList is null then it will return the new
-	 * arrayList of same type if it is not null then it will return the same
-	 * arrayList
-	 * 
-	 * @param 
-	 *            : Type Parameter
-	 * 
-	 * @param pAL
-	 *            : ArrayList to be initialized
-	 * @return ArrayList : initialized ArrayList
-	 */
-	public static  ArrayList initArrayList(ArrayList pAL) {
-		if (pAL == null) return new ArrayList();
-		return pAL;
-	}
-
-	/**
-	 * cloneVector : Generic deep copy of the vector. If original vector is null
-	 * then return value will also be null.
-	 * 
-	 * @param 
-	 *            : Type of vector
-	 * 
-	 * @param oldVec
-	 *            : The original vector.
-	 * 
-	 * @return Vector<T> : Deep copy of original vector.
-	 */
-	public static synchronized  Vector cloneVector(Vector oldVec) {
-		if (oldVec == null) return null;
-		Vector newVec = new Vector(oldVec.size());
-		for (T obj : oldVec)
-			newVec.add(obj);
-		return newVec;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Ramandeep Arora, arorar@us.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2) 
+ * 2797696    2009-05-27  raman_arora  Input files use unsafe operations
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+import java.util.Vector;
+
+/**
+ * Class GenericExts is responsible for generic initialization
+ */
+public class GenericExts {
+
+	/**
+	 * initArrayList : If arrayList is null then it will return the new
+	 * arrayList of same type if it is not null then it will clear the arrayList
+	 * 
+	 * @param 
+	 *            : Type Parameter
+	 * 
+	 * @param pAL
+	 *            : ArrayList to be initialized
+	 * @return ArrayList : initialized ArrayList
+	 */
+	public static  ArrayList initClearArrayList(ArrayList pAL) {
+		if (pAL == null) return new ArrayList();
+		pAL.clear();
+		return pAL;
+	}
+
+	/**
+	 * initArrayList : If arrayList is null then it will return the new
+	 * arrayList of same type if it is not null then it will return the same
+	 * arrayList
+	 * 
+	 * @param 
+	 *            : Type Parameter
+	 * 
+	 * @param pAL
+	 *            : ArrayList to be initialized
+	 * @return ArrayList : initialized ArrayList
+	 */
+	public static  ArrayList initArrayList(ArrayList pAL) {
+		if (pAL == null) return new ArrayList();
+		return pAL;
+	}
+
+	/**
+	 * cloneVector : Generic deep copy of the vector. If original vector is null
+	 * then return value will also be null.
+	 * 
+	 * @param 
+	 *            : Type of vector
+	 * 
+	 * @param oldVec
+	 *            : The original vector.
+	 * 
+	 * @return Vector<T> : Deep copy of original vector.
+	 */
+	public static synchronized  Vector cloneVector(Vector oldVec) {
+		if (oldVec == null) return null;
+		Vector newVec = new Vector(oldVec.size());
+		for (T obj : oldVec)
+			newVec.add(obj);
+		return newVec;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/IndicationListenerSBLIM.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/IndicationListenerSBLIM.java
similarity index 72%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/IndicationListenerSBLIM.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/IndicationListenerSBLIM.java
index f90f8ef..2f0b230 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/IndicationListenerSBLIM.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/IndicationListenerSBLIM.java
@@ -1,77 +1,75 @@
-/*
-  (C) Copyright IBM Corp. 2012
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * @author : Dave Blaschke, IBM, blaschke@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 3477087    2012-01-23  blaschke-oss Need Access to an Indication Sender's IP Address                  
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.InetAddress;
-import java.util.EventListener;
-
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-
-/**
- * This interface is implemented by the code that wants to create a listener for
- * indications. See the WBEMListenerFactory class for an example.
- * 
- * The difference between this interface and IndicationListener is
- * that the JSR48 standard (javax.wbem.listener.IndicationListener)
- * does not allow for the listener to receive the IP of the indication sender
- * whereas this internal interface (
- * org.sblim.cimclinet.IndicationListenerSBLIM) does.
- */
-public interface IndicationListenerSBLIM extends EventListener {
-
-	/**
-	 * Called when an indication has been received by the listener
-	 * 
-	 * @param pIndicationURL
-	 *            The URL to which the indication was posted. For example if the
-	 *            indication was delivered over the https protocol to the
-	 *            destination listener https://hostname:6111/, pIndicationURL
-	 *            would be set to https://hostname:6111/.
-	 * @param pIndication
-	 *            The indication received.
-	 * @param pSenderIP
-	 *            The internet address of the indication sender.
-	 */
-	public void indicationOccured(String pIndicationURL, CIMInstance pIndication,
-			InetAddress pSenderIP);
-
-}
+/*
+  (C) Copyright IBM Corp. 2012
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * @author : Dave Blaschke, IBM, blaschke@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 3477087    2012-01-23  blaschke-oss Need Access to an Indication Sender's IP Address                  
+ */
+
+package org.metricshub.wbem.sblim.cimclient;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.InetAddress;
+import java.util.EventListener;
+
+import org.metricshub.wbem.javax.cim.CIMInstance;
+
+/**
+ * This interface is implemented by the code that wants to create a listener for
+ * indications. See the WBEMListenerFactory class for an example.
+ * 
+ * The difference between this interface and IndicationListener is
+ * that the JSR48 standard (javax.wbem.listener.IndicationListener)
+ * does not allow for the listener to receive the IP of the indication sender
+ * whereas this internal interface (
+ * org.sblim.cimclinet.IndicationListenerSBLIM) does.
+ */
+public interface IndicationListenerSBLIM extends EventListener {
+
+	/**
+	 * Called when an indication has been received by the listener
+	 * 
+	 * @param pIndicationURL
+	 *            The URL to which the indication was posted. For example if the
+	 *            indication was delivered over the https protocol to the
+	 *            destination listener https://hostname:6111/, pIndicationURL
+	 *            would be set to https://hostname:6111/.
+	 * @param pIndication
+	 *            The indication received.
+	 * @param pSenderIP
+	 *            The internet address of the indication sender.
+	 */
+	public void indicationOccured(String pIndicationURL, CIMInstance pIndication,
+			InetAddress pSenderIP);
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/LogAndTraceManager.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/LogAndTraceManager.java
similarity index 84%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/LogAndTraceManager.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/LogAndTraceManager.java
index 49b51f3..f7aa039 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/LogAndTraceManager.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/LogAndTraceManager.java
@@ -1,220 +1,218 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-13  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-
-/**
- * Class LogAndTraceManager provides the means to register/unregister log and
- * trace listeners. It is the entry point for application that want to redirect
- * the CIM Client's log and trace messages into their own logging framework.
- * 
- */
-public class LogAndTraceManager {
-
-	private static LogAndTraceManager cManager = new LogAndTraceManager();
-
-	/**
-	 * Returns the singleton instance of the manager.
-	 * 
-	 * @return The manager
-	 */
-	public static LogAndTraceManager getManager() {
-		return cManager;
-	}
-
-	private LogAndTraceManager() {
-		super();
-	}
-
-	/**
-	 * Adds a listener for log messages. The listener will be notified of any
-	 * log event.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public void addLogListener(LogListener pListener) {
-		LogAndTraceBroker.getBroker().addLogListener(pListener);
-	}
-
-	/**
-	 * Remove a listener. This listener will not be notified of log events
-	 * anymore.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public void removeLogListener(LogListener pListener) {
-		LogAndTraceBroker.getBroker().removeLogListener(pListener);
-	}
-
-	/**
-	 * Removes all listeners. Caution: This will also remove the internal
-	 * console and file loggers.
-	 */
-	public void clearLogListeners() {
-		LogAndTraceBroker.getBroker().clearLogListeners();
-	}
-
-	/**
-	 * Gets the registered log listeners including the internal console and file
-	 * loggers.
-	 * 
-	 * @return An unmodifiable list of listeners
-	 */
-	public List getLogListeners() {
-		return Collections.unmodifiableList(LogAndTraceBroker.getBroker().getLogListeners());
-	}
-
-	/**
-	 * Adds a listener for log messages. The listener will be notified of any
-	 * trace event.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public void addTraceListener(TraceListener pListener) {
-		LogAndTraceBroker.getBroker().addTraceListener(pListener);
-	}
-
-	/**
-	 * Removes a listener. This listener will not be notified of trace events
-	 * anymore.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public void removeTraceListener(TraceListener pListener) {
-		LogAndTraceBroker.getBroker().removeTraceListener(pListener);
-	}
-
-	/**
-	 * Removes all listeners. Caution this will also remove the internal trace
-	 * file listener.
-	 */
-	public void clearTraceListeners() {
-		LogAndTraceBroker.getBroker().clearTraceListeners();
-	}
-
-	/**
-	 * Gets the registered trace listeners including the internal console and
-	 * file loggers.
-	 * 
-	 * @return A unmodifiable list of listeners
-	 */
-	public List getTraceListeners() {
-		return Collections.unmodifiableList(LogAndTraceBroker.getBroker().getTraceListeners());
-	}
-
-	/**
-	 * Adds a listener for CIM-XML trace messages. The listener will be notified
-	 * of any CIM-XML trace event.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public void addCIMXMLTraceListener(CIMXMLTraceListener pListener) {
-		LogAndTraceBroker.getBroker().addCIMXMLTraceListener(pListener);
-	}
-
-	/**
-	 * Removes a CIM-XML trace listener. This listener will not be notified of
-	 * CIM-XML trace events anymore.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public void removeCIMXMLTraceListener(CIMXMLTraceListener pListener) {
-		LogAndTraceBroker.getBroker().removeCIMXMLTraceListener(pListener);
-	}
-
-	/**
-	 * Removes all CIM-XML trace listeners.
-	 */
-	public void clearCIMXMLTraceListeners() {
-		LogAndTraceBroker.getBroker().clearCIMXMLTraceListeners();
-	}
-
-	/**
-	 * Gets the registered CIM-XML trace listeners.
-	 * 
-	 * @return A unmodifiable list of listeners
-	 */
-	public List getCIMXMLTraceListeners() {
-		return Collections
-				.unmodifiableList(LogAndTraceBroker.getBroker().getCIMXMLTraceListeners());
-	}
-
-	/**
-	 * Returns the stream to which the CIM-XML traces are sent. A value of
-	 * null means that tracing is effectively disabled. Otherwise
-	 * the CIM-XML tracing can be activated either globally or per-connection
-	 * via the "sblim.wbem.cimxmlTracing" configuration property.
-	 * 
-	 * @return The CIM-XML trace stream
-	 */
-	public OutputStream getXmlTraceStream() {
-		return LogAndTraceBroker.getBroker().getXmlTraceStream();
-	}
-
-	/**
-	 * Sets the stream to which the CIM-XML traces are sent. A value of
-	 * null means that tracing is effectively disabled. Otherwise
-	 * the CIM-XML tracing can be activated either globally or per-connection
-	 * via the "sblim.wbem.cimxmlTracing" configuration property.
-	 * 
-	 * @param pStream
-	 *            The CIM-XML trace stream
-	 */
-	public void setXmlTraceStream(OutputStream pStream) {
-		LogAndTraceBroker.getBroker().setXmlTraceStream(pStream);
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-13  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
+ */
+
+package org.metricshub.wbem.sblim.cimclient;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.OutputStream;
+import java.util.Collections;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+
+/**
+ * Class LogAndTraceManager provides the means to register/unregister log and
+ * trace listeners. It is the entry point for application that want to redirect
+ * the CIM Client's log and trace messages into their own logging framework.
+ * 
+ */
+public class LogAndTraceManager {
+
+	private static LogAndTraceManager cManager = new LogAndTraceManager();
+
+	/**
+	 * Returns the singleton instance of the manager.
+	 * 
+	 * @return The manager
+	 */
+	public static LogAndTraceManager getManager() {
+		return cManager;
+	}
+
+	private LogAndTraceManager() {
+		super();
+	}
+
+	/**
+	 * Adds a listener for log messages. The listener will be notified of any
+	 * log event.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public void addLogListener(LogListener pListener) {
+		LogAndTraceBroker.getBroker().addLogListener(pListener);
+	}
+
+	/**
+	 * Remove a listener. This listener will not be notified of log events
+	 * anymore.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public void removeLogListener(LogListener pListener) {
+		LogAndTraceBroker.getBroker().removeLogListener(pListener);
+	}
+
+	/**
+	 * Removes all listeners. Caution: This will also remove the internal
+	 * console and file loggers.
+	 */
+	public void clearLogListeners() {
+		LogAndTraceBroker.getBroker().clearLogListeners();
+	}
+
+	/**
+	 * Gets the registered log listeners including the internal console and file
+	 * loggers.
+	 * 
+	 * @return An unmodifiable list of listeners
+	 */
+	public List getLogListeners() {
+		return Collections.unmodifiableList(LogAndTraceBroker.getBroker().getLogListeners());
+	}
+
+	/**
+	 * Adds a listener for log messages. The listener will be notified of any
+	 * trace event.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public void addTraceListener(TraceListener pListener) {
+		LogAndTraceBroker.getBroker().addTraceListener(pListener);
+	}
+
+	/**
+	 * Removes a listener. This listener will not be notified of trace events
+	 * anymore.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public void removeTraceListener(TraceListener pListener) {
+		LogAndTraceBroker.getBroker().removeTraceListener(pListener);
+	}
+
+	/**
+	 * Removes all listeners. Caution this will also remove the internal trace
+	 * file listener.
+	 */
+	public void clearTraceListeners() {
+		LogAndTraceBroker.getBroker().clearTraceListeners();
+	}
+
+	/**
+	 * Gets the registered trace listeners including the internal console and
+	 * file loggers.
+	 * 
+	 * @return A unmodifiable list of listeners
+	 */
+	public List getTraceListeners() {
+		return Collections.unmodifiableList(LogAndTraceBroker.getBroker().getTraceListeners());
+	}
+
+	/**
+	 * Adds a listener for CIM-XML trace messages. The listener will be notified
+	 * of any CIM-XML trace event.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public void addCIMXMLTraceListener(CIMXMLTraceListener pListener) {
+		LogAndTraceBroker.getBroker().addCIMXMLTraceListener(pListener);
+	}
+
+	/**
+	 * Removes a CIM-XML trace listener. This listener will not be notified of
+	 * CIM-XML trace events anymore.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public void removeCIMXMLTraceListener(CIMXMLTraceListener pListener) {
+		LogAndTraceBroker.getBroker().removeCIMXMLTraceListener(pListener);
+	}
+
+	/**
+	 * Removes all CIM-XML trace listeners.
+	 */
+	public void clearCIMXMLTraceListeners() {
+		LogAndTraceBroker.getBroker().clearCIMXMLTraceListeners();
+	}
+
+	/**
+	 * Gets the registered CIM-XML trace listeners.
+	 * 
+	 * @return A unmodifiable list of listeners
+	 */
+	public List getCIMXMLTraceListeners() {
+		return Collections
+				.unmodifiableList(LogAndTraceBroker.getBroker().getCIMXMLTraceListeners());
+	}
+
+	/**
+	 * Returns the stream to which the CIM-XML traces are sent. A value of
+	 * null means that tracing is effectively disabled. Otherwise
+	 * the CIM-XML tracing can be activated either globally or per-connection
+	 * via the "sblim.wbem.cimxmlTracing" configuration property.
+	 * 
+	 * @return The CIM-XML trace stream
+	 */
+	public OutputStream getXmlTraceStream() {
+		return LogAndTraceBroker.getBroker().getXmlTraceStream();
+	}
+
+	/**
+	 * Sets the stream to which the CIM-XML traces are sent. A value of
+	 * null means that tracing is effectively disabled. Otherwise
+	 * the CIM-XML tracing can be activated either globally or per-connection
+	 * via the "sblim.wbem.cimxmlTracing" configuration property.
+	 * 
+	 * @param pStream
+	 *            The CIM-XML trace stream
+	 */
+	public void setXmlTraceStream(OutputStream pStream) {
+		LogAndTraceBroker.getBroker().setXmlTraceStream(pStream);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/LogListener.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/LogListener.java
similarity index 67%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/LogListener.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/LogListener.java
index d6bcfe2..6a647ef 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/LogListener.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/LogListener.java
@@ -1,68 +1,66 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-13  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.logging.Level;
-
-/**
- * The interface LogListener must be implemented if you want to attach your own
- * logging framework to the CIM Client.
- * 
- * @see LogAndTraceManager
- */
-public interface LogListener {
-
-	/**
-	 * Receive a message.
-	 * 
-	 * @param pLevel
-	 *            One of the message level identifiers, e.g. SEVERE
-	 * @param pMessageKey
-	 *            The identifier of the message
-	 * @param pMessage
-	 *            The message text
-	 * @param pParameters
-	 *            The parameters for the message
-	 */
-	public void log(Level pLevel, String pMessageKey, String pMessage, Object[] pParameters);
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-13  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.logging.Level;
+
+/**
+ * The interface LogListener must be implemented if you want to attach your own
+ * logging framework to the CIM Client.
+ * 
+ * @see LogAndTraceManager
+ */
+public interface LogListener {
+
+	/**
+	 * Receive a message.
+	 * 
+	 * @param pLevel
+	 *            One of the message level identifiers, e.g. SEVERE
+	 * @param pMessageKey
+	 *            The identifier of the message
+	 * @param pMessage
+	 *            The message text
+	 * @param pParameters
+	 *            The parameters for the message
+	 */
+	public void log(Level pLevel, String pMessageKey, String pMessage, Object[] pParameters);
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/TraceListener.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/TraceListener.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/TraceListener.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/TraceListener.java
index f8fc366..04adebc 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/TraceListener.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/TraceListener.java
@@ -1,83 +1,81 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-14  lupusalex    Make SBLIM client JSR48 compliant
- * 1711092    2006-05-02  lupusalex    Some fixes/additions of log&trace messages
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.logging.Level;
-
-/**
- * The interface TraceListener must be implemented if you want to attach your
- * own logging framework to the CIM Client.
- * 
- * @see LogAndTraceManager
- */
-public interface TraceListener {
-
-	/**
-	 * Receive a trace message.
-	 * 
-	 * @param pLevel
-	 *            One of the message level identifiers, e.g. FINE
-	 * @param pOrigin
-	 *            The java class/method/line-of-code sending the message. Might
-	 *            be null if algorithm failed to determine origin.
-	 * @param pMessage
-	 *            The message text
-	 */
-	public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage);
-
-	/**
-	 * Receive a trace message.
-	 * 
-	 * @param pLevel
-	 *            One of the message level identifiers, e.g. SEVERE
-	 * @param pOrigin
-	 *            The java class/method/line-of-code sending the message
-	 * @param pMessage
-	 *            The message text
-	 * @param pThrown
-	 *            The throwable associated with the message
-	 */
-	public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage, Throwable pThrown);
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-14  lupusalex    Make SBLIM client JSR48 compliant
+ * 1711092    2006-05-02  lupusalex    Some fixes/additions of log&trace messages
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.logging.Level;
+
+/**
+ * The interface TraceListener must be implemented if you want to attach your
+ * own logging framework to the CIM Client.
+ * 
+ * @see LogAndTraceManager
+ */
+public interface TraceListener {
+
+	/**
+	 * Receive a trace message.
+	 * 
+	 * @param pLevel
+	 *            One of the message level identifiers, e.g. FINE
+	 * @param pOrigin
+	 *            The java class/method/line-of-code sending the message. Might
+	 *            be null if algorithm failed to determine origin.
+	 * @param pMessage
+	 *            The message text
+	 */
+	public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage);
+
+	/**
+	 * Receive a trace message.
+	 * 
+	 * @param pLevel
+	 *            One of the message level identifiers, e.g. SEVERE
+	 * @param pOrigin
+	 *            The java class/method/line-of-code sending the message
+	 * @param pMessage
+	 *            The message text
+	 * @param pThrown
+	 *            The throwable associated with the message
+	 */
+	public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage, Throwable pThrown);
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/WBEMClientSBLIM.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMClientSBLIM.java
similarity index 88%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/WBEMClientSBLIM.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMClientSBLIM.java
index 5acae87..056329c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/WBEMClientSBLIM.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMClientSBLIM.java
@@ -1,278 +1,277 @@
-/*
-  WBEMClientSBLIM.java
-
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-08  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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
- * 2942520    2010-03-08  blaschke-oss IPv6 link local address with scope_id including a dot not supported
- * 3516848    2012-04-11  blaschke-oss enumerateNamespaces() method to WBEMClient
- * 3522904    2012-05-02  blaschke-oss Add new API WBEMClientSBLIM.isActive()
- *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.URI;
-import java.util.Locale;
-import java.util.Properties;
-
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import javax.net.SocketFactory;
-import javax.security.auth.Subject;
-import org.sentrysoftware.wbem.javax.wbem.CloseableIterator;
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-import org.sentrysoftware.wbem.javax.wbem.client.WBEMClient;
-
-/**
- * Class WBEMClientSBLIM contains the SBLIM CIM Client specific extensions to
- * the WBEMClient interface.
- * 
- * @see WBEMClient
- * 
- */
-public interface WBEMClientSBLIM extends WBEMClient {
-
-	/**
-	 * Initialize the client connection. This must be called before any
-	 * operations. This must only be called once.
-	 * 
-	 * @param pUri
-	 *            The protocol and host to use. Any other fields will be
-	 *            ignored.
-	 * @param pSubject
-	 *            The principal/credential pairs for this connection.
-	 * @param pLocales
-	 *            An array of locales in order of priority of preference.
-	 * @throws IllegalArgumentException
-	 *             If the host or scheme portion of the object path is null, or
-	 *             if the protocol is not supported.
-	 * @throws WBEMException
-	 *             If the protocol adapter or security cannot be initialized.
-	 */
-	public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
-			throws IllegalArgumentException, WBEMException;
-
-	/**
-	 * Returns the client specific configuration properties. Note that only
-	 * these properties are returned that override the global settings. The
-	 * global settings can be accessed via the java.lang.System
-	 * class.
      
-	 * If the no client specific configuration is set, this method returns
-	 * null
-	 * 
-	 * @return The configuration properties
-	 * @see System#getProperties()
-	 */
-	public Properties getProperties();
-
-	/**
-	 * Sets the client specific configuration properties. Any previously set
-	 * client specific properties are overwritten. The given properties are
-	 * handled as an overlay on the global settings. That means that properties
-	 * specified here override the corresponding global properties whereas
-	 * properties not specified here are taken from the global properties. The
-	 * global settings can be accessed via the java.lang.System
-	 * class.
-	 * 
-	 * @param pProperties
-	 *            The session specific properties. null resets this
-	 *            client to the global settings.
-	 * 
-	 * @see System#setProperties(Properties)
-	 */
-	public void setProperties(Properties pProperties);
-
-	/**
-	 * Returns the effective value of a given configuration property. The method
-	 * will return the local value of the current thread if one was set or
-	 * otherwise client specific value if one was set or otherwise the global
-	 * value if one was set or otherwise the default value. Valid property names
-	 * can be found in the WBEMConfigurationProperties interface.
-	 * 
-	 * @param pKey
-	 *            The name of the configuration property
-	 * 
-	 * @return The value of the given configuration property
-	 * @see WBEMConfigurationProperties
-	 */
-	public String getProperty(String pKey);
-
-	/**
-	 * Sets a client specific configuration property. This property will
-	 * override the corresponding global property for this client instance. The
-	 * global settings can be accessed via the java.lang.System
-	 * class. Valid property names can be found in the
-	 * WBEMConfigurationProperties interface. Unknown properties
-	 * are ignored.
-	 * 
-	 * @param pKey
-	 *            The name of the configuration property
-	 * @param pValue
-	 *            The value of the configuration property. null
-	 *            resets to the global setting.
-	 * @see WBEMConfigurationProperties
-	 * @see System#setProperty(String, String)
-	 */
-	public void setProperty(String pKey, String pValue);
-
-	/**
-	 * Returns the configuration properties that are local to the current
-	 * thread. Note that only these properties are returned that override the
-	 * global and the client settings. The global settings can be accessed via
-	 * the java.lang.System class, the client setting via
-	 * getProperties().
      
-	 * If the no client specific configuration is set, this method returns
-	 * null
-	 * 
-	 * @return The configuration properties
-	 * @see System#getProperties()
-	 * @see #getProperties()
-	 */
-	public Properties getLocalProperties();
-
-	/**
-	 * Sets the configuration properties that are local to the current thread.
-	 * Any previously set local properties (of the current thread) are
-	 * overwritten. The given properties are handled as an overlay on the global
-	 * settings and the client settings. That means that properties specified
-	 * here override the corresponding properties whereas properties not
-	 * specified here are taken from the client or global properties. The global
-	 * settings can be accessed via the java.lang.System class, the
-	 * client setting via getProperties().
-	 * 
-	 * @param pProperties
-	 *            The thread specific properties. null remove the
-	 *            local setting of the current thread.
-	 * 
-	 * @see System#setProperties(Properties)
-	 * @see #setProperties(Properties)
-	 */
-	public void setLocalProperties(Properties pProperties);
-
-	/**
-	 * Sets a local configuration property for the current thread. This property
-	 * will override the corresponding global and client property for this
-	 * client instance. The global settings can be accessed via the
-	 * java.lang.System class, the client setting via
-	 * getProperties(). Valid property names can be found in the
-	 * WBEMConfigurationProperties interface. Unknown properties
-	 * are ignored.
-	 * 
-	 * @param pKey
-	 *            The name of the configuration property
-	 * @param pValue
-	 *            The value of the configuration property. null
-	 *            resets to the global setting.
-	 * @see WBEMConfigurationProperties
-	 * @see System#setProperty(String, String)
-	 * @see #setProperty(String, String)
-	 */
-	public void setLocalProperty(String pKey, String pValue);
-
-	/**
-	 * Gets the custom socket factory if one is set. The client uses this
-	 * factory for socket creation instead of the default one.
-	 * 
-	 * @return The custom factory used for socket creation. null
-	 *         indicates set the JRE default factory is used.
-	 */
-	public SocketFactory getCustomSocketFactory();
-
-	/**
-	 * Sets a custom socket factory. The client will use this factory for socket
-	 * creation instead of the JRE default.
-	 * 
-	 * @param pFactory
-	 *            The factory to use for socket creation. null
-	 *            resets to the JRE default factory.
-	 * @throws UnsupportedOperationException
-	 *             Some protocols might not communicate via TCP sockets
-	 */
-	public void setCustomSocketFactory(SocketFactory pFactory) throws UnsupportedOperationException;
-
-	/**
-	 * Enumerate the names of the instances of CIM namespaces.
-	 * 
-	 * @param pNamespace
-	 *            The Interop Namespace, if known. If null, the default Interop
-	 *            Namespace names defined by DSP1033 are used.
-	 * @return A CloseableIterator of CIMObjectPaths.
-	 * @throws WBEMException
-	 *             If unsuccessful, one of the following status codes must be
-	 *             returned. The ORDERED list is:
-	 * 
-	 *             
      -	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
      
-	 */
-	public CloseableIterator enumerateNamespaces(String pNamespace)
-			throws WBEMException;
-
-	/**
-	 * Returns an indication of whether the client is active (initialized and
-	 * not closed) or inactive (not initialized or closed).
-	 * 
-	 * @return true if client is active, false
-	 *         otherwise.
-	 */
-	public boolean isActive();
-
-	/**
-	 * Sends the indication to the specified recipient.
-	 * 
-	 * @param pRecipient
-	 *            URI of indication recipient.
-	 * @param pIndication
-	 *            Indication.
-	 * @return true if indication received successfully,
-	 *         false otherwise.
-	 * @throws WBEMException
-	 *             If unsuccessful, one of the following status codes must be
-	 *             returned. The ORDERED list is:
-	 * 
-	 *             
      -	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
-	 *            or otherwise incorrect parameters)
-	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
      
-	 */
-	public boolean sendIndication(URI pRecipient, CIMInstance pIndication) throws WBEMException;
-}
+/*
+  WBEMClientSBLIM.java
+
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-08  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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
+ * 2942520    2010-03-08  blaschke-oss IPv6 link local address with scope_id including a dot not supported
+ * 3516848    2012-04-11  blaschke-oss enumerateNamespaces() method to WBEMClient
+ * 3522904    2012-05-02  blaschke-oss Add new API WBEMClientSBLIM.isActive()
+ *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
+ */
+
+package org.metricshub.wbem.sblim.cimclient;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.URI;
+import java.util.Locale;
+import java.util.Properties;
+
+import javax.net.SocketFactory;
+import javax.security.auth.Subject;
+
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.wbem.CloseableIterator;
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.javax.wbem.client.WBEMClient;
+
+/**
+ * Class WBEMClientSBLIM contains the SBLIM CIM Client specific extensions to
+ * the WBEMClient interface.
+ * 
+ * @see WBEMClient
+ * 
+ */
+public interface WBEMClientSBLIM extends WBEMClient {
+
+	/**
+	 * Initialize the client connection. This must be called before any
+	 * operations. This must only be called once.
+	 * 
+	 * @param pUri
+	 *            The protocol and host to use. Any other fields will be
+	 *            ignored.
+	 * @param pSubject
+	 *            The principal/credential pairs for this connection.
+	 * @param pLocales
+	 *            An array of locales in order of priority of preference.
+	 * @throws IllegalArgumentException
+	 *             If the host or scheme portion of the object path is null, or
+	 *             if the protocol is not supported.
+	 * @throws WBEMException
+	 *             If the protocol adapter or security cannot be initialized.
+	 */
+	public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
+			throws IllegalArgumentException, WBEMException;
+
+	/**
+	 * Returns the client specific configuration properties. Note that only
+	 * these properties are returned that override the global settings. The
+	 * global settings can be accessed via the java.lang.System
+	 * class.
      
+	 * If the no client specific configuration is set, this method returns
+	 * null
+	 * 
+	 * @return The configuration properties
+	 * @see System#getProperties()
+	 */
+	public Properties getProperties();
+
+	/**
+	 * Sets the client specific configuration properties. Any previously set
+	 * client specific properties are overwritten. The given properties are
+	 * handled as an overlay on the global settings. That means that properties
+	 * specified here override the corresponding global properties whereas
+	 * properties not specified here are taken from the global properties. The
+	 * global settings can be accessed via the java.lang.System
+	 * class.
+	 * 
+	 * @param pProperties
+	 *            The session specific properties. null resets this
+	 *            client to the global settings.
+	 * 
+	 * @see System#setProperties(Properties)
+	 */
+	public void setProperties(Properties pProperties);
+
+	/**
+	 * Returns the effective value of a given configuration property. The method
+	 * will return the local value of the current thread if one was set or
+	 * otherwise client specific value if one was set or otherwise the global
+	 * value if one was set or otherwise the default value. Valid property names
+	 * can be found in the WBEMConfigurationProperties interface.
+	 * 
+	 * @param pKey
+	 *            The name of the configuration property
+	 * 
+	 * @return The value of the given configuration property
+	 * @see WBEMConfigurationProperties
+	 */
+	public String getProperty(String pKey);
+
+	/**
+	 * Sets a client specific configuration property. This property will
+	 * override the corresponding global property for this client instance. The
+	 * global settings can be accessed via the java.lang.System
+	 * class. Valid property names can be found in the
+	 * WBEMConfigurationProperties interface. Unknown properties
+	 * are ignored.
+	 * 
+	 * @param pKey
+	 *            The name of the configuration property
+	 * @param pValue
+	 *            The value of the configuration property. null
+	 *            resets to the global setting.
+	 * @see WBEMConfigurationProperties
+	 * @see System#setProperty(String, String)
+	 */
+	public void setProperty(String pKey, String pValue);
+
+	/**
+	 * Returns the configuration properties that are local to the current
+	 * thread. Note that only these properties are returned that override the
+	 * global and the client settings. The global settings can be accessed via
+	 * the java.lang.System class, the client setting via
+	 * getProperties().
      
+	 * If the no client specific configuration is set, this method returns
+	 * null
+	 * 
+	 * @return The configuration properties
+	 * @see System#getProperties()
+	 * @see #getProperties()
+	 */
+	public Properties getLocalProperties();
+
+	/**
+	 * Sets the configuration properties that are local to the current thread.
+	 * Any previously set local properties (of the current thread) are
+	 * overwritten. The given properties are handled as an overlay on the global
+	 * settings and the client settings. That means that properties specified
+	 * here override the corresponding properties whereas properties not
+	 * specified here are taken from the client or global properties. The global
+	 * settings can be accessed via the java.lang.System class, the
+	 * client setting via getProperties().
+	 * 
+	 * @param pProperties
+	 *            The thread specific properties. null remove the
+	 *            local setting of the current thread.
+	 * 
+	 * @see System#setProperties(Properties)
+	 * @see #setProperties(Properties)
+	 */
+	public void setLocalProperties(Properties pProperties);
+
+	/**
+	 * Sets a local configuration property for the current thread. This property
+	 * will override the corresponding global and client property for this
+	 * client instance. The global settings can be accessed via the
+	 * java.lang.System class, the client setting via
+	 * getProperties(). Valid property names can be found in the
+	 * WBEMConfigurationProperties interface. Unknown properties
+	 * are ignored.
+	 * 
+	 * @param pKey
+	 *            The name of the configuration property
+	 * @param pValue
+	 *            The value of the configuration property. null
+	 *            resets to the global setting.
+	 * @see WBEMConfigurationProperties
+	 * @see System#setProperty(String, String)
+	 * @see #setProperty(String, String)
+	 */
+	public void setLocalProperty(String pKey, String pValue);
+
+	/**
+	 * Gets the custom socket factory if one is set. The client uses this
+	 * factory for socket creation instead of the default one.
+	 * 
+	 * @return The custom factory used for socket creation. null
+	 *         indicates set the JRE default factory is used.
+	 */
+	public SocketFactory getCustomSocketFactory();
+
+	/**
+	 * Sets a custom socket factory. The client will use this factory for socket
+	 * creation instead of the JRE default.
+	 * 
+	 * @param pFactory
+	 *            The factory to use for socket creation. null
+	 *            resets to the JRE default factory.
+	 * @throws UnsupportedOperationException
+	 *             Some protocols might not communicate via TCP sockets
+	 */
+	public void setCustomSocketFactory(SocketFactory pFactory) throws UnsupportedOperationException;
+
+	/**
+	 * Enumerate the names of the instances of CIM namespaces.
+	 * 
+	 * @param pNamespace
+	 *            The Interop Namespace, if known. If null, the default Interop
+	 *            Namespace names defined by DSP1033 are used.
+	 * @return A CloseableIterator of CIMObjectPaths.
+	 * @throws WBEMException
+	 *             If unsuccessful, one of the following status codes must be
+	 *             returned. The ORDERED list is:
+	 * 
+	 *             
      +	 *      CIM_ERR_FAILED (some other unspecified error occurred)
+	 * 
      
+	 */
+	public CloseableIterator enumerateNamespaces(String pNamespace)
+			throws WBEMException;
+
+	/**
+	 * Returns an indication of whether the client is active (initialized and
+	 * not closed) or inactive (not initialized or closed).
+	 * 
+	 * @return true if client is active, false
+	 *         otherwise.
+	 */
+	public boolean isActive();
+
+	/**
+	 * Sends the indication to the specified recipient.
+	 * 
+	 * @param pRecipient
+	 *            URI of indication recipient.
+	 * @param pIndication
+	 *            Indication.
+	 * @return true if indication received successfully,
+	 *         false otherwise.
+	 * @throws WBEMException
+	 *             If unsuccessful, one of the following status codes must be
+	 *             returned. The ORDERED list is:
+	 * 
+	 *             
      +	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
+	 *            or otherwise incorrect parameters)
+	 *      CIM_ERR_FAILED (some other unspecified error occurred)
+	 * 
      
+	 */
+	public boolean sendIndication(URI pRecipient, CIMInstance pIndication) throws WBEMException;
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/WBEMConfigurationProperties.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMConfigurationProperties.java
similarity index 95%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/WBEMConfigurationProperties.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMConfigurationProperties.java
index be80a47..e1a36c4 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/WBEMConfigurationProperties.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMConfigurationProperties.java
@@ -1,1154 +1,1152 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-11-08  lupusalex    Make SBLIM client JSR48 compliant
- * 1688273    2007-04-19  lupusalex    Full support of HTTP trailers
- * 1815707    2007-10-30  ebak         TLS support
- * 1827728    2007-11-12  ebak         embeddedInstances: attribute EmbeddedObject not set
- * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2372030    2008-12-01  blaschke-oss Add property to control synchronized SSL handshaking
- * 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
- * 2846231    2009-09-23  rgummada     connection failure on CIMOM w/o user/pw
- * 2930341    2010-01-12  blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0
- * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
- * 2970881    2010-03-15  blaschke-oss Add property to control EmbeddedObject case
- * 3046073    2010-09-07  blaschke-oss Performance hit due to socket conn. creation with timeout
- * 3111718    2010-11-18  blaschke-oss org.sblim.cimclient SSL Code is using the wrong SSL Property
- * 3185763    2011-02-25  blaschke-oss Reliable indication support - Phase 1
- * 3195069    2011-02-28  blaschke-oss Need support to disable SSL Handshake
- * 3197423    2011-03-02  blaschke-oss Server authentication with PegasusLocalAuthInfo failing
- * 3277928    2011-04-06  blaschke-oss CIM-XML tracing cannot be enabled in the field
- * 3206904    2011-05-03  blaschke-oss Indication listener deadlock causes JVM to run out sockets
- * 3288721    2011-05-20  blaschke-oss Need the function of indication reordering
- * 3459036    2011-12-13  blaschke-oss Linked list for RI queue not efficient for many LDs
- * 3485074    2012-02-06  blaschke-oss An Indication trace request
- * 3492246    2012-02-23  blaschke-oss Rename new indication trace property
- * 3492214    2012-02-23  blaschke-oss Add a SenderIPAddress property indications
- * 3492224    2012-02-23  blaschke-oss Need two different timeouts for Socket connections
- * 3521157    2012-05-10  blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
- * 3524050    2012-06-06  blaschke-oss Improve WWW-Authenticate in HTTPClient.java
- * 3536399    2012-08-25  hellerda     Add client/listener peer authentication properties
- * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
- * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
- *    2618    2013-02-27  blaschke-oss Need to add property to disable weak cipher suites for the secure indication
- *    2628    2013-03-26  blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched
- *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
- *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
- *    2647    2013-07-01  blaschke-oss Add two ssl protocol properties for http server and client
- *    2654    2013-07-29  blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF
- *    2151    2013-08-20  blaschke-oss gzip compression not supported
- *    2711    2013-11-13  blaschke-oss LOCALNAMESPACEPATH allows 0 NAMESPACE children
- */
-package org.sentrysoftware.wbem.sblim.cimclient;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * The interface WBEMConfigurationProperties contains the names of all
- * configuration properties that are recognized by the CIM Client.
- * 
- */
-public interface WBEMConfigurationProperties {
-
-	/**
-	 * A URL string giving the location of the CIM client config file. 
      
-	 * 
      
-	 * By default the SBLIM CIM Client looks for
-	 * 
        
-	 * 
      • file:sblim-cim-client2.properties
        • 
-	 * 
      • file:%USER_HOME%/sblim-cim-client2.properties
        • 
-	 * 
      • file:/etc/java/sblim-cim-client2.properties
        • 
-	 * 
      
-	 * The first file found will be used. The default search list is not applied
-	 * if this property is set, even if the given URL does not exist.
      
-	 */
-	public static final String CONFIG_URL = "sblim.wbem.configURL";
-
-	/**
-	 * Sets the minimum level for messages to be written to the log file.
      
-	 * 
      
-	 * Type: Discrete
      
-	 * Recognition: Startup
      
-	 * Range: OFF, SEVERE, WARNING, INFO, CONFIG, ALL
      
-	 * Default: OFF, which disables file logging completely.
-	 */
-	public static final String LOG_FILE_LEVEL = "sblim.wbem.logFileLevel";
-
-	/**
-	 * A string specifying the location of the log file. The string may include
-	 * the following special components that will be replaced at runtime:
      
-	 * 
        
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
        /the local pathname separator
        %tthe system temporary directory
        %hthe value of the "user.home" system property
        %gthe generation number to distinguish rotated logs
        %ua unique number to resolve conflicts
        %%translates to a single percent sign "%"
        
-	 * 
      
-	 * Thus for example a pattern of %t/java%g.log with a count of
-	 * 2 would typically cause log files to be written on Unix to
-	 * /var/tmp/java2.log
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: Startup
      
-	 * Default: %t/cimclient_log_%g.txt.
-	 */
-	public static final String LOG_FILE_LOCATION = "sblim.wbem.logFileLocation";
-
-	/**
-	 * Sets the maximum size in bytes of a single log file. When the limit is
-	 * reached a new file is created. A limit of zero will create a new log file
-	 * for every log record !
      
-	 * 
      
-	 * Type: Integer
      
-	 * Recognition: Startup
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 100.000
      
-	 */
-	public static final String LOG_FILE_SIZE_LIMIT = "sblim.wbem.logFileSizeLimit";
-
-	/**
-	 * Sets the number of log files to cycle through. When the number is
-	 * exceeded the oldest file is dropped.
      
-	 * 
      
-	 * Type: Integer
      
-	 * Recognition: Startup
      
-	 * Range: 1 .. Integer.MAX_VALUE
      
-	 * Default: 5
      
-	 */
-	public static final String LOG_FILE_COUNT = "sblim.wbem.logFileCount";
-
-	/**
-	 * Sets the minimum level for messages to be written to the console logger
-	 * file.
      
-	 * 
      
-	 * Type: Discrete
      
-	 * Recognition: Startup
      
-	 * Range: OFF, SEVERE, WARNING, INFO, CONFIG, ALL
      
-	 * Default: OFF, which disables console logging completely.
-	 */
-	public static final String LOG_CONSOLE_LEVEL = "sblim.wbem.logConsoleLevel";
-
-	/**
-	 * Sets the type of the console logger. Maybe either message log or trace
-	 * log.
      
-	 * 
      
-	 * Type: Discrete
      
-	 * Recognition: Startup
      
-	 * Range: MESSAGE, TRACE
      
-	 * Default: MESSAGE.
-	 */
-	public static final String LOG_CONSOLE_TYPE = "sblim.wbem.logConsoleType";
-
-	/**
-	 * Sets the minimum level for messages to be written to the trace file.
      
-	 * 
      
-	 * Type: Discrete
      
-	 * Recognition: Startup
      
-	 * Range:
-	 * OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, ALL
      
-	 * Default: OFF, which disables file tracing completely
      
-	 */
-	public static final String TRACE_FILE_LEVEL = "sblim.wbem.traceFileLevel";
-
-	/**
-	 * A string specifying the location of the trace file. The string may
-	 * include the following special components that will be replaced at
-	 * runtime:
      
-	 * 
        
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
        /the local pathname separator
        %tthe system temporary directory
        %hthe value of the "user.home" system property
        %gthe generation number to distinguish rotated logs
        %ua unique number to resolve conflicts
        %%translates to a single percent sign "%"
        
-	 * 
      
-	 * Thus for example a pattern of %t/java%g.log with a count of
-	 * 2 would typically cause log files to be written on Unix to
-	 * /var/tmp/java2.log
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: Startup
      
-	 * Default: %t/cimclient_trace_%g.txt
      
-	 */
-	public static final String TRACE_FILE_LOCATION = "sblim.wbem.traceFileLocation";
-
-	/**
-	 * Sets the maximum size in bytes of a single log file. When the limit is
-	 * reached a new file is created. A limit of zero creates a new file for
-	 * each trace record !
      
-	 * 
      
-	 * Type: Integer
      
-	 * Recognition: Startup
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 1.000.000
      
-	 */
-	public static final String TRACE_FILE_SIZE_LIMIT = "sblim.wbem.traceFileSizeLimit";
-
-	/**
-	 * Sets the number of log files to cycle through. When the number is
-	 * exceeded the oldest file is dropped.
      
-	 * 
      
-	 * Type: Integer
      
-	 * Recognition: Startup
      
-	 * Range: 1 .. Integer.MAX_VALUE
      
-	 * Default: 5
      
-	 */
-	public static final String TRACE_FILE_COUNT = "sblim.wbem.traceFileCount";
-
-	/**
-	 * The timeout for http requests. A timeout of zero is interpreted as
-	 * infinite timeout.
      
-	 * 
      
-	 * Type: Integer
      
-	 * Unit: Milliseconds
      
-	 * Recognition: Anytime
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 0
      
-	 */
-	public static final String HTTP_TIMEOUT = "sblim.wbem.httpTimeout";
-
-	/**
-	 * The size of the internal http connection pools. Each
-	 * WBEMClient instance has it's own http connection pool. A
-	 * positive value defines the number of connections, zero that no connection
-	 * will be reused, and -1 all connections will be reused (when it's
-	 * possible).
      
-	 * 
      
-	 * Type: Integer
      
-	 * Recognition: Anytime
      
-	 * Range: -1, 0, 1 .. Integer.MAX_VALUE
      
-	 * Default: 16
      
-	 */
-	public static final String HTTP_POOL_SIZE = "sblim.wbem.httpPoolSize";
-
-	/**
-	 * The Java class name of the authentication module to use for http
-	 * authentication. 
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next authentication
      
-	 * Range:
-	 * 
-	 * org.sblim.cimclient.internal.http.WwwAuthInfo, org.sblim.cimclient.internal.http.PegasusLocalAuthInfo or any self-written subclass of org.sblim.cimclient.internal.http.AuthorizationInfo
-	 * 
      
-	 * Default: org.sblim.cimclient.internal.http.WwwAuthInfo
      
-	 */
-	public static final String HTTP_AUTHENTICATION_MODULE = "sblim.wbem.httpAuthModule";
-
-	/**
-	 * The WWW-Authenticate information to use when sending the first request to
-	 * a server. 
      
-	 * 
      
-	 * Note: This string must exactly match what the server returns in the
      
-	 * WWW-Authenticate field of an HTTP 401 response when authentication
      
-	 * fails. The following two strings are examples:
      
-	 * 
      
-	 * 
-	 * 
-	 * Basic realm="Secure Area"
-	 * Digest realm="testrealm@host.com",qop="auth,auth-int",nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",opaque="5ccc069c403ebaf9f0171e9517f40e41"
-	 * 
-	 * 
-	 * Type: String
      
-	 * Recognition: On next authentication
      
-	 * Range: Basic, Digest
      
-	 * Default: none
      
-	 */
-	public static final String HTTP_WWW_AUTHENTICATE_INFO = "sblim.wbem.httpWwwAuthenticateInfo";
-
-	/**
-	 * Specifies if MPOST is used for transmitting http messages. If false, POST
-	 * is used.
      
-	 * 
      
-	 * Type: Boolean
      
-	 * Recognition: Anytime
      
-	 * Range: true, false
      
-	 * Default: true
      
-	 */
-	public static final String HTTP_USE_MPOST = "sblim.wbem.httpMPOST";
-
-	/**
-	 * Specifies if chunking is used for transmitting http messages.
      
-	 * 
      
-	 * Type: Boolean
      
-	 * Recognition: Anytime
      
-	 * Range: true, false
      
-	 * Default: true
      
-	 */
-	public static final String HTTP_USE_CHUNKING = "sblim.wbem.httpChunking";
-
-	/**
-	 * Specifies the http protocol version to use. This option is useful if the
-	 * protocol negotiation fails.
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: Anytime
      
-	 * Range: 1.0, 1.1
      
-	 * Default: 1.1
      
-	 */
-	public static final String HTTP_VERSION = "sblim.wbem.httpVersion";
-
-	/**
-	 * Specifies how often the client will retry to connect to a CIMOM which
-	 * refused the connection in the first place.
      
-	 * 
      
-	 * Type: Integer
      
-	 * Recognition: Anytime
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 0
      
-	 */
-	public static final String HTTP_CONNECTION_RETRIES = "sblim.wbem.httpConnectionRetries";
-
-	/**
-	 * Specifies if the client will discard and request again http documents
-	 * with less than a given number of bytes.
      
-	 * 
      
-	 * Type: Boolean
      
-	 * Recognition: Anytime
      
-	 * Range: true, false
      
-	 * Default: false
      
-	 */
-	public static final String HTTP_ENABLE_CONTENT_LENGTH_RETRY = "sblim.wbem.httpEnableContentLengthRetry";
-
-	/**
-	 * Specifies the threshold above which a http document is regarded as valid
-	 * by the content length retry algorithm.
      
-	 * 
      
-	 * Type: Integer
      
-	 * Recognition: Anytime
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 50
      
-	 */
-	public static final String HTTP_CONTENT_LENGTH_THRESHOLD = "sblim.wbem.httpContentLengthThreshold";
-
-	/**
-	 * The file path of the SSL keystore.
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next SSL connection
      
-	 * Default: none
      
-	 */
-	public static final String KEYSTORE_PATH = "javax.net.ssl.keyStore";
-
-	/**
-	 * The type of the keystore.
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next SSL connection
      
-	 * Range: PKCS12, JKS, ...
      
-	 * Default: JKS
      
-	 */
-	public static final String KEYSTORE_TYPE = "javax.net.ssl.keyStoreType";
-
-	/**
-	 * The password of the keystore.
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next SSL connection
      
-	 * Default: none
      
-	 */
-	public static final String KEYSTORE_PASSWORD = "javax.net.ssl.keyStorePassword";
-
-	/**
-	 * The file path of the SSL truststore.
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next SSL connection
      
-	 * Default: none
      
-	 */
-	public static final String TRUSTSTORE_PATH = "javax.net.ssl.trustStore";
-
-	/**
-	 * The type of the truststore.
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next SSL connection
      
-	 * Range: PKCS12, JKS, ...
      
-	 * Default: JKS
      
-	 */
-	public static final String TRUSTSTORE_TYPE = "javax.net.ssl.trustStoreType";
-
-	/**
-	 * The password of the truststore.
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next SSL connection
      
-	 * Default: none
      
-	 */
-	public static final String TRUSTSTORE_PASSWORD = "javax.net.ssl.trustStorePassword";
-
-	/**
-	 * The provider to use for creation of SSL client sockets.
      
-	 * 
      
-	 * Security property: JRE global access via Security.setProperty() and Security.getProperty() !
-	 * 
      
-	 * 
      
-	 * Type: Java class name
      
-	 * Recognition: On next SSL connection
      
-	 * Default: Security.getProviders("SSLContext.SSL")
      
-	 */
-	public static final String SSL_SOCKET_PROVIDER = "sblim.wbem.sslSocketProvider";
-
-	/**
-	 * The provider to use for creation of SSL server sockets.
      
-	 * 
      
-	 * Security property: JRE global access via Security.setProperty() and Security.getProperty() !
-	 * 
      
-	 * 
      
-	 * Type: Java class name
      
-	 * Recognition: On next SSL connection
      
-	 * Default: Security.getProviders("SSLContext.SSL")
      
-	 */
-	public static final String SSL_SERVER_SOCKET_PROVIDER = "sblim.wbem.sslServerSocketProvider";
-
-	/**
-	 * The protocol used for SSLContext.getInstance(String protocol). For
-	 * IBMJSSE2 provider it can be "SSL_TLS".
      
-	 * 
      
-	 * Security property: JRE global access via
-	 * Security.setProperty() and
-	 * Security.getProperty()
      
-	 * Recognition: On next SSL connection
      
-	 * Default: "SSL"
-	 */
-	public static final String SSL_PROTOCOL = "ssl.Protocol";
-
-	/**
-	 * The protocol used for SSLContext.getInstance(String protocol) by a
-	 * client. This property overrides any value set via the ssl.Protocol
-	 * property.
      
-	 * 
      
-	 * Recognition: On next SSL connection
      
-	 * Default: none
-	 */
-	public static final String SSL_CLIENT_PROTOCOL = "sblim.wbem.sslClientProtocol";
-
-	/**
-	 * The protocol used for SSLContext.getInstance(String protocol) by a
-	 * listener. This property overrides any value set via the ssl.Protocol
-	 * property.
      
-	 * 
      
-	 * Recognition: On next SSL connection
      
-	 * Default: none
-	 */
-	public static final String SSL_LISTENER_PROTOCOL = "sblim.wbem.sslListenerProtocol";
-
-	/**
-	 * The key manager factory algorithm name.
      
-	 * 
      
-	 * Security property: JRE global access via Security.setProperty() and Security.getProperty() !
-	 * 
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next SSL connection
      
-	 * Range: IbmX509, SunX509, ...
      
-	 * Default: JRE specific
      
-	 */
-	public static final String SSL_KEYMANAGER_ALGORITHM = "ssl.KeyManagerFactory.algorithm";
-
-	/**
-	 * The trust manager factory algorithm name.
      
-	 * 
      
-	 * Security property: JRE global access via Security.setProperty() and Security.getProperty() !
-	 * 
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next SSL connection
      
-	 * Range: IbmX509, SunX509, ...
      
-	 * Default: JRE specific
      
-	 */
-	public static final String SSL_TRUSTMANAGER_ALGORITHM = "ssl.TrustManagerFactory.algorithm";
-
-	/**
-	 * Determines if a HTTPS client will attempt to authenticate the server
-	 * (i.e. CIMOM) by verifying the server certificate.
      
-	 * 
      
-	 * If false, do not attempt verification. If true, the client will attempt
-	 * to verify the server certificate against the contents of the truststore;
-	 * in this case a valid path must be defined in "javax.net.ssl.trustStore"
-	 * or no connection will be permitted. 
      
-	 * 
      
-	 * Type: Boolean
      
-	 * Recognition: On initialization of a new client
      
-	 * Default: false
      
-	 */
-	public static final String SSL_CLIENT_PEER_VERIFICATION = "sblim.wbem.sslClientPeerVerification";
-
-	/**
-	 * Determines how a HTTPS listener will handle authentication of a client
-	 * (i.e. indication sender):
      
-	 * 
        
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
        ignoredo not examine the client certificate
        acceptexamine client certificate if presented; do not fail if not presented
-	 * 
        requireexamine client certificate; fail if not presented
        
-	 * 
      
-	 * If set to "ignore", do not attempt verification. If set to "accept" or
-	 * "require", the listener will attempt to verify the sender against the
-	 * contents of the truststore; in this case a valid path must be defined in
-	 * "javax.net.ssl.trustStore" or no connection will be permitted. 
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next call to addListener()
      
-	 * Default: ignore
      
-	 */
-	public static final String SSL_LISTENER_PEER_VERIFICATION = "sblim.wbem.sslListenerPeerVerification";
-
-	/**
-	 * The comma-separated list of cipher suites that are to be disabled by the
-	 * client when connecting via an SSL socket. In general, this is the list of
-	 * cipher suites considered "too weak" for use in a particular environment.
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On initialization of a new client
      
-	 * Default: none
      
-	 */
-	public static final String SSL_CLIENT_CIPHER_SUITES_TO_DISABLE = "sblim.wbem.sslClientCipherSuitesToDisable";
-
-	/**
-	 * The comma-separated list of cipher suites that are to be disabled by the
-	 * listener when connecting via an SSL socket. In general, this is the list
-	 * of cipher suites considered "too weak" for use in a particular
-	 * environment.
      
-	 * 
      
-	 * Type: String
      
-	 * Recognition: On next call to addListener()
      
-	 * Default: none
      
-	 */
-	public static final String SSL_LISTENER_CIPHER_SUITES_TO_DISABLE = "sblim.wbem.sslListenerCipherSuitesToDisable";
-
-	/**
-	 * Specifies the XML parser for parsing CIM-XML responses.
      
-	 * The SAX parser is the default choice since it is fast, resource saving
-	 * and interoperable. The streaming algorithm of the PULL parser uses the
-	 * fewest possible resources but at the prize to keep the CIMOMs response
-	 * open for a long time. That works with many but not all CIMOMs. The DOM
-	 * parser is slow and resource hungry but nice to debug.
      
-	 * 
      
-	 * Type: Discrete
      
-	 * Recognition: Anytime
      
-	 * Range: DOM, PULL, SAX
      
-	 * Default: SAX
      
-	 */
-	public static final String CIMXML_PARSER = "sblim.wbem.cimxmlParser";
-
-	/**
-	 * Enables or disables tracing of CIM-XML communication. The trace is sent
-	 * to an output stream the application has to set via the LogAndTraceManager
-	 * class.
      
-	 * 
      
-	 * Type: Boolean
      
-	 * Recognition: Anytime
      
-	 * Range: true, false
      
-	 * Default: false
      
-	 */
-	public static final String CIMXML_TRACING = "sblim.wbem.cimxmlTracing";
-
-	/**
-	 * Specifies the stream to use for tracing CIM-XML communication in the
-	 * event the application does not set one via the LogAndTraceManager class.
-	 * This stream can either be standard output (System.out), standard error
-	 * output (System.err) or a filename to be opened by the client.
-	 * 
-	 * Note: This property has no effect unless sblim.wbem.cimxmlTracing is set
-	 * to true.
-	 * 
-	 * Note: This property has no effect if the application already set the
-	 * stream prior to client initialization. If the application sets the stream
-	 * after client initialization, the stream specified by this property is
-	 * overridden.
-	 * 
-	 * Note: If a filename is specified, it is opened and all CIM-XML
-	 * communication is written to it - no checks are made for an existing file
-	 * or for filling up the disk. USE WITH CAUTION.
-	 * 
-	 * Type: String
      
-	 * Recognition: Startup
      
-	 * Range: System.out, System.err, filename
      
-	 * Default: none
      
-	 */
-	public static final String CIMXML_TRACE_STREAM = "sblim.wbem.cimxmlTraceStream";
-
-	/**
-	 * 
-	 * Tells the XML builder how to sign embedded objects. This is necessary due to
-	 * the non-consequent handling of embedded objects on different CIMOMs.
-	 * "AttribOnly"       - only the EmbeddedObject="instance/object" is used
-	 *                      (should be good for Pegasus)
-	 * "EmbObjQuali"      - on qualified CIM-XML elements the EmbeddedObject qualifier is used
-	 *                      for embedded classes and instances
-	 * "EmbObjAndEmbInstQuali" -
-	 *                      on qualified CIM-XML elements the EmbeddedObject qualifier is used
-	 *                      for embedded classes and the EmbeddedInstance="className" qualifier
-	 *                      is used for embedded instances 
-	 * Type: String
-	 * Recognition: Anytime
-	 * Range: AttribOnly, EmbObjQuali, EmbObjAndEmbInstQuali
-	 * Default: AttribOnly
-	 * 
-	 */
-	public static final String CIMXML_EMBOBJBUILDER = "sblim.wbem.cimxmlEmbObjBuilder";
-
-	/**
-	 * 
-	 * If set the type of valueless EmbeddedObjects are mapped to CLASS_T. It should work well
-	 * with OpenPegasus-2.7.0.
-	 * If unset no type mapping is done for valuless EmbeddedObjects.  
-	 * 
-	 * Type: Boolean
-	 * Default: true
-	 * 
-	 */
-	public static final String CIMXML_PARSER_STRICT_EMBOBJ_TYPES = "sblim.wbem.cimxmlParser.strictEmbObjTypes";
-
-	/**
-	 * 
-	 * If set to false, the embedded object entity in all requests is in mixed case
-	 * (EmbeddedObject) per DSP0203.  If set to true, the embedded object entity is in
-	 * upper case (EMBEDDEDOBJECT) - this works with some older CIMOMs, such as OpenPegasus 
-	 * 2.6.1 and 2.7.0.
-	 * 
-	 * <!ENTITY % EmbeddedObject "EmbeddedObject (object|instance) #IMPLIED">
-	 * 
-	 * Type: Boolean
-	 * Recognition: Startup
-	 * Range: true, false
-	 * Default: true
-	 * 
-	 */
-	public static final String CIMXML_BUILDER_UPPERCASE_EMBOBJ_ENTITIES = "sblim.wbem.cimxmlBuilder.upperCaseEmbObjEntities";
-
-	/**
-	 * 
-	 * If set to true, SSL handshakes are performed after an SSL socket is created by the
-	 * socket factory.  If set to false, handshakes are not performed, which is useful if
-	 * if the handshake has already taken place.
-	 * 
-	 * Type: Boolean
-	 * Recognition: Anytime
-	 * Default: true
-	 * 
-	 */
-	public static final String PERFORM_SSL_HANDSHAKE = "sblim.wbem.performSslHandshake";
-
-	/**
-	 * 
-	 * If set to false, SSL handshakes are not synchronized.  If set to true, SSL handshakes
-	 * are synchronized as a workaround for an IBMJSSE1 problem with thread-safe handshakes.
-	 * 
-	 * Note: This property has no affect unless sblim.wbem.performSslHandshake is set to 
-	 * true.
-	 * 
-	 * Type: Boolean
-	 * Recognition: Anytime
-	 * Default: false
-	 * 
-	 */
-	public static final String SYNCHRONIZED_SSL_HANDSHAKE = "sblim.wbem.synchronizedSslHandshake";
-
-	/**
-	 * 
-	 * If set to true, socket connections are attempted with the timeout value defined by 
-	 * sblim.wbem.socketConnectTimeout.  If set to false, socket connections are attempted
-	 * without a timeout.  Using a timeout for socket connections is the preferred method
-	 * but may introduce intermittent, significant performance impacts during the connection 
-	 * process in Java 5+ (see Sun bug 5092063).   
-	 * 
-	 * Type: Boolean
-	 * Recognition: Anytime
-	 * Default: true
-	 * 
-	 */
-	public static final String SOCKET_CONNECT_WITH_TIMEOUT = "sblim.wbem.socketConnectWithTimeout";
-
-	/**
-	 * 
-	 * The timeout for socket connect requests. A timeout of zero is interpreted
-	 * as infinite timeout.
-	 * 
-	 * Note: This property has no effect unless socket connection with timeout is
-	 * enabled (see the sblim.wbem.socketConnectWithTimeout property).
-	 * 
-	 * Type: Integer
-	 * Unit: Milliseconds
-	 * Recognition: Anytime
-	 * Range: 0 .. Integer.MAX_VALUE
-	 * Default: 0
-	 * 
-	 */
-	public static final String SOCKET_CONNECT_TIMEOUT = "sblim.wbem.socketConnectTimeout";
-
-	/**
-	 * The idle timeout between socket requests after which the socket is
-	 * automatically reset (closed, then reopened). A timeout of zero is
-	 * interpreted as infinite timeout. 
      
-	 * Type: Integer
      
-	 * Unit: Milliseconds
      
-	 * Recognition: Anytime
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 0
      
-	 */
-	public static final String SOCKET_IDLE_TIMEOUT = "sblim.wbem.socketIdleTimeout";
-
-	/**
-	 * 
-	 * Turn on/off usage of the default user/password, which can be used
-	 * if the CIMOM requires a "garbage" credential.  If set to false,
-	 * user-supplied credentials will be applied.  If set to true,
-	 * default credentials will be applied when both the user-supplied
-	 * principal and credential are null/empty.
-	 * 
-	 * Type: Boolean
-	 * Recognition: Startup
-	 * Default: false
-	 * 
-	 */
-	public static final String KEY_CREDENTIALS_DEFAULT_ENABLED = "sblim.wbem.default.authorization.enabled";
-
-	/**
-	 * 
-	 * The name of the user for the "garbage" credential.
-	 * 
-	 * Note: This property has no effect unless default authorization is
-	 * enabled (see the sblim.wbem.default.authorization.enabled property)
-	 * AND both the user-supplied principal and credential are null/empty.
-	 * 
-	 * Type: String
-	 * Recognition: Startup
-	 * Default: "default"
-	 * 
-	 */
-	public static final String KEY_DEFAULT_PRINCIPAL = "sblim.wbem.default.principal";
-
-	/**
-	 * 
-	 * The credential of the user for the "garbage" credential.
-	 * 
-	 * Note: This property has no effect unless default authorization is
-	 * enabled (see the sblim.wbem.default.authorization.enabled property)
-	 * AND both the user-supplied principal and credential are null/empty.
-	 * 
-	 * Type: String
-	 * Recognition: Startup
-	 * Default: "default"
-	 * 
-	 */
-	public static final String KEY_DEFAULT_CREDENTIAL = "sblim.wbem.default.credential";
-
-	/**
-	 * The timeout for http connections of an indication listener. A timeout of
-	 * zero is interpreted as infinite timeout.
      
-	 * 
      
-	 * Type: Integer
      
-	 * Unit: Milliseconds
      
-	 * Recognition: On next creation of a WBEMListener
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 10000
      
-	 */
-	public static final String LISTENER_HTTP_TIMEOUT = "sblim.wbem.listenerHttpTimeout";
-
-	/**
-	 * The header timeout for http connections of an indication listener. The
-	 * header timeout is defined as the maximum amount of time allowed to read
-	 * in the entire http header. A timeout of zero is interpreted as infinite
-	 * timeout.
      
-	 * 
      
-	 * Note: One form of DoS attack sends periodic http header lines in an
-	 * attempt to keep the socket open indefinitely. This timeout can be used to
-	 * thwart such an attempt.
      
-	 * 
      
-	 * Type: Integer
      
-	 * Unit: Milliseconds
      
-	 * Recognition: On next creation of a WBEMListener
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 30000
      
-	 */
-	public static final String LISTENER_HTTP_HEADER_TIMEOUT = "sblim.wbem.listenerHttpHeaderTimeout";
-
-	/**
-	 * The maximum allowable timeouts an http connection of an indication
-	 * listener can have before the client ignores it. In other words, the
-	 * number of times an IP exceeds sblim.wbem.listenerHttpTimeout and
-	 * sblim.wbem.listenerHttpHeaderTimeout before it is blocked. A value of
-	 * zero is interpreted as unlimited timeouts.
      
-	 * 
      
-	 * Type: Integer
      
-	 * Recognition: On next creation of a WBEMListener
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 0
      
-	 */
-	public static final String LISTENER_HTTP_MAX_ALLOWED_TIMEOUTS = "sblim.wbem.listenerHttpMaxAllowedTimeouts";
-
-	/**
-	 * The size of the thread pool for the connection handlers of the indication
-	 * for http connections of an indication listener. This is the maximum
-	 * number of handler threads the pool might create on heavy load.
      
-	 * A value of -1 is interpreted as infinity. 
      
-	 * Type: Integer
      
-	 * Unit: Count
      
-	 * Recognition: On next creation of a WBEMListener
      
-	 * Range: -1 .. Integer.MAX_VALUE
      
-	 * Default: 8
      
-	 */
-	public static final String LISTENER_MAX_POOL_SIZE = "sblim.wbem.listenerPoolMaxSize";
-
-	/**
-	 * The minimal number of connection handlers of the indication listener that
-	 * will be kept open by the thread pool regardless of the current load. 
      
-	 * Type: Integer
      
-	 * Unit: Count
      
-	 * Recognition: On next creation of a WBEMListener
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 2
      
-	 */
-	public static final String LISTENER_MIN_POOL_SIZE = "sblim.wbem.listenerPoolMinSize";
-
-	/**
-	 * The maximum number of queued connections (the fixed capacity of the
-	 * ArrayBlockingQueue of pending connections incoming to the listener).
-	 * Whereas increasing this number will result in a correspondingly greater
-	 * memory usage, making the number too small can result in HTTP 503
-	 * "Service temporarily overloaded" returned to server if there is no room
-	 * in queue for an incoming connection. 
      
-	 * Type: Integer
      
-	 * Unit: Count
      
-	 * Recognition: On next creation of a WBEMListener
      
-	 * Range: 1 .. Integer.MAX_VALUE
      
-	 * Default: 32
      
-	 */
-	public static final String LISTENER_MAX_QUEUE_SIZE = "sblim.wbem.listenerQueueMaxSize";
-
-	/**
-	 * The number of queued connections that is tolerated before the thread pool
-	 * creates an additional handler thread. Increasing this value leads to a
-	 * less "nervous" creation/destruction of handlers. However it
-	 * makes the listener more vulnerable to frozen connections.
      
-	 * 
      
-	 * Type: Integer
      
-	 * Unit: Count
      
-	 * Recognition: On next creation of a WBEMListener
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 2
      
-	 */
-	public static final String LISTENER_BACKLOG = "sblim.wbem.listenerBacklog";
-
-	/**
-	 * The idle time of a worker that is tolerated before the worker is
-	 * destroyed by the thread pool. By setting the minimal pool size >0 you can
-	 * protect a given number of worker from destruction.
      
-	 * 
      
-	 * Type: Long
      
-	 * Unit: Milliseconds
      
-	 * Recognition: On next creation of a WBEMListener
      
-	 * Range: 0 .. Long.MAX_VALUE
      
-	 * Default: 30000
      
-	 */
-	public static final String LISTENER_HANDLER_MAX_IDLE = "sblim.wbem.listenerHandlerMaxIdle";
-
-	/**
-	 * The maximum number of queued events (the fixed capacity of the LinkedList
-	 * of indications awaiting delivery to the listener). When the maximum is
-	 * reached, the oldest indications are discarded to make room for the newest
-	 * ones. A value of 0 is interpreted as infinity. 
      
-	 * Type: Integer
      
-	 * Unit: Count
      
-	 * Recognition: On next creation of a WBEMListener
      
-	 * Range: 0 .. Integer.MAX_VALUE
      
-	 * Default: 0
      
-	 */
-	public static final String LISTENER_MAX_QUEUED_EVENTS = "sblim.wbem.listenerMaxQueuedEvents";
-
-	/**
-	 * 
-	 * If set to true, reliable indication support is enabled and indications
-	 * are processed accordingly.  If set to false, reliable indication 
-	 * support is disabled and indications are passed directly to listener.
-	 * 
-	 * If reliable indication support is enabled, incoming indications are
-	 * handled as documented in DSP1054 which includes queuing unexpected 
-	 * indications, caching all indications for the duration of their sequence 
-	 * identifier lifetime, and logging missing, duplicate and out-of-order 
-	 * indications.
-	 * 
-	 * The sequence identifier lifetime is defined as:
-	 *   DeliveryRetryAttempts * DeliveryRetryInterval * 10
-	 * These values can be set by the sblim.wbem.listenerDeliveryRetryAttempts
-	 * and sblim.wbem.listenerDeliveryRetryInterval properties below.
-	 * 
-	 * Unexpected indications are queued in either a linked list or a hash
-	 * table based on the sblim.wbem.listenerReliableIndicationHashtableCapacity
-	 * property below.  The linked list is better suited for a small number of 
-	 * listener destinations per WBEMListener while the hash table is better 
-	 * suited for a large number.
-	 * 
-	 * Type: Boolean
-	 * Recognition: On next creation of a WBEMListener
-	 * Default: false
-	 * 
-	 */
-	public static final String LISTENER_ENABLE_RELIABLE_INDICATIONS = "sblim.wbem.listenerEnableReliableIndications";
-
-	/**
-	 * 
-	 * The default value to use for the CIM_IndicationService DeliveryRetryAttempts
-	 * property.  See DSP1054 for details on reliable indications.
-	 * 
-	 * Note: This property has no effect unless reliable indication support is
-	 * enabled.  See the sblim.wbem.listenerEnableReliableIndications property.
-	 * 
-	 * Type: Long
-	 * Unit: Count
-	 * Recognition: On next creation of a WBEMListener
-	 * Range: 1 .. 1000
-	 * Default: 3
-	 * 
-	 */
-	public static final String LISTENER_DELIVERY_RETRY_ATTEMPTS = "sblim.wbem.listenerDeliveryRetryAttempts";
-
-	/**
-	 * 
-	 * The default value to use for the CIM_IndicationService DeliveryRetryInterval
-	 * property.  See DSP1054 for details on reliable indications.
-	 * 
-	 * Note: This property has no effect unless reliable indication support is
-	 * enabled.  See the sblim.wbem.listenerEnableReliableIndications property.
-	 * 
-	 * Type: Long
-	 * Unit: Seconds
-	 * Recognition: On next creation of a WBEMListener
-	 * Range: 1 .. 86400
-	 * Default: 20
-	 * 
-	 */
-	public static final String LISTENER_DELIVERY_RETRY_INTERVAL = "sblim.wbem.listenerDeliveryRetryInterval";
-
-	/**
-	 * 
-	 * The default value to use for the reliable indication handler's initial
-	 * hash table capacity.  A value of 0 indicates use a linked list instead.
-	 * Linked lists are better suited for a small number of listener destinations
-	 * per WBEMListener while hash tables are better suited for a large number.
-	 * 
-	 * Note: This property has no effect unless reliable indication support is
-	 * enabled.  See the sblim.wbem.listenerEnableReliableIndications property.
-	 * 
-	 * Type: Integer
-	 * Unit: Count
-	 * Recognition: On next creation of a WBEMListener
-	 * Range: 0 .. 25000
-	 * Default: 0
-	 * 
-	 */
-	public static final String LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY = "sblim.wbem.listenerReliableIndicationHashtableCapacity";
-
-	/**
-	 * 
-	 * The filter to use for tracing of incoming indications at the FINE level.
-	 * 
-	 * If string is empty, no tracing of incoming indications will occur.  If
-	 * string is not empty, it identifies one or more properties to be included
-	 * in the trace of all incoming indications.  An optional class can be used
-	 * to filter the output to include only those indications that contain the
-	 * substring.  For example, to trace the SequenceContext and SequenceNumber
-	 * properties of all alerts, use the following:
-	 * 
-	 *    alert:sequencecontext,sequencenumber
-	 * 
-	 * To trace the IndicationTime of all indications, use the following:
-	 * 
-	 *    indicationtime
-	 * 
-	 * Note: This property has no effect unless tracing is enabled.  See the
-	 * sblim.wbem.traceFileLevel property.
-	 * 
-	 * Type: String
-	 * Recognition: On next creation of WBEMListener
-	 * Format: [class:]property[,property]*
-	 * 
-	 */
-	public static final String LISTENER_INDICATION_TRACE_FILTER = "sblim.wbem.listenerIndicationTraceFilter";
-
-	/**
-	 * 
-	 * If set to true, a property will be added to all indications that identifies
-	 * the sender's IP address.  If set to false, the property will not be added.
-	 * 
-	 * The property is a CIMProperty with:
-	 *   name = "SBLIMJCC_SenderIPAddress"
-	 *   data type = CIMDataType.STRING_T
-	 *   value = String returned by InetAddress.getHostAddress() (i.e. 1.2.3.4)
-	 * 
-	 * Type: Boolean
-	 * Recognition: On next creation of a WBEMListener
-	 * Default: false
-	 * 
-	 */
-	public static final String LISTENER_ADD_SENDER_IP_ADDRESS = "sblim.wbem.listenerAddSenderIPAddress";
-
-	/**
-	 * 
-	 * If set to true, numeric string values passed to the java.lang.Double
-	 * constructor or its parseDouble method will be checked to make sure they
-	 * are not in the range that hangs Java 6- (see Sun bug 4421494).  If
-	 * set to false, the string values will not be checked.
-	 * 
-	 * Note: This property should only be set to true if running on Java 5 or
-	 * Java 6 prior to update 24.
-	 * 
-	 * Type: Boolean
-	 * Recognition: Startup
-	 * Default: true
-	 * 
-	 */
-	public static final String VERIFY_JAVA_LANG_DOUBLE_STRINGS = "sblim.wbem.verifyJavaLangDoubleStrings";
-
-	/**
-	 * 
-	 * If set to true, numeric key data types in a CIMInstance's CIMObjectPath
-	 * will be synchronized to match those of the corresponding keys within
-	 * the CIMInstance's CIMProperty[].  If set to false, the numeric key data
-	 * types will not be synchronized. 
-	 * 
-	 * Note: Only numeric key data types in CIMInstances from CIMOM responses
-	 * are synchronized, application calls to the CIMInstance constructor are
-	 * not affected.
-	 * 
-	 * Type: Boolean
-	 * Recognition: Startup
-	 * Default: false
-	 * 
-	 */
-	public static final String SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES = "sblim.wbem.synchronizeNumericKeyDataTypes";
-
-	/**
-	 * 
-	 * If set to true, gzip encoding is enabled.  If set to false, gzip encoding
-	 * is not enabled.  When enabled, outgoing requests include the HTTP header
-	 * "Accept-Encoding: gzip" to indicate to the CIMOM that the client handles
-	 * message bodies compressed with gzip.  If the incoming response includes
-	 * "Content-Encoding: gzip" the message body will be decompressed with gzip
-	 * before being processed.
-	 * 
-	 * Note: This property does not affect indications or outgoing requests.
-	 * 
-	 * Type: Boolean
-	 * Recognition: Anytime
-	 * Default: false
-	 * 
-	 */
-	public static final String ENABLE_GZIP_ENCODING = "sblim.wbem.enableGzipEncoding";
-
-	/**
-	 * 
-	 * If set to true, the CIM-XML parser will allow empty LOCALNAMESPACEPATH
-	 * elements in incoming responses.  If set to false, the parser will not
-	 * allow empty LOCALNAMESPACEPATH elements.
-	 * 
-	 * Note: Some older CIMOMs sent empty LOCALNAMESPACEPATHs, relying on the
-	 * client to provide the local namespace path.  This is a violation of
-	 * DSP0201, which dictates that LOCALNAMESPACEPATH must contain at least
-	 * one NAMESPACE child.  By default, this property is set to false so the
-	 * client can adhere to the CIM-XML specifications.  Set this property to
-	 * true if "LOCALNAMESPACEPATH requires NAMESPACE" exceptions occur while
-	 * interacting with one of these older CIMOMs.
-	 * 
-	 * Type: Boolean
-	 * Recognition: Anytime
-	 * Default: false
-	 * 
-	 */
-	public static final String CIMXML_PARSER_ALLOW_EMPTY_LOCALNAMESPACEPATH = "sblim.wbem.cimxmlParser.allowEmptyLocalNameSpacePath";
-	
-	/**
-	 * AMMO-863
-	 * 
      
-	 * New configuration property to force the use of a strict mode for the
-	 * HTTP header Connection=Keep-alive (that may not be used for HTTP/1.1).
-	 */
-	public static final String HTTP_KEEP_ALIVE_STRICT_MODE = "sblim.wbem.httpKeepAliveStrictMode";
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-11-08  lupusalex    Make SBLIM client JSR48 compliant
+ * 1688273    2007-04-19  lupusalex    Full support of HTTP trailers
+ * 1815707    2007-10-30  ebak         TLS support
+ * 1827728    2007-11-12  ebak         embeddedInstances: attribute EmbeddedObject not set
+ * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2372030    2008-12-01  blaschke-oss Add property to control synchronized SSL handshaking
+ * 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
+ * 2846231    2009-09-23  rgummada     connection failure on CIMOM w/o user/pw
+ * 2930341    2010-01-12  blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0
+ * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
+ * 2970881    2010-03-15  blaschke-oss Add property to control EmbeddedObject case
+ * 3046073    2010-09-07  blaschke-oss Performance hit due to socket conn. creation with timeout
+ * 3111718    2010-11-18  blaschke-oss org.sblim.cimclient SSL Code is using the wrong SSL Property
+ * 3185763    2011-02-25  blaschke-oss Reliable indication support - Phase 1
+ * 3195069    2011-02-28  blaschke-oss Need support to disable SSL Handshake
+ * 3197423    2011-03-02  blaschke-oss Server authentication with PegasusLocalAuthInfo failing
+ * 3277928    2011-04-06  blaschke-oss CIM-XML tracing cannot be enabled in the field
+ * 3206904    2011-05-03  blaschke-oss Indication listener deadlock causes JVM to run out sockets
+ * 3288721    2011-05-20  blaschke-oss Need the function of indication reordering
+ * 3459036    2011-12-13  blaschke-oss Linked list for RI queue not efficient for many LDs
+ * 3485074    2012-02-06  blaschke-oss An Indication trace request
+ * 3492246    2012-02-23  blaschke-oss Rename new indication trace property
+ * 3492214    2012-02-23  blaschke-oss Add a SenderIPAddress property indications
+ * 3492224    2012-02-23  blaschke-oss Need two different timeouts for Socket connections
+ * 3521157    2012-05-10  blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
+ * 3524050    2012-06-06  blaschke-oss Improve WWW-Authenticate in HTTPClient.java
+ * 3536399    2012-08-25  hellerda     Add client/listener peer authentication properties
+ * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
+ * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
+ *    2618    2013-02-27  blaschke-oss Need to add property to disable weak cipher suites for the secure indication
+ *    2628    2013-03-26  blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched
+ *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
+ *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
+ *    2647    2013-07-01  blaschke-oss Add two ssl protocol properties for http server and client
+ *    2654    2013-07-29  blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF
+ *    2151    2013-08-20  blaschke-oss gzip compression not supported
+ *    2711    2013-11-13  blaschke-oss LOCALNAMESPACEPATH allows 0 NAMESPACE children
+ */
+package org.metricshub.wbem.sblim.cimclient;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * The interface WBEMConfigurationProperties contains the names of all
+ * configuration properties that are recognized by the CIM Client.
+ * 
+ */
+public interface WBEMConfigurationProperties {
+
+	/**
+	 * A URL string giving the location of the CIM client config file. 
      
+	 * 
      
+	 * By default the SBLIM CIM Client looks for
+	 * 
        
+	 * 
      • file:sblim-cim-client2.properties
        • 
+	 * 
      • file:%USER_HOME%/sblim-cim-client2.properties
        • 
+	 * 
      • file:/etc/java/sblim-cim-client2.properties
        • 
+	 * 
      
+	 * The first file found will be used. The default search list is not applied
+	 * if this property is set, even if the given URL does not exist.
      
+	 */
+	public static final String CONFIG_URL = "sblim.wbem.configURL";
+
+	/**
+	 * Sets the minimum level for messages to be written to the log file.
      
+	 * 
      
+	 * Type: Discrete
      
+	 * Recognition: Startup
      
+	 * Range: OFF, SEVERE, WARNING, INFO, CONFIG, ALL
      
+	 * Default: OFF, which disables file logging completely.
+	 */
+	public static final String LOG_FILE_LEVEL = "sblim.wbem.logFileLevel";
+
+	/**
+	 * A string specifying the location of the log file. The string may include
+	 * the following special components that will be replaced at runtime:
      
+	 * 
        
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
        /the local pathname separator
        %tthe system temporary directory
        %hthe value of the "user.home" system property
        %gthe generation number to distinguish rotated logs
        %ua unique number to resolve conflicts
        %%translates to a single percent sign "%"
        
+	 * 
      
+	 * Thus for example a pattern of %t/java%g.log with a count of
+	 * 2 would typically cause log files to be written on Unix to
+	 * /var/tmp/java2.log
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: Startup
      
+	 * Default: %t/cimclient_log_%g.txt.
+	 */
+	public static final String LOG_FILE_LOCATION = "sblim.wbem.logFileLocation";
+
+	/**
+	 * Sets the maximum size in bytes of a single log file. When the limit is
+	 * reached a new file is created. A limit of zero will create a new log file
+	 * for every log record !
      
+	 * 
      
+	 * Type: Integer
      
+	 * Recognition: Startup
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 100.000
      
+	 */
+	public static final String LOG_FILE_SIZE_LIMIT = "sblim.wbem.logFileSizeLimit";
+
+	/**
+	 * Sets the number of log files to cycle through. When the number is
+	 * exceeded the oldest file is dropped.
      
+	 * 
      
+	 * Type: Integer
      
+	 * Recognition: Startup
      
+	 * Range: 1 .. Integer.MAX_VALUE
      
+	 * Default: 5
      
+	 */
+	public static final String LOG_FILE_COUNT = "sblim.wbem.logFileCount";
+
+	/**
+	 * Sets the minimum level for messages to be written to the console logger
+	 * file.
      
+	 * 
      
+	 * Type: Discrete
      
+	 * Recognition: Startup
      
+	 * Range: OFF, SEVERE, WARNING, INFO, CONFIG, ALL
      
+	 * Default: OFF, which disables console logging completely.
+	 */
+	public static final String LOG_CONSOLE_LEVEL = "sblim.wbem.logConsoleLevel";
+
+	/**
+	 * Sets the type of the console logger. Maybe either message log or trace
+	 * log.
      
+	 * 
      
+	 * Type: Discrete
      
+	 * Recognition: Startup
      
+	 * Range: MESSAGE, TRACE
      
+	 * Default: MESSAGE.
+	 */
+	public static final String LOG_CONSOLE_TYPE = "sblim.wbem.logConsoleType";
+
+	/**
+	 * Sets the minimum level for messages to be written to the trace file.
      
+	 * 
      
+	 * Type: Discrete
      
+	 * Recognition: Startup
      
+	 * Range:
+	 * OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, ALL
      
+	 * Default: OFF, which disables file tracing completely
      
+	 */
+	public static final String TRACE_FILE_LEVEL = "sblim.wbem.traceFileLevel";
+
+	/**
+	 * A string specifying the location of the trace file. The string may
+	 * include the following special components that will be replaced at
+	 * runtime:
      
+	 * 
        
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
        /the local pathname separator
        %tthe system temporary directory
        %hthe value of the "user.home" system property
        %gthe generation number to distinguish rotated logs
        %ua unique number to resolve conflicts
        %%translates to a single percent sign "%"
        
+	 * 
      
+	 * Thus for example a pattern of %t/java%g.log with a count of
+	 * 2 would typically cause log files to be written on Unix to
+	 * /var/tmp/java2.log
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: Startup
      
+	 * Default: %t/cimclient_trace_%g.txt
      
+	 */
+	public static final String TRACE_FILE_LOCATION = "sblim.wbem.traceFileLocation";
+
+	/**
+	 * Sets the maximum size in bytes of a single log file. When the limit is
+	 * reached a new file is created. A limit of zero creates a new file for
+	 * each trace record !
      
+	 * 
      
+	 * Type: Integer
      
+	 * Recognition: Startup
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 1.000.000
      
+	 */
+	public static final String TRACE_FILE_SIZE_LIMIT = "sblim.wbem.traceFileSizeLimit";
+
+	/**
+	 * Sets the number of log files to cycle through. When the number is
+	 * exceeded the oldest file is dropped.
      
+	 * 
      
+	 * Type: Integer
      
+	 * Recognition: Startup
      
+	 * Range: 1 .. Integer.MAX_VALUE
      
+	 * Default: 5
      
+	 */
+	public static final String TRACE_FILE_COUNT = "sblim.wbem.traceFileCount";
+
+	/**
+	 * The timeout for http requests. A timeout of zero is interpreted as
+	 * infinite timeout.
      
+	 * 
      
+	 * Type: Integer
      
+	 * Unit: Milliseconds
      
+	 * Recognition: Anytime
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 0
      
+	 */
+	public static final String HTTP_TIMEOUT = "sblim.wbem.httpTimeout";
+
+	/**
+	 * The size of the internal http connection pools. Each
+	 * WBEMClient instance has it's own http connection pool. A
+	 * positive value defines the number of connections, zero that no connection
+	 * will be reused, and -1 all connections will be reused (when it's
+	 * possible).
      
+	 * 
      
+	 * Type: Integer
      
+	 * Recognition: Anytime
      
+	 * Range: -1, 0, 1 .. Integer.MAX_VALUE
      
+	 * Default: 16
      
+	 */
+	public static final String HTTP_POOL_SIZE = "sblim.wbem.httpPoolSize";
+
+	/**
+	 * The Java class name of the authentication module to use for http
+	 * authentication. 
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next authentication
      
+	 * Range:
+	 * 
+	 * org.sblim.cimclient.internal.http.WwwAuthInfo, org.sblim.cimclient.internal.http.PegasusLocalAuthInfo or any self-written subclass of org.sblim.cimclient.internal.http.AuthorizationInfo
+	 * 
      
+	 * Default: org.sblim.cimclient.internal.http.WwwAuthInfo
      
+	 */
+	public static final String HTTP_AUTHENTICATION_MODULE = "sblim.wbem.httpAuthModule";
+
+	/**
+	 * The WWW-Authenticate information to use when sending the first request to
+	 * a server. 
      
+	 * 
      
+	 * Note: This string must exactly match what the server returns in the
      
+	 * WWW-Authenticate field of an HTTP 401 response when authentication
      
+	 * fails. The following two strings are examples:
      
+	 * 
      
+	 * 
+	 * 
+	 * Basic realm="Secure Area"
+	 * Digest realm="testrealm@host.com",qop="auth,auth-int",nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",opaque="5ccc069c403ebaf9f0171e9517f40e41"
+	 * 
+	 * 
+	 * Type: String
      
+	 * Recognition: On next authentication
      
+	 * Range: Basic, Digest
      
+	 * Default: none
      
+	 */
+	public static final String HTTP_WWW_AUTHENTICATE_INFO = "sblim.wbem.httpWwwAuthenticateInfo";
+
+	/**
+	 * Specifies if MPOST is used for transmitting http messages. If false, POST
+	 * is used.
      
+	 * 
      
+	 * Type: Boolean
      
+	 * Recognition: Anytime
      
+	 * Range: true, false
      
+	 * Default: true
      
+	 */
+	public static final String HTTP_USE_MPOST = "sblim.wbem.httpMPOST";
+
+	/**
+	 * Specifies if chunking is used for transmitting http messages.
      
+	 * 
      
+	 * Type: Boolean
      
+	 * Recognition: Anytime
      
+	 * Range: true, false
      
+	 * Default: true
      
+	 */
+	public static final String HTTP_USE_CHUNKING = "sblim.wbem.httpChunking";
+
+	/**
+	 * Specifies the http protocol version to use. This option is useful if the
+	 * protocol negotiation fails.
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: Anytime
      
+	 * Range: 1.0, 1.1
      
+	 * Default: 1.1
      
+	 */
+	public static final String HTTP_VERSION = "sblim.wbem.httpVersion";
+
+	/**
+	 * Specifies how often the client will retry to connect to a CIMOM which
+	 * refused the connection in the first place.
      
+	 * 
      
+	 * Type: Integer
      
+	 * Recognition: Anytime
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 0
      
+	 */
+	public static final String HTTP_CONNECTION_RETRIES = "sblim.wbem.httpConnectionRetries";
+
+	/**
+	 * Specifies if the client will discard and request again http documents
+	 * with less than a given number of bytes.
      
+	 * 
      
+	 * Type: Boolean
      
+	 * Recognition: Anytime
      
+	 * Range: true, false
      
+	 * Default: false
      
+	 */
+	public static final String HTTP_ENABLE_CONTENT_LENGTH_RETRY = "sblim.wbem.httpEnableContentLengthRetry";
+
+	/**
+	 * Specifies the threshold above which a http document is regarded as valid
+	 * by the content length retry algorithm.
      
+	 * 
      
+	 * Type: Integer
      
+	 * Recognition: Anytime
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 50
      
+	 */
+	public static final String HTTP_CONTENT_LENGTH_THRESHOLD = "sblim.wbem.httpContentLengthThreshold";
+
+	/**
+	 * The file path of the SSL keystore.
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next SSL connection
      
+	 * Default: none
      
+	 */
+	public static final String KEYSTORE_PATH = "javax.net.ssl.keyStore";
+
+	/**
+	 * The type of the keystore.
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next SSL connection
      
+	 * Range: PKCS12, JKS, ...
      
+	 * Default: JKS
      
+	 */
+	public static final String KEYSTORE_TYPE = "javax.net.ssl.keyStoreType";
+
+	/**
+	 * The password of the keystore.
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next SSL connection
      
+	 * Default: none
      
+	 */
+	public static final String KEYSTORE_PASSWORD = "javax.net.ssl.keyStorePassword";
+
+	/**
+	 * The file path of the SSL truststore.
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next SSL connection
      
+	 * Default: none
      
+	 */
+	public static final String TRUSTSTORE_PATH = "javax.net.ssl.trustStore";
+
+	/**
+	 * The type of the truststore.
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next SSL connection
      
+	 * Range: PKCS12, JKS, ...
      
+	 * Default: JKS
      
+	 */
+	public static final String TRUSTSTORE_TYPE = "javax.net.ssl.trustStoreType";
+
+	/**
+	 * The password of the truststore.
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next SSL connection
      
+	 * Default: none
      
+	 */
+	public static final String TRUSTSTORE_PASSWORD = "javax.net.ssl.trustStorePassword";
+
+	/**
+	 * The provider to use for creation of SSL client sockets.
      
+	 * 
      
+	 * Security property: JRE global access via Security.setProperty() and Security.getProperty() !
+	 * 
      
+	 * 
      
+	 * Type: Java class name
      
+	 * Recognition: On next SSL connection
      
+	 * Default: Security.getProviders("SSLContext.SSL")
      
+	 */
+	public static final String SSL_SOCKET_PROVIDER = "sblim.wbem.sslSocketProvider";
+
+	/**
+	 * The provider to use for creation of SSL server sockets.
      
+	 * 
      
+	 * Security property: JRE global access via Security.setProperty() and Security.getProperty() !
+	 * 
      
+	 * 
      
+	 * Type: Java class name
      
+	 * Recognition: On next SSL connection
      
+	 * Default: Security.getProviders("SSLContext.SSL")
      
+	 */
+	public static final String SSL_SERVER_SOCKET_PROVIDER = "sblim.wbem.sslServerSocketProvider";
+
+	/**
+	 * The protocol used for SSLContext.getInstance(String protocol). For
+	 * IBMJSSE2 provider it can be "SSL_TLS".
      
+	 * 
      
+	 * Security property: JRE global access via
+	 * Security.setProperty() and
+	 * Security.getProperty()
      
+	 * Recognition: On next SSL connection
      
+	 * Default: "SSL"
+	 */
+	public static final String SSL_PROTOCOL = "ssl.Protocol";
+
+	/**
+	 * The protocol used for SSLContext.getInstance(String protocol) by a
+	 * client. This property overrides any value set via the ssl.Protocol
+	 * property.
      
+	 * 
      
+	 * Recognition: On next SSL connection
      
+	 * Default: none
+	 */
+	public static final String SSL_CLIENT_PROTOCOL = "sblim.wbem.sslClientProtocol";
+
+	/**
+	 * The protocol used for SSLContext.getInstance(String protocol) by a
+	 * listener. This property overrides any value set via the ssl.Protocol
+	 * property.
      
+	 * 
      
+	 * Recognition: On next SSL connection
      
+	 * Default: none
+	 */
+	public static final String SSL_LISTENER_PROTOCOL = "sblim.wbem.sslListenerProtocol";
+
+	/**
+	 * The key manager factory algorithm name.
      
+	 * 
      
+	 * Security property: JRE global access via Security.setProperty() and Security.getProperty() !
+	 * 
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next SSL connection
      
+	 * Range: IbmX509, SunX509, ...
      
+	 * Default: JRE specific
      
+	 */
+	public static final String SSL_KEYMANAGER_ALGORITHM = "ssl.KeyManagerFactory.algorithm";
+
+	/**
+	 * The trust manager factory algorithm name.
      
+	 * 
      
+	 * Security property: JRE global access via Security.setProperty() and Security.getProperty() !
+	 * 
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next SSL connection
      
+	 * Range: IbmX509, SunX509, ...
      
+	 * Default: JRE specific
      
+	 */
+	public static final String SSL_TRUSTMANAGER_ALGORITHM = "ssl.TrustManagerFactory.algorithm";
+
+	/**
+	 * Determines if a HTTPS client will attempt to authenticate the server
+	 * (i.e. CIMOM) by verifying the server certificate.
      
+	 * 
      
+	 * If false, do not attempt verification. If true, the client will attempt
+	 * to verify the server certificate against the contents of the truststore;
+	 * in this case a valid path must be defined in "javax.net.ssl.trustStore"
+	 * or no connection will be permitted. 
      
+	 * 
      
+	 * Type: Boolean
      
+	 * Recognition: On initialization of a new client
      
+	 * Default: false
      
+	 */
+	public static final String SSL_CLIENT_PEER_VERIFICATION = "sblim.wbem.sslClientPeerVerification";
+
+	/**
+	 * Determines how a HTTPS listener will handle authentication of a client
+	 * (i.e. indication sender):
      
+	 * 
        
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
        ignoredo not examine the client certificate
        acceptexamine client certificate if presented; do not fail if not presented
+	 * 
        requireexamine client certificate; fail if not presented
        
+	 * 
      
+	 * If set to "ignore", do not attempt verification. If set to "accept" or
+	 * "require", the listener will attempt to verify the sender against the
+	 * contents of the truststore; in this case a valid path must be defined in
+	 * "javax.net.ssl.trustStore" or no connection will be permitted. 
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next call to addListener()
      
+	 * Default: ignore
      
+	 */
+	public static final String SSL_LISTENER_PEER_VERIFICATION = "sblim.wbem.sslListenerPeerVerification";
+
+	/**
+	 * The comma-separated list of cipher suites that are to be disabled by the
+	 * client when connecting via an SSL socket. In general, this is the list of
+	 * cipher suites considered "too weak" for use in a particular environment.
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On initialization of a new client
      
+	 * Default: none
      
+	 */
+	public static final String SSL_CLIENT_CIPHER_SUITES_TO_DISABLE = "sblim.wbem.sslClientCipherSuitesToDisable";
+
+	/**
+	 * The comma-separated list of cipher suites that are to be disabled by the
+	 * listener when connecting via an SSL socket. In general, this is the list
+	 * of cipher suites considered "too weak" for use in a particular
+	 * environment.
      
+	 * 
      
+	 * Type: String
      
+	 * Recognition: On next call to addListener()
      
+	 * Default: none
      
+	 */
+	public static final String SSL_LISTENER_CIPHER_SUITES_TO_DISABLE = "sblim.wbem.sslListenerCipherSuitesToDisable";
+
+	/**
+	 * Specifies the XML parser for parsing CIM-XML responses.
      
+	 * The SAX parser is the default choice since it is fast, resource saving
+	 * and interoperable. The streaming algorithm of the PULL parser uses the
+	 * fewest possible resources but at the prize to keep the CIMOMs response
+	 * open for a long time. That works with many but not all CIMOMs. The DOM
+	 * parser is slow and resource hungry but nice to debug.
      
+	 * 
      
+	 * Type: Discrete
      
+	 * Recognition: Anytime
      
+	 * Range: DOM, PULL, SAX
      
+	 * Default: SAX
      
+	 */
+	public static final String CIMXML_PARSER = "sblim.wbem.cimxmlParser";
+
+	/**
+	 * Enables or disables tracing of CIM-XML communication. The trace is sent
+	 * to an output stream the application has to set via the LogAndTraceManager
+	 * class.
      
+	 * 
      
+	 * Type: Boolean
      
+	 * Recognition: Anytime
      
+	 * Range: true, false
      
+	 * Default: false
      
+	 */
+	public static final String CIMXML_TRACING = "sblim.wbem.cimxmlTracing";
+
+	/**
+	 * Specifies the stream to use for tracing CIM-XML communication in the
+	 * event the application does not set one via the LogAndTraceManager class.
+	 * This stream can either be standard output (System.out), standard error
+	 * output (System.err) or a filename to be opened by the client.
+	 * 
+	 * Note: This property has no effect unless sblim.wbem.cimxmlTracing is set
+	 * to true.
+	 * 
+	 * Note: This property has no effect if the application already set the
+	 * stream prior to client initialization. If the application sets the stream
+	 * after client initialization, the stream specified by this property is
+	 * overridden.
+	 * 
+	 * Note: If a filename is specified, it is opened and all CIM-XML
+	 * communication is written to it - no checks are made for an existing file
+	 * or for filling up the disk. USE WITH CAUTION.
+	 * 
+	 * Type: String
      
+	 * Recognition: Startup
      
+	 * Range: System.out, System.err, filename
      
+	 * Default: none
      
+	 */
+	public static final String CIMXML_TRACE_STREAM = "sblim.wbem.cimxmlTraceStream";
+
+	/**
+	 * 
+	 * Tells the XML builder how to sign embedded objects. This is necessary due to
+	 * the non-consequent handling of embedded objects on different CIMOMs.
+	 * "AttribOnly"       - only the EmbeddedObject="instance/object" is used
+	 *                      (should be good for Pegasus)
+	 * "EmbObjQuali"      - on qualified CIM-XML elements the EmbeddedObject qualifier is used
+	 *                      for embedded classes and instances
+	 * "EmbObjAndEmbInstQuali" -
+	 *                      on qualified CIM-XML elements the EmbeddedObject qualifier is used
+	 *                      for embedded classes and the EmbeddedInstance="className" qualifier
+	 *                      is used for embedded instances 
+	 * Type: String
+	 * Recognition: Anytime
+	 * Range: AttribOnly, EmbObjQuali, EmbObjAndEmbInstQuali
+	 * Default: AttribOnly
+	 * 
+	 */
+	public static final String CIMXML_EMBOBJBUILDER = "sblim.wbem.cimxmlEmbObjBuilder";
+
+	/**
+	 * 
+	 * If set the type of valueless EmbeddedObjects are mapped to CLASS_T. It should work well
+	 * with OpenPegasus-2.7.0.
+	 * If unset no type mapping is done for valuless EmbeddedObjects.  
+	 * 
+	 * Type: Boolean
+	 * Default: true
+	 * 
+	 */
+	public static final String CIMXML_PARSER_STRICT_EMBOBJ_TYPES = "sblim.wbem.cimxmlParser.strictEmbObjTypes";
+
+	/**
+	 * 
+	 * If set to false, the embedded object entity in all requests is in mixed case
+	 * (EmbeddedObject) per DSP0203.  If set to true, the embedded object entity is in
+	 * upper case (EMBEDDEDOBJECT) - this works with some older CIMOMs, such as OpenPegasus 
+	 * 2.6.1 and 2.7.0.
+	 * 
+	 * <!ENTITY % EmbeddedObject "EmbeddedObject (object|instance) #IMPLIED">
+	 * 
+	 * Type: Boolean
+	 * Recognition: Startup
+	 * Range: true, false
+	 * Default: true
+	 * 
+	 */
+	public static final String CIMXML_BUILDER_UPPERCASE_EMBOBJ_ENTITIES = "sblim.wbem.cimxmlBuilder.upperCaseEmbObjEntities";
+
+	/**
+	 * 
+	 * If set to true, SSL handshakes are performed after an SSL socket is created by the
+	 * socket factory.  If set to false, handshakes are not performed, which is useful if
+	 * if the handshake has already taken place.
+	 * 
+	 * Type: Boolean
+	 * Recognition: Anytime
+	 * Default: true
+	 * 
+	 */
+	public static final String PERFORM_SSL_HANDSHAKE = "sblim.wbem.performSslHandshake";
+
+	/**
+	 * 
+	 * If set to false, SSL handshakes are not synchronized.  If set to true, SSL handshakes
+	 * are synchronized as a workaround for an IBMJSSE1 problem with thread-safe handshakes.
+	 * 
+	 * Note: This property has no affect unless sblim.wbem.performSslHandshake is set to 
+	 * true.
+	 * 
+	 * Type: Boolean
+	 * Recognition: Anytime
+	 * Default: false
+	 * 
+	 */
+	public static final String SYNCHRONIZED_SSL_HANDSHAKE = "sblim.wbem.synchronizedSslHandshake";
+
+	/**
+	 * 
+	 * If set to true, socket connections are attempted with the timeout value defined by 
+	 * sblim.wbem.socketConnectTimeout.  If set to false, socket connections are attempted
+	 * without a timeout.  Using a timeout for socket connections is the preferred method
+	 * but may introduce intermittent, significant performance impacts during the connection 
+	 * process in Java 5+ (see Sun bug 5092063).   
+	 * 
+	 * Type: Boolean
+	 * Recognition: Anytime
+	 * Default: true
+	 * 
+	 */
+	public static final String SOCKET_CONNECT_WITH_TIMEOUT = "sblim.wbem.socketConnectWithTimeout";
+
+	/**
+	 * 
+	 * The timeout for socket connect requests. A timeout of zero is interpreted
+	 * as infinite timeout.
+	 * 
+	 * Note: This property has no effect unless socket connection with timeout is
+	 * enabled (see the sblim.wbem.socketConnectWithTimeout property).
+	 * 
+	 * Type: Integer
+	 * Unit: Milliseconds
+	 * Recognition: Anytime
+	 * Range: 0 .. Integer.MAX_VALUE
+	 * Default: 0
+	 * 
+	 */
+	public static final String SOCKET_CONNECT_TIMEOUT = "sblim.wbem.socketConnectTimeout";
+
+	/**
+	 * The idle timeout between socket requests after which the socket is
+	 * automatically reset (closed, then reopened). A timeout of zero is
+	 * interpreted as infinite timeout. 
      
+	 * Type: Integer
      
+	 * Unit: Milliseconds
      
+	 * Recognition: Anytime
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 0
      
+	 */
+	public static final String SOCKET_IDLE_TIMEOUT = "sblim.wbem.socketIdleTimeout";
+
+	/**
+	 * 
+	 * Turn on/off usage of the default user/password, which can be used
+	 * if the CIMOM requires a "garbage" credential.  If set to false,
+	 * user-supplied credentials will be applied.  If set to true,
+	 * default credentials will be applied when both the user-supplied
+	 * principal and credential are null/empty.
+	 * 
+	 * Type: Boolean
+	 * Recognition: Startup
+	 * Default: false
+	 * 
+	 */
+	public static final String KEY_CREDENTIALS_DEFAULT_ENABLED = "sblim.wbem.default.authorization.enabled";
+
+	/**
+	 * 
+	 * The name of the user for the "garbage" credential.
+	 * 
+	 * Note: This property has no effect unless default authorization is
+	 * enabled (see the sblim.wbem.default.authorization.enabled property)
+	 * AND both the user-supplied principal and credential are null/empty.
+	 * 
+	 * Type: String
+	 * Recognition: Startup
+	 * Default: "default"
+	 * 
+	 */
+	public static final String KEY_DEFAULT_PRINCIPAL = "sblim.wbem.default.principal";
+
+	/**
+	 * 
+	 * The credential of the user for the "garbage" credential.
+	 * 
+	 * Note: This property has no effect unless default authorization is
+	 * enabled (see the sblim.wbem.default.authorization.enabled property)
+	 * AND both the user-supplied principal and credential are null/empty.
+	 * 
+	 * Type: String
+	 * Recognition: Startup
+	 * Default: "default"
+	 * 
+	 */
+	public static final String KEY_DEFAULT_CREDENTIAL = "sblim.wbem.default.credential";
+
+	/**
+	 * The timeout for http connections of an indication listener. A timeout of
+	 * zero is interpreted as infinite timeout.
      
+	 * 
      
+	 * Type: Integer
      
+	 * Unit: Milliseconds
      
+	 * Recognition: On next creation of a WBEMListener
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 10000
      
+	 */
+	public static final String LISTENER_HTTP_TIMEOUT = "sblim.wbem.listenerHttpTimeout";
+
+	/**
+	 * The header timeout for http connections of an indication listener. The
+	 * header timeout is defined as the maximum amount of time allowed to read
+	 * in the entire http header. A timeout of zero is interpreted as infinite
+	 * timeout.
      
+	 * 
      
+	 * Note: One form of DoS attack sends periodic http header lines in an
+	 * attempt to keep the socket open indefinitely. This timeout can be used to
+	 * thwart such an attempt.
      
+	 * 
      
+	 * Type: Integer
      
+	 * Unit: Milliseconds
      
+	 * Recognition: On next creation of a WBEMListener
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 30000
      
+	 */
+	public static final String LISTENER_HTTP_HEADER_TIMEOUT = "sblim.wbem.listenerHttpHeaderTimeout";
+
+	/**
+	 * The maximum allowable timeouts an http connection of an indication
+	 * listener can have before the client ignores it. In other words, the
+	 * number of times an IP exceeds sblim.wbem.listenerHttpTimeout and
+	 * sblim.wbem.listenerHttpHeaderTimeout before it is blocked. A value of
+	 * zero is interpreted as unlimited timeouts.
      
+	 * 
      
+	 * Type: Integer
      
+	 * Recognition: On next creation of a WBEMListener
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 0
      
+	 */
+	public static final String LISTENER_HTTP_MAX_ALLOWED_TIMEOUTS = "sblim.wbem.listenerHttpMaxAllowedTimeouts";
+
+	/**
+	 * The size of the thread pool for the connection handlers of the indication
+	 * for http connections of an indication listener. This is the maximum
+	 * number of handler threads the pool might create on heavy load.
      
+	 * A value of -1 is interpreted as infinity. 
      
+	 * Type: Integer
      
+	 * Unit: Count
      
+	 * Recognition: On next creation of a WBEMListener
      
+	 * Range: -1 .. Integer.MAX_VALUE
      
+	 * Default: 8
      
+	 */
+	public static final String LISTENER_MAX_POOL_SIZE = "sblim.wbem.listenerPoolMaxSize";
+
+	/**
+	 * The minimal number of connection handlers of the indication listener that
+	 * will be kept open by the thread pool regardless of the current load. 
      
+	 * Type: Integer
      
+	 * Unit: Count
      
+	 * Recognition: On next creation of a WBEMListener
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 2
      
+	 */
+	public static final String LISTENER_MIN_POOL_SIZE = "sblim.wbem.listenerPoolMinSize";
+
+	/**
+	 * The maximum number of queued connections (the fixed capacity of the
+	 * ArrayBlockingQueue of pending connections incoming to the listener).
+	 * Whereas increasing this number will result in a correspondingly greater
+	 * memory usage, making the number too small can result in HTTP 503
+	 * "Service temporarily overloaded" returned to server if there is no room
+	 * in queue for an incoming connection. 
      
+	 * Type: Integer
      
+	 * Unit: Count
      
+	 * Recognition: On next creation of a WBEMListener
      
+	 * Range: 1 .. Integer.MAX_VALUE
      
+	 * Default: 32
      
+	 */
+	public static final String LISTENER_MAX_QUEUE_SIZE = "sblim.wbem.listenerQueueMaxSize";
+
+	/**
+	 * The number of queued connections that is tolerated before the thread pool
+	 * creates an additional handler thread. Increasing this value leads to a
+	 * less "nervous" creation/destruction of handlers. However it
+	 * makes the listener more vulnerable to frozen connections.
      
+	 * 
      
+	 * Type: Integer
      
+	 * Unit: Count
      
+	 * Recognition: On next creation of a WBEMListener
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 2
      
+	 */
+	public static final String LISTENER_BACKLOG = "sblim.wbem.listenerBacklog";
+
+	/**
+	 * The idle time of a worker that is tolerated before the worker is
+	 * destroyed by the thread pool. By setting the minimal pool size >0 you can
+	 * protect a given number of worker from destruction.
      
+	 * 
      
+	 * Type: Long
      
+	 * Unit: Milliseconds
      
+	 * Recognition: On next creation of a WBEMListener
      
+	 * Range: 0 .. Long.MAX_VALUE
      
+	 * Default: 30000
      
+	 */
+	public static final String LISTENER_HANDLER_MAX_IDLE = "sblim.wbem.listenerHandlerMaxIdle";
+
+	/**
+	 * The maximum number of queued events (the fixed capacity of the LinkedList
+	 * of indications awaiting delivery to the listener). When the maximum is
+	 * reached, the oldest indications are discarded to make room for the newest
+	 * ones. A value of 0 is interpreted as infinity. 
      
+	 * Type: Integer
      
+	 * Unit: Count
      
+	 * Recognition: On next creation of a WBEMListener
      
+	 * Range: 0 .. Integer.MAX_VALUE
      
+	 * Default: 0
      
+	 */
+	public static final String LISTENER_MAX_QUEUED_EVENTS = "sblim.wbem.listenerMaxQueuedEvents";
+
+	/**
+	 * 
+	 * If set to true, reliable indication support is enabled and indications
+	 * are processed accordingly.  If set to false, reliable indication 
+	 * support is disabled and indications are passed directly to listener.
+	 * 
+	 * If reliable indication support is enabled, incoming indications are
+	 * handled as documented in DSP1054 which includes queuing unexpected 
+	 * indications, caching all indications for the duration of their sequence 
+	 * identifier lifetime, and logging missing, duplicate and out-of-order 
+	 * indications.
+	 * 
+	 * The sequence identifier lifetime is defined as:
+	 *   DeliveryRetryAttempts * DeliveryRetryInterval * 10
+	 * These values can be set by the sblim.wbem.listenerDeliveryRetryAttempts
+	 * and sblim.wbem.listenerDeliveryRetryInterval properties below.
+	 * 
+	 * Unexpected indications are queued in either a linked list or a hash
+	 * table based on the sblim.wbem.listenerReliableIndicationHashtableCapacity
+	 * property below.  The linked list is better suited for a small number of 
+	 * listener destinations per WBEMListener while the hash table is better 
+	 * suited for a large number.
+	 * 
+	 * Type: Boolean
+	 * Recognition: On next creation of a WBEMListener
+	 * Default: false
+	 * 
+	 */
+	public static final String LISTENER_ENABLE_RELIABLE_INDICATIONS = "sblim.wbem.listenerEnableReliableIndications";
+
+	/**
+	 * 
+	 * The default value to use for the CIM_IndicationService DeliveryRetryAttempts
+	 * property.  See DSP1054 for details on reliable indications.
+	 * 
+	 * Note: This property has no effect unless reliable indication support is
+	 * enabled.  See the sblim.wbem.listenerEnableReliableIndications property.
+	 * 
+	 * Type: Long
+	 * Unit: Count
+	 * Recognition: On next creation of a WBEMListener
+	 * Range: 1 .. 1000
+	 * Default: 3
+	 * 
+	 */
+	public static final String LISTENER_DELIVERY_RETRY_ATTEMPTS = "sblim.wbem.listenerDeliveryRetryAttempts";
+
+	/**
+	 * 
+	 * The default value to use for the CIM_IndicationService DeliveryRetryInterval
+	 * property.  See DSP1054 for details on reliable indications.
+	 * 
+	 * Note: This property has no effect unless reliable indication support is
+	 * enabled.  See the sblim.wbem.listenerEnableReliableIndications property.
+	 * 
+	 * Type: Long
+	 * Unit: Seconds
+	 * Recognition: On next creation of a WBEMListener
+	 * Range: 1 .. 86400
+	 * Default: 20
+	 * 
+	 */
+	public static final String LISTENER_DELIVERY_RETRY_INTERVAL = "sblim.wbem.listenerDeliveryRetryInterval";
+
+	/**
+	 * 
+	 * The default value to use for the reliable indication handler's initial
+	 * hash table capacity.  A value of 0 indicates use a linked list instead.
+	 * Linked lists are better suited for a small number of listener destinations
+	 * per WBEMListener while hash tables are better suited for a large number.
+	 * 
+	 * Note: This property has no effect unless reliable indication support is
+	 * enabled.  See the sblim.wbem.listenerEnableReliableIndications property.
+	 * 
+	 * Type: Integer
+	 * Unit: Count
+	 * Recognition: On next creation of a WBEMListener
+	 * Range: 0 .. 25000
+	 * Default: 0
+	 * 
+	 */
+	public static final String LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY = "sblim.wbem.listenerReliableIndicationHashtableCapacity";
+
+	/**
+	 * 
+	 * The filter to use for tracing of incoming indications at the FINE level.
+	 * 
+	 * If string is empty, no tracing of incoming indications will occur.  If
+	 * string is not empty, it identifies one or more properties to be included
+	 * in the trace of all incoming indications.  An optional class can be used
+	 * to filter the output to include only those indications that contain the
+	 * substring.  For example, to trace the SequenceContext and SequenceNumber
+	 * properties of all alerts, use the following:
+	 * 
+	 *    alert:sequencecontext,sequencenumber
+	 * 
+	 * To trace the IndicationTime of all indications, use the following:
+	 * 
+	 *    indicationtime
+	 * 
+	 * Note: This property has no effect unless tracing is enabled.  See the
+	 * sblim.wbem.traceFileLevel property.
+	 * 
+	 * Type: String
+	 * Recognition: On next creation of WBEMListener
+	 * Format: [class:]property[,property]*
+	 * 
+	 */
+	public static final String LISTENER_INDICATION_TRACE_FILTER = "sblim.wbem.listenerIndicationTraceFilter";
+
+	/**
+	 * 
+	 * If set to true, a property will be added to all indications that identifies
+	 * the sender's IP address.  If set to false, the property will not be added.
+	 * 
+	 * The property is a CIMProperty with:
+	 *   name = "SBLIMJCC_SenderIPAddress"
+	 *   data type = CIMDataType.STRING_T
+	 *   value = String returned by InetAddress.getHostAddress() (i.e. 1.2.3.4)
+	 * 
+	 * Type: Boolean
+	 * Recognition: On next creation of a WBEMListener
+	 * Default: false
+	 * 
+	 */
+	public static final String LISTENER_ADD_SENDER_IP_ADDRESS = "sblim.wbem.listenerAddSenderIPAddress";
+
+	/**
+	 * 
+	 * If set to true, numeric string values passed to the java.lang.Double
+	 * constructor or its parseDouble method will be checked to make sure they
+	 * are not in the range that hangs Java 6- (see Sun bug 4421494).  If
+	 * set to false, the string values will not be checked.
+	 * 
+	 * Note: This property should only be set to true if running on Java 5 or
+	 * Java 6 prior to update 24.
+	 * 
+	 * Type: Boolean
+	 * Recognition: Startup
+	 * Default: true
+	 * 
+	 */
+	public static final String VERIFY_JAVA_LANG_DOUBLE_STRINGS = "sblim.wbem.verifyJavaLangDoubleStrings";
+
+	/**
+	 * 
+	 * If set to true, numeric key data types in a CIMInstance's CIMObjectPath
+	 * will be synchronized to match those of the corresponding keys within
+	 * the CIMInstance's CIMProperty[].  If set to false, the numeric key data
+	 * types will not be synchronized. 
+	 * 
+	 * Note: Only numeric key data types in CIMInstances from CIMOM responses
+	 * are synchronized, application calls to the CIMInstance constructor are
+	 * not affected.
+	 * 
+	 * Type: Boolean
+	 * Recognition: Startup
+	 * Default: false
+	 * 
+	 */
+	public static final String SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES = "sblim.wbem.synchronizeNumericKeyDataTypes";
+
+	/**
+	 * 
+	 * If set to true, gzip encoding is enabled.  If set to false, gzip encoding
+	 * is not enabled.  When enabled, outgoing requests include the HTTP header
+	 * "Accept-Encoding: gzip" to indicate to the CIMOM that the client handles
+	 * message bodies compressed with gzip.  If the incoming response includes
+	 * "Content-Encoding: gzip" the message body will be decompressed with gzip
+	 * before being processed.
+	 * 
+	 * Note: This property does not affect indications or outgoing requests.
+	 * 
+	 * Type: Boolean
+	 * Recognition: Anytime
+	 * Default: false
+	 * 
+	 */
+	public static final String ENABLE_GZIP_ENCODING = "sblim.wbem.enableGzipEncoding";
+
+	/**
+	 * 
+	 * If set to true, the CIM-XML parser will allow empty LOCALNAMESPACEPATH
+	 * elements in incoming responses.  If set to false, the parser will not
+	 * allow empty LOCALNAMESPACEPATH elements.
+	 * 
+	 * Note: Some older CIMOMs sent empty LOCALNAMESPACEPATHs, relying on the
+	 * client to provide the local namespace path.  This is a violation of
+	 * DSP0201, which dictates that LOCALNAMESPACEPATH must contain at least
+	 * one NAMESPACE child.  By default, this property is set to false so the
+	 * client can adhere to the CIM-XML specifications.  Set this property to
+	 * true if "LOCALNAMESPACEPATH requires NAMESPACE" exceptions occur while
+	 * interacting with one of these older CIMOMs.
+	 * 
+	 * Type: Boolean
+	 * Recognition: Anytime
+	 * Default: false
+	 * 
+	 */
+	public static final String CIMXML_PARSER_ALLOW_EMPTY_LOCALNAMESPACEPATH = "sblim.wbem.cimxmlParser.allowEmptyLocalNameSpacePath";
+	
+	/**
+	 * AMMO-863
+	 * 
      
+	 * New configuration property to force the use of a strict mode for the
+	 * HTTP header Connection=Keep-alive (that may not be used for HTTP/1.1).
+	 */
+	public static final String HTTP_KEEP_ALIVE_STRICT_MODE = "sblim.wbem.httpKeepAliveStrictMode";
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/WBEMListenerSBLIM.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMListenerSBLIM.java
similarity index 88%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/WBEMListenerSBLIM.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMListenerSBLIM.java
index b1be5ee..66ae31a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/WBEMListenerSBLIM.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMListenerSBLIM.java
@@ -1,465 +1,462 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2007-01-08  ebak         Make SBLIM client JSR48 compliant
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 3023348    2010-07-02  blaschke-oss Listener uses # constructor instead of valueOf
- * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
- * 3469018    2012-01-03  blaschke-oss Properties not passed to CIMIndicationHandler
- * 3477087    2012-01-23  blaschke-oss Need Access to an Indication Sender's IP Address
- * 3496385    2012-03-02  blaschke-oss JSR48 1.0.0: add WBEMListener get/setProperty
- * 3513228    2012-04-23  blaschke-oss Reliable Indications support can create lots of threads
- * 3529062    2012-05-23  blaschke-oss WBEMListenerFactory should return new instance
- * 3529065    2012-05-31  hellerda     Enable WBEMListener get/setProperty
- *    2628    2013-03-26  blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched
- *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
- *    2657    2013-08-20  blaschke-oss Potential null pointer exception in handleConnection
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.net.BindException;
-import java.util.Enumeration;
-import java.util.EventListener;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.sentrysoftware.wbem.javax.wbem.listener.IndicationListener;
-import org.sentrysoftware.wbem.javax.wbem.listener.WBEMListener;
-import org.sentrysoftware.wbem.javax.wbem.listener.WBEMListenerConstants;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpConnectionHandler;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpServerConnection;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConstants;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.indications.CIMEventDispatcher;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.indications.CIMIndicationHandler;
-
-/**
- * Class WBEMListenerSBLIM is the SBLIM implementation of the WBEMListener
- * interface.
- * 
- */
-public class WBEMListenerSBLIM implements WBEMListener {
-
-	/**
-	 * The real implementation of a listener that starts a HTTP server and
-	 * processes incoming indications
-	 * 
-	 */
-	public class WBEMListenerImpl {
-
-		private EventListener iIndicationListener;
-
-		private HttpServerConnection iConnection;
-
-		private CIMIndicationHandler iIndicationHandler;
-
-		private HttpConnectionHandler iConnectionHandler;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pLocalAddress
-		 *            The local address to bind the port to. If null the port is
-		 *            bound to all local addresses. For use on multi-homed
-		 *            systems.
-		 * @param pPort
-		 *            The port to listen on. If zero any free port will be
-		 *            chosen.
-		 * @param pSSL
-		 *            SSL secured connection?
-		 * @param pIndicationListener
-		 *            The indication listener to forward the incoming
-		 *            indications to (an instance of IndicationListener or
-		 *            IndicationListenerSBLIM).
-		 * @param pProperties
-		 *            The configuration.
-		 * @throws IOException
-		 */
-		public WBEMListenerImpl(String pLocalAddress, int pPort, boolean pSSL,
-				EventListener pIndicationListener, Properties pProperties) throws IOException {
-
-			// Merge any properties passed via addListener
-			if (pProperties != null) {
-				for (Enumeration e = pProperties.keys(); e.hasMoreElements();) {
-					String key = (String) e.nextElement();
-					String value = pProperties.getProperty(key);
-					setProperty(key, value);
-				}
-			}
-			WBEMConfiguration config = WBEMListenerSBLIM.this.iConfiguration;
-			if (!(pIndicationListener instanceof IndicationListener)
-					&& !(pIndicationListener instanceof IndicationListenerSBLIM)) throw new IllegalArgumentException(
-					"Listener must be instance of IndicationListener or IndicationListenerSBLIM");
-			this.iIndicationListener = pIndicationListener;
-			CIMEventDispatcher eventDispatcher = new CIMEventDispatcher(this.iIndicationListener,
-					config.getListenerMaxQueuedEvents());
-			this.iIndicationHandler = new CIMIndicationHandler(eventDispatcher, config);
-			this.iConnectionHandler = new HttpConnectionHandler(this.iIndicationHandler, config);
-			this.iConnection = new HttpServerConnection(this.iConnectionHandler, pLocalAddress,
-					pPort, pSSL, config);
-		}
-
-		@Override
-		protected void finalize() throws Throwable {
-			try {
-				stop();
-			} finally {
-				super.finalize();
-			}
-		}
-
-		/**
-		 * Starts the HTTP server connection receiving the indications.
-		 */
-		public void start() {
-			this.iConnection.start();
-		}
-
-		/**
-		 * Stops the HTTP server connection receiving the indications and the
-		 * indication handler.
-		 */
-		public void stop() {
-			this.iConnection.close();
-			this.iIndicationHandler.close();
-		}
-
-		/**
-		 * Returns the listener we forward the indications to.
-		 * 
-		 * @return The listener.
-		 */
-		public IndicationListener getIndicationListener() {
-			return (this.iIndicationListener instanceof IndicationListener) ? (IndicationListener) this.iIndicationListener
-					: null;
-		}
-
-		/**
-		 * Returns the listener we forward the indications to.
-		 * 
-		 * @return The listener.
-		 */
-		public IndicationListenerSBLIM getIndicationListenerSBLIM() {
-			return (this.iIndicationListener instanceof IndicationListenerSBLIM) ? (IndicationListenerSBLIM) this.iIndicationListener
-					: null;
-		}
-
-		/**
-		 * Returns the listener port.
-		 * 
-		 * @return The listener port.
-		 */
-		public int getListenerPort() {
-			return this.iConnection.getPort();
-		}
-
-		/**
-		 * Get the IPs blocked by the listener.
-		 * 
-		 * @return The comma-separated list of blocked IPs.
-		 */
-		public String getBlockedIPs() {
-			return this.iConnectionHandler.getBlockedIPs();
-		}
-
-		/**
-		 * Set the IPs to be blocked by the listener.
-		 * 
-		 * @param pIPs
-		 *            The comma-separated list of blocked IPs.
-		 */
-		public void setBlockedIPs(String pIPs) {
-			this.iConnectionHandler.setBlockedIPs(pIPs);
-		}
-	}
-
-	protected final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties());
-
-	private Map iPortMap = new HashMap();
-
-	/**
-	 * Ctor.
-	 */
-	public WBEMListenerSBLIM() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.sentrysoftware.wbem.javax.wbem.listener.WBEMListener#addListener(javax.wbem.listener.
-	 * IndicationListener, int, java.lang.String)
-	 */
-	public int addListener(IndicationListener pListener, int pPort, String pTransport)
-			throws IOException {
-		return addListener((EventListener) pListener, pPort, pTransport, null, null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.sentrysoftware.wbem.javax.wbem.listener.WBEMListener#addListener(javax.wbem.listener.
-	 * IndicationListener, int, java.lang.String, java.lang.String)
-	 */
-	public int addListener(IndicationListener pListener, int pPort, String pTransport,
-			String pLocalAddr) throws IOException {
-		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr, null);
-	}
-
-	/**
-	 * Add a new listener using the specified port.
-	 * 
-	 * @param pListener
-	 *            The Indication Listener that will be called when an indication
-	 *            is received.
-	 * @param pPort
-	 *            The port to listen on. Use 0 to specify any available port.
-	 * @param pTransport
-	 *            The transport to use (e.g. HTTP or HTTPS).
-	 * @param pLocalAddr
-	 *            The local IP address to bind to. This is only needed in
-	 *            multi-homed systems. A value of null will bind to
-	 *            all IP addresses.
-	 * @param pConfigurationProperties
-	 *            The individual configuration properties for this listener.
-	 * @return The port that was used.
-	 * @throws IOException
-	 *             This exception is thrown when binding to pPort fails.
-	 */
-	public int addListener(IndicationListener pListener, int pPort, String pTransport,
-			String pLocalAddr, Properties pConfigurationProperties) throws IOException {
-
-		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr,
-				pConfigurationProperties);
-	}
-
-	/**
-	 * Add a new listener using the specified port.
-	 * 
-	 * @param pListener
-	 *            The SBLIM Indication Listener that will be called when an
-	 *            indication is received.
-	 * @param pPort
-	 *            The port to listen on. Use 0 to specify any available port.
-	 * @param pTransport
-	 *            The transport to use (e.g. HTTP or HTTPS).
-	 * @return The port that was used.
-	 * @throws IOException
-	 *             This exception is thrown when binding to pPort fails.
-	 */
-	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport)
-			throws IOException {
-		return addListener((EventListener) pListener, pPort, pTransport, null, null);
-	}
-
-	/**
-	 * Add a new listener using the specified port and local address.
-	 * 
-	 * @param pListener
-	 *            The SBLIM Indication Listener that will be called when an
-	 *            indication is received.
-	 * @param pPort
-	 *            The port to listen on. Use 0 to specify any available port.
-	 * @param pTransport
-	 *            The transport to use (e.g. HTTP or HTTPS).
-	 * @param pLocalAddr
-	 *            The local IP address to bind to. This is only needed in
-	 *            multi-homed systems. A value of null will bind to
-	 *            all IP addresses.
-	 * @return The port that was used.
-	 * @throws IOException
-	 *             This exception is thrown when binding to pPort fails.
-	 */
-	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport,
-			String pLocalAddr) throws IOException {
-		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr, null);
-	}
-
-	/**
-	 * Add a new listener using the specified port, local address and
-	 * properties.
-	 * 
-	 * @param pListener
-	 *            The SBLIM Indication Listener that will be called when an
-	 *            indication is received.
-	 * @param pPort
-	 *            The port to listen on. Use 0 to specify any available port.
-	 * @param pTransport
-	 *            The transport to use (e.g. HTTP or HTTPS).
-	 * @param pLocalAddr
-	 *            The local IP address to bind to. This is only needed in
-	 *            multi-homed systems. A value of null will bind to
-	 *            all IP addresses.
-	 * @param pConfigurationProperties
-	 *            The individual configuration properties for this listener.
-	 * @return The port that was used.
-	 * @throws IOException
-	 *             This exception is thrown when binding to pPort fails.
-	 */
-	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport,
-			String pLocalAddr, Properties pConfigurationProperties) throws IOException {
-
-		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr,
-				pConfigurationProperties);
-	}
-
-	/**
-	 * Add a new listener using the specified port, local address and
-	 * properties. This is the worker routine for all public addListener
-	 * methods.
-	 * 
-	 * @param pListener
-	 *            The indication listener (IndicationListener or
-	 *            IndicationListenerSBLIM) that will be called when
-	 *            an indication is received.
-	 * @param pPort
-	 *            The port to listen on. Use 0 to specify any available port.
-	 * @param pTransport
-	 *            The transport to use (e.g. HTTP or HTTPS).
-	 * @param pLocalAddr
-	 *            The local IP address to bind to. This is only needed in
-	 *            multi-homed systems. A value of null will bind to
-	 *            all IP addresses.
-	 * @param pConfigurationProperties
-	 *            The individual configuration properties for this listener.
-	 * @return The port that was used.
-	 * @throws IOException
-	 *             This exception is thrown when binding to pPort fails.
-	 */
-	private synchronized int addListener(EventListener pListener, int pPort, String pTransport,
-			String pLocalAddr, Properties pConfigurationProperties) throws IOException {
-
-		if (pPort > 0 && this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new BindException(
-				"Port already in use."); }
-		boolean ssl;
-		if (pTransport.equalsIgnoreCase(WBEMConstants.HTTP)) ssl = false;
-		else if (pTransport.equalsIgnoreCase(WBEMConstants.HTTPS)) ssl = true;
-		else throw new IllegalArgumentException("Unknown transport: " + pTransport
-				+ "! Valid values are http and https.");
-
-		WBEMListenerImpl listener = new WBEMListenerImpl(pLocalAddr, pPort, ssl, pListener,
-				pConfigurationProperties);
-		listener.start();
-
-		this.iPortMap.put(Integer.valueOf(listener.getListenerPort()), listener);
-
-		return listener.getListenerPort();
-	}
-
-	/**
-	 * Get the IPs blocked by the listener associated with the specified port.
-	 * 
-	 * @param pPort
-	 *            The port.
-	 * @return The comma-separated list of blocked IPs.
-	 */
-	public String getBlockedIPs(int pPort) {
-		if (pPort <= 0 || !this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new IllegalArgumentException(
-				"Port not in use."); }
-		WBEMListenerImpl listener = this.iPortMap.get(Integer.valueOf(pPort));
-		return listener != null ? listener.getBlockedIPs() : null;
-	}
-
-	public String getProperty(String pName) {
-		if (pName.startsWith("javax.wbem.")) {
-			// Process JSR48 properties
-			if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE)) {
-				return this.iConfiguration.getSslKeyStorePath();
-			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE_PASSWORD)) {
-				return this.iConfiguration.getSslKeyStorePassword();
-			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_TRUSTSTORE)) {
-				return this.iConfiguration.getSslTrustStorePath();
-			} else {
-				return null;
-			}
-		}
-		return this.iConfiguration.getDomainProperty(pName);
-	}
-
-	public synchronized void removeListener(int pPort) {
-		WBEMListenerImpl listener = this.iPortMap.remove(Integer.valueOf(pPort));
-		if (listener != null) {
-			listener.stop();
-		}
-	}
-
-	/**
-	 * Set the IPs to be blocked by the listener associated with the specified
-	 * port.
-	 * 
-	 * @param pPort
-	 *            The port.
-	 * @param pIPs
-	 *            The comma-separated list of blocked IPs.
-	 */
-	public void setBlockedIPs(int pPort, String pIPs) {
-		if (pPort <= 0 || !this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new IllegalArgumentException(
-				"Port not in use."); }
-		WBEMListenerImpl listener = this.iPortMap.get(Integer.valueOf(pPort));
-		if (listener != null) {
-			listener.setBlockedIPs(pIPs);
-		}
-	}
-
-	public void setProperty(String pName, String pValue) {
-		if (pName.startsWith("javax.wbem.")) {
-			// Process JSR48 properties
-			if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE)) {
-				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
-						pValue);
-			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE_PASSWORD)) {
-				this.iConfiguration.setDomainProperty(
-						WBEMConfigurationProperties.KEYSTORE_PASSWORD, pValue);
-			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_TRUSTSTORE)) {
-				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
-						pValue);
-			} else {
-				throw new IllegalArgumentException(pName);
-			}
-		} else {
-			this.iConfiguration.setDomainProperty(pName, pValue);
-		}
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2007-01-08  ebak         Make SBLIM client JSR48 compliant
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 3023348    2010-07-02  blaschke-oss Listener uses # constructor instead of valueOf
+ * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
+ * 3469018    2012-01-03  blaschke-oss Properties not passed to CIMIndicationHandler
+ * 3477087    2012-01-23  blaschke-oss Need Access to an Indication Sender's IP Address
+ * 3496385    2012-03-02  blaschke-oss JSR48 1.0.0: add WBEMListener get/setProperty
+ * 3513228    2012-04-23  blaschke-oss Reliable Indications support can create lots of threads
+ * 3529062    2012-05-23  blaschke-oss WBEMListenerFactory should return new instance
+ * 3529065    2012-05-31  hellerda     Enable WBEMListener get/setProperty
+ *    2628    2013-03-26  blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched
+ *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
+ *    2657    2013-08-20  blaschke-oss Potential null pointer exception in handleConnection
+ */
+
+package org.metricshub.wbem.sblim.cimclient;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.net.BindException;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.metricshub.wbem.javax.wbem.listener.IndicationListener;
+import org.metricshub.wbem.javax.wbem.listener.WBEMListenerConstants;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpConnectionHandler;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpServerConnection;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.indications.CIMEventDispatcher;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.indications.CIMIndicationHandler;
+import org.metricshub.wbem.javax.wbem.listener.WBEMListener;
+
+/**
+ * Class WBEMListenerSBLIM is the SBLIM implementation of the WBEMListener
+ * interface.
+ * 
+ */
+public class WBEMListenerSBLIM implements WBEMListener {
+
+	/**
+	 * The real implementation of a listener that starts a HTTP server and
+	 * processes incoming indications
+	 * 
+	 */
+	public class WBEMListenerImpl {
+
+		private EventListener iIndicationListener;
+
+		private HttpServerConnection iConnection;
+
+		private CIMIndicationHandler iIndicationHandler;
+
+		private HttpConnectionHandler iConnectionHandler;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pLocalAddress
+		 *            The local address to bind the port to. If null the port is
+		 *            bound to all local addresses. For use on multi-homed
+		 *            systems.
+		 * @param pPort
+		 *            The port to listen on. If zero any free port will be
+		 *            chosen.
+		 * @param pSSL
+		 *            SSL secured connection?
+		 * @param pIndicationListener
+		 *            The indication listener to forward the incoming
+		 *            indications to (an instance of IndicationListener or
+		 *            IndicationListenerSBLIM).
+		 * @param pProperties
+		 *            The configuration.
+		 * @throws IOException
+		 */
+		public WBEMListenerImpl(String pLocalAddress, int pPort, boolean pSSL,
+				EventListener pIndicationListener, Properties pProperties) throws IOException {
+
+			// Merge any properties passed via addListener
+			if (pProperties != null) {
+				for (Enumeration e = pProperties.keys(); e.hasMoreElements();) {
+					String key = (String) e.nextElement();
+					String value = pProperties.getProperty(key);
+					setProperty(key, value);
+				}
+			}
+			WBEMConfiguration config = WBEMListenerSBLIM.this.iConfiguration;
+			if (!(pIndicationListener instanceof IndicationListener)
+					&& !(pIndicationListener instanceof IndicationListenerSBLIM)) throw new IllegalArgumentException(
+					"Listener must be instance of IndicationListener or IndicationListenerSBLIM");
+			this.iIndicationListener = pIndicationListener;
+			CIMEventDispatcher eventDispatcher = new CIMEventDispatcher(this.iIndicationListener,
+					config.getListenerMaxQueuedEvents());
+			this.iIndicationHandler = new CIMIndicationHandler(eventDispatcher, config);
+			this.iConnectionHandler = new HttpConnectionHandler(this.iIndicationHandler, config);
+			this.iConnection = new HttpServerConnection(this.iConnectionHandler, pLocalAddress,
+					pPort, pSSL, config);
+		}
+
+		@Override
+		protected void finalize() throws Throwable {
+			try {
+				stop();
+			} finally {
+				super.finalize();
+			}
+		}
+
+		/**
+		 * Starts the HTTP server connection receiving the indications.
+		 */
+		public void start() {
+			this.iConnection.start();
+		}
+
+		/**
+		 * Stops the HTTP server connection receiving the indications and the
+		 * indication handler.
+		 */
+		public void stop() {
+			this.iConnection.close();
+			this.iIndicationHandler.close();
+		}
+
+		/**
+		 * Returns the listener we forward the indications to.
+		 * 
+		 * @return The listener.
+		 */
+		public IndicationListener getIndicationListener() {
+			return (this.iIndicationListener instanceof IndicationListener) ? (IndicationListener) this.iIndicationListener
+					: null;
+		}
+
+		/**
+		 * Returns the listener we forward the indications to.
+		 * 
+		 * @return The listener.
+		 */
+		public IndicationListenerSBLIM getIndicationListenerSBLIM() {
+			return (this.iIndicationListener instanceof IndicationListenerSBLIM) ? (IndicationListenerSBLIM) this.iIndicationListener
+					: null;
+		}
+
+		/**
+		 * Returns the listener port.
+		 * 
+		 * @return The listener port.
+		 */
+		public int getListenerPort() {
+			return this.iConnection.getPort();
+		}
+
+		/**
+		 * Get the IPs blocked by the listener.
+		 * 
+		 * @return The comma-separated list of blocked IPs.
+		 */
+		public String getBlockedIPs() {
+			return this.iConnectionHandler.getBlockedIPs();
+		}
+
+		/**
+		 * Set the IPs to be blocked by the listener.
+		 * 
+		 * @param pIPs
+		 *            The comma-separated list of blocked IPs.
+		 */
+		public void setBlockedIPs(String pIPs) {
+			this.iConnectionHandler.setBlockedIPs(pIPs);
+		}
+	}
+
+	protected final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties());
+
+	private Map iPortMap = new HashMap();
+
+	/**
+	 * Ctor.
+	 */
+	public WBEMListenerSBLIM() {
+		super();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.metricshub.wbem.javax.wbem.listener.WBEMListener#addListener(javax.wbem.listener.
+	 * IndicationListener, int, java.lang.String)
+	 */
+	public int addListener(IndicationListener pListener, int pPort, String pTransport)
+			throws IOException {
+		return addListener((EventListener) pListener, pPort, pTransport, null, null);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.metricshub.wbem.javax.wbem.listener.WBEMListener#addListener(javax.wbem.listener.
+	 * IndicationListener, int, java.lang.String, java.lang.String)
+	 */
+	public int addListener(IndicationListener pListener, int pPort, String pTransport,
+			String pLocalAddr) throws IOException {
+		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr, null);
+	}
+
+	/**
+	 * Add a new listener using the specified port.
+	 * 
+	 * @param pListener
+	 *            The Indication Listener that will be called when an indication
+	 *            is received.
+	 * @param pPort
+	 *            The port to listen on. Use 0 to specify any available port.
+	 * @param pTransport
+	 *            The transport to use (e.g. HTTP or HTTPS).
+	 * @param pLocalAddr
+	 *            The local IP address to bind to. This is only needed in
+	 *            multi-homed systems. A value of null will bind to
+	 *            all IP addresses.
+	 * @param pConfigurationProperties
+	 *            The individual configuration properties for this listener.
+	 * @return The port that was used.
+	 * @throws IOException
+	 *             This exception is thrown when binding to pPort fails.
+	 */
+	public int addListener(IndicationListener pListener, int pPort, String pTransport,
+			String pLocalAddr, Properties pConfigurationProperties) throws IOException {
+
+		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr,
+				pConfigurationProperties);
+	}
+
+	/**
+	 * Add a new listener using the specified port.
+	 * 
+	 * @param pListener
+	 *            The SBLIM Indication Listener that will be called when an
+	 *            indication is received.
+	 * @param pPort
+	 *            The port to listen on. Use 0 to specify any available port.
+	 * @param pTransport
+	 *            The transport to use (e.g. HTTP or HTTPS).
+	 * @return The port that was used.
+	 * @throws IOException
+	 *             This exception is thrown when binding to pPort fails.
+	 */
+	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport)
+			throws IOException {
+		return addListener((EventListener) pListener, pPort, pTransport, null, null);
+	}
+
+	/**
+	 * Add a new listener using the specified port and local address.
+	 * 
+	 * @param pListener
+	 *            The SBLIM Indication Listener that will be called when an
+	 *            indication is received.
+	 * @param pPort
+	 *            The port to listen on. Use 0 to specify any available port.
+	 * @param pTransport
+	 *            The transport to use (e.g. HTTP or HTTPS).
+	 * @param pLocalAddr
+	 *            The local IP address to bind to. This is only needed in
+	 *            multi-homed systems. A value of null will bind to
+	 *            all IP addresses.
+	 * @return The port that was used.
+	 * @throws IOException
+	 *             This exception is thrown when binding to pPort fails.
+	 */
+	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport,
+			String pLocalAddr) throws IOException {
+		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr, null);
+	}
+
+	/**
+	 * Add a new listener using the specified port, local address and
+	 * properties.
+	 * 
+	 * @param pListener
+	 *            The SBLIM Indication Listener that will be called when an
+	 *            indication is received.
+	 * @param pPort
+	 *            The port to listen on. Use 0 to specify any available port.
+	 * @param pTransport
+	 *            The transport to use (e.g. HTTP or HTTPS).
+	 * @param pLocalAddr
+	 *            The local IP address to bind to. This is only needed in
+	 *            multi-homed systems. A value of null will bind to
+	 *            all IP addresses.
+	 * @param pConfigurationProperties
+	 *            The individual configuration properties for this listener.
+	 * @return The port that was used.
+	 * @throws IOException
+	 *             This exception is thrown when binding to pPort fails.
+	 */
+	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport,
+			String pLocalAddr, Properties pConfigurationProperties) throws IOException {
+
+		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr,
+				pConfigurationProperties);
+	}
+
+	/**
+	 * Add a new listener using the specified port, local address and
+	 * properties. This is the worker routine for all public addListener
+	 * methods.
+	 * 
+	 * @param pListener
+	 *            The indication listener (IndicationListener or
+	 *            IndicationListenerSBLIM) that will be called when
+	 *            an indication is received.
+	 * @param pPort
+	 *            The port to listen on. Use 0 to specify any available port.
+	 * @param pTransport
+	 *            The transport to use (e.g. HTTP or HTTPS).
+	 * @param pLocalAddr
+	 *            The local IP address to bind to. This is only needed in
+	 *            multi-homed systems. A value of null will bind to
+	 *            all IP addresses.
+	 * @param pConfigurationProperties
+	 *            The individual configuration properties for this listener.
+	 * @return The port that was used.
+	 * @throws IOException
+	 *             This exception is thrown when binding to pPort fails.
+	 */
+	private synchronized int addListener(EventListener pListener, int pPort, String pTransport,
+			String pLocalAddr, Properties pConfigurationProperties) throws IOException {
+
+		if (pPort > 0 && this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new BindException(
+				"Port already in use."); }
+		boolean ssl;
+		if (pTransport.equalsIgnoreCase(WBEMConstants.HTTP)) ssl = false;
+		else if (pTransport.equalsIgnoreCase(WBEMConstants.HTTPS)) ssl = true;
+		else throw new IllegalArgumentException("Unknown transport: " + pTransport
+				+ "! Valid values are http and https.");
+
+		WBEMListenerImpl listener = new WBEMListenerImpl(pLocalAddr, pPort, ssl, pListener,
+				pConfigurationProperties);
+		listener.start();
+
+		this.iPortMap.put(Integer.valueOf(listener.getListenerPort()), listener);
+
+		return listener.getListenerPort();
+	}
+
+	/**
+	 * Get the IPs blocked by the listener associated with the specified port.
+	 * 
+	 * @param pPort
+	 *            The port.
+	 * @return The comma-separated list of blocked IPs.
+	 */
+	public String getBlockedIPs(int pPort) {
+		if (pPort <= 0 || !this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new IllegalArgumentException(
+				"Port not in use."); }
+		WBEMListenerImpl listener = this.iPortMap.get(Integer.valueOf(pPort));
+		return listener != null ? listener.getBlockedIPs() : null;
+	}
+
+	public String getProperty(String pName) {
+		if (pName.startsWith("javax.wbem.")) {
+			// Process JSR48 properties
+			if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE)) {
+				return this.iConfiguration.getSslKeyStorePath();
+			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE_PASSWORD)) {
+				return this.iConfiguration.getSslKeyStorePassword();
+			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_TRUSTSTORE)) {
+				return this.iConfiguration.getSslTrustStorePath();
+			} else {
+				return null;
+			}
+		}
+		return this.iConfiguration.getDomainProperty(pName);
+	}
+
+	public synchronized void removeListener(int pPort) {
+		WBEMListenerImpl listener = this.iPortMap.remove(Integer.valueOf(pPort));
+		if (listener != null) {
+			listener.stop();
+		}
+	}
+
+	/**
+	 * Set the IPs to be blocked by the listener associated with the specified
+	 * port.
+	 * 
+	 * @param pPort
+	 *            The port.
+	 * @param pIPs
+	 *            The comma-separated list of blocked IPs.
+	 */
+	public void setBlockedIPs(int pPort, String pIPs) {
+		if (pPort <= 0 || !this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new IllegalArgumentException(
+				"Port not in use."); }
+		WBEMListenerImpl listener = this.iPortMap.get(Integer.valueOf(pPort));
+		if (listener != null) {
+			listener.setBlockedIPs(pIPs);
+		}
+	}
+
+	public void setProperty(String pName, String pValue) {
+		if (pName.startsWith("javax.wbem.")) {
+			// Process JSR48 properties
+			if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE)) {
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
+						pValue);
+			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE_PASSWORD)) {
+				this.iConfiguration.setDomainProperty(
+						WBEMConfigurationProperties.KEYSTORE_PASSWORD, pValue);
+			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_TRUSTSTORE)) {
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
+						pValue);
+			} else {
+				throw new IllegalArgumentException(pName);
+			}
+		} else {
+			this.iConfiguration.setDomainProperty(pName, pValue);
+		}
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java
similarity index 91%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java
index 15c2234..b1100e1 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java
@@ -1,560 +1,559 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
- 
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
- 
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
- 
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
- * 1729361    2007-06-04  lupusalex    Multicast discovery is broken in DiscovererSLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.discovery;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-
-import javax.security.auth.Subject;
-import org.sentrysoftware.wbem.javax.wbem.client.WBEMClient;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Class AdvertisementCatalog implements a catalog for WBEM service
- * advertisements. In practice we usually have multiple advertisements for a
- * single service, because the DMTF mandates an advertisement per remote service
- * access point (e.g. http, https, rmi). This class tries to ease the management
- * of this by indexing services by the unique service id and therefore surfacing
- * which advertisements belong to the same service. The application might then
- * choose it's preferred communication mechanism.
- * 
- * No thread synchronization provided, this is the responsibility of
- *            the caller.
- * @since 2.0.2
- */
-public class AdvertisementCatalog {
-
-	/**
-	 * Interface EventListener specifies listener that are called when an
-	 * advertisement is added to or removed from the catalog, expires or is
-	 * renewed.
-	 * 
-	 */
-	public static interface EventListener {
-
-		/**
-		 * Called when an advertisement is added to the catalog that has not
-		 * been a member of the catalog before.
-		 * 
-		 * @param pEvent
-		 *            The type of the event. One of the constants
-		 *            EVENT_ADD, EVENT_REMOVE, EVENT_EXPIRE, EVENT_RENEW
-		 *            in AdvertisementCatalog.
-		 * 
-		 * @param pAdvertisment
-		 *            The added advertisement
-		 */
-		public void advertisementEvent(int pEvent, WBEMServiceAdvertisement pAdvertisment);
-	}
-
-	/**
-	 * Class AdvertisementDecorator decorates a WBEMAdvertisement with state
-	 * information required by the AdvertisementCatalog class
-	 * 
-	 * @pattern Decorator
-	 * iAvertisement!=null
-	 */
-	private static class AdvertisementDecorator implements WBEMServiceAdvertisement {
-
-		private WBEMServiceAdvertisement iAdvertisement;
-
-		private boolean iRefresh = false;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pAdvertisement
-		 *            The advertisement to decorate
-		 */
-		protected AdvertisementDecorator(WBEMServiceAdvertisement pAdvertisement) {
-			if (pAdvertisement == null) throw new IllegalArgumentException("Advertisement is null");
-			this.iAdvertisement = pAdvertisement;
-		}
-
-		/**
-		 * Returns advertisement
-		 * 
-		 * @return The value of advertisement.
-		 */
-		protected WBEMServiceAdvertisement getAdvertisementXXX() {
-			return this.iAdvertisement;
-		}
-
-		/**
-		 * Returns refresh
-		 * 
-		 * @return The value of refresh.
-		 */
-		protected boolean isRefresh() {
-			return this.iRefresh;
-		}
-
-		/**
-		 * Sets advertisement
-		 * 
-		 * @param pAdvertisement
-		 *            The new value of advertisement.
-		 */
-		protected void setAdvertisement(WBEMServiceAdvertisement pAdvertisement) {
-			this.iAdvertisement = pAdvertisement;
-		}
-
-		/**
-		 * Sets refresh
-		 * 
-		 * @param pRefresh
-		 *            The new value of refresh.
-		 */
-		protected void setRefresh(boolean pRefresh) {
-			this.iRefresh = pRefresh;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		@Override
-		public boolean equals(Object pObj) {
-			return this.iAdvertisement.equals(pObj);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.lang.Object#hashCode()
-		 */
-		@Override
-		public int hashCode() {
-			return this.iAdvertisement.hashCode();
-		}
-
-		/**
-		 * @see WBEMServiceAdvertisement#createClient(javax.security.auth.Subject, java.util.Locale[])
-		 */
-		public WBEMClient createClient(Subject pSubject, Locale[] pLocales) throws Exception {
-			return this.iAdvertisement.createClient(pSubject, pLocales);
-		}
-
-		/**
-		 * @see WBEMServiceAdvertisement#getAttribute(java.lang.String)
-		 */
-		public String getAttribute(String pAttributeName) {
-			return this.iAdvertisement.getAttribute(pAttributeName);
-		}
-
-		/**
-		 * @see WBEMServiceAdvertisement#getAttributes()
-		 */
-		public Set> getAttributes() {
-			return this.iAdvertisement.getAttributes();
-		}
-
-		/**
-		 * @see WBEMServiceAdvertisement#getConcreteServiceType()
-		 */
-		public String getConcreteServiceType() {
-			return this.iAdvertisement.getConcreteServiceType();
-		}
-
-		/**
-		 * @see WBEMServiceAdvertisement#getDirectory()
-		 */
-		public String getDirectory() {
-			return this.iAdvertisement.getDirectory();
-		}
-
-		/**
-		 * @see WBEMServiceAdvertisement#getInteropNamespaces()
-		 */
-		public String[] getInteropNamespaces() {
-			return this.iAdvertisement.getInteropNamespaces();
-		}
-
-		/**
-		 * @see WBEMServiceAdvertisement#getServiceId()
-		 */
-		public String getServiceId() {
-			return this.iAdvertisement.getServiceId();
-		}
-
-		/**
-		 * @see WBEMServiceAdvertisement#getServiceUrl()
-		 */
-		public String getServiceUrl() {
-			return this.iAdvertisement.getServiceUrl();
-		}
-
-		/**
-		 * @see WBEMServiceAdvertisement#isExpired()
-		 */
-		public boolean isExpired() {
-			return this.iAdvertisement.isExpired();
-		}
-
-		/**
-		 * @see WBEMServiceAdvertisement#setExpired(boolean)
-		 */
-		public void setExpired(boolean pExpired) {
-			this.iAdvertisement.setExpired(pExpired);
-		}
-	}
-
-	/**
-	 * Event code when advertisement is added
-	 */
-	public static int EVENT_ADD = 1;
-
-	/**
-	 * Event code when advertisement is removed
-	 */
-	public static int EVENT_REMOVE = 2;
-
-	/**
-	 * Event code when advertisement expires
-	 */
-	public static int EVENT_EXPIRE = 4;
-
-	/**
-	 * Event code when advertisement is renewed
-	 */
-	public static int EVENT_RENEW = 8;
-
-	private List iListeners = new LinkedList();
-
-	private HashMap> iCatalogByDirectory = new HashMap>();
-
-	private Map> iCatalogById = new HashMap>();
-
-	/**
-	 * Ctor.
-	 */
-	public AdvertisementCatalog() {
-	/**/
-	}
-
-	/**
-	 * Adds a listener for "add" events. The listener will be called whenever a
-	 * advertisement is added to the catalog.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public void addEventListener(EventListener pListener) {
-		this.iListeners.add(pListener);
-	}
-
-	/**
-	 * Adds new advertisements to the catalog. Existing advertisements sharing
-	 * concrete type, url and directory are replaced.
-	 * 
-	 * @param pAdvertisements
-	 *            The new advertisements
-	 */
-	public void addAdvertisements(WBEMServiceAdvertisement[] pAdvertisements) {
-		for (int i = 0; i < pAdvertisements.length; ++i) {
-			String url = "";
-			try {
-				WBEMServiceAdvertisement advertisement = pAdvertisements[i];
-				url = advertisement.getServiceUrl();
-				WBEMProtocol protocol = makeProtocol(advertisement);
-				String serviceId = advertisement.getAttribute(WBEMServiceAdvertisement.SERVICE_ID);
-				{
-					List innerList = this.iCatalogByDirectory
-							.get(advertisement.getDirectory());
-					if (innerList == null) {
-						innerList = new ArrayList();
-						this.iCatalogByDirectory.put(advertisement.getDirectory(), innerList);
-					}
-					AdvertisementDecorator entry = findAdvertisement(innerList, advertisement);
-					if (entry != null) {
-						boolean wasExpired = entry.isExpired();
-						entry.setAdvertisement(advertisement);
-						entry.setRefresh(false);
-						entry.setExpired(false);
-						if (wasExpired) {
-							notifyEventListeners(EVENT_RENEW, advertisement);
-						}
-					} else {
-						innerList.add(new AdvertisementDecorator(advertisement));
-						notifyEventListeners(EVENT_ADD, advertisement);
-					}
-				}
-				{
-					Map innerMap = this.iCatalogById
-							.get(serviceId);
-					if (innerMap == null) {
-						innerMap = new HashMap();
-						this.iCatalogById.put(serviceId, innerMap);
-					}
-					innerMap.put(protocol, advertisement);
-				}
-			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINE,
-				                                    "Incomplete advertisement for" + url, e);
-			}
-		}
-	}
-
-	/**
-	 * Returns the advertisement from the catalog corresponding to a given id
-	 * and with the protocol preferred most.
-	 * 
-	 * @param pId
-	 *            The service id
-	 * @param pProtocols
-	 *            An array containing the desired protocols in order of
-	 *            preference. If a service doesn't advertise any of the given
-	 *            protocols this service returns null.
-	 * @return The corresponding advertisement
-	 */
-	public WBEMServiceAdvertisement getAdvertisement(final String pId,
-			final WBEMProtocol[] pProtocols) {
-		Map innerMap = this.iCatalogById.get(pId);
-		if (innerMap == null) { return null; }
-		for (int i = 0; i < pProtocols.length; ++i) {
-			WBEMServiceAdvertisement advertisement = innerMap.get(pProtocols[i]);
-			if (advertisement != null) { return advertisement; }
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the advertisements from the catalog corresponding to a given
-	 * directory
-	 * 
-	 * @param pDirectory
-	 *            The directory service
-	 * @return The corresponding advertisements
-	 */
-	public WBEMServiceAdvertisement[] getAdvertisementsByDirectory(String pDirectory) {
-		List result = this.iCatalogByDirectory.get(pDirectory);
-		return (result != null ? (WBEMServiceAdvertisement[]) result
-				.toArray(new WBEMServiceAdvertisement[result.size()])
-				: new WBEMServiceAdvertisement[] {});
-	}
-
-	/**
-	 * Returns the advertisements from the catalog corresponding to a given id
-	 * 
-	 * @param pId
-	 *            The service id
-	 * @return The corresponding advertisements
-	 */
-	public WBEMServiceAdvertisement[] getAdvertisementsById(String pId) {
-		Map innerMap = this.iCatalogById.get(pId);
-		if (innerMap == null) { return null; }
-		Collection advertisements = innerMap.values();
-		return advertisements.toArray(new WBEMServiceAdvertisement[advertisements.size()]);
-	}
-
-	/**
-	 * Returns an array of service ids known by this catalog
-	 * 
-	 * @return The service ids
-	 */
-	public String[] getKnownIds() {
-		Set ids = this.iCatalogById.keySet();
-		return ids.toArray(new String[ids.size()]);
-	}
-
-	/**
-	 * Refreshes the advertisements from a given directory. All existing
-	 * advertisements from this directory are deleted first before the new ones
-	 * are added.
-	 * 
-	 * @param pDirectory
-	 *            The directory services we got the advertisements from
-	 * @param pAdvertisements
-	 *            The advertisements
-	 */
-	public void refreshAdvertisements(final String[] pDirectory,
-			WBEMServiceAdvertisement[] pAdvertisements) {
-		for (int i = 0; i < pDirectory.length; ++i) {
-			markRefresh(pDirectory[i]);
-		}
-		addAdvertisements(pAdvertisements);
-		for (int i = 0; i < pDirectory.length; ++i) {
-			expire(pDirectory[i]);
-		}
-	}
-
-	/**
-	 * Removes a listener
-	 * 
-	 * @param pListener
-	 *            The listener to remove
-	 */
-	public void removeEventListener(EventListener pListener) {
-		this.iListeners.remove(pListener);
-	}
-
-	/**
-	 * Removes the expired advertisements from the catalog.
-	 * 
-	 * @param pDirectory
-	 *            When not null only the expired advertisements of
-	 *            the given directory are removed. Otherwise all expired
-	 *            advertisements are removed.
-	 */
-	public void removeExpired(String pDirectory) {
-
-		if (pDirectory == null) {
-			Iterator iter = this.iCatalogByDirectory.keySet().iterator();
-			while (iter.hasNext()) {
-				removeExpired(iter.next());
-			}
-			return;
-		}
-
-		List advertisementList = this.iCatalogByDirectory.get(pDirectory);
-		Iterator iter = advertisementList.iterator();
-		while (iter.hasNext()) {
-			AdvertisementDecorator decorator = iter.next();
-			if (decorator.isExpired()) {
-				iter.remove();
-				notifyEventListeners(EVENT_REMOVE, decorator);
-				Map innerMap = this.iCatalogById
-						.get(decorator.getServiceId());
-				innerMap.remove(makeProtocol(decorator));
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		StringBuffer result = new StringBuffer();
-		result.append("AdvertisementCatalog:");
-		Iterator>> outer = this.iCatalogById
-				.entrySet().iterator();
-		while (outer.hasNext()) {
-			Map.Entry> entry = outer.next();
-			if (entry.getValue() == null) {
-				continue;
-			}
-			result.append("[service-id:\"");
-			result.append(entry.getKey());
-			result.append("\"");
-			Map innerMap = entry.getValue();
-			Iterator> inner = innerMap.entrySet()
-			                                                                            .iterator();
-			while (inner.hasNext()) {
-				Map.Entry innerEntry = inner.next();
-				result.append("[");
-				result.append(innerEntry.getKey().toString());
-				result.append("]");
-			}
-			result.append("]");
-		}
-		return result.toString();
-	}
-
-	private void expire(String pDirectory) {
-		List advertisementList = this.iCatalogByDirectory.get(pDirectory);
-		if (advertisementList == null) { return; }
-		Iterator iter = advertisementList.iterator();
-		while (iter.hasNext()) {
-			AdvertisementDecorator advertisement = iter.next();
-			if (advertisement.isRefresh()) {
-				advertisement.setRefresh(false);
-				advertisement.setExpired(true);
-				notifyEventListeners(EVENT_EXPIRE, advertisement);
-			}
-		}
-	}
-
-	private AdvertisementDecorator findAdvertisement(List pList,
-			WBEMServiceAdvertisement pAdvertisement) {
-		Iterator iter = pList.iterator();
-		while (iter.hasNext()) {
-			AdvertisementDecorator entry = iter.next();
-			if (entry.getServiceUrl().equals(pAdvertisement.getServiceUrl())) { return entry; }
-		}
-		return null;
-	}
-
-	private WBEMProtocol makeProtocol(WBEMServiceAdvertisement advertisement) {
-		String presentation = advertisement.getAttribute(WBEMServiceAdvertisement.COMM_MECHANISM);
-		if ("OTHER".equalsIgnoreCase(presentation)) {
-			presentation = advertisement
-					.getAttribute(WBEMServiceAdvertisement.OTHER_COMM_MECHN_DESC);
-		}
-		String transport = advertisement.getServiceUrl().split(":", 2)[0];
-		WBEMProtocol protocol = new WBEMProtocol(transport, presentation);
-		return protocol;
-	}
-
-	private void markRefresh(String pDirectory) {
-		List advertisementList = this.iCatalogByDirectory.get(pDirectory);
-		if (advertisementList == null) { return; }
-		Iterator iter = advertisementList.iterator();
-		while (iter.hasNext()) {
-			AdvertisementDecorator advertisement = iter.next();
-			advertisement.setRefresh(true);
-		}
-	}
-
-	private void notifyEventListeners(int pEvent, WBEMServiceAdvertisement pAdvertisement) {
-		Iterator iter = this.iListeners.iterator();
-		while (iter.hasNext()) {
-			iter.next().advertisementEvent(pEvent, pAdvertisement);
-		}
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+ 
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+ 
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+ 
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
+ * 1729361    2007-06-04  lupusalex    Multicast discovery is broken in DiscovererSLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ */
+
+package org.metricshub.wbem.sblim.cimclient.discovery;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import javax.security.auth.Subject;
+
+import org.metricshub.wbem.javax.wbem.client.WBEMClient;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.logging.Level;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Class AdvertisementCatalog implements a catalog for WBEM service
+ * advertisements. In practice we usually have multiple advertisements for a
+ * single service, because the DMTF mandates an advertisement per remote service
+ * access point (e.g. http, https, rmi). This class tries to ease the management
+ * of this by indexing services by the unique service id and therefore surfacing
+ * which advertisements belong to the same service. The application might then
+ * choose it's preferred communication mechanism.
+ * 
+ * No thread synchronization provided, this is the responsibility of
+ *            the caller.
+ * @since 2.0.2
+ */
+public class AdvertisementCatalog {
+
+	/**
+	 * Interface EventListener specifies listener that are called when an
+	 * advertisement is added to or removed from the catalog, expires or is
+	 * renewed.
+	 * 
+	 */
+	public static interface EventListener {
+
+		/**
+		 * Called when an advertisement is added to the catalog that has not
+		 * been a member of the catalog before.
+		 * 
+		 * @param pEvent
+		 *            The type of the event. One of the constants
+		 *            EVENT_ADD, EVENT_REMOVE, EVENT_EXPIRE, EVENT_RENEW
+		 *            in AdvertisementCatalog.
+		 * 
+		 * @param pAdvertisment
+		 *            The added advertisement
+		 */
+		public void advertisementEvent(int pEvent, WBEMServiceAdvertisement pAdvertisment);
+	}
+
+	/**
+	 * Class AdvertisementDecorator decorates a WBEMAdvertisement with state
+	 * information required by the AdvertisementCatalog class
+	 * 
+	 * @pattern Decorator
+	 * iAvertisement!=null
+	 */
+	private static class AdvertisementDecorator implements WBEMServiceAdvertisement {
+
+		private WBEMServiceAdvertisement iAdvertisement;
+
+		private boolean iRefresh = false;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pAdvertisement
+		 *            The advertisement to decorate
+		 */
+		protected AdvertisementDecorator(WBEMServiceAdvertisement pAdvertisement) {
+			if (pAdvertisement == null) throw new IllegalArgumentException("Advertisement is null");
+			this.iAdvertisement = pAdvertisement;
+		}
+
+		/**
+		 * Returns advertisement
+		 * 
+		 * @return The value of advertisement.
+		 */
+		protected WBEMServiceAdvertisement getAdvertisementXXX() {
+			return this.iAdvertisement;
+		}
+
+		/**
+		 * Returns refresh
+		 * 
+		 * @return The value of refresh.
+		 */
+		protected boolean isRefresh() {
+			return this.iRefresh;
+		}
+
+		/**
+		 * Sets advertisement
+		 * 
+		 * @param pAdvertisement
+		 *            The new value of advertisement.
+		 */
+		protected void setAdvertisement(WBEMServiceAdvertisement pAdvertisement) {
+			this.iAdvertisement = pAdvertisement;
+		}
+
+		/**
+		 * Sets refresh
+		 * 
+		 * @param pRefresh
+		 *            The new value of refresh.
+		 */
+		protected void setRefresh(boolean pRefresh) {
+			this.iRefresh = pRefresh;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see java.lang.Object#equals(java.lang.Object)
+		 */
+		@Override
+		public boolean equals(Object pObj) {
+			return this.iAdvertisement.equals(pObj);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see java.lang.Object#hashCode()
+		 */
+		@Override
+		public int hashCode() {
+			return this.iAdvertisement.hashCode();
+		}
+
+		/**
+		 * @see WBEMServiceAdvertisement#createClient(javax.security.auth.Subject, java.util.Locale[])
+		 */
+		public WBEMClient createClient(Subject pSubject, Locale[] pLocales) throws Exception {
+			return this.iAdvertisement.createClient(pSubject, pLocales);
+		}
+
+		/**
+		 * @see WBEMServiceAdvertisement#getAttribute(java.lang.String)
+		 */
+		public String getAttribute(String pAttributeName) {
+			return this.iAdvertisement.getAttribute(pAttributeName);
+		}
+
+		/**
+		 * @see WBEMServiceAdvertisement#getAttributes()
+		 */
+		public Set> getAttributes() {
+			return this.iAdvertisement.getAttributes();
+		}
+
+		/**
+		 * @see WBEMServiceAdvertisement#getConcreteServiceType()
+		 */
+		public String getConcreteServiceType() {
+			return this.iAdvertisement.getConcreteServiceType();
+		}
+
+		/**
+		 * @see WBEMServiceAdvertisement#getDirectory()
+		 */
+		public String getDirectory() {
+			return this.iAdvertisement.getDirectory();
+		}
+
+		/**
+		 * @see WBEMServiceAdvertisement#getInteropNamespaces()
+		 */
+		public String[] getInteropNamespaces() {
+			return this.iAdvertisement.getInteropNamespaces();
+		}
+
+		/**
+		 * @see WBEMServiceAdvertisement#getServiceId()
+		 */
+		public String getServiceId() {
+			return this.iAdvertisement.getServiceId();
+		}
+
+		/**
+		 * @see WBEMServiceAdvertisement#getServiceUrl()
+		 */
+		public String getServiceUrl() {
+			return this.iAdvertisement.getServiceUrl();
+		}
+
+		/**
+		 * @see WBEMServiceAdvertisement#isExpired()
+		 */
+		public boolean isExpired() {
+			return this.iAdvertisement.isExpired();
+		}
+
+		/**
+		 * @see WBEMServiceAdvertisement#setExpired(boolean)
+		 */
+		public void setExpired(boolean pExpired) {
+			this.iAdvertisement.setExpired(pExpired);
+		}
+	}
+
+	/**
+	 * Event code when advertisement is added
+	 */
+	public static int EVENT_ADD = 1;
+
+	/**
+	 * Event code when advertisement is removed
+	 */
+	public static int EVENT_REMOVE = 2;
+
+	/**
+	 * Event code when advertisement expires
+	 */
+	public static int EVENT_EXPIRE = 4;
+
+	/**
+	 * Event code when advertisement is renewed
+	 */
+	public static int EVENT_RENEW = 8;
+
+	private List iListeners = new LinkedList();
+
+	private HashMap> iCatalogByDirectory = new HashMap>();
+
+	private Map> iCatalogById = new HashMap>();
+
+	/**
+	 * Ctor.
+	 */
+	public AdvertisementCatalog() {
+	/**/
+	}
+
+	/**
+	 * Adds a listener for "add" events. The listener will be called whenever a
+	 * advertisement is added to the catalog.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public void addEventListener(EventListener pListener) {
+		this.iListeners.add(pListener);
+	}
+
+	/**
+	 * Adds new advertisements to the catalog. Existing advertisements sharing
+	 * concrete type, url and directory are replaced.
+	 * 
+	 * @param pAdvertisements
+	 *            The new advertisements
+	 */
+	public void addAdvertisements(WBEMServiceAdvertisement[] pAdvertisements) {
+		for (int i = 0; i < pAdvertisements.length; ++i) {
+			String url = "";
+			try {
+				WBEMServiceAdvertisement advertisement = pAdvertisements[i];
+				url = advertisement.getServiceUrl();
+				WBEMProtocol protocol = makeProtocol(advertisement);
+				String serviceId = advertisement.getAttribute(WBEMServiceAdvertisement.SERVICE_ID);
+				{
+					List innerList = this.iCatalogByDirectory
+							.get(advertisement.getDirectory());
+					if (innerList == null) {
+						innerList = new ArrayList();
+						this.iCatalogByDirectory.put(advertisement.getDirectory(), innerList);
+					}
+					AdvertisementDecorator entry = findAdvertisement(innerList, advertisement);
+					if (entry != null) {
+						boolean wasExpired = entry.isExpired();
+						entry.setAdvertisement(advertisement);
+						entry.setRefresh(false);
+						entry.setExpired(false);
+						if (wasExpired) {
+							notifyEventListeners(EVENT_RENEW, advertisement);
+						}
+					} else {
+						innerList.add(new AdvertisementDecorator(advertisement));
+						notifyEventListeners(EVENT_ADD, advertisement);
+					}
+				}
+				{
+					Map innerMap = this.iCatalogById
+							.get(serviceId);
+					if (innerMap == null) {
+						innerMap = new HashMap();
+						this.iCatalogById.put(serviceId, innerMap);
+					}
+					innerMap.put(protocol, advertisement);
+				}
+			} catch (Exception e) {
+				LogAndTraceBroker.getBroker().trace(Level.FINE,
+				                                    "Incomplete advertisement for" + url, e);
+			}
+		}
+	}
+
+	/**
+	 * Returns the advertisement from the catalog corresponding to a given id
+	 * and with the protocol preferred most.
+	 * 
+	 * @param pId
+	 *            The service id
+	 * @param pProtocols
+	 *            An array containing the desired protocols in order of
+	 *            preference. If a service doesn't advertise any of the given
+	 *            protocols this service returns null.
+	 * @return The corresponding advertisement
+	 */
+	public WBEMServiceAdvertisement getAdvertisement(final String pId,
+			final WBEMProtocol[] pProtocols) {
+		Map innerMap = this.iCatalogById.get(pId);
+		if (innerMap == null) { return null; }
+		for (int i = 0; i < pProtocols.length; ++i) {
+			WBEMServiceAdvertisement advertisement = innerMap.get(pProtocols[i]);
+			if (advertisement != null) { return advertisement; }
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the advertisements from the catalog corresponding to a given
+	 * directory
+	 * 
+	 * @param pDirectory
+	 *            The directory service
+	 * @return The corresponding advertisements
+	 */
+	public WBEMServiceAdvertisement[] getAdvertisementsByDirectory(String pDirectory) {
+		List result = this.iCatalogByDirectory.get(pDirectory);
+		return (result != null ? (WBEMServiceAdvertisement[]) result
+				.toArray(new WBEMServiceAdvertisement[result.size()])
+				: new WBEMServiceAdvertisement[] {});
+	}
+
+	/**
+	 * Returns the advertisements from the catalog corresponding to a given id
+	 * 
+	 * @param pId
+	 *            The service id
+	 * @return The corresponding advertisements
+	 */
+	public WBEMServiceAdvertisement[] getAdvertisementsById(String pId) {
+		Map innerMap = this.iCatalogById.get(pId);
+		if (innerMap == null) { return null; }
+		Collection advertisements = innerMap.values();
+		return advertisements.toArray(new WBEMServiceAdvertisement[advertisements.size()]);
+	}
+
+	/**
+	 * Returns an array of service ids known by this catalog
+	 * 
+	 * @return The service ids
+	 */
+	public String[] getKnownIds() {
+		Set ids = this.iCatalogById.keySet();
+		return ids.toArray(new String[ids.size()]);
+	}
+
+	/**
+	 * Refreshes the advertisements from a given directory. All existing
+	 * advertisements from this directory are deleted first before the new ones
+	 * are added.
+	 * 
+	 * @param pDirectory
+	 *            The directory services we got the advertisements from
+	 * @param pAdvertisements
+	 *            The advertisements
+	 */
+	public void refreshAdvertisements(final String[] pDirectory,
+			WBEMServiceAdvertisement[] pAdvertisements) {
+		for (int i = 0; i < pDirectory.length; ++i) {
+			markRefresh(pDirectory[i]);
+		}
+		addAdvertisements(pAdvertisements);
+		for (int i = 0; i < pDirectory.length; ++i) {
+			expire(pDirectory[i]);
+		}
+	}
+
+	/**
+	 * Removes a listener
+	 * 
+	 * @param pListener
+	 *            The listener to remove
+	 */
+	public void removeEventListener(EventListener pListener) {
+		this.iListeners.remove(pListener);
+	}
+
+	/**
+	 * Removes the expired advertisements from the catalog.
+	 * 
+	 * @param pDirectory
+	 *            When not null only the expired advertisements of
+	 *            the given directory are removed. Otherwise all expired
+	 *            advertisements are removed.
+	 */
+	public void removeExpired(String pDirectory) {
+
+		if (pDirectory == null) {
+			Iterator iter = this.iCatalogByDirectory.keySet().iterator();
+			while (iter.hasNext()) {
+				removeExpired(iter.next());
+			}
+			return;
+		}
+
+		List advertisementList = this.iCatalogByDirectory.get(pDirectory);
+		Iterator iter = advertisementList.iterator();
+		while (iter.hasNext()) {
+			AdvertisementDecorator decorator = iter.next();
+			if (decorator.isExpired()) {
+				iter.remove();
+				notifyEventListeners(EVENT_REMOVE, decorator);
+				Map innerMap = this.iCatalogById
+						.get(decorator.getServiceId());
+				innerMap.remove(makeProtocol(decorator));
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		StringBuffer result = new StringBuffer();
+		result.append("AdvertisementCatalog:");
+		Iterator>> outer = this.iCatalogById
+				.entrySet().iterator();
+		while (outer.hasNext()) {
+			Map.Entry> entry = outer.next();
+			if (entry.getValue() == null) {
+				continue;
+			}
+			result.append("[service-id:\"");
+			result.append(entry.getKey());
+			result.append("\"");
+			Map innerMap = entry.getValue();
+			Iterator> inner = innerMap.entrySet()
+			                                                                            .iterator();
+			while (inner.hasNext()) {
+				Map.Entry innerEntry = inner.next();
+				result.append("[");
+				result.append(innerEntry.getKey().toString());
+				result.append("]");
+			}
+			result.append("]");
+		}
+		return result.toString();
+	}
+
+	private void expire(String pDirectory) {
+		List advertisementList = this.iCatalogByDirectory.get(pDirectory);
+		if (advertisementList == null) { return; }
+		Iterator iter = advertisementList.iterator();
+		while (iter.hasNext()) {
+			AdvertisementDecorator advertisement = iter.next();
+			if (advertisement.isRefresh()) {
+				advertisement.setRefresh(false);
+				advertisement.setExpired(true);
+				notifyEventListeners(EVENT_EXPIRE, advertisement);
+			}
+		}
+	}
+
+	private AdvertisementDecorator findAdvertisement(List pList,
+			WBEMServiceAdvertisement pAdvertisement) {
+		Iterator iter = pList.iterator();
+		while (iter.hasNext()) {
+			AdvertisementDecorator entry = iter.next();
+			if (entry.getServiceUrl().equals(pAdvertisement.getServiceUrl())) { return entry; }
+		}
+		return null;
+	}
+
+	private WBEMProtocol makeProtocol(WBEMServiceAdvertisement advertisement) {
+		String presentation = advertisement.getAttribute(WBEMServiceAdvertisement.COMM_MECHANISM);
+		if ("OTHER".equalsIgnoreCase(presentation)) {
+			presentation = advertisement
+					.getAttribute(WBEMServiceAdvertisement.OTHER_COMM_MECHN_DESC);
+		}
+		String transport = advertisement.getServiceUrl().split(":", 2)[0];
+		WBEMProtocol protocol = new WBEMProtocol(transport, presentation);
+		return protocol;
+	}
+
+	private void markRefresh(String pDirectory) {
+		List advertisementList = this.iCatalogByDirectory.get(pDirectory);
+		if (advertisementList == null) { return; }
+		Iterator iter = advertisementList.iterator();
+		while (iter.hasNext()) {
+			AdvertisementDecorator advertisement = iter.next();
+			advertisement.setRefresh(true);
+		}
+	}
+
+	private void notifyEventListeners(int pEvent, WBEMServiceAdvertisement pAdvertisement) {
+		Iterator iter = this.iListeners.iterator();
+		while (iter.hasNext()) {
+			iter.next().advertisementEvent(pEvent, pAdvertisement);
+		}
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/Discoverer.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/Discoverer.java
similarity index 71%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/Discoverer.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/Discoverer.java
index dd700c1..92f333f 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/Discoverer.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/Discoverer.java
@@ -1,73 +1,71 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
- * 1729361    2007-06-04  lupusalex    Multicast discovery is broken in DiscovererSLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.discovery;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Interface Discoverer offers methodology for discovering WBEM services.
- * 
- * Implementations SHALL ensure thread-safety
- * @since 2.0.2
- */
-public interface Discoverer {
-
-	/**
-	 * Finds WBEM services using a given list of directory servers
-	 * 
-	 * @param pDirectoryUrls
-	 *            An array of directory servers. For SLP this would be a list of
-	 *            DA URLs.
-	 * @return The array of WBEM service advertisements found
-	 */
-	public WBEMServiceAdvertisement[] findWbemServices(String[] pDirectoryUrls);
-
-	/**
-	 * Finds directory services. The semantics of this method might be protocol
-	 * specific. E.g. for SLP this sends a multicast into the local subnet
-	 * looking first for directory agent, second for service agents.
-	 * 
-	 * @return A String[] containing the URLs of the directories
-	 * @since 2.0.3
-	 */
-	public String[] findDirectoryServices();
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
+ * 1729361    2007-06-04  lupusalex    Multicast discovery is broken in DiscovererSLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.discovery;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Interface Discoverer offers methodology for discovering WBEM services.
+ * 
+ * Implementations SHALL ensure thread-safety
+ * @since 2.0.2
+ */
+public interface Discoverer {
+
+	/**
+	 * Finds WBEM services using a given list of directory servers
+	 * 
+	 * @param pDirectoryUrls
+	 *            An array of directory servers. For SLP this would be a list of
+	 *            DA URLs.
+	 * @return The array of WBEM service advertisements found
+	 */
+	public WBEMServiceAdvertisement[] findWbemServices(String[] pDirectoryUrls);
+
+	/**
+	 * Finds directory services. The semantics of this method might be protocol
+	 * specific. E.g. for SLP this sends a multicast into the local subnet
+	 * looking first for directory agent, second for service agents.
+	 * 
+	 * @return A String[] containing the URLs of the directories
+	 * @since 2.0.3
+	 */
+	public String[] findDirectoryServices();
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/DiscovererFactory.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/DiscovererFactory.java
similarity index 69%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/DiscovererFactory.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/DiscovererFactory.java
index 3a0a8cd..47b40bc 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/DiscovererFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/DiscovererFactory.java
@@ -1,93 +1,91 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.discovery;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Locale;
-
-import org.sentrysoftware.wbem.sblim.cimclient.discovery.Discoverer;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.discovery.slp.DiscovererSLP;
-
-/**
- * Class DiscovererFactory is responsible for creating concrete instances of the
- * Discoverer interface.
- * 
- * This class is thread-safe.
- * 
- * @since 2.0.2
- */
-public class DiscovererFactory {
-
-	/**
-	 * The Service Location Protocol (SLP)
-	 */
-	public static final String SLP = "SLP";
-
-	private static final String[] cProtocols = new String[] { SLP };
-
-	/**
-	 * Returns the concrete Discoverer for a given discovery protocol.
-	 * 
-	 * @param pProtocol The discovery protocol, e.g. "SLP"
-	 * @return The corresponding discoverer
-	 * @throws IllegalArgumentException On unsupported protocols
-	 * Factory Method
-	 */
-	public static Discoverer getDiscoverer(String pProtocol) throws IllegalArgumentException {
-		if (SLP.equalsIgnoreCase(pProtocol)) {
-			return new DiscovererSLP(Locale.US);
-		}
-		throw new IllegalArgumentException("Protocol " + pProtocol + " not supported.");
-	}
-
-	/**
-	 * Return an array of all supported discovery protocols
-	 * 
-	 * @return The supported protocols
-	 */
-	public static String[] getSupportedProtocols() {
-		return cProtocols;
-	}
-
-	private DiscovererFactory() {
-		/**/}
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.discovery;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Locale;
+
+import org.metricshub.wbem.sblim.cimclient.internal.discovery.slp.DiscovererSLP;
+import org.metricshub.wbem.sblim.cimclient.discovery.Discoverer;
+
+/**
+ * Class DiscovererFactory is responsible for creating concrete instances of the
+ * Discoverer interface.
+ * 
+ * This class is thread-safe.
+ * 
+ * @since 2.0.2
+ */
+public class DiscovererFactory {
+
+	/**
+	 * The Service Location Protocol (SLP)
+	 */
+	public static final String SLP = "SLP";
+
+	private static final String[] cProtocols = new String[] { SLP };
+
+	/**
+	 * Returns the concrete Discoverer for a given discovery protocol.
+	 * 
+	 * @param pProtocol The discovery protocol, e.g. "SLP"
+	 * @return The corresponding discoverer
+	 * @throws IllegalArgumentException On unsupported protocols
+	 * Factory Method
+	 */
+	public static Discoverer getDiscoverer(String pProtocol) throws IllegalArgumentException {
+		if (SLP.equalsIgnoreCase(pProtocol)) {
+			return new DiscovererSLP(Locale.US);
+		}
+		throw new IllegalArgumentException("Protocol " + pProtocol + " not supported.");
+	}
+
+	/**
+	 * Return an array of all supported discovery protocols
+	 * 
+	 * @return The supported protocols
+	 */
+	public static String[] getSupportedProtocols() {
+		return cProtocols;
+	}
+
+	private DiscovererFactory() {
+		/**/}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/WBEMProtocol.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMProtocol.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/WBEMProtocol.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMProtocol.java
index d8c8f97..a1f31c7 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/WBEMProtocol.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMProtocol.java
@@ -1,144 +1,142 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1678915    2007-03-29  lupusalex    Integrated WBEM service discovery via SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.discovery;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class WBEMProtocol encapsulates a transport/presentation protocol pair. E.g.
- * "HTTPS/CIM-XML"
- * 
- * iTransport != null
      iPresentation != null      
- * @since 2.0.2
- */
-public class WBEMProtocol {
-
-	private String iTransport;
-
-	private String iPresentation;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pTransport
-	 *            The transport protocol (e.g. HTTP, HTTPS, RMI)
-	 * @param pPresentation
-	 *            The presentation protocol (e.g. CIM-XML)
-	 */
-	public WBEMProtocol(String pTransport, String pPresentation) {
-		this.iTransport = pTransport != null ? pTransport.toUpperCase() : "";
-		this.iPresentation = pPresentation != null ? pPresentation.toUpperCase() : "";
-	}
-
-	/**
-	 * Returns the presentation protocol (e.g. CIM-XML)
-	 * 
-	 * @return The value.
-	 */
-	public String getPresentation() {
-		return this.iPresentation;
-	}
-
-	/**
-	 * Sets the presentation protocol
-	 * 
-	 * @param pPresentation
-	 *            The new value (e.g. CIM-XML)
-	 */
-	public void setPresentation(String pPresentation) {
-		this.iPresentation = pPresentation != null ? pPresentation : "";
-	}
-
-	/**
-	 * Returns transport protocol (e.g. HTTP)
-	 * 
-	 * @return The value.
-	 */
-	public String getTransport() {
-		return this.iTransport;
-	}
-
-	/**
-	 * Sets the transport protocol
-	 * 
-	 * @param pTransport
-	 *            The new value (e.g. HTTP).
-	 */
-	public void setTransport(String pTransport) {
-		this.iTransport = pTransport != null ? pTransport : "";
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object pObj) {
-		if (pObj instanceof WBEMProtocol) {
-			WBEMProtocol that = (WBEMProtocol) pObj;
-			return (this.iTransport.equals(that.iTransport))
-					&& (this.iPresentation.equals(that.iPresentation));
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return this.iTransport.hashCode() + this.iPresentation.hashCode();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return this.iTransport + "/" + this.iPresentation;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1678915    2007-03-29  lupusalex    Integrated WBEM service discovery via SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.discovery;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class WBEMProtocol encapsulates a transport/presentation protocol pair. E.g.
+ * "HTTPS/CIM-XML"
+ * 
+ * iTransport != null
      iPresentation != null      
+ * @since 2.0.2
+ */
+public class WBEMProtocol {
+
+	private String iTransport;
+
+	private String iPresentation;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pTransport
+	 *            The transport protocol (e.g. HTTP, HTTPS, RMI)
+	 * @param pPresentation
+	 *            The presentation protocol (e.g. CIM-XML)
+	 */
+	public WBEMProtocol(String pTransport, String pPresentation) {
+		this.iTransport = pTransport != null ? pTransport.toUpperCase() : "";
+		this.iPresentation = pPresentation != null ? pPresentation.toUpperCase() : "";
+	}
+
+	/**
+	 * Returns the presentation protocol (e.g. CIM-XML)
+	 * 
+	 * @return The value.
+	 */
+	public String getPresentation() {
+		return this.iPresentation;
+	}
+
+	/**
+	 * Sets the presentation protocol
+	 * 
+	 * @param pPresentation
+	 *            The new value (e.g. CIM-XML)
+	 */
+	public void setPresentation(String pPresentation) {
+		this.iPresentation = pPresentation != null ? pPresentation : "";
+	}
+
+	/**
+	 * Returns transport protocol (e.g. HTTP)
+	 * 
+	 * @return The value.
+	 */
+	public String getTransport() {
+		return this.iTransport;
+	}
+
+	/**
+	 * Sets the transport protocol
+	 * 
+	 * @param pTransport
+	 *            The new value (e.g. HTTP).
+	 */
+	public void setTransport(String pTransport) {
+		this.iTransport = pTransport != null ? pTransport : "";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object pObj) {
+		if (pObj instanceof WBEMProtocol) {
+			WBEMProtocol that = (WBEMProtocol) pObj;
+			return (this.iTransport.equals(that.iTransport))
+					&& (this.iPresentation.equals(that.iPresentation));
+		}
+		return false;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		return this.iTransport.hashCode() + this.iPresentation.hashCode();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return this.iTransport + "/" + this.iPresentation;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java
similarity index 91%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java
index 7e0b8f7..803a842 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java
@@ -1,344 +1,343 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2012
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3469427    2012-01-04  blaschke-oss Fix broken HTML links
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.discovery;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Locale;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import javax.security.auth.Subject;
-import org.sentrysoftware.wbem.javax.wbem.client.WBEMClient;
-
-/**
- * Interface WBEMServiceAdvertisement is encapsulates the information collected
- * about a service during discovery. The DMTF specifies a set a attributes that
- * each service must advertise. These attributes are found as string constants
- * in this interface and the method getAttribute() is offered to get an
- * attribute by name. This design was chosen because the set of attributes might
- * be extended by DMTF and vendor implementations. It's also unclear if upcoming
- * new discovery protocols will have the same set of attributes as SLP.
- * 
- * Immutable
- * This class is thread-safe
- * @since 2.0.2
- */
-public interface WBEMServiceAdvertisement {
-
-	/**
-	 * template-type (string): The scheme name of the service scheme. The scheme
-	 * name consists of the service type name and an optional naming authority
-	 * name, separated from the service type name by a period. See RFC 2609
-	 * section 3.2.2 for the conventions governing service type names.
-	 */
-	public static final String TEMPLATE_TYPE = "template-type";
-
-	/**
-	 * template-version (string): The version number of the service type
-	 * specification.
-	 */
-	public static final String TEMPLATE_VERSION = "template-version";
-
-	/**
-	 * template-description (string): A description of the service suitable for
-	 * inclusion in text read by people.
-	 */
-	public static final String TEMPLATE_DESCRIPTION = "template-description";
-
-	/**
-	 * template-url-syntax (string): The template-url-syntax MUST be the WBEM
-	 * URI Mapping of the location of one service access point offered by the
-	 * WBEM Server over TCP transport. This attribute must provide sufficient
-	 * addressing information so that the WBEM Server can be addressed directly
-	 * using the URL. The WBEM URI Mapping is defined in the WBEM URI Mapping
-	 * Specification 1.0.0 (DSP0207).
      
-	 * 
      
-	 * Example: (template-url-syntax=https://localhost:5989)
-	 */
-	public static final String TEMPLATE_URL_SYNTAX = "template-url-syntax";
-
-	/**
-	 * service-hi-name (string, optional): This string is used as a name of the
-	 * CIM service for human interfaces. This attribute MUST be the
-	 * CIM_ObjectManager.ElementName property value.
-	 */
-	public static final String SERVICE_HI_NAME = "service-hi-name";
-
-	/**
-	 * service-hi-description (string, optional): This string is used as a
-	 * description of the CIM service for human interfaces.This attribute MUST
-	 * be the CIM_ObjectManager.Description property value.
-	 */
-	public static final String SERVICE_HI_DESC = "service-hi-description";
-
-	/**
-	 * service-id (string, literal): The ID of this WBEM Server. The value MUST
-	 * be the CIM_ObjectManager.Name property value.
-	 */
-	public static final String SERVICE_ID = "service-id";
-
-	/**
-	 * CommunicationMechanism (string, literal): The communication mechanism
-	 * (protocol) used by the CIM Object Manager for this service-location-tcp
-	 * defined in this advertisement. This information MUST be the
-	 * CIM_ObjectManagerCommunicationMechanism.CommunicationMechanism property
-	 * value. CIM-XML is defined in the CIM Operations over HTTP specification
-	 * which can be found at http://www.dmtf.org/ 
      
-	 * 
      
-	 * Values: "Unknown", "Other", "cim-xml"
-	 */
-	public static final String COMM_MECHANISM = "CommunicationMechanism";
-
-	/**
-	 * OtherCommunicationMechanismDescription (string, literal, optional): The
-	 * other communication mechanism defined for the CIM Server in the case the
-	 * "Other" value is set in the CommunicationMechanism string. This attribute
-	 * MUST be the
-	 * CIM_ObjectManagerCommunicationMechanism.OtherCommunicationMechanism
-	 * property value. This attribute is optional because it is only required if
-	 * the "other" value is set in CommunicationMechansim. The value returned is
-	 * a free-form string.
-	 */
-	public static final String OTHER_COMM_MECHN_DESC = "OtherCommunicationMechanismDescription";
-
-	/**
-	 * InteropSchemaNamespace (string, literal, multiple): Namespace within the
-	 * target WBEM Server where the CIM Interop Schema can be accessed. Multiple
-	 * namespaces may be provided. Each namespace provided MUST contain the same
-	 * information.
-	 */
-	public static final String INTEROP_NS = "InteropSchemaNamespace";
-
-	/**
-	 * ProtocolVersion (string, literal, optional): The version of the protocol.
-	 * It MUST be the CIM_ObjectManagerCommunicationMechanism.Version property
-	 * value.
-	 */
-	public static final String PROTOCOL_VERSION = "ProtocolVersion";
-
-	/**
-	 * FunctionalProfilesSupported (string, literal, multiple):
-	 * ProfilesSupported defines the CIM Operation profiles supported by the CIM
-	 * Object Manager. This attribute MUST be the
-	 * CIM_ObjectManagerCommunicationMechansim.FunctionalProfilesSupported
-	 * property value.
      
-	 * 
      
-	 * Values: 
-	 "Unknown", "Other", "Basic Read", "Basic Write",
-	 "Schema Manipulation", "Instance Manipulation",
-	 "Association Traversal", "Query Execution",
-	 "Qualifier Declaration", "Indications"
-	 */
-	public static final String FUNCTIONAL_PROF_SUPP = "FunctionalProfilesSupported";
-
-	/**
-	 * FunctionalProfileDescriptions (string, literal, multiple, optional):
-	 * Other profile description if the "other" value is set in the
-	 * ProfilesSupported attribute. This attribute is optional because it is
-	 * returned only if the "other" value is set in the ProfilesSupported
-	 * attribute. If provided it MUST be equal to the
-	 * CIM_ObjectManagerCommunicationMechanism.FunctionalProfileDescriptions
-	 * property value.
-	 */
-	public static final String FUNCTIONAL_PROF_DESC = "FunctionalProfileDescriptions";
-
-	/**
-	 * MultipleOperationsSupported (boolean): Defines whether the CIM Object
-	 * Manager supports batch operations. This attribute MUST be the
-	 * CIM_ObjectManagerCommunicationMechanism.MultipleOperationsSupported
-	 * property value.
-	 */
-	public static final String MULT_OPERATIONS_SUPP = "MultipleOperationsSupported";
-
-	/**
-	 * AuthenticationMechanismsSupported (string, literal, multiple): Defines
-	 * the authentication mechanism supported by the CIM Object Manager. This
-	 * attributed MUST be the CIM_ObjectManagerCommunicationMechanism.
-	 * AuthenticationMechanismsSupported property value. 
      
-	 * 
      
-	 * Values: "Unknown", "None", "Other", "Basic", "Digest"
-	 */
-	public static final String AUTH_MECH_SUPP = "AuthenticationMechanismsSupported";
-
-	/**
-	 * AuthenticationMechansimDescriptions (string, literal, multiple,
-	 * optional): Defines other Authentication mechanisms supported by the CIM
-	 * Object Manager in the case where the "Other" value is set in any of the
-	 * AuthenticationMechanismSupported attribute values. If provided, this
-	 * attribute MUST be the CIM_ObjectManagerCommunicationMechanism.
-	 * AuthenticationMechansimDescriptions property value.
-	 */
-	public static final String AUTH_MECH_DESC = "AuthenticationMechansimDescriptions";
-
-	/**
-	 * Namespace (string, literal, multiple, optional): Namespace(s) supported
-	 * on the CIM Object Manager. This attribute MUST be the CIM_Namespace.name
-	 * property value for each instance of CIM_Namespace that exists. This
-	 * attribute is optional. NOTE: This value is literal (L) because the
-	 * namespace names MUST not be translated into other languages.
-	 */
-	public static final String NAMESPACE = "Namespace";
-
-	/**
-	 * Classinfo (string, multiple, optional): This attributes is optional but
-	 * if used, the values MUST be the CIM_Namespace.Classinfo property value.
-	 * The values represent the classinfo (CIM Schema version, etc.) for the
-	 * namespaces defined in the corresponding namespace listed in the Namespace
-	 * attribute. Each entry in this attribute MUST correspond to the namespace
-	 * defined in the same position of the namespace attribute. There must be
-	 * one entry in this attribute for each entry in the namespace attribute.
-	 */
-	public static final String CLASSINFO = "Classinfo";
-
-	/**
-	 * RegisteredProfilesSupported (string, literal, multiple):
-	 * RegisteredProfilesSupported defines the Profiles that this WBEM Server
-	 * has support for. Each entry in this attribute MUST be in the form of
-	 * Organization:Profile Name{:Subprofile Name}
      
-	 * 
      
-	 * Examples: 
      
-	 * 
      
-	 * 
-	 * DMTF:CIM Server
      
-	 * DMTF:CIM Server:Protocol Adapter
      
-	 * DMTF:CIM Server:Provider Registration 
      
-	 * 
      
-	 * The Organization MUST be the CIM_RegisteredProfile.RegisteredOrganization
-	 * property value. The Profile Name MUST be the
-	 * CIM_RegisteredProfile.RegisteredName property value. The subprofile Name
-	 * MUST be the CIM_RegisteredProfile.RegisteredName property value when it
-	 * is used as a Dependent in the CIM_SubProfileRequiresProfile association
-	 * for the specified Profile Name (used as the antecedent).
-	 * 
-	 */
-	public static final String REG_PROF_SUPP = "RegisteredProfilesSupported";
-
-	/**
-	 * Gets the URL of the directory from which this advertisement was received
-	 * 
-	 * @return The directory URL
-	 */
-	public abstract String getDirectory();
-
-	/**
-	 * Returns the concrete service type. E.g. for the SLP advertised service
-	 * service:wbem:https this method would return
-	 * https.
-	 * 
-	 * @return The concrete service type
-	 */
-	public abstract String getConcreteServiceType();
-
-	/**
-	 * Returns the interop namespaces
-	 * 
-	 * @return The interop namespaces
-	 */
-	public abstract String[] getInteropNamespaces();
-
-	/**
-	 * Returns the service url, e.g. http://9.155.62.79:5988
-	 * 
-	 * @return The service url
-	 */
-	public abstract String getServiceUrl();
-
-	/**
-	 * Return the attribute value for a given attribute name
-	 * 
-	 * @param pAttributeName
-	 *            The attribute name
-	 * @return The value
-	 */
-	public abstract String getAttribute(String pAttributeName);
-
-	/**
-	 * Return the set of attributes of this advertisement
-	 * 
-	 * @return A Set<Map.Entry<String, String>> containing the name
-	 *         value pairs of the attributes.
-	 */
-	public abstract Set> getAttributes();
-
-	/**
-	 * Returns the service id
-	 * 
-	 * @return The service id
-	 */
-	public abstract String getServiceId();
-
-	/**
-	 * Returns the expiration state of the advertisement.
-	 * 
-	 * @return true when advertisement is expired.
-	 */
-	public abstract boolean isExpired();
-
-	/**
-	 * Sets the expirations state of the advertisement. Might be used by the
-	 * application to mark an advertisement as expired, e.g. when it's no longer
-	 * reported by the corresponding directory. Used for this purpose by
-	 * AdvertisementCatalog.
-	 * 
-	 * @param pExpired
-	 *            The new value
-	 */
-	public abstract void setExpired(boolean pExpired);
-
-	/**
-	 * Creates a fully-initialized WBEMClient instance connected to the service
-	 * that is subject of this advertisement. On every call to this method a new
-	 * client will be created. The client is not stored or cached anywhere in
-	 * this class.
-	 * 
-	 * @param pSubject
-	 *            The credential for authenticating with the service
-	 * @param pLocales
-	 *            An array of locales ordered by preference
-	 * @return The WBEM client
-	 * @throws Exception
-	 * @pattern Factory Methods
-	 */
-	public abstract WBEMClient createClient(Subject pSubject, Locale[] pLocales) throws Exception;
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2012
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3469427    2012-01-04  blaschke-oss Fix broken HTML links
+ */
+
+package org.metricshub.wbem.sblim.cimclient.discovery;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Locale;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import javax.security.auth.Subject;
+
+import org.metricshub.wbem.javax.wbem.client.WBEMClient;
+
+/**
+ * Interface WBEMServiceAdvertisement is encapsulates the information collected
+ * about a service during discovery. The DMTF specifies a set a attributes that
+ * each service must advertise. These attributes are found as string constants
+ * in this interface and the method getAttribute() is offered to get an
+ * attribute by name. This design was chosen because the set of attributes might
+ * be extended by DMTF and vendor implementations. It's also unclear if upcoming
+ * new discovery protocols will have the same set of attributes as SLP.
+ * 
+ * Immutable
+ * This class is thread-safe
+ * @since 2.0.2
+ */
+public interface WBEMServiceAdvertisement {
+
+	/**
+	 * template-type (string): The scheme name of the service scheme. The scheme
+	 * name consists of the service type name and an optional naming authority
+	 * name, separated from the service type name by a period. See RFC 2609
+	 * section 3.2.2 for the conventions governing service type names.
+	 */
+	public static final String TEMPLATE_TYPE = "template-type";
+
+	/**
+	 * template-version (string): The version number of the service type
+	 * specification.
+	 */
+	public static final String TEMPLATE_VERSION = "template-version";
+
+	/**
+	 * template-description (string): A description of the service suitable for
+	 * inclusion in text read by people.
+	 */
+	public static final String TEMPLATE_DESCRIPTION = "template-description";
+
+	/**
+	 * template-url-syntax (string): The template-url-syntax MUST be the WBEM
+	 * URI Mapping of the location of one service access point offered by the
+	 * WBEM Server over TCP transport. This attribute must provide sufficient
+	 * addressing information so that the WBEM Server can be addressed directly
+	 * using the URL. The WBEM URI Mapping is defined in the WBEM URI Mapping
+	 * Specification 1.0.0 (DSP0207).
      
+	 * 
      
+	 * Example: (template-url-syntax=https://localhost:5989)
+	 */
+	public static final String TEMPLATE_URL_SYNTAX = "template-url-syntax";
+
+	/**
+	 * service-hi-name (string, optional): This string is used as a name of the
+	 * CIM service for human interfaces. This attribute MUST be the
+	 * CIM_ObjectManager.ElementName property value.
+	 */
+	public static final String SERVICE_HI_NAME = "service-hi-name";
+
+	/**
+	 * service-hi-description (string, optional): This string is used as a
+	 * description of the CIM service for human interfaces.This attribute MUST
+	 * be the CIM_ObjectManager.Description property value.
+	 */
+	public static final String SERVICE_HI_DESC = "service-hi-description";
+
+	/**
+	 * service-id (string, literal): The ID of this WBEM Server. The value MUST
+	 * be the CIM_ObjectManager.Name property value.
+	 */
+	public static final String SERVICE_ID = "service-id";
+
+	/**
+	 * CommunicationMechanism (string, literal): The communication mechanism
+	 * (protocol) used by the CIM Object Manager for this service-location-tcp
+	 * defined in this advertisement. This information MUST be the
+	 * CIM_ObjectManagerCommunicationMechanism.CommunicationMechanism property
+	 * value. CIM-XML is defined in the CIM Operations over HTTP specification
+	 * which can be found at http://www.dmtf.org/ 
      
+	 * 
      
+	 * Values: "Unknown", "Other", "cim-xml"
+	 */
+	public static final String COMM_MECHANISM = "CommunicationMechanism";
+
+	/**
+	 * OtherCommunicationMechanismDescription (string, literal, optional): The
+	 * other communication mechanism defined for the CIM Server in the case the
+	 * "Other" value is set in the CommunicationMechanism string. This attribute
+	 * MUST be the
+	 * CIM_ObjectManagerCommunicationMechanism.OtherCommunicationMechanism
+	 * property value. This attribute is optional because it is only required if
+	 * the "other" value is set in CommunicationMechansim. The value returned is
+	 * a free-form string.
+	 */
+	public static final String OTHER_COMM_MECHN_DESC = "OtherCommunicationMechanismDescription";
+
+	/**
+	 * InteropSchemaNamespace (string, literal, multiple): Namespace within the
+	 * target WBEM Server where the CIM Interop Schema can be accessed. Multiple
+	 * namespaces may be provided. Each namespace provided MUST contain the same
+	 * information.
+	 */
+	public static final String INTEROP_NS = "InteropSchemaNamespace";
+
+	/**
+	 * ProtocolVersion (string, literal, optional): The version of the protocol.
+	 * It MUST be the CIM_ObjectManagerCommunicationMechanism.Version property
+	 * value.
+	 */
+	public static final String PROTOCOL_VERSION = "ProtocolVersion";
+
+	/**
+	 * FunctionalProfilesSupported (string, literal, multiple):
+	 * ProfilesSupported defines the CIM Operation profiles supported by the CIM
+	 * Object Manager. This attribute MUST be the
+	 * CIM_ObjectManagerCommunicationMechansim.FunctionalProfilesSupported
+	 * property value.
      
+	 * 
      
+	 * Values: 
+	 "Unknown", "Other", "Basic Read", "Basic Write",
+	 "Schema Manipulation", "Instance Manipulation",
+	 "Association Traversal", "Query Execution",
+	 "Qualifier Declaration", "Indications"
+	 */
+	public static final String FUNCTIONAL_PROF_SUPP = "FunctionalProfilesSupported";
+
+	/**
+	 * FunctionalProfileDescriptions (string, literal, multiple, optional):
+	 * Other profile description if the "other" value is set in the
+	 * ProfilesSupported attribute. This attribute is optional because it is
+	 * returned only if the "other" value is set in the ProfilesSupported
+	 * attribute. If provided it MUST be equal to the
+	 * CIM_ObjectManagerCommunicationMechanism.FunctionalProfileDescriptions
+	 * property value.
+	 */
+	public static final String FUNCTIONAL_PROF_DESC = "FunctionalProfileDescriptions";
+
+	/**
+	 * MultipleOperationsSupported (boolean): Defines whether the CIM Object
+	 * Manager supports batch operations. This attribute MUST be the
+	 * CIM_ObjectManagerCommunicationMechanism.MultipleOperationsSupported
+	 * property value.
+	 */
+	public static final String MULT_OPERATIONS_SUPP = "MultipleOperationsSupported";
+
+	/**
+	 * AuthenticationMechanismsSupported (string, literal, multiple): Defines
+	 * the authentication mechanism supported by the CIM Object Manager. This
+	 * attributed MUST be the CIM_ObjectManagerCommunicationMechanism.
+	 * AuthenticationMechanismsSupported property value. 
      
+	 * 
      
+	 * Values: "Unknown", "None", "Other", "Basic", "Digest"
+	 */
+	public static final String AUTH_MECH_SUPP = "AuthenticationMechanismsSupported";
+
+	/**
+	 * AuthenticationMechansimDescriptions (string, literal, multiple,
+	 * optional): Defines other Authentication mechanisms supported by the CIM
+	 * Object Manager in the case where the "Other" value is set in any of the
+	 * AuthenticationMechanismSupported attribute values. If provided, this
+	 * attribute MUST be the CIM_ObjectManagerCommunicationMechanism.
+	 * AuthenticationMechansimDescriptions property value.
+	 */
+	public static final String AUTH_MECH_DESC = "AuthenticationMechansimDescriptions";
+
+	/**
+	 * Namespace (string, literal, multiple, optional): Namespace(s) supported
+	 * on the CIM Object Manager. This attribute MUST be the CIM_Namespace.name
+	 * property value for each instance of CIM_Namespace that exists. This
+	 * attribute is optional. NOTE: This value is literal (L) because the
+	 * namespace names MUST not be translated into other languages.
+	 */
+	public static final String NAMESPACE = "Namespace";
+
+	/**
+	 * Classinfo (string, multiple, optional): This attributes is optional but
+	 * if used, the values MUST be the CIM_Namespace.Classinfo property value.
+	 * The values represent the classinfo (CIM Schema version, etc.) for the
+	 * namespaces defined in the corresponding namespace listed in the Namespace
+	 * attribute. Each entry in this attribute MUST correspond to the namespace
+	 * defined in the same position of the namespace attribute. There must be
+	 * one entry in this attribute for each entry in the namespace attribute.
+	 */
+	public static final String CLASSINFO = "Classinfo";
+
+	/**
+	 * RegisteredProfilesSupported (string, literal, multiple):
+	 * RegisteredProfilesSupported defines the Profiles that this WBEM Server
+	 * has support for. Each entry in this attribute MUST be in the form of
+	 * Organization:Profile Name{:Subprofile Name}
      
+	 * 
      
+	 * Examples: 
      
+	 * 
      
+	 * 
+	 * DMTF:CIM Server
      
+	 * DMTF:CIM Server:Protocol Adapter
      
+	 * DMTF:CIM Server:Provider Registration 
      
+	 * 
      
+	 * The Organization MUST be the CIM_RegisteredProfile.RegisteredOrganization
+	 * property value. The Profile Name MUST be the
+	 * CIM_RegisteredProfile.RegisteredName property value. The subprofile Name
+	 * MUST be the CIM_RegisteredProfile.RegisteredName property value when it
+	 * is used as a Dependent in the CIM_SubProfileRequiresProfile association
+	 * for the specified Profile Name (used as the antecedent).
+	 * 
+	 */
+	public static final String REG_PROF_SUPP = "RegisteredProfilesSupported";
+
+	/**
+	 * Gets the URL of the directory from which this advertisement was received
+	 * 
+	 * @return The directory URL
+	 */
+	public abstract String getDirectory();
+
+	/**
+	 * Returns the concrete service type. E.g. for the SLP advertised service
+	 * service:wbem:https this method would return
+	 * https.
+	 * 
+	 * @return The concrete service type
+	 */
+	public abstract String getConcreteServiceType();
+
+	/**
+	 * Returns the interop namespaces
+	 * 
+	 * @return The interop namespaces
+	 */
+	public abstract String[] getInteropNamespaces();
+
+	/**
+	 * Returns the service url, e.g. http://9.155.62.79:5988
+	 * 
+	 * @return The service url
+	 */
+	public abstract String getServiceUrl();
+
+	/**
+	 * Return the attribute value for a given attribute name
+	 * 
+	 * @param pAttributeName
+	 *            The attribute name
+	 * @return The value
+	 */
+	public abstract String getAttribute(String pAttributeName);
+
+	/**
+	 * Return the set of attributes of this advertisement
+	 * 
+	 * @return A Set<Map.Entry<String, String>> containing the name
+	 *         value pairs of the attributes.
+	 */
+	public abstract Set> getAttributes();
+
+	/**
+	 * Returns the service id
+	 * 
+	 * @return The service id
+	 */
+	public abstract String getServiceId();
+
+	/**
+	 * Returns the expiration state of the advertisement.
+	 * 
+	 * @return true when advertisement is expired.
+	 */
+	public abstract boolean isExpired();
+
+	/**
+	 * Sets the expirations state of the advertisement. Might be used by the
+	 * application to mark an advertisement as expired, e.g. when it's no longer
+	 * reported by the corresponding directory. Used for this purpose by
+	 * AdvertisementCatalog.
+	 * 
+	 * @param pExpired
+	 *            The new value
+	 */
+	public abstract void setExpired(boolean pExpired);
+
+	/**
+	 * Creates a fully-initialized WBEMClient instance connected to the service
+	 * that is subject of this advertisement. On every call to this method a new
+	 * client will be created. The client is not stored or cached anywhere in
+	 * this class.
+	 * 
+	 * @param pSubject
+	 *            The credential for authenticating with the service
+	 * @param pLocales
+	 *            An array of locales ordered by preference
+	 * @return The WBEM client
+	 * @throws Exception
+	 * @pattern Factory Methods
+	 */
+	public abstract WBEMClient createClient(Subject pSubject, Locale[] pLocales) throws Exception;
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/discovery/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/bestpractise.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/bestpractise.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/bestpractise.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/bestpractise.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/configuration.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/configuration.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/configuration.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/configuration.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/development.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/development.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/development.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/development.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/discovery.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/discovery.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/discovery.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/discovery.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/embedded.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/embedded.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/embedded.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/embedded.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/firststeps.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/firststeps.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/firststeps.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/firststeps.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/history.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/history.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/history.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/history.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/indication_threading.png b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/indication_threading.png
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/indication_threading.png
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/indication_threading.png
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/indications.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/indications.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/indications.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/indications.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/logging.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/logging.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/logging.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/logging.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/secure.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/secure.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/secure.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/secure.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/secure_indications.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/secure_indications.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/secure_indications.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/secure_indications.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/terminology.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/terminology.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/terminology.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/terminology.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/unittest.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/unittest.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/doc-files/unittest.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/doc-files/unittest.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java
index 8a2882d..29a43e9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java
@@ -1,123 +1,121 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-10-10  ebak         Make SBLIM client JSR48 compliant
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cim;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.sentrysoftware.wbem.javax.cim.CIMElement;
-
-/**
- * Class CIMElementSorter can sort CIMElement arrays and can do binary search by
- * name in them.
- */
-public class CIMElementSorter implements Comparator {
-
-	private static final Comparator COMPARATOR = new CIMElementSorter();
-
-	/**
-	 * Sorts the passed CIMElement array, the passed array is not copied.
-	 * 
-	 * @param pArray
-	 *            the array which will be sorted if it's not null
-	 * @return pArray
-	 */
-	public static CIMElement[] sort(CIMElement[] pArray) {
-		if (pArray == null || pArray.length == 0) return null;
-		synchronized (pArray) {
-			Arrays.sort(pArray /* , COMPARATOR */);
-		}
-		return pArray;
-	}
-
-	/**
-	 * Finds CIMElement, named pName, in pArray which must be a sorted array of
-	 * CIMElements.
-	 * 
-	 * @param pArray
-	 * @param pName
-	 * @return the CIMElement if found, otherwise null
-	 */
-	public static CIMElement find(CIMElement[] pArray, String pName) {
-		if (pArray == null) return null;
-		int idx;
-		synchronized (pArray) {
-			idx = Arrays.binarySearch(pArray, pName, COMPARATOR);
-		}
-		if (idx < 0) return null;
-		return pArray[idx];
-	}
-
-	/**
-	 * Finds the index of CIMElement, named pName, in pArray which must be a
-	 * sorted array of CIMElements.
-	 * 
-	 * @param pArray
-	 * @param pName
-	 * @return the index, just like in case of Arrays.binarySearch()
-	 * @see java.util.Arrays#binarySearch(Object[], Object, Comparator)
-	 */
-	public static int findIdx(CIMElement[] pArray, String pName) {
-		if (pArray == null) return -1;
-		synchronized (pArray) {
-			return Arrays.binarySearch(pArray, pName, COMPARATOR);
-		}
-	}
-
-	/**
-	 * @see java.util.Comparator#compare(Object, Object)
-	 */
-	public int compare(Object pObj0, Object pObj1) {
-		// ebak: handling null objects
-		if (pObj0 == null) return pObj1 == null ? 0 : 1;
-		if (pObj1 == null) return -1;
-		String name0 = pObj0 instanceof CIMElement ? ((CIMElement) pObj0).getName()
-				: (String) pObj0;
-		String name1 = pObj1 instanceof CIMElement ? ((CIMElement) pObj1).getName()
-				: (String) pObj1;
-		return name0.compareToIgnoreCase(name1);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-10-10  ebak         Make SBLIM client JSR48 compliant
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cim;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Arrays;
+import java.util.Comparator;
+
+import org.metricshub.wbem.javax.cim.CIMElement;
+
+/**
+ * Class CIMElementSorter can sort CIMElement arrays and can do binary search by
+ * name in them.
+ */
+public class CIMElementSorter implements Comparator {
+
+	private static final Comparator COMPARATOR = new CIMElementSorter();
+
+	/**
+	 * Sorts the passed CIMElement array, the passed array is not copied.
+	 * 
+	 * @param pArray
+	 *            the array which will be sorted if it's not null
+	 * @return pArray
+	 */
+	public static CIMElement[] sort(CIMElement[] pArray) {
+		if (pArray == null || pArray.length == 0) return null;
+		synchronized (pArray) {
+			Arrays.sort(pArray /* , COMPARATOR */);
+		}
+		return pArray;
+	}
+
+	/**
+	 * Finds CIMElement, named pName, in pArray which must be a sorted array of
+	 * CIMElements.
+	 * 
+	 * @param pArray
+	 * @param pName
+	 * @return the CIMElement if found, otherwise null
+	 */
+	public static CIMElement find(CIMElement[] pArray, String pName) {
+		if (pArray == null) return null;
+		int idx;
+		synchronized (pArray) {
+			idx = Arrays.binarySearch(pArray, pName, COMPARATOR);
+		}
+		if (idx < 0) return null;
+		return pArray[idx];
+	}
+
+	/**
+	 * Finds the index of CIMElement, named pName, in pArray which must be a
+	 * sorted array of CIMElements.
+	 * 
+	 * @param pArray
+	 * @param pName
+	 * @return the index, just like in case of Arrays.binarySearch()
+	 * @see java.util.Arrays#binarySearch(Object[], Object, Comparator)
+	 */
+	public static int findIdx(CIMElement[] pArray, String pName) {
+		if (pArray == null) return -1;
+		synchronized (pArray) {
+			return Arrays.binarySearch(pArray, pName, COMPARATOR);
+		}
+	}
+
+	/**
+	 * @see java.util.Comparator#compare(Object, Object)
+	 */
+	public int compare(Object pObj0, Object pObj1) {
+		// ebak: handling null objects
+		if (pObj0 == null) return pObj1 == null ? 0 : 1;
+		if (pObj1 == null) return -1;
+		String name0 = pObj0 instanceof CIMElement ? ((CIMElement) pObj0).getName()
+				: (String) pObj0;
+		String name1 = pObj1 instanceof CIMElement ? ((CIMElement) pObj1).getName()
+				: (String) pObj1;
+		return name0.compareToIgnoreCase(name1);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMHelper.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMHelper.java
similarity index 86%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMHelper.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMHelper.java
index 1ce9442..e048802 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMHelper.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMHelper.java
@@ -1,349 +1,346 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-12-06  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2964463    2010-03-08  blaschke-oss WBEMClient.initialize() throws wrong exception
- * 2942520    2010-03-08  blaschke-oss IPv6 link local address with scope_id including a dot not supported
- * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
- * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
- * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cim;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.math.BigInteger;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger16;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger32;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger64;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger8;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConstants;
-
-/**
- * Class CIMHelper provides convenience methods that are missing from the
- * official JSR48 API
- * 
- */
-public abstract class CIMHelper {
-
-	private CIMHelper() {
-	// no instances
-	}
-
-	/**
-	 * Creates a URI of a CIMOM from a given CIM object path, adding default
-	 * port if port not parsable.
-	 * 
-	 * @param pPath
-	 *            The CIM object path.
-	 * @return The URI.
-	 * @throws URISyntaxException
-	 */
-	public static URI createCimomUri(CIMObjectPath pPath) throws URISyntaxException {
-		String scheme = pPath.getScheme();
-		String host = pPath.getHost();
-		int port = WBEMConstants.DEFAULT_WBEM_PORT;
-		try {
-			port = Integer.parseInt(pPath.getPort());
-		} catch (NumberFormatException e) {
-			// stuck with default port
-		}
-		return new URI(scheme, null, host, port, WBEMConstants.CIMOM_PATH, null, null);
-	}
-
-	/**
-	 * Creates a URI of a CIMOM from a given URI, adding default port if port
-	 * not specified.
-	 * 
-	 * @param pUri
-	 *            The URI.
-	 * @return The URI.
-	 * @throws URISyntaxException
-	 */
-	public static URI createCimomUri(URI pUri) throws URISyntaxException {
-		String scheme = pUri.getScheme();
-		String host = pUri.getHost();
-		int port = pUri.getPort();
-		if (port == -1) {
-			// stuck with default port
-			port = WBEMConstants.DEFAULT_WBEM_PORT;
-		}
-		return new URI(scheme, null, host, port, WBEMConstants.CIMOM_PATH, null, null);
-	}
-
-	private static CIMDataType CIMScalarDataTypes[] = {
-	/* 00 */CIMDataType.UINT8_T,
-	/* 01 */CIMDataType.SINT8_T,
-	/* 02 */CIMDataType.UINT16_T,
-	/* 03 */CIMDataType.SINT16_T,
-	/* 04 */CIMDataType.UINT32_T,
-	/* 05 */CIMDataType.SINT32_T,
-	/* 06 */CIMDataType.UINT64_T,
-	/* 07 */CIMDataType.SINT64_T,
-	/* 08 */CIMDataType.STRING_T,
-	/* 09 */CIMDataType.BOOLEAN_T,
-	/* 10 */CIMDataType.REAL32_T,
-	/* 11 */CIMDataType.REAL64_T,
-	/* 12 */CIMDataType.DATETIME_T,
-	/* 13 */CIMDataType.CHAR16_T,
-	/* 14 */new CIMDataType(""),
-	/* 15 */CIMDataType.OBJECT_T,
-	/* 16 */null,
-	/* 17 */CIMDataType.CLASS_T };
-
-	/**
-	 * Returns the CIMDataType of a scalar of the specified data type. This
-	 * should be used in lieu of "new CIMDataType(pType)" which is not supported
-	 * by the JSR48 standard.
-	 * 
-	 * @param pType
-	 *            Data type.
-	 * @return CIMDataType corresponding to data type.
-	 */
-	public static CIMDataType ScalarDataType(int pType) {
-		if (pType < 0 || pType >= CIMScalarDataTypes.length) return null;
-		return CIMScalarDataTypes[pType];
-	}
-
-	private static CIMDataType CIMArrayDataTypes[] = {
-	/* 00 */CIMDataType.UINT8_ARRAY_T,
-	/* 01 */CIMDataType.SINT8_ARRAY_T,
-	/* 02 */CIMDataType.UINT16_ARRAY_T,
-	/* 03 */CIMDataType.SINT16_ARRAY_T,
-	/* 04 */CIMDataType.UINT32_ARRAY_T,
-	/* 05 */CIMDataType.SINT32_ARRAY_T,
-	/* 06 */CIMDataType.UINT64_ARRAY_T,
-	/* 07 */CIMDataType.SINT64_ARRAY_T,
-	/* 08 */CIMDataType.STRING_ARRAY_T,
-	/* 09 */CIMDataType.BOOLEAN_ARRAY_T,
-	/* 10 */CIMDataType.REAL32_ARRAY_T,
-	/* 11 */CIMDataType.REAL64_ARRAY_T,
-	/* 12 */CIMDataType.DATETIME_ARRAY_T,
-	/* 13 */CIMDataType.CHAR16_ARRAY_T,
-	/* 14 */new CIMDataType("", 0),
-	/* 15 */CIMDataType.OBJECT_ARRAY_T,
-	/* 16 */null,
-	/* 17 */CIMDataType.CLASS_ARRAY_T };
-
-	/**
-	 * Returns the CIMDataType of an unbounded array of the specified data type.
-	 * This should be used in lieu of "new CIMDataType(pType,0)" which is not
-	 * supported by the JSR48 standard.
-	 * 
-	 * @param pType
-	 *            Data type.
-	 * @return CIMDataType corresponding to data type.
-	 */
-	public static CIMDataType UnboundedArrayDataType(int pType) {
-		if (pType < 0 || pType >= CIMArrayDataTypes.length) return null;
-		return CIMArrayDataTypes[pType];
-	}
-
-	/**
-	 * CIMInstanceWithSynchonizedNumericKeyDataTypes returns a
-	 * CIMInstance where the data types of all numeric keys in the
-	 * CIMObjectPath match those of the corresponding keys within
-	 * the CIMProperty[].
-	 * 
-	 * The need for this conversion mechanism arises from a deficiency in the
-	 * CIM-XML specs, where the TYPE (sint8, uint8, etc.) is required for
-	 * PROPERTY but not for KEYVALUE. If a CIMOM sends a KEYVALUE of
-	 * VALUETYPE="numeric" without TYPE, the Java CIM Client assumes a type of
-	 * sint64, uint64 or real64. This can cause problems (i.e.
-	 * ClassCastException) down the line if the TYPE of the corresponding
-	 * PROPERTY is different.
-	 * 
-	 * @param pObjectPath
-	 *            Instance object path.
-	 * @param pProps
-	 *            Instance properties.
-	 * @return CIMInstance with numeric key data types synchronized.
-	 */
-	public static CIMInstance CIMInstanceWithSynchonizedNumericKeyDataTypes(
-			CIMObjectPath pObjectPath, CIMProperty[] pProps) {
-		CIMInstance inst = new CIMInstance(pObjectPath, pProps);
-		CIMProperty[] oldKeys = inst.getKeys();
-		CIMProperty[] newKeys = new CIMProperty[oldKeys.length];
-		boolean update = false;
-
-		for (int i = 0; i < oldKeys.length; i++) {
-			CIMDataType oldType = oldKeys[i].getDataType();
-			CIMProperty prop = inst.getProperty(oldKeys[i].getName());
-			if (oldType != null && prop != null && prop.getDataType() != null
-					&& !prop.getDataType().equals(oldType) && isNumericObject(oldType)
-					&& isNumericObject(prop.getDataType())) {
-				update = true;
-				newKeys[i] = new CIMProperty(oldKeys[i].getName(), prop.getDataType(),
-						translateNumericObject(oldKeys[i].getValue(), oldType, prop.getDataType()),
-						oldKeys[i].isKey(), oldKeys[i].isPropagated(), oldKeys[i].getOriginClass());
-			} else {
-				newKeys[i] = oldKeys[i];
-			}
-		}
-
-		return (update ? inst.deriveInstance(new CIMObjectPath(pObjectPath.getScheme(), pObjectPath
-				.getHost(), pObjectPath.getPort(), pObjectPath.getNamespace(), pObjectPath
-				.getObjectName(), newKeys)) : inst);
-	}
-
-	private static boolean isNumericObject(CIMDataType type) {
-		switch (type.getType()) {
-			case CIMDataType.SINT8:
-			case CIMDataType.SINT16:
-			case CIMDataType.SINT32:
-			case CIMDataType.SINT64:
-			case CIMDataType.UINT8:
-			case CIMDataType.UINT16:
-			case CIMDataType.UINT32:
-			case CIMDataType.UINT64:
-			case CIMDataType.REAL32:
-			case CIMDataType.REAL64:
-				return true;
-		}
-		return false;
-	}
-
-	private static Object translateNumericObject(Object oldValue, CIMDataType oldType,
-			CIMDataType newType) {
-		if (oldValue == null) return null;
-
-		int from = oldType.getType(), to = newType.getType();
-		long newInt = 0;
-		double newDec = 0;
-		Object o = null;
-		boolean useInt = true;
-
-		switch (from) {
-			case CIMDataType.SINT8:
-				Byte b = (Byte) oldValue;
-				newInt = b.longValue();
-				break;
-			case CIMDataType.SINT16:
-				Short s = (Short) oldValue;
-				newInt = s.longValue();
-				break;
-			case CIMDataType.SINT32:
-				Integer i = (Integer) oldValue;
-				newInt = i.longValue();
-				break;
-			case CIMDataType.SINT64:
-				Long l = (Long) oldValue;
-				newInt = l.longValue();
-				break;
-			case CIMDataType.UINT8:
-				UnsignedInteger8 u8 = (UnsignedInteger8) oldValue;
-				newInt = u8.longValue();
-				break;
-			case CIMDataType.UINT16:
-				UnsignedInteger16 u16 = (UnsignedInteger16) oldValue;
-				newInt = u16.longValue();
-				break;
-			case CIMDataType.UINT32:
-				UnsignedInteger32 u32 = (UnsignedInteger32) oldValue;
-				newInt = u32.longValue();
-				break;
-			case CIMDataType.UINT64:
-				UnsignedInteger64 u64 = (UnsignedInteger64) oldValue;
-				newInt = u64.longValue();
-				break;
-			case CIMDataType.REAL32:
-				Float f = (Float) oldValue;
-				newDec = f.doubleValue();
-				useInt = false;
-				break;
-			case CIMDataType.REAL64:
-				Double d = (Double) oldValue;
-				newDec = d.doubleValue();
-				useInt = false;
-				break;
-		}
-
-		switch (to) {
-			case CIMDataType.SINT8:
-				byte b = (byte) (useInt ? newInt : newDec);
-				o = new Byte(b);
-				break;
-			case CIMDataType.SINT16:
-				short s = (short) (useInt ? newInt : newDec);
-				o = new Short(s);
-				break;
-			case CIMDataType.SINT32:
-				int i = (int) (useInt ? newInt : newDec);
-				o = new Integer(i);
-				break;
-			case CIMDataType.SINT64:
-				long l = (long) (useInt ? newInt : newDec);
-				o = new Long(l);
-				break;
-			case CIMDataType.UINT8:
-				byte u8 = (byte) (useInt ? newInt : newDec);
-				o = new UnsignedInteger8(u8);
-				break;
-			case CIMDataType.UINT16:
-				short u16 = (short) (useInt ? newInt : newDec);
-				o = new UnsignedInteger16(u16);
-				break;
-			case CIMDataType.UINT32:
-				int u32 = (int) (useInt ? newInt : newDec);
-				o = new UnsignedInteger32(u32);
-				break;
-			case CIMDataType.UINT64:
-				long u64 = (long) (useInt ? newInt : newDec);
-				o = new UnsignedInteger64(BigInteger.valueOf(u64));
-				break;
-			case CIMDataType.REAL32:
-				float f = (float) (useInt ? newInt : newDec);
-				o = new Float(f);
-				break;
-			case CIMDataType.REAL64:
-				double d = useInt ? (double) newInt : newDec;
-				o = new Double(d);
-				break;
-		}
-
-		return o;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-12-06  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2964463    2010-03-08  blaschke-oss WBEMClient.initialize() throws wrong exception
+ * 2942520    2010-03-08  blaschke-oss IPv6 link local address with scope_id including a dot not supported
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
+ * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
+ * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cim;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.math.BigInteger;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.metricshub.wbem.javax.cim.UnsignedInteger16;
+import org.metricshub.wbem.javax.cim.UnsignedInteger32;
+import org.metricshub.wbem.javax.cim.UnsignedInteger64;
+import org.metricshub.wbem.javax.cim.UnsignedInteger8;
+
+/**
+ * Class CIMHelper provides convenience methods that are missing from the
+ * official JSR48 API
+ * 
+ */
+public abstract class CIMHelper {
+
+	private CIMHelper() {
+	// no instances
+	}
+
+	/**
+	 * Creates a URI of a CIMOM from a given CIM object path, adding default
+	 * port if port not parsable.
+	 * 
+	 * @param pPath
+	 *            The CIM object path.
+	 * @return The URI.
+	 * @throws URISyntaxException
+	 */
+	public static URI createCimomUri(CIMObjectPath pPath) throws URISyntaxException {
+		String scheme = pPath.getScheme();
+		String host = pPath.getHost();
+		int port = WBEMConstants.DEFAULT_WBEM_PORT;
+		try {
+			port = Integer.parseInt(pPath.getPort());
+		} catch (NumberFormatException e) {
+			// stuck with default port
+		}
+		return new URI(scheme, null, host, port, WBEMConstants.CIMOM_PATH, null, null);
+	}
+
+	/**
+	 * Creates a URI of a CIMOM from a given URI, adding default port if port
+	 * not specified.
+	 * 
+	 * @param pUri
+	 *            The URI.
+	 * @return The URI.
+	 * @throws URISyntaxException
+	 */
+	public static URI createCimomUri(URI pUri) throws URISyntaxException {
+		String scheme = pUri.getScheme();
+		String host = pUri.getHost();
+		int port = pUri.getPort();
+		if (port == -1) {
+			// stuck with default port
+			port = WBEMConstants.DEFAULT_WBEM_PORT;
+		}
+		return new URI(scheme, null, host, port, WBEMConstants.CIMOM_PATH, null, null);
+	}
+
+	private static CIMDataType CIMScalarDataTypes[] = {
+	/* 00 */CIMDataType.UINT8_T,
+	/* 01 */CIMDataType.SINT8_T,
+	/* 02 */CIMDataType.UINT16_T,
+	/* 03 */CIMDataType.SINT16_T,
+	/* 04 */CIMDataType.UINT32_T,
+	/* 05 */CIMDataType.SINT32_T,
+	/* 06 */CIMDataType.UINT64_T,
+	/* 07 */CIMDataType.SINT64_T,
+	/* 08 */CIMDataType.STRING_T,
+	/* 09 */CIMDataType.BOOLEAN_T,
+	/* 10 */CIMDataType.REAL32_T,
+	/* 11 */CIMDataType.REAL64_T,
+	/* 12 */CIMDataType.DATETIME_T,
+	/* 13 */CIMDataType.CHAR16_T,
+	/* 14 */new CIMDataType(""),
+	/* 15 */CIMDataType.OBJECT_T,
+	/* 16 */null,
+	/* 17 */CIMDataType.CLASS_T };
+
+	/**
+	 * Returns the CIMDataType of a scalar of the specified data type. This
+	 * should be used in lieu of "new CIMDataType(pType)" which is not supported
+	 * by the JSR48 standard.
+	 * 
+	 * @param pType
+	 *            Data type.
+	 * @return CIMDataType corresponding to data type.
+	 */
+	public static CIMDataType ScalarDataType(int pType) {
+		if (pType < 0 || pType >= CIMScalarDataTypes.length) return null;
+		return CIMScalarDataTypes[pType];
+	}
+
+	private static CIMDataType CIMArrayDataTypes[] = {
+	/* 00 */CIMDataType.UINT8_ARRAY_T,
+	/* 01 */CIMDataType.SINT8_ARRAY_T,
+	/* 02 */CIMDataType.UINT16_ARRAY_T,
+	/* 03 */CIMDataType.SINT16_ARRAY_T,
+	/* 04 */CIMDataType.UINT32_ARRAY_T,
+	/* 05 */CIMDataType.SINT32_ARRAY_T,
+	/* 06 */CIMDataType.UINT64_ARRAY_T,
+	/* 07 */CIMDataType.SINT64_ARRAY_T,
+	/* 08 */CIMDataType.STRING_ARRAY_T,
+	/* 09 */CIMDataType.BOOLEAN_ARRAY_T,
+	/* 10 */CIMDataType.REAL32_ARRAY_T,
+	/* 11 */CIMDataType.REAL64_ARRAY_T,
+	/* 12 */CIMDataType.DATETIME_ARRAY_T,
+	/* 13 */CIMDataType.CHAR16_ARRAY_T,
+	/* 14 */new CIMDataType("", 0),
+	/* 15 */CIMDataType.OBJECT_ARRAY_T,
+	/* 16 */null,
+	/* 17 */CIMDataType.CLASS_ARRAY_T };
+
+	/**
+	 * Returns the CIMDataType of an unbounded array of the specified data type.
+	 * This should be used in lieu of "new CIMDataType(pType,0)" which is not
+	 * supported by the JSR48 standard.
+	 * 
+	 * @param pType
+	 *            Data type.
+	 * @return CIMDataType corresponding to data type.
+	 */
+	public static CIMDataType UnboundedArrayDataType(int pType) {
+		if (pType < 0 || pType >= CIMArrayDataTypes.length) return null;
+		return CIMArrayDataTypes[pType];
+	}
+
+	/**
+	 * CIMInstanceWithSynchonizedNumericKeyDataTypes returns a
+	 * CIMInstance where the data types of all numeric keys in the
+	 * CIMObjectPath match those of the corresponding keys within
+	 * the CIMProperty[].
+	 * 
+	 * The need for this conversion mechanism arises from a deficiency in the
+	 * CIM-XML specs, where the TYPE (sint8, uint8, etc.) is required for
+	 * PROPERTY but not for KEYVALUE. If a CIMOM sends a KEYVALUE of
+	 * VALUETYPE="numeric" without TYPE, the Java CIM Client assumes a type of
+	 * sint64, uint64 or real64. This can cause problems (i.e.
+	 * ClassCastException) down the line if the TYPE of the corresponding
+	 * PROPERTY is different.
+	 * 
+	 * @param pObjectPath
+	 *            Instance object path.
+	 * @param pProps
+	 *            Instance properties.
+	 * @return CIMInstance with numeric key data types synchronized.
+	 */
+	public static CIMInstance CIMInstanceWithSynchonizedNumericKeyDataTypes(
+			CIMObjectPath pObjectPath, CIMProperty[] pProps) {
+		CIMInstance inst = new CIMInstance(pObjectPath, pProps);
+		CIMProperty[] oldKeys = inst.getKeys();
+		CIMProperty[] newKeys = new CIMProperty[oldKeys.length];
+		boolean update = false;
+
+		for (int i = 0; i < oldKeys.length; i++) {
+			CIMDataType oldType = oldKeys[i].getDataType();
+			CIMProperty prop = inst.getProperty(oldKeys[i].getName());
+			if (oldType != null && prop != null && prop.getDataType() != null
+					&& !prop.getDataType().equals(oldType) && isNumericObject(oldType)
+					&& isNumericObject(prop.getDataType())) {
+				update = true;
+				newKeys[i] = new CIMProperty(oldKeys[i].getName(), prop.getDataType(),
+						translateNumericObject(oldKeys[i].getValue(), oldType, prop.getDataType()),
+						oldKeys[i].isKey(), oldKeys[i].isPropagated(), oldKeys[i].getOriginClass());
+			} else {
+				newKeys[i] = oldKeys[i];
+			}
+		}
+
+		return (update ? inst.deriveInstance(new CIMObjectPath(pObjectPath.getScheme(), pObjectPath
+				.getHost(), pObjectPath.getPort(), pObjectPath.getNamespace(), pObjectPath
+				.getObjectName(), newKeys)) : inst);
+	}
+
+	private static boolean isNumericObject(CIMDataType type) {
+		switch (type.getType()) {
+			case CIMDataType.SINT8:
+			case CIMDataType.SINT16:
+			case CIMDataType.SINT32:
+			case CIMDataType.SINT64:
+			case CIMDataType.UINT8:
+			case CIMDataType.UINT16:
+			case CIMDataType.UINT32:
+			case CIMDataType.UINT64:
+			case CIMDataType.REAL32:
+			case CIMDataType.REAL64:
+				return true;
+		}
+		return false;
+	}
+
+	private static Object translateNumericObject(Object oldValue, CIMDataType oldType,
+			CIMDataType newType) {
+		if (oldValue == null) return null;
+
+		int from = oldType.getType(), to = newType.getType();
+		long newInt = 0;
+		double newDec = 0;
+		Object o = null;
+		boolean useInt = true;
+
+		switch (from) {
+			case CIMDataType.SINT8:
+				Byte b = (Byte) oldValue;
+				newInt = b.longValue();
+				break;
+			case CIMDataType.SINT16:
+				Short s = (Short) oldValue;
+				newInt = s.longValue();
+				break;
+			case CIMDataType.SINT32:
+				Integer i = (Integer) oldValue;
+				newInt = i.longValue();
+				break;
+			case CIMDataType.SINT64:
+				Long l = (Long) oldValue;
+				newInt = l.longValue();
+				break;
+			case CIMDataType.UINT8:
+				UnsignedInteger8 u8 = (UnsignedInteger8) oldValue;
+				newInt = u8.longValue();
+				break;
+			case CIMDataType.UINT16:
+				UnsignedInteger16 u16 = (UnsignedInteger16) oldValue;
+				newInt = u16.longValue();
+				break;
+			case CIMDataType.UINT32:
+				UnsignedInteger32 u32 = (UnsignedInteger32) oldValue;
+				newInt = u32.longValue();
+				break;
+			case CIMDataType.UINT64:
+				UnsignedInteger64 u64 = (UnsignedInteger64) oldValue;
+				newInt = u64.longValue();
+				break;
+			case CIMDataType.REAL32:
+				Float f = (Float) oldValue;
+				newDec = f.doubleValue();
+				useInt = false;
+				break;
+			case CIMDataType.REAL64:
+				Double d = (Double) oldValue;
+				newDec = d.doubleValue();
+				useInt = false;
+				break;
+		}
+
+		switch (to) {
+			case CIMDataType.SINT8:
+				byte b = (byte) (useInt ? newInt : newDec);
+				o = new Byte(b);
+				break;
+			case CIMDataType.SINT16:
+				short s = (short) (useInt ? newInt : newDec);
+				o = new Short(s);
+				break;
+			case CIMDataType.SINT32:
+				int i = (int) (useInt ? newInt : newDec);
+				o = new Integer(i);
+				break;
+			case CIMDataType.SINT64:
+				long l = (long) (useInt ? newInt : newDec);
+				o = new Long(l);
+				break;
+			case CIMDataType.UINT8:
+				byte u8 = (byte) (useInt ? newInt : newDec);
+				o = new UnsignedInteger8(u8);
+				break;
+			case CIMDataType.UINT16:
+				short u16 = (short) (useInt ? newInt : newDec);
+				o = new UnsignedInteger16(u16);
+				break;
+			case CIMDataType.UINT32:
+				int u32 = (int) (useInt ? newInt : newDec);
+				o = new UnsignedInteger32(u32);
+				break;
+			case CIMDataType.UINT64:
+				long u64 = (long) (useInt ? newInt : newDec);
+				o = new UnsignedInteger64(BigInteger.valueOf(u64));
+				break;
+			case CIMDataType.REAL32:
+				float f = (float) (useInt ? newInt : newDec);
+				o = new Float(f);
+				break;
+			case CIMDataType.REAL64:
+				double d = useInt ? (double) newInt : newDec;
+				o = new Double(d);
+				break;
+		}
+
+		return o;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java
index 5885655..4413836 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java
@@ -1,156 +1,154 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-11-30  ebak         Make SBLIM client JSR48 compliant
- * 1669961    2006-04-16  lupusalex    CIMTypedElement.getType() =>getDataType()
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cim;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-
-/**
- * Class CIMInstanceBuilder provides help for CIMInstance(CIMObjectPath,
- * CIMProperty[]) constructor.
      
- * 
      
- * CIMObjectPath param has to contain the key properties only.
      
- * ( VALUE.NAMEDINSTANCE->INSTANCENAME->KEYBINDING )
      
- * CIMProperty[] param has to contain all properties, including key properties.
      
- * ( VALUE.NAMEDINSTANCE->INSTANCE->PROPERTY* )
      
- * The implementation merges the properties from both params.
      
- * From CIMObjectPath's keys only the type and value information is considered.
      
- * 
- */
-public class CIMInstanceBuilder {
-
-	private CIMProperty[] iProperties;
-
-	private static final Object[] EMPTY_RPOP_A = new CIMProperty[0];
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pPath
-	 * @param pProps
-	 * @throws IllegalArgumentException
-	 */
-	public CIMInstanceBuilder(CIMObjectPath pPath, CIMProperty[] pProps)
-			throws IllegalArgumentException {
-		this.iProperties = pProps != null ? pProps : new CIMProperty[0];
-		CIMElementSorter.sort(this.iProperties);
-		addPathKeys(pPath);
-	}
-
-	/**
-	 * Extends the keys of the passed CIMObjectPath.
-	 * 
-	 * @param pPath
-	 * @return the new CIMObjectPath
-	 */
-	public CIMObjectPath setKeys(CIMObjectPath pPath) {
-		List> keys = new ArrayList>();
-		for (int i = 0; i < this.iProperties.length; ++i) {
-			CIMProperty prop = this.iProperties[i];
-			if (prop.isKey()) keys.add(prop);
-		}
-
-		/*
-		 * CIMObjectPath( String scheme, String host, String port, String
-		 * namespace, String objectName, CIMProperty[] keys )
-		 */
-		return new CIMObjectPath(pPath.getScheme(), pPath.getHost(), pPath.getPort(), pPath
-				.getNamespace(), pPath.getObjectName(), (CIMProperty[]) keys.toArray(EMPTY_RPOP_A));
-	}
-
-	/**
-	 * getAllPropertis
-	 * 
-	 * @return all properties in an ordered way
-	 */
-	public CIMProperty[] getAllPropertis() {
-		return this.iProperties;
-	}
-
-	private void addPathKeys(CIMObjectPath pPath) throws IllegalArgumentException {
-		CIMProperty[] keys = pPath.getKeys();
-		for (int i = 0; i < keys.length; i++) {
-			CIMProperty key = keys[i];
-			int pos = CIMElementSorter.findIdx(this.iProperties, key.getName());
-			if (pos < 0) {
-				pos = -pos - 1;
-				CIMProperty[] newArray = new CIMProperty[this.iProperties.length + 1];
-				System.arraycopy(this.iProperties, 0, newArray, 0, pos);
-				newArray[pos] = key;
-				System.arraycopy(this.iProperties, pos, newArray, pos + 1, this.iProperties.length
-						- pos);
-				this.iProperties = newArray;
-			} else {
-				CIMProperty prop = this.iProperties[pos];
-				// typeAndValueCheck(key, prop);
-				if (!prop.isKey()) this.iProperties[pos] = mkKey(prop);
-			}
-		}
-	}
-
-	private static CIMProperty mkKey(CIMProperty pProp) {
-		return new CIMProperty(pProp.getName(), pProp.getDataType(), pProp.getValue(),
-				true, pProp.isPropagated(), pProp.getOriginClass());
-	}
-
-	/*
-	 * private static void typeAndValueCheck(CIMProperty pPathProp, CIMProperty
-	 * pArrayProp) throws IllegalArgumentException { CIMDataType pType =
-	 * pPathProp.getDataType(), aType = pArrayProp.getDataType(); if (pType ==
-	 * null ? aType != null : pType.getType() != aType.getType()) throw new
-	 * IllegalArgumentException( pPathProp.getName() + " property presents in
-	 * CIMObjectPath param and CIMProperty[] param " + "with different types!");
-	 * Object pValue = pPathProp.getValue(), aValue = pArrayProp.getValue(); if
-	 * (pValue == null ? aValue != null : !pValue.equals(aValue)) throw new
-	 * IllegalArgumentException( pPathProp.getName() + " property conatins
-	 * different values in CIMObjectPath and " + "CIMProperty params!"); }
-	 */
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-11-30  ebak         Make SBLIM client JSR48 compliant
+ * 1669961    2006-04-16  lupusalex    CIMTypedElement.getType() =>getDataType()
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cim;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+
+/**
+ * Class CIMInstanceBuilder provides help for CIMInstance(CIMObjectPath,
+ * CIMProperty[]) constructor.
      
+ * 
      
+ * CIMObjectPath param has to contain the key properties only.
      
+ * ( VALUE.NAMEDINSTANCE->INSTANCENAME->KEYBINDING )
      
+ * CIMProperty[] param has to contain all properties, including key properties.
      
+ * ( VALUE.NAMEDINSTANCE->INSTANCE->PROPERTY* )
      
+ * The implementation merges the properties from both params.
      
+ * From CIMObjectPath's keys only the type and value information is considered.
      
+ * 
+ */
+public class CIMInstanceBuilder {
+
+	private CIMProperty[] iProperties;
+
+	private static final Object[] EMPTY_RPOP_A = new CIMProperty[0];
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pPath
+	 * @param pProps
+	 * @throws IllegalArgumentException
+	 */
+	public CIMInstanceBuilder(CIMObjectPath pPath, CIMProperty[] pProps)
+			throws IllegalArgumentException {
+		this.iProperties = pProps != null ? pProps : new CIMProperty[0];
+		CIMElementSorter.sort(this.iProperties);
+		addPathKeys(pPath);
+	}
+
+	/**
+	 * Extends the keys of the passed CIMObjectPath.
+	 * 
+	 * @param pPath
+	 * @return the new CIMObjectPath
+	 */
+	public CIMObjectPath setKeys(CIMObjectPath pPath) {
+		List> keys = new ArrayList>();
+		for (int i = 0; i < this.iProperties.length; ++i) {
+			CIMProperty prop = this.iProperties[i];
+			if (prop.isKey()) keys.add(prop);
+		}
+
+		/*
+		 * CIMObjectPath( String scheme, String host, String port, String
+		 * namespace, String objectName, CIMProperty[] keys )
+		 */
+		return new CIMObjectPath(pPath.getScheme(), pPath.getHost(), pPath.getPort(), pPath
+				.getNamespace(), pPath.getObjectName(), (CIMProperty[]) keys.toArray(EMPTY_RPOP_A));
+	}
+
+	/**
+	 * getAllPropertis
+	 * 
+	 * @return all properties in an ordered way
+	 */
+	public CIMProperty[] getAllPropertis() {
+		return this.iProperties;
+	}
+
+	private void addPathKeys(CIMObjectPath pPath) throws IllegalArgumentException {
+		CIMProperty[] keys = pPath.getKeys();
+		for (int i = 0; i < keys.length; i++) {
+			CIMProperty key = keys[i];
+			int pos = CIMElementSorter.findIdx(this.iProperties, key.getName());
+			if (pos < 0) {
+				pos = -pos - 1;
+				CIMProperty[] newArray = new CIMProperty[this.iProperties.length + 1];
+				System.arraycopy(this.iProperties, 0, newArray, 0, pos);
+				newArray[pos] = key;
+				System.arraycopy(this.iProperties, pos, newArray, pos + 1, this.iProperties.length
+						- pos);
+				this.iProperties = newArray;
+			} else {
+				CIMProperty prop = this.iProperties[pos];
+				// typeAndValueCheck(key, prop);
+				if (!prop.isKey()) this.iProperties[pos] = mkKey(prop);
+			}
+		}
+	}
+
+	private static CIMProperty mkKey(CIMProperty pProp) {
+		return new CIMProperty(pProp.getName(), pProp.getDataType(), pProp.getValue(),
+				true, pProp.isPropagated(), pProp.getOriginClass());
+	}
+
+	/*
+	 * private static void typeAndValueCheck(CIMProperty pPathProp, CIMProperty
+	 * pArrayProp) throws IllegalArgumentException { CIMDataType pType =
+	 * pPathProp.getDataType(), aType = pArrayProp.getDataType(); if (pType ==
+	 * null ? aType != null : pType.getType() != aType.getType()) throw new
+	 * IllegalArgumentException( pPathProp.getName() + " property presents in
+	 * CIMObjectPath param and CIMProperty[] param " + "with different types!");
+	 * Object pValue = pPathProp.getValue(), aValue = pArrayProp.getValue(); if
+	 * (pValue == null ? aValue != null : !pValue.equals(aValue)) throw new
+	 * IllegalArgumentException( pPathProp.getName() + " property conatins
+	 * different values in CIMObjectPath and " + "CIMProperty params!"); }
+	 */
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMOctetString.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMOctetString.java
similarity index 91%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMOctetString.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMOctetString.java
index 0cca4a0..f75d9a3 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMOctetString.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMOctetString.java
@@ -1,484 +1,482 @@
-/*
-  (C) Copyright IBM Corp. 2011
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Dave Blaschke, IBM, blaschke@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 3397922    2011-08-30  blaschke-oss support OctetString 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cim;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger8;
-
-/**
- * This class represents a CIM octet string, or length-prefixed string, where
- * the length is four octets (32 bits) AND includes the four octets it occupies.
- * In other words, the length of the octet string is the number of characters in
- * the string plus four. There are three possible representations: 
      
- * 
      
- * 1) Byte array - This is an array of UnsignedInteger8 (unit8) objects. The
- * first four bytes contain the length, so the ASCII string "DEB" would be
- * represented as { 0x00, 0x00, 0x00, 0x07, 0x44, 0x45, 0x42 }
      
- * 
      
- * 2) Hexadecimal string - This is a string of hexadecimal digits. The four
- * bytes after the initial "0x" contain the length, so the ASCII string "DEB"
- * would be represented as "0x00000007444542".
      
- * 
      
- * 3) ASCII string
      
- * 
      
- * One of these representations is passed into a constructor. The other
- * representations are created on demand when a get() method is invoked or when
- * the equals() method is invoked and the two octet strings have no
- * representations in common.
- */
-public class CIMOctetString {
-
-	private UnsignedInteger8 iBytes[];
-
-	private String iASCIIString;
-
-	private char iReplacementChar; // 0xFF indicates ASCII constructor used
-
-	private String iHexString;
-
-	private int iLength;
-
-	/**
-	 * Constructs a CIMOctetString from the given byte array.
-	 * 
-	 * @param pBytes
-	 *            Byte array representation of octet string.
-	 * @throws IllegalArgumentException
-	 */
-	public CIMOctetString(UnsignedInteger8 pBytes[]) throws IllegalArgumentException {
-		// Minimum (empty) byte array is { 0x00 0x00 0x00 0x04 }
-		if (pBytes == null || pBytes.length < 4) throw new IllegalArgumentException(
-				"Array of bytes must contain at least four bytes");
-
-		// Verify there are no null entries in byte array
-		for (int i = pBytes.length - 1; i >= 0; i--)
-			if (pBytes[i] == null) throw new IllegalArgumentException(
-					"Array of bytes must not contain any null bytes");
-
-		// Calculate length
-		this.iLength = pBytes[3].byteValue() + (pBytes[2].byteValue() * 0x100)
-				+ (pBytes[1].byteValue() * 0x10000) + (pBytes[0].byteValue() * 0x1000000);
-
-		// Verify calculated length matches actual length
-		if (this.iLength != pBytes.length) throw new IllegalArgumentException(
-				"Array of bytes contains invalid length: found " + this.iLength + ", expected "
-						+ pBytes.length);
-
-		// Save byte array in new object
-		this.iBytes = new UnsignedInteger8[this.iLength];
-		for (int i = this.iLength - 1; i >= 0; i--)
-			this.iBytes[i] = pBytes[i];
-	}
-
-	/**
-	 * Constructs a CIMOctetString from the given string.
-	 * 
-	 * @param pString
-	 *            String representation of octet string.
-	 * @param pIsHex
-	 *            true if string is hexadecimal string,
-	 *            false if string is ASCII string.
-	 * 
-	 * @throws IllegalArgumentException
-	 */
-	public CIMOctetString(String pString, boolean pIsHex) throws IllegalArgumentException {
-		if (pString == null) throw new IllegalArgumentException("String cannot be null");
-
-		if (pIsHex) {
-			// Minimum (empty) hexadecimal string is "0x00000004"
-			if (pString.length() < 10) throw new IllegalArgumentException(
-					"Hexadecimal string must contain \"0x\" and at least four pairs of hex digits");
-
-			// Verify hexadecimal string starts with "0x"
-			if (pString.charAt(0) != '0' || pString.charAt(1) != 'x') throw new IllegalArgumentException(
-					"Hexadecimal string must begin with \"0x\"");
-
-			// Calculate length
-			try {
-				this.iLength = Integer.parseInt(pString.substring(2, 10), 16);
-			} catch (NumberFormatException e) {
-				throw new IllegalArgumentException(
-						"Hexadecimal string length could not be parsed: " + e.toString());
-			}
-
-			// Verify calculated length matches actual length
-			if ((this.iLength * 2) + 2 != pString.length()) throw new IllegalArgumentException(
-					"Hexadecimal string contains invalid length: found " + this.iLength
-							+ ", expected " + ((pString.length() - 2 / 2)));
-
-			// Verify remainder of hexadecimal string contains only hexadecimal
-			// digits
-			for (int i = pString.length() - 1; i >= 10; i--) {
-				char ch = pString.charAt(i);
-				if (!((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'))) throw new IllegalArgumentException(
-						"Hexadecimal string could not be parsed, invalid character \'" + ch
-								+ "\' at index " + i);
-			}
-
-			// Save hexadecimal string in new object
-			this.iHexString = new String(pString);
-		} else {
-			// Calculate length
-			this.iLength = pString.length() + 4;
-
-			// Save ASCII string in new object and indicate constructor used
-			this.iASCIIString = new String(pString);
-			this.iReplacementChar = 0xFF;
-		}
-	}
-
-	/**
-	 * Takes a CIM octet string and returns true if it is equal to
-	 * this CIM octet string. Otherwise, it returns false. Two
-	 * octet strings are considered equal if all of their common representations
-	 * are equal. If the octet strings have no representations in common, this
-	 * method will build the missing one, starting with byte array and then
-	 * hexadecmial string.
-	 * 
-	 * NOTE: The ASCII string representation is only considered if both octet
-	 * strings were constructed with an ASCII string.
-	 * 
-	 * @param pObj
-	 *            The object to be compared a CIM element.
-	 * @return true if the specified CIM octet string equals this
-	 *         CIM octet string, false otherwise.
-	 */
-	@Override
-	public synchronized boolean equals(Object pObj) {
-		// Verify parameter is CIMOctetString instance
-		if (!(pObj instanceof CIMOctetString)) return false;
-
-		CIMOctetString that = (CIMOctetString) pObj;
-		int numCompares = 0;
-
-		// Verify lengths are same
-		if (this.iLength != that.iLength) return false;
-
-		// Verify byte arrays match if both non-null
-		if (this.iBytes != null && that.iBytes != null) {
-			for (int i = this.iLength - 1; i >= 0; i--)
-				if (this.iBytes[i].byteValue() != that.iBytes[i].byteValue()) return false;
-			numCompares++;
-		}
-
-		// Verify hexadecimal strings match if both non-null
-		if (this.iHexString != null && that.iHexString != null) {
-			if (!this.iHexString.equalsIgnoreCase(that.iHexString)) return false;
-			numCompares++;
-		}
-
-		// Verify ASCII strings match if both non-null
-		if (this.iASCIIString != null && that.iASCIIString != null
-				&& this.iReplacementChar == that.iReplacementChar) {
-			if (!this.iASCIIString.equalsIgnoreCase(that.iASCIIString)) return false;
-			numCompares++;
-		}
-
-		// Octet strings equal if at least one representation equal
-		if (numCompares > 0) return true;
-
-		// At this point, the two CIMOctetString instances have no
-		// representations in common - time to make one
-
-		if (this.iBytes != null && that.iBytes == null) {
-			that.getBytes();
-			if (this.iBytes != null && that.iBytes != null) {
-				for (int i = this.iLength - 1; i >= 0; i--)
-					if (this.iBytes[i].byteValue() != that.iBytes[i].byteValue()) return false;
-				numCompares++;
-			}
-		}
-
-		// Octet strings equal if byte arrays equal
-		if (numCompares > 0) return true;
-
-		if (this.iBytes == null && that.iBytes != null) {
-			getBytes();
-			if (this.iBytes != null && that.iBytes != null) {
-				for (int i = this.iLength - 1; i >= 0; i--)
-					if (this.iBytes[i].byteValue() != that.iBytes[i].byteValue()) return false;
-				numCompares++;
-			}
-		}
-
-		// Octet strings equal if byte arrays equal
-		if (numCompares > 0) return true;
-
-		if (this.iHexString != null && that.iHexString == null) {
-			that.getHexString();
-			if (this.iHexString != null && that.iHexString != null) {
-				if (!this.iHexString.equalsIgnoreCase(that.iHexString)) return false;
-				numCompares++;
-			}
-		}
-
-		// Octet strings equal if byte arrays equal
-		if (numCompares > 0) return true;
-
-		if (this.iHexString == null && that.iHexString != null) {
-			getHexString();
-			if (this.iHexString != null && that.iHexString != null) {
-				if (!this.iHexString.equalsIgnoreCase(that.iHexString)) return false;
-				numCompares++;
-			}
-		}
-
-		// Octet strings equal if byte arrays equal
-		if (numCompares > 0) return true;
-
-		return false;
-	}
-
-	/**
-	 * Returns ASCII string representation of octet string with non-printable
-	 * characters replaced by pReplacementChar. If the ASCII string
-	 * has not yet been created, it is created from the byte array or
-	 * hexadecimal string.
-	 * 
-	 * @param pReplacementChar
-	 *            Replacement character for non-printable characters which must
-	 *            be between 0x20 and 0x7E, inclusive.
-	 * @return ASCII string representation of octet string.
-	 */
-	public synchronized String getASCIIString(char pReplacementChar) {
-		// If ASCII string constructor used, return original string
-		if (this.iASCIIString != null && this.iReplacementChar == 0xFF) return this.iASCIIString;
-
-		// Verify replacement character is printable
-		if (pReplacementChar <= 0x1F || pReplacementChar >= 0x7F) throw new IllegalArgumentException(
-				"Replacement character not printable");
-
-		// If we already did this once, return previous string
-		if (this.iASCIIString != null && this.iReplacementChar == pReplacementChar) return this.iASCIIString;
-
-		// Construct new ASCII string
-		StringBuilder str = new StringBuilder("");
-		if (this.iBytes != null) {
-			for (int i = 4; i < this.iBytes.length; i++) {
-				char ch = (char) this.iBytes[i].byteValue();
-				if (ch <= 0x1F || ch >= 0x7F) str.append(pReplacementChar);
-				else str.append(ch);
-			}
-		} else /* (this.iHexString != null) */{
-			for (int i = 10; i < this.iHexString.length(); i += 2) {
-				char ch = (char) Integer.parseInt(this.iHexString.substring(i, i + 2), 16);
-				if (ch <= 0x1F || ch >= 0x7F) str.append(pReplacementChar);
-				else str.append(ch);
-			}
-		}
-
-		// Save ASCII string in new object and indicate which replacement
-		// character used
-		this.iASCIIString = new String(str);
-		this.iReplacementChar = pReplacementChar;
-
-		return this.iASCIIString;
-	}
-
-	/**
-	 * Returns byte array representation of octet string. If the byte array has
-	 * not yet been created, it is created from the hexadecimal string or ASCII
-	 * string.
-	 * 
-	 * @return Byte array representation of octet string.
-	 */
-	public synchronized UnsignedInteger8[] getBytes() {
-		if (this.iBytes != null) return this.iBytes;
-
-		if (this.iHexString != null) {
-			convertHexStringToBytes();
-		} else /* if (this.iASCIIString != null) */{
-			convertASCIIStringToBytes();
-		}
-
-		return this.iBytes;
-	}
-
-	/**
-	 * Returns hexadecimal string representation of octet string. If the
-	 * hexadecimal string has not yet been created, it is created from the byte
-	 * array or ASCII string.
-	 * 
-	 * @return Hexadecimal string representation of octet string.
-	 */
-	public synchronized String getHexString() {
-		if (this.iHexString != null) return this.iHexString;
-
-		if (this.iBytes != null) {
-			convertBytesToHexString();
-		} else /* if (this.iASCIIString != null) */{
-			convertASCIIStringToHexString();
-		}
-
-		return this.iHexString;
-	}
-
-	/**
-	 * Returns hash code value for octet string.
-	 * 
-	 * @return Hash code value for octet string.
-	 */
-	@Override
-	public int hashCode() {
-		return toString().toLowerCase().hashCode();
-	}
-
-	/**
-	 * Returns length of octet string, where length is number of octets plus
-	 * four.
-	 * 
-	 * @return Length of octet string.
-	 */
-	public int length() {
-		return this.iLength;
-	}
-
-	/**
-	 * Returns string representation of octet string.
-	 * 
-	 * @return String representation of octet string.
-	 */
-	@Override
-	public String toString() {
-		return getHexString();
-	}
-
-	private void convertBytesToHexString() {
-		// Start with "0x"
-		StringBuilder str = new StringBuilder("0x");
-
-		// Append length
-		String len = Integer.toHexString(this.iLength);
-		for (int i = 8 - len.length(); i > 0; i--)
-			str.append('0');
-		str.append(len);
-
-		// Append string
-		for (int i = 4; i < this.iLength; i++) {
-			String octet = Integer.toHexString(this.iBytes[i].intValue());
-			if (octet.length() == 1) str.append('0');
-			str.append(octet);
-		}
-
-		// Save hexadecimal string in new object
-		this.iHexString = new String(str);
-
-		// debug("convertBytesToHexString: from {" + toBytesString() + "} to \""
-		// + this.iHexString + "\"");
-	}
-
-	private void convertHexStringToBytes() {
-		// Save byte array in new object
-		this.iBytes = new UnsignedInteger8[this.iLength];
-
-		// Convert each octet in hexadecimal string to byte
-		for (int idxByte = 0, idxStr = 2, len = this.iHexString.length(); idxStr < len; idxByte++, idxStr += 2) {
-			short s;
-			try {
-				s = Short.parseShort(this.iHexString.substring(idxStr, idxStr + 2), 16);
-			} catch (NumberFormatException e) {
-				throw new IllegalArgumentException("Hex string length could not be parsed: "
-						+ e.toString());
-			}
-			this.iBytes[idxByte] = new UnsignedInteger8(s);
-		}
-
-		// debug("convertHexStringToBytes: from \"" + this.iHexString +
-		// "\" to {" + toBytesString() + "}");
-	}
-
-	private void convertASCIIStringToBytes() {
-		// Save byte array in new object
-		this.iBytes = new UnsignedInteger8[this.iLength];
-
-		// Convert length
-		this.iBytes[0] = new UnsignedInteger8((short) ((this.iLength >> 24) & 0xFF));
-		this.iBytes[1] = new UnsignedInteger8((short) ((this.iLength >> 16) & 0xFF));
-		this.iBytes[2] = new UnsignedInteger8((short) ((this.iLength >> 8) & 0xFF));
-		this.iBytes[3] = new UnsignedInteger8((short) (this.iLength & 0xFF));
-
-		// Convert each character in ASCII string to byte
-		for (int idxStr = 0, idxByte = 4; idxStr < this.iASCIIString.length(); idxStr++, idxByte++)
-			this.iBytes[idxByte] = new UnsignedInteger8((short) (this.iASCIIString.charAt(idxStr)));
-
-		// debug("convertASCIIStringToBytes: from \"" + this.iASCIIString +
-		// "\" to {" + toBytesString() + "}");
-	}
-
-	private void convertASCIIStringToHexString() {
-		// Start with "0x"
-		StringBuilder str = new StringBuilder("0x");
-
-		// Append length
-		String len = Integer.toHexString(this.iLength);
-		for (int i = 8 - len.length(); i > 0; i--)
-			str.append('0');
-		str.append(len);
-
-		// Append string
-		for (int idxAsc = 0, idxHex = 10; idxAsc < this.iASCIIString.length(); idxAsc++, idxHex++) {
-			String octet = Integer.toHexString((this.iASCIIString.charAt(idxAsc)));
-			if (octet.length() == 1) str.append('0');
-			str.append(octet);
-		}
-
-		// Save hexadecimal string in new object
-		this.iHexString = new String(str);
-
-		// debug("convertASCIIStringToHexString: from \"" + this.iASCIIString +
-		// "\" to \"" + this.iHexString + "\"");
-	}
-
-	// private String toBytesString() {
-	// StringBuilder str = new StringBuilder();
-	//
-	// for (int i = 0; i < this.iLength; i++) {
-	// String octet = Integer.toHexString((this.iBytes[i].intValue()));
-	// if (i > 0) str.append(' ');
-	// if (octet.length() == 1) str.append('0');
-	// str.append(octet);
-	// }
-	// return new String(str);
-	// }
-
-	// private void debug(String str) {
-	// System.out.println(str);
-	// }
-}
+/*
+  (C) Copyright IBM Corp. 2011
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Dave Blaschke, IBM, blaschke@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 3397922    2011-08-30  blaschke-oss support OctetString 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cim;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.UnsignedInteger8;
+
+/**
+ * This class represents a CIM octet string, or length-prefixed string, where
+ * the length is four octets (32 bits) AND includes the four octets it occupies.
+ * In other words, the length of the octet string is the number of characters in
+ * the string plus four. There are three possible representations: 
      
+ * 
      
+ * 1) Byte array - This is an array of UnsignedInteger8 (unit8) objects. The
+ * first four bytes contain the length, so the ASCII string "DEB" would be
+ * represented as { 0x00, 0x00, 0x00, 0x07, 0x44, 0x45, 0x42 }
      
+ * 
      
+ * 2) Hexadecimal string - This is a string of hexadecimal digits. The four
+ * bytes after the initial "0x" contain the length, so the ASCII string "DEB"
+ * would be represented as "0x00000007444542".
      
+ * 
      
+ * 3) ASCII string
      
+ * 
      
+ * One of these representations is passed into a constructor. The other
+ * representations are created on demand when a get() method is invoked or when
+ * the equals() method is invoked and the two octet strings have no
+ * representations in common.
+ */
+public class CIMOctetString {
+
+	private UnsignedInteger8 iBytes[];
+
+	private String iASCIIString;
+
+	private char iReplacementChar; // 0xFF indicates ASCII constructor used
+
+	private String iHexString;
+
+	private int iLength;
+
+	/**
+	 * Constructs a CIMOctetString from the given byte array.
+	 * 
+	 * @param pBytes
+	 *            Byte array representation of octet string.
+	 * @throws IllegalArgumentException
+	 */
+	public CIMOctetString(UnsignedInteger8 pBytes[]) throws IllegalArgumentException {
+		// Minimum (empty) byte array is { 0x00 0x00 0x00 0x04 }
+		if (pBytes == null || pBytes.length < 4) throw new IllegalArgumentException(
+				"Array of bytes must contain at least four bytes");
+
+		// Verify there are no null entries in byte array
+		for (int i = pBytes.length - 1; i >= 0; i--)
+			if (pBytes[i] == null) throw new IllegalArgumentException(
+					"Array of bytes must not contain any null bytes");
+
+		// Calculate length
+		this.iLength = pBytes[3].byteValue() + (pBytes[2].byteValue() * 0x100)
+				+ (pBytes[1].byteValue() * 0x10000) + (pBytes[0].byteValue() * 0x1000000);
+
+		// Verify calculated length matches actual length
+		if (this.iLength != pBytes.length) throw new IllegalArgumentException(
+				"Array of bytes contains invalid length: found " + this.iLength + ", expected "
+						+ pBytes.length);
+
+		// Save byte array in new object
+		this.iBytes = new UnsignedInteger8[this.iLength];
+		for (int i = this.iLength - 1; i >= 0; i--)
+			this.iBytes[i] = pBytes[i];
+	}
+
+	/**
+	 * Constructs a CIMOctetString from the given string.
+	 * 
+	 * @param pString
+	 *            String representation of octet string.
+	 * @param pIsHex
+	 *            true if string is hexadecimal string,
+	 *            false if string is ASCII string.
+	 * 
+	 * @throws IllegalArgumentException
+	 */
+	public CIMOctetString(String pString, boolean pIsHex) throws IllegalArgumentException {
+		if (pString == null) throw new IllegalArgumentException("String cannot be null");
+
+		if (pIsHex) {
+			// Minimum (empty) hexadecimal string is "0x00000004"
+			if (pString.length() < 10) throw new IllegalArgumentException(
+					"Hexadecimal string must contain \"0x\" and at least four pairs of hex digits");
+
+			// Verify hexadecimal string starts with "0x"
+			if (pString.charAt(0) != '0' || pString.charAt(1) != 'x') throw new IllegalArgumentException(
+					"Hexadecimal string must begin with \"0x\"");
+
+			// Calculate length
+			try {
+				this.iLength = Integer.parseInt(pString.substring(2, 10), 16);
+			} catch (NumberFormatException e) {
+				throw new IllegalArgumentException(
+						"Hexadecimal string length could not be parsed: " + e.toString());
+			}
+
+			// Verify calculated length matches actual length
+			if ((this.iLength * 2) + 2 != pString.length()) throw new IllegalArgumentException(
+					"Hexadecimal string contains invalid length: found " + this.iLength
+							+ ", expected " + ((pString.length() - 2 / 2)));
+
+			// Verify remainder of hexadecimal string contains only hexadecimal
+			// digits
+			for (int i = pString.length() - 1; i >= 10; i--) {
+				char ch = pString.charAt(i);
+				if (!((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'))) throw new IllegalArgumentException(
+						"Hexadecimal string could not be parsed, invalid character \'" + ch
+								+ "\' at index " + i);
+			}
+
+			// Save hexadecimal string in new object
+			this.iHexString = new String(pString);
+		} else {
+			// Calculate length
+			this.iLength = pString.length() + 4;
+
+			// Save ASCII string in new object and indicate constructor used
+			this.iASCIIString = new String(pString);
+			this.iReplacementChar = 0xFF;
+		}
+	}
+
+	/**
+	 * Takes a CIM octet string and returns true if it is equal to
+	 * this CIM octet string. Otherwise, it returns false. Two
+	 * octet strings are considered equal if all of their common representations
+	 * are equal. If the octet strings have no representations in common, this
+	 * method will build the missing one, starting with byte array and then
+	 * hexadecmial string.
+	 * 
+	 * NOTE: The ASCII string representation is only considered if both octet
+	 * strings were constructed with an ASCII string.
+	 * 
+	 * @param pObj
+	 *            The object to be compared a CIM element.
+	 * @return true if the specified CIM octet string equals this
+	 *         CIM octet string, false otherwise.
+	 */
+	@Override
+	public synchronized boolean equals(Object pObj) {
+		// Verify parameter is CIMOctetString instance
+		if (!(pObj instanceof CIMOctetString)) return false;
+
+		CIMOctetString that = (CIMOctetString) pObj;
+		int numCompares = 0;
+
+		// Verify lengths are same
+		if (this.iLength != that.iLength) return false;
+
+		// Verify byte arrays match if both non-null
+		if (this.iBytes != null && that.iBytes != null) {
+			for (int i = this.iLength - 1; i >= 0; i--)
+				if (this.iBytes[i].byteValue() != that.iBytes[i].byteValue()) return false;
+			numCompares++;
+		}
+
+		// Verify hexadecimal strings match if both non-null
+		if (this.iHexString != null && that.iHexString != null) {
+			if (!this.iHexString.equalsIgnoreCase(that.iHexString)) return false;
+			numCompares++;
+		}
+
+		// Verify ASCII strings match if both non-null
+		if (this.iASCIIString != null && that.iASCIIString != null
+				&& this.iReplacementChar == that.iReplacementChar) {
+			if (!this.iASCIIString.equalsIgnoreCase(that.iASCIIString)) return false;
+			numCompares++;
+		}
+
+		// Octet strings equal if at least one representation equal
+		if (numCompares > 0) return true;
+
+		// At this point, the two CIMOctetString instances have no
+		// representations in common - time to make one
+
+		if (this.iBytes != null && that.iBytes == null) {
+			that.getBytes();
+			if (this.iBytes != null && that.iBytes != null) {
+				for (int i = this.iLength - 1; i >= 0; i--)
+					if (this.iBytes[i].byteValue() != that.iBytes[i].byteValue()) return false;
+				numCompares++;
+			}
+		}
+
+		// Octet strings equal if byte arrays equal
+		if (numCompares > 0) return true;
+
+		if (this.iBytes == null && that.iBytes != null) {
+			getBytes();
+			if (this.iBytes != null && that.iBytes != null) {
+				for (int i = this.iLength - 1; i >= 0; i--)
+					if (this.iBytes[i].byteValue() != that.iBytes[i].byteValue()) return false;
+				numCompares++;
+			}
+		}
+
+		// Octet strings equal if byte arrays equal
+		if (numCompares > 0) return true;
+
+		if (this.iHexString != null && that.iHexString == null) {
+			that.getHexString();
+			if (this.iHexString != null && that.iHexString != null) {
+				if (!this.iHexString.equalsIgnoreCase(that.iHexString)) return false;
+				numCompares++;
+			}
+		}
+
+		// Octet strings equal if byte arrays equal
+		if (numCompares > 0) return true;
+
+		if (this.iHexString == null && that.iHexString != null) {
+			getHexString();
+			if (this.iHexString != null && that.iHexString != null) {
+				if (!this.iHexString.equalsIgnoreCase(that.iHexString)) return false;
+				numCompares++;
+			}
+		}
+
+		// Octet strings equal if byte arrays equal
+		if (numCompares > 0) return true;
+
+		return false;
+	}
+
+	/**
+	 * Returns ASCII string representation of octet string with non-printable
+	 * characters replaced by pReplacementChar. If the ASCII string
+	 * has not yet been created, it is created from the byte array or
+	 * hexadecimal string.
+	 * 
+	 * @param pReplacementChar
+	 *            Replacement character for non-printable characters which must
+	 *            be between 0x20 and 0x7E, inclusive.
+	 * @return ASCII string representation of octet string.
+	 */
+	public synchronized String getASCIIString(char pReplacementChar) {
+		// If ASCII string constructor used, return original string
+		if (this.iASCIIString != null && this.iReplacementChar == 0xFF) return this.iASCIIString;
+
+		// Verify replacement character is printable
+		if (pReplacementChar <= 0x1F || pReplacementChar >= 0x7F) throw new IllegalArgumentException(
+				"Replacement character not printable");
+
+		// If we already did this once, return previous string
+		if (this.iASCIIString != null && this.iReplacementChar == pReplacementChar) return this.iASCIIString;
+
+		// Construct new ASCII string
+		StringBuilder str = new StringBuilder("");
+		if (this.iBytes != null) {
+			for (int i = 4; i < this.iBytes.length; i++) {
+				char ch = (char) this.iBytes[i].byteValue();
+				if (ch <= 0x1F || ch >= 0x7F) str.append(pReplacementChar);
+				else str.append(ch);
+			}
+		} else /* (this.iHexString != null) */{
+			for (int i = 10; i < this.iHexString.length(); i += 2) {
+				char ch = (char) Integer.parseInt(this.iHexString.substring(i, i + 2), 16);
+				if (ch <= 0x1F || ch >= 0x7F) str.append(pReplacementChar);
+				else str.append(ch);
+			}
+		}
+
+		// Save ASCII string in new object and indicate which replacement
+		// character used
+		this.iASCIIString = new String(str);
+		this.iReplacementChar = pReplacementChar;
+
+		return this.iASCIIString;
+	}
+
+	/**
+	 * Returns byte array representation of octet string. If the byte array has
+	 * not yet been created, it is created from the hexadecimal string or ASCII
+	 * string.
+	 * 
+	 * @return Byte array representation of octet string.
+	 */
+	public synchronized UnsignedInteger8[] getBytes() {
+		if (this.iBytes != null) return this.iBytes;
+
+		if (this.iHexString != null) {
+			convertHexStringToBytes();
+		} else /* if (this.iASCIIString != null) */{
+			convertASCIIStringToBytes();
+		}
+
+		return this.iBytes;
+	}
+
+	/**
+	 * Returns hexadecimal string representation of octet string. If the
+	 * hexadecimal string has not yet been created, it is created from the byte
+	 * array or ASCII string.
+	 * 
+	 * @return Hexadecimal string representation of octet string.
+	 */
+	public synchronized String getHexString() {
+		if (this.iHexString != null) return this.iHexString;
+
+		if (this.iBytes != null) {
+			convertBytesToHexString();
+		} else /* if (this.iASCIIString != null) */{
+			convertASCIIStringToHexString();
+		}
+
+		return this.iHexString;
+	}
+
+	/**
+	 * Returns hash code value for octet string.
+	 * 
+	 * @return Hash code value for octet string.
+	 */
+	@Override
+	public int hashCode() {
+		return toString().toLowerCase().hashCode();
+	}
+
+	/**
+	 * Returns length of octet string, where length is number of octets plus
+	 * four.
+	 * 
+	 * @return Length of octet string.
+	 */
+	public int length() {
+		return this.iLength;
+	}
+
+	/**
+	 * Returns string representation of octet string.
+	 * 
+	 * @return String representation of octet string.
+	 */
+	@Override
+	public String toString() {
+		return getHexString();
+	}
+
+	private void convertBytesToHexString() {
+		// Start with "0x"
+		StringBuilder str = new StringBuilder("0x");
+
+		// Append length
+		String len = Integer.toHexString(this.iLength);
+		for (int i = 8 - len.length(); i > 0; i--)
+			str.append('0');
+		str.append(len);
+
+		// Append string
+		for (int i = 4; i < this.iLength; i++) {
+			String octet = Integer.toHexString(this.iBytes[i].intValue());
+			if (octet.length() == 1) str.append('0');
+			str.append(octet);
+		}
+
+		// Save hexadecimal string in new object
+		this.iHexString = new String(str);
+
+		// debug("convertBytesToHexString: from {" + toBytesString() + "} to \""
+		// + this.iHexString + "\"");
+	}
+
+	private void convertHexStringToBytes() {
+		// Save byte array in new object
+		this.iBytes = new UnsignedInteger8[this.iLength];
+
+		// Convert each octet in hexadecimal string to byte
+		for (int idxByte = 0, idxStr = 2, len = this.iHexString.length(); idxStr < len; idxByte++, idxStr += 2) {
+			short s;
+			try {
+				s = Short.parseShort(this.iHexString.substring(idxStr, idxStr + 2), 16);
+			} catch (NumberFormatException e) {
+				throw new IllegalArgumentException("Hex string length could not be parsed: "
+						+ e.toString());
+			}
+			this.iBytes[idxByte] = new UnsignedInteger8(s);
+		}
+
+		// debug("convertHexStringToBytes: from \"" + this.iHexString +
+		// "\" to {" + toBytesString() + "}");
+	}
+
+	private void convertASCIIStringToBytes() {
+		// Save byte array in new object
+		this.iBytes = new UnsignedInteger8[this.iLength];
+
+		// Convert length
+		this.iBytes[0] = new UnsignedInteger8((short) ((this.iLength >> 24) & 0xFF));
+		this.iBytes[1] = new UnsignedInteger8((short) ((this.iLength >> 16) & 0xFF));
+		this.iBytes[2] = new UnsignedInteger8((short) ((this.iLength >> 8) & 0xFF));
+		this.iBytes[3] = new UnsignedInteger8((short) (this.iLength & 0xFF));
+
+		// Convert each character in ASCII string to byte
+		for (int idxStr = 0, idxByte = 4; idxStr < this.iASCIIString.length(); idxStr++, idxByte++)
+			this.iBytes[idxByte] = new UnsignedInteger8((short) (this.iASCIIString.charAt(idxStr)));
+
+		// debug("convertASCIIStringToBytes: from \"" + this.iASCIIString +
+		// "\" to {" + toBytesString() + "}");
+	}
+
+	private void convertASCIIStringToHexString() {
+		// Start with "0x"
+		StringBuilder str = new StringBuilder("0x");
+
+		// Append length
+		String len = Integer.toHexString(this.iLength);
+		for (int i = 8 - len.length(); i > 0; i--)
+			str.append('0');
+		str.append(len);
+
+		// Append string
+		for (int idxAsc = 0; idxAsc < this.iASCIIString.length(); idxAsc++) {
+			String octet = Integer.toHexString((this.iASCIIString.charAt(idxAsc)));
+			if (octet.length() == 1) str.append('0');
+			str.append(octet);
+		}
+
+		// Save hexadecimal string in new object
+		this.iHexString = new String(str);
+
+		// debug("convertASCIIStringToHexString: from \"" + this.iASCIIString +
+		// "\" to \"" + this.iHexString + "\"");
+	}
+
+	// private String toBytesString() {
+	// StringBuilder str = new StringBuilder();
+	//
+	// for (int i = 0; i < this.iLength; i++) {
+	// String octet = Integer.toHexString((this.iBytes[i].intValue()));
+	// if (i > 0) str.append(' ');
+	// if (octet.length() == 1) str.append('0');
+	// str.append(octet);
+	// }
+	// return new String(str);
+	// }
+
+	// private void debug(String str) {
+	// System.out.println(str);
+	// }
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java
index 399fd23..eefe45c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java
@@ -1,329 +1,327 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2011
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-10-09  ebak         Make SBLIM client JSR48 compliant
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
- * 1783288    2007-09-10  ebak         CIMClass.isAssociation() not working for retrieved classes.
- * 1796339    2007-10-01  ebak         Serializable interface missing from internal componentry
- * 1963102    2008-06-26  rgummada     NullPointerException when getting qualifiers
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2620505    2009-02-24  rgummada     EmbeddedObject qualifier is missing from CIMClass
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
- * 2975885    2010-03-24  blaschke-oss TCK: CIMXXX.hasQualifierValue(null,null) returns true
- * 3001680    2010-05-18  blaschke-oss CIMQualifierElementInterfaceImpl changes qualifiers
- * 3023095    2010-07-01  blaschke-oss CIMQualifiedElementInterfaceImpl equals/hashCode issue
- * 3154232    2011-01-13  blaschke-oss EmbeddedObject misspelled in javadoc
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cim;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMFlavor;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifiedElementInterface;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifier;
-
-/**
- * Class CIMQualifiedElementInterfaceImpl is responsible for implementing the
- * functionality of javax.cim.CIMQualifiedElementInterface
- */
-public class CIMQualifiedElementInterfaceImpl implements CIMQualifiedElementInterface, Serializable {
-
-	/**
-	 * serialVersionUID
-	 */
-	private static final long serialVersionUID = 4533301297060752510L;
-
-	private CIMQualifier[] iQualis;
-
-	private CIMQualifier[] iLocalOnlyQualis;
-
-	private boolean iEmbeddedObject;
-
-	private static final CIMQualifier KEY = new CIMQualifier("Key",
-			CIMDataType.BOOLEAN_T, Boolean.TRUE, CIMFlavor.DISABLEOVERRIDE);
-
-	private static final CIMQualifier ASSOCIATION = new CIMQualifier(
-			"Association", CIMDataType.BOOLEAN_T, Boolean.TRUE, CIMFlavor.DISABLEOVERRIDE);
-
-	private static final CIMQualifier[] EMPTY_QA = new CIMQualifier[0];
-
-	/**
-	 * Ctor. This constructor doesn't modify the passed qualifier list.
-	 * 
-	 * @param pQualifiers
-	 */
-	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers) {
-		setQualis(pQualifiers);
-	}
-
-	/**
-	 * Ctor. This constructor modifies the qualifier list according to the
-	 * pIsKeyed flag.
-	 * 
-	 * @param pQualifiers
-	 * @param pIsKeyed
-	 */
-	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean pIsKeyed) {
-		this(pQualifiers, pIsKeyed, false);
-	}
-
-	/**
-	 * Ctor. This constructor is able to not remove the EmbeddedObject
-	 * qualifier. It is useful for the XML parser to parse EmbeddedObject
-	 * qualified elements without values.
-	 * 
-	 * @param pQualifiers
-	 * @param pIsKeyed
-	 * @param pKeepEmbObj
-	 */
-	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean pIsKeyed,
-			boolean pKeepEmbObj) {
-		this(pQualifiers, pIsKeyed, pKeepEmbObj, false);
-	}
-
-	/**
-	 * Ctor. This constructor is able to not remove the EmbeddedObject
-	 * qualifier. It is useful for the XML parser to parse EmbeddedObject
-	 * qualified elements without values. It also adds or removes the
-	 * Association qualifier depending on the value of pIsAssociation.
-	 * 
-	 * @param pQualifiers
-	 * @param pIsKeyed
-	 * @param pKeepEmbObj
-	 * @param pIsAssociation
-	 */
-	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean pIsKeyed,
-			boolean pKeepEmbObj, boolean pIsAssociation) {
-		if (pKeepEmbObj) {
-			this.iQualis = (CIMQualifier[]) CIMElementSorter.sort(pQualifiers);
-			this.iEmbeddedObject = CIMElementSorter.findIdx(this.iQualis, "EmbeddedObject") >= 0;
-		} else {
-			setQualis(pQualifiers);
-		}
-		setBoolQualifier(KEY, pIsKeyed);
-		setBoolQualifier(ASSOCIATION, pIsAssociation);
-	}
-
-	/**
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object pObj) {
-		if (!(pObj instanceof CIMQualifiedElementInterfaceImpl)) return false;
-		CIMQualifiedElementInterfaceImpl that = (CIMQualifiedElementInterfaceImpl) pObj;
-		return Arrays.equals(getQualifiers(), that.getQualifiers());
-	}
-
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return Arrays.hashCode(getQualifiers());
-	}
-
-	/**
-	 * Sets the Qualifiers. If there is an EmbeddedObject qualifier,
-	 * corresponding flag is set.
-	 * 
-	 * @param pQualiA
-	 */
-	private void setQualis(CIMQualifier[] pQualiA) {
-		pQualiA = (CIMQualifier[]) CIMElementSorter.sort(pQualiA);
-		int rmIdx = CIMElementSorter.findIdx(pQualiA, "EmbeddedObject");
-		if (rmIdx < 0) {
-			this.iQualis = pQualiA;
-			return;
-		}
-		this.iEmbeddedObject = true;
-		this.iQualis = pQualiA;
-	}
-
-	/**
-	 * if pValue is false and boolean qualifier exists it is removed.
      
-	 * if pValue is true and boolean qualifier exists, it's value is changed to
-	 * true, if boolean qualifier doesn't exist it is added.
-	 * 
-	 * @param pQuali
-	 * @param pValue
-	 */
-	private void setBoolQualifier(CIMQualifier pQuali, boolean pValue) {
-		int idx = CIMElementSorter.findIdx(this.iQualis, pQuali.getName());
-		if (pValue) {
-			if (idx < 0) {
-				// insert the qualifier
-				// idx=-insertIdx-1
-				// insertIdx=-idx-1;
-				insertQuali(pQuali, -idx - 1);
-			} else if (!pQuali.getValue().equals(this.iQualis[idx].getValue())) {
-				// change the qualifier if value different
-				this.iQualis[idx] = pQuali;
-			}
-		} else {
-			if (idx > 0) {
-				// remove the existing qualifier
-				removeQuali(idx);
-			}
-		}
-	}
-
-	private void insertQuali(CIMQualifier pQuali, int idx) {
-		int origLength = this.iQualis == null ? 0 : this.iQualis.length;
-		CIMQualifier[] qualis = new CIMQualifier[origLength + 1];
-		int srcIdx = 0, dstIdx = 0;
-		while (srcIdx < idx)
-			qualis[dstIdx++] = this.iQualis[srcIdx++];
-		qualis[dstIdx++] = pQuali;
-		while (srcIdx < origLength)
-			qualis[dstIdx++] = this.iQualis[srcIdx++];
-		this.iQualis = qualis;
-	}
-
-	private void removeQuali(int idx) {
-		CIMQualifier[] qualis = new CIMQualifier[this.iQualis.length - 1];
-		int srcIdx = 0, dstIdx = 0;
-		while (srcIdx < idx)
-			qualis[dstIdx++] = this.iQualis[srcIdx++];
-		++srcIdx;
-		while (srcIdx < this.iQualis.length)
-			qualis[dstIdx++] = this.iQualis[srcIdx++];
-		this.iQualis = qualis;
-	}
-
-	/*
-	 * CIMQualifier( "Key", CIMDataType.BOOLEAN_T, new Boolean(true),
-	 * CIMFlavor.DISABLEOVERRIDE );
-	 */
-
-	/**
-	 * Returns true if the "key" Qualifier with true value presents.
-	 * 
-	 * @return true/false
-	 */
-	public boolean isKeyed() {
-		return hasQualifierValue("key", Boolean.TRUE);
-	}
-
-	/**
-	 * Returns true if the "EmbeddedObject" qualifier with true value presents.
-	 * 
-	 * @return true/false
-	 */
-	public boolean isEmbeddedObject() {
-		return this.iEmbeddedObject;
-	}
-
-	/**
-	 * @see org.sentrysoftware.wbem.javax.cim.CIMQualifiedElementInterface#getQualifier(int)
-	 */
-	public CIMQualifier getQualifier(int pIndex) {
-		return this.iQualis[pIndex];
-	}
-
-	/**
-	 * @see org.sentrysoftware.wbem.javax.cim.CIMQualifiedElementInterface#getQualifier(java.lang.String)
-	 */
-	public CIMQualifier getQualifier(String pName) {
-		return (CIMQualifier) CIMElementSorter.find(this.iQualis, pName);
-	}
-
-	/**
-	 * @see org.sentrysoftware.wbem.javax.cim.CIMQualifiedElementInterface#getQualifierCount()
-	 */
-	public int getQualifierCount() {
-		return this.iQualis == null ? 0 : this.iQualis.length;
-	}
-
-	/**
-	 * @see org.sentrysoftware.wbem.javax.cim.CIMQualifiedElementInterface#getQualifierValue(java.lang.String)
-	 */
-	public Object getQualifierValue(String pName) {
-		CIMQualifier quali = getQualifier(pName);
-		if (quali == null) return null;
-		return quali.getValue();
-	}
-
-	/**
-	 * @see org.sentrysoftware.wbem.javax.cim.CIMQualifiedElementInterface#getQualifiers()
-	 */
-	public CIMQualifier[] getQualifiers() {
-		return getQualifiers(false);
-	}
-
-	/**
-	 * getQualifiers - helps filtering based on the propagated flag.
-	 * 
-	 * @param pLocalOnly
-	 * @return CIMQualifier[]
-	 */
-	public CIMQualifier[] getQualifiers(boolean pLocalOnly) {
-		if (this.iQualis == null) return EMPTY_QA;
-		if (!pLocalOnly) return this.iQualis;
-		if (this.iLocalOnlyQualis == null) {
-			ArrayList> qualiL = new ArrayList>(this.iQualis.length);
-			for (int i = 0; i < this.iQualis.length; i++)
-				if (!this.iQualis[i].isPropagated()) qualiL.add(this.iQualis[i]);
-			this.iLocalOnlyQualis = qualiL.toArray(new CIMQualifier[qualiL.size()]);
-		}
-		return this.iLocalOnlyQualis;
-	}
-
-	/**
-	 * @see org.sentrysoftware.wbem.javax.cim.CIMQualifiedElementInterface#hasQualifier(java.lang.String)
-	 */
-	public boolean hasQualifier(String pName) {
-		return getQualifier(pName) != null;
-	}
-
-	/**
-	 * @see org.sentrysoftware.wbem.javax.cim.CIMQualifiedElementInterface#hasQualifierValue(java.lang.String,
-	 *      java.lang.Object)
-	 */
-	public boolean hasQualifierValue(String pName, Object pValue) {
-		if (!hasQualifier(pName)) return false;
-		Object value = getQualifierValue(pName);
-		return value == null ? pValue == null : value.equals(pValue);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2011
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-10-09  ebak         Make SBLIM client JSR48 compliant
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
+ * 1783288    2007-09-10  ebak         CIMClass.isAssociation() not working for retrieved classes.
+ * 1796339    2007-10-01  ebak         Serializable interface missing from internal componentry
+ * 1963102    2008-06-26  rgummada     NullPointerException when getting qualifiers
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2620505    2009-02-24  rgummada     EmbeddedObject qualifier is missing from CIMClass
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
+ * 2975885    2010-03-24  blaschke-oss TCK: CIMXXX.hasQualifierValue(null,null) returns true
+ * 3001680    2010-05-18  blaschke-oss CIMQualifierElementInterfaceImpl changes qualifiers
+ * 3023095    2010-07-01  blaschke-oss CIMQualifiedElementInterfaceImpl equals/hashCode issue
+ * 3154232    2011-01-13  blaschke-oss EmbeddedObject misspelled in javadoc
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cim;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMQualifier;
+import org.metricshub.wbem.javax.cim.CIMFlavor;
+import org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface;
+
+/**
+ * Class CIMQualifiedElementInterfaceImpl is responsible for implementing the
+ * functionality of javax.cim.CIMQualifiedElementInterface
+ */
+public class CIMQualifiedElementInterfaceImpl implements CIMQualifiedElementInterface, Serializable {
+
+	/**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = 4533301297060752510L;
+
+	private CIMQualifier[] iQualis;
+
+	private CIMQualifier[] iLocalOnlyQualis;
+
+	private boolean iEmbeddedObject;
+
+	private static final CIMQualifier KEY = new CIMQualifier("Key",
+			CIMDataType.BOOLEAN_T, Boolean.TRUE, CIMFlavor.DISABLEOVERRIDE);
+
+	private static final CIMQualifier ASSOCIATION = new CIMQualifier(
+			"Association", CIMDataType.BOOLEAN_T, Boolean.TRUE, CIMFlavor.DISABLEOVERRIDE);
+
+	private static final CIMQualifier[] EMPTY_QA = new CIMQualifier[0];
+
+	/**
+	 * Ctor. This constructor doesn't modify the passed qualifier list.
+	 * 
+	 * @param pQualifiers
+	 */
+	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers) {
+		setQualis(pQualifiers);
+	}
+
+	/**
+	 * Ctor. This constructor modifies the qualifier list according to the
+	 * pIsKeyed flag.
+	 * 
+	 * @param pQualifiers
+	 * @param pIsKeyed
+	 */
+	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean pIsKeyed) {
+		this(pQualifiers, pIsKeyed, false);
+	}
+
+	/**
+	 * Ctor. This constructor is able to not remove the EmbeddedObject
+	 * qualifier. It is useful for the XML parser to parse EmbeddedObject
+	 * qualified elements without values.
+	 * 
+	 * @param pQualifiers
+	 * @param pIsKeyed
+	 * @param pKeepEmbObj
+	 */
+	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean pIsKeyed,
+			boolean pKeepEmbObj) {
+		this(pQualifiers, pIsKeyed, pKeepEmbObj, false);
+	}
+
+	/**
+	 * Ctor. This constructor is able to not remove the EmbeddedObject
+	 * qualifier. It is useful for the XML parser to parse EmbeddedObject
+	 * qualified elements without values. It also adds or removes the
+	 * Association qualifier depending on the value of pIsAssociation.
+	 * 
+	 * @param pQualifiers
+	 * @param pIsKeyed
+	 * @param pKeepEmbObj
+	 * @param pIsAssociation
+	 */
+	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean pIsKeyed,
+			boolean pKeepEmbObj, boolean pIsAssociation) {
+		if (pKeepEmbObj) {
+			this.iQualis = (CIMQualifier[]) CIMElementSorter.sort(pQualifiers);
+			this.iEmbeddedObject = CIMElementSorter.findIdx(this.iQualis, "EmbeddedObject") >= 0;
+		} else {
+			setQualis(pQualifiers);
+		}
+		setBoolQualifier(KEY, pIsKeyed);
+		setBoolQualifier(ASSOCIATION, pIsAssociation);
+	}
+
+	/**
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object pObj) {
+		if (!(pObj instanceof CIMQualifiedElementInterfaceImpl)) return false;
+		CIMQualifiedElementInterfaceImpl that = (CIMQualifiedElementInterfaceImpl) pObj;
+		return Arrays.equals(getQualifiers(), that.getQualifiers());
+	}
+
+	/**
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		return Arrays.hashCode(getQualifiers());
+	}
+
+	/**
+	 * Sets the Qualifiers. If there is an EmbeddedObject qualifier,
+	 * corresponding flag is set.
+	 * 
+	 * @param pQualiA
+	 */
+	private void setQualis(CIMQualifier[] pQualiA) {
+		pQualiA = (CIMQualifier[]) CIMElementSorter.sort(pQualiA);
+		int rmIdx = CIMElementSorter.findIdx(pQualiA, "EmbeddedObject");
+		if (rmIdx < 0) {
+			this.iQualis = pQualiA;
+			return;
+		}
+		this.iEmbeddedObject = true;
+		this.iQualis = pQualiA;
+	}
+
+	/**
+	 * if pValue is false and boolean qualifier exists it is removed.
      
+	 * if pValue is true and boolean qualifier exists, it's value is changed to
+	 * true, if boolean qualifier doesn't exist it is added.
+	 * 
+	 * @param pQuali
+	 * @param pValue
+	 */
+	private void setBoolQualifier(CIMQualifier pQuali, boolean pValue) {
+		int idx = CIMElementSorter.findIdx(this.iQualis, pQuali.getName());
+		if (pValue) {
+			if (idx < 0) {
+				// insert the qualifier
+				// idx=-insertIdx-1
+				// insertIdx=-idx-1;
+				insertQuali(pQuali, -idx - 1);
+			} else if (!pQuali.getValue().equals(this.iQualis[idx].getValue())) {
+				// change the qualifier if value different
+				this.iQualis[idx] = pQuali;
+			}
+		} else {
+			if (idx > 0) {
+				// remove the existing qualifier
+				removeQuali(idx);
+			}
+		}
+	}
+
+	private void insertQuali(CIMQualifier pQuali, int idx) {
+		int origLength = this.iQualis == null ? 0 : this.iQualis.length;
+		CIMQualifier[] qualis = new CIMQualifier[origLength + 1];
+		int srcIdx = 0, dstIdx = 0;
+		while (srcIdx < idx)
+			qualis[dstIdx++] = this.iQualis[srcIdx++];
+		qualis[dstIdx++] = pQuali;
+		while (srcIdx < origLength)
+			qualis[dstIdx++] = this.iQualis[srcIdx++];
+		this.iQualis = qualis;
+	}
+
+	private void removeQuali(int idx) {
+		CIMQualifier[] qualis = new CIMQualifier[this.iQualis.length - 1];
+		int srcIdx = 0, dstIdx = 0;
+		while (srcIdx < idx)
+			qualis[dstIdx++] = this.iQualis[srcIdx++];
+		++srcIdx;
+		while (srcIdx < this.iQualis.length)
+			qualis[dstIdx++] = this.iQualis[srcIdx++];
+		this.iQualis = qualis;
+	}
+
+	/*
+	 * CIMQualifier( "Key", CIMDataType.BOOLEAN_T, new Boolean(true),
+	 * CIMFlavor.DISABLEOVERRIDE );
+	 */
+
+	/**
+	 * Returns true if the "key" Qualifier with true value presents.
+	 * 
+	 * @return true/false
+	 */
+	public boolean isKeyed() {
+		return hasQualifierValue("key", Boolean.TRUE);
+	}
+
+	/**
+	 * Returns true if the "EmbeddedObject" qualifier with true value presents.
+	 * 
+	 * @return true/false
+	 */
+	public boolean isEmbeddedObject() {
+		return this.iEmbeddedObject;
+	}
+
+	/**
+	 * @see org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface#getQualifier(int)
+	 */
+	public CIMQualifier getQualifier(int pIndex) {
+		return this.iQualis[pIndex];
+	}
+
+	/**
+	 * @see org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface#getQualifier(java.lang.String)
+	 */
+	public CIMQualifier getQualifier(String pName) {
+		return (CIMQualifier) CIMElementSorter.find(this.iQualis, pName);
+	}
+
+	/**
+	 * @see org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface#getQualifierCount()
+	 */
+	public int getQualifierCount() {
+		return this.iQualis == null ? 0 : this.iQualis.length;
+	}
+
+	/**
+	 * @see org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface#getQualifierValue(java.lang.String)
+	 */
+	public Object getQualifierValue(String pName) {
+		CIMQualifier quali = getQualifier(pName);
+		if (quali == null) return null;
+		return quali.getValue();
+	}
+
+	/**
+	 * @see org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface#getQualifiers()
+	 */
+	public CIMQualifier[] getQualifiers() {
+		return getQualifiers(false);
+	}
+
+	/**
+	 * getQualifiers - helps filtering based on the propagated flag.
+	 * 
+	 * @param pLocalOnly
+	 * @return CIMQualifier[]
+	 */
+	public CIMQualifier[] getQualifiers(boolean pLocalOnly) {
+		if (this.iQualis == null) return EMPTY_QA;
+		if (!pLocalOnly) return this.iQualis;
+		if (this.iLocalOnlyQualis == null) {
+			ArrayList> qualiL = new ArrayList>(this.iQualis.length);
+			for (int i = 0; i < this.iQualis.length; i++)
+				if (!this.iQualis[i].isPropagated()) qualiL.add(this.iQualis[i]);
+			this.iLocalOnlyQualis = qualiL.toArray(new CIMQualifier[qualiL.size()]);
+		}
+		return this.iLocalOnlyQualis;
+	}
+
+	/**
+	 * @see org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface#hasQualifier(java.lang.String)
+	 */
+	public boolean hasQualifier(String pName) {
+		return getQualifier(pName) != null;
+	}
+
+	/**
+	 * @see org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface#hasQualifierValue(java.lang.String,
+	 *      java.lang.Object)
+	 */
+	public boolean hasQualifierValue(String pName, Object pValue) {
+		if (!hasQualifier(pName)) return false;
+		Object value = getQualifierValue(pName);
+		return value == null ? pValue == null : value.equals(pValue);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMVersion.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMVersion.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMVersion.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMVersion.java
index f8acb6a..bbd8836 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/CIMVersion.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMVersion.java
@@ -1,158 +1,156 @@
-/*
-  CIMVersion.java
-
-  (C) Copyright IBM Corp. 2005, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM ,chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 2807325    2009-06-22  blaschke-oss Change licensing from CPL to EPL
- * 2834838    2009-08-11  blaschke-oss Add interface to retrieve version number and product name
- * 3027618    2010-07-14  blaschke-oss Close files/readers in finally blocks
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cim;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-/**
- * Class CIMVersion is responsible for providing the exact version number,
- * product name, etc. of the Java CIM Client
- */
-public class CIMVersion {
-
-	private static String PRODUCT_NAME = "n/a";
-
-	private static String VERSION = "n/a";
-
-	private static String COPYRIGHT = "n/a";
-
-	private static String BUILDDATE = "n/a";
-
-	private static String BUILDTIME = "n/a";
-
-	static {
-		Properties properties = new Properties();
-		InputStream versionIS = null;
-		try {
-			versionIS = CIMVersion.class.getClassLoader().getResourceAsStream("com/sentrysoftware/sblim/cimclient/version.txt");
-			properties.load(versionIS);
-			PRODUCT_NAME = properties.getProperty("PRODUCTNAME");
-			VERSION = properties.getProperty("VERSION");
-			COPYRIGHT = properties.getProperty("COPYRIGHT");
-			BUILDDATE = properties.getProperty("BUILDDATE");
-			BUILDTIME = properties.getProperty("BUILDTIME");
-		} catch (FileNotFoundException e) {
-			System.out.println("Error: Could not open version.txt");
-		} catch (IOException e) {
-			System.out.println("Error while reading version.txt");
-		} finally {
-			if (versionIS != null) {
-				try {
-					versionIS.close();
-				} catch (IOException e) {
-					/* Ignore exception on close */
-				}
-			}
-		}
-	}
-
-	/**
-	 * Gets the build date
-	 * 
-	 * @return The build date
-	 */
-	public static String getBuildDate() {
-		return BUILDDATE;
-	}
-
-	/**
-	 * Gets the build time
-	 * 
-	 * @return The build time
-	 */
-	public static String getBuildTime() {
-		return BUILDTIME;
-	}
-
-	/**
-	 * Gets the copyright statement
-	 * 
-	 * @return THe copyright
-	 */
-	public static String getCopyright() {
-		return COPYRIGHT;
-	}
-
-	/**
-	 * Gets the product name
-	 * 
-	 * @return The product name
-	 */
-	public static String getProductName() {
-		return PRODUCT_NAME;
-	}
-
-	/**
-	 * Gets the version
-	 * 
-	 * @return The version
-	 */
-	public static String getVersion() {
-		return VERSION;
-	}
-
-	/**
-	 * toString
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return (PRODUCT_NAME + "\n" + VERSION + "\n" + COPYRIGHT + "\n" + BUILDDATE + "\n" + BUILDTIME);
-	}
-
-	/**
-	 * main
-	 * 
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		System.out.println(new CIMVersion());
-	}
-}
+/*
+  CIMVersion.java
+
+  (C) Copyright IBM Corp. 2005, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM ,chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 2807325    2009-06-22  blaschke-oss Change licensing from CPL to EPL
+ * 2834838    2009-08-11  blaschke-oss Add interface to retrieve version number and product name
+ * 3027618    2010-07-14  blaschke-oss Close files/readers in finally blocks
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cim;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * Class CIMVersion is responsible for providing the exact version number,
+ * product name, etc. of the Java CIM Client
+ */
+public class CIMVersion {
+
+	private static String PRODUCT_NAME = "n/a";
+
+	private static String VERSION = "n/a";
+
+	private static String COPYRIGHT = "n/a";
+
+	private static String BUILDDATE = "n/a";
+
+	private static String BUILDTIME = "n/a";
+
+	static {
+		Properties properties = new Properties();
+		InputStream versionIS = null;
+		try {
+			versionIS = CIMVersion.class.getClassLoader().getResourceAsStream("org/sblim/cimclient/version.txt");
+			properties.load(versionIS);
+			PRODUCT_NAME = properties.getProperty("PRODUCTNAME");
+			VERSION = properties.getProperty("VERSION");
+			COPYRIGHT = properties.getProperty("COPYRIGHT");
+			BUILDDATE = properties.getProperty("BUILDDATE");
+			BUILDTIME = properties.getProperty("BUILDTIME");
+		} catch (FileNotFoundException e) {
+			System.out.println("Error: Could not open version.txt");
+		} catch (IOException e) {
+			System.out.println("Error while reading version.txt");
+		} finally {
+			if (versionIS != null) {
+				try {
+					versionIS.close();
+				} catch (IOException e) {
+					/* Ignore exception on close */
+				}
+			}
+		}
+	}
+
+	/**
+	 * Gets the build date
+	 * 
+	 * @return The build date
+	 */
+	public static String getBuildDate() {
+		return BUILDDATE;
+	}
+
+	/**
+	 * Gets the build time
+	 * 
+	 * @return The build time
+	 */
+	public static String getBuildTime() {
+		return BUILDTIME;
+	}
+
+	/**
+	 * Gets the copyright statement
+	 * 
+	 * @return THe copyright
+	 */
+	public static String getCopyright() {
+		return COPYRIGHT;
+	}
+
+	/**
+	 * Gets the product name
+	 * 
+	 * @return The product name
+	 */
+	public static String getProductName() {
+		return PRODUCT_NAME;
+	}
+
+	/**
+	 * Gets the version
+	 * 
+	 * @return The version
+	 */
+	public static String getVersion() {
+		return VERSION;
+	}
+
+	/**
+	 * toString
+	 * 
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return (PRODUCT_NAME + "\n" + VERSION + "\n" + COPYRIGHT + "\n" + BUILDDATE + "\n" + BUILDTIME);
+	}
+
+	/**
+	 * main
+	 * 
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		System.out.println(new CIMVersion());
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/DTStringReader.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringReader.java
similarity index 84%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/DTStringReader.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringReader.java
index 4fc3f3e..bd669b0 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/DTStringReader.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringReader.java
@@ -1,208 +1,206 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-10-12  ebak         Make SBLIM client JSR48 compliant
- * 1678807    2007-03-12  ebak         Minor CIMDateTime suggestions
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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
- * 3526675    2012-05-14  blaschke-oss Unit test fails on Java 7
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cim;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.StringReader;
-
-/**
- * Class DTString helps parsing CIMDateTime Strings.
- * 
- */
-public class DTStringReader {
-
-	private String iDateTimeStr;
-
-	private StringReader iReader;
-
-	private int iPos = 0;
-
-	private boolean iUnsignificant;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pDateTimeStr
-	 */
-	public DTStringReader(String pDateTimeStr) {
-		this.iDateTimeStr = pDateTimeStr;
-		this.iReader = new StringReader(pDateTimeStr);
-	}
-
-	/**
-	 * read
-	 * 
-	 * @param pLen
-	 *            - number of characters to be read from the string
-	 * @param pFieldName
-	 *            - the name of the field which is to be read (e.g. year, month,
-	 *            day ...)
-	 * @param pAllowUnsignificant
-	 * @return int
-	 * @throws IllegalArgumentException
-	 */
-	public int read(int pLen, String pFieldName, boolean pAllowUnsignificant)
-			throws IllegalArgumentException {
-		char[] buf = new char[pLen];
-		int read;
-		try {
-			read = this.iReader.read(buf);
-			this.iPos += pLen;
-		} catch (IOException e) {
-			String msg = "Failed to read " + pFieldName + " field from " + this.iDateTimeStr + '!';
-			throw new IllegalArgumentException(msg);
-		}
-		if (read != pLen) {
-			String msg = "Length of " + pFieldName + " field should be " + pLen + " but only"
-					+ read + " characters could be read!";
-			throw new IllegalArgumentException(msg);
-		}
-		// Not significant check
-		if (pAllowUnsignificant) {
-			int cnt = 0;
-			for (int i = 0; i < buf.length; i++)
-				if (buf[i] == '*') ++cnt;
-			if (cnt == buf.length) {
-				this.iUnsignificant = true;
-				return -1;
-			}
-		}
-		this.iUnsignificant = false;
-		String field = new String(buf);
-		int res;
-		try {
-			res = Integer.parseInt(field);
-		} catch (NumberFormatException e) {
-			String msg = "Illegal " + pFieldName + " field \"" + field + "\" in \""
-					+ this.iDateTimeStr + "\"!";
-			throw new IllegalArgumentException(msg);
-		}
-		if (res < 0) throw new IllegalArgumentException("Negative value is not allowed for "
-				+ pFieldName + " in " + this.iDateTimeStr + "!");
-		// Java 7 parseInt began allowing plus sign
-		if (field.indexOf('+') != -1) throw new IllegalArgumentException(
-				"Plus sign is not allowed for " + pFieldName + " in " + this.iDateTimeStr + "!");
-		return res;
-	}
-
-	/**
-	 * readAndCheck
-	 * 
-	 * @param pLen
-	 *            - number of digits to read
-	 * @param pFieldName
-	 *            - the name of the field which is to be read (e.g. year, month,
-	 *            day...)
-	 * @param pMin
-	 *            - the allowed minimum value (-1 is always allowed as not
-	 *            significant)
-	 * @param pMax
-	 *            - the allowed maximum value
-	 * @param pAllowUnsignificant
-	 * @return int
-	 * @throws IllegalArgumentException
-	 */
-	public int readAndCheck(int pLen, String pFieldName, int pMin, int pMax,
-			boolean pAllowUnsignificant) throws IllegalArgumentException {
-		int val = read(pLen, pFieldName, pAllowUnsignificant);
-		if (pAllowUnsignificant && val == -1) return val;
-		if (val < pMin || val > pMax) throw new IllegalArgumentException(pFieldName
-				+ " must be between " + pMin + " and " + pMax + ", but " + val + " was read from "
-				+ this.iDateTimeStr + " !");
-		return val;
-	}
-
-	/**
-	 * read
-	 * 
-	 * @return a char, 0 if failed
-	 */
-	public char read() {
-		try {
-			int i = this.iReader.read();
-			if (i > 0) {
-				++this.iPos;
-				return (char) i;
-			}
-			return 0;
-		} catch (IOException e) {
-			return 0;
-		}
-	}
-
-	/**
-	 * read - Throws an IllegalArgumentException if the read character is not c.
-	 * 
-	 * @param c
-	 *            - contains the character which should be read from the String.
-	 * @throws IllegalArgumentException
-	 */
-	public void read(char c) throws IllegalArgumentException {
-		if (read() != c) {
-			String msg = "'" + c + "' expected at position " + getPos() + " in "
-					+ this.iDateTimeStr + "!";
-			throw new IllegalArgumentException(msg);
-		}
-	}
-
-	/**
-	 * getPos
-	 * 
-	 * @return the position in the reader
-	 */
-	public int getPos() {
-		return this.iPos;
-	}
-
-	/**
-	 * isUnsignificant
-	 * 
-	 * @return boolean
-	 */
-	public boolean isUnsignificant() {
-		return this.iUnsignificant;
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-10-12  ebak         Make SBLIM client JSR48 compliant
+ * 1678807    2007-03-12  ebak         Minor CIMDateTime suggestions
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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
+ * 3526675    2012-05-14  blaschke-oss Unit test fails on Java 7
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cim;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.StringReader;
+
+/**
+ * Class DTString helps parsing CIMDateTime Strings.
+ * 
+ */
+public class DTStringReader {
+
+	private String iDateTimeStr;
+
+	private StringReader iReader;
+
+	private int iPos = 0;
+
+	private boolean iUnsignificant;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pDateTimeStr
+	 */
+	public DTStringReader(String pDateTimeStr) {
+		this.iDateTimeStr = pDateTimeStr;
+		this.iReader = new StringReader(pDateTimeStr);
+	}
+
+	/**
+	 * read
+	 * 
+	 * @param pLen
+	 *            - number of characters to be read from the string
+	 * @param pFieldName
+	 *            - the name of the field which is to be read (e.g. year, month,
+	 *            day ...)
+	 * @param pAllowUnsignificant
+	 * @return int
+	 * @throws IllegalArgumentException
+	 */
+	public int read(int pLen, String pFieldName, boolean pAllowUnsignificant)
+			throws IllegalArgumentException {
+		char[] buf = new char[pLen];
+		int read;
+		try {
+			read = this.iReader.read(buf);
+			this.iPos += pLen;
+		} catch (IOException e) {
+			String msg = "Failed to read " + pFieldName + " field from " + this.iDateTimeStr + '!';
+			throw new IllegalArgumentException(msg);
+		}
+		if (read != pLen) {
+			String msg = "Length of " + pFieldName + " field should be " + pLen + " but only"
+					+ read + " characters could be read!";
+			throw new IllegalArgumentException(msg);
+		}
+		// Not significant check
+		if (pAllowUnsignificant) {
+			int cnt = 0;
+			for (int i = 0; i < buf.length; i++)
+				if (buf[i] == '*') ++cnt;
+			if (cnt == buf.length) {
+				this.iUnsignificant = true;
+				return -1;
+			}
+		}
+		this.iUnsignificant = false;
+		String field = new String(buf);
+		int res;
+		try {
+			res = Integer.parseInt(field);
+		} catch (NumberFormatException e) {
+			String msg = "Illegal " + pFieldName + " field \"" + field + "\" in \""
+					+ this.iDateTimeStr + "\"!";
+			throw new IllegalArgumentException(msg);
+		}
+		if (res < 0) throw new IllegalArgumentException("Negative value is not allowed for "
+				+ pFieldName + " in " + this.iDateTimeStr + "!");
+		// Java 7 parseInt began allowing plus sign
+		if (field.indexOf('+') != -1) throw new IllegalArgumentException(
+				"Plus sign is not allowed for " + pFieldName + " in " + this.iDateTimeStr + "!");
+		return res;
+	}
+
+	/**
+	 * readAndCheck
+	 * 
+	 * @param pLen
+	 *            - number of digits to read
+	 * @param pFieldName
+	 *            - the name of the field which is to be read (e.g. year, month,
+	 *            day...)
+	 * @param pMin
+	 *            - the allowed minimum value (-1 is always allowed as not
+	 *            significant)
+	 * @param pMax
+	 *            - the allowed maximum value
+	 * @param pAllowUnsignificant
+	 * @return int
+	 * @throws IllegalArgumentException
+	 */
+	public int readAndCheck(int pLen, String pFieldName, int pMin, int pMax,
+			boolean pAllowUnsignificant) throws IllegalArgumentException {
+		int val = read(pLen, pFieldName, pAllowUnsignificant);
+		if (pAllowUnsignificant && val == -1) return val;
+		if (val < pMin || val > pMax) throw new IllegalArgumentException(pFieldName
+				+ " must be between " + pMin + " and " + pMax + ", but " + val + " was read from "
+				+ this.iDateTimeStr + " !");
+		return val;
+	}
+
+	/**
+	 * read
+	 * 
+	 * @return a char, 0 if failed
+	 */
+	public char read() {
+		try {
+			int i = this.iReader.read();
+			if (i > 0) {
+				++this.iPos;
+				return (char) i;
+			}
+			return 0;
+		} catch (IOException e) {
+			return 0;
+		}
+	}
+
+	/**
+	 * read - Throws an IllegalArgumentException if the read character is not c.
+	 * 
+	 * @param c
+	 *            - contains the character which should be read from the String.
+	 * @throws IllegalArgumentException
+	 */
+	public void read(char c) throws IllegalArgumentException {
+		if (read() != c) {
+			String msg = "'" + c + "' expected at position " + getPos() + " in "
+					+ this.iDateTimeStr + "!";
+			throw new IllegalArgumentException(msg);
+		}
+	}
+
+	/**
+	 * getPos
+	 * 
+	 * @return the position in the reader
+	 */
+	public int getPos() {
+		return this.iPos;
+	}
+
+	/**
+	 * isUnsignificant
+	 * 
+	 * @return boolean
+	 */
+	public boolean isUnsignificant() {
+		return this.iUnsignificant;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/DTStringWriter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringWriter.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/DTStringWriter.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringWriter.java
index 1bb1dfe..095d3bc 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/DTStringWriter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringWriter.java
@@ -1,134 +1,132 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-10-12  ebak         Make SBLIM client JSR48 compliant
- * 1678807    2007-03-12  ebak         Minor CIMDateTime suggestions
- * 1849235    2008-02-11  blaschke-oss DTStringWriter.writeSigned parameter pDigits is not used
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2989367    2010-04-29  blaschke-oss CIMDateTimeInterval(long) constructor range wrong
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cim;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Arrays;
-
-/**
- * Class DTStringWriter helps making CIMDateTime Strings.
- */
-public class DTStringWriter {
-
-	private StringBuffer iBuf = new StringBuffer();
-
-	/**
-	 * writeInt - writes an integer, the upper digits are filled with zeros
-	 * 
-	 * @param pNum
-	 *            -1 means that asterisks have to be printed
-	 * @param pDigits
-	 */
-	public void write(int pDigits, int pNum) {
-		if (pDigits <= 0) return;
-		if (pNum == -1) {
-			char[] cA = new char[pDigits];
-			Arrays.fill(cA, '*');
-			this.iBuf.append(cA);
-			return;
-		}
-		String str = Integer.toString(pNum);
-		int paddingDigits = pDigits - str.length();
-		if (paddingDigits > 0) {
-			char[] cA = new char[paddingDigits];
-			Arrays.fill(cA, '0');
-			this.iBuf.append(cA).append(str);
-		} else this.iBuf.append(str);
-	}
-
-	/**
-	 * writeSignedInt - used for utc writing
-	 * 
-	 * @param pNum
-	 * @param pDigits
-	 */
-	public void writeSigned(int pDigits, int pNum) {
-		char sign;
-		if (pNum < 0) {
-			sign = '-';
-			pNum = -pNum;
-		} else sign = '+';
-		write(sign);
-		write(pDigits, pNum);
-	}
-
-	/**
-	 * writeUSec
-	 * 
-	 * @param pUSec
-	 * @param pUnsignificantDigits
-	 */
-	public void writeUSec(int pUSec, int pUnsignificantDigits) {
-		int digits = 6 - pUnsignificantDigits;
-		write(digits, pUSec);
-		for (int i = 0; i < pUnsignificantDigits; i++)
-			write('*');
-	}
-
-	/**
-	 * writeChar
-	 * 
-	 * @param pChar
-	 */
-	public void write(char pChar) {
-		this.iBuf.append(pChar);
-	}
-
-	/**
-	 * write
-	 * 
-	 * @param pStr
-	 */
-	public void write(String pStr) {
-		this.iBuf.append(pStr);
-	}
-
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return this.iBuf.toString();
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-10-12  ebak         Make SBLIM client JSR48 compliant
+ * 1678807    2007-03-12  ebak         Minor CIMDateTime suggestions
+ * 1849235    2008-02-11  blaschke-oss DTStringWriter.writeSigned parameter pDigits is not used
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2989367    2010-04-29  blaschke-oss CIMDateTimeInterval(long) constructor range wrong
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cim;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Arrays;
+
+/**
+ * Class DTStringWriter helps making CIMDateTime Strings.
+ */
+public class DTStringWriter {
+
+	private StringBuffer iBuf = new StringBuffer();
+
+	/**
+	 * writeInt - writes an integer, the upper digits are filled with zeros
+	 * 
+	 * @param pNum
+	 *            -1 means that asterisks have to be printed
+	 * @param pDigits
+	 */
+	public void write(int pDigits, int pNum) {
+		if (pDigits <= 0) return;
+		if (pNum == -1) {
+			char[] cA = new char[pDigits];
+			Arrays.fill(cA, '*');
+			this.iBuf.append(cA);
+			return;
+		}
+		String str = Integer.toString(pNum);
+		int paddingDigits = pDigits - str.length();
+		if (paddingDigits > 0) {
+			char[] cA = new char[paddingDigits];
+			Arrays.fill(cA, '0');
+			this.iBuf.append(cA).append(str);
+		} else this.iBuf.append(str);
+	}
+
+	/**
+	 * writeSignedInt - used for utc writing
+	 * 
+	 * @param pNum
+	 * @param pDigits
+	 */
+	public void writeSigned(int pDigits, int pNum) {
+		char sign;
+		if (pNum < 0) {
+			sign = '-';
+			pNum = -pNum;
+		} else sign = '+';
+		write(sign);
+		write(pDigits, pNum);
+	}
+
+	/**
+	 * writeUSec
+	 * 
+	 * @param pUSec
+	 * @param pUnsignificantDigits
+	 */
+	public void writeUSec(int pUSec, int pUnsignificantDigits) {
+		int digits = 6 - pUnsignificantDigits;
+		write(digits, pUSec);
+		for (int i = 0; i < pUnsignificantDigits; i++)
+			write('*');
+	}
+
+	/**
+	 * writeChar
+	 * 
+	 * @param pChar
+	 */
+	public void write(char pChar) {
+		this.iBuf.append(pChar);
+	}
+
+	/**
+	 * write
+	 * 
+	 * @param pStr
+	 */
+	public void write(String pStr) {
+		this.iBuf.append(pStr);
+	}
+
+	/**
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return this.iBuf.toString();
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cim/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java
similarity index 93%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java
index 326bd35..d9ea7ad 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java
@@ -1,2635 +1,2634 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
- 
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
- 
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
- 
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com  
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 13521      2004-11-26  thschaef     XML Request Composition for static method call is wrong
- * 18075      2005-08-11  pineiro5     Can not use method CIMClient.invokeMethod
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1365086 	  2006-10-25  ebak	       Possible bug in createQualifier
- * 1565892    2006-11-16  lupusalex    Make SBLIM client JSR48 compliant
- * 1610046    2006-12-18  lupusalex    Does not escape trailing spaces  
- * 1610046    2007-01-10  lupusalex    Rework: Does not escape trailing spaces 
- * 1649611    2007-01-31  lupusalex    Interop issue: Quotes not escaped by client
- * 1671502    2007-02-28  lupusalex    Remove dependency from Xerces
- * 1660756    2007-03-02  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1669961    2006-04-16  lupusalex    CIMTypedElement.getType() =>getDataType()
- * 1715027    2007-05-08  lupusalex    Make message id random
- * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
- * 1734888    2007-06-11  ebak         Wrong reference building in METHODCALL request
- * 1827728    2007-11-12  ebak         embeddedInstances: attribute EmbeddedObject not set
- * 1827728    2007-11-20  ebak         rework: embeddedInstances: attribute EmbeddedObject not set
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
- * 2865222    2009-09-29  raman_arora  enumerateQualifierTypes shouldn't require a class name
- * 2858933    2009-10-12  raman_arora  JSR48 new APIs: associatorClasses & associatorInstances
- * 2886829    2009-11-18  raman_arora  JSR48 new APIs: referenceClasses & referenceInstances
- * 2944219    2010-02-05  blaschke-oss Problem with pull operations using client against EMC CIMOM
- * 3027479    2010-07-09  blaschke-oss Dead store to local variable
- * 3062747    2010-09-21  blaschke-oss SblimCIMClient does not log all CIM-XML responces.
- * 3514537    2012-04-03  blaschke-oss TCK: execQueryInstances requires boolean, not Boolean
- * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
- * 3527580    2012-05-17  blaschke-oss WBEMClient should not throw IllegalArgumentException
- * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
- *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
- *    2689    2013-10-10  blaschke-oss createMETHODCALL should not add PARAMTYPE attribute
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.Random;
-import java.util.Vector;
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMNamedElementInterface;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifierType;
-import org.sentrysoftware.wbem.javax.cim.CIMValuedElement;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger32;
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.TimeStamp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMAssociatorNamesOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMAssociatorsOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMCreateClassOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMCreateInstanceOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMCreateNameSpaceOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMCreateQualifierTypeOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMDeleteClassOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMDeleteInstanceOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMDeleteQualifierTypeOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumClassNamesOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumClassesOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumInstanceNamesOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumInstancesOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumNameSpaceOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumQualifierTypesOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMExecQueryOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMGetClassOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMGetInstanceOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMGetPropertyOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMGetQualifierTypeOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMInvokeMethodOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMOperation;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMReferenceNamesOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMReferencesOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMSetClassOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMSetInstanceOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMSetPropertyOp;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations.CIMSetQualifierTypeOp;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * Class CIMClientXML_HelperImpl is responsible for building CIM-XML requests
- * and responses.
- */
-public class CIMClientXML_HelperImpl {
-
-	private static class Counter {
-
-		private int iCounter;
-
-		protected Counter(int pCounter) {
-			this.iCounter = pCounter;
-		}
-
-		protected int incrementAndGet() {
-			return ++this.iCounter;
-		}
-	}
-
-	private static final String VERSION = "1.0";
-
-	private static final String ASSOCIATOR_NAMES = "AssociatorNames";
-
-	// Pull Enumeration variables
-	private static final String ASSOC_CLASS = "AssocClass";
-
-	private static final String CLASS_NAME = "ClassName";
-
-	private static final String CONTINUE_ON_ERROR = "ContinueOnError";
-
-	private static final String DEEP_INHERITANCE = "DeepInheritance";
-
-	private static final String ENUMERATION_CONTEXT = "EnumerationContext";
-
-	private static final String FILTER_QUERY_LANGUAGE = "FilterQueryLanguage";
-
-	private static final String FILTER_QUERY = "FilterQuery";
-
-	private static final String INCLUDE_CLASS_ORIGIN = "IncludeClassOrigin";
-
-	private static final String INSTANCE_NAME = "InstanceName";
-
-	private static final String MAX_OBJECT_COUNT = "MaxObjectCount";
-
-	private static final String PROPERTY_LIST = "PropertyList";
-
-	private static final String OPERATION_TIMEOUT = "OperationTimeout";
-
-	private static final String RESULT_CLASS = "ResultClass";
-
-	private static final String RETURN_QUERY_RESULT_CLASS = "ReturnQueryResultClass";
-
-	private static final String QUERY_RESULT_CLASS = "QueryResultClass";
-
-	private static final String ROLE = "Role";
-
-	private static final String RESULT_ROLE = "ResultRole";
-
-	private static final Random RANDOM = new Random();
-
-	private static final int MAX_ID = 1 << 20;
-
-	private final ThreadLocal iCurrentId = new ThreadLocal();
-
-	private final DocumentBuilder iBuilder;
-
-	private static String valueStr(CIMValuedElement pE) {
-		Object o = pE.getValue();
-		return o == null ? MOF.NULL : o.toString();
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @throws ParserConfigurationException
-	 */
-	public CIMClientXML_HelperImpl() throws ParserConfigurationException {
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		this.iBuilder = factory.newDocumentBuilder();
-	}
-
-	/**
-	 * getDocumentBuilder
-	 * 
-	 * @return DocumentBuilder
-	 */
-	public DocumentBuilder getDocumentBuilder() {
-		return this.iBuilder;
-	}
-
-	/**
-	 * newDocument
-	 * 
-	 * @return Document
-	 */
-	public Document newDocument() {
-		return this.iBuilder.newDocument();
-	}
-
-	/**
-	 * parse
-	 * 
-	 * @param pIS
-	 * @return Document
-	 * @throws IOException
-	 * @throws SAXException
-	 */
-	public Document parse(InputSource pIS) throws IOException, SAXException {
-		if (pIS == null) throw new IllegalArgumentException("null input stream argument");
-		return this.iBuilder.parse(pIS);
-	}
-
-	/**
-	 * Serializes a given DOM document as (CIM-)XML to a given output stream
-	 * 
-	 * @param pOS
-	 *            The output stream
-	 * @param pDoc
-	 *            The documents
-	 * @throws IOException
-	 *             Whenever something goes wrong
-	 */
-	public static void serialize(OutputStream pOS, Document pDoc) throws IOException {
-		CimXmlSerializer.serialize(pOS, pDoc, false);
-	}
-
-	/**
-	 * Serializes a given DOM document as (CIM-)XML to a given output stream.
-	 * The document is pretty wrapped and indented and surrounded with markers
-	 * for the begin and end.
-	 * 
-	 * @param pOS
-	 *            The output stream
-	 * @param pDoc
-	 *            The documents
-	 * @throws IOException
-	 */
-	public static void dumpDocument(OutputStream pOS, Document pDoc) throws IOException {
-		dumpDocument(pOS, pDoc, null);
-	}
-
-	/**
-	 * Serializes a given DOM document as (CIM-)XML to a given output stream.
-	 * The document is pretty wrapped and indented and surrounded with markers
-	 * for the begin and end.
-	 * 
-	 * @param pOS
-	 *            The output stream
-	 * @param pDoc
-	 *            The documents
-	 * @param pOrigin
-	 *            The origin of the output stream (request, indication response,
-	 *            etc.)
-	 * @throws IOException
-	 */
-	public static void dumpDocument(OutputStream pOS, Document pDoc, String pOrigin)
-			throws IOException {
-		// debug
-		if (pOS == null) { return; }
-		if (pOrigin == null) pOrigin = "unknown";
-		pOS.write("<--- ".getBytes());
-		pOS.write(pOrigin.getBytes());
-		pOS.write(" begin ".getBytes());
-		pOS.write(TimeStamp.formatWithMillis(System.currentTimeMillis()).getBytes());
-		pOS.write(" -----\n".getBytes());
-		CimXmlSerializer.serialize(pOS, pDoc, true);
-		pOS.write("\n---- ".getBytes());
-		pOS.write(pOrigin.getBytes());
-		pOS.write(" end ------>\n".getBytes());
-	}
-
-	/**
-	 * createCIMMessage
-	 * 
-	 * @param pDoc
-	 * @param pRequestE
-	 * @return Element
-	 */
-	public Element createCIMMessage(Document pDoc, Element pRequestE) {
-		Element cimE = CIMXMLBuilderImpl.createCIM(pDoc);
-		Element messageE = CIMXMLBuilderImpl.createMESSAGE(pDoc, cimE, String.valueOf(getNextId()),
-				VERSION);
-		if (pRequestE != null) {
-			messageE.appendChild(pRequestE);
-		}
-		return messageE;
-	}
-
-	/**
-	 * createMultiReq
-	 * 
-	 * @param pDoc
-	 * @return Element
-	 */
-	public Element createMultiReq(Document pDoc) {
-		Element multireqE = CIMXMLBuilderImpl.createMULTIREQ(pDoc);
-		return multireqE;
-	}
-
-	/**
-	 * associatorNames_request
-	 * 
-	 * @param pDoc
-	 * @param pObjectName
-	 * @param pAssocClass
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pResultRole
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element associatorNames_request(Document pDoc, CIMObjectPath pObjectName,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole)
-			throws WBEMException {
-
-		// obtain data
-		String className = pObjectName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-		CIMProperty[] keysA = pObjectName.getKeys();
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				ASSOCIATOR_NAMES);
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
-
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
-		Element instancenameE = CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
-		for (int i = 0; i < keysA.length; i++) {
-			CIMProperty prop = keysA[i];
-			String propName = prop.getName();
-			// TODO: check that CIMDataType.toString() satisfies this
-			String propTypeStr = prop.getDataType().toString();
-			String propValueStr = valueStr(prop);
-			Element keybindingE = CIMXMLBuilderImpl.createKEYBINDING(pDoc, instancenameE, propName);
-			CIMXMLBuilderImpl.createKEYVALUE(pDoc, keybindingE, propTypeStr, propValueStr);
-		}
-		if (pAssocClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "AssocClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
-		}
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-		if (pResultRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultRole");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * associatorNames_response
-	 * 
-	 * @param pDoc
-	 * @param pPathA
-	 * @return Element
-	 */
-	public static Element associatorNames_response(Document pDoc, CIMObjectPath[] pPathA) {
-		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
-		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
-				"associatorNames");
-		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
-		try {
-			for (int i = 0; i < pPathA.length; i++) {
-				CIMXMLBuilderImpl.createOBJECTPATH(pDoc, iRetValE, pPathA[i]);
-			}
-		} catch (WBEMException e) {
-			throw new RuntimeException(e);
-		}
-		return simpRspE;
-	}
-
-	/**
-	 * associatorInstances_request
-	 * 
-	 * @param pDoc
-	 * @param pObjectName
-	 * @param pAssocClass
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pResultRole
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element associatorInstances_request(Document pDoc, CIMObjectPath pObjectName,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
-
-		String className = pObjectName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-		CIMProperty[] keysA = pObjectName.getKeys();
-
-		// Make sure keys are populated
-		if (keysA.length == 0) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"associatorInstances requires keys for the instance to be populated");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "Associators");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
-		Element instancenameE = CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
-		for (int i = 0; i < keysA.length; i++) {
-			CIMProperty prop = keysA[i];
-			String propName = prop.getName();
-			String propTypeStr = prop.getDataType().toString();
-			String propValueStr = valueStr(prop);
-
-			Element keybindingE = CIMXMLBuilderImpl.createKEYBINDING(pDoc, instancenameE, propName);
-			CIMXMLBuilderImpl.createKEYVALUE(pDoc, keybindingE, propTypeStr, propValueStr);
-		}
-		if (pAssocClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "AssocClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
-		}
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-		if (pResultRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultRole");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++) {
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-			}
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * associatorClasses_request
-	 * 
-	 * @param pDoc
-	 * @param pObjectName
-	 * @param pAssocClass
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pResultRole
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element associatorClasses_request(Document pDoc, CIMObjectPath pObjectName,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-
-		String className = pObjectName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		// Make sure keys are not populated
-		if (pObjectName.getKeys().length != 0) throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"Keys should not be populated for associatorClasses");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "Associators");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
-
-		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
-
-		if (pAssocClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "AssocClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
-		}
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-		if (pResultRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultRole");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
-		}
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++) {
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-			}
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * associators_request
-	 * 
-	 * @param pDoc
-	 * @param pObjectName
-	 * @param pAssocClass
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pResultRole
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element associators_request(Document pDoc, CIMObjectPath pObjectName,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-
-		// obtain data
-		String className = pObjectName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-		CIMProperty[] keysA = pObjectName.getKeys();
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "Associators");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
-		Element instancenameE = CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
-		for (int i = 0; i < keysA.length; i++) {
-			CIMProperty prop = keysA[i];
-			String propName = prop.getName();
-			// TODO: check that CIMDataType.toString() satisfies this
-			String propTypeStr = prop.getDataType().toString();
-			// CIMXMLBuilderImpl.getTypeStr(pValue.getType());
-			String propValueStr = valueStr(prop);
-
-			Element keybindingE = CIMXMLBuilderImpl.createKEYBINDING(pDoc, instancenameE, propName);
-			CIMXMLBuilderImpl.createKEYVALUE(pDoc, keybindingE, propTypeStr, propValueStr);
-		}
-		if (pAssocClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "AssocClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
-		}
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-		if (pResultRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultRole");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
-		}
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList"); // BB
-			// fixed
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++) {
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-			}
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * associators_response
-	 * 
-	 * @param pDoc
-	 * @param pNamedElementA
-	 * @return Element
-	 */
-	public static Element associators_response(Document pDoc,
-			CIMNamedElementInterface[] pNamedElementA) {
-		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
-		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE, "associators");
-		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
-		try {
-			for (int i = 0; i < pNamedElementA.length; i++) {
-				CIMNamedElementInterface namedElement = pNamedElementA[i];
-				CIMObjectPath op = namedElement.getObjectPath();
-				String nameSpace = op == null ? null : op.getNamespace();
-				CIMXMLBuilderImpl
-						.createVALUEOBJECTWITHPATH(pDoc, iRetValE, namedElement, nameSpace);
-				/*
-				 * CIMXMLBuilderImpl.createCLASSPATH( pDoc, iRetValE,
-				 * pClassA[i].getObjectPath() );
-				 * CIMXMLBuilderImpl.createCLASS(pDoc, iRetValE, pClassA[i]);
-				 */
-
-			}
-		} catch (WBEMException e) {
-			throw new RuntimeException(e);
-		}
-		return simpRspE;
-	}
-
-	/**
-	 * enumerateInstanceNames_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element enumerateInstanceNames_request(Document pDoc, CIMObjectPath pPath)
-			throws WBEMException {
-		// obtain data
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerateInstanceNames");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
-		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
-
-		return simplereqE;
-	}
-
-	/**
-	 * enumerateInstances_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pDeepInheritance
-	 * @param pLocalOnly
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element enumerateInstances_request(Document pDoc, CIMObjectPath pPath,
-			boolean pDeepInheritance, boolean pLocalOnly, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
-
-		// obtain data
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerateInstances");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
-		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "LocalOnly");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pLocalOnly);
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "DeepInheritance");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pDeepInheritance);
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++) {
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-			}
-		}
-		return simplereqE;
-	}
-
-	/**
-	 * getInstance_request
-	 * 
-	 * @param pDoc
-	 * @param pName
-	 * @param pLocalOnly
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element getInstance_request(Document pDoc, CIMObjectPath pName, boolean pLocalOnly,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-		// obtain data
-		String className = pName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "GetInstance");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"InstanceName");
-		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pName);
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "LocalOnly");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pLocalOnly);
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++) {
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-			}
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * deleteInstance_request
-	 * 
-	 * @param pDoc
-	 * @param pName
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element deleteInstance_request(Document pDoc, CIMObjectPath pName) throws WBEMException {
-
-		// obtain data
-		String className = pName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"DeleteInstance");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"InstanceName");
-		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pName);
-
-		return simplereqE;
-	}
-
-	/**
-	 * getClass_request
-	 * 
-	 * @param pDoc
-	 * @param pName
-	 * @param pLocalOnly
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element getClass_request(Document pDoc, CIMObjectPath pName, boolean pLocalOnly,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-
-		// obtain data
-		String className = pName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "GetClass");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
-		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "LocalOnly");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pLocalOnly);
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++) {
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-			}
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * createInstance_request
-	 * 
-	 * @param pDoc
-	 * @param pName
-	 * @param pInstance
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element createInstance_request(Document pDoc, CIMObjectPath pName, CIMInstance pInstance)
-			throws WBEMException {
-
-		String className = pInstance.getObjectPath().getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"CreateInstance");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"NewInstance");
-
-		CIMXMLBuilderImpl.createINSTANCE(pDoc, iparamvalueE, pInstance);
-
-		return simplereqE;
-	}
-
-	/**
-	 * invokeMethod_request
-	 * 
-	 * @param pDoc
-	 * @param pLocalPath
-	 * @param pMethodName
-	 * @param pInArgs
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element invokeMethod_request(Document pDoc, CIMObjectPath pLocalPath,
-			String pMethodName, CIMArgument[] pInArgs) throws WBEMException {
-
-		// obtain data
-		String className = pLocalPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-		CIMProperty[] keysA = pLocalPath.getKeys();
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element methodcallE = CIMXMLBuilderImpl.createMETHODCALL(pDoc, simplereqE, pMethodName);
-
-		// 13521
-		if (keysA.length > 0) {
-			Element localpathE = CIMXMLBuilderImpl.createLOCALINSTANCEPATH(pDoc, methodcallE);
-			CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, localpathE, pLocalPath); // 13521
-			CIMXMLBuilderImpl.createINSTANCENAME(pDoc, localpathE, pLocalPath); // 13521
-		} else {
-			CIMXMLBuilderImpl.createLOCALCLASSPATH(pDoc, methodcallE, pLocalPath);
-		}
-
-		buildParamValues(pDoc, methodcallE, pLocalPath, pInArgs);
-
-		return simplereqE;
-	}
-
-	/**
-	 * invokeMethod_response
-	 * 
-	 * @param pDoc
-	 * @param pMethodName
-	 * @param pLocalPath
-	 * @param pRetVal
-	 * @param pOutArgA
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element invokeMethod_response(Document pDoc, String pMethodName,
-			CIMObjectPath pLocalPath, Object pRetVal, CIMArgument[] pOutArgA)
-			throws WBEMException {
-		if (pMethodName == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null method name");
-		Element simpleRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
-		Element methodRspE = CIMXMLBuilderImpl.createMETHODRESPONSE(pDoc, simpleRspE, pMethodName);
-
-		CIMXMLBuilderImpl.createRETURNVALUE(pDoc, methodRspE, pRetVal);
-
-		buildParamValues(pDoc, methodRspE, pLocalPath, pOutArgA);
-		return simpleRspE;
-	}
-
-	/**
-	 * @param pLocalPath
-	 */
-	private static void buildParamValues(Document pDoc, Element pParentE, CIMObjectPath pLocalPath,
-			CIMArgument[] pArgA) throws WBEMException {
-		if (pArgA == null) return;
-		for (int i = 0; i < pArgA.length; i++) {
-			CIMArgument arg = pArgA[i];
-			if (arg == null) continue;
-			CIMXMLBuilderImpl.createPARAMVALUE(pDoc, pParentE, arg);
-		}
-	}
-
-	// public CIMResponse createIndication_request(Document doc) throws
-	// CIMXMLParseException, CIMException {
-	// Element rootE = doc.getDocumentElement();
-	// CIMResponse response = (CIMResponse)xmlParser.parseCIM(rootE);
-	// response.checkError();
-	// return response;
-	// // Vector v = (Vector)response.getFirstReturnValue();
-	// //
-	// // //TODO: Should we return the whole list of instances or just the first
-	// instance?
-	// // //TODO: return the whole vector of indications
-	// // if (v.size() > 0)
-	// // return (CIMInstance)v.elementAt(0);
-	// // else
-	// // return null;
-	// }
-
-	/**
-	 * createIndication_response
-	 * 
-	 * @param error
-	 * @return Document
-	 */
-	public Document createIndication_response(CIMError error) {
-
-		// CIMXMLBuilderImpl.create XML
-		Document doc = this.iBuilder.newDocument();
-		Element cimE = CIMXMLBuilderImpl.createCIM(doc);
-		Element messageE = CIMXMLBuilderImpl.createMESSAGE(doc, cimE, String.valueOf(getNextId()),
-				"1.0");
-		Element simpleexprspE = CIMXMLBuilderImpl.createSIMPLEEXPRSP(doc, messageE);
-		Element expmethodresponseE = CIMXMLBuilderImpl.createEXPMETHODRESPONSE(doc, simpleexprspE,
-				"ExportIndication");
-		if (error == null) {
-			CIMXMLBuilderImpl.createIRETURNVALUE(doc, expmethodresponseE);
-		} else {
-			CIMXMLBuilderImpl.createERROR(doc, expmethodresponseE, error);
-		}
-		// Element
-		return doc;
-	}
-
-	/**
-	 * createClass_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pClass
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element createClass_request(Document pDoc, CIMObjectPath pPath, CIMClass pClass)
-			throws WBEMException {
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "CreateClass");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "NewClass");
-
-		CIMXMLBuilderImpl.createCLASS(pDoc, iparamvalueE, pClass);
-
-		return simplereqE;
-	}
-
-	/**
-	 * getQualifier_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pQt
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element getQualifier_request(Document pDoc, CIMObjectPath pPath, String pQt)
-			throws WBEMException {
-		// obtain data
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl
-				.createIMETHODCALL(pDoc, simplereqE, "GetQualifier");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"QualifierName");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pPath.getObjectName());
-
-		return simplereqE;
-	}
-
-	/**
-	 * createQualifierType_request : This has been replaced by
-	 * setQualifierType_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pQt
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element createQualifierType_request(Document pDoc, CIMObjectPath pPath,
-			CIMQualifierType pQt) throws WBEMException {
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl
-				.createIMETHODCALL(pDoc, simplereqE, "SetQualifier");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"QualifierDeclaration");
-		CIMXMLBuilderImpl.createQUALIFIER_DECLARATION(pDoc, iparamvalueE, pQt);
-
-		return simplereqE;
-	}
-
-	/**
-	 * deleteClass_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element deleteClass_request(Document pDoc, CIMObjectPath pPath) throws WBEMException {
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "DeleteClass");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
-
-		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
-
-		return simplereqE;
-	}
-
-	/**
-	 * deleteQualifierType_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element deleteQualifierType_request(Document pDoc, CIMObjectPath pPath)
-			throws WBEMException {
-		// obtain data
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"DeleteQualifier");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"QualifierName");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pPath.getObjectName());
-		return simplereqE;
-	}
-
-	/**
-	 * enumerateClasses_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pDeepInheritance
-	 * @param pLocalOnly
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @return Element
-	 */
-	public Element enumerateClasses_request(Document pDoc, CIMObjectPath pPath,
-			boolean pDeepInheritance, boolean pLocalOnly, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin) {
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerateClasses");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE;
-		if (pPath != null && pPath.getObjectName() != null
-				&& pPath.getObjectName().trim().length() != 0) {
-			String className = pPath.getObjectName();
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
-		}
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "LocalOnly");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pLocalOnly);
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "DeepInheritance");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pDeepInheritance);
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-		return simplereqE;
-	}
-
-	/**
-	 * enumerateClasses_response
-	 * 
-	 * @param pDoc
-	 * @param pClA
-	 * @return Element
-	 */
-	public static Element enumerateClasses_response(Document pDoc, CIMClass[] pClA) {
-		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
-		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
-				"enumerateClasses");
-		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
-		try {
-			for (int i = 0; i < pClA.length; i++) {
-				CIMXMLBuilderImpl.createCLASS(pDoc, iRetValE, pClA[i]);
-			}
-		} catch (WBEMException e) {
-			throw new RuntimeException(e);
-		}
-		return simpRspE;
-	}
-
-	/**
-	 * enumerateInstances_response
-	 * 
-	 * @param pDoc
-	 * @param pInstA
-	 * @return Element
-	 */
-	public static Element enumerateInstances_response(Document pDoc, CIMInstance[] pInstA) {
-		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
-		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
-				"enumerateInstances");
-		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
-		try {
-			for (int i = 0; i < pInstA.length; i++) {
-				CIMXMLBuilderImpl.createINSTANCE(pDoc, iRetValE, pInstA[i]);
-			}
-		} catch (WBEMException e) {
-			throw new RuntimeException(e);
-		}
-		return simpRspE;
-	}
-
-	/**
-	 * enumerateClassNames_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pDeepInheritance
-	 * @return Element
-	 */
-	public Element enumerateClassNames_request(Document pDoc, CIMObjectPath pPath,
-			boolean pDeepInheritance) {
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerateClassNames");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE;
-
-		if (pPath != null && pPath.getObjectName() != null
-				&& pPath.getObjectName().trim().length() != 0) {
-			String className = pPath.getObjectName();
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "DeepInheritance");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pDeepInheritance);
-
-		return simplereqE;
-	}
-
-	/**
-	 * getProperty_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pPropertyName
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element getProperty_request(Document pDoc, CIMObjectPath pPath, String pPropertyName)
-			throws WBEMException {
-		// obtain data
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "GetProperty");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"InstanceName");
-		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
-
-		if (pPropertyName != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyName");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pPropertyName);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * referenceNames_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pResultClass
-	 * @param pRole
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element referenceNames_request(Document pDoc, CIMObjectPath pPath, String pResultClass,
-			String pRole) throws WBEMException {
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"ReferenceNames");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
-		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
-
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * referenceClasses_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element referenceClasses_request(Document pDoc, CIMObjectPath pPath,
-			String pResultClass, String pRole, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
-
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		// Make sure keys are not populated
-		if (pPath.getKeys().length != 0) throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"Keys should not be populated for referenceClasses");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "References");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
-		// createOBJECTNAME will internally call createINSTANCENAME but as there
-		// are no keys Element containing keys will not be populated
-		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
-
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++) {
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-			}
-		}
-		return simplereqE;
-	}
-
-	/**
-	 * referenceInstances_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element referenceInstances_request(Document pDoc, CIMObjectPath pPath,
-			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		// keys are required for CIMInstance
-		if (pPath.getKeys().length == 0) throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"refrenceInstances requires keys for the instance to be populated");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "References");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
-		// createOBJECTNAME will internally call createINSTANCENAME to populate
-		// Element containing keys
-		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
-
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++) {
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-			}
-		}
-		return simplereqE;
-	}
-
-	/**
-	 * references_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element references_request(Document pDoc, CIMObjectPath pPath, String pResultClass,
-			String pRole, boolean pIncludeQualifiers, boolean pIncludeClassOrigin,
-			String[] pPropertyList) throws WBEMException {
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "References");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE;
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
-		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
-
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++) {
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-			}
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * setClass_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pClass
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element setClass_request(Document pDoc, CIMObjectPath pPath, CIMClass pClass)
-			throws WBEMException {
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "ModifyClass");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"ModifiedClass");
-		CIMXMLBuilderImpl.createCLASS(pDoc, iparamvalueE, pClass);
-
-		return simplereqE;
-	}
-
-	/**
-	 * setInstance_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pInstance
-	 * @param pIncludeQualifiers
-	 * @param pPropertyList
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element setInstance_request(Document pDoc, CIMObjectPath pPath, CIMInstance pInstance,
-			boolean pIncludeQualifiers, String[] pPropertyList) throws WBEMException {
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"ModifyInstance");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"ModifiedInstance");
-		CIMXMLBuilderImpl.createVALUENAMEDINSTANCE(pDoc, iparamvalueE, pPath, pInstance);
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++) {
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-			}
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * setProperty_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pPropertyName
-	 * @param pNewValue
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element setProperty_request(Document pDoc, CIMObjectPath pPath, String pPropertyName,
-			Object pNewValue) throws WBEMException {
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "SetProperty");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"InstanceName");
-		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
-
-		if (pPropertyName != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyName");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pPropertyName);
-		}
-
-		if (pNewValue != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "NewValue");
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pNewValue);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * setQualifierType_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pQt
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element setQualifierType_request(Document pDoc, CIMObjectPath pPath,
-			CIMQualifierType pQt) throws WBEMException {
-		// Make sure class name exists, it is required to uniquely identify
-		// qualifier in namespace
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl
-				.createIMETHODCALL(pDoc, simplereqE, "SetQualifier");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"QualifierDeclaration");
-		CIMXMLBuilderImpl.createQUALIFIER_DECLARATION(pDoc, iparamvalueE, pQt);
-
-		return simplereqE;
-	}
-
-	/**
-	 * enumQualifierTypes_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element enumQualifierTypes_request(Document pDoc, CIMObjectPath pPath)
-			throws WBEMException {
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerateQualifiers");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		return simplereqE;
-	}
-
-	/**
-	 * enumQualifierTypes_response
-	 * 
-	 * @param pDoc
-	 * @param pQualiTypeA
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element enumQualifierTypes_response(Document pDoc,
-			CIMQualifierType[] pQualiTypeA) throws WBEMException {
-		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
-		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
-				"associatorNames");
-		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
-		for (int i = 0; i < pQualiTypeA.length; i++) {
-			CIMXMLBuilderImpl.createQUALIFIER_DECLARATION(pDoc, iRetValE, pQualiTypeA[i]);
-		}
-		return simpRspE;
-	}
-
-	/**
-	 * execQuery_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pQuery
-	 * @param pQueryLanguage
-	 * @return Element
-	 */
-	public Element execQuery_request(Document pDoc, CIMObjectPath pPath, String pQuery,
-			String pQueryLanguage) {
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "ExecQuery");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element querylanguageE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"QueryLanguage");
-		CIMXMLBuilderImpl.createVALUE(pDoc, querylanguageE, pQueryLanguage);
-
-		Element queryE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Query");
-		CIMXMLBuilderImpl.createVALUE(pDoc, queryE, pQuery);
-
-		return simplereqE;
-	}
-
-	/**
-	 * performBatchOperation_request
-	 * 
-	 * @param pDoc
-	 * @param pOperations
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element performBatchOperation_request(Document pDoc, Vector pOperations)
-			throws WBEMException {
-
-		Element messageE = createCIMMessage(pDoc, null);
-		if (pOperations.size() > 1) {
-			Element multireqE = createMultiReq(pDoc);
-			messageE.appendChild(multireqE);
-			messageE = multireqE;
-		}
-		int i = 0;
-		Iterator iter = pOperations.iterator();
-		while (iter.hasNext()) {
-			CIMOperation op = iter.next();
-			try {
-				Element requestE = null;
-
-				if (op instanceof CIMAssociatorsOp) {
-					CIMAssociatorsOp associatorsOp = (CIMAssociatorsOp) op;
-					requestE = associators_request(pDoc, associatorsOp.getObjectName(),
-							associatorsOp.getAssocClass(), associatorsOp.getResultClass(),
-							associatorsOp.getRole(), associatorsOp.getResultRole(), associatorsOp
-									.isIncludeQualifiers(), associatorsOp.isIncludeClassOrigin(),
-							associatorsOp.getPropertyList());
-				} else if (op instanceof CIMAssociatorNamesOp) {
-					CIMAssociatorNamesOp associatorNamesOp = (CIMAssociatorNamesOp) op;
-					requestE = associatorNames_request(pDoc, associatorNamesOp.getObjectName(),
-							associatorNamesOp.getAssocClass(), associatorNamesOp.getResultClass(),
-							associatorNamesOp.getRole(), associatorNamesOp.getResultRole());
-				} else if (op instanceof CIMCreateClassOp) {
-					CIMCreateClassOp createClassOp = (CIMCreateClassOp) op;
-					requestE = createClass_request(pDoc, createClassOp.getObjectName(),
-							createClassOp.getCimClass());
-				} else if (op instanceof CIMCreateInstanceOp) {
-					CIMCreateInstanceOp createInstanceOp = (CIMCreateInstanceOp) op;
-					requestE = createInstance_request(pDoc, createInstanceOp.getObjectName(),
-							createInstanceOp.getInstance());
-				} else if (op instanceof CIMCreateNameSpaceOp) {
-					CIMCreateNameSpaceOp createNameSpaceOp = (CIMCreateNameSpaceOp) op;
-
-					String namespace = createNameSpaceOp.getNameSpace();
-					int j = namespace.lastIndexOf('/');
-
-					if (j < 0) throw new WBEMException(WBEMException.CIM_ERR_NOT_FOUND,
-							"Invalid namespace. Must contain at least /");
-					String parentNs = namespace.substring(0, j);
-					namespace = namespace.substring(j + 1);
-
-					/*
-					 * CIMInstance inst = new CIMInstance();
-					 * inst.setClassName("CIM_NameSpace"); CIMProperty prop =
-					 * new CIMProperty("NameSpace"); prop.setValue(new
-					 * CIMValue(namespace, CIMDataType
-					 * .getPredefinedType(CIMDataType.STRING))); Vector v = new
-					 * Vector(); v.add(prop); inst.setProperties(v);
-					 */
-
-					CIMInstance inst = new CIMInstance(new CIMObjectPath(null, null, null, null,
-							"CIM_NameSpace", null), new CIMProperty[] { new CIMProperty(
-							"NameSpace", CIMDataType.STRING_T, namespace, true, false, null) });
-					CIMObjectPath object = new CIMObjectPath(null, null, null, parentNs, null, null);
-
-					requestE = createInstance_request(pDoc, object, inst);
-				} else if (op instanceof CIMCreateQualifierTypeOp) {
-					CIMCreateQualifierTypeOp createQualifierTypeOp = (CIMCreateQualifierTypeOp) op;
-					requestE = createQualifierType_request(pDoc, createQualifierTypeOp
-							.getObjectName(), createQualifierTypeOp.getQualifierType());
-				} else if (op instanceof CIMDeleteClassOp) {
-					CIMDeleteClassOp deleteClassOp = (CIMDeleteClassOp) op;
-					requestE = deleteClass_request(pDoc, deleteClassOp.getObjectName());
-				} else if (op instanceof CIMDeleteInstanceOp) {
-					CIMDeleteInstanceOp deleteInstanceOp = (CIMDeleteInstanceOp) op;
-					requestE = deleteClass_request(pDoc, deleteInstanceOp.getObjectName());
-				} else if (op instanceof CIMDeleteQualifierTypeOp) {
-					CIMDeleteQualifierTypeOp deleteQualifierTypeOp = (CIMDeleteQualifierTypeOp) op;
-					requestE = deleteClass_request(pDoc, deleteQualifierTypeOp.getObjectName());
-				} else if (op instanceof CIMEnumClassesOp) {
-					CIMEnumClassesOp enumClassesOp = (CIMEnumClassesOp) op;
-					requestE = enumerateClasses_request(pDoc, enumClassesOp.getObjectName(),
-							enumClassesOp.isDeep(), enumClassesOp.isLocalOnly(), enumClassesOp
-									.isIncludeQualifiers(), enumClassesOp.isIncludeClassOrigin());
-				} else if (op instanceof CIMEnumClassNamesOp) {
-					CIMEnumClassNamesOp enumClassNamesOp = (CIMEnumClassNamesOp) op;
-					requestE = enumerateClassNames_request(pDoc, enumClassNamesOp.getObjectName(),
-							enumClassNamesOp.isDeep());
-				} else if (op instanceof CIMEnumInstanceNamesOp) {
-					CIMEnumInstanceNamesOp enumInstanceNamesOp = (CIMEnumInstanceNamesOp) op;
-					requestE = enumerateInstanceNames_request(pDoc, enumInstanceNamesOp
-							.getObjectName());
-				} else if (op instanceof CIMEnumInstancesOp) {
-					CIMEnumInstancesOp enumInstancesOp = (CIMEnumInstancesOp) op;
-					requestE = enumerateInstances_request(pDoc, enumInstancesOp.getObjectName(),
-							enumInstancesOp.isDeep(), enumInstancesOp.isLocalOnly(),
-							enumInstancesOp.isIncludeQualifiers(), enumInstancesOp
-									.isIncludeClassOrigin(), enumInstancesOp.getPropertyList());
-				} else if (op instanceof CIMEnumNameSpaceOp) {
-					CIMEnumNameSpaceOp enumNameSpaceOp = (CIMEnumNameSpaceOp) op;
-					// ebak: here we have to set CIMObjectPath's objectname
-					// enumNameSpaceOp.getObjectName().setObjectName("CIM_NameSpace");
-					CIMObjectPath objPath = enumNameSpaceOp.getObjectName();
-					objPath = new CIMObjectPath(objPath.getScheme(), objPath.getHost(), objPath
-							.getPort(), objPath.getNamespace(), "CIM_NameSpace", objPath.getKeys());
-					requestE = enumerateInstanceNames_request(pDoc, enumNameSpaceOp.getObjectName());
-				} else if (op instanceof CIMEnumQualifierTypesOp) {
-					CIMEnumQualifierTypesOp enumQualifierTypesOp = (CIMEnumQualifierTypesOp) op;
-					requestE = enumQualifierTypes_request(pDoc, enumQualifierTypesOp
-							.getObjectName());
-				} else if (op instanceof CIMExecQueryOp) {
-					CIMExecQueryOp execQueryOp = (CIMExecQueryOp) op;
-					requestE = execQuery_request(pDoc, execQueryOp.getObjectName(), execQueryOp
-							.getQuery(), execQueryOp.getQueryLanguage());
-				} else if (op instanceof CIMGetPropertyOp) {
-					CIMGetPropertyOp getPropertyOp = (CIMGetPropertyOp) op;
-					requestE = getInstance_request(pDoc, getPropertyOp.getObjectName(), false,
-							false, false, new String[] { getPropertyOp.getPropertyName() });
-
-				} else if (op instanceof CIMGetClassOp) {
-					CIMGetClassOp getClassOp = (CIMGetClassOp) op;
-					requestE = getClass_request(pDoc, getClassOp.getObjectName(), getClassOp
-							.isLocalOnly(), getClassOp.isIncludeQualifiers(), getClassOp
-							.isIncludeClassOrigin(), getClassOp.getPropertyList());
-				} else if (op instanceof CIMGetInstanceOp) {
-					CIMGetInstanceOp getInstanceOp = (CIMGetInstanceOp) op;
-					requestE = getInstance_request(pDoc, getInstanceOp.getObjectName(),
-							getInstanceOp.isLocalOnly(), getInstanceOp.isIncludeQualifiers(),
-							getInstanceOp.isIncludeClassOrigin(), getInstanceOp.getPropertyList());
-				} else if (op instanceof CIMGetQualifierTypeOp) {
-					CIMGetQualifierTypeOp getQualifierTypeOp = (CIMGetQualifierTypeOp) op;
-					requestE = getQualifier_request(pDoc, getQualifierTypeOp.getObjectName(),
-							getQualifierTypeOp.getQualifierType());
-				} else if (op instanceof CIMInvokeMethodOp) {
-					CIMInvokeMethodOp invokeMethodOp = (CIMInvokeMethodOp) op;
-					requestE = invokeMethod_request(pDoc, invokeMethodOp.getObjectName(),
-							invokeMethodOp.getMethodCall(), invokeMethodOp.getInParams());
-				} else if (op instanceof CIMReferenceNamesOp) {
-					CIMReferenceNamesOp referenceNamesOp = (CIMReferenceNamesOp) op;
-					requestE = referenceNames_request(pDoc, referenceNamesOp.getObjectName(),
-							referenceNamesOp.getResultClass(), referenceNamesOp.getResultRole());
-				} else if (op instanceof CIMReferencesOp) {
-					CIMReferencesOp referencesOp = (CIMReferencesOp) op;
-					requestE = references_request(pDoc, referencesOp.getObjectName(), referencesOp
-							.getResultClass(), referencesOp.getRole(), referencesOp
-							.isIncludeQualifiers(), referencesOp.isIncludeClassOrigin(),
-							referencesOp.getPropertyList());
-				} else if (op instanceof CIMSetClassOp) {
-					CIMSetClassOp setClassOp = (CIMSetClassOp) op;
-					requestE = setClass_request(pDoc, setClassOp.getObjectName(), setClassOp
-							.getCimClass());
-				} else if (op instanceof CIMSetInstanceOp) {
-					CIMSetInstanceOp setInstanceOp = (CIMSetInstanceOp) op;
-					requestE = setInstance_request(pDoc, setInstanceOp.getObjectName(),
-							setInstanceOp.getInstance(), setInstanceOp.isIncludeQualifiers(),
-							setInstanceOp.getPropertyList());
-				} else if (op instanceof CIMSetPropertyOp) {
-					CIMSetPropertyOp setPropertyOp = (CIMSetPropertyOp) op;
-					requestE = setProperty_request(pDoc, setPropertyOp.getObjectName(),
-							setPropertyOp.getPropertyName(), setPropertyOp.getCimValue());
-				} else if (op instanceof CIMSetQualifierTypeOp) {
-					CIMSetQualifierTypeOp setQualifierTypeOp = (CIMSetQualifierTypeOp) op;
-					requestE = setQualifierType_request(pDoc, setQualifierTypeOp.getObjectName(),
-							setQualifierTypeOp.getQualifierType());
-				}
-				if (requestE == null) throw new WBEMException(
-						WBEMException.CIM_ERR_INVALID_PARAMETER, "Illegal batch operation number ("
-								+ i + ") " + op.getClass());
-				messageE.appendChild(requestE);
-			} catch (WBEMException e) {
-				throw e;
-			} catch (Exception e) {
-				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "At batch operation (" + i
-						+ ')', null, e);
-			}
-			i++;
-		}
-		return messageE;
-	}
-
-	/**
-	 * Sets the message id counter to a given value. For use in units tests
-	 * only.
-	 * 
-	 * @param pId
-	 *            The new value
-	 */
-	public void setId(int pId) {
-		this.iCurrentId.set(new Counter(pId - 1));
-	}
-
-	/**
-	 * Get the next message id. If this method is called for the first time by
-	 * the current thread it will choose a start value randomly. Afterwards the
-	 * id is incremented by 1. Be aware that different threads will have
-	 * distinct id counters.
-	 * 
-	 * @return The next message id
-	 */
-	private int getNextId() {
-		if (this.iCurrentId.get() == null) {
-			this.iCurrentId.set(new Counter(RANDOM.nextInt(MAX_ID)));
-		}
-		return this.iCurrentId.get().incrementAndGet();
-	}
-
-	/**
-	 * pAssociatorPaths_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pAssocClass
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pResultRole
-	 * @param pFilterQueryLanguage
-	 * @param pFilterQuery
-	 * @param pOperationTimeout
-	 * @param pContinueOnError
-	 * @param pMaxObjectCount
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element OpenAssociatorInstancePaths_request(Document pDoc, CIMObjectPath pPath,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenAssociatorInstancePaths");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				INSTANCE_NAME);
-		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
-
-		if (pAssocClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ASSOC_CLASS);
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
-		}
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_CLASS);
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ROLE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-		if (pResultRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_ROLE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
-		}
-		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
-		}
-		if (pFilterQuery != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
-		}
-		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
-
-		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * OpenAssociatorInstances_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pAssocClass
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pResultRole
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @param pFilterQueryLanguage
-	 * @param pFilterQuery
-	 * @param pOperationTimeout
-	 * @param pContinueOnError
-	 * @param pMaxObjectCount
-	 * @return Element OpenAssociatorInstances_request
-	 * @throws WBEMException
-	 */
-	public Element OpenAssociatorInstances_request(Document pDoc, CIMObjectPath pPath,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeClassOrigin, String[] pPropertyList, String pFilterQueryLanguage,
-			String pFilterQuery, UnsignedInteger32 pOperationTimeout, boolean pContinueOnError,
-			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
-		String className = pPath.getObjectName();
-
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenAssociatorInstances");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				INSTANCE_NAME);
-		// createINSTANCENAME will take care of keyBindings
-		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
-
-		if (pAssocClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ASSOC_CLASS);
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
-		}
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_CLASS);
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ROLE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-		if (pResultRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_ROLE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
-		}
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, PROPERTY_LIST);
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++)
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-		}
-		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
-		}
-		if (pFilterQuery != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
-		}
-		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
-
-		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * OpenEnumerateInstancePaths_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pFilterQueryLanguage
-	 * @param pFilterQuery
-	 * @param pOperationTimeout
-	 * @param pContinueOnError
-	 * @param pMaxObjectCount
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element OpenEnumerateInstancePaths_request(Document pDoc, CIMObjectPath pPath,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenEnumerateInstancePaths");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CLASS_NAME);
-		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
-
-		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
-		}
-		if (pFilterQuery != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
-		}
-		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
-
-		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * OpenEnumerateInstances_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pPropertyList
-	 * @param pIncludeClassOrigin
-	 * @param pDeepInheritance
-	 * @param pFilterQueryLanguage
-	 * @param pFilterQuery
-	 * @param pOperationTimeout
-	 * @param pContinueOnError
-	 * @param pMaxObjectCount
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element OpenEnumerateInstances_request(Document pDoc, CIMObjectPath pPath,
-			boolean pDeepInheritance, boolean pIncludeClassOrigin, String[] pPropertyList,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenEnumerateInstances");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CLASS_NAME);
-		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, DEEP_INHERITANCE);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pDeepInheritance);
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, PROPERTY_LIST);
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++)
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-		}
-
-		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
-		}
-		if (pFilterQuery != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
-		}
-		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
-
-		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * EnumerationCount_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pEnumerationContext
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element EnumerationCount_request(Document pDoc, CIMObjectPath pPath,
-			String pEnumerationContext) throws WBEMException {
-
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerationCount");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		if (pEnumerationContext != null) {
-			Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					ENUMERATION_CONTEXT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pEnumerationContext);
-		}
-
-		return simplereqE;
-
-	}
-
-	/**
-	 * CloseEnumeration_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pEnumerationContext
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public Element CloseEnumeration_request(Document pDoc, CIMObjectPath pPath,
-			String pEnumerationContext) throws WBEMException {
-
-		String className = pPath.getObjectName();
-
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"CloseEnumeration");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		if (pEnumerationContext != null) {
-			Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					ENUMERATION_CONTEXT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pEnumerationContext);
-		}
-		return simplereqE;
-	}
-
-	/**
-	 * referencePaths_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pFilterQueryLanguage
-	 * @param pFilterQuery
-	 * @param pOperationTimeout
-	 * @param pContinueOnError
-	 * @param pMaxObjectCount
-	 * @return Element referencePaths_request
-	 * @throws WBEMException
-	 */
-	public Element OpenReferenceInstancePaths_request(Document pDoc, CIMObjectPath pPath,
-			String pResultClass, String pRole, String pFilterQueryLanguage, String pFilterQuery,
-			UnsignedInteger32 pOperationTimeout, boolean pContinueOnError,
-			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenReferenceInstancePaths");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				INSTANCE_NAME);
-		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
-
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_CLASS);
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ROLE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
-		}
-		if (pFilterQuery != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
-		}
-		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
-
-		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
-		}
-
-		return simplereqE;
-
-	}
-
-	/**
-	 * references_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 * @param pFilterQueryLanguage
-	 * @param pFilterQuery
-	 * @param pOperationTimeout
-	 * @param pContinueOnError
-	 * @param pMaxObjectCount
-	 * @return Element references_request
-	 * @throws WBEMException
-	 */
-	public Element OpenReferenceInstances_request(Document pDoc, CIMObjectPath pPath,
-			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenReferenceInstances");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				INSTANCE_NAME);
-		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
-
-		if (pResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_CLASS);
-			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
-		}
-		if (pRole != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ROLE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
-
-		if (pPropertyList != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, PROPERTY_LIST);
-			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++)
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
-		}
-
-		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
-		}
-		if (pFilterQuery != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
-		}
-		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
-
-		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * OpenQueryInstances_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pFilterQuery
-	 * @param pFilterQueryLanguage
-	 * @param pReturnQueryResultClass
-	 * @param pOperationTimeout
-	 * @param pContinueOnError
-	 * @param pMaxObjectCount
-	 * @param pQueryResultClass
-	 * @return Element OpenQueryInstances_request
-	 * @throws WBEMException
-	 */
-	public Element OpenQueryInstances_request(Document pDoc, CIMObjectPath pPath,
-			String pFilterQuery, String pFilterQueryLanguage, boolean pReturnQueryResultClass,
-			UnsignedInteger32 pOperationTimeout, boolean pContinueOnError,
-			UnsignedInteger32 pMaxObjectCount, CIMClass pQueryResultClass) throws WBEMException {
-
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenQueryInstances");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE;
-
-		if (pFilterQuery != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
-		}
-		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
-		}
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				RETURN_QUERY_RESULT_CLASS);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pReturnQueryResultClass);
-
-		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
-		}
-
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
-		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
-
-		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
-		}
-		if (pQueryResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					QUERY_RESULT_CLASS);
-			CIMXMLBuilderImpl.createCLASS(pDoc, iparamvalueE, pQueryResultClass);
-		}
-		return simplereqE;
-	}
-
-	/**
-	 * PullInstancesWithPath_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pContext
-	 * @param pMaxObjectCount
-	 * @return Element PullInstancesWithPath_request
-	 * @throws WBEMException
-	 */
-	public Element PullInstancesWithPath_request(Document pDoc, CIMObjectPath pPath,
-			String pContext, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
-		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"PullInstancesWithPath");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE;
-
-		if (pContext != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					ENUMERATION_CONTEXT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContext);
-		}
-
-		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * PullInstancePaths_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pContext
-	 * @param pMaxObjectCount
-	 * @return Element PullInstancePaths
-	 * @throws WBEMException
-	 */
-	public Element PullInstancePaths_request(Document pDoc, CIMObjectPath pPath, String pContext,
-			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
-		String className = pPath.getObjectName();
-
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"PullInstancePaths");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE;
-
-		if (pContext != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					ENUMERATION_CONTEXT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContext);
-		}
-
-		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * PullInstances_request
-	 * 
-	 * @param pDoc
-	 * @param pPath
-	 * @param pContext
-	 * @param pMaxObjectCount
-	 * @return Element PullInstances_request
-	 * @throws WBEMException
-	 */
-	public Element PullInstances_request(Document pDoc, CIMObjectPath pPath, String pContext,
-			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-		String className = pPath.getObjectName();
-
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
-
-		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"PullInstances");
-		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
-
-		Element iparamvalueE;
-
-		if (pContext != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					ENUMERATION_CONTEXT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContext);
-		}
-
-		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
-			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
-		}
-
-		return simplereqE;
-	}
-
-	/**
-	 * sendIndication_request
-	 * 
-	 * @param pDoc
-	 * @param pIndication
-	 * @return Element sendIndication_request
-	 * @throws WBEMException
-	 */
-	public Element sendIndication_request(Document pDoc, CIMInstance pIndication)
-			throws WBEMException {
-		Element simpleexpreqE = CIMXMLBuilderImpl.createSIMPLEEXPREQ(pDoc);
-		Element expmethodcallE = CIMXMLBuilderImpl.createEXPMETHODCALL(pDoc, simpleexpreqE,
-				"ExportIndication");
-		Element expparamvalueE = CIMXMLBuilderImpl.createEXPPARAMVALUE(pDoc, expmethodcallE,
-				"NewIndication");
-
-		CIMXMLBuilderImpl.createINSTANCE(pDoc, expparamvalueE, pIndication);
-
-		return simpleexpreqE;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+ 
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+ 
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+ 
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com  
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 13521      2004-11-26  thschaef     XML Request Composition for static method call is wrong
+ * 18075      2005-08-11  pineiro5     Can not use method CIMClient.invokeMethod
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1365086 	  2006-10-25  ebak	       Possible bug in createQualifier
+ * 1565892    2006-11-16  lupusalex    Make SBLIM client JSR48 compliant
+ * 1610046    2006-12-18  lupusalex    Does not escape trailing spaces  
+ * 1610046    2007-01-10  lupusalex    Rework: Does not escape trailing spaces 
+ * 1649611    2007-01-31  lupusalex    Interop issue: Quotes not escaped by client
+ * 1671502    2007-02-28  lupusalex    Remove dependency from Xerces
+ * 1660756    2007-03-02  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1669961    2006-04-16  lupusalex    CIMTypedElement.getType() =>getDataType()
+ * 1715027    2007-05-08  lupusalex    Make message id random
+ * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
+ * 1734888    2007-06-11  ebak         Wrong reference building in METHODCALL request
+ * 1827728    2007-11-12  ebak         embeddedInstances: attribute EmbeddedObject not set
+ * 1827728    2007-11-20  ebak         rework: embeddedInstances: attribute EmbeddedObject not set
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
+ * 2865222    2009-09-29  raman_arora  enumerateQualifierTypes shouldn't require a class name
+ * 2858933    2009-10-12  raman_arora  JSR48 new APIs: associatorClasses & associatorInstances
+ * 2886829    2009-11-18  raman_arora  JSR48 new APIs: referenceClasses & referenceInstances
+ * 2944219    2010-02-05  blaschke-oss Problem with pull operations using client against EMC CIMOM
+ * 3027479    2010-07-09  blaschke-oss Dead store to local variable
+ * 3062747    2010-09-21  blaschke-oss SblimCIMClient does not log all CIM-XML responces.
+ * 3514537    2012-04-03  blaschke-oss TCK: execQueryInstances requires boolean, not Boolean
+ * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3527580    2012-05-17  blaschke-oss WBEMClient should not throw IllegalArgumentException
+ * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
+ *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
+ *    2689    2013-10-10  blaschke-oss createMETHODCALL should not add PARAMTYPE attribute
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+import java.util.Random;
+import java.util.Vector;
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMQualifierType;
+import org.metricshub.wbem.javax.cim.CIMValuedElement;
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.TimeStamp;
+import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMAssociatorNamesOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMAssociatorsOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMCreateClassOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMCreateInstanceOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMCreateNameSpaceOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMCreateQualifierTypeOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMDeleteClassOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMDeleteInstanceOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMDeleteQualifierTypeOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumClassNamesOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumClassesOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumInstanceNamesOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumInstancesOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumNameSpaceOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMEnumQualifierTypesOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMExecQueryOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMGetClassOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMGetInstanceOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMGetPropertyOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMGetQualifierTypeOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMInvokeMethodOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMOperation;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMReferenceNamesOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMReferencesOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMSetClassOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMSetInstanceOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMSetPropertyOp;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMSetQualifierTypeOp;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.metricshub.wbem.javax.cim.UnsignedInteger32;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * Class CIMClientXML_HelperImpl is responsible for building CIM-XML requests
+ * and responses.
+ */
+public class CIMClientXML_HelperImpl {
+
+	private static class Counter {
+
+		private int iCounter;
+
+		protected Counter(int pCounter) {
+			this.iCounter = pCounter;
+		}
+
+		protected int incrementAndGet() {
+			return ++this.iCounter;
+		}
+	}
+
+	private static final String VERSION = "1.0";
+
+	private static final String ASSOCIATOR_NAMES = "AssociatorNames";
+
+	// Pull Enumeration variables
+	private static final String ASSOC_CLASS = "AssocClass";
+
+	private static final String CLASS_NAME = "ClassName";
+
+	private static final String CONTINUE_ON_ERROR = "ContinueOnError";
+
+	private static final String DEEP_INHERITANCE = "DeepInheritance";
+
+	private static final String ENUMERATION_CONTEXT = "EnumerationContext";
+
+	private static final String FILTER_QUERY_LANGUAGE = "FilterQueryLanguage";
+
+	private static final String FILTER_QUERY = "FilterQuery";
+
+	private static final String INCLUDE_CLASS_ORIGIN = "IncludeClassOrigin";
+
+	private static final String INSTANCE_NAME = "InstanceName";
+
+	private static final String MAX_OBJECT_COUNT = "MaxObjectCount";
+
+	private static final String PROPERTY_LIST = "PropertyList";
+
+	private static final String OPERATION_TIMEOUT = "OperationTimeout";
+
+	private static final String RESULT_CLASS = "ResultClass";
+
+	private static final String RETURN_QUERY_RESULT_CLASS = "ReturnQueryResultClass";
+
+	private static final String QUERY_RESULT_CLASS = "QueryResultClass";
+
+	private static final String ROLE = "Role";
+
+	private static final String RESULT_ROLE = "ResultRole";
+
+	private static final Random RANDOM = new Random();
+
+	private static final int MAX_ID = 1 << 20;
+
+	private final ThreadLocal iCurrentId = new ThreadLocal();
+
+	private final DocumentBuilder iBuilder;
+
+	private static String valueStr(CIMValuedElement pE) {
+		Object o = pE.getValue();
+		return o == null ? MOF.NULL : o.toString();
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @throws ParserConfigurationException
+	 */
+	public CIMClientXML_HelperImpl() throws ParserConfigurationException {
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		this.iBuilder = factory.newDocumentBuilder();
+	}
+
+	/**
+	 * getDocumentBuilder
+	 * 
+	 * @return DocumentBuilder
+	 */
+	public DocumentBuilder getDocumentBuilder() {
+		return this.iBuilder;
+	}
+
+	/**
+	 * newDocument
+	 * 
+	 * @return Document
+	 */
+	public Document newDocument() {
+		return this.iBuilder.newDocument();
+	}
+
+	/**
+	 * parse
+	 * 
+	 * @param pIS
+	 * @return Document
+	 * @throws IOException
+	 * @throws SAXException
+	 */
+	public Document parse(InputSource pIS) throws IOException, SAXException {
+		if (pIS == null) throw new IllegalArgumentException("null input stream argument");
+		return this.iBuilder.parse(pIS);
+	}
+
+	/**
+	 * Serializes a given DOM document as (CIM-)XML to a given output stream
+	 * 
+	 * @param pOS
+	 *            The output stream
+	 * @param pDoc
+	 *            The documents
+	 * @throws IOException
+	 *             Whenever something goes wrong
+	 */
+	public static void serialize(OutputStream pOS, Document pDoc) throws IOException {
+		CimXmlSerializer.serialize(pOS, pDoc, false);
+	}
+
+	/**
+	 * Serializes a given DOM document as (CIM-)XML to a given output stream.
+	 * The document is pretty wrapped and indented and surrounded with markers
+	 * for the begin and end.
+	 * 
+	 * @param pOS
+	 *            The output stream
+	 * @param pDoc
+	 *            The documents
+	 * @throws IOException
+	 */
+	public static void dumpDocument(OutputStream pOS, Document pDoc) throws IOException {
+		dumpDocument(pOS, pDoc, null);
+	}
+
+	/**
+	 * Serializes a given DOM document as (CIM-)XML to a given output stream.
+	 * The document is pretty wrapped and indented and surrounded with markers
+	 * for the begin and end.
+	 * 
+	 * @param pOS
+	 *            The output stream
+	 * @param pDoc
+	 *            The documents
+	 * @param pOrigin
+	 *            The origin of the output stream (request, indication response,
+	 *            etc.)
+	 * @throws IOException
+	 */
+	public static void dumpDocument(OutputStream pOS, Document pDoc, String pOrigin)
+			throws IOException {
+		// debug
+		if (pOS == null) { return; }
+		if (pOrigin == null) pOrigin = "unknown";
+		pOS.write("<--- ".getBytes());
+		pOS.write(pOrigin.getBytes());
+		pOS.write(" begin ".getBytes());
+		pOS.write(TimeStamp.formatWithMillis(System.currentTimeMillis()).getBytes());
+		pOS.write(" -----\n".getBytes());
+		CimXmlSerializer.serialize(pOS, pDoc, true);
+		pOS.write("\n---- ".getBytes());
+		pOS.write(pOrigin.getBytes());
+		pOS.write(" end ------>\n".getBytes());
+	}
+
+	/**
+	 * createCIMMessage
+	 * 
+	 * @param pDoc
+	 * @param pRequestE
+	 * @return Element
+	 */
+	public Element createCIMMessage(Document pDoc, Element pRequestE) {
+		Element cimE = CIMXMLBuilderImpl.createCIM(pDoc);
+		Element messageE = CIMXMLBuilderImpl.createMESSAGE(pDoc, cimE, String.valueOf(getNextId()),
+				VERSION);
+		if (pRequestE != null) {
+			messageE.appendChild(pRequestE);
+		}
+		return messageE;
+	}
+
+	/**
+	 * createMultiReq
+	 * 
+	 * @param pDoc
+	 * @return Element
+	 */
+	public Element createMultiReq(Document pDoc) {
+		Element multireqE = CIMXMLBuilderImpl.createMULTIREQ(pDoc);
+		return multireqE;
+	}
+
+	/**
+	 * associatorNames_request
+	 * 
+	 * @param pDoc
+	 * @param pObjectName
+	 * @param pAssocClass
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pResultRole
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element associatorNames_request(Document pDoc, CIMObjectPath pObjectName,
+			String pAssocClass, String pResultClass, String pRole, String pResultRole)
+			throws WBEMException {
+
+		// obtain data
+		String className = pObjectName.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+		CIMProperty[] keysA = pObjectName.getKeys();
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				ASSOCIATOR_NAMES);
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
+
+		Element iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		Element instancenameE = CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
+		for (int i = 0; i < keysA.length; i++) {
+			CIMProperty prop = keysA[i];
+			String propName = prop.getName();
+			// TODO: check that CIMDataType.toString() satisfies this
+			String propTypeStr = prop.getDataType().toString();
+			String propValueStr = valueStr(prop);
+			Element keybindingE = CIMXMLBuilderImpl.createKEYBINDING(pDoc, instancenameE, propName);
+			CIMXMLBuilderImpl.createKEYVALUE(pDoc, keybindingE, propTypeStr, propValueStr);
+		}
+		if (pAssocClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "AssocClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
+		}
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+		if (pResultRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultRole");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * associatorNames_response
+	 * 
+	 * @param pDoc
+	 * @param pPathA
+	 * @return Element
+	 */
+	public static Element associatorNames_response(Document pDoc, CIMObjectPath[] pPathA) {
+		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
+		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
+				"associatorNames");
+		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
+		try {
+			for (int i = 0; i < pPathA.length; i++) {
+				CIMXMLBuilderImpl.createOBJECTPATH(pDoc, iRetValE, pPathA[i]);
+			}
+		} catch (WBEMException e) {
+			throw new RuntimeException(e);
+		}
+		return simpRspE;
+	}
+
+	/**
+	 * associatorInstances_request
+	 * 
+	 * @param pDoc
+	 * @param pObjectName
+	 * @param pAssocClass
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pResultRole
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element associatorInstances_request(Document pDoc, CIMObjectPath pObjectName,
+			String pAssocClass, String pResultClass, String pRole, String pResultRole,
+			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
+
+		String className = pObjectName.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+		CIMProperty[] keysA = pObjectName.getKeys();
+
+		// Make sure keys are populated
+		if (keysA.length == 0) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"associatorInstances requires keys for the instance to be populated");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "Associators");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
+		Element iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		Element instancenameE = CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
+		for (int i = 0; i < keysA.length; i++) {
+			CIMProperty prop = keysA[i];
+			String propName = prop.getName();
+			String propTypeStr = prop.getDataType().toString();
+			String propValueStr = valueStr(prop);
+
+			Element keybindingE = CIMXMLBuilderImpl.createKEYBINDING(pDoc, instancenameE, propName);
+			CIMXMLBuilderImpl.createKEYVALUE(pDoc, keybindingE, propTypeStr, propValueStr);
+		}
+		if (pAssocClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "AssocClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
+		}
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+		if (pResultRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultRole");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++) {
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			}
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * associatorClasses_request
+	 * 
+	 * @param pDoc
+	 * @param pObjectName
+	 * @param pAssocClass
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pResultRole
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element associatorClasses_request(Document pDoc, CIMObjectPath pObjectName,
+			String pAssocClass, String pResultClass, String pRole, String pResultRole,
+			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
+			throws WBEMException {
+
+		String className = pObjectName.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		// Make sure keys are not populated
+		if (pObjectName.getKeys().length != 0) throw new WBEMException(
+				WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"Keys should not be populated for associatorClasses");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "Associators");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
+		Element iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+
+		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
+
+		if (pAssocClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "AssocClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
+		}
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+		if (pResultRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultRole");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
+		}
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++) {
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			}
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * associators_request
+	 * 
+	 * @param pDoc
+	 * @param pObjectName
+	 * @param pAssocClass
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pResultRole
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element associators_request(Document pDoc, CIMObjectPath pObjectName,
+			String pAssocClass, String pResultClass, String pRole, String pResultRole,
+			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
+			throws WBEMException {
+
+		// obtain data
+		String className = pObjectName.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+		CIMProperty[] keysA = pObjectName.getKeys();
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "Associators");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
+		Element iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		Element instancenameE = CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
+		for (int i = 0; i < keysA.length; i++) {
+			CIMProperty prop = keysA[i];
+			String propName = prop.getName();
+			// TODO: check that CIMDataType.toString() satisfies this
+			String propTypeStr = prop.getDataType().toString();
+			// CIMXMLBuilderImpl.getTypeStr(pValue.getType());
+			String propValueStr = valueStr(prop);
+
+			Element keybindingE = CIMXMLBuilderImpl.createKEYBINDING(pDoc, instancenameE, propName);
+			CIMXMLBuilderImpl.createKEYVALUE(pDoc, keybindingE, propTypeStr, propValueStr);
+		}
+		if (pAssocClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "AssocClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
+		}
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+		if (pResultRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultRole");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
+		}
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList"); // BB
+			// fixed
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++) {
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			}
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * associators_response
+	 * 
+	 * @param pDoc
+	 * @param pNamedElementA
+	 * @return Element
+	 */
+	public static Element associators_response(Document pDoc,
+			CIMNamedElementInterface[] pNamedElementA) {
+		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
+		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE, "associators");
+		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
+		try {
+			for (int i = 0; i < pNamedElementA.length; i++) {
+				CIMNamedElementInterface namedElement = pNamedElementA[i];
+				CIMObjectPath op = namedElement.getObjectPath();
+				String nameSpace = op == null ? null : op.getNamespace();
+				CIMXMLBuilderImpl
+						.createVALUEOBJECTWITHPATH(pDoc, iRetValE, namedElement, nameSpace);
+				/*
+				 * CIMXMLBuilderImpl.createCLASSPATH( pDoc, iRetValE,
+				 * pClassA[i].getObjectPath() );
+				 * CIMXMLBuilderImpl.createCLASS(pDoc, iRetValE, pClassA[i]);
+				 */
+
+			}
+		} catch (WBEMException e) {
+			throw new RuntimeException(e);
+		}
+		return simpRspE;
+	}
+
+	/**
+	 * enumerateInstanceNames_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element enumerateInstanceNames_request(Document pDoc, CIMObjectPath pPath)
+			throws WBEMException {
+		// obtain data
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"EnumerateInstanceNames");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
+		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
+
+		return simplereqE;
+	}
+
+	/**
+	 * enumerateInstances_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pDeepInheritance
+	 * @param pLocalOnly
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element enumerateInstances_request(Document pDoc, CIMObjectPath pPath,
+			boolean pDeepInheritance, boolean pLocalOnly, boolean pIncludeQualifiers,
+			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
+
+		// obtain data
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"EnumerateInstances");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
+		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "LocalOnly");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pLocalOnly);
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "DeepInheritance");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pDeepInheritance);
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++) {
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			}
+		}
+		return simplereqE;
+	}
+
+	/**
+	 * getInstance_request
+	 * 
+	 * @param pDoc
+	 * @param pName
+	 * @param pLocalOnly
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element getInstance_request(Document pDoc, CIMObjectPath pName, boolean pLocalOnly,
+			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
+			throws WBEMException {
+		// obtain data
+		String className = pName.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "GetInstance");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"InstanceName");
+		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pName);
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "LocalOnly");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pLocalOnly);
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++) {
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			}
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * deleteInstance_request
+	 * 
+	 * @param pDoc
+	 * @param pName
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element deleteInstance_request(Document pDoc, CIMObjectPath pName) throws WBEMException {
+
+		// obtain data
+		String className = pName.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"DeleteInstance");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"InstanceName");
+		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pName);
+
+		return simplereqE;
+	}
+
+	/**
+	 * getClass_request
+	 * 
+	 * @param pDoc
+	 * @param pName
+	 * @param pLocalOnly
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element getClass_request(Document pDoc, CIMObjectPath pName, boolean pLocalOnly,
+			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
+			throws WBEMException {
+
+		// obtain data
+		String className = pName.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "GetClass");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
+		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "LocalOnly");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pLocalOnly);
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++) {
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			}
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * createInstance_request
+	 * 
+	 * @param pDoc
+	 * @param pName
+	 * @param pInstance
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element createInstance_request(Document pDoc, CIMObjectPath pName, CIMInstance pInstance)
+			throws WBEMException {
+
+		String className = pInstance.getObjectPath().getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"CreateInstance");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"NewInstance");
+
+		CIMXMLBuilderImpl.createINSTANCE(pDoc, iparamvalueE, pInstance);
+
+		return simplereqE;
+	}
+
+	/**
+	 * invokeMethod_request
+	 * 
+	 * @param pDoc
+	 * @param pLocalPath
+	 * @param pMethodName
+	 * @param pInArgs
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element invokeMethod_request(Document pDoc, CIMObjectPath pLocalPath,
+			String pMethodName, CIMArgument[] pInArgs) throws WBEMException {
+
+		// obtain data
+		String className = pLocalPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+		CIMProperty[] keysA = pLocalPath.getKeys();
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element methodcallE = CIMXMLBuilderImpl.createMETHODCALL(pDoc, simplereqE, pMethodName);
+
+		// 13521
+		if (keysA.length > 0) {
+			Element localpathE = CIMXMLBuilderImpl.createLOCALINSTANCEPATH(pDoc, methodcallE);
+			CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, localpathE, pLocalPath); // 13521
+			CIMXMLBuilderImpl.createINSTANCENAME(pDoc, localpathE, pLocalPath); // 13521
+		} else {
+			CIMXMLBuilderImpl.createLOCALCLASSPATH(pDoc, methodcallE, pLocalPath);
+		}
+
+		buildParamValues(pDoc, methodcallE, pLocalPath, pInArgs);
+
+		return simplereqE;
+	}
+
+	/**
+	 * invokeMethod_response
+	 * 
+	 * @param pDoc
+	 * @param pMethodName
+	 * @param pLocalPath
+	 * @param pRetVal
+	 * @param pOutArgA
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element invokeMethod_response(Document pDoc, String pMethodName,
+			CIMObjectPath pLocalPath, Object pRetVal, CIMArgument[] pOutArgA)
+			throws WBEMException {
+		if (pMethodName == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null method name");
+		Element simpleRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
+		Element methodRspE = CIMXMLBuilderImpl.createMETHODRESPONSE(pDoc, simpleRspE, pMethodName);
+
+		CIMXMLBuilderImpl.createRETURNVALUE(pDoc, methodRspE, pRetVal);
+
+		buildParamValues(pDoc, methodRspE, pLocalPath, pOutArgA);
+		return simpleRspE;
+	}
+
+	/**
+	 * @param pLocalPath
+	 */
+	private static void buildParamValues(Document pDoc, Element pParentE, CIMObjectPath pLocalPath,
+			CIMArgument[] pArgA) throws WBEMException {
+		if (pArgA == null) return;
+		for (int i = 0; i < pArgA.length; i++) {
+			CIMArgument arg = pArgA[i];
+			if (arg == null) continue;
+			CIMXMLBuilderImpl.createPARAMVALUE(pDoc, pParentE, arg);
+		}
+	}
+
+	// public CIMResponse createIndication_request(Document doc) throws
+	// CIMXMLParseException, CIMException {
+	// Element rootE = doc.getDocumentElement();
+	// CIMResponse response = (CIMResponse)xmlParser.parseCIM(rootE);
+	// response.checkError();
+	// return response;
+	// // Vector v = (Vector)response.getFirstReturnValue();
+	// //
+	// // //TODO: Should we return the whole list of instances or just the first
+	// instance?
+	// // //TODO: return the whole vector of indications
+	// // if (v.size() > 0)
+	// // return (CIMInstance)v.elementAt(0);
+	// // else
+	// // return null;
+	// }
+
+	/**
+	 * createIndication_response
+	 * 
+	 * @param error
+	 * @return Document
+	 */
+	public Document createIndication_response(CIMError error) {
+
+		// CIMXMLBuilderImpl.create XML
+		Document doc = this.iBuilder.newDocument();
+		Element cimE = CIMXMLBuilderImpl.createCIM(doc);
+		Element messageE = CIMXMLBuilderImpl.createMESSAGE(doc, cimE, String.valueOf(getNextId()),
+				"1.0");
+		Element simpleexprspE = CIMXMLBuilderImpl.createSIMPLEEXPRSP(doc, messageE);
+		Element expmethodresponseE = CIMXMLBuilderImpl.createEXPMETHODRESPONSE(doc, simpleexprspE,
+				"ExportIndication");
+		if (error == null) {
+			CIMXMLBuilderImpl.createIRETURNVALUE(doc, expmethodresponseE);
+		} else {
+			CIMXMLBuilderImpl.createERROR(doc, expmethodresponseE, error);
+		}
+		// Element
+		return doc;
+	}
+
+	/**
+	 * createClass_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pClass
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element createClass_request(Document pDoc, CIMObjectPath pPath, CIMClass pClass)
+			throws WBEMException {
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "CreateClass");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "NewClass");
+
+		CIMXMLBuilderImpl.createCLASS(pDoc, iparamvalueE, pClass);
+
+		return simplereqE;
+	}
+
+	/**
+	 * getQualifier_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pQt
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element getQualifier_request(Document pDoc, CIMObjectPath pPath, String pQt)
+			throws WBEMException {
+		// obtain data
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl
+				.createIMETHODCALL(pDoc, simplereqE, "GetQualifier");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"QualifierName");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pPath.getObjectName());
+
+		return simplereqE;
+	}
+
+	/**
+	 * createQualifierType_request : This has been replaced by
+	 * setQualifierType_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pQt
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element createQualifierType_request(Document pDoc, CIMObjectPath pPath,
+			CIMQualifierType pQt) throws WBEMException {
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl
+				.createIMETHODCALL(pDoc, simplereqE, "SetQualifier");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"QualifierDeclaration");
+		CIMXMLBuilderImpl.createQUALIFIER_DECLARATION(pDoc, iparamvalueE, pQt);
+
+		return simplereqE;
+	}
+
+	/**
+	 * deleteClass_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element deleteClass_request(Document pDoc, CIMObjectPath pPath) throws WBEMException {
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "DeleteClass");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
+
+		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
+
+		return simplereqE;
+	}
+
+	/**
+	 * deleteQualifierType_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element deleteQualifierType_request(Document pDoc, CIMObjectPath pPath)
+			throws WBEMException {
+		// obtain data
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"DeleteQualifier");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"QualifierName");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pPath.getObjectName());
+		return simplereqE;
+	}
+
+	/**
+	 * enumerateClasses_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pDeepInheritance
+	 * @param pLocalOnly
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @return Element
+	 */
+	public Element enumerateClasses_request(Document pDoc, CIMObjectPath pPath,
+			boolean pDeepInheritance, boolean pLocalOnly, boolean pIncludeQualifiers,
+			boolean pIncludeClassOrigin) {
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"EnumerateClasses");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE;
+		if (pPath != null && pPath.getObjectName() != null
+				&& pPath.getObjectName().trim().length() != 0) {
+			String className = pPath.getObjectName();
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
+		}
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "LocalOnly");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pLocalOnly);
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "DeepInheritance");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pDeepInheritance);
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+		return simplereqE;
+	}
+
+	/**
+	 * enumerateClasses_response
+	 * 
+	 * @param pDoc
+	 * @param pClA
+	 * @return Element
+	 */
+	public static Element enumerateClasses_response(Document pDoc, CIMClass[] pClA) {
+		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
+		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
+				"enumerateClasses");
+		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
+		try {
+			for (int i = 0; i < pClA.length; i++) {
+				CIMXMLBuilderImpl.createCLASS(pDoc, iRetValE, pClA[i]);
+			}
+		} catch (WBEMException e) {
+			throw new RuntimeException(e);
+		}
+		return simpRspE;
+	}
+
+	/**
+	 * enumerateInstances_response
+	 * 
+	 * @param pDoc
+	 * @param pInstA
+	 * @return Element
+	 */
+	public static Element enumerateInstances_response(Document pDoc, CIMInstance[] pInstA) {
+		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
+		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
+				"enumerateInstances");
+		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
+		try {
+			for (int i = 0; i < pInstA.length; i++) {
+				CIMXMLBuilderImpl.createINSTANCE(pDoc, iRetValE, pInstA[i]);
+			}
+		} catch (WBEMException e) {
+			throw new RuntimeException(e);
+		}
+		return simpRspE;
+	}
+
+	/**
+	 * enumerateClassNames_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pDeepInheritance
+	 * @return Element
+	 */
+	public Element enumerateClassNames_request(Document pDoc, CIMObjectPath pPath,
+			boolean pDeepInheritance) {
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"EnumerateClassNames");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE;
+
+		if (pPath != null && pPath.getObjectName() != null
+				&& pPath.getObjectName().trim().length() != 0) {
+			String className = pPath.getObjectName();
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "DeepInheritance");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pDeepInheritance);
+
+		return simplereqE;
+	}
+
+	/**
+	 * getProperty_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pPropertyName
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element getProperty_request(Document pDoc, CIMObjectPath pPath, String pPropertyName)
+			throws WBEMException {
+		// obtain data
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "GetProperty");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"InstanceName");
+		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
+
+		if (pPropertyName != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyName");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pPropertyName);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * referenceNames_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pResultClass
+	 * @param pRole
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element referenceNames_request(Document pDoc, CIMObjectPath pPath, String pResultClass,
+			String pRole) throws WBEMException {
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"ReferenceNames");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
+
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * referenceClasses_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element referenceClasses_request(Document pDoc, CIMObjectPath pPath,
+			String pResultClass, String pRole, boolean pIncludeQualifiers,
+			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
+
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		// Make sure keys are not populated
+		if (pPath.getKeys().length != 0) throw new WBEMException(
+				WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"Keys should not be populated for referenceClasses");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "References");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		// createOBJECTNAME will internally call createINSTANCENAME but as there
+		// are no keys Element containing keys will not be populated
+		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
+
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++) {
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			}
+		}
+		return simplereqE;
+	}
+
+	/**
+	 * referenceInstances_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element referenceInstances_request(Document pDoc, CIMObjectPath pPath,
+			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList)
+			throws WBEMException {
+
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		// keys are required for CIMInstance
+		if (pPath.getKeys().length == 0) throw new WBEMException(
+				WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"refrenceInstances requires keys for the instance to be populated");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "References");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		// createOBJECTNAME will internally call createINSTANCENAME to populate
+		// Element containing keys
+		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
+
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++) {
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			}
+		}
+		return simplereqE;
+	}
+
+	/**
+	 * references_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element references_request(Document pDoc, CIMObjectPath pPath, String pResultClass,
+			String pRole, boolean pIncludeQualifiers, boolean pIncludeClassOrigin,
+			String[] pPropertyList) throws WBEMException {
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "References");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE;
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
+
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ResultClass");
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Role");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++) {
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			}
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * setClass_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pClass
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element setClass_request(Document pDoc, CIMObjectPath pPath, CIMClass pClass)
+			throws WBEMException {
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "ModifyClass");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"ModifiedClass");
+		CIMXMLBuilderImpl.createCLASS(pDoc, iparamvalueE, pClass);
+
+		return simplereqE;
+	}
+
+	/**
+	 * setInstance_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pInstance
+	 * @param pIncludeQualifiers
+	 * @param pPropertyList
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element setInstance_request(Document pDoc, CIMObjectPath pPath, CIMInstance pInstance,
+			boolean pIncludeQualifiers, String[] pPropertyList) throws WBEMException {
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"ModifyInstance");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"ModifiedInstance");
+		CIMXMLBuilderImpl.createVALUENAMEDINSTANCE(pDoc, iparamvalueE, pPath, pInstance);
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyList");
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++) {
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			}
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * setProperty_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pPropertyName
+	 * @param pNewValue
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element setProperty_request(Document pDoc, CIMObjectPath pPath, String pPropertyName,
+			Object pNewValue) throws WBEMException {
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "SetProperty");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"InstanceName");
+		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
+
+		if (pPropertyName != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "PropertyName");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pPropertyName);
+		}
+
+		if (pNewValue != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "NewValue");
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pNewValue);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * setQualifierType_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pQt
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element setQualifierType_request(Document pDoc, CIMObjectPath pPath,
+			CIMQualifierType pQt) throws WBEMException {
+		// Make sure class name exists, it is required to uniquely identify
+		// qualifier in namespace
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl
+				.createIMETHODCALL(pDoc, simplereqE, "SetQualifier");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"QualifierDeclaration");
+		CIMXMLBuilderImpl.createQUALIFIER_DECLARATION(pDoc, iparamvalueE, pQt);
+
+		return simplereqE;
+	}
+
+	/**
+	 * enumQualifierTypes_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element enumQualifierTypes_request(Document pDoc, CIMObjectPath pPath)
+			throws WBEMException {
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"EnumerateQualifiers");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		return simplereqE;
+	}
+
+	/**
+	 * enumQualifierTypes_response
+	 * 
+	 * @param pDoc
+	 * @param pQualiTypeA
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element enumQualifierTypes_response(Document pDoc,
+			CIMQualifierType[] pQualiTypeA) throws WBEMException {
+		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
+		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
+				"associatorNames");
+		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
+		for (int i = 0; i < pQualiTypeA.length; i++) {
+			CIMXMLBuilderImpl.createQUALIFIER_DECLARATION(pDoc, iRetValE, pQualiTypeA[i]);
+		}
+		return simpRspE;
+	}
+
+	/**
+	 * execQuery_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pQuery
+	 * @param pQueryLanguage
+	 * @return Element
+	 */
+	public Element execQuery_request(Document pDoc, CIMObjectPath pPath, String pQuery,
+			String pQueryLanguage) {
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "ExecQuery");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element querylanguageE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				"QueryLanguage");
+		CIMXMLBuilderImpl.createVALUE(pDoc, querylanguageE, pQueryLanguage);
+
+		Element queryE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Query");
+		CIMXMLBuilderImpl.createVALUE(pDoc, queryE, pQuery);
+
+		return simplereqE;
+	}
+
+	/**
+	 * performBatchOperation_request
+	 * 
+	 * @param pDoc
+	 * @param pOperations
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element performBatchOperation_request(Document pDoc, Vector pOperations)
+			throws WBEMException {
+
+		Element messageE = createCIMMessage(pDoc, null);
+		if (pOperations.size() > 1) {
+			Element multireqE = createMultiReq(pDoc);
+			messageE.appendChild(multireqE);
+			messageE = multireqE;
+		}
+		int i = 0;
+		Iterator iter = pOperations.iterator();
+		while (iter.hasNext()) {
+			CIMOperation op = iter.next();
+			try {
+				Element requestE = null;
+
+				if (op instanceof CIMAssociatorsOp) {
+					CIMAssociatorsOp associatorsOp = (CIMAssociatorsOp) op;
+					requestE = associators_request(pDoc, associatorsOp.getObjectName(),
+							associatorsOp.getAssocClass(), associatorsOp.getResultClass(),
+							associatorsOp.getRole(), associatorsOp.getResultRole(), associatorsOp
+									.isIncludeQualifiers(), associatorsOp.isIncludeClassOrigin(),
+							associatorsOp.getPropertyList());
+				} else if (op instanceof CIMAssociatorNamesOp) {
+					CIMAssociatorNamesOp associatorNamesOp = (CIMAssociatorNamesOp) op;
+					requestE = associatorNames_request(pDoc, associatorNamesOp.getObjectName(),
+							associatorNamesOp.getAssocClass(), associatorNamesOp.getResultClass(),
+							associatorNamesOp.getRole(), associatorNamesOp.getResultRole());
+				} else if (op instanceof CIMCreateClassOp) {
+					CIMCreateClassOp createClassOp = (CIMCreateClassOp) op;
+					requestE = createClass_request(pDoc, createClassOp.getObjectName(),
+							createClassOp.getCimClass());
+				} else if (op instanceof CIMCreateInstanceOp) {
+					CIMCreateInstanceOp createInstanceOp = (CIMCreateInstanceOp) op;
+					requestE = createInstance_request(pDoc, createInstanceOp.getObjectName(),
+							createInstanceOp.getInstance());
+				} else if (op instanceof CIMCreateNameSpaceOp) {
+					CIMCreateNameSpaceOp createNameSpaceOp = (CIMCreateNameSpaceOp) op;
+
+					String namespace = createNameSpaceOp.getNameSpace();
+					int j = namespace.lastIndexOf('/');
+
+					if (j < 0) throw new WBEMException(WBEMException.CIM_ERR_NOT_FOUND,
+							"Invalid namespace. Must contain at least /");
+					String parentNs = namespace.substring(0, j);
+					namespace = namespace.substring(j + 1);
+
+					/*
+					 * CIMInstance inst = new CIMInstance();
+					 * inst.setClassName("CIM_NameSpace"); CIMProperty prop =
+					 * new CIMProperty("NameSpace"); prop.setValue(new
+					 * CIMValue(namespace, CIMDataType
+					 * .getPredefinedType(CIMDataType.STRING))); Vector v = new
+					 * Vector(); v.add(prop); inst.setProperties(v);
+					 */
+
+					CIMInstance inst = new CIMInstance(new CIMObjectPath(null, null, null, null,
+							"CIM_NameSpace", null), new CIMProperty[] { new CIMProperty(
+							"NameSpace", CIMDataType.STRING_T, namespace, true, false, null) });
+					CIMObjectPath object = new CIMObjectPath(null, null, null, parentNs, null, null);
+
+					requestE = createInstance_request(pDoc, object, inst);
+				} else if (op instanceof CIMCreateQualifierTypeOp) {
+					CIMCreateQualifierTypeOp createQualifierTypeOp = (CIMCreateQualifierTypeOp) op;
+					requestE = createQualifierType_request(pDoc, createQualifierTypeOp
+							.getObjectName(), createQualifierTypeOp.getQualifierType());
+				} else if (op instanceof CIMDeleteClassOp) {
+					CIMDeleteClassOp deleteClassOp = (CIMDeleteClassOp) op;
+					requestE = deleteClass_request(pDoc, deleteClassOp.getObjectName());
+				} else if (op instanceof CIMDeleteInstanceOp) {
+					CIMDeleteInstanceOp deleteInstanceOp = (CIMDeleteInstanceOp) op;
+					requestE = deleteClass_request(pDoc, deleteInstanceOp.getObjectName());
+				} else if (op instanceof CIMDeleteQualifierTypeOp) {
+					CIMDeleteQualifierTypeOp deleteQualifierTypeOp = (CIMDeleteQualifierTypeOp) op;
+					requestE = deleteClass_request(pDoc, deleteQualifierTypeOp.getObjectName());
+				} else if (op instanceof CIMEnumClassesOp) {
+					CIMEnumClassesOp enumClassesOp = (CIMEnumClassesOp) op;
+					requestE = enumerateClasses_request(pDoc, enumClassesOp.getObjectName(),
+							enumClassesOp.isDeep(), enumClassesOp.isLocalOnly(), enumClassesOp
+									.isIncludeQualifiers(), enumClassesOp.isIncludeClassOrigin());
+				} else if (op instanceof CIMEnumClassNamesOp) {
+					CIMEnumClassNamesOp enumClassNamesOp = (CIMEnumClassNamesOp) op;
+					requestE = enumerateClassNames_request(pDoc, enumClassNamesOp.getObjectName(),
+							enumClassNamesOp.isDeep());
+				} else if (op instanceof CIMEnumInstanceNamesOp) {
+					CIMEnumInstanceNamesOp enumInstanceNamesOp = (CIMEnumInstanceNamesOp) op;
+					requestE = enumerateInstanceNames_request(pDoc, enumInstanceNamesOp
+							.getObjectName());
+				} else if (op instanceof CIMEnumInstancesOp) {
+					CIMEnumInstancesOp enumInstancesOp = (CIMEnumInstancesOp) op;
+					requestE = enumerateInstances_request(pDoc, enumInstancesOp.getObjectName(),
+							enumInstancesOp.isDeep(), enumInstancesOp.isLocalOnly(),
+							enumInstancesOp.isIncludeQualifiers(), enumInstancesOp
+									.isIncludeClassOrigin(), enumInstancesOp.getPropertyList());
+				} else if (op instanceof CIMEnumNameSpaceOp) {
+					CIMEnumNameSpaceOp enumNameSpaceOp = (CIMEnumNameSpaceOp) op;
+					// ebak: here we have to set CIMObjectPath's objectname
+					// enumNameSpaceOp.getObjectName().setObjectName("CIM_NameSpace");
+					CIMObjectPath objPath = enumNameSpaceOp.getObjectName();
+					objPath = new CIMObjectPath(objPath.getScheme(), objPath.getHost(), objPath
+							.getPort(), objPath.getNamespace(), "CIM_NameSpace", objPath.getKeys());
+					requestE = enumerateInstanceNames_request(pDoc, enumNameSpaceOp.getObjectName());
+				} else if (op instanceof CIMEnumQualifierTypesOp) {
+					CIMEnumQualifierTypesOp enumQualifierTypesOp = (CIMEnumQualifierTypesOp) op;
+					requestE = enumQualifierTypes_request(pDoc, enumQualifierTypesOp
+							.getObjectName());
+				} else if (op instanceof CIMExecQueryOp) {
+					CIMExecQueryOp execQueryOp = (CIMExecQueryOp) op;
+					requestE = execQuery_request(pDoc, execQueryOp.getObjectName(), execQueryOp
+							.getQuery(), execQueryOp.getQueryLanguage());
+				} else if (op instanceof CIMGetPropertyOp) {
+					CIMGetPropertyOp getPropertyOp = (CIMGetPropertyOp) op;
+					requestE = getInstance_request(pDoc, getPropertyOp.getObjectName(), false,
+							false, false, new String[] { getPropertyOp.getPropertyName() });
+
+				} else if (op instanceof CIMGetClassOp) {
+					CIMGetClassOp getClassOp = (CIMGetClassOp) op;
+					requestE = getClass_request(pDoc, getClassOp.getObjectName(), getClassOp
+							.isLocalOnly(), getClassOp.isIncludeQualifiers(), getClassOp
+							.isIncludeClassOrigin(), getClassOp.getPropertyList());
+				} else if (op instanceof CIMGetInstanceOp) {
+					CIMGetInstanceOp getInstanceOp = (CIMGetInstanceOp) op;
+					requestE = getInstance_request(pDoc, getInstanceOp.getObjectName(),
+							getInstanceOp.isLocalOnly(), getInstanceOp.isIncludeQualifiers(),
+							getInstanceOp.isIncludeClassOrigin(), getInstanceOp.getPropertyList());
+				} else if (op instanceof CIMGetQualifierTypeOp) {
+					CIMGetQualifierTypeOp getQualifierTypeOp = (CIMGetQualifierTypeOp) op;
+					requestE = getQualifier_request(pDoc, getQualifierTypeOp.getObjectName(),
+							getQualifierTypeOp.getQualifierType());
+				} else if (op instanceof CIMInvokeMethodOp) {
+					CIMInvokeMethodOp invokeMethodOp = (CIMInvokeMethodOp) op;
+					requestE = invokeMethod_request(pDoc, invokeMethodOp.getObjectName(),
+							invokeMethodOp.getMethodCall(), invokeMethodOp.getInParams());
+				} else if (op instanceof CIMReferenceNamesOp) {
+					CIMReferenceNamesOp referenceNamesOp = (CIMReferenceNamesOp) op;
+					requestE = referenceNames_request(pDoc, referenceNamesOp.getObjectName(),
+							referenceNamesOp.getResultClass(), referenceNamesOp.getResultRole());
+				} else if (op instanceof CIMReferencesOp) {
+					CIMReferencesOp referencesOp = (CIMReferencesOp) op;
+					requestE = references_request(pDoc, referencesOp.getObjectName(), referencesOp
+							.getResultClass(), referencesOp.getRole(), referencesOp
+							.isIncludeQualifiers(), referencesOp.isIncludeClassOrigin(),
+							referencesOp.getPropertyList());
+				} else if (op instanceof CIMSetClassOp) {
+					CIMSetClassOp setClassOp = (CIMSetClassOp) op;
+					requestE = setClass_request(pDoc, setClassOp.getObjectName(), setClassOp
+							.getCimClass());
+				} else if (op instanceof CIMSetInstanceOp) {
+					CIMSetInstanceOp setInstanceOp = (CIMSetInstanceOp) op;
+					requestE = setInstance_request(pDoc, setInstanceOp.getObjectName(),
+							setInstanceOp.getInstance(), setInstanceOp.isIncludeQualifiers(),
+							setInstanceOp.getPropertyList());
+				} else if (op instanceof CIMSetPropertyOp) {
+					CIMSetPropertyOp setPropertyOp = (CIMSetPropertyOp) op;
+					requestE = setProperty_request(pDoc, setPropertyOp.getObjectName(),
+							setPropertyOp.getPropertyName(), setPropertyOp.getCimValue());
+				} else if (op instanceof CIMSetQualifierTypeOp) {
+					CIMSetQualifierTypeOp setQualifierTypeOp = (CIMSetQualifierTypeOp) op;
+					requestE = setQualifierType_request(pDoc, setQualifierTypeOp.getObjectName(),
+							setQualifierTypeOp.getQualifierType());
+				}
+				if (requestE == null) throw new WBEMException(
+						WBEMException.CIM_ERR_INVALID_PARAMETER, "Illegal batch operation number ("
+								+ i + ") " + op.getClass());
+				messageE.appendChild(requestE);
+			} catch (WBEMException e) {
+				throw e;
+			} catch (Exception e) {
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "At batch operation (" + i
+						+ ')', null, e);
+			}
+			i++;
+		}
+		return messageE;
+	}
+
+	/**
+	 * Sets the message id counter to a given value. For use in units tests
+	 * only.
+	 * 
+	 * @param pId
+	 *            The new value
+	 */
+	public void setId(int pId) {
+		this.iCurrentId.set(new Counter(pId - 1));
+	}
+
+	/**
+	 * Get the next message id. If this method is called for the first time by
+	 * the current thread it will choose a start value randomly. Afterwards the
+	 * id is incremented by 1. Be aware that different threads will have
+	 * distinct id counters.
+	 * 
+	 * @return The next message id
+	 */
+	private int getNextId() {
+		if (this.iCurrentId.get() == null) {
+			this.iCurrentId.set(new Counter(RANDOM.nextInt(MAX_ID)));
+		}
+		return this.iCurrentId.get().incrementAndGet();
+	}
+
+	/**
+	 * pAssociatorPaths_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pAssocClass
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pResultRole
+	 * @param pFilterQueryLanguage
+	 * @param pFilterQuery
+	 * @param pOperationTimeout
+	 * @param pContinueOnError
+	 * @param pMaxObjectCount
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element OpenAssociatorInstancePaths_request(Document pDoc, CIMObjectPath pPath,
+			String pAssocClass, String pResultClass, String pRole, String pResultRole,
+			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
+			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
+
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"OpenAssociatorInstancePaths");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				INSTANCE_NAME);
+		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
+
+		if (pAssocClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ASSOC_CLASS);
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
+		}
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_CLASS);
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ROLE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+		if (pResultRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_ROLE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
+		}
+		if (pFilterQueryLanguage != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					FILTER_QUERY_LANGUAGE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
+		}
+		if (pFilterQuery != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
+		}
+		if (pOperationTimeout != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					OPERATION_TIMEOUT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
+
+		if (pMaxObjectCount != null) {
+			iparamvalueE = CIMXMLBuilderImpl
+					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * OpenAssociatorInstances_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pAssocClass
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pResultRole
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @param pFilterQueryLanguage
+	 * @param pFilterQuery
+	 * @param pOperationTimeout
+	 * @param pContinueOnError
+	 * @param pMaxObjectCount
+	 * @return Element OpenAssociatorInstances_request
+	 * @throws WBEMException
+	 */
+	public Element OpenAssociatorInstances_request(Document pDoc, CIMObjectPath pPath,
+			String pAssocClass, String pResultClass, String pRole, String pResultRole,
+			boolean pIncludeClassOrigin, String[] pPropertyList, String pFilterQueryLanguage,
+			String pFilterQuery, UnsignedInteger32 pOperationTimeout, boolean pContinueOnError,
+			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
+
+		String className = pPath.getObjectName();
+
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"OpenAssociatorInstances");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				INSTANCE_NAME);
+		// createINSTANCENAME will take care of keyBindings
+		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
+
+		if (pAssocClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ASSOC_CLASS);
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pAssocClass);
+		}
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_CLASS);
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ROLE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+		if (pResultRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_ROLE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
+		}
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, PROPERTY_LIST);
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++)
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+		}
+		if (pFilterQueryLanguage != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					FILTER_QUERY_LANGUAGE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
+		}
+		if (pFilterQuery != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
+		}
+		if (pOperationTimeout != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					OPERATION_TIMEOUT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
+
+		if (pMaxObjectCount != null) {
+			iparamvalueE = CIMXMLBuilderImpl
+					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * OpenEnumerateInstancePaths_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pFilterQueryLanguage
+	 * @param pFilterQuery
+	 * @param pOperationTimeout
+	 * @param pContinueOnError
+	 * @param pMaxObjectCount
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element OpenEnumerateInstancePaths_request(Document pDoc, CIMObjectPath pPath,
+			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
+			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
+
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"OpenEnumerateInstancePaths");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CLASS_NAME);
+		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
+
+		if (pFilterQueryLanguage != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					FILTER_QUERY_LANGUAGE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
+		}
+		if (pFilterQuery != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
+		}
+		if (pOperationTimeout != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					OPERATION_TIMEOUT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
+
+		if (pMaxObjectCount != null) {
+			iparamvalueE = CIMXMLBuilderImpl
+					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * OpenEnumerateInstances_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pPropertyList
+	 * @param pIncludeClassOrigin
+	 * @param pDeepInheritance
+	 * @param pFilterQueryLanguage
+	 * @param pFilterQuery
+	 * @param pOperationTimeout
+	 * @param pContinueOnError
+	 * @param pMaxObjectCount
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element OpenEnumerateInstances_request(Document pDoc, CIMObjectPath pPath,
+			boolean pDeepInheritance, boolean pIncludeClassOrigin, String[] pPropertyList,
+			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
+			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
+
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"OpenEnumerateInstances");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CLASS_NAME);
+		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, DEEP_INHERITANCE);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pDeepInheritance);
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, PROPERTY_LIST);
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++)
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+		}
+
+		if (pFilterQueryLanguage != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					FILTER_QUERY_LANGUAGE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
+		}
+		if (pFilterQuery != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
+		}
+		if (pOperationTimeout != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					OPERATION_TIMEOUT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
+
+		if (pMaxObjectCount != null) {
+			iparamvalueE = CIMXMLBuilderImpl
+					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * EnumerationCount_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pEnumerationContext
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element EnumerationCount_request(Document pDoc, CIMObjectPath pPath,
+			String pEnumerationContext) throws WBEMException {
+
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"EnumerationCount");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		if (pEnumerationContext != null) {
+			Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					ENUMERATION_CONTEXT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pEnumerationContext);
+		}
+
+		return simplereqE;
+
+	}
+
+	/**
+	 * CloseEnumeration_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pEnumerationContext
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public Element CloseEnumeration_request(Document pDoc, CIMObjectPath pPath,
+			String pEnumerationContext) throws WBEMException {
+
+		String className = pPath.getObjectName();
+
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"CloseEnumeration");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		if (pEnumerationContext != null) {
+			Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					ENUMERATION_CONTEXT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pEnumerationContext);
+		}
+		return simplereqE;
+	}
+
+	/**
+	 * referencePaths_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pFilterQueryLanguage
+	 * @param pFilterQuery
+	 * @param pOperationTimeout
+	 * @param pContinueOnError
+	 * @param pMaxObjectCount
+	 * @return Element referencePaths_request
+	 * @throws WBEMException
+	 */
+	public Element OpenReferenceInstancePaths_request(Document pDoc, CIMObjectPath pPath,
+			String pResultClass, String pRole, String pFilterQueryLanguage, String pFilterQuery,
+			UnsignedInteger32 pOperationTimeout, boolean pContinueOnError,
+			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
+
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"OpenReferenceInstancePaths");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				INSTANCE_NAME);
+		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
+
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_CLASS);
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ROLE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+		if (pFilterQueryLanguage != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					FILTER_QUERY_LANGUAGE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
+		}
+		if (pFilterQuery != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
+		}
+		if (pOperationTimeout != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					OPERATION_TIMEOUT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
+
+		if (pMaxObjectCount != null) {
+			iparamvalueE = CIMXMLBuilderImpl
+					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
+		}
+
+		return simplereqE;
+
+	}
+
+	/**
+	 * references_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 * @param pFilterQueryLanguage
+	 * @param pFilterQuery
+	 * @param pOperationTimeout
+	 * @param pContinueOnError
+	 * @param pMaxObjectCount
+	 * @return Element references_request
+	 * @throws WBEMException
+	 */
+	public Element OpenReferenceInstances_request(Document pDoc, CIMObjectPath pPath,
+			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList,
+			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
+			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
+
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"OpenReferenceInstances");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				INSTANCE_NAME);
+		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
+
+		if (pResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_CLASS);
+			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, pResultClass);
+		}
+		if (pRole != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ROLE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl
+				.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
+
+		if (pPropertyList != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, PROPERTY_LIST);
+			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
+			for (int i = 0; i < pPropertyList.length; i++)
+				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+		}
+
+		if (pFilterQueryLanguage != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					FILTER_QUERY_LANGUAGE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
+		}
+		if (pFilterQuery != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
+		}
+		if (pOperationTimeout != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					OPERATION_TIMEOUT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
+
+		if (pMaxObjectCount != null) {
+			iparamvalueE = CIMXMLBuilderImpl
+					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * OpenQueryInstances_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pFilterQuery
+	 * @param pFilterQueryLanguage
+	 * @param pReturnQueryResultClass
+	 * @param pOperationTimeout
+	 * @param pContinueOnError
+	 * @param pMaxObjectCount
+	 * @param pQueryResultClass
+	 * @return Element OpenQueryInstances_request
+	 * @throws WBEMException
+	 */
+	public Element OpenQueryInstances_request(Document pDoc, CIMObjectPath pPath,
+			String pFilterQuery, String pFilterQueryLanguage, boolean pReturnQueryResultClass,
+			UnsignedInteger32 pOperationTimeout, boolean pContinueOnError,
+			UnsignedInteger32 pMaxObjectCount, CIMClass pQueryResultClass) throws WBEMException {
+
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"OpenQueryInstances");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE;
+
+		if (pFilterQuery != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
+		}
+		if (pFilterQueryLanguage != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					FILTER_QUERY_LANGUAGE);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
+		}
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+				RETURN_QUERY_RESULT_CLASS);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pReturnQueryResultClass);
+
+		if (pOperationTimeout != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					OPERATION_TIMEOUT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
+		}
+
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CONTINUE_ON_ERROR);
+		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
+
+		if (pMaxObjectCount != null) {
+			iparamvalueE = CIMXMLBuilderImpl
+					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
+		}
+		if (pQueryResultClass != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					QUERY_RESULT_CLASS);
+			CIMXMLBuilderImpl.createCLASS(pDoc, iparamvalueE, pQueryResultClass);
+		}
+		return simplereqE;
+	}
+
+	/**
+	 * PullInstancesWithPath_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pContext
+	 * @param pMaxObjectCount
+	 * @return Element PullInstancesWithPath_request
+	 * @throws WBEMException
+	 */
+	public Element PullInstancesWithPath_request(Document pDoc, CIMObjectPath pPath,
+			String pContext, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
+
+		String className = pPath.getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"PullInstancesWithPath");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE;
+
+		if (pContext != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					ENUMERATION_CONTEXT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContext);
+		}
+
+		if (pMaxObjectCount != null) {
+			iparamvalueE = CIMXMLBuilderImpl
+					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * PullInstancePaths_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pContext
+	 * @param pMaxObjectCount
+	 * @return Element PullInstancePaths
+	 * @throws WBEMException
+	 */
+	public Element PullInstancePaths_request(Document pDoc, CIMObjectPath pPath, String pContext,
+			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
+
+		String className = pPath.getObjectName();
+
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"PullInstancePaths");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE;
+
+		if (pContext != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					ENUMERATION_CONTEXT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContext);
+		}
+
+		if (pMaxObjectCount != null) {
+			iparamvalueE = CIMXMLBuilderImpl
+					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * PullInstances_request
+	 * 
+	 * @param pDoc
+	 * @param pPath
+	 * @param pContext
+	 * @param pMaxObjectCount
+	 * @return Element PullInstances_request
+	 * @throws WBEMException
+	 */
+	public Element PullInstances_request(Document pDoc, CIMObjectPath pPath, String pContext,
+			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
+		String className = pPath.getObjectName();
+
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"null class name");
+
+		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
+				"PullInstances");
+		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
+
+		Element iparamvalueE;
+
+		if (pContext != null) {
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
+					ENUMERATION_CONTEXT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContext);
+		}
+
+		if (pMaxObjectCount != null) {
+			iparamvalueE = CIMXMLBuilderImpl
+					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
+		}
+
+		return simplereqE;
+	}
+
+	/**
+	 * sendIndication_request
+	 * 
+	 * @param pDoc
+	 * @param pIndication
+	 * @return Element sendIndication_request
+	 * @throws WBEMException
+	 */
+	public Element sendIndication_request(Document pDoc, CIMInstance pIndication)
+			throws WBEMException {
+		Element simpleexpreqE = CIMXMLBuilderImpl.createSIMPLEEXPREQ(pDoc);
+		Element expmethodcallE = CIMXMLBuilderImpl.createEXPMETHODCALL(pDoc, simpleexpreqE,
+				"ExportIndication");
+		Element expparamvalueE = CIMXMLBuilderImpl.createEXPPARAMVALUE(pDoc, expmethodcallE,
+				"NewIndication");
+
+		CIMXMLBuilderImpl.createINSTANCE(pDoc, expparamvalueE, pIndication);
+
+		return simpleexpreqE;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java
index b290726..b064249 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java
@@ -1,199 +1,197 @@
-/*
-  CIMMessage.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Hashtable;
-
-import org.w3c.dom.Document;
-
-/**
- * Class CIMMessage is used by the CIM-XML DOM parser.
- */
-public class CIMMessage {
-
-	protected Document iDoc;
-
-	protected Hashtable iElements;
-
-	protected String iCimVersion;
-
-	protected String iDtdVersion;
-
-	protected String iId;
-
-	protected String iProtocolVersion;
-
-	protected String iMethod;
-
-	protected boolean iIsCIMExport = false;
-
-	protected boolean iIsSimple = false;
-
-	protected boolean iIsRequest = false;
-
-	protected CIMMessage() { /**/}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pCimVersion
-	 * @param pDtdVersion
-	 * @param pId
-	 * @param pMethod
-	 */
-	public CIMMessage(String pCimVersion, String pDtdVersion, String pId, String pMethod) {
-		this.iCimVersion = pCimVersion;
-		this.iDtdVersion = pDtdVersion;
-		this.iId = pId;
-		this.iMethod = pMethod;
-	}
-
-	/**
-	 * getCIMVersion
-	 * 
-	 * @return String
-	 */
-	public String getCIMVersion() {
-		return this.iCimVersion;
-	}
-
-	/**
-	 * getDTDVersion
-	 * 
-	 * @return String
-	 */
-	public String getDTDVersion() {
-		return this.iDtdVersion;
-	}
-
-	/**
-	 * isCIMOperation
-	 * 
-	 * @return String
-	 */
-	public boolean isCIMOperation() {
-		return !this.iIsCIMExport;
-	}
-
-	/**
-	 * isCIMExport
-	 * 
-	 * @return String
-	 */
-	public boolean isCIMExport() {
-		return this.iIsCIMExport;
-	}
-
-	/**
-	 * setId
-	 * 
-	 * @param pId
-	 */
-	public void setId(String pId) {
-		this.iId = pId;
-	}
-
-	/**
-	 * setMethod
-	 * 
-	 * @param pMethod
-	 */
-	public void setMethod(String pMethod) {
-
-		this.iMethod = pMethod;
-		this.iIsCIMExport = (pMethod.toUpperCase().endsWith("EXPREQ") || pMethod.toUpperCase()
-				.endsWith("EXPRSP"));
-		this.iIsRequest = (pMethod.toUpperCase().endsWith("REQ"));
-		this.iIsSimple = pMethod.toUpperCase().startsWith("SIMPLE");
-	}
-
-	/**
-	 * setCIMVersion
-	 * 
-	 * @param pCimVersion
-	 */
-	public void setCIMVersion(String pCimVersion) {
-		this.iCimVersion = pCimVersion;
-	}
-
-	/**
-	 * setDTDVersion
-	 * 
-	 * @param pDtdVersion
-	 */
-	public void setDTDVersion(String pDtdVersion) {
-		this.iDtdVersion = pDtdVersion;
-	}
-
-	/**
-	 * setIsRequest
-	 * 
-	 * @param pValue
-	 */
-	public void setIsRequest(boolean pValue) {
-		this.iIsRequest = pValue;
-	}
-
-	/**
-	 * getId
-	 * 
-	 * @return String
-	 */
-	public String getId() {
-		return this.iId;
-	}
-
-	/**
-	 * getProtocolVersion
-	 * 
-	 * @return String
-	 */
-	public String getProtocolVersion() {
-		return this.iProtocolVersion;
-	}
-}
+/*
+  CIMMessage.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Hashtable;
+
+import org.w3c.dom.Document;
+
+/**
+ * Class CIMMessage is used by the CIM-XML DOM parser.
+ */
+public class CIMMessage {
+
+	protected Document iDoc;
+
+	protected Hashtable iElements;
+
+	protected String iCimVersion;
+
+	protected String iDtdVersion;
+
+	protected String iId;
+
+	protected String iProtocolVersion;
+
+	protected String iMethod;
+
+	protected boolean iIsCIMExport = false;
+
+	protected boolean iIsSimple = false;
+
+	protected boolean iIsRequest = false;
+
+	protected CIMMessage() { /**/}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pCimVersion
+	 * @param pDtdVersion
+	 * @param pId
+	 * @param pMethod
+	 */
+	public CIMMessage(String pCimVersion, String pDtdVersion, String pId, String pMethod) {
+		this.iCimVersion = pCimVersion;
+		this.iDtdVersion = pDtdVersion;
+		this.iId = pId;
+		this.iMethod = pMethod;
+	}
+
+	/**
+	 * getCIMVersion
+	 * 
+	 * @return String
+	 */
+	public String getCIMVersion() {
+		return this.iCimVersion;
+	}
+
+	/**
+	 * getDTDVersion
+	 * 
+	 * @return String
+	 */
+	public String getDTDVersion() {
+		return this.iDtdVersion;
+	}
+
+	/**
+	 * isCIMOperation
+	 * 
+	 * @return String
+	 */
+	public boolean isCIMOperation() {
+		return !this.iIsCIMExport;
+	}
+
+	/**
+	 * isCIMExport
+	 * 
+	 * @return String
+	 */
+	public boolean isCIMExport() {
+		return this.iIsCIMExport;
+	}
+
+	/**
+	 * setId
+	 * 
+	 * @param pId
+	 */
+	public void setId(String pId) {
+		this.iId = pId;
+	}
+
+	/**
+	 * setMethod
+	 * 
+	 * @param pMethod
+	 */
+	public void setMethod(String pMethod) {
+
+		this.iMethod = pMethod;
+		this.iIsCIMExport = (pMethod.toUpperCase().endsWith("EXPREQ") || pMethod.toUpperCase()
+				.endsWith("EXPRSP"));
+		this.iIsRequest = (pMethod.toUpperCase().endsWith("REQ"));
+		this.iIsSimple = pMethod.toUpperCase().startsWith("SIMPLE");
+	}
+
+	/**
+	 * setCIMVersion
+	 * 
+	 * @param pCimVersion
+	 */
+	public void setCIMVersion(String pCimVersion) {
+		this.iCimVersion = pCimVersion;
+	}
+
+	/**
+	 * setDTDVersion
+	 * 
+	 * @param pDtdVersion
+	 */
+	public void setDTDVersion(String pDtdVersion) {
+		this.iDtdVersion = pDtdVersion;
+	}
+
+	/**
+	 * setIsRequest
+	 * 
+	 * @param pValue
+	 */
+	public void setIsRequest(boolean pValue) {
+		this.iIsRequest = pValue;
+	}
+
+	/**
+	 * getId
+	 * 
+	 * @return String
+	 */
+	public String getId() {
+		return this.iId;
+	}
+
+	/**
+	 * getProtocolVersion
+	 * 
+	 * @return String
+	 */
+	public String getProtocolVersion() {
+		return this.iProtocolVersion;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java
similarity index 75%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java
index d7af6b1..a87d204 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java
@@ -1,168 +1,166 @@
-/*
-  CIMRequest.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Vector;
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * Class CIMRequest is used by the CIM-XML DOM parser.
- * 
- */
-public class CIMRequest extends CIMMessage {
-
-	protected Vector iRequests = new Vector(0);
-
-	protected Vector iParamValue = new Vector(0);
-
-	protected String iMethodName;
-
-	protected CIMObjectPath iPath;
-
-	protected String iNamespace;
-
-	/**
-	 * Ctor.
-	 */
-	public CIMRequest() { /**/}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pCimVersion
-	 * @param pDtdVersion
-	 * @param pId
-	 * @param pMethod
-	 */
-	public CIMRequest(String pCimVersion, String pDtdVersion, String pId, String pMethod) {
-		super(pCimVersion, pDtdVersion, pId, pMethod);
-	}
-
-	/**
-	 * addParamValue
-	 * 
-	 * @param v
-	 */
-	public void addParamValue(Object v) {
-		if (v instanceof Vector) this.iParamValue.addAll((Vector) v);
-		else this.iParamValue.add(v);
-	}
-
-	/**
-	 * addRequest
-	 * 
-	 * @param request
-	 */
-	public void addRequest(CIMRequest request) {
-		this.iRequests.add(request);
-	}
-
-	/**
-	 * getMethodName
-	 * 
-	 * @return String
-	 */
-	public String getMethodName() {
-		return this.iMethodName;
-	}
-
-	/**
-	 * getNameSpace
-	 * 
-	 * @return String
-	 */
-	public String getNameSpace() {
-		return this.iNamespace;
-	}
-
-	/**
-	 * getObjectPath
-	 * 
-	 * @return String
-	 */
-	public CIMObjectPath getObjectPath() {
-		return this.iPath;
-	}
-
-	/**
-	 * getParamValue
-	 * 
-	 * @return String
-	 */
-	public Vector getParamValue() {
-		return this.iParamValue;
-	}
-
-	/**
-	 * setMethodName
-	 * 
-	 * @param methodName
-	 */
-	public void setMethodName(String methodName) {
-		this.iMethodName = methodName;
-	}
-
-	/**
-	 * setNameSpace
-	 * 
-	 * @param namespace
-	 */
-	public void setNameSpace(String namespace) {
-		this.iNamespace = namespace;
-	}
-
-	/**
-	 * setObjectPath
-	 * 
-	 * @param path
-	 */
-	public void setObjectPath(CIMObjectPath path) {
-		this.iPath = path;
-	}
-}
+/*
+  CIMRequest.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Vector;
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * Class CIMRequest is used by the CIM-XML DOM parser.
+ * 
+ */
+public class CIMRequest extends CIMMessage {
+
+	protected Vector iRequests = new Vector(0);
+
+	protected Vector iParamValue = new Vector(0);
+
+	protected String iMethodName;
+
+	protected CIMObjectPath iPath;
+
+	protected String iNamespace;
+
+	/**
+	 * Ctor.
+	 */
+	public CIMRequest() { /**/}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pCimVersion
+	 * @param pDtdVersion
+	 * @param pId
+	 * @param pMethod
+	 */
+	public CIMRequest(String pCimVersion, String pDtdVersion, String pId, String pMethod) {
+		super(pCimVersion, pDtdVersion, pId, pMethod);
+	}
+
+	/**
+	 * addParamValue
+	 * 
+	 * @param v
+	 */
+	public void addParamValue(Object v) {
+		if (v instanceof Vector) this.iParamValue.addAll((Vector) v);
+		else this.iParamValue.add(v);
+	}
+
+	/**
+	 * addRequest
+	 * 
+	 * @param request
+	 */
+	public void addRequest(CIMRequest request) {
+		this.iRequests.add(request);
+	}
+
+	/**
+	 * getMethodName
+	 * 
+	 * @return String
+	 */
+	public String getMethodName() {
+		return this.iMethodName;
+	}
+
+	/**
+	 * getNameSpace
+	 * 
+	 * @return String
+	 */
+	public String getNameSpace() {
+		return this.iNamespace;
+	}
+
+	/**
+	 * getObjectPath
+	 * 
+	 * @return String
+	 */
+	public CIMObjectPath getObjectPath() {
+		return this.iPath;
+	}
+
+	/**
+	 * getParamValue
+	 * 
+	 * @return String
+	 */
+	public Vector getParamValue() {
+		return this.iParamValue;
+	}
+
+	/**
+	 * setMethodName
+	 * 
+	 * @param methodName
+	 */
+	public void setMethodName(String methodName) {
+		this.iMethodName = methodName;
+	}
+
+	/**
+	 * setNameSpace
+	 * 
+	 * @param namespace
+	 */
+	public void setNameSpace(String namespace) {
+		this.iNamespace = namespace;
+	}
+
+	/**
+	 * setObjectPath
+	 * 
+	 * @param path
+	 */
+	public void setObjectPath(CIMObjectPath path) {
+		this.iPath = path;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java
index 154a94b..22cab16 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java
@@ -1,229 +1,227 @@
-/*
-  CIMResponse.java
-
-  (C) Copyright IBM Corp. 2005, 2012
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 3525135    2012-05-09  blaschke-oss Remove CIMResponse.isSuccessul
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.List;
-import java.util.Vector;
-
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-
-/**
- * Represent a CIMReponse message.
- */
-public class CIMResponse extends CIMMessage {
-
-	protected Vector iResponses = new Vector(0);
-
-	protected WBEMException iError = null;
-
-	protected Vector iReturnValue = new Vector();
-
-	protected Vector iParamValue = new Vector(0);
-
-	/**
-	 * Constructs a CIMResponse object.
-	 * 
-	 */
-	public CIMResponse() { /**/}
-
-	/**
-	 * Constructs a CIMResponse object with the specified CIMVersion, DTDVersion
-	 * and method.
-	 * 
-	 * @param pCimVersion
-	 * @param pDtdVersion
-	 * @param pId
-	 * @param pMethod
-	 */
-	public CIMResponse(String pCimVersion, String pDtdVersion, String pId, String pMethod) {
-		super(pCimVersion, pDtdVersion, pId, pMethod);
-	}
-
-	/**
-	 * Constructs a CIM Response message from a given CIM Request.
-	 * 
-	 * @param request
-	 */
-	public CIMResponse(CIMRequest request) {
-		super();
-		this.iCimVersion = request.getCIMVersion();
-		this.iDtdVersion = request.getDTDVersion();
-	}
-
-	/**
-	 * addParamValue
-	 * 
-	 * @param o
-	 */
-	public void addParamValue(Object o) {
-		this.iParamValue.add(o);
-	}
-
-	/**
-	 * addParamValue
-	 * 
-	 * @param v
-	 */
-	public void addParamValue(Vector v) {
-		this.iParamValue.addAll(v);
-	}
-
-	/**
-	 * addResponse
-	 * 
-	 * @param response
-	 */
-	public void addResponse(CIMResponse response) {
-		this.iResponses.add(response);
-	}
-
-	/**
-	 * addReturnValue
-	 * 
-	 * @param o
-	 */
-	public void addReturnValue(Object o) {
-		this.iReturnValue.add(o);
-	}
-
-	/**
-	 * Verify the status code for this CIMResponse.
-	 * 
-	 * @throws WBEMException
-	 *             if the status code is other than success.
-	 */
-	public void checkError() throws WBEMException {
-		if (this.iError != null) throw this.iError;
-	}
-
-	/**
-	 * getAllResponses
-	 * 
-	 * @return List
-	 */
-	public List getAllResponses() {
-		return this.iResponses;
-	}
-
-	/**
-	 * getException
-	 * 
-	 * @return WBEMException
-	 */
-	public WBEMException getException() {
-		return this.iError;
-	}
-
-	/**
-	 * isSuccessful
-	 * 
-	 * @return boolean
-	 */
-	public boolean isSuccessful() {
-		return this.iError == null;
-	}
-
-	/**
-	 * getFirstResponse
-	 * 
-	 * @return CIMResponse
-	 */
-	public CIMResponse getFirstResponse() {
-		if (this.iResponses != null && this.iResponses.size() > 0) return this.iResponses
-				.elementAt(0);
-		return null;
-	}
-
-	/**
-	 * getParamValues
-	 * 
-	 * @return List
-	 */
-	public List getParamValues() {
-		return this.iParamValue;
-	}
-
-	/**
-	 * getFirstReturnValue
-	 * 
-	 * @return List
-	 */
-	public List getFirstReturnValue() {
-		return this.iReturnValue;
-	}
-
-	/**
-	 * setError
-	 * 
-	 * @param error
-	 */
-	public void setError(WBEMException error) {
-		this.iError = error;
-	}
-
-	/**
-	 * setParamValue
-	 * 
-	 * @param paramValue
-	 */
-	public void setParamValue(Vector paramValue) {
-		this.iParamValue = paramValue;
-	}
-
-	/**
-	 * setReturnValue
-	 * 
-	 * @param returnValue
-	 */
-	public void setReturnValue(Vector returnValue) {
-		this.iReturnValue = returnValue;
-	}
-
-}
+/*
+  CIMResponse.java
+
+  (C) Copyright IBM Corp. 2005, 2012
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 3525135    2012-05-09  blaschke-oss Remove CIMResponse.isSuccessul
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.List;
+import java.util.Vector;
+
+import org.metricshub.wbem.javax.wbem.WBEMException;
+
+/**
+ * Represent a CIMReponse message.
+ */
+public class CIMResponse extends CIMMessage {
+
+	protected Vector iResponses = new Vector(0);
+
+	protected WBEMException iError = null;
+
+	protected Vector iReturnValue = new Vector();
+
+	protected Vector iParamValue = new Vector(0);
+
+	/**
+	 * Constructs a CIMResponse object.
+	 * 
+	 */
+	public CIMResponse() { /**/}
+
+	/**
+	 * Constructs a CIMResponse object with the specified CIMVersion, DTDVersion
+	 * and method.
+	 * 
+	 * @param pCimVersion
+	 * @param pDtdVersion
+	 * @param pId
+	 * @param pMethod
+	 */
+	public CIMResponse(String pCimVersion, String pDtdVersion, String pId, String pMethod) {
+		super(pCimVersion, pDtdVersion, pId, pMethod);
+	}
+
+	/**
+	 * Constructs a CIM Response message from a given CIM Request.
+	 * 
+	 * @param request
+	 */
+	public CIMResponse(CIMRequest request) {
+		super();
+		this.iCimVersion = request.getCIMVersion();
+		this.iDtdVersion = request.getDTDVersion();
+	}
+
+	/**
+	 * addParamValue
+	 * 
+	 * @param o
+	 */
+	public void addParamValue(Object o) {
+		this.iParamValue.add(o);
+	}
+
+	/**
+	 * addParamValue
+	 * 
+	 * @param v
+	 */
+	public void addParamValue(Vector v) {
+		this.iParamValue.addAll(v);
+	}
+
+	/**
+	 * addResponse
+	 * 
+	 * @param response
+	 */
+	public void addResponse(CIMResponse response) {
+		this.iResponses.add(response);
+	}
+
+	/**
+	 * addReturnValue
+	 * 
+	 * @param o
+	 */
+	public void addReturnValue(Object o) {
+		this.iReturnValue.add(o);
+	}
+
+	/**
+	 * Verify the status code for this CIMResponse.
+	 * 
+	 * @throws WBEMException
+	 *             if the status code is other than success.
+	 */
+	public void checkError() throws WBEMException {
+		if (this.iError != null) throw this.iError;
+	}
+
+	/**
+	 * getAllResponses
+	 * 
+	 * @return List
+	 */
+	public List getAllResponses() {
+		return this.iResponses;
+	}
+
+	/**
+	 * getException
+	 * 
+	 * @return WBEMException
+	 */
+	public WBEMException getException() {
+		return this.iError;
+	}
+
+	/**
+	 * isSuccessful
+	 * 
+	 * @return boolean
+	 */
+	public boolean isSuccessful() {
+		return this.iError == null;
+	}
+
+	/**
+	 * getFirstResponse
+	 * 
+	 * @return CIMResponse
+	 */
+	public CIMResponse getFirstResponse() {
+		if (this.iResponses != null && this.iResponses.size() > 0) return this.iResponses
+				.elementAt(0);
+		return null;
+	}
+
+	/**
+	 * getParamValues
+	 * 
+	 * @return List
+	 */
+	public List getParamValues() {
+		return this.iParamValue;
+	}
+
+	/**
+	 * getFirstReturnValue
+	 * 
+	 * @return List
+	 */
+	public List getFirstReturnValue() {
+		return this.iReturnValue;
+	}
+
+	/**
+	 * setError
+	 * 
+	 * @param error
+	 */
+	public void setError(WBEMException error) {
+		this.iError = error;
+	}
+
+	/**
+	 * setParamValue
+	 * 
+	 * @param paramValue
+	 */
+	public void setParamValue(Vector paramValue) {
+		this.iParamValue = paramValue;
+	}
+
+	/**
+	 * setReturnValue
+	 * 
+	 * @param returnValue
+	 */
+	public void setReturnValue(Vector returnValue) {
+		this.iReturnValue = returnValue;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java
similarity index 93%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java
index f96fc44..89e1dc7 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java
@@ -1,2300 +1,2299 @@
-/*
-  CIMXMLBuilderImpl.java
-
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------ 
- * 16627      2005-04-01  thschaef     Correct instantiation for Uint64 
- * 17459      2005-06-24  thschaef     catch null within createMethod method
- * 17459      2005-06-27  thschaef     further improvement to createMethod()
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1610046    2006-07-12  ebak         Does not escape trailing spaces KEYVALUE
- * 1631407    2007-01-11  lupusalex    VALUE.REFERENCE doesn't handle references without namespace
- * 1656285    2007-02-12  ebak         IndicationHandler does not accept non-Integer message ID
- * 1671505    2007-02-28  lupusalex    Wrong escaping of spaces in XML (Undo 1610046)
- * 1660756    2007-03-02  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1669961    2006-04-16  lupusalex    CIMTypedElement.getType() =>getDataType()
- * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
- * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
- * 1820763    2007-10-29  ebak    	   Supporting the EmbeddedInstance qualifier
- * 1827728    2007-11-12  ebak         embeddedInstances: attribute EmbeddedObject not set
- * 1827728    2007-11-20  ebak         rework: embeddedInstances: attribute EmbeddedObject not set
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2087969    2008-09-03  blaschke-oss VALUE.ARRAY used in request for array of references
- * 2093708    2008-09-10  rgummada     HTTP 400 - Bad Request, CIMError: request-not-valid
- * 2204488 	  2008-10-28  raman_arora  Fix code to remove compiler warnings
- * 2210455    2008-10-30  blaschke-oss Enhance javadoc, fix potential null pointers
- * 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
- * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
- * 2849970    2009-09-03  blaschke-oss createVALUEARRAY fails to create reference array
- * 2912490    2010-01-05  rgummada     NullPointerException when invoking getInstance
- * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
- * 2970881    2010-03-15  blaschke-oss Add property to control EmbeddedObject case
- * 3001333    2010-05-19  blaschke-oss CIMMethod class ignores propagated parameter
- * 3304058    2011-05-20  blaschke-oss Use same date format in change history
- * 3588558    2012-11-26  blaschke-oss An enhancement on Java CIM Client logging
- *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
- *    2638    2013-05-09  blaschke-oss Do not build empty REFERENCECLASS
- *    2689    2013-10-10  blaschke-oss createMETHODCALL should not add PARAMTYPE attribute
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMClassProperty;
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMFlavor;
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMMethod;
-import org.sentrysoftware.wbem.javax.cim.CIMNamedElementInterface;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMParameter;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifiedElementInterface;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifier;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifierType;
-import org.sentrysoftware.wbem.javax.cim.CIMScope;
-import org.sentrysoftware.wbem.javax.cim.CIMTypedElement;
-import org.sentrysoftware.wbem.javax.cim.CIMValuedElement;
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * Class CIMXMLBuilderImpl is the core class for building CIM-XML documents.
- */
-public class CIMXMLBuilderImpl {
-
-	private static final int MAJOR_CIM_VERSION = 2;
-
-	private static final int MINOR_CIM_VERSION = 0;
-
-	private static final int MAJOR_DTD_VERSION = 2;
-
-	private static final int MINOR_DTD_VERSION = 0;
-
-	/**
-	 * createCIM
-	 * 
-	 * @param pDoc
-	 * @return Element
-	 */
-	public static Element createCIM(Document pDoc) {
-		// 
-		// 
-		Element e = pDoc.createElement("CIM");
-		e.setAttribute("CIMVERSION", MAJOR_CIM_VERSION + "." + MINOR_CIM_VERSION);
-		// required
-		e.setAttribute("DTDVERSION", MAJOR_DTD_VERSION + "." + MINOR_DTD_VERSION);
-		// required
-		pDoc.appendChild(e); // root element
-		return e;
-	}
-
-	// ////////////////////////////////////////////////////////////////////////////////////////
-	// Value Elements
-	// ////////////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * createVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @return Element
-	 */
-	public static Element createVALUE(Document pDoc, Element pParentE) {
-		// 
-		Element e = pDoc.createElement("VALUE");
-		pParentE.appendChild(e);
-
-		return e;
-	}
-
-	/**
-	 * createVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pValue
-	 * @return Element
-	 */
-	public static Element createVALUE(Document pDoc, Element pParentE, String pValue) {
-		// 
-		Element e = pDoc.createElement("VALUE");
-		pParentE.appendChild(e);
-
-		Text textE = pDoc.createTextNode(pValue);
-		e.appendChild(textE);
-		return e;
-	}
-
-	/**
-	 * createVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pValue
-	 * @return Element
-	 */
-	public static Element createVALUE(Document pDoc, Element pParentE, boolean pValue) {
-		return createVALUE(pDoc, pParentE, pValue ? MOF.TRUE : MOF.FALSE);
-	}
-
-	/**
-	 * createVALUEARRAY
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @return Element
-	 */
-	public static Element createVALUEARRAY(Document pDoc, Element pParentE) {
-		// 
-		Element e = pDoc.createElement("VALUE.ARRAY");
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createVALUEREFERENCE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @return Element
-	 */
-	public static Element createVALUEREFERENCE(Document pDoc, Element pParentE) {
-		// 
-		Element e = pDoc.createElement("VALUE.REFERENCE");
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createVALUEREFARRAY
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @return Element
-	 */
-	public static Element createVALUEREFARRAY(Document pDoc, Element pParentE) {
-		// 
-		Element e = pDoc.createElement("VALUE.REFARRAY");
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	// ////////////////////////////////////////////////////////////////////////////////////////
-	// Properties elements
-	// ////////////////////////////////////////////////////////////////////////////////////////
-	/**
-	 * createPROPERTY
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @param pType
-	 * @return Element
-	 */
-	public static Element createPROPERTY(Document pDoc, Element pParentE, String pName, String pType) {
-		// 
-		// 
-
-		Element e = pDoc.createElement("PROPERTY");
-		if (pName != null) e.setAttribute("NAME", pName);
-		if (pType != null) e.setAttribute("TYPE", pType);
-		// TODO: ClassOrigin, Propagated
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createPROPERTYARRAY
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @param pType
-	 * @return Element
-	 */
-	public static Element createPROPERTYARRAY(Document pDoc, Element pParentE, String pName,
-			String pType) {
-		// 
-		// 
-
-		Element e = pDoc.createElement("PROPERTY.ARRAY");
-		if (pName != null) e.setAttribute("NAME", pName);
-		if (pType != null) e.setAttribute("TYPE", pType);
-		// TODO: ClassOrigin, Propagated
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createPROPERTYREFERENCE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @param pReferenceclass
-	 * @return Element
-	 */
-	public static Element createPROPERTYREFERENCE(Document pDoc, Element pParentE, String pName,
-			String pReferenceclass) {
-		// 
-		// 
-
-		Element e = pDoc.createElement("PROPERTY.REFERENCE");
-		if (pName != null) e.setAttribute("NAME", pName);
-		if (pReferenceclass != null && pReferenceclass.length() > 0) e.setAttribute(
-				"REFERENCECLASS", pReferenceclass);
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	// ////////////////////////////////////////////////////////////////////////////////////////
-	// Naming and Location elements
-	// ////////////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * createNAMESPACE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createNAMESPACE(Document pDoc, Element pParentE, String pName) {
-		// 
-		// 
-		Element e = pDoc.createElement("NAMESPACE");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createLOCALINSTANCEPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @return Element
-	 */
-	public static Element createLOCALINSTANCEPATH(Document pDoc, Element pParentE) {
-		// 
-		Element e = pDoc.createElement("LOCALINSTANCEPATH");
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createCLASSNAME
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createCLASSNAME(Document pDoc, Element pParentE, String pName) {
-		// 
-		// 
-		Element e = pDoc.createElement("CLASSNAME");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-
-			pParentE.appendChild(e);
-		}
-		return e;
-	}
-
-	/**
-	 * createCLASS
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @param pSuperClass
-	 * @return Element
-	 */
-	public static Element createCLASS(Document pDoc, Element pParentE, String pName,
-			String pSuperClass) {
-		// 
-		// 
-		Element e = pDoc.createElement("CLASS");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-
-		}
-		if (pSuperClass != null && pSuperClass.length() > 0) {
-			e.setAttribute("SUPERCLASS", pSuperClass);
-
-		}
-		if (pParentE != null) pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createINSTANCENAME
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pClassName
-	 * @return Element
-	 */
-	public static Element createINSTANCENAME(Document pDoc, Element pParentE, String pClassName) {
-		// 
-		// 
-		Element e = pDoc.createElement("INSTANCENAME");
-		if (pClassName != null) {
-			e.setAttribute("CLASSNAME", pClassName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createKEYBINDING
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createKEYBINDING(Document pDoc, Element pParentE, String pName) {
-		// 
-		// 
-		Element e = pDoc.createElement("KEYBINDING");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	private static final Pattern NUM_PAT = Pattern.compile("^[su]int(8|16|32|64)$",
-			Pattern.CASE_INSENSITIVE);
-
-	/**
-	 * 
-	 * getValueTypeStr
-	 * 
-	 * @param pTypeStr
-	 * @return String
-	 */
-	private static String getValueTypeStr(String pTypeStr) {
-
-		if (pTypeStr == null || MOF.DT_STR.equalsIgnoreCase(pTypeStr)) return MOF.DT_STR;
-		if (MOF.DT_BOOL.equalsIgnoreCase(pTypeStr)) return MOF.DT_BOOL;
-		Matcher m = NUM_PAT.matcher(pTypeStr);
-		if (m.matches()) return "numeric";
-		return MOF.DT_STR;
-	}
-
-	/**
-	 * createKEYVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pValueType
-	 * @param pValue
-	 * @return KEYVALUE
-	 */
-	public static Element createKEYVALUE(Document pDoc, Element pParentE, String pValueType,
-			String pValue) {
-		/*
-		 *  
-		 */
-		if (pValueType == null) pValueType = "string";
-		Element e = pDoc.createElement("KEYVALUE");
-		// FIXME: ebak: TYPE attrib is more exact, easier to handle
-		e.setAttribute("TYPE", pValueType);
-		// ebak: maybe old CIMOMs won't understand the TYPE attrib
-		e.setAttribute("VALUETYPE", getValueTypeStr(pValueType));
-		pParentE.appendChild(e);
-		Text valueE = pDoc.createTextNode(pValue);
-		e.appendChild(valueE);
-		return e;
-	}
-
-	// ////////////////////////////////////////////////////////////////////////////////////////
-	// Object Definition Elements
-	// ////////////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * createINSTANCE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pClassName
-	 * @return Element
-	 */
-	public static Element createINSTANCE(Document pDoc, Element pParentE, String pClassName) {
-		// 
-		// 
-
-		Element e = pDoc.createElement("INSTANCE");
-		if (pClassName != null) {
-			e.setAttribute("CLASSNAME", pClassName);
-		}
-		if (pParentE != null) pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createQUALIFIER
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @param pType
-	 * @return Element
-	 */
-	public static Element createQUALIFIER(Document pDoc, Element pParentE, String pName,
-			String pType) {
-		// 
-		// 
-
-		Element e = pDoc.createElement("QUALIFIER");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-			// TODO: add additional attributes "propagated", "qualifierFlavod"
-		}
-		if (pType != null) e.setAttribute("TYPE", pType);
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	// ///////////////////////////////////////////////////////////////////////////////////////////
-	// Message Elements
-	// ///////////////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * createMESSAGE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pId
-	 * @param pProtocolVersion
-	 * @return Element
-	 */
-	public static Element createMESSAGE(Document pDoc, Element pParentE, String pId,
-			String pProtocolVersion) {
-		// 
-		// 
-		Element e = pDoc.createElement("MESSAGE");
-		e.setAttribute("ID", pId); // required
-		e.setAttribute("PROTOCOLVERSION", pProtocolVersion); // required
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createSIMPLEREQ
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @return Element
-	 */
-	public static Element createSIMPLEREQ(Document pDoc, Element pParentE) {
-		// 
-		Element e = pDoc.createElement("SIMPLEREQ");
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createSIMPLEREQ
-	 * 
-	 * @param pDoc
-	 * @return Element
-	 */
-	public static Element createSIMPLEREQ(Document pDoc) {
-		// 
-		Element e = pDoc.createElement("SIMPLEREQ");
-		return e;
-	}
-
-	/**
-	 * createMULTIREQ
-	 * 
-	 * @param pDoc
-	 * @return Element
-	 */
-	public static Element createMULTIREQ(Document pDoc) {
-		// 
-		Element e = pDoc.createElement("MULTIREQ");
-		return e;
-	}
-
-	/**
-	 * createMETHODCALL
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createMETHODCALL(Document pDoc, Element pParentE, String pName) {
-		// 
-		// 
-		Element e = pDoc.createElement("METHODCALL");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createPARAMVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pArg
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createPARAMVALUE(Document pDoc, Element pParentE, CIMArgument pArg)
-			throws WBEMException {
-		// )
-		// 
-		if (pArg == null) return null;
-		Element e = pDoc.createElement("PARAMVALUE");
-		EmbObjBuilder embObjBuilder = new EmbObjBuilder(pDoc, pArg);
-		if (pArg.getName() != null) {
-			e.setAttribute("NAME", pArg.getName());
-		}
-		e.setAttribute("PARAMTYPE", embObjBuilder.getTypeStr());
-		embObjBuilder.addSign(e);
-		embObjBuilder.addValue(e);
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createSIMPLERSP
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @return Element
-	 */
-	public static Element createSIMPLERSP(Document pDoc, Element pParentE) {
-		// 
-		Element e = pDoc.createElement("SIMPLERSP");
-
-		if (pParentE != null) pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createSIMPLEEXPRSP
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @return Element
-	 */
-	public static Element createSIMPLEEXPRSP(Document pDoc, Element pParentE) {
-		// 
-		Element e = pDoc.createElement("SIMPLEEXPRSP");
-
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createMETHODRESPONSE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createMETHODRESPONSE(Document pDoc, Element pParentE, String pName) {
-		// 
-		// 
-
-		// %CIMName;>
-		Element e = pDoc.createElement("METHODRESPONSE");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createIMETHODRESPONSE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createIMETHODRESPONSE(Document pDoc, Element pParentE, String pName) {
-		// 
-		// 
-		// %CIMName;>
-		Element e = pDoc.createElement("IMETHODRESPONSE");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createEXPMETHODRESPONSE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createEXPMETHODRESPONSE(Document pDoc, Element pParentE, String pName) {
-		// 
-		// 
-		Element e = pDoc.createElement("EXPMETHODRESPONSE");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createIRETURNVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @return Element
-	 */
-	public static Element createIRETURNVALUE(Document pDoc, Element pParentE) {
-		// 
-		Element e = pDoc.createElement("IRETURNVALUE");
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * 
      -	 * !ELEMENT RETURNVALUE (VALUE | VALUE.REFERENCE)
-	 * !ATTLIST RETURNVALUE
-	 * %ParamType;       #IMPLIED
-	 * 
      
-	 * 
-	 * createRETURNVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pValue
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createRETURNVALUE(Document pDoc, Element pParentE, Object pValue)
-			throws WBEMException {
-		Element retValE = pDoc.createElement("RETURNVALUE");
-		CIMDataType type = CIMDataType.getDataType(pValue);
-		retValE.setAttribute("PARAMTYPE", getTypeStr(type));
-		createVALUE(pDoc, retValE, pValue);
-		pParentE.appendChild(retValE);
-		return retValE;
-	}
-
-	/**
-	 * createIMETHODCALL
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createIMETHODCALL(Document pDoc, Element pParentE, String pName) {
-		// 
-		// 
-		Element e = pDoc.createElement("IMETHODCALL");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createIPARAMVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createIPARAMVALUE(Document pDoc, Element pParentE, String pName) {
-		// )
-		// 
-		Element e = pDoc.createElement("IPARAMVALUE");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createERROR
-	 * 
-	 * @param doc
-	 * @param parentE
-	 * @param error
-	 * @return Element
-	 */
-	public static Element createERROR(Document doc, Element parentE, CIMError error) {
-		// 
-		// 
-		Element e = doc.createElement("ERROR");
-		int code;
-		if ((code = error.getCode()) > 0) {
-			e.setAttribute("CODE", Integer.toString(code));
-		}
-		String description = error.getDescription();
-		if (description != null) {
-			e.setAttribute("DESCRIPTION", description);
-		}
-
-		parentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * ENTITY % QualifierFlavor "OVERRIDABLE (true|false) 'true' TOSUBCLASS
-	 * (true|false) 'true' TOINSTANCE (true|false) 'false' TRANSLATABLE
-	 * (true|false) 'false'"
-	 * 
-	 * @param pElement
-	 * @param pFlavors
-	 */
-	private static void setFlavors(Element pElement, int pFlavors) {
-		if ((pFlavors & CIMFlavor.TRANSLATE) > 0) {
-			pElement.setAttribute("TRANSLATABLE", MOF.TRUE);
-		}
-		if ((pFlavors & CIMFlavor.DISABLEOVERRIDE) > 0) {
-			pElement.setAttribute("OVERRIDABLE", MOF.FALSE);
-		}
-		if ((pFlavors & CIMFlavor.RESTRICTED) > 0) {
-			pElement.setAttribute("TOSUBCLASS", MOF.FALSE);
-		}
-		/*
-		 * if ((pFlavors & CIMFlavor.RESTRICTED)>0) {
-		 * pElement.setAttribute("TOSUBCLASS", "true"); }
-		 */
-	}
-
-	/**
-	 * createQUALIFIER_DECLARATION
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pQualifierType
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createQUALIFIER_DECLARATION(Document pDoc, Element pParentE,
-			CIMQualifierType pQualifierType) throws WBEMException {
-		// 
-		// 
-
-		String pValueTypeStr = getTypeStr(pQualifierType.getDataType());
-		Element qualifierdeclarationE = pDoc.createElement("QUALIFIER.DECLARATION");
-		qualifierdeclarationE.setAttribute("NAME", pQualifierType.getName());
-		qualifierdeclarationE.setAttribute("TYPE", pValueTypeStr);
-		qualifierdeclarationE.setAttribute("ISARRAY",
-				pQualifierType.getDataType().isArray() ? MOF.TRUE : MOF.FALSE);
-
-		setFlavors(qualifierdeclarationE, pQualifierType.getFlavor());
-
-		int scopes = pQualifierType.getScope();
-		if (scopes > 0) {
-			Element scopeE = pDoc.createElement("SCOPE");
-			if ((scopes & CIMScope.CLASS) > 0) scopeE.setAttribute("CLASS", MOF.TRUE);
-			if ((scopes & CIMScope.ASSOCIATION) > 0) scopeE.setAttribute("ASSOCIATION", MOF.TRUE);
-			if ((scopes & CIMScope.REFERENCE) > 0) scopeE.setAttribute("REFERENCE", MOF.TRUE);
-			if ((scopes & CIMScope.PROPERTY) > 0) scopeE.setAttribute("PROPERTY", MOF.TRUE);
-			if ((scopes & CIMScope.METHOD) > 0) scopeE.setAttribute("METHOD", MOF.TRUE);
-			if ((scopes & CIMScope.PARAMETER) > 0) scopeE.setAttribute("PARAMETER", MOF.TRUE);
-			if ((scopes & CIMScope.INDICATION) > 0) scopeE.setAttribute("INDICATION", MOF.TRUE);
-			qualifierdeclarationE.appendChild(scopeE);
-		}
-
-		createVALUE(pDoc, qualifierdeclarationE, pQualifierType.getValue());
-
-		pParentE.appendChild(qualifierdeclarationE);
-		return qualifierdeclarationE;
-	}
-
-	/**
-	 * createQUALIFIER
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pQualifier
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createQUALIFIER(Document pDoc, Element pParentE,
-			CIMQualifier pQualifier) throws WBEMException {
-		// 
-		// 
-
-		Object value = pQualifier.getValue();
-		if (value == null) return null;
-
-		Element qualifierE = createQUALIFIER(pDoc, pParentE, pQualifier.getName(),
-				getTypeStr(pQualifier.getDataType()));
-
-		if (pQualifier.isPropagated()) {
-			qualifierE.setAttribute("PROPAGATED", "true");
-		}
-		setFlavors(qualifierE, pQualifier.getFlavor());
-
-		createVALUE(pDoc, qualifierE, value);
-
-		pParentE.appendChild(qualifierE);
-		return qualifierE;
-	}
-
-	/**
-	 * createQUALIFIERS
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pQualifiersA
-	 * @throws WBEMException
-	 */
-	public static void createQUALIFIERS(Document pDoc, Element pParentE,
-			CIMQualifier[] pQualifiersA) throws WBEMException {
-		if (pQualifiersA == null) return;
-		for (int i = 0; i < pQualifiersA.length; i++) {
-			createQUALIFIER(pDoc, pParentE, pQualifiersA[i]);
-		}
-	}
-
-	/**
-	 * createPROPERTIES
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pProperties
-	 * @throws WBEMException
-	 */
-	public static void createPROPERTIES(Document pDoc, Element pParentE,
-			CIMProperty[] pProperties) throws WBEMException {
-		if (pProperties == null) return;
-		for (int i = 0; i < pProperties.length; i++) {
-			createPROPERTY(pDoc, pParentE, pProperties[i]);
-		}
-	}
-
-	private static final CIMQualifiedElementInterfaceImpl KEYQUALIFIERS_IMPL = new CIMQualifiedElementInterfaceImpl(
-			null, true);
-
-	static final CIMQualifier EMB_OBJ_QUALI = new CIMQualifier("EmbeddedObject",
-			CIMDataType.BOOLEAN_T, Boolean.TRUE, CIMFlavor.DISABLEOVERRIDE);
-
-	// ebak: embedded object: CLASS_T or INSTANCE_T?
-
-	/**
-	 * isCIMObject
-	 * 
-	 * @param typeCode
-	 * @return boolean
-	 */
-	public static boolean isCIMObject(int typeCode) {
-		return typeCode == CIMDataType.CLASS || typeCode == CIMDataType.OBJECT;
-	}
-
-	/**
-	 * isCIMObject
-	 * 
-	 * @param pType
-	 * @return boolean
-	 */
-	public static boolean isCIMObject(CIMDataType pType) {
-		return pType == null ? false : isCIMObject(pType.getType());
-	}
-
-	/**
-	 * getEmbObjTypeStr
-	 * 
-	 * @param pType
-	 * @return String
-	 */
-	public static String getEmbObjTypeStr(CIMDataType pType) {
-		return isCIMObject(pType) ? MOF.DT_STR : getTypeStr(pType);
-	}
-
-	private static Document getDoc() {
-		try {
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			DocumentBuilder docBuilder = factory.newDocumentBuilder();
-			return docBuilder.newDocument();
-		} catch (ParserConfigurationException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * cimObjectToXMLString - for embedded object support
-	 * 
-	 * @param pObj
-	 * @return String
-	 * @throws WBEMException
-	 */
-	public static String cimObjectToXMLString(Object pObj) throws WBEMException {
-		if (pObj == null) return null;
-		Document doc;
-		Element e;
-		if (pObj instanceof CIMClass) {
-			doc = getDoc();
-			e = createCLASS(doc, null, (CIMClass) pObj);
-		} else if (pObj instanceof CIMInstance) {
-			doc = getDoc();
-			e = createINSTANCE(doc, null, (CIMInstance) pObj);
-		} else {
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, pObj.getClass().getName()
-					+ " parameter is not suitable for this method!");
-		}
-		doc.appendChild(e);
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		try {
-			CimXmlSerializer.serialize(os, doc.getDocumentElement(), false);
-		} catch (IOException ex) {
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-					"XML serialization failed with IOException!", null, ex);
-		}
-		return os.toString();
-	}
-
-	/**
-	 * cimObjectArrayToXMLString - for embedded object support
-	 * 
-	 * @param pObj
-	 * @return String[]
-	 * @throws WBEMException
-	 */
-	public static String[] cimObjectArrayToXMLString(Object pObj) throws WBEMException {
-		if (pObj == null) return null;
-		if (!(pObj instanceof Object[])) throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-				"Object[] parameter is required for this method!");
-		Object[] objA = (Object[]) pObj;
-		String[] strA = new String[objA.length];
-		// here we don't deal with the consistency check of the Object[]
-		for (int i = 0; i < objA.length; i++)
-			strA[i] = cimObjectToXMLString(objA[i]);
-		return strA;
-	}
-
-	static boolean embObjQualified(CIMQualifiedElementInterface pQualid) {
-		return pQualid.hasQualifier("EmbeddedObject") || pQualid.hasQualifier("EmbeddedInstance");
-	}
-
-	static class EmbObjBuilder {
-
-		private static final int ATTRIB_ONLY = 0, EO_QUALI = 1, EO_AND_EI_QUALI = 2;
-
-		private int iSignMethod;
-
-		private Document iDoc;
-
-		private CIMTypedElement iTypedE;
-
-		private boolean iXMLQualified;
-
-		private static final boolean iUpperCaseEmbObjEntities = WBEMConfiguration
-				.getGlobalConfiguration().upperCaseEmbObjEntities();
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pDoc
-		 * @param pTypedE
-		 */
-		public EmbObjBuilder(Document pDoc, CIMTypedElement pTypedE) {
-			this(pDoc, pTypedE, false);
-		}
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pDoc
-		 * @param pTypedE
-		 * @param pXMLQualified
-		 *            - e.g. CIMProperty is not qualified in JSR48, but
-		 *            qualified in CIM-XML
-		 */
-		public EmbObjBuilder(Document pDoc, CIMTypedElement pTypedE, boolean pXMLQualified) {
-			this.iDoc = pDoc;
-			this.iTypedE = pTypedE;
-			this.iXMLQualified = pXMLQualified;
-			String builderCfg = WBEMConfiguration.getGlobalConfiguration().getCimXmlEmbObjBuilder();
-			if ("EmbObjQuali".equalsIgnoreCase(builderCfg)) {
-				this.iSignMethod = EO_QUALI;
-			} else if ("EmbObjAndEmbInstQuali".equalsIgnoreCase(builderCfg)) {
-				this.iSignMethod = EO_AND_EI_QUALI;
-			} else {
-				this.iSignMethod = ATTRIB_ONLY;
-			}
-		}
-
-		/**
-		 * getTypeStr
-		 * 
-		 * @return String
-		 */
-		public String getTypeStr() {
-			return getEmbObjTypeStr(this.iTypedE.getDataType());
-		}
-
-		/**
-		 * isArray
-		 * 
-		 * @return String
-		 */
-		public boolean isArray() {
-			return this.iTypedE.getDataType().isArray();
-		}
-
-		private Object getValue() {
-			if (!(this.iTypedE instanceof CIMValuedElement)) return null;
-			return ((CIMValuedElement) this.iTypedE).getValue();
-
-		}
-
-		/**
-		 * addSign
-		 * 
-		 * @param pElement
-		 * @throws WBEMException
-		 */
-		public void addSign(Element pElement) throws WBEMException {
-			if (!isCIMObject(this.iTypedE.getDataType())) return;
-			CIMQualifiedElementInterface qualified;
-			if (this.iTypedE instanceof CIMQualifiedElementInterface) {
-				qualified = (CIMQualifiedElementInterface) this.iTypedE;
-				if (embObjQualified(qualified)) return;
-			} else {
-				qualified = null;
-			}
-			if (this.iSignMethod == ATTRIB_ONLY || (qualified == null && !this.iXMLQualified)) {
-				pElement.setAttribute(iUpperCaseEmbObjEntities ? "EMBEDDEDOBJECT"
-						: "EmbeddedObject",
-						this.iTypedE.getDataType().getType() == CIMDataType.OBJECT ? "instance"
-								: "object");
-			} else {
-				if (this.iSignMethod == EO_AND_EI_QUALI) {
-					addEmbObjOrEmbInstQuali(pElement);
-				} else { // EO_QUALI
-					createQUALIFIER(this.iDoc, pElement, EMB_OBJ_QUALI);
-				}
-			}
-		}
-
-		private void addEmbObjOrEmbInstQuali(Element pElement) throws WBEMException {
-			CIMQualifier signQuali;
-			if (this.iTypedE.getDataType().getType() == CIMDataType.OBJECT) {
-				CIMInstance inst;
-				if (isArray()) {
-					CIMInstance[] instA = (CIMInstance[]) getValue();
-					inst = instA == null ? null : instA[0];
-				} else {
-					inst = (CIMInstance) getValue();
-				}
-				String className = inst == null ? "" : inst.getClassName();
-				signQuali = new CIMQualifier("EmbeddedInstance", CIMDataType.STRING_T,
-						className, CIMFlavor.DISABLEOVERRIDE);
-			} else { // class
-				signQuali = EMB_OBJ_QUALI;
-			}
-			createQUALIFIER(this.iDoc, pElement, signQuali);
-		}
-
-		/**
-		 * addValue
-		 * 
-		 * @param pElement
-		 * @throws WBEMException
-		 */
-		public void addValue(Element pElement) throws WBEMException {
-			Object value = getValue();
-			if (value == null) return;
-			if (isCIMObject(this.iTypedE.getDataType())) {
-				if (isArray()) {
-					value = cimObjectArrayToXMLString(value);
-				} else {
-					value = cimObjectToXMLString(value);
-				}
-			}
-			createVALUE(this.iDoc, pElement, value);
-		}
-
-	}
-
-	/**
-	 * createPROPERTY
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pProperty
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createPROPERTY(Document pDoc, Element pParentE, CIMProperty pProperty)
-			throws WBEMException {
-		CIMDataType propType = pProperty.getDataType();
-		Element propertyE;
-		EmbObjBuilder embObjBuilder = new EmbObjBuilder(pDoc, pProperty, true);
-		String typeStr = embObjBuilder.getTypeStr();
-		if (propType.isArray()) {
-			propertyE = createPROPERTYARRAY(pDoc, pParentE, pProperty.getName(), typeStr);
-		} else if (propType.getType() == CIMDataType.REFERENCE) {
-			propertyE = createPROPERTYREFERENCE(pDoc, pParentE, pProperty.getName(), propType
-					.getRefClassName());
-		} else {
-			propertyE = createPROPERTY(pDoc, pParentE, pProperty.getName(), typeStr);
-		}
-
-		String classorigin = pProperty.getOriginClass();
-		if (classorigin != null && classorigin.length() > 0) propertyE.setAttribute("CLASSORIGIN",
-				classorigin);
-
-		if (pProperty.isPropagated()) propertyE.setAttribute("PROPAGATED", MOF.TRUE);
-		// FIXME: here key qualifier should be added if the property is a key
-		embObjBuilder.addSign(propertyE);
-		if (pProperty instanceof CIMClassProperty) {
-			createQUALIFIERS(pDoc, propertyE, ((CIMClassProperty) pProperty).getQualifiers());
-		} else { // CIMProperty
-			if (pProperty.isKey()) createQUALIFIERS(pDoc, propertyE, KEYQUALIFIERS_IMPL
-					.getQualifiers());
-		}
-		embObjBuilder.addValue(propertyE);
-		return propertyE;
-	}
-
-	/**
-	 * createVALUEARRAY
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pValA
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createVALUEARRAY(Document pDoc, Element pParentE, Object[] pValA)
-			throws WBEMException {
-		Element valuearrayE = (pValA != null && pValA.length > 0 && (pValA[0] instanceof CIMObjectPath || pValA[0] instanceof CIMInstance)) ? createVALUEREFARRAY(
-				pDoc, pParentE)
-				: createVALUEARRAY(pDoc, pParentE);
-
-		if (pValA != null) for (int i = 0; i < pValA.length; i++) {
-			createVALUE(pDoc, valuearrayE, pValA[i]);
-		}
-		pParentE.appendChild(valuearrayE);
-		return valuearrayE;
-	}
-
-	/**
-	 * createVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pArgValue
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createVALUE(Document pDoc, Element pParentE, Object pArgValue)
-			throws WBEMException {
-		if (pArgValue == null) return null;
-
-		Element valueE = null;
-		if (pArgValue instanceof Object[]) {
-			valueE = createVALUEARRAY(pDoc, pParentE, (Object[]) pArgValue);
-		} else {
-			CIMDataType type = CIMDataType.getDataType(pArgValue);
-			if (type != null && type.getType() == CIMDataType.REFERENCE) {
-				valueE = createVALUEREFERENCE(pDoc, pParentE);
-
-				CIMObjectPath op = (CIMObjectPath) pArgValue;
-				CIMProperty[] keys = op.getKeys();
-				if (op.getHost() == null || "".equals(op.getHost())) {
-					if (op.getNamespace() == null || "".equals(op.getNamespace())) {
-						if (keys.length > 0) {
-							createINSTANCENAME(pDoc, valueE, op);
-						} else {
-							createCLASSNAME(pDoc, valueE, op.getObjectName());
-						}
-					} else {
-						if (keys.length > 0) {
-							createLOCALINSTANCEPATH(pDoc, valueE, op);
-						} else {
-							createLOCALCLASSPATH(pDoc, valueE, op);
-						}
-					}
-				} else {
-					if (keys.length > 0) {
-						createINSTANCEPATH(pDoc, valueE, op);
-					} else {
-						createCLASSPATH(pDoc, valueE, op);
-					}
-				}
-				// createOBJECTPATH(doc, valueE, (CIMObjectPath) obj);
-			} else {
-				if (pArgValue instanceof CIMInstance) {
-					valueE = createVALUEREFERENCE(pDoc, pParentE);
-					CIMObjectPath cop = ((CIMInstance) pArgValue).getObjectPath();
-					createINSTANCENAME(pDoc, valueE, cop);
-				} else if (pArgValue instanceof CIMClass) {
-					valueE = createVALUE(pDoc, pParentE);
-					createCLASS(pDoc, valueE, (CIMClass) pArgValue);
-				} else {
-					createVALUE(pDoc, pParentE, pArgValue.toString());
-				}
-			}
-		}
-
-		return valueE;
-	}
-
-	/**
-	 * createINSTANCE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pInstance
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createINSTANCE(Document pDoc, Element pParentE, CIMInstance pInstance)
-			throws WBEMException {
-		// 
-		// 
-
-		String className = pInstance.getObjectPath().getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-				"null class name");
-
-		Element instanceE = createINSTANCE(pDoc, pParentE, className);
-
-		// FIXME: in JSR48 CIMInstance doesn't have qualifiers
-		// createQUALIFIERS(pDoc, instanceE, pInstance.getQualifiers());
-		createPROPERTIES(pDoc, instanceE, pInstance.getProperties());
-
-		if (pParentE != null) pParentE.appendChild(instanceE);
-
-		return instanceE;
-	}
-
-	/**
-	 * createOBJECTPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createOBJECTPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
-		Element objectpathE = pDoc.createElement("OBJECTPATH");
-
-		CIMProperty[] keys = pPath.getKeys();
-		if (keys.length > 0) {
-			createINSTANCEPATH(pDoc, objectpathE, pPath);
-		} else {
-			createCLASSPATH(pDoc, objectpathE, pPath);
-		}
-
-		pParentE.appendChild(objectpathE);
-		return objectpathE;
-	}
-
-	/**
-	 * createOBJECTNAME
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createOBJECTNAME(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
-
-		CIMProperty[] keys = pPath.getKeys();
-		if (keys.length > 0) { return createINSTANCENAME(pDoc, pParentE, pPath); }
-		if (pPath.getObjectName() == null) throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
-		return createCLASSNAME(pDoc, pParentE, pPath.getObjectName());
-	}
-
-	/**
-	 * createLOCALINSTANCEPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createLOCALINSTANCEPATH(Document pDoc, Element pParentE,
-			CIMObjectPath pPath) throws WBEMException {
-		Element localinstancepathE = pDoc.createElement("LOCALINSTANCEPATH");
-
-		createLOCALNAMESPACEPATH(pDoc, localinstancepathE, pPath);
-		createINSTANCENAME(pDoc, localinstancepathE, pPath);
-
-		pParentE.appendChild(localinstancepathE);
-		return localinstancepathE;
-	}
-
-	/**
-	 * createLOCALCLASSPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createLOCALCLASSPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
-		Element localinstancepathE = pDoc.createElement("LOCALCLASSPATH");
-
-		createLOCALNAMESPACEPATH(pDoc, localinstancepathE, pPath);
-
-		if (pPath.getObjectName() == null) throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
-		createCLASSNAME(pDoc, localinstancepathE, pPath.getObjectName());
-
-		pParentE.appendChild(localinstancepathE);
-		return localinstancepathE;
-	}
-
-	/**
-	 * createLOCALOBJECTPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createLOCALOBJECTPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
-
-		CIMProperty[] keys = pPath.getKeys();
-		if (keys.length > 0) { return createLOCALINSTANCEPATH(pDoc, pParentE, pPath); }
-		return createLOCALCLASSPATH(pDoc, pParentE, pPath);
-	}
-
-	/**
-	 * createVALUEREFERENCE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createVALUEREFERENCE(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
-		Element objectpathE = pDoc.createElement("VALUE.REFERENCE");
-
-		String ns = pPath.getNamespace();
-		if (pPath.getHost() == null || "".equals(pPath.getHost())) {
-			if (pPath.getNamespace() == null || "".equals(ns)) {
-				createINSTANCENAME(pDoc, objectpathE, pPath);
-			} else {
-				createLOCALOBJECTPATH(pDoc, objectpathE, pPath);
-			}
-		} else {
-			CIMProperty[] keys = pPath.getKeys();
-			if (keys.length > 0) {
-				createINSTANCEPATH(pDoc, objectpathE, pPath);
-			} else {
-				createCLASSPATH(pDoc, objectpathE, pPath);
-			}
-		}
-
-		pParentE.appendChild(objectpathE);
-		return objectpathE;
-	}
-
-	/**
-	 * createINSTANCENAME
-	 * 
-	 * @param doc
-	 * @param parentE
-	 * @param instanceOP
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createINSTANCENAME(Document doc, Element parentE, CIMObjectPath instanceOP)
-			throws WBEMException {
-
-		Element instancenameE = doc.createElement("INSTANCENAME");
-		String classname = instanceOP.getObjectName();
-		if (classname != null) {
-			instancenameE.setAttribute("CLASSNAME", classname);
-		}
-
-		CIMProperty[] keysA = instanceOP.getKeys();
-		for (int ii = 0; ii < keysA.length; ii++) {
-			CIMProperty prop = keysA[ii];
-			String propName = prop.getName();
-			CIMDataType propType = prop.getDataType();
-			Object propValue = prop.getValue();
-			// if (_pValue == null) TODO what happened when a KeyBinding has a
-			// null property value?
-			/*
-			 * ebak: test support for #1666336 EnumInstance has attributes
-			 * filled from others  Handling direct KEYVALUE and
-			 * VALUE.REFERENCE children is difficult, KEYBINDING can wrap them
-			 * -> dropping out KEYVALUE? | VALUE.REFERENCE?.
-			 * 
-			 *  
-			 * 
-			 *   - non
-			 * reference values can be null
-			 * 
-			 *  - reference
-			 * value shouldn't be null
-			 */
-			if (propType == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER,
-					"Type of property or key cannot be a null! " + propName + " in ObjectPath "
-							+ instanceOP.toString() + " has null type."); }
-
-			if (propValue == null) {
-				if (propType.getType() == CIMDataType.REFERENCE) { throw new WBEMException(
-						WBEMException.CIM_ERR_INVALID_PARAMETER,
-						"Value of reference cannot be null! " + propName + " in ObjectPath "
-								+ instanceOP.toString() + " has null value."); }
-			}
-
-			Element keybindingE = createKEYBINDING(doc, instancenameE, propName);
-			if (propType.getType() == CIMDataType.REFERENCE) {
-				CIMObjectPath refOP = (CIMObjectPath) propValue;
-
-				createVALUEREFERENCE(doc, keybindingE, refOP);
-			} else {
-				String valueStr = propValue == null ? null : propValue.toString();
-				String valueTypeStr = getTypeStr(propType);
-				createKEYVALUE(doc, keybindingE, valueTypeStr, valueStr);
-			}
-		}
-
-		parentE.appendChild(instancenameE);
-		return instancenameE;
-	}
-
-	/**
-	 * createCLASSPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pPath
-	 * @return Element
-	 */
-	public static Element createCLASSPATH(Document pDoc, Element pParentE, CIMObjectPath pPath) {
-		Element classpathE = pDoc.createElement("CLASSPATH");
-
-		// ebak: NAMESPACEPATH is necessary
-		createNAMESPACEPATH(pDoc, classpathE, pPath);
-		createCLASSNAME(pDoc, classpathE, pPath.getObjectName());
-
-		pParentE.appendChild(classpathE);
-		return classpathE;
-	}
-
-	/**
-	 * createPARAMETERS
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pParameters
-	 * @throws WBEMException
-	 */
-	public static void createPARAMETERS(Document pDoc, Element pParentE,
-			CIMParameter[] pParameters) throws WBEMException {
-		if (pParameters == null) return;
-		for (int i = 0; i < pParameters.length; i++) {
-			createPARAMETER(pDoc, pParentE, pParameters[i]);
-		}
-	}
-
-	/**
-	 * createPARAMETER
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pParameter
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createPARAMETER(Document pDoc, Element pParentE,
-			CIMParameter pParameter) throws WBEMException {
-		Element parameterE;
-		CIMDataType type = pParameter.getDataType();
-		int typeCode = type.getType();
-		EmbObjBuilder embObjBuilder = new EmbObjBuilder(pDoc, pParameter);
-		String typeStr = embObjBuilder.getTypeStr();
-		if (type.isArray()) {
-			if (typeCode == CIMDataType.REFERENCE) {
-				parameterE = pDoc.createElement("PARAMETER.REFARRAY");
-				String refclass = type.getRefClassName();
-				if (refclass != null && refclass.length() > 0) parameterE.setAttribute(
-						"REFERENCECLASS", type.getRefClassName());
-			} else {
-				parameterE = pDoc.createElement("PARAMETER.ARRAY");
-				parameterE.setAttribute("TYPE", typeStr);
-			}
-		} else {
-			if (typeCode == CIMDataType.REFERENCE) {
-				parameterE = pDoc.createElement("PARAMETER.REFERENCE");
-				String refclass = type.getRefClassName();
-				if (refclass != null && refclass.length() > 0) parameterE.setAttribute(
-						"REFERENCECLASS", type.getRefClassName());
-			} else {
-				parameterE = pDoc.createElement("PARAMETER");
-				parameterE.setAttribute("TYPE", typeStr);
-			}
-		}
-		parameterE.setAttribute("NAME", pParameter.getName());
-		embObjBuilder.addSign(parameterE);
-		createQUALIFIERS(pDoc, parameterE, pParameter.getQualifiers());
-
-		pParentE.appendChild(parameterE);
-		return parameterE;
-	}
-
-	/**
-	 * createMETHODS
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pMethods
-	 * @param pClassName
-	 * @throws WBEMException
-	 */
-	public static void createMETHODS(Document pDoc, Element pParentE, CIMMethod[] pMethods,
-			String pClassName) throws WBEMException {
-		for (int i = 0; i < pMethods.length; i++) {
-			createMETHOD(pDoc, pParentE, pMethods[i], pClassName);
-		}
-	}
-
-	/**
-	 * createMETHOD
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pMethod
-	 * @param pClassName
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createMETHOD(Document pDoc, Element pParentE, CIMMethod pMethod,
-			String pClassName) throws WBEMException {
-		Element methodE = pDoc.createElement("METHOD");
-
-		methodE.setAttribute("NAME", pMethod.getName());
-		EmbObjBuilder embObjBuilder = new EmbObjBuilder(pDoc, pMethod);
-		String typeStr = embObjBuilder.getTypeStr();
-		methodE.setAttribute("TYPE", typeStr);
-		String classorigin = pMethod.getOriginClass();
-
-		if (classorigin != null && classorigin.length() != 0) methodE.setAttribute("CLASSORIGIN",
-				classorigin);
-
-		// 17459
-		if (pMethod.isPropagated()) {
-			methodE.setAttribute("PROPAGATED", MOF.TRUE);
-		} else {
-			methodE.setAttribute("PROPAGATED", MOF.FALSE);
-		}
-		// ebak: embedded object support
-		embObjBuilder.addSign(methodE);
-
-		createQUALIFIERS(pDoc, methodE, pMethod.getQualifiers());
-		createPARAMETERS(pDoc, methodE, pMethod.getParameters());
-
-		pParentE.appendChild(methodE);
-		return methodE;
-	}
-
-	/*
-	 * private static String elementStr(Element pE) { try {
-	 * ByteArrayOutputStream os = new ByteArrayOutputStream();
-	 * CimXmlSerializer.serialize(os, pE, true); return new
-	 * String(os.toByteArray()); } catch (RuntimeException e) { throw e; } catch
-	 * (Exception e) { throw new RuntimeException(e); } }
-	 */
-
-	/**
-	 * createCLASS
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pClass
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createCLASS(Document pDoc, Element pParentE, CIMClass pClass)
-			throws WBEMException {
-
-		Element classE = createCLASS(pDoc, pParentE, pClass.getName(), pClass.getSuperClassName());
-
-		createQUALIFIERS(pDoc, classE, pClass.getQualifiers());
-		createPROPERTIES(pDoc, classE, pClass.getProperties());
-		createMETHODS(pDoc, classE, pClass.getMethods(), pClass.getName());
-
-		// parentE.appendChild(classE);
-		return classE;
-	}
-
-	/**
-	 * createHOST
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pHost
-	 * @return Element
-	 */
-	public static Element createHOST(Document pDoc, Element pParentE, String pHost) {
-		Element hostE = pDoc.createElement("HOST");
-
-		Text hostT = pDoc.createTextNode(pHost);
-		hostE.appendChild(hostT);
-
-		pParentE.appendChild(hostE);
-		return hostE;
-	}
-
-	/**
-	 * createNAMESPACEPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pPath
-	 * @return Element
-	 */
-	public static Element createNAMESPACEPATH(Document pDoc, Element pParentE, CIMObjectPath pPath) {
-		Element namespacepathE = pDoc.createElement("NAMESPACEPATH");
-
-		String host = pPath.getHost();
-		if (host == null) {
-			// try {
-			// host = InetAddress.getLocalHost().getHostAddress();
-			// } catch (Exception e) {
-			// throw new CIMXMLBuilderException("Error while resolving
-			// hostname");
-			// }
-			host = "unassigned-hostname";
-		}
-		createHOST(pDoc, namespacepathE, host);
-		createLOCALNAMESPACEPATH(pDoc, namespacepathE, pPath);
-
-		pParentE.appendChild(namespacepathE);
-		return namespacepathE;
-	}
-
-	/**
-	 * createINSTANCEPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pPath
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createINSTANCEPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
-		Element instancepathE = pDoc.createElement("INSTANCEPATH");
-
-		createNAMESPACEPATH(pDoc, instancepathE, pPath);
-		createINSTANCENAME(pDoc, instancepathE, pPath);
-		pParentE.appendChild(instancepathE);
-		return instancepathE;
-	}
-
-	/**
-	 * createVALUENAMEDINSTANCE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pPath
-	 * @param pInst
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createVALUENAMEDINSTANCE(Document pDoc, Element pParentE,
-			CIMObjectPath pPath, CIMInstance pInst) throws WBEMException {
-		Element valuenamedinstanceE = pDoc.createElement("VALUE.NAMEDINSTANCE");
-		createINSTANCENAME(pDoc, valuenamedinstanceE, pPath);
-		createINSTANCE(pDoc, valuenamedinstanceE, pInst);
-
-		pParentE.appendChild(valuenamedinstanceE);
-		return valuenamedinstanceE;
-	}
-
-	/**
-	 * createVALUENAMEDINSTANCE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pInst
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createVALUENAMEDINSTANCE(Document pDoc, Element pParentE,
-			CIMInstance pInst) throws WBEMException {
-		Element valuenamedinstanceE = pDoc.createElement("VALUE.NAMEDINSTANCE");
-		createINSTANCENAME(pDoc, valuenamedinstanceE, pInst.getObjectPath());
-		createINSTANCE(pDoc, valuenamedinstanceE, pInst);
-
-		pParentE.appendChild(valuenamedinstanceE);
-		return valuenamedinstanceE;
-	}
-
-	private static CIMObjectPath changeNameSpace(CIMNamedElementInterface pNamedElement,
-			String pNameSpace) {
-		CIMObjectPath path = pNamedElement.getObjectPath();
-		return new CIMObjectPath(path.getScheme(), path.getHost(), path.getPort(), pNameSpace, path
-				.getObjectName(), path.getKeys());
-	}
-
-	private static CIMClass changeClassNameSpace(CIMClass pClass, String pNameSpace) {
-		CIMObjectPath newOp = changeNameSpace(pClass, pNameSpace);
-		return new CIMClass(newOp, pClass.getSuperClassName(), pClass.getQualifiers(), pClass
-				.getProperties(), pClass.getMethods(), pClass.isAssociation(), pClass.isKeyed());
-	}
-
-	private static CIMInstance changeInstanceNameSpace(CIMInstance pInst, String pNameSpace) {
-		CIMObjectPath newOp = changeNameSpace(pInst, pNameSpace);
-		return new CIMInstance(newOp, pInst.getProperties());
-	}
-
-	/**
-	 * createVALUEOBJECTWITHPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pObj
-	 * @param pNameSpace
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createVALUEOBJECTWITHPATH(Document pDoc, Element pParentE, Object pObj,
-			String pNameSpace) throws WBEMException {
-		Element valueobjectwithpathE = pDoc.createElement("VALUE.OBJECTWITHPATH");
-		if (pObj instanceof CIMClass) {
-			CIMClass clazz = (CIMClass) pObj;
-
-			if (clazz.getObjectPath().getNamespace() == null
-					|| clazz.getObjectPath().getNamespace().length() == 0) {
-				// ebak: changing the namespace in clazz's objectPath
-				// clazz.getObjectPath().setNameSpace(pNameSpace);
-				clazz = changeClassNameSpace(clazz, pNameSpace);
-			}
-
-			createCLASSPATH(pDoc, valueobjectwithpathE, clazz.getObjectPath());
-			createCLASS(pDoc, valueobjectwithpathE, clazz);
-		} else if (pObj instanceof CIMInstance) {
-			CIMInstance inst = (CIMInstance) pObj;
-			if (inst.getObjectPath().getNamespace() == null
-					|| inst.getObjectPath().getNamespace().length() == 0) {
-				// ebak: changing the namespace ins inst's objectPath
-				// inst.getObjectPath().setNameSpace(pNameSpace);
-				inst = changeInstanceNameSpace(inst, pNameSpace);
-			}
-			createINSTANCEPATH(pDoc, valueobjectwithpathE, inst.getObjectPath());
-			createINSTANCE(pDoc, valueobjectwithpathE, inst);
-		}
-
-		pParentE.appendChild(valueobjectwithpathE);
-		return valueobjectwithpathE;
-	}
-
-	/**
-	 * createVALUEOBJECTWITHLOCALPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pObj
-	 * @param pNameSpace
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createVALUEOBJECTWITHLOCALPATH(Document pDoc, Element pParentE,
-			Object pObj, String pNameSpace) throws WBEMException {
-		Element valueobjectwithpathE = pDoc.createElement("VALUE.OBJECTWITHLOCALPATH");
-		if (pObj instanceof CIMClass) {
-			CIMClass clazz = (CIMClass) pObj;
-
-			if (clazz.getObjectPath().getNamespace() == null
-					|| clazz.getObjectPath().getNamespace().length() == 0) {
-				// ebak: changing clazz's objectPath
-				// clazz.getObjectPath().setNameSpace(pNameSpace);
-				clazz = changeClassNameSpace(clazz, pNameSpace);
-			}
-			createLOCALCLASSPATH(pDoc, valueobjectwithpathE, clazz.getObjectPath());
-			createCLASS(pDoc, valueobjectwithpathE, clazz);
-		} else if (pObj instanceof CIMInstance) {
-			CIMInstance inst = (CIMInstance) pObj;
-			if (inst.getObjectPath().getNamespace() == null
-					|| inst.getObjectPath().getNamespace().length() == 0) {
-				// inst.getObjectPath().setNameSpace(pNameSpace);
-				inst = changeInstanceNameSpace(inst, pNameSpace);
-			}
-			createLOCALINSTANCEPATH(pDoc, valueobjectwithpathE, inst.getObjectPath());
-			createINSTANCE(pDoc, valueobjectwithpathE, inst);
-		}
-
-		pParentE.appendChild(valueobjectwithpathE);
-		return valueobjectwithpathE;
-	}
-
-	/**
-	 * createIRETURNVALUE_ERROR
-	 * 
-	 * @param doc
-	 * @param parentE
-	 * @param error
-	 * @return Element
-	 */
-	public static Element createIRETURNVALUE_ERROR(Document doc, Element parentE, CIMError error) {
-		Element ireturnvalueE = doc.createElement("IRETURNVALUE");
-
-		parentE.appendChild(ireturnvalueE);
-		return ireturnvalueE;
-	}
-
-	/**
-	 * createIRETURNVALUE_GETINSTANCE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pInst
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createIRETURNVALUE_GETINSTANCE(Document pDoc, Element pParentE,
-			CIMInstance pInst) throws WBEMException {
-		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
-		createINSTANCENAME(pDoc, ireturnvalueE, pInst.getObjectPath());
-
-		return ireturnvalueE;
-	}
-
-	/**
-	 * createIRETURNVALUE_ASSOCIATORS_NAMES
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pResultSet
-	 * @return Element
-	 * @throws Exception
-	 */
-	public static Element createIRETURNVALUE_ASSOCIATORS_NAMES(Document pDoc, Element pParentE,
-			CIMObjectPath[] pResultSet) throws Exception {
-		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
-
-		if (pResultSet != null) {
-			for (int i = 0; i < pResultSet.length; i++) {
-				CIMObjectPath path = pResultSet[i];
-
-				if (path.getHost() == null || "".equals(path.getHost())) createLOCALOBJECTPATH(
-						pDoc, ireturnvalueE, path);
-				else createOBJECTPATH(pDoc, ireturnvalueE, path);
-			}
-		}
-		pParentE.appendChild(ireturnvalueE);
-		return ireturnvalueE;
-	}
-
-	/**
-	 * createIRETURNVALUE_ASSOCIATORS
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pResultSet
-	 * @param pNameSpace
-	 * @return Element
-	 * @throws Exception
-	 */
-	public static Element createIRETURNVALUE_ASSOCIATORS(Document pDoc, Element pParentE,
-			Object[] pResultSet, String pNameSpace) throws Exception {
-		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
-		if (pResultSet != null) {
-			for (int i = 0; i < pResultSet.length; i++) {
-				Object obj = pResultSet[i];
-				CIMObjectPath op = null;
-				if (obj instanceof CIMClass) {
-					op = ((CIMClass) obj).getObjectPath();
-				} else if (obj instanceof CIMInstance) {
-					op = ((CIMInstance) obj).getObjectPath();
-				} else {
-					throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-							"object in result set neither class nor instance!");
-				}
-				if (op.getHost() == null || "".equals(op.getHost())) {
-					createVALUEOBJECTWITHLOCALPATH(pDoc, ireturnvalueE, obj, pNameSpace);
-				} else {
-					createVALUEOBJECTWITHPATH(pDoc, ireturnvalueE, obj, pNameSpace);
-				}
-			}
-		}
-		pParentE.appendChild(ireturnvalueE);
-		return ireturnvalueE;
-	}
-
-	/**
-	 * createIRETURNVALUE_ENUMERATE_INSTANCENAME
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pResultSet
-	 * @param pNameSpace
-	 * @return Element
-	 * @throws Exception
-	 */
-	public static Element createIRETURNVALUE_ENUMERATE_INSTANCENAME(Document pDoc,
-			Element pParentE, Object[] pResultSet, String pNameSpace) throws Exception {
-		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
-		if (pResultSet != null) {
-			for (int i = 0; i < pResultSet.length; i++) {
-				Object obj = pResultSet[i];
-				CIMObjectPath op = null;
-				if (obj instanceof CIMClass) {
-					op = ((CIMClass) obj).getObjectPath();
-				} else if (obj instanceof CIMInstance) {
-					op = ((CIMInstance) obj).getObjectPath();
-				} else {
-					throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-							"object in result set neither class nor instance!");
-				}
-				if (op.getHost() == null || "".equals(op.getHost())) {
-					createVALUEOBJECTWITHLOCALPATH(pDoc, ireturnvalueE, obj, pNameSpace);
-				} else {
-					createVALUEOBJECTWITHPATH(pDoc, ireturnvalueE, obj, pNameSpace);
-				}
-			}
-		}
-		pParentE.appendChild(ireturnvalueE);
-		return ireturnvalueE;
-	}
-
-	/**
-	 * createIRETURNVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pResultSet
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createIRETURNVALUE(Document pDoc, Element pParentE, Object[] pResultSet)
-			throws WBEMException {
-		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
-		if (pResultSet != null && pResultSet.length > 0) {
-			Object obj = pResultSet[0];
-			if (obj instanceof CIMClass) {
-				for (int i = 0; i < pResultSet.length; i++) {
-					CIMClass clazz = (CIMClass) pResultSet[i];
-					Element classnameE = pDoc.createElement("CLASSNAME");
-					ireturnvalueE.appendChild(classnameE);
-					if (clazz.getName() != null) classnameE.setAttribute("NAME", clazz.getName());
-				}
-			} else if (obj instanceof CIMInstance) {
-				for (int i = 0; i < pResultSet.length; i++) {
-					CIMInstance inst = (CIMInstance) pResultSet[i];
-					createVALUENAMEDINSTANCE(pDoc, ireturnvalueE, inst);
-				}
-			}
-		}
-		pParentE.appendChild(ireturnvalueE);
-		return ireturnvalueE;
-	}
-
-	/**
-	 * createIRETURNVALUE_ENUMERATE_CLASSNAME
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pResultSet
-	 * @return Element
-	 */
-	public static Element createIRETURNVALUE_ENUMERATE_CLASSNAME(Document pDoc, Element pParentE,
-			CIMClass[] pResultSet) {
-		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
-		if (pResultSet != null && pResultSet.length > 0) {
-			for (int i = 0; i < pResultSet.length; i++) {
-				CIMClass clazz = pResultSet[i];
-
-				Element classnameE = pDoc.createElement("CLASSNAME");
-				ireturnvalueE.appendChild(classnameE);
-				if (clazz.getName() != null) classnameE.setAttribute("NAME", clazz.getName());
-			}
-		}
-		pParentE.appendChild(ireturnvalueE);
-		return ireturnvalueE;
-	}
-
-	/**
-	 * createIndication_response
-	 * 
-	 * @param doc
-	 * @param ID
-	 * @param error
-	 * @return Element
-	 */
-	// ebak: [ 1656285 ] IndicationHandler does not accept non-Integer message
-	// ID
-	public static Element createIndication_response(Document doc, String ID, CIMError error) {
-
-		// xmlBuilder.create XML
-		Element cimE = createCIM(doc);
-		Element messageE = createMESSAGE(doc, cimE, ID, "1.0");
-		Element simpleexprspE = createSIMPLEEXPRSP(doc, messageE);
-		Element expmethodresponseE = createEXPMETHODRESPONSE(doc, simpleexprspE, "ExportIndication");
-		if (error == null) {
-			createIRETURNVALUE(doc, expmethodresponseE);
-		} else {
-			createERROR(doc, expmethodresponseE, error);
-		}
-		// Element
-		return cimE;
-	}
-
-	/**
-	 * createIRETURNVALUE_ENUMERATE_INSTANCE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pResultSet
-	 * @return Element
-	 * @throws WBEMException
-	 */
-	public static Element createIRETURNVALUE_ENUMERATE_INSTANCE(Document pDoc, Element pParentE,
-			CIMInstance[] pResultSet) throws WBEMException {
-		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
-		if (pResultSet != null && pResultSet.length > 0) {
-			for (int i = 0; i < pResultSet.length; i++) {
-				createVALUENAMEDINSTANCE(pDoc, ireturnvalueE, pResultSet[i]);
-			}
-		}
-		pParentE.appendChild(ireturnvalueE);
-		return ireturnvalueE;
-	}
-
-	/**
-	 * getTypeStr
-	 * 
-	 * @param pType
-	 * @return String
-	 */
-	public static String getTypeStr(CIMDataType pType) {
-		if (pType == null) return "string";
-		if (pType.getType() == CIMDataType.REFERENCE) return MOF.REFERENCE;
-		return MOF.dataType(pType);
-	}
-
-	/**
-	 * getOpTypeStr
-	 * 
-	 * @param pType
-	 * @return String
-	 */
-	public static String getOpTypeStr(CIMDataType pType) {
-		return getTypeStr(pType);
-	}
-
-	private static final Pattern NAMESPACE_SPLIT_PATTERN = Pattern.compile("/+");
-
-	/**
-	 * createLOCALNAMESPACEPATH
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createLOCALNAMESPACEPATH(Document pDoc, Element pParentE,
-			CIMObjectPath pName) {
-		if (pName == null) return null;
-		// TODO: name(ObjectPath) should not be null, should an exception be
-		// thrown?
-		// This assumes that the NameSpace does not consist exclusively of
-		// empties like "////"
-		Element localnamespacepathE = pDoc.createElement("LOCALNAMESPACEPATH");
-		String nameSpace = pName.getNamespace();
-		if (nameSpace != null) {
-			String[] nsA = NAMESPACE_SPLIT_PATTERN.split(nameSpace);
-			for (int i = 0; i < nsA.length; i++)
-				if (nsA[i] != null && nsA[i].length() > 0) createNAMESPACE(pDoc,
-						localnamespacepathE, nsA[i]);
-		}
-		pParentE.appendChild(localnamespacepathE);
-
-		return localnamespacepathE;
-	}
-
-	/**
-	 * createSIMPLEEXPREQ
-	 * 
-	 * @param pDoc
-	 * @return Element
-	 */
-	public static Element createSIMPLEEXPREQ(Document pDoc) {
-		// 
-		Element e = pDoc.createElement("SIMPLEEXPREQ");
-		return e;
-	}
-
-	/**
-	 * createEXPMETHODCALL
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createEXPMETHODCALL(Document pDoc, Element pParentE, String pName) {
-		// 
-		// 
-		Element e = pDoc.createElement("EXPMETHODCALL");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-
-	/**
-	 * createEXPPARAMVALUE
-	 * 
-	 * @param pDoc
-	 * @param pParentE
-	 * @param pName
-	 * @return Element
-	 */
-	public static Element createEXPPARAMVALUE(Document pDoc, Element pParentE, String pName) {
-		// 
-		// 
-		Element e = pDoc.createElement("EXPPARAMVALUE");
-		if (pName != null) {
-			e.setAttribute("NAME", pName);
-		}
-		pParentE.appendChild(e);
-		return e;
-	}
-}
+/*
+  CIMXMLBuilderImpl.java
+
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------ 
+ * 16627      2005-04-01  thschaef     Correct instantiation for Uint64 
+ * 17459      2005-06-24  thschaef     catch null within createMethod method
+ * 17459      2005-06-27  thschaef     further improvement to createMethod()
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1610046    2006-07-12  ebak         Does not escape trailing spaces KEYVALUE
+ * 1631407    2007-01-11  lupusalex    VALUE.REFERENCE doesn't handle references without namespace
+ * 1656285    2007-02-12  ebak         IndicationHandler does not accept non-Integer message ID
+ * 1671505    2007-02-28  lupusalex    Wrong escaping of spaces in XML (Undo 1610046)
+ * 1660756    2007-03-02  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1669961    2006-04-16  lupusalex    CIMTypedElement.getType() =>getDataType()
+ * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
+ * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
+ * 1820763    2007-10-29  ebak    	   Supporting the EmbeddedInstance qualifier
+ * 1827728    2007-11-12  ebak         embeddedInstances: attribute EmbeddedObject not set
+ * 1827728    2007-11-20  ebak         rework: embeddedInstances: attribute EmbeddedObject not set
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2087969    2008-09-03  blaschke-oss VALUE.ARRAY used in request for array of references
+ * 2093708    2008-09-10  rgummada     HTTP 400 - Bad Request, CIMError: request-not-valid
+ * 2204488 	  2008-10-28  raman_arora  Fix code to remove compiler warnings
+ * 2210455    2008-10-30  blaschke-oss Enhance javadoc, fix potential null pointers
+ * 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
+ * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
+ * 2849970    2009-09-03  blaschke-oss createVALUEARRAY fails to create reference array
+ * 2912490    2010-01-05  rgummada     NullPointerException when invoking getInstance
+ * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
+ * 2970881    2010-03-15  blaschke-oss Add property to control EmbeddedObject case
+ * 3001333    2010-05-19  blaschke-oss CIMMethod class ignores propagated parameter
+ * 3304058    2011-05-20  blaschke-oss Use same date format in change history
+ * 3588558    2012-11-26  blaschke-oss An enhancement on Java CIM Client logging
+ *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
+ *    2638    2013-05-09  blaschke-oss Do not build empty REFERENCECLASS
+ *    2689    2013-10-10  blaschke-oss createMETHODCALL should not add PARAMTYPE attribute
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMClassProperty;
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMMethod;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMParameter;
+import org.metricshub.wbem.javax.cim.CIMQualifier;
+import org.metricshub.wbem.javax.cim.CIMQualifierType;
+import org.metricshub.wbem.javax.cim.CIMTypedElement;
+import org.metricshub.wbem.javax.cim.CIMValuedElement;
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+import org.metricshub.wbem.javax.cim.CIMFlavor;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface;
+import org.metricshub.wbem.javax.cim.CIMScope;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+
+/**
+ * Class CIMXMLBuilderImpl is the core class for building CIM-XML documents.
+ */
+public class CIMXMLBuilderImpl {
+
+	private static final int MAJOR_CIM_VERSION = 2;
+
+	private static final int MINOR_CIM_VERSION = 0;
+
+	private static final int MAJOR_DTD_VERSION = 2;
+
+	private static final int MINOR_DTD_VERSION = 0;
+
+	/**
+	 * createCIM
+	 * 
+	 * @param pDoc
+	 * @return Element
+	 */
+	public static Element createCIM(Document pDoc) {
+		// 
+		// 
+		Element e = pDoc.createElement("CIM");
+		e.setAttribute("CIMVERSION", MAJOR_CIM_VERSION + "." + MINOR_CIM_VERSION);
+		// required
+		e.setAttribute("DTDVERSION", MAJOR_DTD_VERSION + "." + MINOR_DTD_VERSION);
+		// required
+		pDoc.appendChild(e); // root element
+		return e;
+	}
+
+	// ////////////////////////////////////////////////////////////////////////////////////////
+	// Value Elements
+	// ////////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * createVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @return Element
+	 */
+	public static Element createVALUE(Document pDoc, Element pParentE) {
+		// 
+		Element e = pDoc.createElement("VALUE");
+		pParentE.appendChild(e);
+
+		return e;
+	}
+
+	/**
+	 * createVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pValue
+	 * @return Element
+	 */
+	public static Element createVALUE(Document pDoc, Element pParentE, String pValue) {
+		// 
+		Element e = pDoc.createElement("VALUE");
+		pParentE.appendChild(e);
+
+		Text textE = pDoc.createTextNode(pValue);
+		e.appendChild(textE);
+		return e;
+	}
+
+	/**
+	 * createVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pValue
+	 * @return Element
+	 */
+	public static Element createVALUE(Document pDoc, Element pParentE, boolean pValue) {
+		return createVALUE(pDoc, pParentE, pValue ? MOF.TRUE : MOF.FALSE);
+	}
+
+	/**
+	 * createVALUEARRAY
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @return Element
+	 */
+	public static Element createVALUEARRAY(Document pDoc, Element pParentE) {
+		// 
+		Element e = pDoc.createElement("VALUE.ARRAY");
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createVALUEREFERENCE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @return Element
+	 */
+	public static Element createVALUEREFERENCE(Document pDoc, Element pParentE) {
+		// 
+		Element e = pDoc.createElement("VALUE.REFERENCE");
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createVALUEREFARRAY
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @return Element
+	 */
+	public static Element createVALUEREFARRAY(Document pDoc, Element pParentE) {
+		// 
+		Element e = pDoc.createElement("VALUE.REFARRAY");
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	// ////////////////////////////////////////////////////////////////////////////////////////
+	// Properties elements
+	// ////////////////////////////////////////////////////////////////////////////////////////
+	/**
+	 * createPROPERTY
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @param pType
+	 * @return Element
+	 */
+	public static Element createPROPERTY(Document pDoc, Element pParentE, String pName, String pType) {
+		// 
+		// 
+
+		Element e = pDoc.createElement("PROPERTY");
+		if (pName != null) e.setAttribute("NAME", pName);
+		if (pType != null) e.setAttribute("TYPE", pType);
+		// TODO: ClassOrigin, Propagated
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createPROPERTYARRAY
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @param pType
+	 * @return Element
+	 */
+	public static Element createPROPERTYARRAY(Document pDoc, Element pParentE, String pName,
+			String pType) {
+		// 
+		// 
+
+		Element e = pDoc.createElement("PROPERTY.ARRAY");
+		if (pName != null) e.setAttribute("NAME", pName);
+		if (pType != null) e.setAttribute("TYPE", pType);
+		// TODO: ClassOrigin, Propagated
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createPROPERTYREFERENCE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @param pReferenceclass
+	 * @return Element
+	 */
+	public static Element createPROPERTYREFERENCE(Document pDoc, Element pParentE, String pName,
+			String pReferenceclass) {
+		// 
+		// 
+
+		Element e = pDoc.createElement("PROPERTY.REFERENCE");
+		if (pName != null) e.setAttribute("NAME", pName);
+		if (pReferenceclass != null && pReferenceclass.length() > 0) e.setAttribute(
+				"REFERENCECLASS", pReferenceclass);
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	// ////////////////////////////////////////////////////////////////////////////////////////
+	// Naming and Location elements
+	// ////////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * createNAMESPACE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createNAMESPACE(Document pDoc, Element pParentE, String pName) {
+		// 
+		// 
+		Element e = pDoc.createElement("NAMESPACE");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createLOCALINSTANCEPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @return Element
+	 */
+	public static Element createLOCALINSTANCEPATH(Document pDoc, Element pParentE) {
+		// 
+		Element e = pDoc.createElement("LOCALINSTANCEPATH");
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createCLASSNAME
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createCLASSNAME(Document pDoc, Element pParentE, String pName) {
+		// 
+		// 
+		Element e = pDoc.createElement("CLASSNAME");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+
+			pParentE.appendChild(e);
+		}
+		return e;
+	}
+
+	/**
+	 * createCLASS
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @param pSuperClass
+	 * @return Element
+	 */
+	public static Element createCLASS(Document pDoc, Element pParentE, String pName,
+			String pSuperClass) {
+		// 
+		// 
+		Element e = pDoc.createElement("CLASS");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+
+		}
+		if (pSuperClass != null && pSuperClass.length() > 0) {
+			e.setAttribute("SUPERCLASS", pSuperClass);
+
+		}
+		if (pParentE != null) pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createINSTANCENAME
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pClassName
+	 * @return Element
+	 */
+	public static Element createINSTANCENAME(Document pDoc, Element pParentE, String pClassName) {
+		// 
+		// 
+		Element e = pDoc.createElement("INSTANCENAME");
+		if (pClassName != null) {
+			e.setAttribute("CLASSNAME", pClassName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createKEYBINDING
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createKEYBINDING(Document pDoc, Element pParentE, String pName) {
+		// 
+		// 
+		Element e = pDoc.createElement("KEYBINDING");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	private static final Pattern NUM_PAT = Pattern.compile("^[su]int(8|16|32|64)$",
+			Pattern.CASE_INSENSITIVE);
+
+	/**
+	 * 
+	 * getValueTypeStr
+	 * 
+	 * @param pTypeStr
+	 * @return String
+	 */
+	private static String getValueTypeStr(String pTypeStr) {
+
+		if (pTypeStr == null || MOF.DT_STR.equalsIgnoreCase(pTypeStr)) return MOF.DT_STR;
+		if (MOF.DT_BOOL.equalsIgnoreCase(pTypeStr)) return MOF.DT_BOOL;
+		Matcher m = NUM_PAT.matcher(pTypeStr);
+		if (m.matches()) return "numeric";
+		return MOF.DT_STR;
+	}
+
+	/**
+	 * createKEYVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pValueType
+	 * @param pValue
+	 * @return KEYVALUE
+	 */
+	public static Element createKEYVALUE(Document pDoc, Element pParentE, String pValueType,
+			String pValue) {
+		/*
+		 *  
+		 */
+		if (pValueType == null) pValueType = "string";
+		Element e = pDoc.createElement("KEYVALUE");
+		// FIXME: ebak: TYPE attrib is more exact, easier to handle
+		e.setAttribute("TYPE", pValueType);
+		// ebak: maybe old CIMOMs won't understand the TYPE attrib
+		e.setAttribute("VALUETYPE", getValueTypeStr(pValueType));
+		pParentE.appendChild(e);
+		Text valueE = pDoc.createTextNode(pValue);
+		e.appendChild(valueE);
+		return e;
+	}
+
+	// ////////////////////////////////////////////////////////////////////////////////////////
+	// Object Definition Elements
+	// ////////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * createINSTANCE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pClassName
+	 * @return Element
+	 */
+	public static Element createINSTANCE(Document pDoc, Element pParentE, String pClassName) {
+		// 
+		// 
+
+		Element e = pDoc.createElement("INSTANCE");
+		if (pClassName != null) {
+			e.setAttribute("CLASSNAME", pClassName);
+		}
+		if (pParentE != null) pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createQUALIFIER
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @param pType
+	 * @return Element
+	 */
+	public static Element createQUALIFIER(Document pDoc, Element pParentE, String pName,
+			String pType) {
+		// 
+		// 
+
+		Element e = pDoc.createElement("QUALIFIER");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+			// TODO: add additional attributes "propagated", "qualifierFlavod"
+		}
+		if (pType != null) e.setAttribute("TYPE", pType);
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	// ///////////////////////////////////////////////////////////////////////////////////////////
+	// Message Elements
+	// ///////////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * createMESSAGE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pId
+	 * @param pProtocolVersion
+	 * @return Element
+	 */
+	public static Element createMESSAGE(Document pDoc, Element pParentE, String pId,
+			String pProtocolVersion) {
+		// 
+		// 
+		Element e = pDoc.createElement("MESSAGE");
+		e.setAttribute("ID", pId); // required
+		e.setAttribute("PROTOCOLVERSION", pProtocolVersion); // required
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createSIMPLEREQ
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @return Element
+	 */
+	public static Element createSIMPLEREQ(Document pDoc, Element pParentE) {
+		// 
+		Element e = pDoc.createElement("SIMPLEREQ");
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createSIMPLEREQ
+	 * 
+	 * @param pDoc
+	 * @return Element
+	 */
+	public static Element createSIMPLEREQ(Document pDoc) {
+		// 
+		Element e = pDoc.createElement("SIMPLEREQ");
+		return e;
+	}
+
+	/**
+	 * createMULTIREQ
+	 * 
+	 * @param pDoc
+	 * @return Element
+	 */
+	public static Element createMULTIREQ(Document pDoc) {
+		// 
+		Element e = pDoc.createElement("MULTIREQ");
+		return e;
+	}
+
+	/**
+	 * createMETHODCALL
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createMETHODCALL(Document pDoc, Element pParentE, String pName) {
+		// 
+		// 
+		Element e = pDoc.createElement("METHODCALL");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createPARAMVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pArg
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createPARAMVALUE(Document pDoc, Element pParentE, CIMArgument pArg)
+			throws WBEMException {
+		// )
+		// 
+		if (pArg == null) return null;
+		Element e = pDoc.createElement("PARAMVALUE");
+		EmbObjBuilder embObjBuilder = new EmbObjBuilder(pDoc, pArg);
+		if (pArg.getName() != null) {
+			e.setAttribute("NAME", pArg.getName());
+		}
+		e.setAttribute("PARAMTYPE", embObjBuilder.getTypeStr());
+		embObjBuilder.addSign(e);
+		embObjBuilder.addValue(e);
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createSIMPLERSP
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @return Element
+	 */
+	public static Element createSIMPLERSP(Document pDoc, Element pParentE) {
+		// 
+		Element e = pDoc.createElement("SIMPLERSP");
+
+		if (pParentE != null) pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createSIMPLEEXPRSP
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @return Element
+	 */
+	public static Element createSIMPLEEXPRSP(Document pDoc, Element pParentE) {
+		// 
+		Element e = pDoc.createElement("SIMPLEEXPRSP");
+
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createMETHODRESPONSE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createMETHODRESPONSE(Document pDoc, Element pParentE, String pName) {
+		// 
+		// 
+
+		// %CIMName;>
+		Element e = pDoc.createElement("METHODRESPONSE");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createIMETHODRESPONSE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createIMETHODRESPONSE(Document pDoc, Element pParentE, String pName) {
+		// 
+		// 
+		// %CIMName;>
+		Element e = pDoc.createElement("IMETHODRESPONSE");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createEXPMETHODRESPONSE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createEXPMETHODRESPONSE(Document pDoc, Element pParentE, String pName) {
+		// 
+		// 
+		Element e = pDoc.createElement("EXPMETHODRESPONSE");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createIRETURNVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @return Element
+	 */
+	public static Element createIRETURNVALUE(Document pDoc, Element pParentE) {
+		// 
+		Element e = pDoc.createElement("IRETURNVALUE");
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * 
      +	 * !ELEMENT RETURNVALUE (VALUE | VALUE.REFERENCE)
+	 * !ATTLIST RETURNVALUE
+	 * %ParamType;       #IMPLIED
+	 * 
      
+	 * 
+	 * createRETURNVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pValue
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createRETURNVALUE(Document pDoc, Element pParentE, Object pValue)
+			throws WBEMException {
+		Element retValE = pDoc.createElement("RETURNVALUE");
+		CIMDataType type = CIMDataType.getDataType(pValue);
+		retValE.setAttribute("PARAMTYPE", getTypeStr(type));
+		createVALUE(pDoc, retValE, pValue);
+		pParentE.appendChild(retValE);
+		return retValE;
+	}
+
+	/**
+	 * createIMETHODCALL
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createIMETHODCALL(Document pDoc, Element pParentE, String pName) {
+		// 
+		// 
+		Element e = pDoc.createElement("IMETHODCALL");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createIPARAMVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createIPARAMVALUE(Document pDoc, Element pParentE, String pName) {
+		// )
+		// 
+		Element e = pDoc.createElement("IPARAMVALUE");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createERROR
+	 * 
+	 * @param doc
+	 * @param parentE
+	 * @param error
+	 * @return Element
+	 */
+	public static Element createERROR(Document doc, Element parentE, CIMError error) {
+		// 
+		// 
+		Element e = doc.createElement("ERROR");
+		int code;
+		if ((code = error.getCode()) > 0) {
+			e.setAttribute("CODE", Integer.toString(code));
+		}
+		String description = error.getDescription();
+		if (description != null) {
+			e.setAttribute("DESCRIPTION", description);
+		}
+
+		parentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * ENTITY % QualifierFlavor "OVERRIDABLE (true|false) 'true' TOSUBCLASS
+	 * (true|false) 'true' TOINSTANCE (true|false) 'false' TRANSLATABLE
+	 * (true|false) 'false'"
+	 * 
+	 * @param pElement
+	 * @param pFlavors
+	 */
+	private static void setFlavors(Element pElement, int pFlavors) {
+		if ((pFlavors & CIMFlavor.TRANSLATE) > 0) {
+			pElement.setAttribute("TRANSLATABLE", MOF.TRUE);
+		}
+		if ((pFlavors & CIMFlavor.DISABLEOVERRIDE) > 0) {
+			pElement.setAttribute("OVERRIDABLE", MOF.FALSE);
+		}
+		if ((pFlavors & CIMFlavor.RESTRICTED) > 0) {
+			pElement.setAttribute("TOSUBCLASS", MOF.FALSE);
+		}
+		/*
+		 * if ((pFlavors & CIMFlavor.RESTRICTED)>0) {
+		 * pElement.setAttribute("TOSUBCLASS", "true"); }
+		 */
+	}
+
+	/**
+	 * createQUALIFIER_DECLARATION
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pQualifierType
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createQUALIFIER_DECLARATION(Document pDoc, Element pParentE,
+			CIMQualifierType pQualifierType) throws WBEMException {
+		// 
+		// 
+
+		String pValueTypeStr = getTypeStr(pQualifierType.getDataType());
+		Element qualifierdeclarationE = pDoc.createElement("QUALIFIER.DECLARATION");
+		qualifierdeclarationE.setAttribute("NAME", pQualifierType.getName());
+		qualifierdeclarationE.setAttribute("TYPE", pValueTypeStr);
+		qualifierdeclarationE.setAttribute("ISARRAY",
+				pQualifierType.getDataType().isArray() ? MOF.TRUE : MOF.FALSE);
+
+		setFlavors(qualifierdeclarationE, pQualifierType.getFlavor());
+
+		int scopes = pQualifierType.getScope();
+		if (scopes > 0) {
+			Element scopeE = pDoc.createElement("SCOPE");
+			if ((scopes & CIMScope.CLASS) > 0) scopeE.setAttribute("CLASS", MOF.TRUE);
+			if ((scopes & CIMScope.ASSOCIATION) > 0) scopeE.setAttribute("ASSOCIATION", MOF.TRUE);
+			if ((scopes & CIMScope.REFERENCE) > 0) scopeE.setAttribute("REFERENCE", MOF.TRUE);
+			if ((scopes & CIMScope.PROPERTY) > 0) scopeE.setAttribute("PROPERTY", MOF.TRUE);
+			if ((scopes & CIMScope.METHOD) > 0) scopeE.setAttribute("METHOD", MOF.TRUE);
+			if ((scopes & CIMScope.PARAMETER) > 0) scopeE.setAttribute("PARAMETER", MOF.TRUE);
+			if ((scopes & CIMScope.INDICATION) > 0) scopeE.setAttribute("INDICATION", MOF.TRUE);
+			qualifierdeclarationE.appendChild(scopeE);
+		}
+
+		createVALUE(pDoc, qualifierdeclarationE, pQualifierType.getValue());
+
+		pParentE.appendChild(qualifierdeclarationE);
+		return qualifierdeclarationE;
+	}
+
+	/**
+	 * createQUALIFIER
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pQualifier
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createQUALIFIER(Document pDoc, Element pParentE,
+			CIMQualifier pQualifier) throws WBEMException {
+		// 
+		// 
+
+		Object value = pQualifier.getValue();
+		if (value == null) return null;
+
+		Element qualifierE = createQUALIFIER(pDoc, pParentE, pQualifier.getName(),
+				getTypeStr(pQualifier.getDataType()));
+
+		if (pQualifier.isPropagated()) {
+			qualifierE.setAttribute("PROPAGATED", "true");
+		}
+		setFlavors(qualifierE, pQualifier.getFlavor());
+
+		createVALUE(pDoc, qualifierE, value);
+
+		pParentE.appendChild(qualifierE);
+		return qualifierE;
+	}
+
+	/**
+	 * createQUALIFIERS
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pQualifiersA
+	 * @throws WBEMException
+	 */
+	public static void createQUALIFIERS(Document pDoc, Element pParentE,
+			CIMQualifier[] pQualifiersA) throws WBEMException {
+		if (pQualifiersA == null) return;
+		for (int i = 0; i < pQualifiersA.length; i++) {
+			createQUALIFIER(pDoc, pParentE, pQualifiersA[i]);
+		}
+	}
+
+	/**
+	 * createPROPERTIES
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pProperties
+	 * @throws WBEMException
+	 */
+	public static void createPROPERTIES(Document pDoc, Element pParentE,
+			CIMProperty[] pProperties) throws WBEMException {
+		if (pProperties == null) return;
+		for (int i = 0; i < pProperties.length; i++) {
+			createPROPERTY(pDoc, pParentE, pProperties[i]);
+		}
+	}
+
+	private static final CIMQualifiedElementInterfaceImpl KEYQUALIFIERS_IMPL = new CIMQualifiedElementInterfaceImpl(
+			null, true);
+
+	static final CIMQualifier EMB_OBJ_QUALI = new CIMQualifier("EmbeddedObject",
+			CIMDataType.BOOLEAN_T, Boolean.TRUE, CIMFlavor.DISABLEOVERRIDE);
+
+	// ebak: embedded object: CLASS_T or INSTANCE_T?
+
+	/**
+	 * isCIMObject
+	 * 
+	 * @param typeCode
+	 * @return boolean
+	 */
+	public static boolean isCIMObject(int typeCode) {
+		return typeCode == CIMDataType.CLASS || typeCode == CIMDataType.OBJECT;
+	}
+
+	/**
+	 * isCIMObject
+	 * 
+	 * @param pType
+	 * @return boolean
+	 */
+	public static boolean isCIMObject(CIMDataType pType) {
+		return pType == null ? false : isCIMObject(pType.getType());
+	}
+
+	/**
+	 * getEmbObjTypeStr
+	 * 
+	 * @param pType
+	 * @return String
+	 */
+	public static String getEmbObjTypeStr(CIMDataType pType) {
+		return isCIMObject(pType) ? MOF.DT_STR : getTypeStr(pType);
+	}
+
+	private static Document getDoc() {
+		try {
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			DocumentBuilder docBuilder = factory.newDocumentBuilder();
+			return docBuilder.newDocument();
+		} catch (ParserConfigurationException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * cimObjectToXMLString - for embedded object support
+	 * 
+	 * @param pObj
+	 * @return String
+	 * @throws WBEMException
+	 */
+	public static String cimObjectToXMLString(Object pObj) throws WBEMException {
+		if (pObj == null) return null;
+		Document doc;
+		Element e;
+		if (pObj instanceof CIMClass) {
+			doc = getDoc();
+			e = createCLASS(doc, null, (CIMClass) pObj);
+		} else if (pObj instanceof CIMInstance) {
+			doc = getDoc();
+			e = createINSTANCE(doc, null, (CIMInstance) pObj);
+		} else {
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, pObj.getClass().getName()
+					+ " parameter is not suitable for this method!");
+		}
+		doc.appendChild(e);
+		ByteArrayOutputStream os = new ByteArrayOutputStream();
+		try {
+			CimXmlSerializer.serialize(os, doc.getDocumentElement(), false);
+		} catch (IOException ex) {
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED,
+					"XML serialization failed with IOException!", null, ex);
+		}
+		return os.toString();
+	}
+
+	/**
+	 * cimObjectArrayToXMLString - for embedded object support
+	 * 
+	 * @param pObj
+	 * @return String[]
+	 * @throws WBEMException
+	 */
+	public static String[] cimObjectArrayToXMLString(Object pObj) throws WBEMException {
+		if (pObj == null) return null;
+		if (!(pObj instanceof Object[])) throw new WBEMException(WBEMException.CIM_ERR_FAILED,
+				"Object[] parameter is required for this method!");
+		Object[] objA = (Object[]) pObj;
+		String[] strA = new String[objA.length];
+		// here we don't deal with the consistency check of the Object[]
+		for (int i = 0; i < objA.length; i++)
+			strA[i] = cimObjectToXMLString(objA[i]);
+		return strA;
+	}
+
+	static boolean embObjQualified(CIMQualifiedElementInterface pQualid) {
+		return pQualid.hasQualifier("EmbeddedObject") || pQualid.hasQualifier("EmbeddedInstance");
+	}
+
+	static class EmbObjBuilder {
+
+		private static final int ATTRIB_ONLY = 0, EO_QUALI = 1, EO_AND_EI_QUALI = 2;
+
+		private int iSignMethod;
+
+		private Document iDoc;
+
+		private CIMTypedElement iTypedE;
+
+		private boolean iXMLQualified;
+
+		private static final boolean iUpperCaseEmbObjEntities = WBEMConfiguration
+				.getGlobalConfiguration().upperCaseEmbObjEntities();
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pDoc
+		 * @param pTypedE
+		 */
+		public EmbObjBuilder(Document pDoc, CIMTypedElement pTypedE) {
+			this(pDoc, pTypedE, false);
+		}
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pDoc
+		 * @param pTypedE
+		 * @param pXMLQualified
+		 *            - e.g. CIMProperty is not qualified in JSR48, but
+		 *            qualified in CIM-XML
+		 */
+		public EmbObjBuilder(Document pDoc, CIMTypedElement pTypedE, boolean pXMLQualified) {
+			this.iDoc = pDoc;
+			this.iTypedE = pTypedE;
+			this.iXMLQualified = pXMLQualified;
+			String builderCfg = WBEMConfiguration.getGlobalConfiguration().getCimXmlEmbObjBuilder();
+			if ("EmbObjQuali".equalsIgnoreCase(builderCfg)) {
+				this.iSignMethod = EO_QUALI;
+			} else if ("EmbObjAndEmbInstQuali".equalsIgnoreCase(builderCfg)) {
+				this.iSignMethod = EO_AND_EI_QUALI;
+			} else {
+				this.iSignMethod = ATTRIB_ONLY;
+			}
+		}
+
+		/**
+		 * getTypeStr
+		 * 
+		 * @return String
+		 */
+		public String getTypeStr() {
+			return getEmbObjTypeStr(this.iTypedE.getDataType());
+		}
+
+		/**
+		 * isArray
+		 * 
+		 * @return String
+		 */
+		public boolean isArray() {
+			return this.iTypedE.getDataType().isArray();
+		}
+
+		private Object getValue() {
+			if (!(this.iTypedE instanceof CIMValuedElement)) return null;
+			return ((CIMValuedElement) this.iTypedE).getValue();
+
+		}
+
+		/**
+		 * addSign
+		 * 
+		 * @param pElement
+		 * @throws WBEMException
+		 */
+		public void addSign(Element pElement) throws WBEMException {
+			if (!isCIMObject(this.iTypedE.getDataType())) return;
+			CIMQualifiedElementInterface qualified;
+			if (this.iTypedE instanceof CIMQualifiedElementInterface) {
+				qualified = (CIMQualifiedElementInterface) this.iTypedE;
+				if (embObjQualified(qualified)) return;
+			} else {
+				qualified = null;
+			}
+			if (this.iSignMethod == ATTRIB_ONLY || (qualified == null && !this.iXMLQualified)) {
+				pElement.setAttribute(iUpperCaseEmbObjEntities ? "EMBEDDEDOBJECT"
+						: "EmbeddedObject",
+						this.iTypedE.getDataType().getType() == CIMDataType.OBJECT ? "instance"
+								: "object");
+			} else {
+				if (this.iSignMethod == EO_AND_EI_QUALI) {
+					addEmbObjOrEmbInstQuali(pElement);
+				} else { // EO_QUALI
+					createQUALIFIER(this.iDoc, pElement, EMB_OBJ_QUALI);
+				}
+			}
+		}
+
+		private void addEmbObjOrEmbInstQuali(Element pElement) throws WBEMException {
+			CIMQualifier signQuali;
+			if (this.iTypedE.getDataType().getType() == CIMDataType.OBJECT) {
+				CIMInstance inst;
+				if (isArray()) {
+					CIMInstance[] instA = (CIMInstance[]) getValue();
+					inst = instA == null ? null : instA[0];
+				} else {
+					inst = (CIMInstance) getValue();
+				}
+				String className = inst == null ? "" : inst.getClassName();
+				signQuali = new CIMQualifier("EmbeddedInstance", CIMDataType.STRING_T,
+						className, CIMFlavor.DISABLEOVERRIDE);
+			} else { // class
+				signQuali = EMB_OBJ_QUALI;
+			}
+			createQUALIFIER(this.iDoc, pElement, signQuali);
+		}
+
+		/**
+		 * addValue
+		 * 
+		 * @param pElement
+		 * @throws WBEMException
+		 */
+		public void addValue(Element pElement) throws WBEMException {
+			Object value = getValue();
+			if (value == null) return;
+			if (isCIMObject(this.iTypedE.getDataType())) {
+				if (isArray()) {
+					value = cimObjectArrayToXMLString(value);
+				} else {
+					value = cimObjectToXMLString(value);
+				}
+			}
+			createVALUE(this.iDoc, pElement, value);
+		}
+
+	}
+
+	/**
+	 * createPROPERTY
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pProperty
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createPROPERTY(Document pDoc, Element pParentE, CIMProperty pProperty)
+			throws WBEMException {
+		CIMDataType propType = pProperty.getDataType();
+		Element propertyE;
+		EmbObjBuilder embObjBuilder = new EmbObjBuilder(pDoc, pProperty, true);
+		String typeStr = embObjBuilder.getTypeStr();
+		if (propType.isArray()) {
+			propertyE = createPROPERTYARRAY(pDoc, pParentE, pProperty.getName(), typeStr);
+		} else if (propType.getType() == CIMDataType.REFERENCE) {
+			propertyE = createPROPERTYREFERENCE(pDoc, pParentE, pProperty.getName(), propType
+					.getRefClassName());
+		} else {
+			propertyE = createPROPERTY(pDoc, pParentE, pProperty.getName(), typeStr);
+		}
+
+		String classorigin = pProperty.getOriginClass();
+		if (classorigin != null && classorigin.length() > 0) propertyE.setAttribute("CLASSORIGIN",
+				classorigin);
+
+		if (pProperty.isPropagated()) propertyE.setAttribute("PROPAGATED", MOF.TRUE);
+		// FIXME: here key qualifier should be added if the property is a key
+		embObjBuilder.addSign(propertyE);
+		if (pProperty instanceof CIMClassProperty) {
+			createQUALIFIERS(pDoc, propertyE, ((CIMClassProperty) pProperty).getQualifiers());
+		} else { // CIMProperty
+			if (pProperty.isKey()) createQUALIFIERS(pDoc, propertyE, KEYQUALIFIERS_IMPL
+					.getQualifiers());
+		}
+		embObjBuilder.addValue(propertyE);
+		return propertyE;
+	}
+
+	/**
+	 * createVALUEARRAY
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pValA
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createVALUEARRAY(Document pDoc, Element pParentE, Object[] pValA)
+			throws WBEMException {
+		Element valuearrayE = (pValA != null && pValA.length > 0 && (pValA[0] instanceof CIMObjectPath || pValA[0] instanceof CIMInstance)) ? createVALUEREFARRAY(
+				pDoc, pParentE)
+				: createVALUEARRAY(pDoc, pParentE);
+
+		if (pValA != null) for (int i = 0; i < pValA.length; i++) {
+			createVALUE(pDoc, valuearrayE, pValA[i]);
+		}
+		pParentE.appendChild(valuearrayE);
+		return valuearrayE;
+	}
+
+	/**
+	 * createVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pArgValue
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createVALUE(Document pDoc, Element pParentE, Object pArgValue)
+			throws WBEMException {
+		if (pArgValue == null) return null;
+
+		Element valueE = null;
+		if (pArgValue instanceof Object[]) {
+			valueE = createVALUEARRAY(pDoc, pParentE, (Object[]) pArgValue);
+		} else {
+			CIMDataType type = CIMDataType.getDataType(pArgValue);
+			if (type != null && type.getType() == CIMDataType.REFERENCE) {
+				valueE = createVALUEREFERENCE(pDoc, pParentE);
+
+				CIMObjectPath op = (CIMObjectPath) pArgValue;
+				CIMProperty[] keys = op.getKeys();
+				if (op.getHost() == null || "".equals(op.getHost())) {
+					if (op.getNamespace() == null || "".equals(op.getNamespace())) {
+						if (keys.length > 0) {
+							createINSTANCENAME(pDoc, valueE, op);
+						} else {
+							createCLASSNAME(pDoc, valueE, op.getObjectName());
+						}
+					} else {
+						if (keys.length > 0) {
+							createLOCALINSTANCEPATH(pDoc, valueE, op);
+						} else {
+							createLOCALCLASSPATH(pDoc, valueE, op);
+						}
+					}
+				} else {
+					if (keys.length > 0) {
+						createINSTANCEPATH(pDoc, valueE, op);
+					} else {
+						createCLASSPATH(pDoc, valueE, op);
+					}
+				}
+				// createOBJECTPATH(doc, valueE, (CIMObjectPath) obj);
+			} else {
+				if (pArgValue instanceof CIMInstance) {
+					valueE = createVALUEREFERENCE(pDoc, pParentE);
+					CIMObjectPath cop = ((CIMInstance) pArgValue).getObjectPath();
+					createINSTANCENAME(pDoc, valueE, cop);
+				} else if (pArgValue instanceof CIMClass) {
+					valueE = createVALUE(pDoc, pParentE);
+					createCLASS(pDoc, valueE, (CIMClass) pArgValue);
+				} else {
+					createVALUE(pDoc, pParentE, pArgValue.toString());
+				}
+			}
+		}
+
+		return valueE;
+	}
+
+	/**
+	 * createINSTANCE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pInstance
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createINSTANCE(Document pDoc, Element pParentE, CIMInstance pInstance)
+			throws WBEMException {
+		// 
+		// 
+
+		String className = pInstance.getObjectPath().getObjectName();
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_FAILED,
+				"null class name");
+
+		Element instanceE = createINSTANCE(pDoc, pParentE, className);
+
+		// FIXME: in JSR48 CIMInstance doesn't have qualifiers
+		// createQUALIFIERS(pDoc, instanceE, pInstance.getQualifiers());
+		createPROPERTIES(pDoc, instanceE, pInstance.getProperties());
+
+		if (pParentE != null) pParentE.appendChild(instanceE);
+
+		return instanceE;
+	}
+
+	/**
+	 * createOBJECTPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createOBJECTPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
+			throws WBEMException {
+		Element objectpathE = pDoc.createElement("OBJECTPATH");
+
+		CIMProperty[] keys = pPath.getKeys();
+		if (keys.length > 0) {
+			createINSTANCEPATH(pDoc, objectpathE, pPath);
+		} else {
+			createCLASSPATH(pDoc, objectpathE, pPath);
+		}
+
+		pParentE.appendChild(objectpathE);
+		return objectpathE;
+	}
+
+	/**
+	 * createOBJECTNAME
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createOBJECTNAME(Document pDoc, Element pParentE, CIMObjectPath pPath)
+			throws WBEMException {
+
+		CIMProperty[] keys = pPath.getKeys();
+		if (keys.length > 0) { return createINSTANCENAME(pDoc, pParentE, pPath); }
+		if (pPath.getObjectName() == null) throw new WBEMException(
+				WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
+		return createCLASSNAME(pDoc, pParentE, pPath.getObjectName());
+	}
+
+	/**
+	 * createLOCALINSTANCEPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createLOCALINSTANCEPATH(Document pDoc, Element pParentE,
+			CIMObjectPath pPath) throws WBEMException {
+		Element localinstancepathE = pDoc.createElement("LOCALINSTANCEPATH");
+
+		createLOCALNAMESPACEPATH(pDoc, localinstancepathE, pPath);
+		createINSTANCENAME(pDoc, localinstancepathE, pPath);
+
+		pParentE.appendChild(localinstancepathE);
+		return localinstancepathE;
+	}
+
+	/**
+	 * createLOCALCLASSPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createLOCALCLASSPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
+			throws WBEMException {
+		Element localinstancepathE = pDoc.createElement("LOCALCLASSPATH");
+
+		createLOCALNAMESPACEPATH(pDoc, localinstancepathE, pPath);
+
+		if (pPath.getObjectName() == null) throw new WBEMException(
+				WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
+		createCLASSNAME(pDoc, localinstancepathE, pPath.getObjectName());
+
+		pParentE.appendChild(localinstancepathE);
+		return localinstancepathE;
+	}
+
+	/**
+	 * createLOCALOBJECTPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createLOCALOBJECTPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
+			throws WBEMException {
+
+		CIMProperty[] keys = pPath.getKeys();
+		if (keys.length > 0) { return createLOCALINSTANCEPATH(pDoc, pParentE, pPath); }
+		return createLOCALCLASSPATH(pDoc, pParentE, pPath);
+	}
+
+	/**
+	 * createVALUEREFERENCE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createVALUEREFERENCE(Document pDoc, Element pParentE, CIMObjectPath pPath)
+			throws WBEMException {
+		Element objectpathE = pDoc.createElement("VALUE.REFERENCE");
+
+		String ns = pPath.getNamespace();
+		if (pPath.getHost() == null || "".equals(pPath.getHost())) {
+			if (pPath.getNamespace() == null || "".equals(ns)) {
+				createINSTANCENAME(pDoc, objectpathE, pPath);
+			} else {
+				createLOCALOBJECTPATH(pDoc, objectpathE, pPath);
+			}
+		} else {
+			CIMProperty[] keys = pPath.getKeys();
+			if (keys.length > 0) {
+				createINSTANCEPATH(pDoc, objectpathE, pPath);
+			} else {
+				createCLASSPATH(pDoc, objectpathE, pPath);
+			}
+		}
+
+		pParentE.appendChild(objectpathE);
+		return objectpathE;
+	}
+
+	/**
+	 * createINSTANCENAME
+	 * 
+	 * @param doc
+	 * @param parentE
+	 * @param instanceOP
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createINSTANCENAME(Document doc, Element parentE, CIMObjectPath instanceOP)
+			throws WBEMException {
+
+		Element instancenameE = doc.createElement("INSTANCENAME");
+		String classname = instanceOP.getObjectName();
+		if (classname != null) {
+			instancenameE.setAttribute("CLASSNAME", classname);
+		}
+
+		CIMProperty[] keysA = instanceOP.getKeys();
+		for (int ii = 0; ii < keysA.length; ii++) {
+			CIMProperty prop = keysA[ii];
+			String propName = prop.getName();
+			CIMDataType propType = prop.getDataType();
+			Object propValue = prop.getValue();
+			// if (_pValue == null) TODO what happened when a KeyBinding has a
+			// null property value?
+			/*
+			 * ebak: test support for #1666336 EnumInstance has attributes
+			 * filled from others  Handling direct KEYVALUE and
+			 * VALUE.REFERENCE children is difficult, KEYBINDING can wrap them
+			 * -> dropping out KEYVALUE? | VALUE.REFERENCE?.
+			 * 
+			 *  
+			 * 
+			 *   - non
+			 * reference values can be null
+			 * 
+			 *  - reference
+			 * value shouldn't be null
+			 */
+			if (propType == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER,
+					"Type of property or key cannot be a null! " + propName + " in ObjectPath "
+							+ instanceOP.toString() + " has null type."); }
+
+			if (propValue == null) {
+				if (propType.getType() == CIMDataType.REFERENCE) { throw new WBEMException(
+						WBEMException.CIM_ERR_INVALID_PARAMETER,
+						"Value of reference cannot be null! " + propName + " in ObjectPath "
+								+ instanceOP.toString() + " has null value."); }
+			}
+
+			Element keybindingE = createKEYBINDING(doc, instancenameE, propName);
+			if (propType.getType() == CIMDataType.REFERENCE) {
+				CIMObjectPath refOP = (CIMObjectPath) propValue;
+
+				createVALUEREFERENCE(doc, keybindingE, refOP);
+			} else {
+				String valueStr = propValue == null ? null : propValue.toString();
+				String valueTypeStr = getTypeStr(propType);
+				createKEYVALUE(doc, keybindingE, valueTypeStr, valueStr);
+			}
+		}
+
+		parentE.appendChild(instancenameE);
+		return instancenameE;
+	}
+
+	/**
+	 * createCLASSPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pPath
+	 * @return Element
+	 */
+	public static Element createCLASSPATH(Document pDoc, Element pParentE, CIMObjectPath pPath) {
+		Element classpathE = pDoc.createElement("CLASSPATH");
+
+		// ebak: NAMESPACEPATH is necessary
+		createNAMESPACEPATH(pDoc, classpathE, pPath);
+		createCLASSNAME(pDoc, classpathE, pPath.getObjectName());
+
+		pParentE.appendChild(classpathE);
+		return classpathE;
+	}
+
+	/**
+	 * createPARAMETERS
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pParameters
+	 * @throws WBEMException
+	 */
+	public static void createPARAMETERS(Document pDoc, Element pParentE,
+			CIMParameter[] pParameters) throws WBEMException {
+		if (pParameters == null) return;
+		for (int i = 0; i < pParameters.length; i++) {
+			createPARAMETER(pDoc, pParentE, pParameters[i]);
+		}
+	}
+
+	/**
+	 * createPARAMETER
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pParameter
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createPARAMETER(Document pDoc, Element pParentE,
+			CIMParameter pParameter) throws WBEMException {
+		Element parameterE;
+		CIMDataType type = pParameter.getDataType();
+		int typeCode = type.getType();
+		EmbObjBuilder embObjBuilder = new EmbObjBuilder(pDoc, pParameter);
+		String typeStr = embObjBuilder.getTypeStr();
+		if (type.isArray()) {
+			if (typeCode == CIMDataType.REFERENCE) {
+				parameterE = pDoc.createElement("PARAMETER.REFARRAY");
+				String refclass = type.getRefClassName();
+				if (refclass != null && refclass.length() > 0) parameterE.setAttribute(
+						"REFERENCECLASS", type.getRefClassName());
+			} else {
+				parameterE = pDoc.createElement("PARAMETER.ARRAY");
+				parameterE.setAttribute("TYPE", typeStr);
+			}
+		} else {
+			if (typeCode == CIMDataType.REFERENCE) {
+				parameterE = pDoc.createElement("PARAMETER.REFERENCE");
+				String refclass = type.getRefClassName();
+				if (refclass != null && refclass.length() > 0) parameterE.setAttribute(
+						"REFERENCECLASS", type.getRefClassName());
+			} else {
+				parameterE = pDoc.createElement("PARAMETER");
+				parameterE.setAttribute("TYPE", typeStr);
+			}
+		}
+		parameterE.setAttribute("NAME", pParameter.getName());
+		embObjBuilder.addSign(parameterE);
+		createQUALIFIERS(pDoc, parameterE, pParameter.getQualifiers());
+
+		pParentE.appendChild(parameterE);
+		return parameterE;
+	}
+
+	/**
+	 * createMETHODS
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pMethods
+	 * @param pClassName
+	 * @throws WBEMException
+	 */
+	public static void createMETHODS(Document pDoc, Element pParentE, CIMMethod[] pMethods,
+			String pClassName) throws WBEMException {
+		for (int i = 0; i < pMethods.length; i++) {
+			createMETHOD(pDoc, pParentE, pMethods[i], pClassName);
+		}
+	}
+
+	/**
+	 * createMETHOD
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pMethod
+	 * @param pClassName
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createMETHOD(Document pDoc, Element pParentE, CIMMethod pMethod,
+			String pClassName) throws WBEMException {
+		Element methodE = pDoc.createElement("METHOD");
+
+		methodE.setAttribute("NAME", pMethod.getName());
+		EmbObjBuilder embObjBuilder = new EmbObjBuilder(pDoc, pMethod);
+		String typeStr = embObjBuilder.getTypeStr();
+		methodE.setAttribute("TYPE", typeStr);
+		String classorigin = pMethod.getOriginClass();
+
+		if (classorigin != null && classorigin.length() != 0) methodE.setAttribute("CLASSORIGIN",
+				classorigin);
+
+		// 17459
+		if (pMethod.isPropagated()) {
+			methodE.setAttribute("PROPAGATED", MOF.TRUE);
+		} else {
+			methodE.setAttribute("PROPAGATED", MOF.FALSE);
+		}
+		// ebak: embedded object support
+		embObjBuilder.addSign(methodE);
+
+		createQUALIFIERS(pDoc, methodE, pMethod.getQualifiers());
+		createPARAMETERS(pDoc, methodE, pMethod.getParameters());
+
+		pParentE.appendChild(methodE);
+		return methodE;
+	}
+
+	/*
+	 * private static String elementStr(Element pE) { try {
+	 * ByteArrayOutputStream os = new ByteArrayOutputStream();
+	 * CimXmlSerializer.serialize(os, pE, true); return new
+	 * String(os.toByteArray()); } catch (RuntimeException e) { throw e; } catch
+	 * (Exception e) { throw new RuntimeException(e); } }
+	 */
+
+	/**
+	 * createCLASS
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pClass
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createCLASS(Document pDoc, Element pParentE, CIMClass pClass)
+			throws WBEMException {
+
+		Element classE = createCLASS(pDoc, pParentE, pClass.getName(), pClass.getSuperClassName());
+
+		createQUALIFIERS(pDoc, classE, pClass.getQualifiers());
+		createPROPERTIES(pDoc, classE, pClass.getProperties());
+		createMETHODS(pDoc, classE, pClass.getMethods(), pClass.getName());
+
+		// parentE.appendChild(classE);
+		return classE;
+	}
+
+	/**
+	 * createHOST
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pHost
+	 * @return Element
+	 */
+	public static Element createHOST(Document pDoc, Element pParentE, String pHost) {
+		Element hostE = pDoc.createElement("HOST");
+
+		Text hostT = pDoc.createTextNode(pHost);
+		hostE.appendChild(hostT);
+
+		pParentE.appendChild(hostE);
+		return hostE;
+	}
+
+	/**
+	 * createNAMESPACEPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pPath
+	 * @return Element
+	 */
+	public static Element createNAMESPACEPATH(Document pDoc, Element pParentE, CIMObjectPath pPath) {
+		Element namespacepathE = pDoc.createElement("NAMESPACEPATH");
+
+		String host = pPath.getHost();
+		if (host == null) {
+			// try {
+			// host = InetAddress.getLocalHost().getHostAddress();
+			// } catch (Exception e) {
+			// throw new CIMXMLBuilderException("Error while resolving
+			// hostname");
+			// }
+			host = "unassigned-hostname";
+		}
+		createHOST(pDoc, namespacepathE, host);
+		createLOCALNAMESPACEPATH(pDoc, namespacepathE, pPath);
+
+		pParentE.appendChild(namespacepathE);
+		return namespacepathE;
+	}
+
+	/**
+	 * createINSTANCEPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pPath
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createINSTANCEPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
+			throws WBEMException {
+		Element instancepathE = pDoc.createElement("INSTANCEPATH");
+
+		createNAMESPACEPATH(pDoc, instancepathE, pPath);
+		createINSTANCENAME(pDoc, instancepathE, pPath);
+		pParentE.appendChild(instancepathE);
+		return instancepathE;
+	}
+
+	/**
+	 * createVALUENAMEDINSTANCE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pPath
+	 * @param pInst
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createVALUENAMEDINSTANCE(Document pDoc, Element pParentE,
+			CIMObjectPath pPath, CIMInstance pInst) throws WBEMException {
+		Element valuenamedinstanceE = pDoc.createElement("VALUE.NAMEDINSTANCE");
+		createINSTANCENAME(pDoc, valuenamedinstanceE, pPath);
+		createINSTANCE(pDoc, valuenamedinstanceE, pInst);
+
+		pParentE.appendChild(valuenamedinstanceE);
+		return valuenamedinstanceE;
+	}
+
+	/**
+	 * createVALUENAMEDINSTANCE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pInst
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createVALUENAMEDINSTANCE(Document pDoc, Element pParentE,
+			CIMInstance pInst) throws WBEMException {
+		Element valuenamedinstanceE = pDoc.createElement("VALUE.NAMEDINSTANCE");
+		createINSTANCENAME(pDoc, valuenamedinstanceE, pInst.getObjectPath());
+		createINSTANCE(pDoc, valuenamedinstanceE, pInst);
+
+		pParentE.appendChild(valuenamedinstanceE);
+		return valuenamedinstanceE;
+	}
+
+	private static CIMObjectPath changeNameSpace(CIMNamedElementInterface pNamedElement,
+			String pNameSpace) {
+		CIMObjectPath path = pNamedElement.getObjectPath();
+		return new CIMObjectPath(path.getScheme(), path.getHost(), path.getPort(), pNameSpace, path
+				.getObjectName(), path.getKeys());
+	}
+
+	private static CIMClass changeClassNameSpace(CIMClass pClass, String pNameSpace) {
+		CIMObjectPath newOp = changeNameSpace(pClass, pNameSpace);
+		return new CIMClass(newOp, pClass.getSuperClassName(), pClass.getQualifiers(), pClass
+				.getProperties(), pClass.getMethods(), pClass.isAssociation(), pClass.isKeyed());
+	}
+
+	private static CIMInstance changeInstanceNameSpace(CIMInstance pInst, String pNameSpace) {
+		CIMObjectPath newOp = changeNameSpace(pInst, pNameSpace);
+		return new CIMInstance(newOp, pInst.getProperties());
+	}
+
+	/**
+	 * createVALUEOBJECTWITHPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pObj
+	 * @param pNameSpace
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createVALUEOBJECTWITHPATH(Document pDoc, Element pParentE, Object pObj,
+			String pNameSpace) throws WBEMException {
+		Element valueobjectwithpathE = pDoc.createElement("VALUE.OBJECTWITHPATH");
+		if (pObj instanceof CIMClass) {
+			CIMClass clazz = (CIMClass) pObj;
+
+			if (clazz.getObjectPath().getNamespace() == null
+					|| clazz.getObjectPath().getNamespace().length() == 0) {
+				// ebak: changing the namespace in clazz's objectPath
+				// clazz.getObjectPath().setNameSpace(pNameSpace);
+				clazz = changeClassNameSpace(clazz, pNameSpace);
+			}
+
+			createCLASSPATH(pDoc, valueobjectwithpathE, clazz.getObjectPath());
+			createCLASS(pDoc, valueobjectwithpathE, clazz);
+		} else if (pObj instanceof CIMInstance) {
+			CIMInstance inst = (CIMInstance) pObj;
+			if (inst.getObjectPath().getNamespace() == null
+					|| inst.getObjectPath().getNamespace().length() == 0) {
+				// ebak: changing the namespace ins inst's objectPath
+				// inst.getObjectPath().setNameSpace(pNameSpace);
+				inst = changeInstanceNameSpace(inst, pNameSpace);
+			}
+			createINSTANCEPATH(pDoc, valueobjectwithpathE, inst.getObjectPath());
+			createINSTANCE(pDoc, valueobjectwithpathE, inst);
+		}
+
+		pParentE.appendChild(valueobjectwithpathE);
+		return valueobjectwithpathE;
+	}
+
+	/**
+	 * createVALUEOBJECTWITHLOCALPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pObj
+	 * @param pNameSpace
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createVALUEOBJECTWITHLOCALPATH(Document pDoc, Element pParentE,
+			Object pObj, String pNameSpace) throws WBEMException {
+		Element valueobjectwithpathE = pDoc.createElement("VALUE.OBJECTWITHLOCALPATH");
+		if (pObj instanceof CIMClass) {
+			CIMClass clazz = (CIMClass) pObj;
+
+			if (clazz.getObjectPath().getNamespace() == null
+					|| clazz.getObjectPath().getNamespace().length() == 0) {
+				// ebak: changing clazz's objectPath
+				// clazz.getObjectPath().setNameSpace(pNameSpace);
+				clazz = changeClassNameSpace(clazz, pNameSpace);
+			}
+			createLOCALCLASSPATH(pDoc, valueobjectwithpathE, clazz.getObjectPath());
+			createCLASS(pDoc, valueobjectwithpathE, clazz);
+		} else if (pObj instanceof CIMInstance) {
+			CIMInstance inst = (CIMInstance) pObj;
+			if (inst.getObjectPath().getNamespace() == null
+					|| inst.getObjectPath().getNamespace().length() == 0) {
+				// inst.getObjectPath().setNameSpace(pNameSpace);
+				inst = changeInstanceNameSpace(inst, pNameSpace);
+			}
+			createLOCALINSTANCEPATH(pDoc, valueobjectwithpathE, inst.getObjectPath());
+			createINSTANCE(pDoc, valueobjectwithpathE, inst);
+		}
+
+		pParentE.appendChild(valueobjectwithpathE);
+		return valueobjectwithpathE;
+	}
+
+	/**
+	 * createIRETURNVALUE_ERROR
+	 * 
+	 * @param doc
+	 * @param parentE
+	 * @param error
+	 * @return Element
+	 */
+	public static Element createIRETURNVALUE_ERROR(Document doc, Element parentE, CIMError error) {
+		Element ireturnvalueE = doc.createElement("IRETURNVALUE");
+
+		parentE.appendChild(ireturnvalueE);
+		return ireturnvalueE;
+	}
+
+	/**
+	 * createIRETURNVALUE_GETINSTANCE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pInst
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createIRETURNVALUE_GETINSTANCE(Document pDoc, Element pParentE,
+			CIMInstance pInst) throws WBEMException {
+		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
+		createINSTANCENAME(pDoc, ireturnvalueE, pInst.getObjectPath());
+
+		return ireturnvalueE;
+	}
+
+	/**
+	 * createIRETURNVALUE_ASSOCIATORS_NAMES
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pResultSet
+	 * @return Element
+	 * @throws Exception
+	 */
+	public static Element createIRETURNVALUE_ASSOCIATORS_NAMES(Document pDoc, Element pParentE,
+			CIMObjectPath[] pResultSet) throws Exception {
+		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
+
+		if (pResultSet != null) {
+			for (int i = 0; i < pResultSet.length; i++) {
+				CIMObjectPath path = pResultSet[i];
+
+				if (path.getHost() == null || "".equals(path.getHost())) createLOCALOBJECTPATH(
+						pDoc, ireturnvalueE, path);
+				else createOBJECTPATH(pDoc, ireturnvalueE, path);
+			}
+		}
+		pParentE.appendChild(ireturnvalueE);
+		return ireturnvalueE;
+	}
+
+	/**
+	 * createIRETURNVALUE_ASSOCIATORS
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pResultSet
+	 * @param pNameSpace
+	 * @return Element
+	 * @throws Exception
+	 */
+	public static Element createIRETURNVALUE_ASSOCIATORS(Document pDoc, Element pParentE,
+			Object[] pResultSet, String pNameSpace) throws Exception {
+		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
+		if (pResultSet != null) {
+			for (int i = 0; i < pResultSet.length; i++) {
+				Object obj = pResultSet[i];
+				CIMObjectPath op = null;
+				if (obj instanceof CIMClass) {
+					op = ((CIMClass) obj).getObjectPath();
+				} else if (obj instanceof CIMInstance) {
+					op = ((CIMInstance) obj).getObjectPath();
+				} else {
+					throw new WBEMException(WBEMException.CIM_ERR_FAILED,
+							"object in result set neither class nor instance!");
+				}
+				if (op.getHost() == null || "".equals(op.getHost())) {
+					createVALUEOBJECTWITHLOCALPATH(pDoc, ireturnvalueE, obj, pNameSpace);
+				} else {
+					createVALUEOBJECTWITHPATH(pDoc, ireturnvalueE, obj, pNameSpace);
+				}
+			}
+		}
+		pParentE.appendChild(ireturnvalueE);
+		return ireturnvalueE;
+	}
+
+	/**
+	 * createIRETURNVALUE_ENUMERATE_INSTANCENAME
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pResultSet
+	 * @param pNameSpace
+	 * @return Element
+	 * @throws Exception
+	 */
+	public static Element createIRETURNVALUE_ENUMERATE_INSTANCENAME(Document pDoc,
+			Element pParentE, Object[] pResultSet, String pNameSpace) throws Exception {
+		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
+		if (pResultSet != null) {
+			for (int i = 0; i < pResultSet.length; i++) {
+				Object obj = pResultSet[i];
+				CIMObjectPath op = null;
+				if (obj instanceof CIMClass) {
+					op = ((CIMClass) obj).getObjectPath();
+				} else if (obj instanceof CIMInstance) {
+					op = ((CIMInstance) obj).getObjectPath();
+				} else {
+					throw new WBEMException(WBEMException.CIM_ERR_FAILED,
+							"object in result set neither class nor instance!");
+				}
+				if (op.getHost() == null || "".equals(op.getHost())) {
+					createVALUEOBJECTWITHLOCALPATH(pDoc, ireturnvalueE, obj, pNameSpace);
+				} else {
+					createVALUEOBJECTWITHPATH(pDoc, ireturnvalueE, obj, pNameSpace);
+				}
+			}
+		}
+		pParentE.appendChild(ireturnvalueE);
+		return ireturnvalueE;
+	}
+
+	/**
+	 * createIRETURNVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pResultSet
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createIRETURNVALUE(Document pDoc, Element pParentE, Object[] pResultSet)
+			throws WBEMException {
+		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
+		if (pResultSet != null && pResultSet.length > 0) {
+			Object obj = pResultSet[0];
+			if (obj instanceof CIMClass) {
+				for (int i = 0; i < pResultSet.length; i++) {
+					CIMClass clazz = (CIMClass) pResultSet[i];
+					Element classnameE = pDoc.createElement("CLASSNAME");
+					ireturnvalueE.appendChild(classnameE);
+					if (clazz.getName() != null) classnameE.setAttribute("NAME", clazz.getName());
+				}
+			} else if (obj instanceof CIMInstance) {
+				for (int i = 0; i < pResultSet.length; i++) {
+					CIMInstance inst = (CIMInstance) pResultSet[i];
+					createVALUENAMEDINSTANCE(pDoc, ireturnvalueE, inst);
+				}
+			}
+		}
+		pParentE.appendChild(ireturnvalueE);
+		return ireturnvalueE;
+	}
+
+	/**
+	 * createIRETURNVALUE_ENUMERATE_CLASSNAME
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pResultSet
+	 * @return Element
+	 */
+	public static Element createIRETURNVALUE_ENUMERATE_CLASSNAME(Document pDoc, Element pParentE,
+			CIMClass[] pResultSet) {
+		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
+		if (pResultSet != null && pResultSet.length > 0) {
+			for (int i = 0; i < pResultSet.length; i++) {
+				CIMClass clazz = pResultSet[i];
+
+				Element classnameE = pDoc.createElement("CLASSNAME");
+				ireturnvalueE.appendChild(classnameE);
+				if (clazz.getName() != null) classnameE.setAttribute("NAME", clazz.getName());
+			}
+		}
+		pParentE.appendChild(ireturnvalueE);
+		return ireturnvalueE;
+	}
+
+	/**
+	 * createIndication_response
+	 * 
+	 * @param doc
+	 * @param ID
+	 * @param error
+	 * @return Element
+	 */
+	// ebak: [ 1656285 ] IndicationHandler does not accept non-Integer message
+	// ID
+	public static Element createIndication_response(Document doc, String ID, CIMError error) {
+
+		// xmlBuilder.create XML
+		Element cimE = createCIM(doc);
+		Element messageE = createMESSAGE(doc, cimE, ID, "1.0");
+		Element simpleexprspE = createSIMPLEEXPRSP(doc, messageE);
+		Element expmethodresponseE = createEXPMETHODRESPONSE(doc, simpleexprspE, "ExportIndication");
+		if (error == null) {
+			createIRETURNVALUE(doc, expmethodresponseE);
+		} else {
+			createERROR(doc, expmethodresponseE, error);
+		}
+		// Element
+		return cimE;
+	}
+
+	/**
+	 * createIRETURNVALUE_ENUMERATE_INSTANCE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pResultSet
+	 * @return Element
+	 * @throws WBEMException
+	 */
+	public static Element createIRETURNVALUE_ENUMERATE_INSTANCE(Document pDoc, Element pParentE,
+			CIMInstance[] pResultSet) throws WBEMException {
+		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
+		if (pResultSet != null && pResultSet.length > 0) {
+			for (int i = 0; i < pResultSet.length; i++) {
+				createVALUENAMEDINSTANCE(pDoc, ireturnvalueE, pResultSet[i]);
+			}
+		}
+		pParentE.appendChild(ireturnvalueE);
+		return ireturnvalueE;
+	}
+
+	/**
+	 * getTypeStr
+	 * 
+	 * @param pType
+	 * @return String
+	 */
+	public static String getTypeStr(CIMDataType pType) {
+		if (pType == null) return "string";
+		if (pType.getType() == CIMDataType.REFERENCE) return MOF.REFERENCE;
+		return MOF.dataType(pType);
+	}
+
+	/**
+	 * getOpTypeStr
+	 * 
+	 * @param pType
+	 * @return String
+	 */
+	public static String getOpTypeStr(CIMDataType pType) {
+		return getTypeStr(pType);
+	}
+
+	private static final Pattern NAMESPACE_SPLIT_PATTERN = Pattern.compile("/+");
+
+	/**
+	 * createLOCALNAMESPACEPATH
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createLOCALNAMESPACEPATH(Document pDoc, Element pParentE,
+			CIMObjectPath pName) {
+		if (pName == null) return null;
+		// TODO: name(ObjectPath) should not be null, should an exception be
+		// thrown?
+		// This assumes that the NameSpace does not consist exclusively of
+		// empties like "////"
+		Element localnamespacepathE = pDoc.createElement("LOCALNAMESPACEPATH");
+		String nameSpace = pName.getNamespace();
+		if (nameSpace != null) {
+			String[] nsA = NAMESPACE_SPLIT_PATTERN.split(nameSpace);
+			for (int i = 0; i < nsA.length; i++)
+				if (nsA[i] != null && nsA[i].length() > 0) createNAMESPACE(pDoc,
+						localnamespacepathE, nsA[i]);
+		}
+		pParentE.appendChild(localnamespacepathE);
+
+		return localnamespacepathE;
+	}
+
+	/**
+	 * createSIMPLEEXPREQ
+	 * 
+	 * @param pDoc
+	 * @return Element
+	 */
+	public static Element createSIMPLEEXPREQ(Document pDoc) {
+		// 
+		Element e = pDoc.createElement("SIMPLEEXPREQ");
+		return e;
+	}
+
+	/**
+	 * createEXPMETHODCALL
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createEXPMETHODCALL(Document pDoc, Element pParentE, String pName) {
+		// 
+		// 
+		Element e = pDoc.createElement("EXPMETHODCALL");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+
+	/**
+	 * createEXPPARAMVALUE
+	 * 
+	 * @param pDoc
+	 * @param pParentE
+	 * @param pName
+	 * @return Element
+	 */
+	public static Element createEXPPARAMVALUE(Document pDoc, Element pParentE, String pName) {
+		// 
+		// 
+		Element e = pDoc.createElement("EXPPARAMVALUE");
+		if (pName != null) {
+			e.setAttribute("NAME", pName);
+		}
+		pParentE.appendChild(e);
+		return e;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java
similarity index 65%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java
index 94e3e02..72424de 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java
@@ -1,74 +1,72 @@
-/*
-  CIMXMLParseException.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-
-/**
- * Class CIMXMLParseException is used by the CIM-XML DOM parser.
- * 
- */
-public class CIMXMLParseException extends IOException {
-
-	private static final long serialVersionUID = 1237082621297618586L;
-
-	/**
-	 * Ctor.
-	 */
-	public CIMXMLParseException() {
-		super();
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param reason
-	 */
-	public CIMXMLParseException(String reason) {
-		super(reason);
-	}
-}
+/*
+  CIMXMLParseException.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+
+/**
+ * Class CIMXMLParseException is used by the CIM-XML DOM parser.
+ * 
+ */
+public class CIMXMLParseException extends IOException {
+
+	private static final long serialVersionUID = 1237082621297618586L;
+
+	/**
+	 * Ctor.
+	 */
+	public CIMXMLParseException() {
+		super();
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param reason
+	 */
+	public CIMXMLParseException(String reason) {
+		super(reason);
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java
similarity index 95%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java
index 712c74c..e97b6bf 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java
@@ -1,3884 +1,3881 @@
-/*
-  CIMXMLParserImpl.java
-
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1464860    2006-05-15  lupusalex    No default value for VALUETYPE assumed
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1547910    2006-09-05  ebak         parseIMETHODCALL() CIMObjectPath parsing problem
- * 1547908    2006-09-05  ebak         parseKEYBINDING() creates incorrect reference type
- * 1545915    2006-09-05  ebak         Wrong parsing of IMETHODCALL request
- * 1660756    2007-03-02  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1669961    2006-04-16  lupusalex    CIMTypedElement.getType() =>getDataType()
- * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
- * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
- * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
- * 1769504	  2007-08-15  ebak         Type identification for VALUETYPE="numeric"
- * 1783288    2007-09-10  ebak         CIMClass.isAssociation() not working for retrieved classes.
- * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
- * 1827728    2007-11-20  ebak         rework: embeddedInstances: attribute EmbeddedObject not set
- * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
- * 1944875    2008-05-29  blaschke-oss Indications with embedded objects are not accepted
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2210455    2008-10-30  blaschke-oss Enhance javadoc, fix potential null pointers
- * 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)
- * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
- * 2860081    2009-09-17  raman_arora  Pull Enumeration Feature (DOM Parser)
- * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
- * 3023143    2010-07-01  blaschke-oss CIMXMLParserImpl uses # constructor instead of valueOf
- * 3027479    2010-07-09  blaschke-oss Dead store to local variable
- * 3027615    2010-07-12  blaschke-oss Use CLASS_ARRAY_T instead of new CIMDataType(CLASS,0)
- * 3293248    2011-05-03  blaschke-oss Support for CIM_ERROR instances within ERROR
- * 3297028    2011-05-03  blaschke-oss Instances contain CIMClassProperty with DOM parser
- * 3411944    2011-09-20  blaschke-oss createJavaObject exception with hex uint
- * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
- * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
- * 3466280    2012-04-23  blaschke-oss get instance failure for CIM_IndicationSubscription
- * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
- * 3526679    2012-05-14  blaschke-oss DOM parser ignores ERROR node CODE
- * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
- * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
- *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
- *    2636    2013-05-08  blaschke-oss Nested embedded instances cause CIMXMLParseException
- *    2640    2013-05-11  blaschke-oss Multiple CDATA parsing broken in DOM parser
- *    2668    2013-09-24  blaschke-oss Potential null pointer exception in parseCIM
- *    2669    2013-09-24  blaschke-oss Potential null pointer exception in parseMESSAGE
- *    2670    2013-09-25  blaschke-oss NAME attribute not required by DOM parser
- *    2671    2013-09-25  blaschke-oss Potential null pointer exception in parseERROR
- *    2675    2013-09-27  blaschke-oss CIMXMLParseException messages should contain element name
- *    2676    2013-09-27  blaschke-oss parseMULTI(EXP)REQ looking for wrong child elements
- *    2678    2013-09-30  blaschke-oss parseMULTI___ allows one SIMPLE___ child element
- *    2679    2013-10-01  blaschke-oss parseIMETHODCALL requires one IPARAMVALUE child element
- *    2680    2013-10-02  blaschke-oss IPARAMVALUE parsing broken on DOM/SAX
- *    2681    2013-10-02  blaschke-oss parseQUALIFIERDECLARATION does not require TYPE attribute
- *    2683    2013-10-07  blaschke-oss KEYVALUE VALUETYPE optional, "string" default
- *    2684    2013-10-07  blaschke-oss parseEXPMETHODRESPONSE has several issues
- *    2685    2013-10-07  blaschke-oss Element.getAttribute returns empty string if no attribute
- *    2686    2013-10-10  blaschke-oss parseEXPPARAMVALUE allows 2+ children, prohibits 0 
- *    2688    2013-10-10  blaschke-oss parseMETHODCALL looks for CIMName attribute instead of NAME
- *    2537    2013-10-17  blaschke-oss Add new data types for PARAMVALUE
- *    2691    2013-10-18  blaschke-oss RETURNVALUE should not require PARAMTYPE attribute
- *    2694    2013-10-25  blaschke-oss NAME attribute not required by DOM parser (part 2)
- *    2695    2013-10-25  blaschke-oss parseMETHODCALL allows LOCALCLASSPATH and LOCALINSTANCEPATH
- *    2696    2013-10-29  blaschke-oss parseIRETURNVALUE ignores VALUE and VALUE.ARRAY
- *    2699    2013-11-05  blaschke-oss parseQUALIFIER does not require TYPE attribute
- *    2700    2013-11-07  blaschke-oss PROPERTY does not require TYPE attribute
- *    2701    2013-11-07  blaschke-oss PROPERTY.ARRAY does not require TYPE attribute
- *    2702    2013-11-07  blaschke-oss Bad PROPERTY.ARRAY ARRAYSIZE generates NumberFormatException
- *    2703    2013-11-08  blaschke-oss MethodNode should not require TYPE attribute
- *    2704    2013-11-11  blaschke-oss PARAMETER does not require TYPE attribute
- *    2705    2013-11-11  blaschke-oss PARAMETER.ARRAY does not require TYPE attribute
- *    2706    2013-11-11  blaschke-oss Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException
- *    2707    2013-11-12  blaschke-oss INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children
- *    2710    2013-11-13  blaschke-oss parseVALUEOBJECTWITH(LOCAL)PATH ignores (LOCAL)CLASSPATH child
- *    2711    2013-11-13  blaschke-oss LOCALNAMESPACEPATH allows 0 NAMESPACE children
- *    2713    2013-11-22  blaschke-oss Enforce loose validation of CIM-XML documents
- *    2715    2013-11-26  blaschke-oss Add VALUE.NULL support
- *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.StringReader;
-import java.math.BigInteger;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.TreeMap;
-import java.util.Vector;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMClassProperty;
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTime;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTimeAbsolute;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTimeInterval;
-import org.sentrysoftware.wbem.javax.cim.CIMFlavor;
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMMethod;
-import org.sentrysoftware.wbem.javax.cim.CIMNamedElementInterface;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMParameter;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifier;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifierType;
-import org.sentrysoftware.wbem.javax.cim.CIMScope;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger16;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger32;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger64;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger8;
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMHelper;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.Util;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.XMLHostStr;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-
-/**
- * Class CIMXMLParserImpl is the main class of CIM-XML DOM parser.
- * 
- */
-public class CIMXMLParserImpl {
-
-	/*
-	 * ebak: local object path - should be used by parseLOCALCLASSPATH(),
-	 * parseLOCALINSTANCEPATH(), parseCLASSNAME(), parseINSTANCENAME(),
-	 * parseCLASS() and parseINSTANCE()
-	 */
-	private static LocalPathBuilder cLocalPathBuilder = new LocalPathBuilder(null);
-
-	/**
-	 * setLocalObjectPath
-	 * 
-	 * @param pLocalOp
-	 *            - empty fields of parsed objectpaths will be substituted by
-	 *            fields coming from this parameter
-	 */
-	public static void setLocalObjectPath(CIMObjectPath pLocalOp) {
-		cLocalPathBuilder = new LocalPathBuilder(pLocalOp);
-	}
-
-	/*
-	 * / local object path
-	 */
-
-	/**
-	 * parseCIM
-	 * 
-	 * @param pCimE
-	 * @return CIMMessage
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMMessage parseCIM(Element pCimE) throws CIMXMLParseException {
-		// 
-		// 
-		Attr cim_cimversionA = (Attr) searchAttribute(pCimE, "CIMVERSION");
-		if (cim_cimversionA == null) throw new CIMXMLParseException(
-				"CIM element missing CIMVERSION attribute!");
-		String cimversion = cim_cimversionA.getNodeValue();
-
-		Attr cim_dtdversionA = (Attr) searchAttribute(pCimE, "DTDVERSION");
-		if (cim_dtdversionA == null) throw new CIMXMLParseException(
-				"CIM element missing DTDVERSION attribute!");
-		String dtdversion = cim_dtdversionA.getNodeValue();
-
-		// MESSAGE
-		Element messageA[] = searchNodes(pCimE, "MESSAGE", 0, 1, false);
-		if (messageA != null) {
-			CIMMessage message = parseMESSAGE(cimversion, dtdversion, messageA[0]);
-			message.setCIMVersion(cimversion);
-			message.setDTDVersion(dtdversion);
-			return message;
-		}
-
-		// DECLARATION
-		if (searchNodes(pCimE, "DECLARATION", 0, 1, false) != null) throw new CIMXMLParseException(
-				"DECLARATION element not supported!");
-
-		throw new CIMXMLParseException("CIM element missing required child element!");
-	}
-
-	// ////////////////////////////////////////////////////////////////////////////////////////
-	// Value Elements
-	// ////////////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * parseVALUE - supports the non-standard TYPE attribute
-	 * 
-	 * @param pValueE
-	 * @return TypedValue, type is null if no TYPE attribute was found, the
-	 *         value is always String, the caller method have to convert it.
-	 * @throws CIMXMLParseException
-	 */
-	public static TypedValue parseVALUE(Element pValueE) throws CIMXMLParseException {
-		// 
-
-		String typeStr = attribute(pValueE, "TYPE");
-		CIMDataType type = typeStr == null ? null : parseScalarTypeStr(typeStr);
-		// ebak: empty VALUE element is parsed as empty String
-		NodeList list = pValueE.getChildNodes();
-		StringBuilder valueStr = new StringBuilder();
-		for (int i = 0; i < list.getLength(); i++) {
-			Text t = (Text) list.item(i);
-			if (t != null) {
-				String nodeValue = t.getNodeValue();
-				if (nodeValue != null) valueStr.append(nodeValue);
-			}
-		}
-		return new TypedValue(type, valueStr.toString());
-	}
-
-	/**
-	 * parseVALUEARRAY - supports the non-standard TYPE attribute
-	 * 
-	 * @param pValueArrayE
-	 * @return TypedValue, type is null if no TYPE attribute was found, the
-	 *         value is always String[], the caller method have to convert it.
-	 * @throws CIMXMLParseException
-	 */
-	public static TypedValue parseVALUEARRAY(Element pValueArrayE) throws CIMXMLParseException {
-		// 
-		String typeStr = attribute(pValueArrayE, "TYPE");
-		CIMDataType type = typeStr == null ? null : parseArrayTypeStr(typeStr);
-
-		// Process node list here, order of VALUE/VALUE.NULL IS important
-		NodeList nl = pValueArrayE.getChildNodes();
-		if (nl == null || nl.getLength() == 0) return new TypedValue(type, new String[0]);
-		Vector resStringV = new Vector();
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node n = nl.item(i);
-			if (n instanceof Text && "".equalsIgnoreCase(n.getNodeValue().trim())) continue;
-			String name = n.getNodeName();
-			if (name.equals("VALUE")) {
-				resStringV.add((String) parseVALUE((Element) n).getValue());
-			} else if (name.equals("VALUE.NULL")) {
-				resStringV.add(null);
-			} else if (NODENAME_HASH.containsKey(name)) { throw new CIMXMLParseException(
-					"VALUE.ARRAY element contains invalid child element " + name + "!"); }
-		}
-		return new TypedValue(type, resStringV.toArray(new String[0]));
-	}
-
-	/**
-	 * parseVALUEREFERENCE
-	 * 
-	 * @param pValuereferenceE
-	 * @return CIMObjectPath
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMObjectPath parseVALUEREFERENCE(Element pValuereferenceE)
-			throws CIMXMLParseException {
-		// 
-
-		// CLASSPATH
-		Element classpathA[] = searchNodes(pValuereferenceE, "CLASSPATH", 0, 1, false);
-		if (classpathA != null) {
-			CIMObjectPath op = parseCLASSPATH(classpathA[0]);
-			return op;
-		}
-
-		// LOCALCLASSPATH
-		Element localclasspathA[] = searchNodes(pValuereferenceE, "LOCALCLASSPATH", 0, 1, false);
-		if (localclasspathA != null) {
-			CIMObjectPath op = parseLOCALCLASSPATH(localclasspathA[0]);
-			return op;
-		}
-
-		// CLASSNAME
-		Element classnameA[] = searchNodes(pValuereferenceE, "CLASSNAME", 0, 1, false);
-		if (classnameA != null) {
-			CIMObjectPath op = parseCLASSNAME(classnameA[0]);
-			if (op != null && op.getNamespace() != null) {
-				// LocalPathBuilder includes default namespace in CLASSNAME
-				// elements, needs to be stripped
-				op = new CIMObjectPath(op.getScheme(), op.getHost(), op.getPort(), null, op
-						.getObjectName(), op.getKeys(), op.getXmlSchemaName());
-			}
-			return op;
-		}
-
-		// INSTANCEPATH
-		Element instancepathA[] = searchNodes(pValuereferenceE, "INSTANCEPATH", 0, 1, false);
-		if (instancepathA != null) {
-			CIMObjectPath op = parseINSTANCEPATH(instancepathA[0]);
-			return op;
-		}
-
-		// LOCALINSTANCEPATH
-		Element localinstancepathA[] = searchNodes(pValuereferenceE, "LOCALINSTANCEPATH", 0, 1,
-				false);
-		if (localinstancepathA != null) {
-			CIMObjectPath op = parseLOCALINSTANCEPATH(localinstancepathA[0]);
-			return op;
-		}
-
-		// INSTANCENAME
-		Element instancenameA[] = searchNodes(pValuereferenceE, "INSTANCENAME", 0, 1, false);
-		if (instancenameA != null) {
-			CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
-			if (op != null && op.getNamespace() != null) {
-				// LocalPathBuilder includes default namespace in INSTANCENAME
-				// elements, needs to be stripped
-				op = new CIMObjectPath(op.getScheme(), op.getHost(), op.getPort(), null, op
-						.getObjectName(), op.getKeys(), op.getXmlSchemaName());
-			}
-			return op;
-		}
-
-		throw new CIMXMLParseException("VALUE.REFERENCE element missing required child element!");
-	}
-
-	/**
-	 * parseVALUEREFARRAY
-	 * 
-	 * @param pValueRefArrayE
-	 * @return CIMObjectPath[]
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMObjectPath[] parseVALUEREFARRAY(Element pValueRefArrayE)
-			throws CIMXMLParseException {
-		// 
-
-		// Process node list here, order of VALUE.REFERENCE/VALUE.NULL IS
-		// important
-		NodeList nl = pValueRefArrayE.getChildNodes();
-		if (nl == null || nl.getLength() == 0) return new CIMObjectPath[0];
-		Vector resObjectPathV = new Vector();
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node n = nl.item(i);
-			if (n instanceof Text && "".equalsIgnoreCase(n.getNodeValue().trim())) continue;
-			String name = n.getNodeName();
-			if (name.equals("VALUE.REFERENCE")) {
-				resObjectPathV.add(parseVALUEREFERENCE((Element) n));
-			} else if (name.equals("VALUE.NULL")) {
-				resObjectPathV.add(null);
-			} else if (NODENAME_HASH.containsKey(name)) { throw new CIMXMLParseException(
-					"VALUE.REFARRAY element contains invalid child element " + name + "!"); }
-		}
-		return resObjectPathV.toArray(new CIMObjectPath[0]);
-	}
-
-	/**
-	 * parseVALUEOBJECT
-	 * 
-	 * @param pValueObjectE
-	 * @return CIMNamedElementInterface (CIMClass|CIMInstance)
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMNamedElementInterface parseVALUEOBJECT(Element pValueObjectE)
-			throws CIMXMLParseException {
-		// 
-
-		// CLASS
-		Element classA[] = searchNodes(pValueObjectE, "CLASS", 0, 1, false);
-		if (classA != null) {
-			CIMClass obj = parseCLASS(classA[0]);
-			return obj;
-		}
-
-		// INSTANCE
-		Element instanceA[] = searchNodes(pValueObjectE, "INSTANCE", 0, 1, false);
-		if (instanceA != null) {
-			CIMInstance obj = parseINSTANCE(instanceA[0]);
-			return obj;
-		}
-
-		throw new CIMXMLParseException("VALUE.OBJECT element missing required child element!");
-	}
-
-	private static final String nodesVALUENAMEDINSTANCE[] = { "INSTANCENAME", "INSTANCE" };
-
-	/**
-	 * parseVALUENAMEDINSTANCE
-	 * 
-	 * @param pValueNamedInstanceE
-	 * @return CIMInstance
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMInstance parseVALUENAMEDINSTANCE(Element pValueNamedInstanceE)
-			throws CIMXMLParseException {
-		// 
-
-		// INSTANCENAME
-		Element instancenameA[] = searchNodes(pValueNamedInstanceE, "INSTANCENAME", 1, 1, true);
-		if (instancenameA == null) { throw new CIMXMLParseException(
-				"VALUE.NAMEDINSTANCE element missing INSTANCENAME child element!"); }
-		CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
-
-		// INSTANCE
-		Element instanceA[] = searchNodes(pValueNamedInstanceE, "INSTANCE", 1, 1, true);
-		if (instanceA == null) { throw new CIMXMLParseException(
-				"VALUE.NAMEDINSTANCE element missing INSTANCE child element!"); }
-		CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
-		checkOtherNodes(pValueNamedInstanceE, nodesVALUENAMEDINSTANCE);
-		return inst;
-	}
-
-	private static final String nodesVALUEINSTANCEWITHPATH[] = { "INSTANCEPATH", "INSTANCE" };
-
-	/**
-	 * parseVALUEINSTANCEWITHPATH
-	 * 
-	 * @param pValueNamedInstanceE
-	 * @return CIMInstance
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMInstance parseVALUEINSTANCEWITHPATH(Element pValueNamedInstanceE)
-			throws CIMXMLParseException {
-		// 
-
-		// INSTANCEPATH
-		Element instancepathA[] = searchNodes(pValueNamedInstanceE, "INSTANCEPATH", 1, 1, true);
-		if (instancepathA == null) { throw new CIMXMLParseException(
-				"VALUE.INSTANCEWITHPATH element missing INSTANCEPATH child element!"); }
-		CIMObjectPath op = parseINSTANCEPATH(instancepathA[0]);
-
-		// INSTANCE
-		Element instanceA[] = searchNodes(pValueNamedInstanceE, "INSTANCE", 1, 1, true);
-		if (instanceA == null) { throw new CIMXMLParseException(
-				"VALUE.INSTANCEWITHPATH element missing INSTANCE child element!"); }
-		CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
-		checkOtherNodes(pValueNamedInstanceE, nodesVALUEINSTANCEWITHPATH);
-		return inst;
-	}
-
-	private static final String nodesVALUENAMEDOBJECTi[] = { "INSTANCENAME", "INSTANCE" };
-
-	/**
-	 * parseVALUENAMEDOBJECT
-	 * 
-	 * @param pValueNamedObjectE
-	 * @return CIMNamedElementInterface
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMNamedElementInterface parseVALUENAMEDOBJECT(Element pValueNamedObjectE)
-			throws CIMXMLParseException {
-		// 
-
-		// CLASS
-		Element classA[] = searchNodes(pValueNamedObjectE, "CLASS", 0, 1, false);
-		if (classA != null) {
-			CIMClass obj = parseCLASS(classA[0]);
-			// checkOtherNodes(pValueNamedObjectE, nodesVALUENAMEDOBJECTc);
-			return obj;
-		}
-
-		// INSTANCENAME
-		Element instancenameA[] = searchNodes(pValueNamedObjectE, "INSTANCENAME", 0, 1, true);
-		if (instancenameA != null) {
-			CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
-
-			// INSTANCE
-			Element instanceA[] = searchNodes(pValueNamedObjectE, "INSTANCE", 0, 1, true);
-			if (instanceA == null) { throw new CIMXMLParseException(
-					"VALUE.NAMEDOBJECT element missing INSTANCE child element!"); }
-			CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
-			checkOtherNodes(pValueNamedObjectE, nodesVALUENAMEDOBJECTi);
-			return inst;
-		}
-
-		throw new CIMXMLParseException("VALUE.NAMEDOBJECT element missing required child element!");
-	}
-
-	private static final String nodesVALUEOBJECTWITHPATHcls[] = { "CLASSPATH", "CLASS" };
-
-	private static final String nodesVALUEOBJECTWITHPATHins[] = { "INSTANCEPATH", "INSTANCE" };
-
-	/**
-	 * parseVALUEOBJECTWITHPATH
-	 * 
-	 * @param pValueObjectWithPathE
-	 * @return CIMNamedElementInterface
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMNamedElementInterface parseVALUEOBJECTWITHPATH(Element pValueObjectWithPathE)
-			throws CIMXMLParseException {
-		// 
-
-		// CLASSPATH
-		Element classpathA[] = searchNodes(pValueObjectWithPathE, "CLASSPATH", 0, 1, true);
-		if (classpathA != null) {
-			CIMObjectPath op = parseCLASSPATH(classpathA[0]);
-
-			// CLASS
-			Element classA[] = searchNodes(pValueObjectWithPathE, "CLASS", 0, 1, true);
-			if (classA == null) { throw new CIMXMLParseException(
-					"VALUE.OBJECTWITHPATH element missing CLASS child element!"); }
-
-			CIMClass obj = parseCLASS(classA[0], op);
-			checkOtherNodes(pValueObjectWithPathE, nodesVALUEOBJECTWITHPATHcls);
-			return obj;
-		}
-
-		// INSTANCEPATH
-		Element instancepathA[] = searchNodes(pValueObjectWithPathE, "INSTANCEPATH", 0, 1, true);
-		if (instancepathA != null) {
-			CIMObjectPath op = parseINSTANCEPATH(instancepathA[0]);
-
-			// INSTANCE
-			Element instanceA[] = searchNodes(pValueObjectWithPathE, "INSTANCE", 0, 1, true);
-			if (instanceA == null) { throw new CIMXMLParseException(
-					"VALUE.OBJECTWITHPATH element missing INSTANCE child element!"); }
-			CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
-			checkOtherNodes(pValueObjectWithPathE, nodesVALUEOBJECTWITHPATHins);
-			return inst;
-		}
-
-		throw new CIMXMLParseException(
-				"VALUE.OBJECTWITHPATH element missing required child element!");
-	}
-
-	private static final String nodesVALUEOBJECTWITHLOCALPATHcls[] = { "LOCALCLASSPATH", "CLASS" };
-
-	private static final String nodesVALUEOBJECTWITHLOCALPATHins[] = { "LOCALINSTANCEPATH",
-			"INSTANCE" };
-
-	/**
-	 * parseVALUEOBJECTWITHLOCALPATH
-	 * 
-	 * @param pValueObjectWithLocalPathE
-	 * @return CIMNamedElementInterface
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMNamedElementInterface parseVALUEOBJECTWITHLOCALPATH(
-			Element pValueObjectWithLocalPathE) throws CIMXMLParseException {
-		// 
-
-		// LOCALCLASSPATH
-		Element localclasspathA[] = searchNodes(pValueObjectWithLocalPathE, "LOCALCLASSPATH", 0, 1,
-				true);
-		if (localclasspathA != null) {
-			CIMObjectPath op = parseLOCALCLASSPATH(localclasspathA[0]);
-
-			// CLASS
-			Element classA[] = searchNodes(pValueObjectWithLocalPathE, "CLASS", 0, 1, true);
-			if (classA == null) { throw new CIMXMLParseException(
-					"VALUE.OBJECTWITHLOCALPATH element missing CLASS child element!"); }
-
-			CIMClass obj = parseCLASS(classA[0], op);
-			checkOtherNodes(pValueObjectWithLocalPathE, nodesVALUEOBJECTWITHLOCALPATHcls);
-			return obj;
-		}
-
-		// LOCALINSTANCEPATH
-		Element localinstancepathA[] = searchNodes(pValueObjectWithLocalPathE, "LOCALINSTANCEPATH",
-				0, 1, true);
-		if (localinstancepathA != null) {
-			CIMObjectPath op = parseLOCALINSTANCEPATH(localinstancepathA[0]);
-
-			// INSTANCE
-			Element instanceA[] = searchNodes(pValueObjectWithLocalPathE, "INSTANCE", 0, 1, true);
-			if (instanceA == null) { throw new CIMXMLParseException(
-					"VALUE.OBJECTWITHLOCALPATH element missing INSTANCE child element!"); }
-			CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
-			checkOtherNodes(pValueObjectWithLocalPathE, nodesVALUEOBJECTWITHLOCALPATHins);
-			return inst;
-		}
-
-		throw new CIMXMLParseException(
-				"VALUE.OBJECTWITHLOCALPATH element missing required child element!");
-	}
-
-	// ////////////////////////////////////////////////////////////////////////////////////////
-	// Naming and Location elements
-	// ////////////////////////////////////////////////////////////////////////////////////////
-
-	private static final String nodesNAMESPACEPATH[] = { "HOST", "LOCALNAMESPACEPATH" };
-
-	/**
-	 * parseNAMESPACEPATH
-	 * 
-	 * @param pNameSpacePathE
-	 * @return CIMObjectPath
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMObjectPath parseNAMESPACEPATH(Element pNameSpacePathE)
-			throws CIMXMLParseException {
-		// 
-		// HOST
-		Element hostA[] = searchNodes(pNameSpacePathE, "HOST", 1, 1, true);
-		if (hostA == null) { throw new CIMXMLParseException(
-				"NAMESPACEPATH element missing HOST child element!"); }
-		XMLHostStr xmlHostStr = new XMLHostStr(parseHOST(hostA[0]));
-		// LOCALNAMESPACE
-		Element localnamespacepathA[] = searchNodes(pNameSpacePathE, "LOCALNAMESPACEPATH", 1, 1,
-				true);
-		if (localnamespacepathA == null) { throw new CIMXMLParseException(
-				"NAMESPACEPATH element missing LOCALNAMESPACEPATH child element!"); }
-		String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
-		/*
-		 * CIMObjectPath( String scheme, String host, String port, String
-		 * namespace, String objectName, CIMProperty[] keys )
-		 */
-		checkOtherNodes(pNameSpacePathE, nodesNAMESPACEPATH);
-		return new CIMObjectPath(xmlHostStr.getProtocol(), xmlHostStr.getHost(), xmlHostStr
-				.getPort(), nameSpace, null, null);
-	}
-
-	/**
-	 * parseLOCALNAMESPACEPATH
-	 * 
-	 * @param pLocalNameSpaceE
-	 * @return String
-	 * @throws CIMXMLParseException
-	 */
-	public static String parseLOCALNAMESPACEPATH(Element pLocalNameSpaceE)
-			throws CIMXMLParseException {
-		// 
-
-		Element[] nameSpaceElementA = searchNodes(pLocalNameSpaceE, "NAMESPACE", 1,
-				Integer.MAX_VALUE, false);
-		if (nameSpaceElementA == null) {
-			if (WBEMConfiguration.getGlobalConfiguration().allowEmptyLocalNameSpacePath()
-					&& cLocalPathBuilder != null) return cLocalPathBuilder.getBasePath()
-					.getNamespace();
-			throw new CIMXMLParseException(
-					"LOCALNAMESPACEPATH element missing NAMESPACE child element!");
-		}
-		StringBuffer sb = new StringBuffer();
-		for (int i = 0; i < nameSpaceElementA.length; i++) {
-			Element namespaceE = nameSpaceElementA[i];
-			String s = parseNAMESPACE(namespaceE);
-			if (i > 0) sb.append("/" + s);
-			else sb.append(s);
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * parseHOST
-	 * 
-	 * @param pHostE
-	 * @return String
-	 */
-	public static String parseHOST(Element pHostE) {
-		// 
-
-		Text valueT = (Text) searchFirstChild(pHostE);
-		String host = valueT.getNodeValue();
-		return host;
-	}
-
-	private static final String nodesNAMESPACE[] = {};
-
-	/**
-	 * parseNAMESPACE
-	 * 
-	 * @param pNameSpaceE
-	 * @return String
-	 * @throws CIMXMLParseException
-	 */
-	public static String parseNAMESPACE(Element pNameSpaceE) throws CIMXMLParseException {
-		// 
-		// 
-
-		Attr namespace_nameA = (Attr) searchAttribute(pNameSpaceE, "NAME");
-		if (namespace_nameA == null) throw new CIMXMLParseException(
-				"NAMESPACE element missing NAME attribute!");
-		String n = namespace_nameA.getValue();
-		checkOtherNodes(pNameSpaceE, nodesNAMESPACE);
-		return n;
-	}
-
-	private static final String nodesCLASSPATH[] = { "NAMESPACEPATH", "CLASSNAME" };
-
-	/**
-	 * parseCLASSPATH
-	 * 
-	 * @param pClassPathE
-	 * @return CIMObjectPath
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMObjectPath parseCLASSPATH(Element pClassPathE) throws CIMXMLParseException {
-		// 
-
-		// NAMESPACEPATH
-		Element namespacepathA[] = searchNodes(pClassPathE, "NAMESPACEPATH", 1, 1, true);
-		if (namespacepathA == null) { throw new CIMXMLParseException(
-				"CLASSPATH element missing NAMESPACEPATH child element!"); }
-		CIMObjectPath nsPath = parseNAMESPACEPATH(namespacepathA[0]);
-		// CLASSNAME
-		Element classnameA[] = searchNodes(pClassPathE, "CLASSNAME", 1, 1, true);
-		if (classnameA == null) { throw new CIMXMLParseException(
-				"CLASSPATH element missing CLASSNAME child element!"); }
-		String className = parseClassName(classnameA[0]);
-		/*
-		 * CIMObjectPath( String scheme, String host, String port, String
-		 * namespace, String objectName, CIMProperty[] keys )
-		 */
-		checkOtherNodes(pClassPathE, nodesCLASSPATH);
-		return new CIMObjectPath(nsPath.getScheme(), nsPath.getHost(), nsPath.getPort(), nsPath
-				.getNamespace(), className, null);
-	}
-
-	private static final String nodesLOCALCLASSPATH[] = { "LOCALNAMESPACEPATH", "CLASSNAME" };
-
-	/**
-	 * parseLOCALCLASSPATH
-	 * 
-	 * @param pClassPathE
-	 * @return CIMObjectPath
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMObjectPath parseLOCALCLASSPATH(Element pClassPathE)
-			throws CIMXMLParseException {
-		// 
-
-		// NAMESPACEPATH
-		Element localnamespacepathA[] = searchNodes(pClassPathE, "LOCALNAMESPACEPATH", 1, 1, true);
-		if (localnamespacepathA == null) { throw new CIMXMLParseException(
-				"LOCALCLASSPATH element missing LOCALNAMESPACEPATH child element!"); }
-		String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
-
-		// CLASSNAME
-		Element classnameA[] = searchNodes(pClassPathE, "CLASSNAME", 1, 1, true);
-		if (classnameA == null) { throw new CIMXMLParseException(
-				"LOCALCLASSPATH element missing CLASSNAME child element!"); }
-		CIMObjectPath op = parseCLASSNAME(classnameA[0]);
-		checkOtherNodes(pClassPathE, nodesLOCALCLASSPATH);
-		return cLocalPathBuilder.build(op.getObjectName(), nameSpace);
-	}
-
-	private static final String nodesCLASSNAME[] = {};
-
-	/**
-	 * parseClassName
-	 * 
-	 * @param pClassNameE
-	 * @return String
-	 * @throws CIMXMLParseException
-	 */
-	public static String parseClassName(Element pClassNameE) throws CIMXMLParseException {
-		// 
-		// 
-		Attr classname_nameA = (Attr) searchAttribute(pClassNameE, "NAME");
-		if (classname_nameA == null) throw new CIMXMLParseException(
-				"CLASSNAME element missing NAME attribute!");
-		checkOtherNodes(pClassNameE, nodesCLASSNAME);
-		return classname_nameA.getNodeValue();
-	}
-
-	/**
-	 * parseCLASSNAME
-	 * 
-	 * @param pClassNameE
-	 * @return CIMObjectPath
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMObjectPath parseCLASSNAME(Element pClassNameE) throws CIMXMLParseException {
-		return cLocalPathBuilder.build(parseClassName(pClassNameE), null);
-	}
-
-	private static final String nodesINSTANCEPATH[] = { "NAMESPACEPATH", "INSTANCENAME" };
-
-	/**
-	 * parseINSTANCEPATH
-	 * 
-	 * @param pInstancePathE
-	 * @return CIMObjectPath
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMObjectPath parseINSTANCEPATH(Element pInstancePathE)
-			throws CIMXMLParseException {
-		// 
-
-		// NAMESPACEPATH
-		Element namespacepathA[] = searchNodes(pInstancePathE, "NAMESPACEPATH", 1, 1, true);
-		if (namespacepathA == null) { throw new CIMXMLParseException(
-				"INSTANCEPATH element missing NAMESPACEPATH child element!"); }
-		CIMObjectPath nsPath = parseNAMESPACEPATH(namespacepathA[0]);
-		// INSTANCENAME
-		Element instancenameA[] = searchNodes(pInstancePathE, "INSTANCENAME", 1, 1, true);
-		if (instancenameA == null) { throw new CIMXMLParseException(
-				"INSTANCEPATH element missing INSTANCENAME child element!"); }
-		CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
-		// ebak: change host and namespace
-		checkOtherNodes(pInstancePathE, nodesINSTANCEPATH);
-		return new CIMObjectPath(nsPath.getScheme(), nsPath.getHost(), nsPath.getPort(), nsPath
-				.getNamespace(), op.getObjectName(), op.getKeys());
-	}
-
-	private static final String nodesLOCALINSTANCEPATH[] = { "LOCALNAMESPACEPATH", "INSTANCENAME" };
-
-	/**
-	 * parseLOCALINSTANCEPATH
-	 * 
-	 * @param pLocalInstancePathE
-	 * @return CIMObjectPath
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMObjectPath parseLOCALINSTANCEPATH(Element pLocalInstancePathE)
-			throws CIMXMLParseException {
-		// 
-
-		// LOCALNAMESPACEPATH
-		Element localnamespacepathA[] = searchNodes(pLocalInstancePathE, "LOCALNAMESPACEPATH", 1,
-				1, true);
-		if (localnamespacepathA == null) { throw new CIMXMLParseException(
-				"LOCALINSTANCEPATH element missing LOCALNAMESPACEPATH child element!"); }
-		String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
-
-		// INSTANCENAME
-		Element instancenameA[] = searchNodes(pLocalInstancePathE, "INSTANCENAME", 1, 1, true);
-		if (instancenameA == null) { throw new CIMXMLParseException(
-				"LOCALINSTANCEPATH element missing INSTANCENAME child element!"); }
-		CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
-		/*
-		 * CIMObjectPath(String objectName, String namespace, CIMProperty[]
-		 * keys)
-		 */
-		checkOtherNodes(pLocalInstancePathE, nodesLOCALINSTANCEPATH);
-		return cLocalPathBuilder.build(op.getObjectName(), nameSpace, op.getKeys());
-	}
-
-	private static final String nodesINSTANCENAME[] = { "KEYBINDING", "KEYVALUE", "VALUE.REFERENCE" };
-
-	/**
-	 * parseINSTANCENAME
-	 * 
-	 * @param pInstanceNameE
-	 * @return CIMObjectPath
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMObjectPath parseINSTANCENAME(Element pInstanceNameE)
-			throws CIMXMLParseException {
-		// 
-		// 
-		Attr instance_classnameA = (Attr) searchAttribute(pInstanceNameE, "CLASSNAME");
-		if (instance_classnameA == null) throw new CIMXMLParseException(
-				"INSTANCENAME element missing CLASSNAME attribute!");
-		String opClassName = instance_classnameA.getNodeValue();
-
-		// KEYBINDING
-		Element[] keyBindingElementA = searchNodes(pInstanceNameE, "KEYBINDING", 0,
-				Integer.MAX_VALUE, false);
-		if (keyBindingElementA != null) {
-			CIMProperty[] keys = new CIMProperty[keyBindingElementA.length];
-			for (int i = 0; i < keyBindingElementA.length; i++) {
-				Element keybindingE = keyBindingElementA[i];
-				keys[i] = parseKEYBINDING(keybindingE);
-			}
-			return cLocalPathBuilder.build(opClassName, null, keys);
-		}
-
-		// KEYVALUE
-		Element keyvalueA[] = searchNodes(pInstanceNameE, "KEYVALUE", 0, 1, false);
-		if (keyvalueA != null) {
-			CIMProperty[] keys = new CIMProperty[1];
-			TypedValue propTypedVal = parseKEYVALUE(keyvalueA[0]);
-			keys[0] = new CIMProperty("", propTypedVal.getType(), propTypedVal.getValue(),
-					true, false, null);
-			return cLocalPathBuilder.build(opClassName, null, keys);
-		}
-
-		// VALUE.REFERENCE
-		Element valuereferenceA[] = searchNodes(pInstanceNameE, "VALUE.REFERENCE", 0, 1, false);
-		if (valuereferenceA != null) {
-			CIMProperty[] keys = new CIMProperty[1];
-			CIMObjectPath op = parseVALUEREFERENCE(valuereferenceA[0]);
-			keys[0] = new CIMProperty("", new CIMDataType(op.getObjectName()), op,
-					true, false, null);
-			return cLocalPathBuilder.build(opClassName, null, keys);
-		}
-
-		checkOtherNodes(pInstanceNameE, nodesINSTANCENAME);
-
-		return new CIMObjectPath(null, null, null, null, opClassName, null);
-	}
-
-	/**
-	 * parseOBJECTPATH
-	 * 
-	 * @param pObjectPathE
-	 * @return CIMObjectPath
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMObjectPath parseOBJECTPATH(Element pObjectPathE) throws CIMXMLParseException {
-		// 
-
-		// INSTANCEPATH
-		Element instancepathA[] = searchNodes(pObjectPathE, "INSTANCEPATH", 0, 1, false);
-		if (instancepathA != null) {
-			CIMObjectPath op = parseINSTANCEPATH(instancepathA[0]);
-			return op;
-		}
-
-		// CLASSPATH
-		Element classpathA[] = searchNodes(pObjectPathE, "CLASSPATH", 0, 1, false);
-		if (classpathA != null) {
-			CIMObjectPath op = parseCLASSPATH(classpathA[0]);
-			return op;
-		}
-
-		throw new CIMXMLParseException("OBJECTPATH element missing required child element!");
-	}
-
-	/**
-	 * parseKEYBINDING
-	 * 
-	 * @param pKeyBindingE
-	 * @return CIMProperty
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMProperty parseKEYBINDING(Element pKeyBindingE) throws CIMXMLParseException {
-		// 
-		// 
-
-		Attr keybinding_nameA = (Attr) searchAttribute(pKeyBindingE, "NAME");
-		if (keybinding_nameA == null) throw new CIMXMLParseException(
-				"KEYBINDING element missing NAME attribute!");
-		String propName = keybinding_nameA.getValue();
-
-		// KEYVALUE
-		Element keyvalueA[] = searchNodes(pKeyBindingE, "KEYVALUE", 0, 1, false);
-		if (keyvalueA != null) {
-			TypedValue propTypedVal = parseKEYVALUE(keyvalueA[0]);
-			return new CIMProperty(propName, propTypedVal.getType(), propTypedVal
-					.getValue(), true, false, null);
-		}
-
-		// VALUE.REFERENCE
-		Element valuereferenceA[] = searchNodes(pKeyBindingE, "VALUE.REFERENCE", 0, 1, false);
-		if (valuereferenceA != null) {
-			CIMObjectPath op = parseVALUEREFERENCE(valuereferenceA[0]);
-			return new CIMProperty(propName, new CIMDataType(op.getObjectName()),
-					op, true, false, null);
-		}
-
-		throw new CIMXMLParseException("KEYBINDING element missing required child element!");
-	}
-
-	private static final TreeMap TYPESTR_MAP = new TreeMap(
-			new Comparator() {
-
-				public int compare(Object pO1, Object pO2) {
-					return ((String) pO1).compareToIgnoreCase((String) pO2);
-				}
-
-			});
-
-	static {
-		TYPESTR_MAP.put(MOF.DT_UINT8, CIMDataType.UINT8_T);
-		TYPESTR_MAP.put(MOF.DT_UINT16, CIMDataType.UINT16_T);
-		TYPESTR_MAP.put(MOF.DT_UINT32, CIMDataType.UINT32_T);
-		TYPESTR_MAP.put(MOF.DT_UINT64, CIMDataType.UINT64_T);
-		TYPESTR_MAP.put(MOF.DT_SINT8, CIMDataType.SINT8_T);
-		TYPESTR_MAP.put(MOF.DT_SINT16, CIMDataType.SINT16_T);
-		TYPESTR_MAP.put(MOF.DT_SINT32, CIMDataType.SINT32_T);
-		TYPESTR_MAP.put(MOF.DT_SINT64, CIMDataType.SINT64_T);
-		TYPESTR_MAP.put(MOF.DT_REAL32, CIMDataType.REAL32_T);
-		TYPESTR_MAP.put(MOF.DT_REAL64, CIMDataType.REAL64_T);
-		TYPESTR_MAP.put(MOF.DT_CHAR16, CIMDataType.CHAR16_T);
-		TYPESTR_MAP.put(MOF.DT_STR, CIMDataType.STRING_T);
-		TYPESTR_MAP.put(MOF.DT_BOOL, CIMDataType.BOOLEAN_T);
-		TYPESTR_MAP.put(MOF.DT_DATETIME, CIMDataType.DATETIME_T);
-		// FIXME: ebak: What to do with those types which are not specified by
-		// MOF's BNF?
-		TYPESTR_MAP.put(MOF.INVALID, CIMDataType.INVALID_T);
-		// FIXME: ebak: What is the string representation of OBJECT?
-		TYPESTR_MAP.put("object", CIMDataType.OBJECT_T);
-		TYPESTR_MAP.put(MOF.CLASS, CIMDataType.CLASS_T);
-		TYPESTR_MAP.put(MOF.REFERENCE, new CIMDataType(""));
-	}
-
-	/**
-	 * parseScalarTypeStr
-	 * 
-	 * @param pTypeStr
-	 * @return CIMDataType
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMDataType parseScalarTypeStr(String pTypeStr) throws CIMXMLParseException {
-		return parseTypeStr(pTypeStr, false);
-	}
-
-	/**
-	 * parseArrayTypeStr
-	 * 
-	 * @param pTypeStr
-	 * @return CIMDataType
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMDataType parseArrayTypeStr(String pTypeStr) throws CIMXMLParseException {
-		return parseTypeStr(pTypeStr, true);
-	}
-
-	/**
-	 * parseTypeStr
-	 * 
-	 * @param pTypeStr
-	 * @param pArray
-	 * @return CIMDataType
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMDataType parseTypeStr(String pTypeStr, boolean pArray)
-			throws CIMXMLParseException {
-		if (pTypeStr == null) return pArray ? CIMDataType.STRING_ARRAY_T : CIMDataType.STRING_T;
-		CIMDataType type = TYPESTR_MAP.get(pTypeStr);
-		if (type == null) throw new CIMXMLParseException("Unknown TYPE string:" + pTypeStr);
-		if (pArray) {
-			if (type.getType() == CIMDataType.REFERENCE) return new CIMDataType(type
-					.getRefClassName(), 0);
-			return CIMHelper.UnboundedArrayDataType(type.getType());
-		}
-		return type;
-	}
-
-	/**
-	 * parseKEYVALUE
-	 * 
-	 * @param pKeyValueE
-	 * @return TypedValue
-	 * @throws CIMXMLParseException
-	 */
-	public static TypedValue parseKEYVALUE(Element pKeyValueE) throws CIMXMLParseException {
-		/*
-		 *  
-		 */
-		// ebak: if TYPE attribute is included there is no need to deal with
-		// VALUETYPE attribute
-		String typeStr = attribute(pKeyValueE, "TYPE");
-
-		Text valueT = (Text) searchFirstChild(pKeyValueE);
-		String valueStr = valueT == null ? null : valueT.getNodeValue();
-
-		if (typeStr == null) {
-			String valueTypeStr = attribute(pKeyValueE, "VALUETYPE");
-			if (valueTypeStr == null) valueTypeStr = "string";
-			ValueTypeHandler vtHandler = new ValueTypeHandler(valueTypeStr, valueStr);
-			return new TypedValue(vtHandler.getType(), vtHandler.getValue());
-		}
-		Object value = valueStr == null ? "" : createJavaObject(typeStr, valueStr);
-		return new TypedValue(parseScalarTypeStr(typeStr), value);
-	}
-
-	/**
-	 * Class ValueTypeHandler determines the value and type of a KEYVALUE XML
-	 * element, when the VALUETYPE attribute is provided instead of the exact
-	 * TYPE attribute. There is a very similar code section in the PULL and SAX
-	 * parser, but that section wasn't made common since in ideal case the DOM
-	 * parser will be removed.
-	 */
-	private static class ValueTypeHandler {
-
-		private CIMDataType iType;
-
-		private Object iValue;
-
-		/**
-		 * 
-		 * Ctor.
-		 * 
-		 * @param pValueTypeStr
-		 * @param pValueStr
-		 * @throws CIMXMLParseException
-		 */
-		public ValueTypeHandler(String pValueTypeStr, String pValueStr) throws CIMXMLParseException {
-
-			if (pValueTypeStr == null) throw new CIMXMLParseException(
-					"KEYVALUE element missing VALUETYPE attribute!");
-
-			if (pValueTypeStr.equals("numeric")) {
-				if (!setUInt64(pValueStr) && !setSInt64(pValueStr) && !setReal64(pValueStr)) throw new CIMXMLParseException(
-						"Unparseable \"number\" value: " + pValueStr + " !");
-			} else if (pValueTypeStr.equals(MOF.DT_STR)) {
-				if (!setDTAbsolute(pValueStr) && !setDTInterval(pValueStr)) {
-					this.iValue = pValueStr;
-					this.iType = CIMDataType.STRING_T;
-				}
-			} else if (pValueTypeStr.equals(MOF.DT_BOOL)) {
-				if (!setBoolean(pValueStr)) throw new CIMXMLParseException(
-						"Unparseable \"boolean\" value: " + pValueStr + " !");
-			} else {
-				throw new CIMXMLParseException("KEYVALUE element's VALUETYPE attribute must be "
-						+ MOF.DT_STR + ", " + MOF.DT_BOOL + " or numeric! " + pValueStr
-						+ " is not allowed!");
-			}
-		}
-
-		/**
-		 * 
-		 * getType
-		 * 
-		 * @return CIMDataType
-		 */
-		public CIMDataType getType() {
-			return this.iType;
-		}
-
-		/**
-		 * 
-		 * getValue
-		 * 
-		 * @return Object
-		 */
-		public Object getValue() {
-			return this.iValue;
-		}
-
-		private boolean setUInt64(String pValue) {
-			try {
-				this.iValue = new UnsignedInteger64(pValue);
-			} catch (NumberFormatException e) {
-				return false;
-			}
-			this.iType = CIMDataType.UINT64_T;
-			return true;
-		}
-
-		private boolean setSInt64(String pValue) {
-			try {
-				this.iValue = new Long(pValue);
-			} catch (NumberFormatException e) {
-				return false;
-			}
-			this.iType = CIMDataType.SINT64_T;
-			return true;
-		}
-
-		private boolean setReal64(String pValue) {
-			try {
-				if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
-					if (Util.isBadDoubleString(pValue)) return false;
-				}
-				this.iValue = new Double(pValue);
-			} catch (NumberFormatException e) {
-				return false;
-			}
-			this.iType = CIMDataType.REAL64_T;
-			return true;
-		}
-
-		private boolean setBoolean(String pValue) {
-			this.iValue = Boolean.valueOf(pValue);
-			this.iType = CIMDataType.BOOLEAN_T;
-			return true;
-		}
-
-		private boolean setDTAbsolute(String pValue) {
-			try {
-				this.iValue = new CIMDateTimeAbsolute(pValue);
-			} catch (IllegalArgumentException e) {
-				return false;
-			}
-			this.iType = CIMDataType.DATETIME_T;
-			return true;
-		}
-
-		private boolean setDTInterval(String pValue) {
-			try {
-				this.iValue = new CIMDateTimeInterval(pValue);
-			} catch (IllegalArgumentException e) {
-				return false;
-			}
-			this.iType = CIMDataType.DATETIME_T;
-			return true;
-		}
-	}
-
-	// ////////////////////////////////////////////////////////////////////////////////////////
-	// Object Definition Elements
-	// ////////////////////////////////////////////////////////////////////////////////////////
-
-	private static String attribute(Element pElement, String pName) {
-		String attrib = pElement.getAttribute(pName);
-		if (attrib == null || attrib.length() == 0) return null;
-		return attrib;
-	}
-
-	private static final String[] nodesCLASS = { "QUALIFIER", "PROPERTY", "PROPERTY.ARRAY",
-			"PROPERTY.REFERENCE", "METHOD" };
-
-	/**
-	 * parseCLASS
-	 * 
-	 * @param pClassE
-	 * @return CIMClass
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMClass parseCLASS(Element pClassE) throws CIMXMLParseException {
-		return parseCLASS(pClassE, null);
-	}
-
-	/**
-	 * parseCLASS
-	 * 
-	 * @param pClassE
-	 * @param pObjectPath
-	 * @return CIMClass
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMClass parseCLASS(Element pClassE, CIMObjectPath pObjectPath)
-			throws CIMXMLParseException {
-		// 
-		// 
-
-		Attr class_nameA = (Attr) searchAttribute(pClassE, "NAME");
-		if (class_nameA == null) throw new CIMXMLParseException(
-				"CLASS element missing NAME attribute!");
-		String name = class_nameA.getNodeValue();
-
-		// Attr superclass_nameA = (Attr)searchAttribute(classE, "SUPERCLASS");
-		// String supername = superclass_nameA.getNodeValue();
-
-		String superClass = attribute(pClassE, "SUPERCLASS");
-
-		// QUALIFIER
-		CIMQualifier[] qualis = parseQUALIFIERS(pClassE);
-
-		// PROPERTY
-		CIMClassProperty[] props = parseCLASSPROPERTIES(pClassE);
-
-		// METHOD
-		Element[] methodElementA = searchNodes(pClassE, "METHOD", 0, Integer.MAX_VALUE, true);
-		CIMMethod[] methods;
-		if (methodElementA != null) {
-			methods = new CIMMethod[methodElementA.length];
-			for (int i = 0; i < methodElementA.length; i++) {
-				Element methodE = methodElementA[i];
-				methods[i] = parseMETHOD(methodE);
-			}
-		} else {
-			methods = null;
-		}
-
-		/*
-		 * CIMClass( String name, String superclass, CIMQualifier[] qualifiers,
-		 * CIMClassProperty[] props, CIMMethod[] methods )
-		 * 
-		 * return new CIMClass( name, superClass, qualis, props, methods );
-		 * 
-		 * This constructor can provide localPath info. CIMClass( CIMObjectPath
-		 * path, String superclass, CIMQualifier[] qualifiers,
-		 * CIMClassProperty[] props, CIMMethod[] pMethods, boolean
-		 * pIsAssociation, boolean pIsKeyed )
-		 */
-		checkOtherNodes(pClassE, nodesCLASS);
-
-		return new CIMClass(
-				pObjectPath == null ? cLocalPathBuilder.build(name, null) : pObjectPath,
-				superClass, qualis, props, methods, hasAssocQuali(qualis), hasKeyProp(props));
-	}
-
-	private static boolean hasAssocQuali(CIMQualifier[] pQualis) {
-		if (pQualis == null) return false;
-		for (int i = 0; i < pQualis.length; i++) {
-			CIMQualifier quali = pQualis[i];
-			if ("ASSOCIATION".equalsIgnoreCase(quali.getName())
-					&& Boolean.TRUE.equals(quali.getValue())) return true;
-		}
-		return false;
-	}
-
-	private static boolean hasKeyProp(CIMProperty[] pProps) {
-		if (pProps == null) return false;
-		for (int i = 0; i < pProps.length; i++)
-			if (pProps[i].isKey()) return true;
-		return false;
-	}
-
-	private static CIMParameter[] parseParameters(Element pMethodE) throws CIMXMLParseException {
-		// PARAMETER
-		Vector> paramV = new Vector>();
-		Element[] paramElementA = searchNodes(pMethodE, "PARAMETER");
-		if (paramElementA != null) {
-			for (int i = 0; i < paramElementA.length; i++) {
-				Element parameterE = paramElementA[i];
-				CIMParameter p = parsePARAMETER(parameterE);
-				paramV.add(p);
-			}
-		}
-
-		Element[] paramRefElementA = searchNodes(pMethodE, "PARAMETER.REFERENCE");
-		if (paramRefElementA != null) {
-			for (int i = 0; i < paramRefElementA.length; i++) {
-				Element parameterE = paramRefElementA[i];
-				CIMParameter p = parsePARAMETERREFERENCE(parameterE);
-				paramV.add(p);
-			}
-		}
-
-		Element[] paramArrayElementA = searchNodes(pMethodE, "PARAMETER.ARRAY");
-		if (paramArrayElementA != null) {
-			for (int i = 0; i < paramArrayElementA.length; i++) {
-				Element parameterE = paramArrayElementA[i];
-				CIMParameter p = parsePARAMETERARRAY(parameterE);
-				paramV.add(p);
-			}
-		}
-
-		Element[] paramRefArrayElementA = searchNodes(pMethodE, "PARAMETER.REFARRAY");
-		if (paramRefArrayElementA != null) {
-			for (int i = 0; i < paramRefArrayElementA.length; i++) {
-				Element parameterE = paramRefArrayElementA[i];
-				CIMParameter p = parsePARAMETERREFARRAY(parameterE);
-				paramV.add(p);
-			}
-		}
-
-		return paramV.toArray(new CIMParameter[0]);
-	}
-
-	private static final String nodesMETHOD[] = { "QUALIFIER", "PARAMETER", "PARAMETER.REFERENCE",
-			"PARAMETER.ARRAY", "PARAMETER.REFARRAY" };
-
-	/**
-	 * parseMETHOD
-	 * 
-	 * @param pMethodE
-	 * @return CIMMethod
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMMethod parseMETHOD(Element pMethodE) throws CIMXMLParseException {
-		// 
-		// 
-
-		String name = attribute(pMethodE, "NAME");
-		if (name == null) throw new CIMXMLParseException("METHOD element missing NAME attribute!");
-		EmbObjHandler embObjHandler = new EmbObjHandler(pMethodE);
-		CIMDataType type = embObjHandler.getType();
-		if (type != null && type.isArray()) throw new CIMXMLParseException(
-				"Method's type cannot be Array!");
-		String classOrigin = attribute(pMethodE, "CLASSORIGIN");
-		String propagatedStr = pMethodE.getAttribute("PROPAGATED");
-		boolean propagated = "true".equalsIgnoreCase(propagatedStr);
-
-		checkOtherNodes(pMethodE, nodesMETHOD);
-
-		// PARAMETERS
-		CIMParameter[] params = parseParameters(pMethodE);
-		// CIMMethod(String name, CIMDataType type, CIMQualifier[] qualifiers,
-		// CIMParameter[] parameters, boolean propagated, String originClass)
-		return new CIMMethod(name, type, embObjHandler.getQualifiers(), params, propagated,
-				classOrigin);
-	}
-
-	private static final String nodesPARAMETER[] = { "QUALIFIER" };
-
-	/**
-	 * parsePARAMETER
-	 * 
-	 * @param pParamE
-	 * @return CIMParameter
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMParameter parsePARAMETER(Element pParamE) throws CIMXMLParseException {
-		String name = attribute(pParamE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PARAMETER element missing NAME attribute!");
-		if (attribute(pParamE, "TYPE") == null) throw new CIMXMLParseException(
-				"PARAMETER element missing TYPE attribute!");
-		checkOtherNodes(pParamE, nodesPARAMETER);
-		EmbObjHandler iEmbObjHandler = new EmbObjHandler(pParamE);
-		// CIMParameter(String name, CIMDataType type, CIMQualifier[]
-		// qualifiers)
-		return new CIMParameter(name, iEmbObjHandler.getType(), iEmbObjHandler
-				.getQualifiers());
-	}
-
-	private static final String nodesPARAMETERREFERENCE[] = { "QUALIFIER" };
-
-	/**
-	 * parsePARAMETERREFERENCE
-	 * 
-	 * @param pParamE
-	 * @return CIMParameter
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMParameter parsePARAMETERREFERENCE(Element pParamE)
-			throws CIMXMLParseException {
-		String name = attribute(pParamE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PARAMETER.REFERENCE element missing NAME attribute!");
-		String referenceClass = attribute(pParamE, "REFERENCECLASS");
-		CIMDataType type = new CIMDataType(referenceClass != null ? referenceClass : "");
-		checkOtherNodes(pParamE, nodesPARAMETERREFERENCE);
-		// QUALIFIER
-		CIMQualifier[] qualis = parseQUALIFIERS(pParamE);
-		return new CIMParameter(name, type, qualis);
-	}
-
-	private static final String nodesPARAMETERARRAY[] = { "QUALIFIER" };
-
-	/**
-	 * parsePARAMETERARRAY
-	 * 
-	 * @param pParamE
-	 * @return CIMParameter
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMParameter parsePARAMETERARRAY(Element pParamE)
-			throws CIMXMLParseException {
-		String name = attribute(pParamE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PARAMETER.ARRAY element missing NAME attribute!");
-		if (attribute(pParamE, "TYPE") == null) throw new CIMXMLParseException(
-				"PARAMETER.ARRAY element missing TYPE attribute!");
-		String arraySizeStr = pParamE.getAttribute("ARRAYSIZE");
-		try {
-			if (arraySizeStr.length() > 0) Integer.parseInt(arraySizeStr);
-		} catch (NumberFormatException e) {
-			throw new CIMXMLParseException(arraySizeStr
-					+ " is not a valid ARRAYSIZE attribute for PARAMETER.ARRAY!");
-		}
-		checkOtherNodes(pParamE, nodesPARAMETERARRAY);
-		EmbObjHandler iEmbObjHandler = new EmbObjHandler(pParamE);
-		return new CIMParameter(name, iEmbObjHandler.getArrayType(), iEmbObjHandler
-				.getQualifiers());
-	}
-
-	private static final String nodesPARAMETERREFARRAY[] = { "QUALIFIER" };
-
-	/**
-	 * parsePARAMETERREFARRAY
-	 * 
-	 * @param pParamE
-	 * @return CIMParameter
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMParameter parsePARAMETERREFARRAY(Element pParamE)
-			throws CIMXMLParseException {
-		String name = attribute(pParamE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PARAMETER.REFARRAY element missing NAME attribute!");
-
-		String referenceClass = attribute(pParamE, "REFERENCECLASS");
-
-		int arraySize = 0; // unlimited
-		String arraySizeStr = pParamE.getAttribute("ARRAYSIZE");
-		try {
-			if (arraySizeStr.length() > 0) arraySize = Integer.parseInt(arraySizeStr);
-		} catch (NumberFormatException e) {
-			throw new CIMXMLParseException(arraySizeStr
-					+ " is not a valid ARRAYSIZE attribute for PARAMETER.REFARRAY!");
-		}
-
-		CIMDataType type = new CIMDataType((referenceClass != null) ? referenceClass : "",
-				arraySize);
-
-		// QUALIFIER
-		checkOtherNodes(pParamE, nodesPARAMETERREFARRAY);
-		CIMQualifier[] qualis = parseQUALIFIERS(pParamE);
-		return new CIMParameter(name, type, qualis);
-	}
-
-	/**
-	 * parseINSTANCE
-	 * 
-	 * @param pInstanceE
-	 * @return CIMInstance
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMInstance parseINSTANCE(Element pInstanceE) throws CIMXMLParseException {
-		return parseINSTANCE(pInstanceE, null);
-	}
-
-	private static final String[] nodesINSTANCE = { "QUALIFIER", "PROPERTY", "PROPERTY.ARRAY",
-			"PROPERTY.REFERENCE" };
-
-	/**
-	 * parseINSTANCE
-	 * 
-	 * @param pInstanceE
-	 * @param pObjPath
-	 * @return CIMInstance
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMInstance parseINSTANCE(Element pInstanceE, CIMObjectPath pObjPath)
-			throws CIMXMLParseException {
-		// 
-		// 
-
-		// BB mod CIMInstance inst = new CIMInstance();
-		String className = attribute(pInstanceE, "CLASSNAME");
-		if (className == null) throw new CIMXMLParseException(
-				"INSTANCE element missing CLASSNAME attribute!");
-		// QUALIFIER
-		// FIXME: in JSR48 CIMInstance doesn't have qualifiers
-		// CIMQualifier[] qualis = parseQUALIFIERS(pInstanceE);
-		// PROPERTY
-		CIMProperty[] props = parsePROPERTIES(pInstanceE);
-
-		checkOtherNodes(pInstanceE, nodesINSTANCE);
-
-		if (pObjPath == null) return new CIMInstance(cLocalPathBuilder.build(className, null),
-				props);
-		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
-				.CIMInstanceWithSynchonizedNumericKeyDataTypes(pObjPath, props);
-		return new CIMInstance(pObjPath, props);
-	}
-
-	/**
-	 * ebak: Access to enclosing method parseQUALIFIERS(Element) from the type
-	 * CIMXMLParserImpl is emulated by a synthetic accessor method. Increasing
-	 * its visibility will improve your performance
-	 * 
-	 * @param pElement
-	 * @return CIMQualifier[]
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMQualifier[] parseQUALIFIERS(Element pElement) throws CIMXMLParseException {
-		Element[] qualiElementA = searchNodes(pElement, "QUALIFIER");
-		CIMQualifier[] qualis;
-		if (qualiElementA != null) {
-			qualis = new CIMQualifier[qualiElementA.length];
-			for (int i = 0; i < qualiElementA.length; i++) {
-				Element qualifierE = qualiElementA[i];
-				qualis[i] = parseQUALIFIER(qualifierE);
-			}
-		} else qualis = null;
-		return qualis;
-	}
-
-	/**
-	 * 
      -	 *  ENTITY % QualifierFlavor "
-	 *  OVERRIDABLE    (true|false)  'true'
-	 *  TOSUBCLASS     (true|false)  'true'
-	 *  TOINSTANCE     (true|false)  'false'
-	 *  TRANSLATABLE   (true|false)  'false'"
-	 * 
      
-	 * 
-	 * @param pElement
-	 * @return int - CIMFlavor bit mixture
-	 */
-	private static int parseFLAVORS(Element pElement) {
-		int flavors = 0;
-		if (!getBoolAttribute(pElement, "OVERRIDABLE", true)) flavors |= CIMFlavor.DISABLEOVERRIDE;
-		if (!getBoolAttribute(pElement, "TOSUBCLASS", true)) flavors |= CIMFlavor.RESTRICTED;
-		if (getBoolAttribute(pElement, "TRANSLATABLE", false)) flavors |= CIMFlavor.TRANSLATE;
-		return flavors;
-	}
-
-	private static TypedValue parseSingleValue(Element pElement) throws CIMXMLParseException {
-		return parseSingleValue(pElement, VALUE | VALUEA);
-	}
-
-	private static final int VALUE = 1, VALUEA = 2, VALUEREF = 4, VALUEREFA = 8;
-
-	private static TypedValue parseSingleValue(Element pElement, int pMask)
-			throws CIMXMLParseException {
-		boolean foundSingleValue = false;
-		String typeStr = attribute(pElement, "TYPE");
-		// ebak: there was an ESS fix in the base implementation
-		if (typeStr == null) typeStr = attribute(pElement, "PARAMTYPE");
-		CIMDataType type = null;
-		Object value = null;
-		if ((pMask & VALUE) > 0) {
-			Element valueE = (Element) searchFirstNode(pElement, "VALUE");
-			if (valueE != null) {
-				TypedValue tVal = parseVALUE(valueE);
-				String valueStr = (String) tVal.getValue();
-				type = typeStr == null ? tVal.getType() : parseScalarTypeStr(typeStr);
-				value = createJavaObject(type == null ? null : type.toString(), valueStr);
-				foundSingleValue = true;
-			}
-		}
-		if (!foundSingleValue && (pMask & VALUEREF) > 0) {
-			// VALUE.REFERENCE
-			Element valuereferenceE = (Element) searchFirstNode(pElement, "VALUE.REFERENCE");
-			if (valuereferenceE != null) {
-				CIMObjectPath op = parseVALUEREFERENCE(valuereferenceE);
-				value = op;
-				type = new CIMDataType(op.getObjectName());
-				foundSingleValue = true;
-			}
-		}
-		if (!foundSingleValue && (pMask & VALUEA) > 0) {
-			// VALUE.ARRAY
-			Element valuearrayE = (Element) searchFirstNode(pElement, "VALUE.ARRAY");
-			if (valuearrayE != null) {
-				TypedValue tValA = parseVALUEARRAY(valuearrayE);
-				type = typeStr == null ? tValA.getType() : parseArrayTypeStr(typeStr);
-				String[] valStrA = (String[]) tValA.getValue();
-				if (valStrA != null) {
-					Object[] values = new Object[valStrA.length];
-					for (int i = 0; i < valStrA.length; i++) {
-						values[i] = createJavaObject(type == null ? null : type.toString(),
-								valStrA[i]);
-					}
-					value = values;
-				}
-				foundSingleValue = true;
-			}
-		}
-		if (!foundSingleValue && (pMask & VALUEREFA) > 0) {
-			// VALUE.REFARRAY
-			Element valueRefArrayE = (Element) searchFirstNode(pElement, "VALUE.REFARRAY");
-			if (valueRefArrayE != null) {
-				type = new CIMDataType("", 0);
-				CIMObjectPath[] opA = parseVALUEREFARRAY(valueRefArrayE);
-				value = opA;
-				foundSingleValue = true;
-			}
-		}
-		if (!foundSingleValue) {
-			if (value instanceof Object[]) type = CIMDataType.STRING_ARRAY_T;
-			else if (value != null) type = CIMDataType.STRING_T;
-			else type = CIMDataType.STRING_T; // /throw new
-			// CIMXMLParseException("null
-			// type with null value!");
-		}
-		return new TypedValue(type, value);
-	}
-
-	private static final String nodesQUALIFIER[] = { "VALUE", "VALUE.ARRAY" };
-
-	/**
-	 * parseQUALIFIER
-	 * 
-	 * @param pQualifierE
-	 * @return CIMQualifier
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMQualifier parseQUALIFIER(Element pQualifierE) throws CIMXMLParseException {
-		// 
-		// 
-
-		String name = attribute(pQualifierE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"QUALIFIER element missing NAME attribute!");
-		String typeStr = attribute(pQualifierE, "TYPE");
-		if (typeStr == null && !hasTypeAttrsInNodes(pQualifierE)) throw new CIMXMLParseException(
-				"QUALIFIER element missing TYPE attribute!");
-		boolean propagated = MOF.TRUE.equalsIgnoreCase(pQualifierE.getAttribute("PROPAGATED"));
-		// FLAVORS
-		int flavors = parseFLAVORS(pQualifierE);
-		// VALUE
-		if (searchNodes(pQualifierE, "VALUE", 0, 1, false) != null
-				|| searchNodes(pQualifierE, "VALUE.ARRAY", 0, 1, false) != null) {
-			TypedValue typedValue = parseSingleValue(pQualifierE);
-			if (typedValue.getType() == null) throw new CIMXMLParseException(
-					"Qualifier's type is null!");
-			// CIMQualifier(String pName, CIMDataType pType, Object pValue, int
-			// pFlavor)
-			return new CIMQualifier(name, typedValue.getType(), typedValue.getValue(),
-					flavors, propagated);
-		}
-		checkOtherNodes(pQualifierE, nodesQUALIFIER);
-
-		CIMDataType type = parseScalarTypeStr(typeStr);
-		return new CIMQualifier(name, type != null ? type : CIMDataType.STRING_T, null,
-				flavors, propagated);
-	}
-
-	/**
-	 * parseQUALIFIERDECLARATION
-	 * 
-	 * @param pQualifierTypeE
-	 * @return CIMQualifierType
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMQualifierType parseQUALIFIERDECLARATION(Element pQualifierTypeE)
-			throws CIMXMLParseException {
-		// 
-		// 
-
-		String name = attribute(pQualifierTypeE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"QUALIFIER.DECLARATION element missing NAME attribute!");
-		String type = attribute(pQualifierTypeE, "TYPE");
-		if (type == null && !hasTypeAttrsInNodes(pQualifierTypeE)) throw new CIMXMLParseException(
-				"QUALIFIER.DECLARATION element missing TYPE attribute!");
-
-		// SCOPES
-		// ebak: there should be only 1 scope node
-		Element scopeElementA[] = searchNodes(pQualifierTypeE, "SCOPE", 0, 1, true);
-		int scopes = scopeElementA == null ? 0 : parseSCOPES(scopeElementA[0]);
-		// QUALIFIERS
-		// CIMQualifier[] qualis = parseQUALIFIERS(pQualifierTypeE);
-
-		CIMDataType qdType;
-		Object qdValue;
-
-		String nodes[] = null;
-
-		if (searchNodes(pQualifierTypeE, "VALUE", 0, 1, true) != null) {
-			nodes = new String[] { "SCOPE", "VALUE" };
-		} else if (searchNodes(pQualifierTypeE, "VALUE.ARRAY", 0, 1, true) != null) {
-			nodes = new String[] { "SCOPE", "VALUE.ARRAY" };
-		}
-
-		// VALUE
-		if (nodes != null) {
-			TypedValue typedValue = parseSingleValue(pQualifierTypeE);
-			qdType = typedValue.getType();
-			qdValue = typedValue.getValue();
-			boolean isArray = hasTrueAttribute(pQualifierTypeE, "ISARRAY");
-			String arraySizeStr = attribute(pQualifierTypeE, "ARRAYSIZE");
-			try {
-				int arraySize = (arraySizeStr == null ? (isArray ? 0 : -1) : Integer
-						.parseInt(arraySizeStr));
-				if (isArray || arraySize >= 0) {
-					qdType = (arraySize > 0) ? new CIMDataType(qdType.getType(), arraySize)
-							: CIMHelper.UnboundedArrayDataType(qdType.getType());
-				}
-			} catch (NumberFormatException e) {
-				throw new CIMXMLParseException(arraySizeStr
-						+ " is not a valid ARRAYSIZE attribute for QUALIFIER.DECLARATION!");
-			}
-		} else {
-			nodes = new String[] { "SCOPE" };
-			qdType = parseScalarTypeStr(type);
-			if (qdType == null) qdType = CIMDataType.STRING_T;
-			qdValue = null;
-		}
-		checkOtherNodes(pQualifierTypeE, nodes);
-
-		// FIXME: ebak: what about the flavors?
-		return new CIMQualifierType(new CIMObjectPath(null, null, null, null, name, null),
-				qdType, qdValue, scopes, 0);
-	}
-
-	private static boolean hasTrueAttribute(Element pElement, String pName) {
-		String valueStr = pElement.getAttribute(pName);
-		return MOF.TRUE.equalsIgnoreCase(valueStr);
-	}
-
-	private static boolean getBoolAttribute(Element pElement, String pName, boolean pDefVal) {
-		String val = pElement.getAttribute(pName);
-		if (MOF.TRUE.equalsIgnoreCase(val)) return true;
-		if (MOF.FALSE.equalsIgnoreCase(val)) return false;
-		return pDefVal;
-	}
-
-	/**
-	 * parseSCOPES
-	 * 
-	 * @param pScopeE
-	 * @return int
-	 */
-	public static int parseSCOPES(Element pScopeE) {
-		int scopes = 0;
-		if (hasTrueAttribute(pScopeE, "CLASS")) scopes |= CIMScope.CLASS;
-		if (hasTrueAttribute(pScopeE, "ASSOCIATION")) scopes |= CIMScope.ASSOCIATION;
-		if (hasTrueAttribute(pScopeE, "REFERENCE")) scopes |= CIMScope.REFERENCE;
-		if (hasTrueAttribute(pScopeE, "PROPERTY")) scopes |= CIMScope.PROPERTY;
-		if (hasTrueAttribute(pScopeE, "METHOD")) scopes |= CIMScope.METHOD;
-		if (hasTrueAttribute(pScopeE, "PARAMETER")) scopes |= CIMScope.PARAMETER;
-		if (hasTrueAttribute(pScopeE, "INDICATION")) scopes |= CIMScope.INDICATION;
-		return scopes;
-	}
-
-	private static Vector> parseClassPropsToVec(Element pElement)
-			throws CIMXMLParseException {
-		Element[] propElementA = searchNodes(pElement, "PROPERTY");
-		Vector> propVec = new Vector>();
-		if (propElementA != null) {
-			for (int i = 0; i < propElementA.length; i++) {
-				Element propertyE = propElementA[i];
-				propVec.add(parseCLASSPROPERTY(propertyE));
-
-			}
-		}
-
-		// PROPERTY.ARRAY
-		Element[] propArrayElementA = searchNodes(pElement, "PROPERTY.ARRAY");
-		if (propArrayElementA != null) {
-			for (int i = 0; i < propArrayElementA.length; i++) {
-				Element propertyarrayE = propArrayElementA[i];
-				propVec.add(parseCLASSPROPERTYARRAY(propertyarrayE));
-			}
-		}
-
-		// PROPERTY.REFERENCE
-		Element[] propRefElementA = searchNodes(pElement, "PROPERTY.REFERENCE");
-		if (propRefElementA != null) {
-			for (int i = 0; i < propRefElementA.length; i++) {
-				Element propertyreferenceE = propRefElementA[i];
-				propVec.add(parseCLASSPROPERTYREFERENCE(propertyreferenceE));
-			}
-		}
-		return propVec;
-	}
-
-	/**
-	 * parsePROPERTIES
-	 * 
-	 * @param pElement
-	 * @return CIMProperty[]
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMProperty[] parsePROPERTIES(Element pElement) throws CIMXMLParseException {
-		Vector> classPropVec = parseClassPropsToVec(pElement);
-		// The following does not convert Vector to
-		// CIMProperty[], it is still CIMClassProperty[]!!! You can treat it
-		// like a CIMProperty (property.getValue(), etc.) but (property
-		// instanceof CIMProperty) will return false!
-		// return classPropVec.toArray(new CIMProperty[0]);
-
-		int arraySize = classPropVec.size();
-		CIMProperty[] retA = new CIMProperty[arraySize];
-		for (int i = 0; i < arraySize; i++) {
-			CIMClassProperty prop = classPropVec.get(i);
-			retA[i] = new CIMProperty(prop.getName(), prop.getDataType(), prop.getValue(),
-					prop.isKey(), prop.isPropagated(), prop.getOriginClass());
-		}
-		return retA;
-	}
-
-	/**
-	 * parseCLASSPROPERTIES
-	 * 
-	 * @param pElement
-	 * @return CIMClassProperty[]
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMClassProperty[] parseCLASSPROPERTIES(Element pElement)
-			throws CIMXMLParseException {
-		Vector> classPropVec = parseClassPropsToVec(pElement);
-		return classPropVec.toArray(new CIMClassProperty[0]);
-	}
-
-	/**
-	 * parsePROPERTY
-	 * 
-	 * @param pPropertyE
-	 * @return CIMProperty
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMProperty parsePROPERTY(Element pPropertyE) throws CIMXMLParseException {
-		return parseCLASSPROPERTY(pPropertyE);
-	}
-
-	private static class EmbObjHandler {
-
-		private CIMQualifier[] iQualiA;
-
-		private boolean iHasEmbObjAttr, iHasEmbInstAttr, iHasEmbObjQuali, iHasEmbInstQuali, iKeyed;
-
-		private CIMDataType iRawType, iType;
-
-		private Object iRawValue, iValue;
-
-		private Element iElement;
-
-		private boolean iStrictParsing = WBEMConfiguration.getGlobalConfiguration()
-				.strictEmbObjTypes();
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pElement
-		 * @throws CIMXMLParseException
-		 */
-		public EmbObjHandler(Element pElement) throws CIMXMLParseException {
-			this.iElement = pElement;
-			handleQualis();
-			handleAttribs();
-			Element valueE = (Element) searchFirstNode(pElement, "VALUE");
-			if (valueE != null) {
-				TypedValue tv = parseVALUE(valueE);
-				if (this.iRawType == null) this.iRawType = tv.getType();
-				if (this.iRawType == null) this.iRawType = CIMDataType.STRING_T;
-				this.iRawValue = tv.getValue();
-			} else {
-				valueE = (Element) searchFirstNode(pElement, "VALUE.ARRAY");
-				if (valueE != null) {
-					TypedValue tv = parseVALUEARRAY(valueE);
-					if (this.iRawType == null) this.iRawType = tv.getType();
-					if (this.iRawType == null) this.iRawType = CIMDataType.STRING_ARRAY_T;
-					this.iRawValue = tv.getValue();
-				}
-			}
-		}
-
-		private void handleQualis() throws CIMXMLParseException {
-			this.iQualiA = parseQUALIFIERS(this.iElement);
-			if (this.iQualiA != null) {
-				for (int idx = 0; idx < this.iQualiA.length; idx++) {
-					String qualiName = this.iQualiA[idx].getName();
-					if ("EmbeddedObject".equalsIgnoreCase(qualiName)) {
-						this.iHasEmbObjQuali = true;
-					} else if ("EMBEDDEDINSTANCE".equalsIgnoreCase(qualiName)) {
-						this.iHasEmbInstQuali = true;
-					} else if ("KEY".equalsIgnoreCase(qualiName)) {
-						this.iKeyed = true;
-					}
-					if ((this.iHasEmbObjQuali || this.iHasEmbInstQuali) && this.iKeyed) return;
-				}
-			}
-		}
-
-		private void handleAttribs() throws CIMXMLParseException {
-			String typeStr = this.iElement.getAttribute("TYPE");
-			if (typeStr == null || typeStr.length() == 0) {
-				typeStr = this.iElement.getAttribute("PARAMTYPE");
-				if (typeStr == null || typeStr.length() == 0) {
-					/*
-					 * throw new CIMXMLParseException( iElement.getNodeName()+"
-					 * must contain a TYPE or PARAMTYPE attribute!" );
-					 */
-					/*
-					 * ebak: Workaround for SVC's TYPE attribute in VALUE and
-					 * VALUE.ARRAY element.
-					 */
-					typeStr = null;
-				}
-			}
-			// ebak: iRawType can be filled from contained VALUE or VALUE.ARRAY
-			// element (SVC)
-			if (typeStr != null) this.iRawType = parseScalarTypeStr(typeStr);
-
-			// DSPs call for EmbeddedObject AND XML is case sensitive, BUT there
-			// are probably CIMOMs out there that still use EMBEDDEDOBJECT
-			String embObjAttrStr = this.iElement.getAttribute("EmbeddedObject");
-			if (embObjAttrStr == null || embObjAttrStr.length() == 0) {
-				embObjAttrStr = this.iElement.getAttribute("EMBEDDEDOBJECT");
-			}
-			if (embObjAttrStr == null || embObjAttrStr.length() == 0) {
-				this.iHasEmbObjAttr = this.iHasEmbInstAttr = false;
-			} else if ("object".equalsIgnoreCase(embObjAttrStr)) {
-				this.iHasEmbObjAttr = true;
-				this.iHasEmbInstAttr = false;
-			} else if ("instance".equalsIgnoreCase(embObjAttrStr)) {
-				this.iHasEmbObjAttr = false;
-				this.iHasEmbInstAttr = true;
-			} else throw new CIMXMLParseException("EmbeddedObject attribute cannot contain \""
-					+ embObjAttrStr + "\" value!");
-		}
-
-		/**
-		 * getQualifiers
-		 * 
-		 * @return CIMQualifier[]
-		 * @throws CIMXMLParseException
-		 */
-		public CIMQualifier[] getQualifiers() throws CIMXMLParseException {
-			transform();
-			CIMQualifiedElementInterfaceImpl qualiImpl = new CIMQualifiedElementInterfaceImpl(
-					this.iQualiA, isKeyed(), this.iType == null
-							|| this.iType.getType() == CIMDataType.STRING);
-			return qualiImpl.getQualifiers();
-		}
-
-		/**
-		 * isKeyed
-		 * 
-		 * @return boolean
-		 */
-		public boolean isKeyed() {
-			return this.iKeyed;
-		}
-
-		/**
-		 * isEmbeddedObject
-		 * 
-		 * @return boolean
-		 */
-		private boolean isEmbeddedObject() {
-			return this.iHasEmbObjAttr || this.iHasEmbInstAttr || this.iHasEmbObjQuali
-					|| this.iHasEmbInstQuali;
-		}
-
-		/**
-		 * isEmbeddedClass
-		 * 
-		 * @return boolean
-		 */
-		private boolean isEmbeddedClass() {
-			return this.iHasEmbObjAttr || this.iHasEmbObjQuali;
-		}
-
-		/**
-		 * isEmbeddedInstance
-		 * 
-		 * @return boolean
-		 */
-		private boolean isEmbeddedInstance() {
-			return this.iHasEmbInstAttr || this.iHasEmbInstQuali;
-		}
-
-		/**
-		 * getType
-		 * 
-		 * @return CIMDataType
-		 * @throws CIMXMLParseException
-		 */
-		public CIMDataType getType() throws CIMXMLParseException {
-			transform();
-			return this.iType;
-		}
-
-		/**
-		 * getArrayType
-		 * 
-		 * @return CIMDataType
-		 * @throws CIMXMLParseException
-		 */
-		public CIMDataType getArrayType() throws CIMXMLParseException {
-			transform();
-			return this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
-					.getType());
-		}
-
-		/**
-		 * getValue
-		 * 
-		 * @return Object
-		 * @throws CIMXMLParseException
-		 */
-		public Object getValue() throws CIMXMLParseException {
-			transform();
-			return this.iValue;
-		}
-
-		private void transform() throws CIMXMLParseException {
-			if (this.iType != null) return;
-			if (this.iRawValue == null) {
-				if (isEmbeddedObject()) {
-					if (this.iRawType != CIMDataType.STRING_T) throw new CIMXMLParseException(
-							"Embedded Object CIM-XML element's type must be string. "
-									+ this.iRawType + " is invalid!");
-					if (this.iStrictParsing) {
-						/*
-						 * In case of strict parsing Object means CIMClass,
-						 * Instance means CIMInstance. Pegasus 2.7.0 seems to
-						 * handle it this way.
-						 */
-						this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T
-								: CIMDataType.CLASS_T;
-					} else {
-						/*
-						 * for valueless EmbeddedObject="object" the type is
-						 * undeterminable since Pegasus's CIMObject can contain
-						 * both CIMClass and CIMInstance
-						 */
-						this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T
-								: CIMDataType.STRING_T;
-					}
-				} else {
-					this.iType = this.iRawType;
-				}
-				this.iValue = null;
-			} else {
-				if (isEmbeddedObject()) {
-					transformEmbObj();
-				} else {
-					transformNormObj();
-				}
-			}
-		}
-
-		private void transformEmbObj() throws CIMXMLParseException {
-			if (this.iRawValue instanceof String) {
-				this.iValue = parseXmlStr((String) this.iRawValue);
-				this.iType = getCIMObjType(this.iValue);
-			} else {
-				this.iValue = parseXmlStrA((String[]) this.iRawValue);
-				this.iType = getCIMObjAType((Object[]) this.iValue);
-			}
-			if (isEmbeddedInstance() && this.iType.getType() != CIMDataType.OBJECT) throw new CIMXMLParseException(
-					this.iElement.getNodeName()
-							+ " element is an EmbeddedInstance with non INSTANCE value. "
-							+ "It's not valid!");
-			if (isEmbeddedClass() && this.iType.getType() != CIMDataType.CLASS
-					&& this.iType.getType() != CIMDataType.OBJECT) throw new CIMXMLParseException(
-					this.iElement.getNodeName()
-							+ " element is an EmbeddedObject with non CLASS/INSTANCE value. It's not valid!");
-		}
-
-		private void transformNormObj() throws CIMXMLParseException {
-			if (this.iRawValue instanceof String) {
-				this.iType = this.iRawType;
-				this.iValue = createJavaObject(this.iType == null ? null : this.iType.toString(),
-						(String) this.iRawValue);
-			} else {
-				String[] rawValueA = (String[]) this.iRawValue;
-				String typeStr = this.iRawType.toString();
-				Object[] objA = new Object[rawValueA.length];
-				for (int i = 0; i < objA.length; i++)
-					objA[i] = createJavaObject(typeStr, rawValueA[i]);
-				this.iType = CIMHelper.UnboundedArrayDataType(this.iRawType.getType());
-				this.iValue = objA;
-			}
-		}
-
-		/**
-		 * parseXmlStr
-		 * 
-		 * @param pXmlStr
-		 * @return CIMClass or CIMInstance
-		 * @throws CIMXMLParseException
-		 */
-		public static Object parseXmlStr(String pXmlStr) throws CIMXMLParseException {
-			// ebak: workaround for null array elements -> parse empty EmbObj
-			// string as null
-			if (pXmlStr == null || pXmlStr.length() == 0) return null;
-			try {
-				CIMClientXML_HelperImpl builder = new CIMClientXML_HelperImpl();
-				Document doc = builder.parse(new InputSource(new StringReader(pXmlStr)));
-				return parseObject(doc.getDocumentElement());
-			} catch (CIMXMLParseException e) {
-				throw e;
-			} catch (Exception e) {
-				throw new CIMXMLParseException(e.getMessage() + "\npXmlStr=" + pXmlStr);
-			}
-		}
-
-		/**
-		 * parseXmlStrA
-		 * 
-		 * @param pXmlStrA
-		 * @return Object[]
-		 * @throws CIMXMLParseException
-		 */
-		public static Object[] parseXmlStrA(String[] pXmlStrA) throws CIMXMLParseException {
-			if (pXmlStrA == null || pXmlStrA.length == 0) return null;
-			Object[] objA = new Object[pXmlStrA.length];
-			for (int i = 0; i < objA.length; i++) {
-				String xmlStr = pXmlStrA[i];
-				objA[i] = xmlStr == null ? null : parseXmlStr(xmlStr);
-			}
-			return objA;
-		}
-
-		/**
-		 * getCIMObjType
-		 * 
-		 * @param pCIMObj
-		 * @return CIMDataType
-		 * @throws CIMXMLParseException
-		 */
-		public static CIMDataType getCIMObjType(Object pCIMObj) throws CIMXMLParseException {
-			if (pCIMObj == null) throw new CIMXMLParseException(
-					"cannot have null CIM object! (CIMClass or CIMInstance)");
-			if (pCIMObj instanceof CIMInstance) return CIMDataType.OBJECT_T;
-			if (pCIMObj instanceof CIMClass) return CIMDataType.CLASS_T;
-			throw new CIMXMLParseException(pCIMObj.getClass().getName()
-					+ " is not a CIM object! (CIMClass or CIMInstance)");
-		}
-
-		/**
-		 * getCIMObjAType
-		 * 
-		 * @param pCIMObjA
-		 * @return CIMDataType
-		 * @throws CIMXMLParseException
-		 */
-		public static CIMDataType getCIMObjAType(Object[] pCIMObjA) throws CIMXMLParseException {
-			if (pCIMObjA == null || pCIMObjA.length == 0) return CIMDataType.STRING_ARRAY_T;
-			CIMDataType type = null;
-			for (int i = 0; i < pCIMObjA.length; i++) {
-				if (pCIMObjA[i] == null) continue;
-				CIMDataType currType = getCIMObjType(pCIMObjA[i]);
-				if (type == null) {
-					type = currType;
-				} else if (type != currType) { throw new CIMXMLParseException(
-						"Embedded Object arrays with different types are not supported"); }
-			}
-			if (type == CIMDataType.OBJECT_T) return CIMDataType.OBJECT_ARRAY_T;
-			if (type == CIMDataType.CLASS_T) return CIMDataType.CLASS_ARRAY_T;
-			return CIMDataType.STRING_ARRAY_T;
-		}
-
-	}
-
-	private static final String nodesPROPERTY[] = { "QUALIFIER", "VALUE" };
-
-	/**
-	 * parseCLASSPROPERTY
-	 * 
-	 * @param pPropertyE
-	 * @return CIMClassProperty
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMClassProperty parseCLASSPROPERTY(Element pPropertyE)
-			throws CIMXMLParseException {
-		// 
-		// 
-
-		Attr property_nameA = (Attr) searchAttribute(pPropertyE, "NAME");
-		if (property_nameA == null) throw new CIMXMLParseException(
-				"PROPERTY element missing NAME attribute!");
-		String name = property_nameA.getNodeValue();
-		if (attribute(pPropertyE, "TYPE") == null && !hasTypeAttrsInNodes(pPropertyE)) throw new CIMXMLParseException(
-				"PROPERTY element missing TYPE attribute!");
-
-		String classOrigin = pPropertyE.getAttribute("CLASSORIGIN");
-		if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
-
-		String propagatedStr = pPropertyE.getAttribute("PROPAGATED");
-		boolean propagated = MOF.TRUE.equalsIgnoreCase(propagatedStr);
-
-		// only QUALIFIER(s) and 0/1 VALUE
-		searchNodes(pPropertyE, "VALUE", 0, 1, true);
-		checkOtherNodes(pPropertyE, nodesPROPERTY);
-
-		// QUALIFIER
-		// ebak: EmbeddedObject support
-		EmbObjHandler embObjHandler = new EmbObjHandler(pPropertyE);
-		/*
-		 * CIMClassProperty(String pName, CIMDataType pType, Object pValue,
-		 * CIMQualifier[] pQualifiers, boolean pKey, boolean propagated, String
-		 * originClass)
-		 */
-		return new CIMClassProperty(name, embObjHandler.getType(),
-				embObjHandler.getValue(), embObjHandler.getQualifiers(), embObjHandler.isKeyed(),
-				propagated, classOrigin);
-	}
-
-	/**
-	 * parsePROPERTYARRAY
-	 * 
-	 * @param pPropertyArrayE
-	 * @return CIMProperty
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMProperty parsePROPERTYARRAY(Element pPropertyArrayE)
-			throws CIMXMLParseException {
-		return parseCLASSPROPERTYARRAY(pPropertyArrayE);
-	}
-
-	private static final String nodesPROPERTYARRAY[] = { "QUALIFIER", "VALUE.ARRAY" };
-
-	/**
-	 * parseCLASSPROPERTYARRAY
-	 * 
-	 * @param pPropArrayE
-	 * @return CIMClassProperty
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMClassProperty parseCLASSPROPERTYARRAY(Element pPropArrayE)
-			throws CIMXMLParseException {
-		// 
-		// 
-
-		String name = attribute(pPropArrayE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PROPERTY.ARRAY element missing NAME attribute!");
-		if (attribute(pPropArrayE, "TYPE") == null && !hasTypeAttrsInNodes(pPropArrayE)) throw new CIMXMLParseException(
-				"PROPERTY.ARRAY element missing TYPE attribute!");
-
-		String valueArraysizeStr = pPropArrayE.getAttribute("ARRAYSIZE");
-		try {
-			if (valueArraysizeStr.length() > 0) Integer.parseInt(valueArraysizeStr);
-		} catch (NumberFormatException e) {
-			throw new CIMXMLParseException(valueArraysizeStr
-					+ " is not a valid ARRAYSIZE attribute for VALUE.ARRAY!");
-		}
-
-		String classOrigin = pPropArrayE.getAttribute("CLASSORIGIN");
-		if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
-
-		String valuePropagatedStr = pPropArrayE.getAttribute("PROPAGATED");
-		boolean propagated = (valuePropagatedStr != null && valuePropagatedStr
-				.equalsIgnoreCase(MOF.TRUE));
-
-		// only QUALIFIER(s) and 0/1 VALUE.ARRAY
-		searchNodes(pPropArrayE, "VALUE.ARRAY", 0, 1, true);
-		checkOtherNodes(pPropArrayE, nodesPROPERTYARRAY);
-
-		// QUALIFIER
-		// ebak: EmbeddedObject support
-		EmbObjHandler embObjHandler = new EmbObjHandler(pPropArrayE);
-		return new CIMClassProperty(name, embObjHandler.getArrayType(), embObjHandler
-				.getValue(), embObjHandler.getQualifiers(), embObjHandler.isKeyed(), propagated,
-				classOrigin);
-	}
-
-	/**
-	 * parsePROPERTYREFERENCE
-	 * 
-	 * @param pPropRefE
-	 * @return CIMProperty
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMProperty parsePROPERTYREFERENCE(Element pPropRefE)
-			throws CIMXMLParseException {
-		return parseCLASSPROPERTYREFERENCE(pPropRefE);
-	}
-
-	private static final String nodesPROPERTYREFERENCE[] = { "QUALIFIER", "VALUE.REFERENCE" };
-
-	/**
-	 * parseCLASSPROPERTYREFERENCE
-	 * 
-	 * @param pPropRefE
-	 * @return CIMClassProperty
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMClassProperty parseCLASSPROPERTYREFERENCE(Element pPropRefE)
-			throws CIMXMLParseException {
-		// 
-		// 
-
-		String name = attribute(pPropRefE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PROPERTY.REFERENCE element missing NAME attribute!");
-
-		String classOrigin = pPropRefE.getAttribute("CLASSORIGIN");
-		if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
-
-		String referenceClass = pPropRefE.getAttribute("REFERENCECLASS");
-
-		String propagatedStr = pPropRefE.getAttribute("PROPAGATED");
-		boolean propagated = MOF.TRUE.equalsIgnoreCase(propagatedStr);
-
-		// QUALIFIER
-		CIMQualifier[] qualis = parseQUALIFIERS(pPropRefE);
-
-		CIMDataType type = new CIMDataType(referenceClass != null ? referenceClass : "");
-		// VALUE.REFERENCE
-		Element valueRefA[] = searchNodes(pPropRefE, "VALUE.REFERENCE", 0, 1, true);
-		Object value = valueRefA != null ? parseVALUEREFERENCE(valueRefA[0]) : null;
-
-		// return a CIMProperty without a CIMValue
-		checkOtherNodes(pPropRefE, nodesPROPERTYREFERENCE);
-		CIMQualifiedElementInterfaceImpl qualiImpl = new CIMQualifiedElementInterfaceImpl(qualis);
-		return new CIMClassProperty(name, type, value, qualis, qualiImpl.isKeyed(),
-				propagated, classOrigin);
-	}
-
-	/**
-	 * parseMESSAGE
-	 * 
-	 * @param pCimVersion
-	 * @param pDtdVersion
-	 * @param pMessageE
-	 * @return CIMMessage
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMMessage parseMESSAGE(String pCimVersion, String pDtdVersion, Element pMessageE)
-			throws CIMXMLParseException {
-		// 
-		// 
-
-		Attr idA = (Attr) searchAttribute(pMessageE, "ID");
-		if (idA == null) throw new CIMXMLParseException("MESSAGE element missing ID attribute!");
-		String id = idA.getNodeValue();
-
-		Attr protocolA = (Attr) searchAttribute(pMessageE, "PROTOCOLVERSION");
-		if (protocolA == null) throw new CIMXMLParseException(
-				"MESSAGE element missing PROTOCOLVERSION attribute!");
-		// TODO
-		if (pCimVersion.equals("2.0") && pDtdVersion.equals("2.0")) {
-
-			// Attr message_idA = (Attr)searchAttribute(messageE, "ID");
-			// String messadeID = message_idA.getNodeValue();
-
-			// Attr message_protocolversionA = (Attr)searchAttribute(messageE,
-			// "PROTOCOLVERSION");
-			// String protocolversion = message_protocolversionA.getNodeValue();
-
-			// SIMPLERSP
-			Element simplerspA[] = searchNodes(pMessageE, "SIMPLERSP", 0, 1, false);
-			if (simplerspA != null) {
-				CIMResponse response = parseSIMPLERSP(simplerspA[0]);
-				response.setMethod("SIMPLERSP");
-				response.setId(id);
-				return response;
-			}
-			Element multirspA[] = searchNodes(pMessageE, "MULTIRSP", 0, 1, false);
-			if (multirspA != null) {
-				CIMResponse response = parseMULTIRSP(multirspA[0]);
-				response.setMethod("MULTIRSP");
-				response.setId(id);
-				return response;
-			}
-			// SIMPLEEXPREQ
-			Element simpleexpreqA[] = searchNodes(pMessageE, "SIMPLEEXPREQ", 0, 1, false);
-			if (simpleexpreqA != null) {
-				CIMRequest request = parseSIMPLEEXPREQ(simpleexpreqA[0]);
-				request.setMethod("SIMPLEEXPREQ");
-				request.setId(id);
-				return request;
-			}
-
-			// MULTIEXPREQ
-			Element multiexpreqA[] = searchNodes(pMessageE, "MULTIEXPREQ", 0, 1, false);
-			if (multiexpreqA != null) {
-				CIMRequest request = parseMULTIEXPREQ(multiexpreqA[0]);
-				request.setMethod("MULTIEXPREQ");
-				request.setId(id);
-				return request;
-			}
-			// SIMPLEEXPRSP
-			Element simpleexprspA[] = searchNodes(pMessageE, "SIMPLEEXPRSP", 0, 1, false);
-			if (simpleexprspA != null) {
-				CIMResponse response = parseSIMPLEEXPRSP(simpleexprspA[0]);
-				response.setMethod("SIMPLEEXPRSP");
-				response.setId(id);
-				return response;
-			}
-			// MULTIEXPRSP
-			Element multiexprspA[] = searchNodes(pMessageE, "MULTIEXPRSP", 0, 1, false);
-			if (multiexprspA != null) {
-				CIMResponse response = parseMULTIEXPRSP(multiexprspA[0]);
-				response.setMethod("MULTIEXPRSP");
-				response.setId(id);
-				return response;
-			}
-
-			// SIMPLEREQ
-			Element simplereqA[] = searchNodes(pMessageE, "SIMPLEREQ", 0, 1, false);
-			if (simplereqA != null) {
-				CIMRequest request = parseSIMPLEREQ(simplereqA[0]);
-				request.setMethod("SIMPLEREQ");
-				request.setId(id);
-				return request;
-			}
-
-			// MULTIREQ
-			Element multireqA[] = searchNodes(pMessageE, "MULTIREQ", 0, 1, false);
-			if (multireqA != null) {
-				CIMRequest request = parseMULTIREQ(multireqA[0]);
-				request.setMethod("MULTIREQ");
-				request.setId(id);
-				return request;
-			}
-			throw new CIMXMLParseException("MESSAGE element missing required child element!");
-		}
-		// TODO, look for the specific error message in the spec
-		throw new CIMXMLParseException("DTD not supported");
-	}
-
-	private static final String nodesPARAMVALUE[] = { "VALUE", "VALUE.REFERENCE", "VALUE.ARRAY",
-			"VALUE.REFARRAY", "CLASSNAME", "INSTANCENAME", "CLASS", "INSTANCE",
-			"VALUE.NAMEDINSTANCE" };
-
-	/**
-	 * parsePARAMVALUE
-	 * 
-	 * @param pParamValueE
-	 * @return CIMArgument
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMArgument parsePARAMVALUE(Element pParamValueE)
-			throws CIMXMLParseException {
-		// )
-		// 
-		String name = attribute(pParamValueE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PARAMVALUE element missing NAME attribute!");
-		// FIXME: ebak: The base implementation didn't contain VALUE.REFARRAY
-		// handling. Why?
-		// ebak: embedded object support, different parsing for VALUE and
-		// VALUE.ARRAY sub elements
-		if (searchNodes(pParamValueE, "VALUE.REFERENCE", 0, 1, false) != null
-				|| searchNodes(pParamValueE, "VALUE.REFARRAY", 0, 1, false) != null) {
-			TypedValue typedValue = parseSingleValue(pParamValueE, VALUEREF | VALUEREFA);
-			CIMDataType type = typedValue.getType();
-			Object value = typedValue.getValue();
-			if (type == null) throw new CIMXMLParseException("PARAMVALUE element type is null!");
-			return new CIMArgument(name, type, value);
-		}
-		if (searchNodes(pParamValueE, "VALUE", 0, 1, false) != null
-				|| searchNodes(pParamValueE, "VALUE.ARRAY", 0, 1, false) != null
-				|| !hasNodes(pParamValueE)) {
-			EmbObjHandler embObjHandler = new EmbObjHandler(pParamValueE);
-			return new CIMArgument(name, embObjHandler.getType(), embObjHandler.getValue());
-		}
-
-		// CLASSNAME
-		Element classNameA[] = searchNodes(pParamValueE, "CLASSNAME", 0, 1, false);
-		if (classNameA != null) {
-			CIMObjectPath op = parseCLASSNAME(classNameA[0]);
-			CIMDataType type = new CIMDataType(op.getObjectName());
-			return new CIMArgument(name, type, op);
-		}
-
-		// INSTANCENAME
-		Element instNameA[] = searchNodes(pParamValueE, "INSTANCENAME", 0, 1, false);
-		if (instNameA != null) {
-			CIMObjectPath op = parseINSTANCENAME(instNameA[0]);
-			CIMDataType type = new CIMDataType(op.getObjectName());
-			return new CIMArgument(name, type, op);
-		}
-
-		// CLASS
-		Element classA[] = searchNodes(pParamValueE, "CLASS", 0, 1, false);
-		if (classA != null) {
-			CIMClass cl = parseCLASS(classA[0]);
-			return new CIMArgument(name, CIMDataType.CLASS_T, cl);
-		}
-
-		// INSTANCE
-		Element instanceA[] = searchNodes(pParamValueE, "INSTANCE", 0, 1, false);
-		if (instanceA != null) {
-			CIMInstance inst = parseINSTANCE(instanceA[0]);
-			return new CIMArgument(name, CIMDataType.OBJECT_T, inst);
-		}
-
-		// VALUE.NAMEDINSTANCE
-		Element valuenamedisntanceA[] = searchNodes(pParamValueE, "VALUE.NAMEDINSTANCE", 0, 1,
-				false);
-		if (valuenamedisntanceA != null) {
-			CIMInstance inst = parseVALUENAMEDINSTANCE(valuenamedisntanceA[0]);
-			return new CIMArgument(name, CIMDataType.OBJECT_T, inst);
-		}
-		checkOtherNodes(pParamValueE, nodesPARAMVALUE);
-		return new CIMArgument(name, CIMDataType.STRING_T, null);
-	}
-
-	private static final String nodesIPARAMVALUE[] = { "VALUE", "VALUE.ARRAY", "VALUE.REFERENCE",
-			"CLASSNAME", "INSTANCENAME", "QUALIFIER.DECLARATION", "CLASS", "INSTANCE",
-			"VALUE.NAMEDINSTANCE" };
-
-	/**
-	 * parseIPARAMVALUE
-	 * 
-	 * @param pParamValueE
-	 * @return CIMArgument
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMArgument parseIPARAMVALUE(Element pParamValueE)
-			throws CIMXMLParseException {
-		// 
-		// 
-
-		String name = attribute(pParamValueE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"IPARAMVALUE element missing NAME attribute!");
-		// this can parse VALUE, VALUE.ARRAY and VALUE.REFERENCE
-		if (searchNodes(pParamValueE, "VALUE", 0, 1, false) != null
-				|| searchNodes(pParamValueE, "VALUE.ARRAY", 0, 1, false) != null
-				|| searchNodes(pParamValueE, "VALUE.REFERENCE", 0, 1, false) != null) {
-			TypedValue typedValue = parseSingleValue(pParamValueE, VALUE | VALUEA | VALUEREF);
-			if (typedValue.getType() != null) { return new CIMArgument(name, typedValue
-					.getType(), typedValue.getValue()); }
-		}
-		// we can have different types too which cannot be handled by
-		// parseSingleValue()
-
-		// INSTANCENAME
-		Element instNameA[] = searchNodes(pParamValueE, "INSTANCENAME", 0, 1, false);
-		if (instNameA != null) {
-			CIMObjectPath op = parseINSTANCENAME(instNameA[0]);
-			CIMDataType type = new CIMDataType(op.getObjectName());
-			return new CIMArgument(name, type, op);
-		}
-
-		// CLASSNAME
-		Element classNameA[] = searchNodes(pParamValueE, "CLASSNAME", 0, 1, false);
-		if (classNameA != null) {
-			CIMObjectPath op = parseCLASSNAME(classNameA[0]);
-			CIMDataType type = new CIMDataType(op.getObjectName());
-			return new CIMArgument(name, type, op);
-		}
-
-		// QUALIFIER.DECLARATION
-		Element qualiDeclarationA[] = searchNodes(pParamValueE, "QUALIFIER.DECLARATION", 0, 1,
-				false);
-		if (qualiDeclarationA != null) {
-			CIMQualifierType qualiType = parseQUALIFIERDECLARATION(qualiDeclarationA[0]);
-			// FIXME: ebak: Does it surely have to be mapped to type:
-			// REFERENCE????
-			return new CIMArgument(name, new CIMDataType(qualiType.getName()), qualiType);
-		}
-
-		// CLASS
-		Element classA[] = searchNodes(pParamValueE, "CLASS", 0, 1, false);
-		if (classA != null) {
-			CIMClass cl = parseCLASS(classA[0]);
-			return new CIMArgument(name, CIMDataType.CLASS_T, cl);
-		}
-
-		// INSTANCE
-		Element instanceA[] = searchNodes(pParamValueE, "INSTANCE", 0, 1, false);
-		if (instanceA != null) {
-			CIMInstance inst = parseINSTANCE(instanceA[0]);
-			return new CIMArgument(name, CIMDataType.OBJECT_T, inst);
-		}
-
-		// VALUE.NAMEDINSTANCE
-		Element valuenamedisntanceA[] = searchNodes(pParamValueE, "VALUE.NAMEDINSTANCE", 0, 1,
-				false);
-		if (valuenamedisntanceA != null) {
-			CIMInstance inst = parseVALUENAMEDINSTANCE(valuenamedisntanceA[0]);
-			return new CIMArgument(name, CIMDataType.OBJECT_T, inst);
-		}
-
-		checkOtherNodes(pParamValueE, nodesIPARAMVALUE);
-		return new CIMArgument(name, CIMDataType.STRING_T, null);
-	}
-
-	/**
-	 * parseSIMPLERSP
-	 * 
-	 * @param pSimpleRspE
-	 * @return CIMResponse
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMResponse parseSIMPLERSP(Element pSimpleRspE) throws CIMXMLParseException {
-		// 
-
-		// METHODRESPONSE
-		Element methodresponseA[] = searchNodes(pSimpleRspE, "METHODRESPONSE", 0, 1, false);
-		if (methodresponseA != null) {
-
-		return parseMETHODRESPONSE(methodresponseA[0]); }
-
-		// IMETHODRESPONSE
-		Element imethodresponseA[] = searchNodes(pSimpleRspE, "IMETHODRESPONSE", 0, 1, false);
-		if (imethodresponseA != null) { return parseIMETHODRESPONSE(imethodresponseA[0]); }
-
-		throw new CIMXMLParseException("SIMPLERSP element missing required child element!");
-	}
-
-	/**
-	 * parseMULTIRSP
-	 * 
-	 * @param pSimpleRspE
-	 * @return CIMResponse
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMResponse parseMULTIRSP(Element pSimpleRspE) throws CIMXMLParseException {
-		// 
-
-		Element[] multiRespElementA = searchNodes(pSimpleRspE, "SIMPLERSP", 2, Integer.MAX_VALUE,
-				false);
-		if (multiRespElementA != null) {
-			CIMResponse multiRsp = new CIMResponse();
-			for (int i = 0; i < multiRespElementA.length; i++) {
-				Element methodresponseE = multiRespElementA[i];
-				CIMResponse rsp = parseSIMPLERSP(methodresponseE);
-				rsp.setMethod("SIMPLERSP");
-				multiRsp.addResponse(rsp);
-			}
-			return multiRsp;
-		}
-
-		throw new CIMXMLParseException("MULTIRSP element missing SIMPLERSP child element!");
-	}
-
-	private static final String nodesSIMPLEREQ[] = { "CORRELATOR", "METHODCALL", "IMETHODCALL" };
-
-	/**
-	 * parseSIMPLEREQ
-	 * 
-	 * @param pSimpleReqE
-	 * @return CIMRequest
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMRequest parseSIMPLEREQ(Element pSimpleReqE) throws CIMXMLParseException {
-		// 
-		CIMRequest request = null;
-
-		// METHODCALL
-		Element methodcallA[] = searchNodes(pSimpleReqE, "METHODCALL", 0, 1, true);
-		if (methodcallA != null) {
-			request = parseMETHODCALL(methodcallA[0]);
-		}
-
-		// IMETHODCALL
-		Element imethodcallA[] = searchNodes(pSimpleReqE, "IMETHODCALL", 0, 1, true);
-		if (imethodcallA != null) {
-			if (request != null) { throw new CIMXMLParseException(
-					"SIMPLEREQ element cannot have METHODCALL and IMETHODCALL child elements!"); }
-			request = parseIMETHODCALL(imethodcallA[0]);
-		}
-
-		if (request == null) throw new CIMXMLParseException(
-				"SIMPLEREQ element missing required child element!");
-
-		// CORRELATOR
-		Element[] correlatorA = searchNodes(pSimpleReqE, "CORRELATOR", 0, Integer.MAX_VALUE, true);
-		if (correlatorA != null) {
-			for (int i = 0; i < correlatorA.length; i++)
-				// TODO: return to WBEMClient API if JSR48 changes
-				parseCORRELATOR(correlatorA[i]);
-		}
-
-		checkOtherNodes(pSimpleReqE, nodesSIMPLEREQ);
-		return request;
-	}
-
-	/**
-	 * parseMULTIREQ
-	 * 
-	 * @param pMultiReqE
-	 * @return CIMRequest
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMRequest parseMULTIREQ(Element pMultiReqE) throws CIMXMLParseException {
-		// 
-
-		Element[] methodReqElementA = searchNodes(pMultiReqE, "SIMPLEREQ", 2, Integer.MAX_VALUE,
-				false);
-		if (methodReqElementA != null) {
-			CIMRequest multiReq = new CIMRequest();
-			for (int i = 0; i < methodReqElementA.length; i++) {
-				Element methodrequestE = methodReqElementA[i];
-				CIMRequest req = parseSIMPLEREQ(methodrequestE);
-				req.setMethod("SIMPLEREQ");
-
-				multiReq.addRequest(req);
-			}
-			return multiReq;
-		}
-		throw new CIMXMLParseException("MULTIREQ element missing SIMPLEREQ child element!");
-	}
-
-	private static final String nodesMETHODCALL[] = { "LOCALCLASSPATH", "LOCALINSTANCEPATH",
-			"PARAMVALUE" };
-
-	/**
-	 * parseMETHODCALL
-	 * 
-	 * @param pMethodCallE
-	 * @return CIMRequest
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMRequest parseMETHODCALL(Element pMethodCallE) throws CIMXMLParseException {
-		// 
-		// 
-
-		CIMRequest request = new CIMRequest();
-		String methodname = attribute(pMethodCallE, "NAME");
-		if (methodname == null) throw new CIMXMLParseException(
-				"METHODCALL element missing NAME attribute!");
-		request.setMethodName(methodname);
-
-		// EXPMETHODCALL
-		boolean localclasspathFound = false;
-		Element localclasspathA[] = searchNodes(pMethodCallE, "LOCALCLASSPATH", 0, 1, true);
-		if (localclasspathA != null) {
-			CIMObjectPath path = parseLOCALCLASSPATH(localclasspathA[0]);
-
-			request.setObjectPath(path);
-			localclasspathFound = true;
-		}
-
-		Element localinstancepathA[] = searchNodes(pMethodCallE, "LOCALINSTANCEPATH", 0, 1, true);
-		if (localinstancepathA != null) {
-			if (localclasspathFound) throw new CIMXMLParseException(
-					"METHODCALL element cannot have both LOCALCLASSPATH and LOCALINSTANCEPATH child elements!");
-
-			CIMObjectPath path = parseLOCALINSTANCEPATH(localinstancepathA[0]);
-
-			request.setObjectPath(path);
-		} else {
-			if (!localclasspathFound) throw new CIMXMLParseException(
-					"METHODCALL element missing required child element!");
-		}
-
-		Element[] paramValueElementA = searchNodes(pMethodCallE, "PARAMVALUE", 0,
-				Integer.MAX_VALUE, true);
-
-		if (paramValueElementA != null) {
-			CIMArgument[] argA = new CIMArgument[paramValueElementA.length];
-			for (int i = 0; i < paramValueElementA.length; i++) {
-				Element paramvalueE = paramValueElementA[i];
-				argA[i] = parsePARAMVALUE(paramvalueE);
-			}
-			request.addParamValue(argA);
-		}
-
-		checkOtherNodes(pMethodCallE, nodesMETHODCALL);
-		return request;
-	}
-
-	private static final String nodesIMETHODCALL[] = { "LOCALNAMESPACEPATH", "IPARAMVALUE" };
-
-	/**
-	 * parseIMETHODCALL
-	 * 
-	 * @param pIMethodCallE
-	 * @return CIMRequest
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMRequest parseIMETHODCALL(Element pIMethodCallE) throws CIMXMLParseException {
-		// 
-		// 
-
-		CIMRequest request = new CIMRequest();
-		String methodname = attribute(pIMethodCallE, "NAME"); // ebak:
-		// CIMName->NAME
-		if (methodname == null) throw new CIMXMLParseException(
-				"IMETHODCALL element missing NAME attribute!");
-		request.setMethodName(methodname);
-
-		// METHODCALL
-		Element localnamespacepathA[] = searchNodes(pIMethodCallE, "LOCALNAMESPACEPATH", 1, 1, true);
-		if (localnamespacepathA != null) {
-			String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
-			request.setNameSpace(nameSpace);
-		}
-
-		Element[] iParamValElementA = searchNodes(pIMethodCallE, "IPARAMVALUE", 0,
-				Integer.MAX_VALUE, true); // ebak:
-		// PARAMVALUE->IPARAMVALUE
-
-		if (iParamValElementA != null) {
-			CIMArgument[] argA = new CIMArgument[iParamValElementA.length];
-			for (int i = 0; i < iParamValElementA.length; i++) {
-				Element paramvalueE = iParamValElementA[i];
-				CIMArgument arg = parseIPARAMVALUE(paramvalueE);
-				/*
-				 * ebak: local nameSpacePath should be added to those reference
-				 * arguments which don't contain namespace
-				 */
-				Object value = arg.getValue();
-				if (value instanceof CIMObjectPath) {
-					CIMObjectPath op = (CIMObjectPath) value;
-					if (op.getNamespace() == null || op.getNamespace().length() == 0) {
-						arg = new CIMArgument(arg.getName(), arg.getDataType(),
-						// CIMObjectPath(String scheme, String host, String
-								// port, String namespace, String objectName,
-								// CIMProperty[] keys)
-								new CIMObjectPath(op.getScheme(), op.getHost(), op.getPort(),
-										request.getNameSpace(), op.getObjectName(), op.getKeys()));
-					}
-				}
-				argA[i] = arg;
-			}
-			request.addParamValue(argA);
-		}
-
-		checkOtherNodes(pIMethodCallE, nodesIMETHODCALL);
-		return request;
-	}
-
-	private static final String nodesSIMPLEEXPREQ[] = { "CORRELATOR", "EXPMETHODCALL" };
-
-	/**
-	 * parseSIMPLEEXPREQ
-	 * 
-	 * @param pSimpleExpReqE
-	 * @return CIMRequest
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMRequest parseSIMPLEEXPREQ(Element pSimpleExpReqE) throws CIMXMLParseException {
-		// 
-		CIMRequest request = null;
-
-		// EXPMETHODCALL
-		Element[] expmethodcallA = searchNodes(pSimpleExpReqE, "EXPMETHODCALL", 1, 1, true);
-		if (expmethodcallA != null) {
-			request = parseEXPMETHODCALL(expmethodcallA[0]);
-		} else {
-			throw new CIMXMLParseException(
-					"SIMPLEEXPREQ element missing EXPMETHODCALL child element!");
-		}
-
-		// CORRELATOR
-		Element[] correlatorA = searchNodes(pSimpleExpReqE, "CORRELATOR", 0, Integer.MAX_VALUE,
-				true);
-		if (correlatorA != null) {
-			for (int i = 0; i < correlatorA.length; i++)
-				// TODO: return to WBEMClient API if JSR48 changes
-				parseCORRELATOR(correlatorA[i]);
-		}
-
-		checkOtherNodes(pSimpleExpReqE, nodesSIMPLEEXPREQ);
-		return request;
-	}
-
-	/**
-	 * parseMULTIEXPREQ
-	 * 
-	 * @param pMultiExpReqE
-	 * @return CIMRequest
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMRequest parseMULTIEXPREQ(Element pMultiExpReqE) throws CIMXMLParseException {
-		// 
-
-		Element[] methodReqElementA = searchNodes(pMultiExpReqE, "SIMPLEEXPREQ", 2,
-				Integer.MAX_VALUE, false);
-		if (methodReqElementA != null) {
-			CIMRequest multiReq = new CIMRequest();
-			for (int i = 0; i < methodReqElementA.length; i++) {
-				Element methodrequestE = methodReqElementA[i];
-				CIMRequest req = parseSIMPLEEXPREQ(methodrequestE);
-				req.setMethod("SIMPLEEXPREQ");
-
-				multiReq.addRequest(req);
-			}
-			return multiReq;
-		}
-		throw new CIMXMLParseException("MULTIEXPREQ element missing SIMPLEEXPREQ child element!");
-	}
-
-	private static final String nodesEXPMETHODCALL[] = { "EXPPARAMVALUE" };
-
-	/**
-	 * parseEXPMETHODCALL
-	 * 
-	 * @param pExpMethodCallE
-	 * @return CIMRequest
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMRequest parseEXPMETHODCALL(Element pExpMethodCallE)
-			throws CIMXMLParseException {
-		// 
-
-		// EXPMETHODCALL
-		CIMRequest request = new CIMRequest();
-		String methodname = attribute(pExpMethodCallE, "NAME");
-		if (methodname == null) throw new CIMXMLParseException(
-				"EXPMETHODCALL element missing NAME attribute!");
-		request.setMethodName(methodname);
-
-		Element[] paramValElementA = searchNodes(pExpMethodCallE, "EXPPARAMVALUE", 0,
-				Integer.MAX_VALUE, false);
-		Vector v = new Vector();
-		if (paramValElementA != null) {
-			for (int i = 0; i < paramValElementA.length; i++) {
-				Element expparamvalueE = paramValElementA[i];
-				CIMInstance inst = parseEXPPARAMVALUE(expparamvalueE);
-				v.add(inst);
-			}
-		}
-		request.addParamValue(v);
-		checkOtherNodes(pExpMethodCallE, nodesEXPMETHODCALL);
-		return request;
-	}
-
-	private static final String nodesEXPPARAMVALUE[] = { "INSTANCE" };
-
-	/**
-	 * parseEXPPARAMVALUE
-	 * 
-	 * @param pExpParamValueE
-	 * @return CIMInstance
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMInstance parseEXPPARAMVALUE(Element pExpParamValueE)
-			throws CIMXMLParseException {
-		// 
-		// 
-		// INSTANCE
-		if (attribute(pExpParamValueE, "NAME") == null) throw new CIMXMLParseException(
-				"EXPPARAMVALUE element missing NAME attribute!");
-
-		Element[] instanceA = searchNodes(pExpParamValueE, "INSTANCE", 0, 1, false);
-		if (instanceA != null) {
-			CIMInstance inst = parseINSTANCE(instanceA[0]);
-			return inst;
-		}
-
-		checkOtherNodes(pExpParamValueE, nodesEXPPARAMVALUE);
-
-		return null;
-	}
-
-	private static final String nodesMETHODRESPONSE[] = { "ERROR", "RETURNVALUE", "PARAMVALUE" };
-
-	/**
-	 * parseMETHODRESPONSE
-	 * 
-	 * @param pMethodResponseE
-	 * @return CIMResponse
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMResponse parseMETHODRESPONSE(Element pMethodResponseE)
-			throws CIMXMLParseException {
-		// 
-		if (attribute(pMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
-				"METHODRESPONSE element missing NAME attribute!");
-
-		CIMResponse response = new CIMResponse();
-
-		// ERROR
-		Element errorA[] = searchNodes(pMethodResponseE, "ERROR", 0, 1, false);
-		if (errorA != null) {
-			WBEMException exception = parseERROR(errorA[0]);
-			response.setError(exception);
-			return response;
-		}
-
-		// RETURNVALUE
-		Element[] retValElementA = searchNodes(pMethodResponseE, "RETURNVALUE", 0, 1, true);
-		if (retValElementA != null) {
-			Vector v = new Vector();
-			for (int i = 0; i < retValElementA.length; i++) {
-				Element returnvalueE = retValElementA[i];
-				v.add(parseRETURNVALUE(returnvalueE));
-			}
-			response.setReturnValue(v);
-		}
-
-		// PARAMVALUE
-		Element[] paramValElementA = searchNodes(pMethodResponseE, "PARAMVALUE", 0,
-				Integer.MAX_VALUE, true);
-		if (paramValElementA != null) {
-			Vector v = new Vector();
-			for (int i = 0; i < paramValElementA.length; i++) {
-				Element paramvalueE = paramValElementA[i];
-				CIMArgument arg = parsePARAMVALUE(paramvalueE);
-				v.add(arg);
-			}
-			response.addParamValue(v);
-		}
-
-		// PARAMVALUE (ESS fix)
-		if (retValElementA != null) {
-			for (int i = 0; i < retValElementA.length; i++) {
-				Element retValE = retValElementA[i];
-
-				paramValElementA = searchNodes(retValE, "PARAMVALUE");
-				if (paramValElementA != null) {
-					Vector> v = new Vector>();
-					for (int j = 0; j < paramValElementA.length; j++) {
-						Element paramvalueE = paramValElementA[j];
-						CIMArgument arg = parsePARAMVALUE(paramvalueE);
-						v.add(arg);
-					}
-					response.addParamValue(v);
-				}
-			}
-		}
-		checkOtherNodes(pMethodResponseE, nodesMETHODRESPONSE);
-
-		return response;
-	}
-
-	private static final String nodesIMETHODRESPONSE[] = { "ERROR", "IRETURNVALUE", "PARAMVALUE" };
-
-	/**
-	 * parseIMETHODRESPONSE
-	 * 
-	 * @param pIMethodResponseE
-	 * @return CIMResponse
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMResponse parseIMETHODRESPONSE(Element pIMethodResponseE)
-			throws CIMXMLParseException {
-		// 
-		if (attribute(pIMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
-				"IMETHODRESPONSE element missing NAME attribute!");
-
-		CIMResponse response = new CIMResponse();
-		// ERROR
-		Element[] errorA = searchNodes(pIMethodResponseE, "ERROR", 0, 1, false);
-		if (errorA != null) {
-			WBEMException exception = parseERROR(errorA[0]);
-			response.setError(exception);
-			return response;
-		}
-
-		// IRETURNVALUE
-		Element[] retValElementA = searchNodes(pIMethodResponseE, "IRETURNVALUE", 0, 1, true);
-		if (retValElementA != null) {
-			for (int i = 0; i < retValElementA.length; i++) {
-				Element ireturnvalueE = retValElementA[i];
-
-				Vector rtnV = parseIRETURNVALUE(ireturnvalueE);
-				response.setReturnValue(rtnV);
-			}
-		}
-
-		// PARAMVALUE
-		Element[] paramValElementA = searchNodes(pIMethodResponseE, "PARAMVALUE", 0,
-				Integer.MAX_VALUE, true);
-		if (paramValElementA != null) {
-			Vector v = new Vector();
-			for (int i = 0; i < paramValElementA.length; i++) {
-				Element paramvalueE = paramValElementA[i];
-				CIMArgument arg = parsePARAMVALUE(paramvalueE);
-				v.add(arg);
-			}
-			response.addParamValue(v);
-		}
-		checkOtherNodes(pIMethodResponseE, nodesIMETHODRESPONSE);
-
-		return response;
-	}
-
-	private static final String nodesERROR[] = { "INSTANCE" };
-
-	/**
-	 * parseERROR
-	 * 
-	 * @param pErrorE
-	 * @return WBEMException
-	 * @throws CIMXMLParseException
-	 */
-	public static WBEMException parseERROR(Element pErrorE) throws CIMXMLParseException {
-		// 
-		// 
-
-		Attr error_codeA = (Attr) searchAttribute(pErrorE, "CODE");
-		if (error_codeA == null) throw new CIMXMLParseException(
-				"ERROR element missing CODE attribute!");
-		String code = error_codeA.getNodeValue();
-		int errorCode = 0;
-		try {
-			if (code.length() > 0) errorCode = Integer.parseInt(code);
-		} catch (Exception e) {
-			LogAndTraceBroker.getBroker().trace(Level.WARNING,
-					"exception while parsing error code from XML", e);
-			errorCode = WBEMException.CIM_ERR_FAILED;
-		}
-		Attr error_descriptionA = (Attr) searchAttribute(pErrorE, "DESCRIPTION");
-		String description = "";
-		if (error_descriptionA != null) {
-			description = error_descriptionA.getNodeValue();
-		}
-
-		Vector rtnV = new Vector();
-
-		// INSTANCE
-		Element[] instElementA = searchNodes(pErrorE, "INSTANCE", 0, Integer.MAX_VALUE, false);
-		if (instElementA != null) {
-			for (int i = 0; i < instElementA.length; i++) {
-				Element instanceE = instElementA[i];
-				CIMInstance inst = parseINSTANCE(instanceE);
-				rtnV.add(inst);
-			}
-		}
-		checkOtherNodes(pErrorE, nodesERROR);
-
-		// throw new CIMException(CIMException.getErrorName(errorCode),
-		// description.substring(description.indexOf(':')+1));
-		if (!rtnV.isEmpty()) return new WBEMException(errorCode, "ErrorCode:" + errorCode
-				+ " description:" + description, rtnV.toArray(new CIMInstance[0]));
-		return new WBEMException(errorCode, "ErrorCode:" + errorCode + " description:"
-				+ description);
-	}
-
-	private static final String nodesRETURNVALUE[] = { "VALUE", "VALUE.REFERENCE" };
-
-	/**
-	 * parseRETURNVALUE
-	 * 
-	 * @param pRetValE
-	 * @return Object
-	 * @throws CIMXMLParseException
-	 */
-	public static Object parseRETURNVALUE(Element pRetValE) throws CIMXMLParseException {
-		// 
-		// 
-		// ebak: embedded object support: different parsing of VALUE sub element
-		checkOtherNodes(pRetValE, nodesRETURNVALUE);
-		if (searchNodes(pRetValE, "VALUE", 0, 1, false) != null) {
-			EmbObjHandler embObjHandler = new EmbObjHandler(pRetValE);
-			return embObjHandler.getValue();
-		}
-		if (searchNodes(pRetValE, "VALUE.REFERENCE", 0, 1, false) != null) {
-			TypedValue typedVal = parseSingleValue(pRetValE, VALUEREF);
-			Object value = typedVal.getValue();
-			return value;
-		}
-		checkOtherNodes(pRetValE, nodesRETURNVALUE);
-		return null;
-	}
-
-	private static final String nodesIRETURNVALUE[] = { "CLASSNAME", "INSTANCENAME", "VALUE",
-			"VALUE.OBJECTWITHPATH", "VALUE.OBJECTWITHLOCALPATH", "VALUE.OBJECT", "OBJECTPATH",
-			"QUALIFIER.DECLARATION", "VALUE.ARRAY", "VALUE.REFERENCE", "CLASS", "INSTANCE",
-			"INSTANCEPATH", "VALUE.NAMEDINSTANCE" };
-
-	/**
-	 * parseIRETURNVALUE
-	 * 
-	 * @param pIRetValE
-	 * @return Vector
-	 * @throws CIMXMLParseException
-	 */
-	public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLParseException {
-		// 
-
-		Vector rtnV = new Vector();
-
-		// CLASS
-		Element[] classElementA = searchNodes(pIRetValE, "CLASS", 0, Integer.MAX_VALUE, false);
-		if (classElementA != null) {
-			for (int i = 0; i < classElementA.length; i++) {
-				Element classE = classElementA[i];
-				CIMClass c = parseCLASS(classE);
-				rtnV.add(c);
-			}
-			return rtnV;
-		}
-
-		// INSTANCE
-		Element[] instElementA = searchNodes(pIRetValE, "INSTANCE", 0, Integer.MAX_VALUE, false);
-		if (instElementA != null) {
-			for (int i = 0; i < instElementA.length; i++) {
-				Element instanceE = instElementA[i];
-				CIMInstance inst = parseINSTANCE(instanceE);
-				rtnV.add(inst);
-			}
-			return rtnV;
-		}
-
-		// CLASSNAME
-		Element[] classNameElementA = searchNodes(pIRetValE, "CLASSNAME", 0, Integer.MAX_VALUE,
-				false);
-		if (classNameElementA != null) {
-			for (int i = 0; i < classNameElementA.length; i++) {
-				Element classnameE = classNameElementA[i];
-				CIMObjectPath op = parseCLASSNAME(classnameE);
-				rtnV.add(op);
-			}
-			return rtnV;
-		}
-
-		// INSTANCENAME
-		Element[] instNameElementA = searchNodes(pIRetValE, "INSTANCENAME", 0, Integer.MAX_VALUE,
-				false);
-		if (instNameElementA != null) {
-			for (int i = 0; i < instNameElementA.length; i++) {
-				Element instancenameE = instNameElementA[i];
-				CIMObjectPath op = parseINSTANCENAME(instancenameE);
-				rtnV.add(op);
-			}
-			return rtnV;
-		}
-
-		// INSTANCEPATH
-		Element[] instpathElementA = searchNodes(pIRetValE, "INSTANCEPATH", 0, Integer.MAX_VALUE,
-				false);
-		if (instpathElementA != null) {
-			for (int i = 0; i < instpathElementA.length; i++) {
-				Element instancePathE = instpathElementA[i];
-				CIMObjectPath op = parseINSTANCEPATH(instancePathE);
-				rtnV.add(op);
-			}
-			return rtnV;
-		}
-
-		// OBJECTPATH
-		Element[] objPathElementA = searchNodes(pIRetValE, "OBJECTPATH", 0, Integer.MAX_VALUE,
-				false);
-		if (objPathElementA != null) {
-			for (int i = 0; i < objPathElementA.length; i++) {
-				Element objectpathE = objPathElementA[i];
-				CIMObjectPath op = parseOBJECTPATH(objectpathE);
-				rtnV.add(op);
-			}
-			return rtnV;
-		}
-
-		// VALUE
-		Element[] valueElementA = searchNodes(pIRetValE, "VALUE", 0, Integer.MAX_VALUE, false);
-		if (valueElementA != null) {
-			for (int i = 0; i < valueElementA.length; i++) {
-				Element valueE = valueElementA[i];
-				TypedValue tv = parseVALUE(valueE);
-				rtnV.add(tv.getValue());
-			}
-			return rtnV;
-		}
-
-		// VALUE.ARRAY
-		Element[] valueArrayElementA = searchNodes(pIRetValE, "VALUE.ARRAY", 0, 1, false);
-		if (valueArrayElementA != null) {
-			Element valuearrayE = valueArrayElementA[0];
-			TypedValue tv = parseVALUEARRAY(valuearrayE);
-			rtnV.add(tv.getValue());
-			return rtnV;
-		}
-
-		// VALUE.REFERENCE
-		Element[] valRefElementA = searchNodes(pIRetValE, "VALUE.REFERENCE", 0, 1, false);
-		if (valRefElementA != null) {
-			Element valuereferenceE = valRefElementA[0];
-			CIMObjectPath op = parseVALUEREFERENCE(valuereferenceE);
-			rtnV.add(op);
-			return rtnV;
-		}
-
-		// VALUE.OBJECT
-		Element[] valObjElementA = searchNodes(pIRetValE, "VALUE.OBJECT", 0, Integer.MAX_VALUE,
-				false);
-		if (valObjElementA != null) {
-			for (int i = 0; i < valObjElementA.length; i++) {
-				Element valueobjectE = valObjElementA[i];
-				CIMNamedElementInterface obj = parseVALUEOBJECT(valueobjectE);
-				rtnV.add(obj);
-			}
-			return rtnV;
-		}
-
-		// VALUE.NAMEDINSTANCE
-		Element[] valNamedInstElementA = searchNodes(pIRetValE, "VALUE.NAMEDINSTANCE", 0,
-				Integer.MAX_VALUE, false);
-		if (valNamedInstElementA != null) {
-			for (int i = 0; i < valNamedInstElementA.length; i++) {
-				Element valuenamedisntanceE = valNamedInstElementA[i];
-				CIMInstance inst = parseVALUENAMEDINSTANCE(valuenamedisntanceE);
-				rtnV.add(inst);
-			}
-			return rtnV;
-		}
-
-		// VALUE.INSTANCEWITHPATH
-		Element[] valInstWithPathElementA = searchNodes(pIRetValE, "VALUE.INSTANCEWITHPATH", 0,
-				Integer.MAX_VALUE, false);
-		if (valInstWithPathElementA != null) {
-			for (int i = 0; i < valInstWithPathElementA.length; i++) {
-				Element valueinstancewithpathE = valInstWithPathElementA[i];
-				CIMInstance inst = parseVALUEINSTANCEWITHPATH(valueinstancewithpathE);
-				rtnV.add(inst);
-			}
-			return rtnV;
-		}
-
-		// VALUE.OBJECTWITHPATH
-		Element[] valObjWithPathElementA = searchNodes(pIRetValE, "VALUE.OBJECTWITHPATH", 0,
-				Integer.MAX_VALUE, false);
-		if (valObjWithPathElementA != null) {
-			for (int i = 0; i < valObjWithPathElementA.length; i++) {
-				Element valueobjectwithpathE = valObjWithPathElementA[i];
-				CIMNamedElementInterface namedIF = parseVALUEOBJECTWITHPATH(valueobjectwithpathE);
-				rtnV.add(namedIF);
-			}
-			return rtnV;
-		}
-
-		// VALUE.OBJECTWITHLOCALPATH
-		Element[] valObjWithLocalPathElementA = searchNodes(pIRetValE, "VALUE.OBJECTWITHLOCALPATH",
-				0, Integer.MAX_VALUE, false);
-		if (valObjWithLocalPathElementA != null) {
-			for (int i = 0; i < valObjWithLocalPathElementA.length; i++) {
-				Element valueobjectwithlocalpathE = valObjWithLocalPathElementA[i];
-				CIMNamedElementInterface namedIF = parseVALUEOBJECTWITHLOCALPATH(valueobjectwithlocalpathE);
-				rtnV.add(namedIF);
-			}
-			return rtnV;
-		}
-
-		// QUALIFIER.DECLARATION
-		Element[] qualiDeclElementA = searchNodes(pIRetValE, "QUALIFIER.DECLARATION", 0,
-				Integer.MAX_VALUE, false);
-		if (qualiDeclElementA != null) {
-			for (int i = 0; i < qualiDeclElementA.length; i++) {
-				Element qualifierdeclarationE = qualiDeclElementA[i];
-				CIMQualifierType o = parseQUALIFIERDECLARATION(qualifierdeclarationE);
-				rtnV.add(o);
-			}
-			return rtnV;
-		}
-		checkOtherNodes(pIRetValE, nodesIRETURNVALUE);
-		return rtnV;
-	}
-
-	/**
-	 * parseObject
-	 * 
-	 * @param pRootE
-	 * @return Object
-	 * @throws CIMXMLParseException
-	 */
-	public static Object parseObject(Element pRootE) throws CIMXMLParseException {
-		Object o = null;
-		String nodeName = pRootE.getNodeName();
-		if (nodeName.equalsIgnoreCase("INSTANCE")) {
-			o = parseINSTANCE(pRootE);
-		} else if (nodeName.equalsIgnoreCase("VALUE.NAMEDINSTANCE")) {
-			o = parseVALUENAMEDINSTANCE(pRootE);
-		} else if (nodeName.equalsIgnoreCase("VALUE.NAMEDOBJECT")) {
-			o = parseVALUENAMEDOBJECT(pRootE);
-		} else if (nodeName.equalsIgnoreCase("VALUE.OBJECTWITHPATH")) {
-			o = parseVALUEOBJECTWITHPATH(pRootE);
-		} else if (nodeName.equalsIgnoreCase("VALUE.OBJECTWITHLOCALPATH")) {
-			o = parseVALUEOBJECTWITHLOCALPATH(pRootE);
-		} else if (nodeName.equalsIgnoreCase("CLASS")) {
-			o = parseCLASS(pRootE);
-		} else if (nodeName.equalsIgnoreCase("CLASSPATH")) {
-			o = parseCLASSPATH(pRootE);
-		} else if (nodeName.equalsIgnoreCase("LOCALCLASSPATH")) {
-			o = parseLOCALCLASSPATH(pRootE);
-		} else if (nodeName.equalsIgnoreCase("OBJECTPATH")) {
-			o = parseOBJECTPATH(pRootE);
-		} else if (nodeName.equalsIgnoreCase("CLASSNAME")) {
-			o = parseCLASSNAME(pRootE);
-		} else if (nodeName.equalsIgnoreCase("INSTANCEPATH")) {
-			o = parseINSTANCEPATH(pRootE);
-		} else if (nodeName.equalsIgnoreCase("LOCALINSTANCEPATH")) {
-			o = parseLOCALINSTANCEPATH(pRootE);
-		} else if (nodeName.equalsIgnoreCase("INSTANCENAME")) {
-			o = parseINSTANCENAME(pRootE);
-		} else if (nodeName.equalsIgnoreCase("QUALIFIER")) {
-			o = parseQUALIFIER(pRootE);
-		} else if (nodeName.equalsIgnoreCase("PROPERTY")) {
-			o = parsePROPERTY(pRootE);
-		} else if (nodeName.equalsIgnoreCase("PROPERTY.ARRAY")) {
-			o = parsePROPERTYARRAY(pRootE);
-		} else if (nodeName.equalsIgnoreCase("PROPERTY.REFERENCE")) {
-			o = parsePROPERTYREFERENCE(pRootE);
-		} else if (nodeName.equalsIgnoreCase("METHOD")) {
-			o = parseMETHOD(pRootE);
-		} else if (nodeName.equalsIgnoreCase("PARAMETER")) {
-			o = parsePARAMETER(pRootE);
-		} else if (nodeName.equalsIgnoreCase("PARAMETER.REFERENCE")) {
-			o = parsePARAMETERREFERENCE(pRootE);
-		} else if (nodeName.equalsIgnoreCase("PARAMETER.ARRAY")) {
-			o = parsePARAMETERARRAY(pRootE);
-		} else if (nodeName.equalsIgnoreCase("PARAMETER.REFARRAY")) {
-			o = parsePARAMETERREFARRAY(pRootE);
-		}
-		return o;
-	}
-
-	// ///////////////////////////////////////////////////////////////////////////////////////////
-
-	/**
-	 * hasNodes
-	 * 
-	 * @param pParentE
-	 * @return boolean
-	 */
-	private static boolean hasNodes(Element pParentE) {
-		NodeList nl = pParentE.getChildNodes();
-		if (nl == null || nl.getLength() == 0) return false;
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node n = nl.item(i);
-			if (!(n instanceof Text) || !("".equalsIgnoreCase(n.getNodeValue().trim()))) return true;
-		}
-		return false;
-	}
-
-	/**
-	 * hasTypeAttrsInNodes
-	 * 
-	 * SVC CIMOM sends typed CIM-XML elements in a non-standard way. The TYPE
-	 * attribute is included in the VALUE or VALUE.ARRAY element not in the
-	 * enclosing element as the standard says.
-	 * 
-	 * @param pParentE
-	 * @return boolean
-	 */
-	private static boolean hasTypeAttrsInNodes(Element pParentE) {
-		NodeList nl = pParentE.getChildNodes();
-		if (nl == null || nl.getLength() == 0) return false;
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node n = nl.item(i);
-			String name = n.getNodeName();
-			if ("VALUE".equalsIgnoreCase(name) || "VALUE.ARRAY".equalsIgnoreCase(name)) {
-				NamedNodeMap nm = n.getAttributes();
-				if (nm != null
-						&& (nm.getNamedItem("TYPE") != null || nm.getNamedItem("PARAMTYPE") != null)) return true;
-			}
-		}
-		return false;
-	}
-
-	private static final HashMap NODENAME_HASH = new HashMap();
-
-	private static void initNodeNameHash(String[] pEnumA) {
-		for (int i = 0; i < pEnumA.length; i++)
-			NODENAME_HASH.put(pEnumA[i], pEnumA[i]);
-	}
-
-	static {
-		initNodeNameHash(new String[] { "CIM", "DECLARATION", "DECLGROUP", "DECLGROUP.WITHNAME",
-				"DECLGROUP.WITHPATH", "QUALIFIER.DECLARATION", "SCOPE", "VALUE", "VALUE.ARRAY",
-				"VALUE.REFERENCE", "VALUE.REFARRAY", "VALUE.OBJECT", "VALUE.NAMEDINSTANCE",
-				"VALUE.NAMEDOBJECT", "VALUE.OBJECTWITHLOCALPATH", "VALUE.OBJECTWITHPATH",
-				"VALUE.NULL", "VALUE.INSTANCEWITHPATH", "NAMESPACEPATH", "LOCALNAMESPACEPATH",
-				"HOST", "NAMESPACE", "CLASSPATH", "LOCALCLASSPATH", "CLASSNAME", "INSTANCEPATH",
-				"LOCALINSTANCEPATH", "INSTANCENAME", "OBJECTPATH", "KEYBINDING", "KEYVALUE",
-				"CLASS", "INSTANCE", "QUALIFIER", "PROPERTY", "PROPERTY.ARRAY",
-				"PROPERTY.REFERENCE", "METHOD", "PARAMETER", "PARAMETER.REFERENCE",
-				"PARAMETER.ARRAY", "PARAMETER.REFARRAY", "MESSAGE", "MULTIREQ", "MULTIEXPREQ",
-				"SIMPLEREQ", "SIMPLEEXPREQ", "IMETHODCALL", "METHODCALL", "EXPMETHODCALL",
-				"PARAMVALUE", "IPARAMVALUE", "EXPPARAMVALUE", "MULTIRSP", "MULTIEXPRSP",
-				"SIMPLERSP", "SIMPLEEXPRSP", "METHODRESPONSE", "EXPMETHODRESPONSE",
-				"IMETHODRESPONSE", "ERROR", "RETURNVALUE", "IRETURNVALUE", "CORRELATOR" });
-	}
-
-	/**
-	 * checkOtherNodes
-	 * 
-	 * @param pParentE
-	 * @param pAllowedChildNodes
-	 */
-	private static void checkOtherNodes(Element pParentE, String[] pAllowedChildNodes)
-			throws CIMXMLParseException {
-		NodeList nl = pParentE.getChildNodes();
-		if (nl == null || nl.getLength() == 0) return;
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node n = nl.item(i);
-			if (n instanceof Text && "".equalsIgnoreCase(n.getNodeValue().trim())) continue;
-			boolean found = false;
-			String name = n.getNodeName().toUpperCase();
-			for (int j = 0; j < pAllowedChildNodes.length; j++) {
-				if (pAllowedChildNodes[j].equalsIgnoreCase(name)) {
-					found = true;
-					break;
-				}
-			}
-			if (!found && NODENAME_HASH.containsKey(name)) throw new CIMXMLParseException(pParentE
-					.getNodeName()
-					+ " element contains invalid child element " + name + "!");
-		}
-	}
-
-	/**
-	 * searchNodes
-	 * 
-	 * @param pParentE
-	 * @param pTagName
-	 * @return Element[]
-	 */
-	public static Element[] searchNodes(Element pParentE, String pTagName) {
-		// return all of child nodes immediately below the parent
-		// return null if not found
-		NodeList nl = pParentE.getChildNodes();
-		if (nl == null || nl.getLength() == 0) return null;
-		Vector resElementV = new Vector();
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node n = nl.item(i);
-			if (n.getNodeName().equals(pTagName)) {
-				resElementV.add(n);
-			}
-		}
-		return resElementV.toArray(new Element[0]);
-	}
-
-	/**
-	 * searchNodes
-	 * 
-	 * @param pParentE
-	 * @param pTagName
-	 * @param pMin
-	 * @param pMax
-	 * @param pAllowOtherNodes
-	 * @return Element[]
-	 * @throws CIMXMLParseException
-	 */
-	public static Element[] searchNodes(Element pParentE, String pTagName, int pMin, int pMax,
-			boolean pAllowOtherNodes) throws CIMXMLParseException {
-		// return all child nodes immediately below parent, null if none found
-
-		NodeList nl = pParentE.getChildNodes();
-		if (nl == null || nl.getLength() == 0) {
-			if (pMin > 0) throw new CIMXMLParseException(pParentE.getNodeName()
-					+ " element must have at least " + pMin + " " + pTagName + " child element(s)!");
-			return null;
-		}
-
-		String otherNode = null;
-		Vector resElementV = new Vector();
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node n = nl.item(i);
-			String name = n.getNodeName().toUpperCase();
-			if (name.equals(pTagName)) {
-				resElementV.add(n);
-			} else if (NODENAME_HASH.containsKey(name)) {
-				otherNode = name;
-			}
-		}
-
-		if (resElementV.size() < pMin) throw new CIMXMLParseException(pParentE.getNodeName()
-				+ " element must have at least " + pMin + " " + pTagName + " child element(s)!");
-		if (resElementV.size() > pMax) throw new CIMXMLParseException(pParentE.getNodeName()
-				+ " element can have no more than " + pMax + " " + pTagName + " child element(s)!");
-		if (resElementV.size() > 0 && !pAllowOtherNodes && otherNode != null) throw new CIMXMLParseException(
-				pParentE.getNodeName() + " element cannot have " + otherNode
-						+ " child element(s) when it already has " + pTagName + " element(s)!");
-		if (resElementV.size() == 0) return null;
-
-		return resElementV.toArray(new Element[0]);
-	}
-
-	/**
-	 * searchFirstNode
-	 * 
-	 * @param pParentE
-	 * @param pTagName
-	 * @return Node
-	 */
-	public static Node searchFirstNode(Element pParentE, String pTagName) {
-		// return the first node which matches to the specific name
-		// return null if not found
-		NodeList nl = pParentE.getChildNodes();
-		for (int i = 0; i < nl.getLength(); i++) {
-			Node n = nl.item(i);
-			if (n.getNodeName().equals(pTagName)) { return n; }
-		}
-		return null;
-	}
-
-	/**
-	 * searchAttribute
-	 * 
-	 * @param pParentN
-	 * @param pAttrName
-	 * @return Node
-	 */
-	public static Node searchAttribute(Node pParentN, String pAttrName) {
-		// return the attribute node with the specific name
-		NamedNodeMap nnm = pParentN.getAttributes();
-		return nnm.getNamedItem(pAttrName);
-	}
-
-	/**
-	 * searchFirstChild
-	 * 
-	 * @param pParentE
-	 * @return Node
-	 */
-	public static Node searchFirstChild(Element pParentE) {
-		// return the first node which matches to the specific name
-		// return null if not found
-		return pParentE.getFirstChild();
-	}
-
-	/**
-	 * createJavaObject
-	 * 
-	 * @param pTypeStr
-	 * @param pValue
-	 * @return Object
-	 * @throws CIMXMLParseException
-	 */
-	public static Object createJavaObject(String pTypeStr, String pValue)
-			throws CIMXMLParseException {
-		// return a java object with the specific type
-		if (pTypeStr == null) pTypeStr = MOF.DT_STR;
-		if (MOF.NULL.equalsIgnoreCase(pTypeStr)) return null;
-		Object o = null;
-		CIMDataType cimType = parseTypeStr(pTypeStr, false);
-		int radix = 10;
-
-		if (pTypeStr.toLowerCase().startsWith("sint") || pTypeStr.toLowerCase().startsWith("uint")) {
-			pValue = pValue.toLowerCase();
-			if (pValue.startsWith("0x") || pValue.startsWith("+0x") || pValue.startsWith("-0x")) {
-				radix = 16;
-				if (pValue.startsWith("-")) pValue = "-" + pValue.substring(3);
-				else pValue = pValue.substring(pValue.indexOf('x') + 1);
-			}
-		}
-
-		switch (cimType.getType()) {
-			case CIMDataType.UINT8:
-				o = new UnsignedInteger8(Short.parseShort(pValue, radix));
-				break;
-			case CIMDataType.UINT16:
-				o = new UnsignedInteger16(Integer.parseInt(pValue, radix));
-				break;
-			case CIMDataType.UINT32:
-				o = new UnsignedInteger32(Long.parseLong(pValue, radix));
-				break;
-			case CIMDataType.UINT64:
-				o = new UnsignedInteger64(new BigInteger(pValue, radix));
-				break;
-			case CIMDataType.SINT8:
-				o = Byte.valueOf(pValue, radix);
-				break;
-			case CIMDataType.SINT16:
-				o = Short.valueOf(pValue, radix);
-				break;
-			case CIMDataType.SINT32:
-				o = Integer.valueOf(pValue, radix);
-				break;
-			case CIMDataType.SINT64:
-				o = Long.valueOf(pValue, radix);
-				break;
-			case CIMDataType.STRING:
-				o = pValue;
-				break;
-			case CIMDataType.BOOLEAN:
-				o = Boolean.valueOf(pValue);
-				break;
-			case CIMDataType.REAL32:
-				o = new Float(pValue);
-				break;
-			case CIMDataType.REAL64:
-				if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
-					if (Util.isBadDoubleString(pValue)) throw new IllegalArgumentException(
-							"Double value string hangs older JVMs!\n" + pValue);
-				}
-				o = new Double(pValue);
-				break;
-			case CIMDataType.DATETIME:
-				o = getDateTime(pValue);
-				break;
-			case CIMDataType.REFERENCE:
-				o = new CIMObjectPath(pValue);
-				break;
-			case CIMDataType.CHAR16:
-				o = Character.valueOf(pValue.charAt(0));
-				break;
-			// case CIMDataType.OBJECT: o = new CIMInstance(); break; //TODO
-			// case CIMDataType.CLASS: o = new CIMClass(value); break; //TODO
-		}
-		return o;
-	}
-
-	private static CIMDateTime getDateTime(String pValue) throws CIMXMLParseException {
-		try {
-			return new CIMDateTimeAbsolute(pValue);
-		} catch (IllegalArgumentException eAbs) {
-			try {
-				return new CIMDateTimeInterval(pValue);
-			} catch (IllegalArgumentException eInt) {
-				throw new CIMXMLParseException("Failed to parse dateTime string: " + pValue + "!\n"
-						+ "CIMDateTimeAbsolute parsing error:\n" + eAbs.getMessage() + "\n"
-						+ "CIMDateTimeInterval parsing error:\n" + eInt.getMessage());
-			}
-		}
-	}
-
-	/**
-	 * parseSIMPLEEXPRSP
-	 * 
-	 * @param pSimpleExpRspE
-	 * @return CIMResponse
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMResponse parseSIMPLEEXPRSP(Element pSimpleExpRspE) throws CIMXMLParseException {
-		// 
-
-		// EXPMETHODRESPONSE
-		Element[] expmethodresponseA = searchNodes(pSimpleExpRspE, "EXPMETHODRESPONSE", 1, 1, false);
-		if (expmethodresponseA != null) return parseEXPMETHODRESPONSE(expmethodresponseA[0]);
-
-		throw new CIMXMLParseException(
-				"SIMPLEEXPRSP element missing EXPMETHODRESPONSE child element!");
-	}
-
-	/**
-	 * parseMULTIEXPRSP
-	 * 
-	 * @param pMultiExpRspE
-	 * @return CIMResponse
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMResponse parseMULTIEXPRSP(Element pMultiExpRspE) throws CIMXMLParseException {
-		// 
-
-		Element[] multiExpRespElementA = searchNodes(pMultiExpRspE, "SIMPLEEXPRSP", 2,
-				Integer.MAX_VALUE, false);
-		if (multiExpRespElementA != null) {
-			CIMResponse multiExpRsp = new CIMResponse();
-			for (int i = 0; i < multiExpRespElementA.length; i++) {
-				Element methodresponseE = multiExpRespElementA[i];
-				CIMResponse rsp = parseSIMPLEEXPRSP(methodresponseE);
-				rsp.setMethod("SIMPLEEXPRSP");
-				multiExpRsp.addResponse(rsp);
-			}
-			return multiExpRsp;
-		}
-
-		throw new CIMXMLParseException("MULTIEXPRSP element missing SIMPLEEXPRSP child element!");
-	}
-
-	private static final String[] nodesEXPMETHODRESPONSE = { "ERROR", "IRETURNVALUE" };
-
-	/**
-	 * parseEXPMETHODRESPONSE
-	 * 
-	 * @param pExpMethodResponseE
-	 * @return CIMResponse
-	 * @throws CIMXMLParseException
-	 */
-	public static CIMResponse parseEXPMETHODRESPONSE(Element pExpMethodResponseE)
-			throws CIMXMLParseException {
-		// 
-
-		CIMResponse response = new CIMResponse();
-
-		if (attribute(pExpMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
-				"EXPMETHODRESPONSE element missing NAME attribute!");
-
-		// ERROR
-		Element[] errorA = searchNodes(pExpMethodResponseE, "ERROR", 0, 1, false);
-		if (errorA != null) {
-			WBEMException exception = parseERROR(errorA[0]);
-			response.setError(exception);
-			return response;
-		}
-
-		// RETURNVALUE
-		Element[] retValElementA = searchNodes(pExpMethodResponseE, "IRETURNVALUE", 0, 1, false);
-		if (retValElementA != null) {
-			Vector v = new Vector();
-			Element returnvalueE = retValElementA[0];
-			v.add(parseIRETURNVALUE(returnvalueE));
-			response.setReturnValue(v);
-			return response;
-		}
-
-		checkOtherNodes(pExpMethodResponseE, nodesEXPMETHODRESPONSE);
-
-		return response;
-	}
-
-	private static final String nodesCORRELATOR[] = { "VALUE" };
-
-	/**
-	 * parseCORRELATOR
-	 * 
-	 * @param pCorrelatorE
-	 * @throws CIMXMLParseException
-	 * */
-	public static void parseCORRELATOR(Element pCorrelatorE) throws CIMXMLParseException {
-		// 
-		// 
-		String name = attribute(pCorrelatorE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"CORRELATOR element missing NAME attribute!");
-		String type = attribute(pCorrelatorE, "TYPE");
-		if (type == null) throw new CIMXMLParseException(
-				"CORRELATOR element missing TYPE attribute!");
-
-		// VALUE
-		Element[] valueA = searchNodes(pCorrelatorE, "VALUE", 1, 1, false);
-		if (valueA != null) {
-			// TypedValue tVal = parseVALUE(valueA[0]);
-		}
-
-		checkOtherNodes(pCorrelatorE, nodesCORRELATOR);
-	}
-}
+/*
+  CIMXMLParserImpl.java
+
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1464860    2006-05-15  lupusalex    No default value for VALUETYPE assumed
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1547910    2006-09-05  ebak         parseIMETHODCALL() CIMObjectPath parsing problem
+ * 1547908    2006-09-05  ebak         parseKEYBINDING() creates incorrect reference type
+ * 1545915    2006-09-05  ebak         Wrong parsing of IMETHODCALL request
+ * 1660756    2007-03-02  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1669961    2006-04-16  lupusalex    CIMTypedElement.getType() =>getDataType()
+ * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
+ * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
+ * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
+ * 1769504	  2007-08-15  ebak         Type identification for VALUETYPE="numeric"
+ * 1783288    2007-09-10  ebak         CIMClass.isAssociation() not working for retrieved classes.
+ * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
+ * 1827728    2007-11-20  ebak         rework: embeddedInstances: attribute EmbeddedObject not set
+ * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
+ * 1944875    2008-05-29  blaschke-oss Indications with embedded objects are not accepted
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2210455    2008-10-30  blaschke-oss Enhance javadoc, fix potential null pointers
+ * 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)
+ * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
+ * 2860081    2009-09-17  raman_arora  Pull Enumeration Feature (DOM Parser)
+ * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
+ * 3023143    2010-07-01  blaschke-oss CIMXMLParserImpl uses # constructor instead of valueOf
+ * 3027479    2010-07-09  blaschke-oss Dead store to local variable
+ * 3027615    2010-07-12  blaschke-oss Use CLASS_ARRAY_T instead of new CIMDataType(CLASS,0)
+ * 3293248    2011-05-03  blaschke-oss Support for CIM_ERROR instances within ERROR
+ * 3297028    2011-05-03  blaschke-oss Instances contain CIMClassProperty with DOM parser
+ * 3411944    2011-09-20  blaschke-oss createJavaObject exception with hex uint
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
+ * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
+ * 3466280    2012-04-23  blaschke-oss get instance failure for CIM_IndicationSubscription
+ * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3526679    2012-05-14  blaschke-oss DOM parser ignores ERROR node CODE
+ * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
+ * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
+ *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
+ *    2636    2013-05-08  blaschke-oss Nested embedded instances cause CIMXMLParseException
+ *    2640    2013-05-11  blaschke-oss Multiple CDATA parsing broken in DOM parser
+ *    2668    2013-09-24  blaschke-oss Potential null pointer exception in parseCIM
+ *    2669    2013-09-24  blaschke-oss Potential null pointer exception in parseMESSAGE
+ *    2670    2013-09-25  blaschke-oss NAME attribute not required by DOM parser
+ *    2671    2013-09-25  blaschke-oss Potential null pointer exception in parseERROR
+ *    2675    2013-09-27  blaschke-oss CIMXMLParseException messages should contain element name
+ *    2676    2013-09-27  blaschke-oss parseMULTI(EXP)REQ looking for wrong child elements
+ *    2678    2013-09-30  blaschke-oss parseMULTI___ allows one SIMPLE___ child element
+ *    2679    2013-10-01  blaschke-oss parseIMETHODCALL requires one IPARAMVALUE child element
+ *    2680    2013-10-02  blaschke-oss IPARAMVALUE parsing broken on DOM/SAX
+ *    2681    2013-10-02  blaschke-oss parseQUALIFIERDECLARATION does not require TYPE attribute
+ *    2683    2013-10-07  blaschke-oss KEYVALUE VALUETYPE optional, "string" default
+ *    2684    2013-10-07  blaschke-oss parseEXPMETHODRESPONSE has several issues
+ *    2685    2013-10-07  blaschke-oss Element.getAttribute returns empty string if no attribute
+ *    2686    2013-10-10  blaschke-oss parseEXPPARAMVALUE allows 2+ children, prohibits 0 
+ *    2688    2013-10-10  blaschke-oss parseMETHODCALL looks for CIMName attribute instead of NAME
+ *    2537    2013-10-17  blaschke-oss Add new data types for PARAMVALUE
+ *    2691    2013-10-18  blaschke-oss RETURNVALUE should not require PARAMTYPE attribute
+ *    2694    2013-10-25  blaschke-oss NAME attribute not required by DOM parser (part 2)
+ *    2695    2013-10-25  blaschke-oss parseMETHODCALL allows LOCALCLASSPATH and LOCALINSTANCEPATH
+ *    2696    2013-10-29  blaschke-oss parseIRETURNVALUE ignores VALUE and VALUE.ARRAY
+ *    2699    2013-11-05  blaschke-oss parseQUALIFIER does not require TYPE attribute
+ *    2700    2013-11-07  blaschke-oss PROPERTY does not require TYPE attribute
+ *    2701    2013-11-07  blaschke-oss PROPERTY.ARRAY does not require TYPE attribute
+ *    2702    2013-11-07  blaschke-oss Bad PROPERTY.ARRAY ARRAYSIZE generates NumberFormatException
+ *    2703    2013-11-08  blaschke-oss MethodNode should not require TYPE attribute
+ *    2704    2013-11-11  blaschke-oss PARAMETER does not require TYPE attribute
+ *    2705    2013-11-11  blaschke-oss PARAMETER.ARRAY does not require TYPE attribute
+ *    2706    2013-11-11  blaschke-oss Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException
+ *    2707    2013-11-12  blaschke-oss INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children
+ *    2710    2013-11-13  blaschke-oss parseVALUEOBJECTWITH(LOCAL)PATH ignores (LOCAL)CLASSPATH child
+ *    2711    2013-11-13  blaschke-oss LOCALNAMESPACEPATH allows 0 NAMESPACE children
+ *    2713    2013-11-22  blaschke-oss Enforce loose validation of CIM-XML documents
+ *    2715    2013-11-26  blaschke-oss Add VALUE.NULL support
+ *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.StringReader;
+import java.math.BigInteger;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.TreeMap;
+import java.util.Vector;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMClassProperty;
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
+import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMMethod;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMParameter;
+import org.metricshub.wbem.javax.cim.CIMQualifier;
+import org.metricshub.wbem.javax.cim.CIMQualifierType;
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
+import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.metricshub.wbem.sblim.cimclient.internal.util.XMLHostStr;
+import org.metricshub.wbem.javax.cim.CIMDateTime;
+import org.metricshub.wbem.javax.cim.CIMFlavor;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.metricshub.wbem.javax.cim.CIMScope;
+import org.metricshub.wbem.javax.cim.UnsignedInteger16;
+import org.metricshub.wbem.javax.cim.UnsignedInteger32;
+import org.metricshub.wbem.javax.cim.UnsignedInteger64;
+import org.metricshub.wbem.javax.cim.UnsignedInteger8;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+import org.xml.sax.InputSource;
+
+/**
+ * Class CIMXMLParserImpl is the main class of CIM-XML DOM parser.
+ * 
+ */
+public class CIMXMLParserImpl {
+
+	/*
+	 * ebak: local object path - should be used by parseLOCALCLASSPATH(),
+	 * parseLOCALINSTANCEPATH(), parseCLASSNAME(), parseINSTANCENAME(),
+	 * parseCLASS() and parseINSTANCE()
+	 */
+	private static LocalPathBuilder cLocalPathBuilder = new LocalPathBuilder(null);
+
+	/**
+	 * setLocalObjectPath
+	 * 
+	 * @param pLocalOp
+	 *            - empty fields of parsed objectpaths will be substituted by
+	 *            fields coming from this parameter
+	 */
+	public static void setLocalObjectPath(CIMObjectPath pLocalOp) {
+		cLocalPathBuilder = new LocalPathBuilder(pLocalOp);
+	}
+
+	/*
+	 * / local object path
+	 */
+
+	/**
+	 * parseCIM
+	 * 
+	 * @param pCimE
+	 * @return CIMMessage
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMMessage parseCIM(Element pCimE) throws CIMXMLParseException {
+		// 
+		// 
+		Attr cim_cimversionA = (Attr) searchAttribute(pCimE, "CIMVERSION");
+		if (cim_cimversionA == null) throw new CIMXMLParseException(
+				"CIM element missing CIMVERSION attribute!");
+		String cimversion = cim_cimversionA.getNodeValue();
+
+		Attr cim_dtdversionA = (Attr) searchAttribute(pCimE, "DTDVERSION");
+		if (cim_dtdversionA == null) throw new CIMXMLParseException(
+				"CIM element missing DTDVERSION attribute!");
+		String dtdversion = cim_dtdversionA.getNodeValue();
+
+		// MESSAGE
+		Element messageA[] = searchNodes(pCimE, "MESSAGE", 0, 1, false);
+		if (messageA != null) {
+			CIMMessage message = parseMESSAGE(cimversion, dtdversion, messageA[0]);
+			message.setCIMVersion(cimversion);
+			message.setDTDVersion(dtdversion);
+			return message;
+		}
+
+		// DECLARATION
+		if (searchNodes(pCimE, "DECLARATION", 0, 1, false) != null) throw new CIMXMLParseException(
+				"DECLARATION element not supported!");
+
+		throw new CIMXMLParseException("CIM element missing required child element!");
+	}
+
+	// ////////////////////////////////////////////////////////////////////////////////////////
+	// Value Elements
+	// ////////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * parseVALUE - supports the non-standard TYPE attribute
+	 * 
+	 * @param pValueE
+	 * @return TypedValue, type is null if no TYPE attribute was found, the
+	 *         value is always String, the caller method have to convert it.
+	 * @throws CIMXMLParseException
+	 */
+	public static TypedValue parseVALUE(Element pValueE) throws CIMXMLParseException {
+		// 
+
+		String typeStr = attribute(pValueE, "TYPE");
+		CIMDataType type = typeStr == null ? null : parseScalarTypeStr(typeStr);
+		// ebak: empty VALUE element is parsed as empty String
+		NodeList list = pValueE.getChildNodes();
+		StringBuilder valueStr = new StringBuilder();
+		for (int i = 0; i < list.getLength(); i++) {
+			Text t = (Text) list.item(i);
+			if (t != null) {
+				String nodeValue = t.getNodeValue();
+				if (nodeValue != null) valueStr.append(nodeValue);
+			}
+		}
+		return new TypedValue(type, valueStr.toString());
+	}
+
+	/**
+	 * parseVALUEARRAY - supports the non-standard TYPE attribute
+	 * 
+	 * @param pValueArrayE
+	 * @return TypedValue, type is null if no TYPE attribute was found, the
+	 *         value is always String[], the caller method have to convert it.
+	 * @throws CIMXMLParseException
+	 */
+	public static TypedValue parseVALUEARRAY(Element pValueArrayE) throws CIMXMLParseException {
+		// 
+		String typeStr = attribute(pValueArrayE, "TYPE");
+		CIMDataType type = typeStr == null ? null : parseArrayTypeStr(typeStr);
+
+		// Process node list here, order of VALUE/VALUE.NULL IS important
+		NodeList nl = pValueArrayE.getChildNodes();
+		if (nl == null || nl.getLength() == 0) return new TypedValue(type, new String[0]);
+		Vector resStringV = new Vector();
+		for (int i = 0; i < nl.getLength(); i++) {
+			Node n = nl.item(i);
+			if (n instanceof Text && "".equalsIgnoreCase(n.getNodeValue().trim())) continue;
+			String name = n.getNodeName();
+			if (name.equals("VALUE")) {
+				resStringV.add((String) parseVALUE((Element) n).getValue());
+			} else if (name.equals("VALUE.NULL")) {
+				resStringV.add(null);
+			} else if (NODENAME_HASH.containsKey(name)) { throw new CIMXMLParseException(
+					"VALUE.ARRAY element contains invalid child element " + name + "!"); }
+		}
+		return new TypedValue(type, resStringV.toArray(new String[0]));
+	}
+
+	/**
+	 * parseVALUEREFERENCE
+	 * 
+	 * @param pValuereferenceE
+	 * @return CIMObjectPath
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMObjectPath parseVALUEREFERENCE(Element pValuereferenceE)
+			throws CIMXMLParseException {
+		// 
+
+		// CLASSPATH
+		Element classpathA[] = searchNodes(pValuereferenceE, "CLASSPATH", 0, 1, false);
+		if (classpathA != null) {
+			CIMObjectPath op = parseCLASSPATH(classpathA[0]);
+			return op;
+		}
+
+		// LOCALCLASSPATH
+		Element localclasspathA[] = searchNodes(pValuereferenceE, "LOCALCLASSPATH", 0, 1, false);
+		if (localclasspathA != null) {
+			CIMObjectPath op = parseLOCALCLASSPATH(localclasspathA[0]);
+			return op;
+		}
+
+		// CLASSNAME
+		Element classnameA[] = searchNodes(pValuereferenceE, "CLASSNAME", 0, 1, false);
+		if (classnameA != null) {
+			CIMObjectPath op = parseCLASSNAME(classnameA[0]);
+			if (op != null && op.getNamespace() != null) {
+				// LocalPathBuilder includes default namespace in CLASSNAME
+				// elements, needs to be stripped
+				op = new CIMObjectPath(op.getScheme(), op.getHost(), op.getPort(), null, op
+						.getObjectName(), op.getKeys(), op.getXmlSchemaName());
+			}
+			return op;
+		}
+
+		// INSTANCEPATH
+		Element instancepathA[] = searchNodes(pValuereferenceE, "INSTANCEPATH", 0, 1, false);
+		if (instancepathA != null) {
+			CIMObjectPath op = parseINSTANCEPATH(instancepathA[0]);
+			return op;
+		}
+
+		// LOCALINSTANCEPATH
+		Element localinstancepathA[] = searchNodes(pValuereferenceE, "LOCALINSTANCEPATH", 0, 1,
+				false);
+		if (localinstancepathA != null) {
+			CIMObjectPath op = parseLOCALINSTANCEPATH(localinstancepathA[0]);
+			return op;
+		}
+
+		// INSTANCENAME
+		Element instancenameA[] = searchNodes(pValuereferenceE, "INSTANCENAME", 0, 1, false);
+		if (instancenameA != null) {
+			CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
+			if (op != null && op.getNamespace() != null) {
+				// LocalPathBuilder includes default namespace in INSTANCENAME
+				// elements, needs to be stripped
+				op = new CIMObjectPath(op.getScheme(), op.getHost(), op.getPort(), null, op
+						.getObjectName(), op.getKeys(), op.getXmlSchemaName());
+			}
+			return op;
+		}
+
+		throw new CIMXMLParseException("VALUE.REFERENCE element missing required child element!");
+	}
+
+	/**
+	 * parseVALUEREFARRAY
+	 * 
+	 * @param pValueRefArrayE
+	 * @return CIMObjectPath[]
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMObjectPath[] parseVALUEREFARRAY(Element pValueRefArrayE)
+			throws CIMXMLParseException {
+		// 
+
+		// Process node list here, order of VALUE.REFERENCE/VALUE.NULL IS
+		// important
+		NodeList nl = pValueRefArrayE.getChildNodes();
+		if (nl == null || nl.getLength() == 0) return new CIMObjectPath[0];
+		Vector resObjectPathV = new Vector();
+		for (int i = 0; i < nl.getLength(); i++) {
+			Node n = nl.item(i);
+			if (n instanceof Text && "".equalsIgnoreCase(n.getNodeValue().trim())) continue;
+			String name = n.getNodeName();
+			if (name.equals("VALUE.REFERENCE")) {
+				resObjectPathV.add(parseVALUEREFERENCE((Element) n));
+			} else if (name.equals("VALUE.NULL")) {
+				resObjectPathV.add(null);
+			} else if (NODENAME_HASH.containsKey(name)) { throw new CIMXMLParseException(
+					"VALUE.REFARRAY element contains invalid child element " + name + "!"); }
+		}
+		return resObjectPathV.toArray(new CIMObjectPath[0]);
+	}
+
+	/**
+	 * parseVALUEOBJECT
+	 * 
+	 * @param pValueObjectE
+	 * @return CIMNamedElementInterface (CIMClass|CIMInstance)
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMNamedElementInterface parseVALUEOBJECT(Element pValueObjectE)
+			throws CIMXMLParseException {
+		// 
+
+		// CLASS
+		Element classA[] = searchNodes(pValueObjectE, "CLASS", 0, 1, false);
+		if (classA != null) {
+			CIMClass obj = parseCLASS(classA[0]);
+			return obj;
+		}
+
+		// INSTANCE
+		Element instanceA[] = searchNodes(pValueObjectE, "INSTANCE", 0, 1, false);
+		if (instanceA != null) {
+			CIMInstance obj = parseINSTANCE(instanceA[0]);
+			return obj;
+		}
+
+		throw new CIMXMLParseException("VALUE.OBJECT element missing required child element!");
+	}
+
+	private static final String nodesVALUENAMEDINSTANCE[] = { "INSTANCENAME", "INSTANCE" };
+
+	/**
+	 * parseVALUENAMEDINSTANCE
+	 * 
+	 * @param pValueNamedInstanceE
+	 * @return CIMInstance
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMInstance parseVALUENAMEDINSTANCE(Element pValueNamedInstanceE)
+			throws CIMXMLParseException {
+		// 
+
+		// INSTANCENAME
+		Element instancenameA[] = searchNodes(pValueNamedInstanceE, "INSTANCENAME", 1, 1, true);
+		if (instancenameA == null) { throw new CIMXMLParseException(
+				"VALUE.NAMEDINSTANCE element missing INSTANCENAME child element!"); }
+		CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
+
+		// INSTANCE
+		Element instanceA[] = searchNodes(pValueNamedInstanceE, "INSTANCE", 1, 1, true);
+		if (instanceA == null) { throw new CIMXMLParseException(
+				"VALUE.NAMEDINSTANCE element missing INSTANCE child element!"); }
+		CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
+		checkOtherNodes(pValueNamedInstanceE, nodesVALUENAMEDINSTANCE);
+		return inst;
+	}
+
+	private static final String nodesVALUEINSTANCEWITHPATH[] = { "INSTANCEPATH", "INSTANCE" };
+
+	/**
+	 * parseVALUEINSTANCEWITHPATH
+	 * 
+	 * @param pValueNamedInstanceE
+	 * @return CIMInstance
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMInstance parseVALUEINSTANCEWITHPATH(Element pValueNamedInstanceE)
+			throws CIMXMLParseException {
+		// 
+
+		// INSTANCEPATH
+		Element instancepathA[] = searchNodes(pValueNamedInstanceE, "INSTANCEPATH", 1, 1, true);
+		if (instancepathA == null) { throw new CIMXMLParseException(
+				"VALUE.INSTANCEWITHPATH element missing INSTANCEPATH child element!"); }
+		CIMObjectPath op = parseINSTANCEPATH(instancepathA[0]);
+
+		// INSTANCE
+		Element instanceA[] = searchNodes(pValueNamedInstanceE, "INSTANCE", 1, 1, true);
+		if (instanceA == null) { throw new CIMXMLParseException(
+				"VALUE.INSTANCEWITHPATH element missing INSTANCE child element!"); }
+		CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
+		checkOtherNodes(pValueNamedInstanceE, nodesVALUEINSTANCEWITHPATH);
+		return inst;
+	}
+
+	private static final String nodesVALUENAMEDOBJECTi[] = { "INSTANCENAME", "INSTANCE" };
+
+	/**
+	 * parseVALUENAMEDOBJECT
+	 * 
+	 * @param pValueNamedObjectE
+	 * @return CIMNamedElementInterface
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMNamedElementInterface parseVALUENAMEDOBJECT(Element pValueNamedObjectE)
+			throws CIMXMLParseException {
+		// 
+
+		// CLASS
+		Element classA[] = searchNodes(pValueNamedObjectE, "CLASS", 0, 1, false);
+		if (classA != null) {
+			CIMClass obj = parseCLASS(classA[0]);
+			// checkOtherNodes(pValueNamedObjectE, nodesVALUENAMEDOBJECTc);
+			return obj;
+		}
+
+		// INSTANCENAME
+		Element instancenameA[] = searchNodes(pValueNamedObjectE, "INSTANCENAME", 0, 1, true);
+		if (instancenameA != null) {
+			CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
+
+			// INSTANCE
+			Element instanceA[] = searchNodes(pValueNamedObjectE, "INSTANCE", 0, 1, true);
+			if (instanceA == null) { throw new CIMXMLParseException(
+					"VALUE.NAMEDOBJECT element missing INSTANCE child element!"); }
+			CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
+			checkOtherNodes(pValueNamedObjectE, nodesVALUENAMEDOBJECTi);
+			return inst;
+		}
+
+		throw new CIMXMLParseException("VALUE.NAMEDOBJECT element missing required child element!");
+	}
+
+	private static final String nodesVALUEOBJECTWITHPATHcls[] = { "CLASSPATH", "CLASS" };
+
+	private static final String nodesVALUEOBJECTWITHPATHins[] = { "INSTANCEPATH", "INSTANCE" };
+
+	/**
+	 * parseVALUEOBJECTWITHPATH
+	 * 
+	 * @param pValueObjectWithPathE
+	 * @return CIMNamedElementInterface
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMNamedElementInterface parseVALUEOBJECTWITHPATH(Element pValueObjectWithPathE)
+			throws CIMXMLParseException {
+		// 
+
+		// CLASSPATH
+		Element classpathA[] = searchNodes(pValueObjectWithPathE, "CLASSPATH", 0, 1, true);
+		if (classpathA != null) {
+			CIMObjectPath op = parseCLASSPATH(classpathA[0]);
+
+			// CLASS
+			Element classA[] = searchNodes(pValueObjectWithPathE, "CLASS", 0, 1, true);
+			if (classA == null) { throw new CIMXMLParseException(
+					"VALUE.OBJECTWITHPATH element missing CLASS child element!"); }
+
+			CIMClass obj = parseCLASS(classA[0], op);
+			checkOtherNodes(pValueObjectWithPathE, nodesVALUEOBJECTWITHPATHcls);
+			return obj;
+		}
+
+		// INSTANCEPATH
+		Element instancepathA[] = searchNodes(pValueObjectWithPathE, "INSTANCEPATH", 0, 1, true);
+		if (instancepathA != null) {
+			CIMObjectPath op = parseINSTANCEPATH(instancepathA[0]);
+
+			// INSTANCE
+			Element instanceA[] = searchNodes(pValueObjectWithPathE, "INSTANCE", 0, 1, true);
+			if (instanceA == null) { throw new CIMXMLParseException(
+					"VALUE.OBJECTWITHPATH element missing INSTANCE child element!"); }
+			CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
+			checkOtherNodes(pValueObjectWithPathE, nodesVALUEOBJECTWITHPATHins);
+			return inst;
+		}
+
+		throw new CIMXMLParseException(
+				"VALUE.OBJECTWITHPATH element missing required child element!");
+	}
+
+	private static final String nodesVALUEOBJECTWITHLOCALPATHcls[] = { "LOCALCLASSPATH", "CLASS" };
+
+	private static final String nodesVALUEOBJECTWITHLOCALPATHins[] = { "LOCALINSTANCEPATH",
+			"INSTANCE" };
+
+	/**
+	 * parseVALUEOBJECTWITHLOCALPATH
+	 * 
+	 * @param pValueObjectWithLocalPathE
+	 * @return CIMNamedElementInterface
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMNamedElementInterface parseVALUEOBJECTWITHLOCALPATH(
+			Element pValueObjectWithLocalPathE) throws CIMXMLParseException {
+		// 
+
+		// LOCALCLASSPATH
+		Element localclasspathA[] = searchNodes(pValueObjectWithLocalPathE, "LOCALCLASSPATH", 0, 1,
+				true);
+		if (localclasspathA != null) {
+			CIMObjectPath op = parseLOCALCLASSPATH(localclasspathA[0]);
+
+			// CLASS
+			Element classA[] = searchNodes(pValueObjectWithLocalPathE, "CLASS", 0, 1, true);
+			if (classA == null) { throw new CIMXMLParseException(
+					"VALUE.OBJECTWITHLOCALPATH element missing CLASS child element!"); }
+
+			CIMClass obj = parseCLASS(classA[0], op);
+			checkOtherNodes(pValueObjectWithLocalPathE, nodesVALUEOBJECTWITHLOCALPATHcls);
+			return obj;
+		}
+
+		// LOCALINSTANCEPATH
+		Element localinstancepathA[] = searchNodes(pValueObjectWithLocalPathE, "LOCALINSTANCEPATH",
+				0, 1, true);
+		if (localinstancepathA != null) {
+			CIMObjectPath op = parseLOCALINSTANCEPATH(localinstancepathA[0]);
+
+			// INSTANCE
+			Element instanceA[] = searchNodes(pValueObjectWithLocalPathE, "INSTANCE", 0, 1, true);
+			if (instanceA == null) { throw new CIMXMLParseException(
+					"VALUE.OBJECTWITHLOCALPATH element missing INSTANCE child element!"); }
+			CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
+			checkOtherNodes(pValueObjectWithLocalPathE, nodesVALUEOBJECTWITHLOCALPATHins);
+			return inst;
+		}
+
+		throw new CIMXMLParseException(
+				"VALUE.OBJECTWITHLOCALPATH element missing required child element!");
+	}
+
+	// ////////////////////////////////////////////////////////////////////////////////////////
+	// Naming and Location elements
+	// ////////////////////////////////////////////////////////////////////////////////////////
+
+	private static final String nodesNAMESPACEPATH[] = { "HOST", "LOCALNAMESPACEPATH" };
+
+	/**
+	 * parseNAMESPACEPATH
+	 * 
+	 * @param pNameSpacePathE
+	 * @return CIMObjectPath
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMObjectPath parseNAMESPACEPATH(Element pNameSpacePathE)
+			throws CIMXMLParseException {
+		// 
+		// HOST
+		Element hostA[] = searchNodes(pNameSpacePathE, "HOST", 1, 1, true);
+		if (hostA == null) { throw new CIMXMLParseException(
+				"NAMESPACEPATH element missing HOST child element!"); }
+		XMLHostStr xmlHostStr = new XMLHostStr(parseHOST(hostA[0]));
+		// LOCALNAMESPACE
+		Element localnamespacepathA[] = searchNodes(pNameSpacePathE, "LOCALNAMESPACEPATH", 1, 1,
+				true);
+		if (localnamespacepathA == null) { throw new CIMXMLParseException(
+				"NAMESPACEPATH element missing LOCALNAMESPACEPATH child element!"); }
+		String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
+		/*
+		 * CIMObjectPath( String scheme, String host, String port, String
+		 * namespace, String objectName, CIMProperty[] keys )
+		 */
+		checkOtherNodes(pNameSpacePathE, nodesNAMESPACEPATH);
+		return new CIMObjectPath(xmlHostStr.getProtocol(), xmlHostStr.getHost(), xmlHostStr
+				.getPort(), nameSpace, null, null);
+	}
+
+	/**
+	 * parseLOCALNAMESPACEPATH
+	 * 
+	 * @param pLocalNameSpaceE
+	 * @return String
+	 * @throws CIMXMLParseException
+	 */
+	public static String parseLOCALNAMESPACEPATH(Element pLocalNameSpaceE)
+			throws CIMXMLParseException {
+		// 
+
+		Element[] nameSpaceElementA = searchNodes(pLocalNameSpaceE, "NAMESPACE", 1,
+				Integer.MAX_VALUE, false);
+		if (nameSpaceElementA == null) {
+			if (WBEMConfiguration.getGlobalConfiguration().allowEmptyLocalNameSpacePath()
+					&& cLocalPathBuilder != null) return cLocalPathBuilder.getBasePath()
+					.getNamespace();
+			throw new CIMXMLParseException(
+					"LOCALNAMESPACEPATH element missing NAMESPACE child element!");
+		}
+		StringBuffer sb = new StringBuffer();
+		for (int i = 0; i < nameSpaceElementA.length; i++) {
+			Element namespaceE = nameSpaceElementA[i];
+			String s = parseNAMESPACE(namespaceE);
+			if (i > 0) sb.append("/" + s);
+			else sb.append(s);
+		}
+		return sb.toString();
+	}
+
+	/**
+	 * parseHOST
+	 * 
+	 * @param pHostE
+	 * @return String
+	 */
+	public static String parseHOST(Element pHostE) {
+		// 
+
+		Text valueT = (Text) searchFirstChild(pHostE);
+		String host = valueT.getNodeValue();
+		return host;
+	}
+
+	private static final String nodesNAMESPACE[] = {};
+
+	/**
+	 * parseNAMESPACE
+	 * 
+	 * @param pNameSpaceE
+	 * @return String
+	 * @throws CIMXMLParseException
+	 */
+	public static String parseNAMESPACE(Element pNameSpaceE) throws CIMXMLParseException {
+		// 
+		// 
+
+		Attr namespace_nameA = (Attr) searchAttribute(pNameSpaceE, "NAME");
+		if (namespace_nameA == null) throw new CIMXMLParseException(
+				"NAMESPACE element missing NAME attribute!");
+		String n = namespace_nameA.getValue();
+		checkOtherNodes(pNameSpaceE, nodesNAMESPACE);
+		return n;
+	}
+
+	private static final String nodesCLASSPATH[] = { "NAMESPACEPATH", "CLASSNAME" };
+
+	/**
+	 * parseCLASSPATH
+	 * 
+	 * @param pClassPathE
+	 * @return CIMObjectPath
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMObjectPath parseCLASSPATH(Element pClassPathE) throws CIMXMLParseException {
+		// 
+
+		// NAMESPACEPATH
+		Element namespacepathA[] = searchNodes(pClassPathE, "NAMESPACEPATH", 1, 1, true);
+		if (namespacepathA == null) { throw new CIMXMLParseException(
+				"CLASSPATH element missing NAMESPACEPATH child element!"); }
+		CIMObjectPath nsPath = parseNAMESPACEPATH(namespacepathA[0]);
+		// CLASSNAME
+		Element classnameA[] = searchNodes(pClassPathE, "CLASSNAME", 1, 1, true);
+		if (classnameA == null) { throw new CIMXMLParseException(
+				"CLASSPATH element missing CLASSNAME child element!"); }
+		String className = parseClassName(classnameA[0]);
+		/*
+		 * CIMObjectPath( String scheme, String host, String port, String
+		 * namespace, String objectName, CIMProperty[] keys )
+		 */
+		checkOtherNodes(pClassPathE, nodesCLASSPATH);
+		return new CIMObjectPath(nsPath.getScheme(), nsPath.getHost(), nsPath.getPort(), nsPath
+				.getNamespace(), className, null);
+	}
+
+	private static final String nodesLOCALCLASSPATH[] = { "LOCALNAMESPACEPATH", "CLASSNAME" };
+
+	/**
+	 * parseLOCALCLASSPATH
+	 * 
+	 * @param pClassPathE
+	 * @return CIMObjectPath
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMObjectPath parseLOCALCLASSPATH(Element pClassPathE)
+			throws CIMXMLParseException {
+		// 
+
+		// NAMESPACEPATH
+		Element localnamespacepathA[] = searchNodes(pClassPathE, "LOCALNAMESPACEPATH", 1, 1, true);
+		if (localnamespacepathA == null) { throw new CIMXMLParseException(
+				"LOCALCLASSPATH element missing LOCALNAMESPACEPATH child element!"); }
+		String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
+
+		// CLASSNAME
+		Element classnameA[] = searchNodes(pClassPathE, "CLASSNAME", 1, 1, true);
+		if (classnameA == null) { throw new CIMXMLParseException(
+				"LOCALCLASSPATH element missing CLASSNAME child element!"); }
+		CIMObjectPath op = parseCLASSNAME(classnameA[0]);
+		checkOtherNodes(pClassPathE, nodesLOCALCLASSPATH);
+		return cLocalPathBuilder.build(op.getObjectName(), nameSpace);
+	}
+
+	private static final String nodesCLASSNAME[] = {};
+
+	/**
+	 * parseClassName
+	 * 
+	 * @param pClassNameE
+	 * @return String
+	 * @throws CIMXMLParseException
+	 */
+	public static String parseClassName(Element pClassNameE) throws CIMXMLParseException {
+		// 
+		// 
+		Attr classname_nameA = (Attr) searchAttribute(pClassNameE, "NAME");
+		if (classname_nameA == null) throw new CIMXMLParseException(
+				"CLASSNAME element missing NAME attribute!");
+		checkOtherNodes(pClassNameE, nodesCLASSNAME);
+		return classname_nameA.getNodeValue();
+	}
+
+	/**
+	 * parseCLASSNAME
+	 * 
+	 * @param pClassNameE
+	 * @return CIMObjectPath
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMObjectPath parseCLASSNAME(Element pClassNameE) throws CIMXMLParseException {
+		return cLocalPathBuilder.build(parseClassName(pClassNameE), null);
+	}
+
+	private static final String nodesINSTANCEPATH[] = { "NAMESPACEPATH", "INSTANCENAME" };
+
+	/**
+	 * parseINSTANCEPATH
+	 * 
+	 * @param pInstancePathE
+	 * @return CIMObjectPath
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMObjectPath parseINSTANCEPATH(Element pInstancePathE)
+			throws CIMXMLParseException {
+		// 
+
+		// NAMESPACEPATH
+		Element namespacepathA[] = searchNodes(pInstancePathE, "NAMESPACEPATH", 1, 1, true);
+		if (namespacepathA == null) { throw new CIMXMLParseException(
+				"INSTANCEPATH element missing NAMESPACEPATH child element!"); }
+		CIMObjectPath nsPath = parseNAMESPACEPATH(namespacepathA[0]);
+		// INSTANCENAME
+		Element instancenameA[] = searchNodes(pInstancePathE, "INSTANCENAME", 1, 1, true);
+		if (instancenameA == null) { throw new CIMXMLParseException(
+				"INSTANCEPATH element missing INSTANCENAME child element!"); }
+		CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
+		// ebak: change host and namespace
+		checkOtherNodes(pInstancePathE, nodesINSTANCEPATH);
+		return new CIMObjectPath(nsPath.getScheme(), nsPath.getHost(), nsPath.getPort(), nsPath
+				.getNamespace(), op.getObjectName(), op.getKeys());
+	}
+
+	private static final String nodesLOCALINSTANCEPATH[] = { "LOCALNAMESPACEPATH", "INSTANCENAME" };
+
+	/**
+	 * parseLOCALINSTANCEPATH
+	 * 
+	 * @param pLocalInstancePathE
+	 * @return CIMObjectPath
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMObjectPath parseLOCALINSTANCEPATH(Element pLocalInstancePathE)
+			throws CIMXMLParseException {
+		// 
+
+		// LOCALNAMESPACEPATH
+		Element localnamespacepathA[] = searchNodes(pLocalInstancePathE, "LOCALNAMESPACEPATH", 1,
+				1, true);
+		if (localnamespacepathA == null) { throw new CIMXMLParseException(
+				"LOCALINSTANCEPATH element missing LOCALNAMESPACEPATH child element!"); }
+		String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
+
+		// INSTANCENAME
+		Element instancenameA[] = searchNodes(pLocalInstancePathE, "INSTANCENAME", 1, 1, true);
+		if (instancenameA == null) { throw new CIMXMLParseException(
+				"LOCALINSTANCEPATH element missing INSTANCENAME child element!"); }
+		CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
+		/*
+		 * CIMObjectPath(String objectName, String namespace, CIMProperty[]
+		 * keys)
+		 */
+		checkOtherNodes(pLocalInstancePathE, nodesLOCALINSTANCEPATH);
+		return cLocalPathBuilder.build(op.getObjectName(), nameSpace, op.getKeys());
+	}
+
+	private static final String nodesINSTANCENAME[] = { "KEYBINDING", "KEYVALUE", "VALUE.REFERENCE" };
+
+	/**
+	 * parseINSTANCENAME
+	 * 
+	 * @param pInstanceNameE
+	 * @return CIMObjectPath
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMObjectPath parseINSTANCENAME(Element pInstanceNameE)
+			throws CIMXMLParseException {
+		// 
+		// 
+		Attr instance_classnameA = (Attr) searchAttribute(pInstanceNameE, "CLASSNAME");
+		if (instance_classnameA == null) throw new CIMXMLParseException(
+				"INSTANCENAME element missing CLASSNAME attribute!");
+		String opClassName = instance_classnameA.getNodeValue();
+
+		// KEYBINDING
+		Element[] keyBindingElementA = searchNodes(pInstanceNameE, "KEYBINDING", 0,
+				Integer.MAX_VALUE, false);
+		if (keyBindingElementA != null) {
+			CIMProperty[] keys = new CIMProperty[keyBindingElementA.length];
+			for (int i = 0; i < keyBindingElementA.length; i++) {
+				Element keybindingE = keyBindingElementA[i];
+				keys[i] = parseKEYBINDING(keybindingE);
+			}
+			return cLocalPathBuilder.build(opClassName, null, keys);
+		}
+
+		// KEYVALUE
+		Element keyvalueA[] = searchNodes(pInstanceNameE, "KEYVALUE", 0, 1, false);
+		if (keyvalueA != null) {
+			CIMProperty[] keys = new CIMProperty[1];
+			TypedValue propTypedVal = parseKEYVALUE(keyvalueA[0]);
+			keys[0] = new CIMProperty("", propTypedVal.getType(), propTypedVal.getValue(),
+					true, false, null);
+			return cLocalPathBuilder.build(opClassName, null, keys);
+		}
+
+		// VALUE.REFERENCE
+		Element valuereferenceA[] = searchNodes(pInstanceNameE, "VALUE.REFERENCE", 0, 1, false);
+		if (valuereferenceA != null) {
+			CIMProperty[] keys = new CIMProperty[1];
+			CIMObjectPath op = parseVALUEREFERENCE(valuereferenceA[0]);
+			keys[0] = new CIMProperty("", new CIMDataType(op.getObjectName()), op,
+					true, false, null);
+			return cLocalPathBuilder.build(opClassName, null, keys);
+		}
+
+		checkOtherNodes(pInstanceNameE, nodesINSTANCENAME);
+
+		return new CIMObjectPath(null, null, null, null, opClassName, null);
+	}
+
+	/**
+	 * parseOBJECTPATH
+	 * 
+	 * @param pObjectPathE
+	 * @return CIMObjectPath
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMObjectPath parseOBJECTPATH(Element pObjectPathE) throws CIMXMLParseException {
+		// 
+
+		// INSTANCEPATH
+		Element instancepathA[] = searchNodes(pObjectPathE, "INSTANCEPATH", 0, 1, false);
+		if (instancepathA != null) {
+			CIMObjectPath op = parseINSTANCEPATH(instancepathA[0]);
+			return op;
+		}
+
+		// CLASSPATH
+		Element classpathA[] = searchNodes(pObjectPathE, "CLASSPATH", 0, 1, false);
+		if (classpathA != null) {
+			CIMObjectPath op = parseCLASSPATH(classpathA[0]);
+			return op;
+		}
+
+		throw new CIMXMLParseException("OBJECTPATH element missing required child element!");
+	}
+
+	/**
+	 * parseKEYBINDING
+	 * 
+	 * @param pKeyBindingE
+	 * @return CIMProperty
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMProperty parseKEYBINDING(Element pKeyBindingE) throws CIMXMLParseException {
+		// 
+		// 
+
+		Attr keybinding_nameA = (Attr) searchAttribute(pKeyBindingE, "NAME");
+		if (keybinding_nameA == null) throw new CIMXMLParseException(
+				"KEYBINDING element missing NAME attribute!");
+		String propName = keybinding_nameA.getValue();
+
+		// KEYVALUE
+		Element keyvalueA[] = searchNodes(pKeyBindingE, "KEYVALUE", 0, 1, false);
+		if (keyvalueA != null) {
+			TypedValue propTypedVal = parseKEYVALUE(keyvalueA[0]);
+			return new CIMProperty(propName, propTypedVal.getType(), propTypedVal
+					.getValue(), true, false, null);
+		}
+
+		// VALUE.REFERENCE
+		Element valuereferenceA[] = searchNodes(pKeyBindingE, "VALUE.REFERENCE", 0, 1, false);
+		if (valuereferenceA != null) {
+			CIMObjectPath op = parseVALUEREFERENCE(valuereferenceA[0]);
+			return new CIMProperty(propName, new CIMDataType(op.getObjectName()),
+					op, true, false, null);
+		}
+
+		throw new CIMXMLParseException("KEYBINDING element missing required child element!");
+	}
+
+	private static final TreeMap TYPESTR_MAP = new TreeMap(
+			new Comparator() {
+
+				public int compare(Object pO1, Object pO2) {
+					return ((String) pO1).compareToIgnoreCase((String) pO2);
+				}
+
+			});
+
+	static {
+		TYPESTR_MAP.put(MOF.DT_UINT8, CIMDataType.UINT8_T);
+		TYPESTR_MAP.put(MOF.DT_UINT16, CIMDataType.UINT16_T);
+		TYPESTR_MAP.put(MOF.DT_UINT32, CIMDataType.UINT32_T);
+		TYPESTR_MAP.put(MOF.DT_UINT64, CIMDataType.UINT64_T);
+		TYPESTR_MAP.put(MOF.DT_SINT8, CIMDataType.SINT8_T);
+		TYPESTR_MAP.put(MOF.DT_SINT16, CIMDataType.SINT16_T);
+		TYPESTR_MAP.put(MOF.DT_SINT32, CIMDataType.SINT32_T);
+		TYPESTR_MAP.put(MOF.DT_SINT64, CIMDataType.SINT64_T);
+		TYPESTR_MAP.put(MOF.DT_REAL32, CIMDataType.REAL32_T);
+		TYPESTR_MAP.put(MOF.DT_REAL64, CIMDataType.REAL64_T);
+		TYPESTR_MAP.put(MOF.DT_CHAR16, CIMDataType.CHAR16_T);
+		TYPESTR_MAP.put(MOF.DT_STR, CIMDataType.STRING_T);
+		TYPESTR_MAP.put(MOF.DT_BOOL, CIMDataType.BOOLEAN_T);
+		TYPESTR_MAP.put(MOF.DT_DATETIME, CIMDataType.DATETIME_T);
+		// FIXME: ebak: What to do with those types which are not specified by
+		// MOF's BNF?
+		TYPESTR_MAP.put(MOF.INVALID, CIMDataType.INVALID_T);
+		// FIXME: ebak: What is the string representation of OBJECT?
+		TYPESTR_MAP.put("object", CIMDataType.OBJECT_T);
+		TYPESTR_MAP.put(MOF.CLASS, CIMDataType.CLASS_T);
+		TYPESTR_MAP.put(MOF.REFERENCE, new CIMDataType(""));
+	}
+
+	/**
+	 * parseScalarTypeStr
+	 * 
+	 * @param pTypeStr
+	 * @return CIMDataType
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMDataType parseScalarTypeStr(String pTypeStr) throws CIMXMLParseException {
+		return parseTypeStr(pTypeStr, false);
+	}
+
+	/**
+	 * parseArrayTypeStr
+	 * 
+	 * @param pTypeStr
+	 * @return CIMDataType
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMDataType parseArrayTypeStr(String pTypeStr) throws CIMXMLParseException {
+		return parseTypeStr(pTypeStr, true);
+	}
+
+	/**
+	 * parseTypeStr
+	 * 
+	 * @param pTypeStr
+	 * @param pArray
+	 * @return CIMDataType
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMDataType parseTypeStr(String pTypeStr, boolean pArray)
+			throws CIMXMLParseException {
+		if (pTypeStr == null) return pArray ? CIMDataType.STRING_ARRAY_T : CIMDataType.STRING_T;
+		CIMDataType type = TYPESTR_MAP.get(pTypeStr);
+		if (type == null) throw new CIMXMLParseException("Unknown TYPE string:" + pTypeStr);
+		if (pArray) {
+			if (type.getType() == CIMDataType.REFERENCE) return new CIMDataType(type
+					.getRefClassName(), 0);
+			return CIMHelper.UnboundedArrayDataType(type.getType());
+		}
+		return type;
+	}
+
+	/**
+	 * parseKEYVALUE
+	 * 
+	 * @param pKeyValueE
+	 * @return TypedValue
+	 * @throws CIMXMLParseException
+	 */
+	public static TypedValue parseKEYVALUE(Element pKeyValueE) throws CIMXMLParseException {
+		/*
+		 *  
+		 */
+		// ebak: if TYPE attribute is included there is no need to deal with
+		// VALUETYPE attribute
+		String typeStr = attribute(pKeyValueE, "TYPE");
+
+		Text valueT = (Text) searchFirstChild(pKeyValueE);
+		String valueStr = valueT == null ? null : valueT.getNodeValue();
+
+		if (typeStr == null) {
+			String valueTypeStr = attribute(pKeyValueE, "VALUETYPE");
+			if (valueTypeStr == null) valueTypeStr = "string";
+			ValueTypeHandler vtHandler = new ValueTypeHandler(valueTypeStr, valueStr);
+			return new TypedValue(vtHandler.getType(), vtHandler.getValue());
+		}
+		Object value = valueStr == null ? "" : createJavaObject(typeStr, valueStr);
+		return new TypedValue(parseScalarTypeStr(typeStr), value);
+	}
+
+	/**
+	 * Class ValueTypeHandler determines the value and type of a KEYVALUE XML
+	 * element, when the VALUETYPE attribute is provided instead of the exact
+	 * TYPE attribute. There is a very similar code section in the PULL and SAX
+	 * parser, but that section wasn't made common since in ideal case the DOM
+	 * parser will be removed.
+	 */
+	private static class ValueTypeHandler {
+
+		private CIMDataType iType;
+
+		private Object iValue;
+
+		/**
+		 * 
+		 * Ctor.
+		 * 
+		 * @param pValueTypeStr
+		 * @param pValueStr
+		 * @throws CIMXMLParseException
+		 */
+		public ValueTypeHandler(String pValueTypeStr, String pValueStr) throws CIMXMLParseException {
+
+			if (pValueTypeStr == null) throw new CIMXMLParseException(
+					"KEYVALUE element missing VALUETYPE attribute!");
+
+			if (pValueTypeStr.equals("numeric")) {
+				if (!setUInt64(pValueStr) && !setSInt64(pValueStr) && !setReal64(pValueStr)) throw new CIMXMLParseException(
+						"Unparseable \"number\" value: " + pValueStr + " !");
+			} else if (pValueTypeStr.equals(MOF.DT_STR)) {
+				if (!setDTAbsolute(pValueStr) && !setDTInterval(pValueStr)) {
+					this.iValue = pValueStr;
+					this.iType = CIMDataType.STRING_T;
+				}
+			} else if (pValueTypeStr.equals(MOF.DT_BOOL)) {
+				if (!setBoolean(pValueStr)) throw new CIMXMLParseException(
+						"Unparseable \"boolean\" value: " + pValueStr + " !");
+			} else {
+				throw new CIMXMLParseException("KEYVALUE element's VALUETYPE attribute must be "
+						+ MOF.DT_STR + ", " + MOF.DT_BOOL + " or numeric! " + pValueStr
+						+ " is not allowed!");
+			}
+		}
+
+		/**
+		 * 
+		 * getType
+		 * 
+		 * @return CIMDataType
+		 */
+		public CIMDataType getType() {
+			return this.iType;
+		}
+
+		/**
+		 * 
+		 * getValue
+		 * 
+		 * @return Object
+		 */
+		public Object getValue() {
+			return this.iValue;
+		}
+
+		private boolean setUInt64(String pValue) {
+			try {
+				this.iValue = new UnsignedInteger64(pValue);
+			} catch (NumberFormatException e) {
+				return false;
+			}
+			this.iType = CIMDataType.UINT64_T;
+			return true;
+		}
+
+		private boolean setSInt64(String pValue) {
+			try {
+				this.iValue = new Long(pValue);
+			} catch (NumberFormatException e) {
+				return false;
+			}
+			this.iType = CIMDataType.SINT64_T;
+			return true;
+		}
+
+		private boolean setReal64(String pValue) {
+			try {
+				if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
+					if (Util.isBadDoubleString(pValue)) return false;
+				}
+				this.iValue = new Double(pValue);
+			} catch (NumberFormatException e) {
+				return false;
+			}
+			this.iType = CIMDataType.REAL64_T;
+			return true;
+		}
+
+		private boolean setBoolean(String pValue) {
+			this.iValue = Boolean.valueOf(pValue);
+			this.iType = CIMDataType.BOOLEAN_T;
+			return true;
+		}
+
+		private boolean setDTAbsolute(String pValue) {
+			try {
+				this.iValue = new CIMDateTimeAbsolute(pValue);
+			} catch (IllegalArgumentException e) {
+				return false;
+			}
+			this.iType = CIMDataType.DATETIME_T;
+			return true;
+		}
+
+		private boolean setDTInterval(String pValue) {
+			try {
+				this.iValue = new CIMDateTimeInterval(pValue);
+			} catch (IllegalArgumentException e) {
+				return false;
+			}
+			this.iType = CIMDataType.DATETIME_T;
+			return true;
+		}
+	}
+
+	// ////////////////////////////////////////////////////////////////////////////////////////
+	// Object Definition Elements
+	// ////////////////////////////////////////////////////////////////////////////////////////
+
+	private static String attribute(Element pElement, String pName) {
+		String attrib = pElement.getAttribute(pName);
+		if (attrib == null || attrib.length() == 0) return null;
+		return attrib;
+	}
+
+	private static final String[] nodesCLASS = { "QUALIFIER", "PROPERTY", "PROPERTY.ARRAY",
+			"PROPERTY.REFERENCE", "METHOD" };
+
+	/**
+	 * parseCLASS
+	 * 
+	 * @param pClassE
+	 * @return CIMClass
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMClass parseCLASS(Element pClassE) throws CIMXMLParseException {
+		return parseCLASS(pClassE, null);
+	}
+
+	/**
+	 * parseCLASS
+	 * 
+	 * @param pClassE
+	 * @param pObjectPath
+	 * @return CIMClass
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMClass parseCLASS(Element pClassE, CIMObjectPath pObjectPath)
+			throws CIMXMLParseException {
+		// 
+		// 
+
+		Attr class_nameA = (Attr) searchAttribute(pClassE, "NAME");
+		if (class_nameA == null) throw new CIMXMLParseException(
+				"CLASS element missing NAME attribute!");
+		String name = class_nameA.getNodeValue();
+
+		// Attr superclass_nameA = (Attr)searchAttribute(classE, "SUPERCLASS");
+		// String supername = superclass_nameA.getNodeValue();
+
+		String superClass = attribute(pClassE, "SUPERCLASS");
+
+		// QUALIFIER
+		CIMQualifier[] qualis = parseQUALIFIERS(pClassE);
+
+		// PROPERTY
+		CIMClassProperty[] props = parseCLASSPROPERTIES(pClassE);
+
+		// METHOD
+		Element[] methodElementA = searchNodes(pClassE, "METHOD", 0, Integer.MAX_VALUE, true);
+		CIMMethod[] methods;
+		if (methodElementA != null) {
+			methods = new CIMMethod[methodElementA.length];
+			for (int i = 0; i < methodElementA.length; i++) {
+				Element methodE = methodElementA[i];
+				methods[i] = parseMETHOD(methodE);
+			}
+		} else {
+			methods = null;
+		}
+
+		/*
+		 * CIMClass( String name, String superclass, CIMQualifier[] qualifiers,
+		 * CIMClassProperty[] props, CIMMethod[] methods )
+		 * 
+		 * return new CIMClass( name, superClass, qualis, props, methods );
+		 * 
+		 * This constructor can provide localPath info. CIMClass( CIMObjectPath
+		 * path, String superclass, CIMQualifier[] qualifiers,
+		 * CIMClassProperty[] props, CIMMethod[] pMethods, boolean
+		 * pIsAssociation, boolean pIsKeyed )
+		 */
+		checkOtherNodes(pClassE, nodesCLASS);
+
+		return new CIMClass(
+				pObjectPath == null ? cLocalPathBuilder.build(name, null) : pObjectPath,
+				superClass, qualis, props, methods, hasAssocQuali(qualis), hasKeyProp(props));
+	}
+
+	private static boolean hasAssocQuali(CIMQualifier[] pQualis) {
+		if (pQualis == null) return false;
+		for (int i = 0; i < pQualis.length; i++) {
+			CIMQualifier quali = pQualis[i];
+			if ("ASSOCIATION".equalsIgnoreCase(quali.getName())
+					&& Boolean.TRUE.equals(quali.getValue())) return true;
+		}
+		return false;
+	}
+
+	private static boolean hasKeyProp(CIMProperty[] pProps) {
+		if (pProps == null) return false;
+		for (int i = 0; i < pProps.length; i++)
+			if (pProps[i].isKey()) return true;
+		return false;
+	}
+
+	private static CIMParameter[] parseParameters(Element pMethodE) throws CIMXMLParseException {
+		// PARAMETER
+		Vector> paramV = new Vector>();
+		Element[] paramElementA = searchNodes(pMethodE, "PARAMETER");
+		if (paramElementA != null) {
+			for (int i = 0; i < paramElementA.length; i++) {
+				Element parameterE = paramElementA[i];
+				CIMParameter p = parsePARAMETER(parameterE);
+				paramV.add(p);
+			}
+		}
+
+		Element[] paramRefElementA = searchNodes(pMethodE, "PARAMETER.REFERENCE");
+		if (paramRefElementA != null) {
+			for (int i = 0; i < paramRefElementA.length; i++) {
+				Element parameterE = paramRefElementA[i];
+				CIMParameter p = parsePARAMETERREFERENCE(parameterE);
+				paramV.add(p);
+			}
+		}
+
+		Element[] paramArrayElementA = searchNodes(pMethodE, "PARAMETER.ARRAY");
+		if (paramArrayElementA != null) {
+			for (int i = 0; i < paramArrayElementA.length; i++) {
+				Element parameterE = paramArrayElementA[i];
+				CIMParameter p = parsePARAMETERARRAY(parameterE);
+				paramV.add(p);
+			}
+		}
+
+		Element[] paramRefArrayElementA = searchNodes(pMethodE, "PARAMETER.REFARRAY");
+		if (paramRefArrayElementA != null) {
+			for (int i = 0; i < paramRefArrayElementA.length; i++) {
+				Element parameterE = paramRefArrayElementA[i];
+				CIMParameter p = parsePARAMETERREFARRAY(parameterE);
+				paramV.add(p);
+			}
+		}
+
+		return paramV.toArray(new CIMParameter[0]);
+	}
+
+	private static final String nodesMETHOD[] = { "QUALIFIER", "PARAMETER", "PARAMETER.REFERENCE",
+			"PARAMETER.ARRAY", "PARAMETER.REFARRAY" };
+
+	/**
+	 * parseMETHOD
+	 * 
+	 * @param pMethodE
+	 * @return CIMMethod
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMMethod parseMETHOD(Element pMethodE) throws CIMXMLParseException {
+		// 
+		// 
+
+		String name = attribute(pMethodE, "NAME");
+		if (name == null) throw new CIMXMLParseException("METHOD element missing NAME attribute!");
+		EmbObjHandler embObjHandler = new EmbObjHandler(pMethodE);
+		CIMDataType type = embObjHandler.getType();
+		if (type != null && type.isArray()) throw new CIMXMLParseException(
+				"Method's type cannot be Array!");
+		String classOrigin = attribute(pMethodE, "CLASSORIGIN");
+		String propagatedStr = pMethodE.getAttribute("PROPAGATED");
+		boolean propagated = "true".equalsIgnoreCase(propagatedStr);
+
+		checkOtherNodes(pMethodE, nodesMETHOD);
+
+		// PARAMETERS
+		CIMParameter[] params = parseParameters(pMethodE);
+		// CIMMethod(String name, CIMDataType type, CIMQualifier[] qualifiers,
+		// CIMParameter[] parameters, boolean propagated, String originClass)
+		return new CIMMethod(name, type, embObjHandler.getQualifiers(), params, propagated,
+				classOrigin);
+	}
+
+	private static final String nodesPARAMETER[] = { "QUALIFIER" };
+
+	/**
+	 * parsePARAMETER
+	 * 
+	 * @param pParamE
+	 * @return CIMParameter
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMParameter parsePARAMETER(Element pParamE) throws CIMXMLParseException {
+		String name = attribute(pParamE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"PARAMETER element missing NAME attribute!");
+		if (attribute(pParamE, "TYPE") == null) throw new CIMXMLParseException(
+				"PARAMETER element missing TYPE attribute!");
+		checkOtherNodes(pParamE, nodesPARAMETER);
+		EmbObjHandler iEmbObjHandler = new EmbObjHandler(pParamE);
+		// CIMParameter(String name, CIMDataType type, CIMQualifier[]
+		// qualifiers)
+		return new CIMParameter(name, iEmbObjHandler.getType(), iEmbObjHandler
+				.getQualifiers());
+	}
+
+	private static final String nodesPARAMETERREFERENCE[] = { "QUALIFIER" };
+
+	/**
+	 * parsePARAMETERREFERENCE
+	 * 
+	 * @param pParamE
+	 * @return CIMParameter
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMParameter parsePARAMETERREFERENCE(Element pParamE)
+			throws CIMXMLParseException {
+		String name = attribute(pParamE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"PARAMETER.REFERENCE element missing NAME attribute!");
+		String referenceClass = attribute(pParamE, "REFERENCECLASS");
+		CIMDataType type = new CIMDataType(referenceClass != null ? referenceClass : "");
+		checkOtherNodes(pParamE, nodesPARAMETERREFERENCE);
+		// QUALIFIER
+		CIMQualifier[] qualis = parseQUALIFIERS(pParamE);
+		return new CIMParameter(name, type, qualis);
+	}
+
+	private static final String nodesPARAMETERARRAY[] = { "QUALIFIER" };
+
+	/**
+	 * parsePARAMETERARRAY
+	 * 
+	 * @param pParamE
+	 * @return CIMParameter
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMParameter parsePARAMETERARRAY(Element pParamE)
+			throws CIMXMLParseException {
+		String name = attribute(pParamE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"PARAMETER.ARRAY element missing NAME attribute!");
+		if (attribute(pParamE, "TYPE") == null) throw new CIMXMLParseException(
+				"PARAMETER.ARRAY element missing TYPE attribute!");
+		String arraySizeStr = pParamE.getAttribute("ARRAYSIZE");
+		try {
+			if (arraySizeStr.length() > 0) Integer.parseInt(arraySizeStr);
+		} catch (NumberFormatException e) {
+			throw new CIMXMLParseException(arraySizeStr
+					+ " is not a valid ARRAYSIZE attribute for PARAMETER.ARRAY!");
+		}
+		checkOtherNodes(pParamE, nodesPARAMETERARRAY);
+		EmbObjHandler iEmbObjHandler = new EmbObjHandler(pParamE);
+		return new CIMParameter(name, iEmbObjHandler.getArrayType(), iEmbObjHandler
+				.getQualifiers());
+	}
+
+	private static final String nodesPARAMETERREFARRAY[] = { "QUALIFIER" };
+
+	/**
+	 * parsePARAMETERREFARRAY
+	 * 
+	 * @param pParamE
+	 * @return CIMParameter
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMParameter parsePARAMETERREFARRAY(Element pParamE)
+			throws CIMXMLParseException {
+		String name = attribute(pParamE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"PARAMETER.REFARRAY element missing NAME attribute!");
+
+		String referenceClass = attribute(pParamE, "REFERENCECLASS");
+
+		int arraySize = 0; // unlimited
+		String arraySizeStr = pParamE.getAttribute("ARRAYSIZE");
+		try {
+			if (arraySizeStr.length() > 0) arraySize = Integer.parseInt(arraySizeStr);
+		} catch (NumberFormatException e) {
+			throw new CIMXMLParseException(arraySizeStr
+					+ " is not a valid ARRAYSIZE attribute for PARAMETER.REFARRAY!");
+		}
+
+		CIMDataType type = new CIMDataType((referenceClass != null) ? referenceClass : "",
+				arraySize);
+
+		// QUALIFIER
+		checkOtherNodes(pParamE, nodesPARAMETERREFARRAY);
+		CIMQualifier[] qualis = parseQUALIFIERS(pParamE);
+		return new CIMParameter(name, type, qualis);
+	}
+
+	/**
+	 * parseINSTANCE
+	 * 
+	 * @param pInstanceE
+	 * @return CIMInstance
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMInstance parseINSTANCE(Element pInstanceE) throws CIMXMLParseException {
+		return parseINSTANCE(pInstanceE, null);
+	}
+
+	private static final String[] nodesINSTANCE = { "QUALIFIER", "PROPERTY", "PROPERTY.ARRAY",
+			"PROPERTY.REFERENCE" };
+
+	/**
+	 * parseINSTANCE
+	 * 
+	 * @param pInstanceE
+	 * @param pObjPath
+	 * @return CIMInstance
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMInstance parseINSTANCE(Element pInstanceE, CIMObjectPath pObjPath)
+			throws CIMXMLParseException {
+		// 
+		// 
+
+		// BB mod CIMInstance inst = new CIMInstance();
+		String className = attribute(pInstanceE, "CLASSNAME");
+		if (className == null) throw new CIMXMLParseException(
+				"INSTANCE element missing CLASSNAME attribute!");
+		// QUALIFIER
+		// FIXME: in JSR48 CIMInstance doesn't have qualifiers
+		// CIMQualifier[] qualis = parseQUALIFIERS(pInstanceE);
+		// PROPERTY
+		CIMProperty[] props = parsePROPERTIES(pInstanceE);
+
+		checkOtherNodes(pInstanceE, nodesINSTANCE);
+
+		if (pObjPath == null) return new CIMInstance(cLocalPathBuilder.build(className, null),
+				props);
+		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
+				.CIMInstanceWithSynchonizedNumericKeyDataTypes(pObjPath, props);
+		return new CIMInstance(pObjPath, props);
+	}
+
+	/**
+	 * ebak: Access to enclosing method parseQUALIFIERS(Element) from the type
+	 * CIMXMLParserImpl is emulated by a synthetic accessor method. Increasing
+	 * its visibility will improve your performance
+	 * 
+	 * @param pElement
+	 * @return CIMQualifier[]
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMQualifier[] parseQUALIFIERS(Element pElement) throws CIMXMLParseException {
+		Element[] qualiElementA = searchNodes(pElement, "QUALIFIER");
+		CIMQualifier[] qualis;
+		if (qualiElementA != null) {
+			qualis = new CIMQualifier[qualiElementA.length];
+			for (int i = 0; i < qualiElementA.length; i++) {
+				Element qualifierE = qualiElementA[i];
+				qualis[i] = parseQUALIFIER(qualifierE);
+			}
+		} else qualis = null;
+		return qualis;
+	}
+
+	/**
+	 * 
      +	 *  ENTITY % QualifierFlavor "
+	 *  OVERRIDABLE    (true|false)  'true'
+	 *  TOSUBCLASS     (true|false)  'true'
+	 *  TOINSTANCE     (true|false)  'false'
+	 *  TRANSLATABLE   (true|false)  'false'"
+	 * 
      
+	 * 
+	 * @param pElement
+	 * @return int - CIMFlavor bit mixture
+	 */
+	private static int parseFLAVORS(Element pElement) {
+		int flavors = 0;
+		if (!getBoolAttribute(pElement, "OVERRIDABLE", true)) flavors |= CIMFlavor.DISABLEOVERRIDE;
+		if (!getBoolAttribute(pElement, "TOSUBCLASS", true)) flavors |= CIMFlavor.RESTRICTED;
+		if (getBoolAttribute(pElement, "TRANSLATABLE", false)) flavors |= CIMFlavor.TRANSLATE;
+		return flavors;
+	}
+
+	private static TypedValue parseSingleValue(Element pElement) throws CIMXMLParseException {
+		return parseSingleValue(pElement, VALUE | VALUEA);
+	}
+
+	private static final int VALUE = 1, VALUEA = 2, VALUEREF = 4, VALUEREFA = 8;
+
+	private static TypedValue parseSingleValue(Element pElement, int pMask)
+			throws CIMXMLParseException {
+		boolean foundSingleValue = false;
+		String typeStr = attribute(pElement, "TYPE");
+		// ebak: there was an ESS fix in the base implementation
+		if (typeStr == null) typeStr = attribute(pElement, "PARAMTYPE");
+		CIMDataType type = null;
+		Object value = null;
+		if ((pMask & VALUE) > 0) {
+			Element valueE = (Element) searchFirstNode(pElement, "VALUE");
+			if (valueE != null) {
+				TypedValue tVal = parseVALUE(valueE);
+				String valueStr = (String) tVal.getValue();
+				type = typeStr == null ? tVal.getType() : parseScalarTypeStr(typeStr);
+				value = createJavaObject(type == null ? null : type.toString(), valueStr);
+				foundSingleValue = true;
+			}
+		}
+		if (!foundSingleValue && (pMask & VALUEREF) > 0) {
+			// VALUE.REFERENCE
+			Element valuereferenceE = (Element) searchFirstNode(pElement, "VALUE.REFERENCE");
+			if (valuereferenceE != null) {
+				CIMObjectPath op = parseVALUEREFERENCE(valuereferenceE);
+				value = op;
+				type = new CIMDataType(op.getObjectName());
+				foundSingleValue = true;
+			}
+		}
+		if (!foundSingleValue && (pMask & VALUEA) > 0) {
+			// VALUE.ARRAY
+			Element valuearrayE = (Element) searchFirstNode(pElement, "VALUE.ARRAY");
+			if (valuearrayE != null) {
+				TypedValue tValA = parseVALUEARRAY(valuearrayE);
+				type = typeStr == null ? tValA.getType() : parseArrayTypeStr(typeStr);
+				String[] valStrA = (String[]) tValA.getValue();
+				if (valStrA != null) {
+					Object[] values = new Object[valStrA.length];
+					for (int i = 0; i < valStrA.length; i++) {
+						values[i] = createJavaObject(type == null ? null : type.toString(),
+								valStrA[i]);
+					}
+					value = values;
+				}
+				foundSingleValue = true;
+			}
+		}
+		if (!foundSingleValue && (pMask & VALUEREFA) > 0) {
+			// VALUE.REFARRAY
+			Element valueRefArrayE = (Element) searchFirstNode(pElement, "VALUE.REFARRAY");
+			if (valueRefArrayE != null) {
+				type = new CIMDataType("", 0);
+				CIMObjectPath[] opA = parseVALUEREFARRAY(valueRefArrayE);
+				value = opA;
+				foundSingleValue = true;
+			}
+		}
+		if (!foundSingleValue) {
+			if (value instanceof Object[]) type = CIMDataType.STRING_ARRAY_T;
+			else if (value != null) type = CIMDataType.STRING_T;
+			else type = CIMDataType.STRING_T; // /throw new
+			// CIMXMLParseException("null
+			// type with null value!");
+		}
+		return new TypedValue(type, value);
+	}
+
+	private static final String nodesQUALIFIER[] = { "VALUE", "VALUE.ARRAY" };
+
+	/**
+	 * parseQUALIFIER
+	 * 
+	 * @param pQualifierE
+	 * @return CIMQualifier
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMQualifier parseQUALIFIER(Element pQualifierE) throws CIMXMLParseException {
+		// 
+		// 
+
+		String name = attribute(pQualifierE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"QUALIFIER element missing NAME attribute!");
+		String typeStr = attribute(pQualifierE, "TYPE");
+		if (typeStr == null && !hasTypeAttrsInNodes(pQualifierE)) throw new CIMXMLParseException(
+				"QUALIFIER element missing TYPE attribute!");
+		boolean propagated = MOF.TRUE.equalsIgnoreCase(pQualifierE.getAttribute("PROPAGATED"));
+		// FLAVORS
+		int flavors = parseFLAVORS(pQualifierE);
+		// VALUE
+		if (searchNodes(pQualifierE, "VALUE", 0, 1, false) != null
+				|| searchNodes(pQualifierE, "VALUE.ARRAY", 0, 1, false) != null) {
+			TypedValue typedValue = parseSingleValue(pQualifierE);
+			if (typedValue.getType() == null) throw new CIMXMLParseException(
+					"Qualifier's type is null!");
+			// CIMQualifier(String pName, CIMDataType pType, Object pValue, int
+			// pFlavor)
+			return new CIMQualifier(name, typedValue.getType(), typedValue.getValue(),
+					flavors, propagated);
+		}
+		checkOtherNodes(pQualifierE, nodesQUALIFIER);
+
+		CIMDataType type = parseScalarTypeStr(typeStr);
+		return new CIMQualifier(name, type != null ? type : CIMDataType.STRING_T, null,
+				flavors, propagated);
+	}
+
+	/**
+	 * parseQUALIFIERDECLARATION
+	 * 
+	 * @param pQualifierTypeE
+	 * @return CIMQualifierType
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMQualifierType parseQUALIFIERDECLARATION(Element pQualifierTypeE)
+			throws CIMXMLParseException {
+		// 
+		// 
+
+		String name = attribute(pQualifierTypeE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"QUALIFIER.DECLARATION element missing NAME attribute!");
+		String type = attribute(pQualifierTypeE, "TYPE");
+		if (type == null && !hasTypeAttrsInNodes(pQualifierTypeE)) throw new CIMXMLParseException(
+				"QUALIFIER.DECLARATION element missing TYPE attribute!");
+
+		// SCOPES
+		// ebak: there should be only 1 scope node
+		Element scopeElementA[] = searchNodes(pQualifierTypeE, "SCOPE", 0, 1, true);
+		int scopes = scopeElementA == null ? 0 : parseSCOPES(scopeElementA[0]);
+		// QUALIFIERS
+		// CIMQualifier[] qualis = parseQUALIFIERS(pQualifierTypeE);
+
+		CIMDataType qdType;
+		Object qdValue;
+
+		String nodes[] = null;
+
+		if (searchNodes(pQualifierTypeE, "VALUE", 0, 1, true) != null) {
+			nodes = new String[] { "SCOPE", "VALUE" };
+		} else if (searchNodes(pQualifierTypeE, "VALUE.ARRAY", 0, 1, true) != null) {
+			nodes = new String[] { "SCOPE", "VALUE.ARRAY" };
+		}
+
+		// VALUE
+		if (nodes != null) {
+			TypedValue typedValue = parseSingleValue(pQualifierTypeE);
+			qdType = typedValue.getType();
+			qdValue = typedValue.getValue();
+			boolean isArray = hasTrueAttribute(pQualifierTypeE, "ISARRAY");
+			String arraySizeStr = attribute(pQualifierTypeE, "ARRAYSIZE");
+			try {
+				int arraySize = (arraySizeStr == null ? (isArray ? 0 : -1) : Integer
+						.parseInt(arraySizeStr));
+				if (isArray || arraySize >= 0) {
+					qdType = (arraySize > 0) ? new CIMDataType(qdType.getType(), arraySize)
+							: CIMHelper.UnboundedArrayDataType(qdType.getType());
+				}
+			} catch (NumberFormatException e) {
+				throw new CIMXMLParseException(arraySizeStr
+						+ " is not a valid ARRAYSIZE attribute for QUALIFIER.DECLARATION!");
+			}
+		} else {
+			nodes = new String[] { "SCOPE" };
+			qdType = parseScalarTypeStr(type);
+			if (qdType == null) qdType = CIMDataType.STRING_T;
+			qdValue = null;
+		}
+		checkOtherNodes(pQualifierTypeE, nodes);
+
+		// FIXME: ebak: what about the flavors?
+		return new CIMQualifierType(new CIMObjectPath(null, null, null, null, name, null),
+				qdType, qdValue, scopes, 0);
+	}
+
+	private static boolean hasTrueAttribute(Element pElement, String pName) {
+		String valueStr = pElement.getAttribute(pName);
+		return MOF.TRUE.equalsIgnoreCase(valueStr);
+	}
+
+	private static boolean getBoolAttribute(Element pElement, String pName, boolean pDefVal) {
+		String val = pElement.getAttribute(pName);
+		if (MOF.TRUE.equalsIgnoreCase(val)) return true;
+		if (MOF.FALSE.equalsIgnoreCase(val)) return false;
+		return pDefVal;
+	}
+
+	/**
+	 * parseSCOPES
+	 * 
+	 * @param pScopeE
+	 * @return int
+	 */
+	public static int parseSCOPES(Element pScopeE) {
+		int scopes = 0;
+		if (hasTrueAttribute(pScopeE, "CLASS")) scopes |= CIMScope.CLASS;
+		if (hasTrueAttribute(pScopeE, "ASSOCIATION")) scopes |= CIMScope.ASSOCIATION;
+		if (hasTrueAttribute(pScopeE, "REFERENCE")) scopes |= CIMScope.REFERENCE;
+		if (hasTrueAttribute(pScopeE, "PROPERTY")) scopes |= CIMScope.PROPERTY;
+		if (hasTrueAttribute(pScopeE, "METHOD")) scopes |= CIMScope.METHOD;
+		if (hasTrueAttribute(pScopeE, "PARAMETER")) scopes |= CIMScope.PARAMETER;
+		if (hasTrueAttribute(pScopeE, "INDICATION")) scopes |= CIMScope.INDICATION;
+		return scopes;
+	}
+
+	private static Vector> parseClassPropsToVec(Element pElement)
+			throws CIMXMLParseException {
+		Element[] propElementA = searchNodes(pElement, "PROPERTY");
+		Vector> propVec = new Vector>();
+		if (propElementA != null) {
+			for (int i = 0; i < propElementA.length; i++) {
+				Element propertyE = propElementA[i];
+				propVec.add(parseCLASSPROPERTY(propertyE));
+
+			}
+		}
+
+		// PROPERTY.ARRAY
+		Element[] propArrayElementA = searchNodes(pElement, "PROPERTY.ARRAY");
+		if (propArrayElementA != null) {
+			for (int i = 0; i < propArrayElementA.length; i++) {
+				Element propertyarrayE = propArrayElementA[i];
+				propVec.add(parseCLASSPROPERTYARRAY(propertyarrayE));
+			}
+		}
+
+		// PROPERTY.REFERENCE
+		Element[] propRefElementA = searchNodes(pElement, "PROPERTY.REFERENCE");
+		if (propRefElementA != null) {
+			for (int i = 0; i < propRefElementA.length; i++) {
+				Element propertyreferenceE = propRefElementA[i];
+				propVec.add(parseCLASSPROPERTYREFERENCE(propertyreferenceE));
+			}
+		}
+		return propVec;
+	}
+
+	/**
+	 * parsePROPERTIES
+	 * 
+	 * @param pElement
+	 * @return CIMProperty[]
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMProperty[] parsePROPERTIES(Element pElement) throws CIMXMLParseException {
+		Vector> classPropVec = parseClassPropsToVec(pElement);
+		// The following does not convert Vector to
+		// CIMProperty[], it is still CIMClassProperty[]!!! You can treat it
+		// like a CIMProperty (property.getValue(), etc.) but (property
+		// instanceof CIMProperty) will return false!
+		// return classPropVec.toArray(new CIMProperty[0]);
+
+		int arraySize = classPropVec.size();
+		CIMProperty[] retA = new CIMProperty[arraySize];
+		for (int i = 0; i < arraySize; i++) {
+			CIMClassProperty prop = classPropVec.get(i);
+			retA[i] = new CIMProperty(prop.getName(), prop.getDataType(), prop.getValue(),
+					prop.isKey(), prop.isPropagated(), prop.getOriginClass());
+		}
+		return retA;
+	}
+
+	/**
+	 * parseCLASSPROPERTIES
+	 * 
+	 * @param pElement
+	 * @return CIMClassProperty[]
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMClassProperty[] parseCLASSPROPERTIES(Element pElement)
+			throws CIMXMLParseException {
+		Vector> classPropVec = parseClassPropsToVec(pElement);
+		return classPropVec.toArray(new CIMClassProperty[0]);
+	}
+
+	/**
+	 * parsePROPERTY
+	 * 
+	 * @param pPropertyE
+	 * @return CIMProperty
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMProperty parsePROPERTY(Element pPropertyE) throws CIMXMLParseException {
+		return parseCLASSPROPERTY(pPropertyE);
+	}
+
+	private static class EmbObjHandler {
+
+		private CIMQualifier[] iQualiA;
+
+		private boolean iHasEmbObjAttr, iHasEmbInstAttr, iHasEmbObjQuali, iHasEmbInstQuali, iKeyed;
+
+		private CIMDataType iRawType, iType;
+
+		private Object iRawValue, iValue;
+
+		private Element iElement;
+
+		private boolean iStrictParsing = WBEMConfiguration.getGlobalConfiguration()
+				.strictEmbObjTypes();
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pElement
+		 * @throws CIMXMLParseException
+		 */
+		public EmbObjHandler(Element pElement) throws CIMXMLParseException {
+			this.iElement = pElement;
+			handleQualis();
+			handleAttribs();
+			Element valueE = (Element) searchFirstNode(pElement, "VALUE");
+			if (valueE != null) {
+				TypedValue tv = parseVALUE(valueE);
+				if (this.iRawType == null) this.iRawType = tv.getType();
+				if (this.iRawType == null) this.iRawType = CIMDataType.STRING_T;
+				this.iRawValue = tv.getValue();
+			} else {
+				valueE = (Element) searchFirstNode(pElement, "VALUE.ARRAY");
+				if (valueE != null) {
+					TypedValue tv = parseVALUEARRAY(valueE);
+					if (this.iRawType == null) this.iRawType = tv.getType();
+					if (this.iRawType == null) this.iRawType = CIMDataType.STRING_ARRAY_T;
+					this.iRawValue = tv.getValue();
+				}
+			}
+		}
+
+		private void handleQualis() throws CIMXMLParseException {
+			this.iQualiA = parseQUALIFIERS(this.iElement);
+			if (this.iQualiA != null) {
+				for (int idx = 0; idx < this.iQualiA.length; idx++) {
+					String qualiName = this.iQualiA[idx].getName();
+					if ("EmbeddedObject".equalsIgnoreCase(qualiName)) {
+						this.iHasEmbObjQuali = true;
+					} else if ("EMBEDDEDINSTANCE".equalsIgnoreCase(qualiName)) {
+						this.iHasEmbInstQuali = true;
+					} else if ("KEY".equalsIgnoreCase(qualiName)) {
+						this.iKeyed = true;
+					}
+					if ((this.iHasEmbObjQuali || this.iHasEmbInstQuali) && this.iKeyed) return;
+				}
+			}
+		}
+
+		private void handleAttribs() throws CIMXMLParseException {
+			String typeStr = this.iElement.getAttribute("TYPE");
+			if (typeStr == null || typeStr.length() == 0) {
+				typeStr = this.iElement.getAttribute("PARAMTYPE");
+				if (typeStr == null || typeStr.length() == 0) {
+					/*
+					 * throw new CIMXMLParseException( iElement.getNodeName()+"
+					 * must contain a TYPE or PARAMTYPE attribute!" );
+					 */
+					/*
+					 * ebak: Workaround for SVC's TYPE attribute in VALUE and
+					 * VALUE.ARRAY element.
+					 */
+					typeStr = null;
+				}
+			}
+			// ebak: iRawType can be filled from contained VALUE or VALUE.ARRAY
+			// element (SVC)
+			if (typeStr != null) this.iRawType = parseScalarTypeStr(typeStr);
+
+			// DSPs call for EmbeddedObject AND XML is case sensitive, BUT there
+			// are probably CIMOMs out there that still use EMBEDDEDOBJECT
+			String embObjAttrStr = this.iElement.getAttribute("EmbeddedObject");
+			if (embObjAttrStr == null || embObjAttrStr.length() == 0) {
+				embObjAttrStr = this.iElement.getAttribute("EMBEDDEDOBJECT");
+			}
+			if (embObjAttrStr == null || embObjAttrStr.length() == 0) {
+				this.iHasEmbObjAttr = this.iHasEmbInstAttr = false;
+			} else if ("object".equalsIgnoreCase(embObjAttrStr)) {
+				this.iHasEmbObjAttr = true;
+				this.iHasEmbInstAttr = false;
+			} else if ("instance".equalsIgnoreCase(embObjAttrStr)) {
+				this.iHasEmbObjAttr = false;
+				this.iHasEmbInstAttr = true;
+			} else throw new CIMXMLParseException("EmbeddedObject attribute cannot contain \""
+					+ embObjAttrStr + "\" value!");
+		}
+
+		/**
+		 * getQualifiers
+		 * 
+		 * @return CIMQualifier[]
+		 * @throws CIMXMLParseException
+		 */
+		public CIMQualifier[] getQualifiers() throws CIMXMLParseException {
+			transform();
+			CIMQualifiedElementInterfaceImpl qualiImpl = new CIMQualifiedElementInterfaceImpl(
+					this.iQualiA, isKeyed(), this.iType == null
+							|| this.iType.getType() == CIMDataType.STRING);
+			return qualiImpl.getQualifiers();
+		}
+
+		/**
+		 * isKeyed
+		 * 
+		 * @return boolean
+		 */
+		public boolean isKeyed() {
+			return this.iKeyed;
+		}
+
+		/**
+		 * isEmbeddedObject
+		 * 
+		 * @return boolean
+		 */
+		private boolean isEmbeddedObject() {
+			return this.iHasEmbObjAttr || this.iHasEmbInstAttr || this.iHasEmbObjQuali
+					|| this.iHasEmbInstQuali;
+		}
+
+		/**
+		 * isEmbeddedClass
+		 * 
+		 * @return boolean
+		 */
+		private boolean isEmbeddedClass() {
+			return this.iHasEmbObjAttr || this.iHasEmbObjQuali;
+		}
+
+		/**
+		 * isEmbeddedInstance
+		 * 
+		 * @return boolean
+		 */
+		private boolean isEmbeddedInstance() {
+			return this.iHasEmbInstAttr || this.iHasEmbInstQuali;
+		}
+
+		/**
+		 * getType
+		 * 
+		 * @return CIMDataType
+		 * @throws CIMXMLParseException
+		 */
+		public CIMDataType getType() throws CIMXMLParseException {
+			transform();
+			return this.iType;
+		}
+
+		/**
+		 * getArrayType
+		 * 
+		 * @return CIMDataType
+		 * @throws CIMXMLParseException
+		 */
+		public CIMDataType getArrayType() throws CIMXMLParseException {
+			transform();
+			return this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
+					.getType());
+		}
+
+		/**
+		 * getValue
+		 * 
+		 * @return Object
+		 * @throws CIMXMLParseException
+		 */
+		public Object getValue() throws CIMXMLParseException {
+			transform();
+			return this.iValue;
+		}
+
+		private void transform() throws CIMXMLParseException {
+			if (this.iType != null) return;
+			if (this.iRawValue == null) {
+				if (isEmbeddedObject()) {
+					if (this.iRawType != CIMDataType.STRING_T) throw new CIMXMLParseException(
+							"Embedded Object CIM-XML element's type must be string. "
+									+ this.iRawType + " is invalid!");
+					if (this.iStrictParsing) {
+						/*
+						 * In case of strict parsing Object means CIMClass,
+						 * Instance means CIMInstance. Pegasus 2.7.0 seems to
+						 * handle it this way.
+						 */
+						this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T
+								: CIMDataType.CLASS_T;
+					} else {
+						/*
+						 * for valueless EmbeddedObject="object" the type is
+						 * undeterminable since Pegasus's CIMObject can contain
+						 * both CIMClass and CIMInstance
+						 */
+						this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T
+								: CIMDataType.STRING_T;
+					}
+				} else {
+					this.iType = this.iRawType;
+				}
+				this.iValue = null;
+			} else {
+				if (isEmbeddedObject()) {
+					transformEmbObj();
+				} else {
+					transformNormObj();
+				}
+			}
+		}
+
+		private void transformEmbObj() throws CIMXMLParseException {
+			if (this.iRawValue instanceof String) {
+				this.iValue = parseXmlStr((String) this.iRawValue);
+				this.iType = getCIMObjType(this.iValue);
+			} else {
+				this.iValue = parseXmlStrA((String[]) this.iRawValue);
+				this.iType = getCIMObjAType((Object[]) this.iValue);
+			}
+			if (isEmbeddedInstance() && this.iType.getType() != CIMDataType.OBJECT) throw new CIMXMLParseException(
+					this.iElement.getNodeName()
+							+ " element is an EmbeddedInstance with non INSTANCE value. "
+							+ "It's not valid!");
+			if (isEmbeddedClass() && this.iType.getType() != CIMDataType.CLASS
+					&& this.iType.getType() != CIMDataType.OBJECT) throw new CIMXMLParseException(
+					this.iElement.getNodeName()
+							+ " element is an EmbeddedObject with non CLASS/INSTANCE value. It's not valid!");
+		}
+
+		private void transformNormObj() throws CIMXMLParseException {
+			if (this.iRawValue instanceof String) {
+				this.iType = this.iRawType;
+				this.iValue = createJavaObject(this.iType == null ? null : this.iType.toString(),
+						(String) this.iRawValue);
+			} else {
+				String[] rawValueA = (String[]) this.iRawValue;
+				String typeStr = this.iRawType.toString();
+				Object[] objA = new Object[rawValueA.length];
+				for (int i = 0; i < objA.length; i++)
+					objA[i] = createJavaObject(typeStr, rawValueA[i]);
+				this.iType = CIMHelper.UnboundedArrayDataType(this.iRawType.getType());
+				this.iValue = objA;
+			}
+		}
+
+		/**
+		 * parseXmlStr
+		 * 
+		 * @param pXmlStr
+		 * @return CIMClass or CIMInstance
+		 * @throws CIMXMLParseException
+		 */
+		public static Object parseXmlStr(String pXmlStr) throws CIMXMLParseException {
+			// ebak: workaround for null array elements -> parse empty EmbObj
+			// string as null
+			if (pXmlStr == null || pXmlStr.length() == 0) return null;
+			try {
+				CIMClientXML_HelperImpl builder = new CIMClientXML_HelperImpl();
+				Document doc = builder.parse(new InputSource(new StringReader(pXmlStr)));
+				return parseObject(doc.getDocumentElement());
+			} catch (CIMXMLParseException e) {
+				throw e;
+			} catch (Exception e) {
+				throw new CIMXMLParseException(e.getMessage() + "\npXmlStr=" + pXmlStr);
+			}
+		}
+
+		/**
+		 * parseXmlStrA
+		 * 
+		 * @param pXmlStrA
+		 * @return Object[]
+		 * @throws CIMXMLParseException
+		 */
+		public static Object[] parseXmlStrA(String[] pXmlStrA) throws CIMXMLParseException {
+			if (pXmlStrA == null || pXmlStrA.length == 0) return null;
+			Object[] objA = new Object[pXmlStrA.length];
+			for (int i = 0; i < objA.length; i++) {
+				String xmlStr = pXmlStrA[i];
+				objA[i] = xmlStr == null ? null : parseXmlStr(xmlStr);
+			}
+			return objA;
+		}
+
+		/**
+		 * getCIMObjType
+		 * 
+		 * @param pCIMObj
+		 * @return CIMDataType
+		 * @throws CIMXMLParseException
+		 */
+		public static CIMDataType getCIMObjType(Object pCIMObj) throws CIMXMLParseException {
+			if (pCIMObj == null) throw new CIMXMLParseException(
+					"cannot have null CIM object! (CIMClass or CIMInstance)");
+			if (pCIMObj instanceof CIMInstance) return CIMDataType.OBJECT_T;
+			if (pCIMObj instanceof CIMClass) return CIMDataType.CLASS_T;
+			throw new CIMXMLParseException(pCIMObj.getClass().getName()
+					+ " is not a CIM object! (CIMClass or CIMInstance)");
+		}
+
+		/**
+		 * getCIMObjAType
+		 * 
+		 * @param pCIMObjA
+		 * @return CIMDataType
+		 * @throws CIMXMLParseException
+		 */
+		public static CIMDataType getCIMObjAType(Object[] pCIMObjA) throws CIMXMLParseException {
+			if (pCIMObjA == null || pCIMObjA.length == 0) return CIMDataType.STRING_ARRAY_T;
+			CIMDataType type = null;
+			for (int i = 0; i < pCIMObjA.length; i++) {
+				if (pCIMObjA[i] == null) continue;
+				CIMDataType currType = getCIMObjType(pCIMObjA[i]);
+				if (type == null) {
+					type = currType;
+				} else if (type != currType) { throw new CIMXMLParseException(
+						"Embedded Object arrays with different types are not supported"); }
+			}
+			if (type == CIMDataType.OBJECT_T) return CIMDataType.OBJECT_ARRAY_T;
+			if (type == CIMDataType.CLASS_T) return CIMDataType.CLASS_ARRAY_T;
+			return CIMDataType.STRING_ARRAY_T;
+		}
+
+	}
+
+	private static final String nodesPROPERTY[] = { "QUALIFIER", "VALUE" };
+
+	/**
+	 * parseCLASSPROPERTY
+	 * 
+	 * @param pPropertyE
+	 * @return CIMClassProperty
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMClassProperty parseCLASSPROPERTY(Element pPropertyE)
+			throws CIMXMLParseException {
+		// 
+		// 
+
+		Attr property_nameA = (Attr) searchAttribute(pPropertyE, "NAME");
+		if (property_nameA == null) throw new CIMXMLParseException(
+				"PROPERTY element missing NAME attribute!");
+		String name = property_nameA.getNodeValue();
+		if (attribute(pPropertyE, "TYPE") == null && !hasTypeAttrsInNodes(pPropertyE)) throw new CIMXMLParseException(
+				"PROPERTY element missing TYPE attribute!");
+
+		String classOrigin = pPropertyE.getAttribute("CLASSORIGIN");
+		if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
+
+		String propagatedStr = pPropertyE.getAttribute("PROPAGATED");
+		boolean propagated = MOF.TRUE.equalsIgnoreCase(propagatedStr);
+
+		// only QUALIFIER(s) and 0/1 VALUE
+		searchNodes(pPropertyE, "VALUE", 0, 1, true);
+		checkOtherNodes(pPropertyE, nodesPROPERTY);
+
+		// QUALIFIER
+		// ebak: EmbeddedObject support
+		EmbObjHandler embObjHandler = new EmbObjHandler(pPropertyE);
+		/*
+		 * CIMClassProperty(String pName, CIMDataType pType, Object pValue,
+		 * CIMQualifier[] pQualifiers, boolean pKey, boolean propagated, String
+		 * originClass)
+		 */
+		return new CIMClassProperty(name, embObjHandler.getType(),
+				embObjHandler.getValue(), embObjHandler.getQualifiers(), embObjHandler.isKeyed(),
+				propagated, classOrigin);
+	}
+
+	/**
+	 * parsePROPERTYARRAY
+	 * 
+	 * @param pPropertyArrayE
+	 * @return CIMProperty
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMProperty parsePROPERTYARRAY(Element pPropertyArrayE)
+			throws CIMXMLParseException {
+		return parseCLASSPROPERTYARRAY(pPropertyArrayE);
+	}
+
+	private static final String nodesPROPERTYARRAY[] = { "QUALIFIER", "VALUE.ARRAY" };
+
+	/**
+	 * parseCLASSPROPERTYARRAY
+	 * 
+	 * @param pPropArrayE
+	 * @return CIMClassProperty
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMClassProperty parseCLASSPROPERTYARRAY(Element pPropArrayE)
+			throws CIMXMLParseException {
+		// 
+		// 
+
+		String name = attribute(pPropArrayE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"PROPERTY.ARRAY element missing NAME attribute!");
+		if (attribute(pPropArrayE, "TYPE") == null && !hasTypeAttrsInNodes(pPropArrayE)) throw new CIMXMLParseException(
+				"PROPERTY.ARRAY element missing TYPE attribute!");
+
+		String valueArraysizeStr = pPropArrayE.getAttribute("ARRAYSIZE");
+		try {
+			if (valueArraysizeStr.length() > 0) Integer.parseInt(valueArraysizeStr);
+		} catch (NumberFormatException e) {
+			throw new CIMXMLParseException(valueArraysizeStr
+					+ " is not a valid ARRAYSIZE attribute for VALUE.ARRAY!");
+		}
+
+		String classOrigin = pPropArrayE.getAttribute("CLASSORIGIN");
+		if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
+
+		String valuePropagatedStr = pPropArrayE.getAttribute("PROPAGATED");
+		boolean propagated = (valuePropagatedStr != null && valuePropagatedStr
+				.equalsIgnoreCase(MOF.TRUE));
+
+		// only QUALIFIER(s) and 0/1 VALUE.ARRAY
+		searchNodes(pPropArrayE, "VALUE.ARRAY", 0, 1, true);
+		checkOtherNodes(pPropArrayE, nodesPROPERTYARRAY);
+
+		// QUALIFIER
+		// ebak: EmbeddedObject support
+		EmbObjHandler embObjHandler = new EmbObjHandler(pPropArrayE);
+		return new CIMClassProperty(name, embObjHandler.getArrayType(), embObjHandler
+				.getValue(), embObjHandler.getQualifiers(), embObjHandler.isKeyed(), propagated,
+				classOrigin);
+	}
+
+	/**
+	 * parsePROPERTYREFERENCE
+	 * 
+	 * @param pPropRefE
+	 * @return CIMProperty
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMProperty parsePROPERTYREFERENCE(Element pPropRefE)
+			throws CIMXMLParseException {
+		return parseCLASSPROPERTYREFERENCE(pPropRefE);
+	}
+
+	private static final String nodesPROPERTYREFERENCE[] = { "QUALIFIER", "VALUE.REFERENCE" };
+
+	/**
+	 * parseCLASSPROPERTYREFERENCE
+	 * 
+	 * @param pPropRefE
+	 * @return CIMClassProperty
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMClassProperty parseCLASSPROPERTYREFERENCE(Element pPropRefE)
+			throws CIMXMLParseException {
+		// 
+		// 
+
+		String name = attribute(pPropRefE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"PROPERTY.REFERENCE element missing NAME attribute!");
+
+		String classOrigin = pPropRefE.getAttribute("CLASSORIGIN");
+		if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
+
+		String referenceClass = pPropRefE.getAttribute("REFERENCECLASS");
+
+		String propagatedStr = pPropRefE.getAttribute("PROPAGATED");
+		boolean propagated = MOF.TRUE.equalsIgnoreCase(propagatedStr);
+
+		// QUALIFIER
+		CIMQualifier[] qualis = parseQUALIFIERS(pPropRefE);
+
+		CIMDataType type = new CIMDataType(referenceClass != null ? referenceClass : "");
+		// VALUE.REFERENCE
+		Element valueRefA[] = searchNodes(pPropRefE, "VALUE.REFERENCE", 0, 1, true);
+		Object value = valueRefA != null ? parseVALUEREFERENCE(valueRefA[0]) : null;
+
+		// return a CIMProperty without a CIMValue
+		checkOtherNodes(pPropRefE, nodesPROPERTYREFERENCE);
+		CIMQualifiedElementInterfaceImpl qualiImpl = new CIMQualifiedElementInterfaceImpl(qualis);
+		return new CIMClassProperty(name, type, value, qualis, qualiImpl.isKeyed(),
+				propagated, classOrigin);
+	}
+
+	/**
+	 * parseMESSAGE
+	 * 
+	 * @param pCimVersion
+	 * @param pDtdVersion
+	 * @param pMessageE
+	 * @return CIMMessage
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMMessage parseMESSAGE(String pCimVersion, String pDtdVersion, Element pMessageE)
+			throws CIMXMLParseException {
+		// 
+		// 
+
+		Attr idA = (Attr) searchAttribute(pMessageE, "ID");
+		if (idA == null) throw new CIMXMLParseException("MESSAGE element missing ID attribute!");
+		String id = idA.getNodeValue();
+
+		Attr protocolA = (Attr) searchAttribute(pMessageE, "PROTOCOLVERSION");
+		if (protocolA == null) throw new CIMXMLParseException(
+				"MESSAGE element missing PROTOCOLVERSION attribute!");
+		// TODO
+		if (pCimVersion.equals("2.0") && pDtdVersion.equals("2.0")) {
+
+			// Attr message_idA = (Attr)searchAttribute(messageE, "ID");
+			// String messadeID = message_idA.getNodeValue();
+
+			// Attr message_protocolversionA = (Attr)searchAttribute(messageE,
+			// "PROTOCOLVERSION");
+			// String protocolversion = message_protocolversionA.getNodeValue();
+
+			// SIMPLERSP
+			Element simplerspA[] = searchNodes(pMessageE, "SIMPLERSP", 0, 1, false);
+			if (simplerspA != null) {
+				CIMResponse response = parseSIMPLERSP(simplerspA[0]);
+				response.setMethod("SIMPLERSP");
+				response.setId(id);
+				return response;
+			}
+			Element multirspA[] = searchNodes(pMessageE, "MULTIRSP", 0, 1, false);
+			if (multirspA != null) {
+				CIMResponse response = parseMULTIRSP(multirspA[0]);
+				response.setMethod("MULTIRSP");
+				response.setId(id);
+				return response;
+			}
+			// SIMPLEEXPREQ
+			Element simpleexpreqA[] = searchNodes(pMessageE, "SIMPLEEXPREQ", 0, 1, false);
+			if (simpleexpreqA != null) {
+				CIMRequest request = parseSIMPLEEXPREQ(simpleexpreqA[0]);
+				request.setMethod("SIMPLEEXPREQ");
+				request.setId(id);
+				return request;
+			}
+
+			// MULTIEXPREQ
+			Element multiexpreqA[] = searchNodes(pMessageE, "MULTIEXPREQ", 0, 1, false);
+			if (multiexpreqA != null) {
+				CIMRequest request = parseMULTIEXPREQ(multiexpreqA[0]);
+				request.setMethod("MULTIEXPREQ");
+				request.setId(id);
+				return request;
+			}
+			// SIMPLEEXPRSP
+			Element simpleexprspA[] = searchNodes(pMessageE, "SIMPLEEXPRSP", 0, 1, false);
+			if (simpleexprspA != null) {
+				CIMResponse response = parseSIMPLEEXPRSP(simpleexprspA[0]);
+				response.setMethod("SIMPLEEXPRSP");
+				response.setId(id);
+				return response;
+			}
+			// MULTIEXPRSP
+			Element multiexprspA[] = searchNodes(pMessageE, "MULTIEXPRSP", 0, 1, false);
+			if (multiexprspA != null) {
+				CIMResponse response = parseMULTIEXPRSP(multiexprspA[0]);
+				response.setMethod("MULTIEXPRSP");
+				response.setId(id);
+				return response;
+			}
+
+			// SIMPLEREQ
+			Element simplereqA[] = searchNodes(pMessageE, "SIMPLEREQ", 0, 1, false);
+			if (simplereqA != null) {
+				CIMRequest request = parseSIMPLEREQ(simplereqA[0]);
+				request.setMethod("SIMPLEREQ");
+				request.setId(id);
+				return request;
+			}
+
+			// MULTIREQ
+			Element multireqA[] = searchNodes(pMessageE, "MULTIREQ", 0, 1, false);
+			if (multireqA != null) {
+				CIMRequest request = parseMULTIREQ(multireqA[0]);
+				request.setMethod("MULTIREQ");
+				request.setId(id);
+				return request;
+			}
+			throw new CIMXMLParseException("MESSAGE element missing required child element!");
+		}
+		// TODO, look for the specific error message in the spec
+		throw new CIMXMLParseException("DTD not supported");
+	}
+
+	private static final String nodesPARAMVALUE[] = { "VALUE", "VALUE.REFERENCE", "VALUE.ARRAY",
+			"VALUE.REFARRAY", "CLASSNAME", "INSTANCENAME", "CLASS", "INSTANCE",
+			"VALUE.NAMEDINSTANCE" };
+
+	/**
+	 * parsePARAMVALUE
+	 * 
+	 * @param pParamValueE
+	 * @return CIMArgument
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMArgument parsePARAMVALUE(Element pParamValueE)
+			throws CIMXMLParseException {
+		// )
+		// 
+		String name = attribute(pParamValueE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"PARAMVALUE element missing NAME attribute!");
+		// FIXME: ebak: The base implementation didn't contain VALUE.REFARRAY
+		// handling. Why?
+		// ebak: embedded object support, different parsing for VALUE and
+		// VALUE.ARRAY sub elements
+		if (searchNodes(pParamValueE, "VALUE.REFERENCE", 0, 1, false) != null
+				|| searchNodes(pParamValueE, "VALUE.REFARRAY", 0, 1, false) != null) {
+			TypedValue typedValue = parseSingleValue(pParamValueE, VALUEREF | VALUEREFA);
+			CIMDataType type = typedValue.getType();
+			Object value = typedValue.getValue();
+			if (type == null) throw new CIMXMLParseException("PARAMVALUE element type is null!");
+			return new CIMArgument(name, type, value);
+		}
+		if (searchNodes(pParamValueE, "VALUE", 0, 1, false) != null
+				|| searchNodes(pParamValueE, "VALUE.ARRAY", 0, 1, false) != null
+				|| !hasNodes(pParamValueE)) {
+			EmbObjHandler embObjHandler = new EmbObjHandler(pParamValueE);
+			return new CIMArgument(name, embObjHandler.getType(), embObjHandler.getValue());
+		}
+
+		// CLASSNAME
+		Element classNameA[] = searchNodes(pParamValueE, "CLASSNAME", 0, 1, false);
+		if (classNameA != null) {
+			CIMObjectPath op = parseCLASSNAME(classNameA[0]);
+			CIMDataType type = new CIMDataType(op.getObjectName());
+			return new CIMArgument(name, type, op);
+		}
+
+		// INSTANCENAME
+		Element instNameA[] = searchNodes(pParamValueE, "INSTANCENAME", 0, 1, false);
+		if (instNameA != null) {
+			CIMObjectPath op = parseINSTANCENAME(instNameA[0]);
+			CIMDataType type = new CIMDataType(op.getObjectName());
+			return new CIMArgument(name, type, op);
+		}
+
+		// CLASS
+		Element classA[] = searchNodes(pParamValueE, "CLASS", 0, 1, false);
+		if (classA != null) {
+			CIMClass cl = parseCLASS(classA[0]);
+			return new CIMArgument(name, CIMDataType.CLASS_T, cl);
+		}
+
+		// INSTANCE
+		Element instanceA[] = searchNodes(pParamValueE, "INSTANCE", 0, 1, false);
+		if (instanceA != null) {
+			CIMInstance inst = parseINSTANCE(instanceA[0]);
+			return new CIMArgument(name, CIMDataType.OBJECT_T, inst);
+		}
+
+		// VALUE.NAMEDINSTANCE
+		Element valuenamedisntanceA[] = searchNodes(pParamValueE, "VALUE.NAMEDINSTANCE", 0, 1,
+				false);
+		if (valuenamedisntanceA != null) {
+			CIMInstance inst = parseVALUENAMEDINSTANCE(valuenamedisntanceA[0]);
+			return new CIMArgument(name, CIMDataType.OBJECT_T, inst);
+		}
+		checkOtherNodes(pParamValueE, nodesPARAMVALUE);
+		return new CIMArgument(name, CIMDataType.STRING_T, null);
+	}
+
+	private static final String nodesIPARAMVALUE[] = { "VALUE", "VALUE.ARRAY", "VALUE.REFERENCE",
+			"CLASSNAME", "INSTANCENAME", "QUALIFIER.DECLARATION", "CLASS", "INSTANCE",
+			"VALUE.NAMEDINSTANCE" };
+
+	/**
+	 * parseIPARAMVALUE
+	 * 
+	 * @param pParamValueE
+	 * @return CIMArgument
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMArgument parseIPARAMVALUE(Element pParamValueE)
+			throws CIMXMLParseException {
+		// 
+		// 
+
+		String name = attribute(pParamValueE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"IPARAMVALUE element missing NAME attribute!");
+		// this can parse VALUE, VALUE.ARRAY and VALUE.REFERENCE
+		if (searchNodes(pParamValueE, "VALUE", 0, 1, false) != null
+				|| searchNodes(pParamValueE, "VALUE.ARRAY", 0, 1, false) != null
+				|| searchNodes(pParamValueE, "VALUE.REFERENCE", 0, 1, false) != null) {
+			TypedValue typedValue = parseSingleValue(pParamValueE, VALUE | VALUEA | VALUEREF);
+			if (typedValue.getType() != null) { return new CIMArgument(name, typedValue
+					.getType(), typedValue.getValue()); }
+		}
+		// we can have different types too which cannot be handled by
+		// parseSingleValue()
+
+		// INSTANCENAME
+		Element instNameA[] = searchNodes(pParamValueE, "INSTANCENAME", 0, 1, false);
+		if (instNameA != null) {
+			CIMObjectPath op = parseINSTANCENAME(instNameA[0]);
+			CIMDataType type = new CIMDataType(op.getObjectName());
+			return new CIMArgument(name, type, op);
+		}
+
+		// CLASSNAME
+		Element classNameA[] = searchNodes(pParamValueE, "CLASSNAME", 0, 1, false);
+		if (classNameA != null) {
+			CIMObjectPath op = parseCLASSNAME(classNameA[0]);
+			CIMDataType type = new CIMDataType(op.getObjectName());
+			return new CIMArgument(name, type, op);
+		}
+
+		// QUALIFIER.DECLARATION
+		Element qualiDeclarationA[] = searchNodes(pParamValueE, "QUALIFIER.DECLARATION", 0, 1,
+				false);
+		if (qualiDeclarationA != null) {
+			CIMQualifierType qualiType = parseQUALIFIERDECLARATION(qualiDeclarationA[0]);
+			// FIXME: ebak: Does it surely have to be mapped to type:
+			// REFERENCE????
+			return new CIMArgument(name, new CIMDataType(qualiType.getName()), qualiType);
+		}
+
+		// CLASS
+		Element classA[] = searchNodes(pParamValueE, "CLASS", 0, 1, false);
+		if (classA != null) {
+			CIMClass cl = parseCLASS(classA[0]);
+			return new CIMArgument(name, CIMDataType.CLASS_T, cl);
+		}
+
+		// INSTANCE
+		Element instanceA[] = searchNodes(pParamValueE, "INSTANCE", 0, 1, false);
+		if (instanceA != null) {
+			CIMInstance inst = parseINSTANCE(instanceA[0]);
+			return new CIMArgument(name, CIMDataType.OBJECT_T, inst);
+		}
+
+		// VALUE.NAMEDINSTANCE
+		Element valuenamedisntanceA[] = searchNodes(pParamValueE, "VALUE.NAMEDINSTANCE", 0, 1,
+				false);
+		if (valuenamedisntanceA != null) {
+			CIMInstance inst = parseVALUENAMEDINSTANCE(valuenamedisntanceA[0]);
+			return new CIMArgument(name, CIMDataType.OBJECT_T, inst);
+		}
+
+		checkOtherNodes(pParamValueE, nodesIPARAMVALUE);
+		return new CIMArgument(name, CIMDataType.STRING_T, null);
+	}
+
+	/**
+	 * parseSIMPLERSP
+	 * 
+	 * @param pSimpleRspE
+	 * @return CIMResponse
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMResponse parseSIMPLERSP(Element pSimpleRspE) throws CIMXMLParseException {
+		// 
+
+		// METHODRESPONSE
+		Element methodresponseA[] = searchNodes(pSimpleRspE, "METHODRESPONSE", 0, 1, false);
+		if (methodresponseA != null) {
+
+		return parseMETHODRESPONSE(methodresponseA[0]); }
+
+		// IMETHODRESPONSE
+		Element imethodresponseA[] = searchNodes(pSimpleRspE, "IMETHODRESPONSE", 0, 1, false);
+		if (imethodresponseA != null) { return parseIMETHODRESPONSE(imethodresponseA[0]); }
+
+		throw new CIMXMLParseException("SIMPLERSP element missing required child element!");
+	}
+
+	/**
+	 * parseMULTIRSP
+	 * 
+	 * @param pSimpleRspE
+	 * @return CIMResponse
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMResponse parseMULTIRSP(Element pSimpleRspE) throws CIMXMLParseException {
+		// 
+
+		Element[] multiRespElementA = searchNodes(pSimpleRspE, "SIMPLERSP", 2, Integer.MAX_VALUE,
+				false);
+		if (multiRespElementA != null) {
+			CIMResponse multiRsp = new CIMResponse();
+			for (int i = 0; i < multiRespElementA.length; i++) {
+				Element methodresponseE = multiRespElementA[i];
+				CIMResponse rsp = parseSIMPLERSP(methodresponseE);
+				rsp.setMethod("SIMPLERSP");
+				multiRsp.addResponse(rsp);
+			}
+			return multiRsp;
+		}
+
+		throw new CIMXMLParseException("MULTIRSP element missing SIMPLERSP child element!");
+	}
+
+	private static final String nodesSIMPLEREQ[] = { "CORRELATOR", "METHODCALL", "IMETHODCALL" };
+
+	/**
+	 * parseSIMPLEREQ
+	 * 
+	 * @param pSimpleReqE
+	 * @return CIMRequest
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMRequest parseSIMPLEREQ(Element pSimpleReqE) throws CIMXMLParseException {
+		// 
+		CIMRequest request = null;
+
+		// METHODCALL
+		Element methodcallA[] = searchNodes(pSimpleReqE, "METHODCALL", 0, 1, true);
+		if (methodcallA != null) {
+			request = parseMETHODCALL(methodcallA[0]);
+		}
+
+		// IMETHODCALL
+		Element imethodcallA[] = searchNodes(pSimpleReqE, "IMETHODCALL", 0, 1, true);
+		if (imethodcallA != null) {
+			if (request != null) { throw new CIMXMLParseException(
+					"SIMPLEREQ element cannot have METHODCALL and IMETHODCALL child elements!"); }
+			request = parseIMETHODCALL(imethodcallA[0]);
+		}
+
+		if (request == null) throw new CIMXMLParseException(
+				"SIMPLEREQ element missing required child element!");
+
+		// CORRELATOR
+		Element[] correlatorA = searchNodes(pSimpleReqE, "CORRELATOR", 0, Integer.MAX_VALUE, true);
+		if (correlatorA != null) {
+			for (int i = 0; i < correlatorA.length; i++)
+				// TODO: return to WBEMClient API if JSR48 changes
+				parseCORRELATOR(correlatorA[i]);
+		}
+
+		checkOtherNodes(pSimpleReqE, nodesSIMPLEREQ);
+		return request;
+	}
+
+	/**
+	 * parseMULTIREQ
+	 * 
+	 * @param pMultiReqE
+	 * @return CIMRequest
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMRequest parseMULTIREQ(Element pMultiReqE) throws CIMXMLParseException {
+		// 
+
+		Element[] methodReqElementA = searchNodes(pMultiReqE, "SIMPLEREQ", 2, Integer.MAX_VALUE,
+				false);
+		if (methodReqElementA != null) {
+			CIMRequest multiReq = new CIMRequest();
+			for (int i = 0; i < methodReqElementA.length; i++) {
+				Element methodrequestE = methodReqElementA[i];
+				CIMRequest req = parseSIMPLEREQ(methodrequestE);
+				req.setMethod("SIMPLEREQ");
+
+				multiReq.addRequest(req);
+			}
+			return multiReq;
+		}
+		throw new CIMXMLParseException("MULTIREQ element missing SIMPLEREQ child element!");
+	}
+
+	private static final String nodesMETHODCALL[] = { "LOCALCLASSPATH", "LOCALINSTANCEPATH",
+			"PARAMVALUE" };
+
+	/**
+	 * parseMETHODCALL
+	 * 
+	 * @param pMethodCallE
+	 * @return CIMRequest
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMRequest parseMETHODCALL(Element pMethodCallE) throws CIMXMLParseException {
+		// 
+		// 
+
+		CIMRequest request = new CIMRequest();
+		String methodname = attribute(pMethodCallE, "NAME");
+		if (methodname == null) throw new CIMXMLParseException(
+				"METHODCALL element missing NAME attribute!");
+		request.setMethodName(methodname);
+
+		// EXPMETHODCALL
+		boolean localclasspathFound = false;
+		Element localclasspathA[] = searchNodes(pMethodCallE, "LOCALCLASSPATH", 0, 1, true);
+		if (localclasspathA != null) {
+			CIMObjectPath path = parseLOCALCLASSPATH(localclasspathA[0]);
+
+			request.setObjectPath(path);
+			localclasspathFound = true;
+		}
+
+		Element localinstancepathA[] = searchNodes(pMethodCallE, "LOCALINSTANCEPATH", 0, 1, true);
+		if (localinstancepathA != null) {
+			if (localclasspathFound) throw new CIMXMLParseException(
+					"METHODCALL element cannot have both LOCALCLASSPATH and LOCALINSTANCEPATH child elements!");
+
+			CIMObjectPath path = parseLOCALINSTANCEPATH(localinstancepathA[0]);
+
+			request.setObjectPath(path);
+		} else {
+			if (!localclasspathFound) throw new CIMXMLParseException(
+					"METHODCALL element missing required child element!");
+		}
+
+		Element[] paramValueElementA = searchNodes(pMethodCallE, "PARAMVALUE", 0,
+				Integer.MAX_VALUE, true);
+
+		if (paramValueElementA != null) {
+			CIMArgument[] argA = new CIMArgument[paramValueElementA.length];
+			for (int i = 0; i < paramValueElementA.length; i++) {
+				Element paramvalueE = paramValueElementA[i];
+				argA[i] = parsePARAMVALUE(paramvalueE);
+			}
+			request.addParamValue(argA);
+		}
+
+		checkOtherNodes(pMethodCallE, nodesMETHODCALL);
+		return request;
+	}
+
+	private static final String nodesIMETHODCALL[] = { "LOCALNAMESPACEPATH", "IPARAMVALUE" };
+
+	/**
+	 * parseIMETHODCALL
+	 * 
+	 * @param pIMethodCallE
+	 * @return CIMRequest
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMRequest parseIMETHODCALL(Element pIMethodCallE) throws CIMXMLParseException {
+		// 
+		// 
+
+		CIMRequest request = new CIMRequest();
+		String methodname = attribute(pIMethodCallE, "NAME"); // ebak:
+		// CIMName->NAME
+		if (methodname == null) throw new CIMXMLParseException(
+				"IMETHODCALL element missing NAME attribute!");
+		request.setMethodName(methodname);
+
+		// METHODCALL
+		Element localnamespacepathA[] = searchNodes(pIMethodCallE, "LOCALNAMESPACEPATH", 1, 1, true);
+		if (localnamespacepathA != null) {
+			String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
+			request.setNameSpace(nameSpace);
+		}
+
+		Element[] iParamValElementA = searchNodes(pIMethodCallE, "IPARAMVALUE", 0,
+				Integer.MAX_VALUE, true); // ebak:
+		// PARAMVALUE->IPARAMVALUE
+
+		if (iParamValElementA != null) {
+			CIMArgument[] argA = new CIMArgument[iParamValElementA.length];
+			for (int i = 0; i < iParamValElementA.length; i++) {
+				Element paramvalueE = iParamValElementA[i];
+				CIMArgument arg = parseIPARAMVALUE(paramvalueE);
+				/*
+				 * ebak: local nameSpacePath should be added to those reference
+				 * arguments which don't contain namespace
+				 */
+				Object value = arg.getValue();
+				if (value instanceof CIMObjectPath) {
+					CIMObjectPath op = (CIMObjectPath) value;
+					if (op.getNamespace() == null || op.getNamespace().length() == 0) {
+						arg = new CIMArgument(arg.getName(), arg.getDataType(),
+						// CIMObjectPath(String scheme, String host, String
+								// port, String namespace, String objectName,
+								// CIMProperty[] keys)
+								new CIMObjectPath(op.getScheme(), op.getHost(), op.getPort(),
+										request.getNameSpace(), op.getObjectName(), op.getKeys()));
+					}
+				}
+				argA[i] = arg;
+			}
+			request.addParamValue(argA);
+		}
+
+		checkOtherNodes(pIMethodCallE, nodesIMETHODCALL);
+		return request;
+	}
+
+	private static final String nodesSIMPLEEXPREQ[] = { "CORRELATOR", "EXPMETHODCALL" };
+
+	/**
+	 * parseSIMPLEEXPREQ
+	 * 
+	 * @param pSimpleExpReqE
+	 * @return CIMRequest
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMRequest parseSIMPLEEXPREQ(Element pSimpleExpReqE) throws CIMXMLParseException {
+		// 
+		CIMRequest request = null;
+
+		// EXPMETHODCALL
+		Element[] expmethodcallA = searchNodes(pSimpleExpReqE, "EXPMETHODCALL", 1, 1, true);
+		if (expmethodcallA != null) {
+			request = parseEXPMETHODCALL(expmethodcallA[0]);
+		} else {
+			throw new CIMXMLParseException(
+					"SIMPLEEXPREQ element missing EXPMETHODCALL child element!");
+		}
+
+		// CORRELATOR
+		Element[] correlatorA = searchNodes(pSimpleExpReqE, "CORRELATOR", 0, Integer.MAX_VALUE,
+				true);
+		if (correlatorA != null) {
+			for (int i = 0; i < correlatorA.length; i++)
+				// TODO: return to WBEMClient API if JSR48 changes
+				parseCORRELATOR(correlatorA[i]);
+		}
+
+		checkOtherNodes(pSimpleExpReqE, nodesSIMPLEEXPREQ);
+		return request;
+	}
+
+	/**
+	 * parseMULTIEXPREQ
+	 * 
+	 * @param pMultiExpReqE
+	 * @return CIMRequest
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMRequest parseMULTIEXPREQ(Element pMultiExpReqE) throws CIMXMLParseException {
+		// 
+
+		Element[] methodReqElementA = searchNodes(pMultiExpReqE, "SIMPLEEXPREQ", 2,
+				Integer.MAX_VALUE, false);
+		if (methodReqElementA != null) {
+			CIMRequest multiReq = new CIMRequest();
+			for (int i = 0; i < methodReqElementA.length; i++) {
+				Element methodrequestE = methodReqElementA[i];
+				CIMRequest req = parseSIMPLEEXPREQ(methodrequestE);
+				req.setMethod("SIMPLEEXPREQ");
+
+				multiReq.addRequest(req);
+			}
+			return multiReq;
+		}
+		throw new CIMXMLParseException("MULTIEXPREQ element missing SIMPLEEXPREQ child element!");
+	}
+
+	private static final String nodesEXPMETHODCALL[] = { "EXPPARAMVALUE" };
+
+	/**
+	 * parseEXPMETHODCALL
+	 * 
+	 * @param pExpMethodCallE
+	 * @return CIMRequest
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMRequest parseEXPMETHODCALL(Element pExpMethodCallE)
+			throws CIMXMLParseException {
+		// 
+
+		// EXPMETHODCALL
+		CIMRequest request = new CIMRequest();
+		String methodname = attribute(pExpMethodCallE, "NAME");
+		if (methodname == null) throw new CIMXMLParseException(
+				"EXPMETHODCALL element missing NAME attribute!");
+		request.setMethodName(methodname);
+
+		Element[] paramValElementA = searchNodes(pExpMethodCallE, "EXPPARAMVALUE", 0,
+				Integer.MAX_VALUE, false);
+		Vector v = new Vector();
+		if (paramValElementA != null) {
+			for (int i = 0; i < paramValElementA.length; i++) {
+				Element expparamvalueE = paramValElementA[i];
+				CIMInstance inst = parseEXPPARAMVALUE(expparamvalueE);
+				v.add(inst);
+			}
+		}
+		request.addParamValue(v);
+		checkOtherNodes(pExpMethodCallE, nodesEXPMETHODCALL);
+		return request;
+	}
+
+	private static final String nodesEXPPARAMVALUE[] = { "INSTANCE" };
+
+	/**
+	 * parseEXPPARAMVALUE
+	 * 
+	 * @param pExpParamValueE
+	 * @return CIMInstance
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMInstance parseEXPPARAMVALUE(Element pExpParamValueE)
+			throws CIMXMLParseException {
+		// 
+		// 
+		// INSTANCE
+		if (attribute(pExpParamValueE, "NAME") == null) throw new CIMXMLParseException(
+				"EXPPARAMVALUE element missing NAME attribute!");
+
+		Element[] instanceA = searchNodes(pExpParamValueE, "INSTANCE", 0, 1, false);
+		if (instanceA != null) {
+			CIMInstance inst = parseINSTANCE(instanceA[0]);
+			return inst;
+		}
+
+		checkOtherNodes(pExpParamValueE, nodesEXPPARAMVALUE);
+
+		return null;
+	}
+
+	private static final String nodesMETHODRESPONSE[] = { "ERROR", "RETURNVALUE", "PARAMVALUE" };
+
+	/**
+	 * parseMETHODRESPONSE
+	 * 
+	 * @param pMethodResponseE
+	 * @return CIMResponse
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMResponse parseMETHODRESPONSE(Element pMethodResponseE)
+			throws CIMXMLParseException {
+		// 
+		if (attribute(pMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
+				"METHODRESPONSE element missing NAME attribute!");
+
+		CIMResponse response = new CIMResponse();
+
+		// ERROR
+		Element errorA[] = searchNodes(pMethodResponseE, "ERROR", 0, 1, false);
+		if (errorA != null) {
+			WBEMException exception = parseERROR(errorA[0]);
+			response.setError(exception);
+			return response;
+		}
+
+		// RETURNVALUE
+		Element[] retValElementA = searchNodes(pMethodResponseE, "RETURNVALUE", 0, 1, true);
+		if (retValElementA != null) {
+			Vector v = new Vector();
+			for (int i = 0; i < retValElementA.length; i++) {
+				Element returnvalueE = retValElementA[i];
+				v.add(parseRETURNVALUE(returnvalueE));
+			}
+			response.setReturnValue(v);
+		}
+
+		// PARAMVALUE
+		Element[] paramValElementA = searchNodes(pMethodResponseE, "PARAMVALUE", 0,
+				Integer.MAX_VALUE, true);
+		if (paramValElementA != null) {
+			Vector v = new Vector();
+			for (int i = 0; i < paramValElementA.length; i++) {
+				Element paramvalueE = paramValElementA[i];
+				CIMArgument arg = parsePARAMVALUE(paramvalueE);
+				v.add(arg);
+			}
+			response.addParamValue(v);
+		}
+
+		// PARAMVALUE (ESS fix)
+		if (retValElementA != null) {
+			for (int i = 0; i < retValElementA.length; i++) {
+				Element retValE = retValElementA[i];
+
+				paramValElementA = searchNodes(retValE, "PARAMVALUE");
+				if (paramValElementA != null) {
+					Vector> v = new Vector>();
+					for (int j = 0; j < paramValElementA.length; j++) {
+						Element paramvalueE = paramValElementA[j];
+						CIMArgument arg = parsePARAMVALUE(paramvalueE);
+						v.add(arg);
+					}
+					response.addParamValue(v);
+				}
+			}
+		}
+		checkOtherNodes(pMethodResponseE, nodesMETHODRESPONSE);
+
+		return response;
+	}
+
+	private static final String nodesIMETHODRESPONSE[] = { "ERROR", "IRETURNVALUE", "PARAMVALUE" };
+
+	/**
+	 * parseIMETHODRESPONSE
+	 * 
+	 * @param pIMethodResponseE
+	 * @return CIMResponse
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMResponse parseIMETHODRESPONSE(Element pIMethodResponseE)
+			throws CIMXMLParseException {
+		// 
+		if (attribute(pIMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
+				"IMETHODRESPONSE element missing NAME attribute!");
+
+		CIMResponse response = new CIMResponse();
+		// ERROR
+		Element[] errorA = searchNodes(pIMethodResponseE, "ERROR", 0, 1, false);
+		if (errorA != null) {
+			WBEMException exception = parseERROR(errorA[0]);
+			response.setError(exception);
+			return response;
+		}
+
+		// IRETURNVALUE
+		Element[] retValElementA = searchNodes(pIMethodResponseE, "IRETURNVALUE", 0, 1, true);
+		if (retValElementA != null) {
+			for (int i = 0; i < retValElementA.length; i++) {
+				Element ireturnvalueE = retValElementA[i];
+
+				Vector rtnV = parseIRETURNVALUE(ireturnvalueE);
+				response.setReturnValue(rtnV);
+			}
+		}
+
+		// PARAMVALUE
+		Element[] paramValElementA = searchNodes(pIMethodResponseE, "PARAMVALUE", 0,
+				Integer.MAX_VALUE, true);
+		if (paramValElementA != null) {
+			Vector v = new Vector();
+			for (int i = 0; i < paramValElementA.length; i++) {
+				Element paramvalueE = paramValElementA[i];
+				CIMArgument arg = parsePARAMVALUE(paramvalueE);
+				v.add(arg);
+			}
+			response.addParamValue(v);
+		}
+		checkOtherNodes(pIMethodResponseE, nodesIMETHODRESPONSE);
+
+		return response;
+	}
+
+	private static final String nodesERROR[] = { "INSTANCE" };
+
+	/**
+	 * parseERROR
+	 * 
+	 * @param pErrorE
+	 * @return WBEMException
+	 * @throws CIMXMLParseException
+	 */
+	public static WBEMException parseERROR(Element pErrorE) throws CIMXMLParseException {
+		// 
+		// 
+
+		Attr error_codeA = (Attr) searchAttribute(pErrorE, "CODE");
+		if (error_codeA == null) throw new CIMXMLParseException(
+				"ERROR element missing CODE attribute!");
+		String code = error_codeA.getNodeValue();
+		int errorCode = 0;
+		try {
+			if (code.length() > 0) errorCode = Integer.parseInt(code);
+		} catch (Exception e) {
+			LogAndTraceBroker.getBroker().trace(Level.WARNING,
+					"exception while parsing error code from XML", e);
+			errorCode = WBEMException.CIM_ERR_FAILED;
+		}
+		Attr error_descriptionA = (Attr) searchAttribute(pErrorE, "DESCRIPTION");
+		String description = "";
+		if (error_descriptionA != null) {
+			description = error_descriptionA.getNodeValue();
+		}
+
+		Vector rtnV = new Vector();
+
+		// INSTANCE
+		Element[] instElementA = searchNodes(pErrorE, "INSTANCE", 0, Integer.MAX_VALUE, false);
+		if (instElementA != null) {
+			for (int i = 0; i < instElementA.length; i++) {
+				Element instanceE = instElementA[i];
+				CIMInstance inst = parseINSTANCE(instanceE);
+				rtnV.add(inst);
+			}
+		}
+		checkOtherNodes(pErrorE, nodesERROR);
+
+		// throw new CIMException(CIMException.getErrorName(errorCode),
+		// description.substring(description.indexOf(':')+1));
+		if (!rtnV.isEmpty()) return new WBEMException(errorCode, "ErrorCode:" + errorCode
+				+ " description:" + description, rtnV.toArray(new CIMInstance[0]));
+		return new WBEMException(errorCode, "ErrorCode:" + errorCode + " description:"
+				+ description);
+	}
+
+	private static final String nodesRETURNVALUE[] = { "VALUE", "VALUE.REFERENCE" };
+
+	/**
+	 * parseRETURNVALUE
+	 * 
+	 * @param pRetValE
+	 * @return Object
+	 * @throws CIMXMLParseException
+	 */
+	public static Object parseRETURNVALUE(Element pRetValE) throws CIMXMLParseException {
+		// 
+		// 
+		// ebak: embedded object support: different parsing of VALUE sub element
+		checkOtherNodes(pRetValE, nodesRETURNVALUE);
+		if (searchNodes(pRetValE, "VALUE", 0, 1, false) != null) {
+			EmbObjHandler embObjHandler = new EmbObjHandler(pRetValE);
+			return embObjHandler.getValue();
+		}
+		if (searchNodes(pRetValE, "VALUE.REFERENCE", 0, 1, false) != null) {
+			TypedValue typedVal = parseSingleValue(pRetValE, VALUEREF);
+			Object value = typedVal.getValue();
+			return value;
+		}
+		checkOtherNodes(pRetValE, nodesRETURNVALUE);
+		return null;
+	}
+
+	private static final String nodesIRETURNVALUE[] = { "CLASSNAME", "INSTANCENAME", "VALUE",
+			"VALUE.OBJECTWITHPATH", "VALUE.OBJECTWITHLOCALPATH", "VALUE.OBJECT", "OBJECTPATH",
+			"QUALIFIER.DECLARATION", "VALUE.ARRAY", "VALUE.REFERENCE", "CLASS", "INSTANCE",
+			"INSTANCEPATH", "VALUE.NAMEDINSTANCE" };
+
+	/**
+	 * parseIRETURNVALUE
+	 * 
+	 * @param pIRetValE
+	 * @return Vector
+	 * @throws CIMXMLParseException
+	 */
+	public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLParseException {
+		// 
+
+		Vector rtnV = new Vector();
+
+		// CLASS
+		Element[] classElementA = searchNodes(pIRetValE, "CLASS", 0, Integer.MAX_VALUE, false);
+		if (classElementA != null) {
+			for (int i = 0; i < classElementA.length; i++) {
+				Element classE = classElementA[i];
+				CIMClass c = parseCLASS(classE);
+				rtnV.add(c);
+			}
+			return rtnV;
+		}
+
+		// INSTANCE
+		Element[] instElementA = searchNodes(pIRetValE, "INSTANCE", 0, Integer.MAX_VALUE, false);
+		if (instElementA != null) {
+			for (int i = 0; i < instElementA.length; i++) {
+				Element instanceE = instElementA[i];
+				CIMInstance inst = parseINSTANCE(instanceE);
+				rtnV.add(inst);
+			}
+			return rtnV;
+		}
+
+		// CLASSNAME
+		Element[] classNameElementA = searchNodes(pIRetValE, "CLASSNAME", 0, Integer.MAX_VALUE,
+				false);
+		if (classNameElementA != null) {
+			for (int i = 0; i < classNameElementA.length; i++) {
+				Element classnameE = classNameElementA[i];
+				CIMObjectPath op = parseCLASSNAME(classnameE);
+				rtnV.add(op);
+			}
+			return rtnV;
+		}
+
+		// INSTANCENAME
+		Element[] instNameElementA = searchNodes(pIRetValE, "INSTANCENAME", 0, Integer.MAX_VALUE,
+				false);
+		if (instNameElementA != null) {
+			for (int i = 0; i < instNameElementA.length; i++) {
+				Element instancenameE = instNameElementA[i];
+				CIMObjectPath op = parseINSTANCENAME(instancenameE);
+				rtnV.add(op);
+			}
+			return rtnV;
+		}
+
+		// INSTANCEPATH
+		Element[] instpathElementA = searchNodes(pIRetValE, "INSTANCEPATH", 0, Integer.MAX_VALUE,
+				false);
+		if (instpathElementA != null) {
+			for (int i = 0; i < instpathElementA.length; i++) {
+				Element instancePathE = instpathElementA[i];
+				CIMObjectPath op = parseINSTANCEPATH(instancePathE);
+				rtnV.add(op);
+			}
+			return rtnV;
+		}
+
+		// OBJECTPATH
+		Element[] objPathElementA = searchNodes(pIRetValE, "OBJECTPATH", 0, Integer.MAX_VALUE,
+				false);
+		if (objPathElementA != null) {
+			for (int i = 0; i < objPathElementA.length; i++) {
+				Element objectpathE = objPathElementA[i];
+				CIMObjectPath op = parseOBJECTPATH(objectpathE);
+				rtnV.add(op);
+			}
+			return rtnV;
+		}
+
+		// VALUE
+		Element[] valueElementA = searchNodes(pIRetValE, "VALUE", 0, Integer.MAX_VALUE, false);
+		if (valueElementA != null) {
+			for (int i = 0; i < valueElementA.length; i++) {
+				Element valueE = valueElementA[i];
+				TypedValue tv = parseVALUE(valueE);
+				rtnV.add(tv.getValue());
+			}
+			return rtnV;
+		}
+
+		// VALUE.ARRAY
+		Element[] valueArrayElementA = searchNodes(pIRetValE, "VALUE.ARRAY", 0, 1, false);
+		if (valueArrayElementA != null) {
+			Element valuearrayE = valueArrayElementA[0];
+			TypedValue tv = parseVALUEARRAY(valuearrayE);
+			rtnV.add(tv.getValue());
+			return rtnV;
+		}
+
+		// VALUE.REFERENCE
+		Element[] valRefElementA = searchNodes(pIRetValE, "VALUE.REFERENCE", 0, 1, false);
+		if (valRefElementA != null) {
+			Element valuereferenceE = valRefElementA[0];
+			CIMObjectPath op = parseVALUEREFERENCE(valuereferenceE);
+			rtnV.add(op);
+			return rtnV;
+		}
+
+		// VALUE.OBJECT
+		Element[] valObjElementA = searchNodes(pIRetValE, "VALUE.OBJECT", 0, Integer.MAX_VALUE,
+				false);
+		if (valObjElementA != null) {
+			for (int i = 0; i < valObjElementA.length; i++) {
+				Element valueobjectE = valObjElementA[i];
+				CIMNamedElementInterface obj = parseVALUEOBJECT(valueobjectE);
+				rtnV.add(obj);
+			}
+			return rtnV;
+		}
+
+		// VALUE.NAMEDINSTANCE
+		Element[] valNamedInstElementA = searchNodes(pIRetValE, "VALUE.NAMEDINSTANCE", 0,
+				Integer.MAX_VALUE, false);
+		if (valNamedInstElementA != null) {
+			for (int i = 0; i < valNamedInstElementA.length; i++) {
+				Element valuenamedisntanceE = valNamedInstElementA[i];
+				CIMInstance inst = parseVALUENAMEDINSTANCE(valuenamedisntanceE);
+				rtnV.add(inst);
+			}
+			return rtnV;
+		}
+
+		// VALUE.INSTANCEWITHPATH
+		Element[] valInstWithPathElementA = searchNodes(pIRetValE, "VALUE.INSTANCEWITHPATH", 0,
+				Integer.MAX_VALUE, false);
+		if (valInstWithPathElementA != null) {
+			for (int i = 0; i < valInstWithPathElementA.length; i++) {
+				Element valueinstancewithpathE = valInstWithPathElementA[i];
+				CIMInstance inst = parseVALUEINSTANCEWITHPATH(valueinstancewithpathE);
+				rtnV.add(inst);
+			}
+			return rtnV;
+		}
+
+		// VALUE.OBJECTWITHPATH
+		Element[] valObjWithPathElementA = searchNodes(pIRetValE, "VALUE.OBJECTWITHPATH", 0,
+				Integer.MAX_VALUE, false);
+		if (valObjWithPathElementA != null) {
+			for (int i = 0; i < valObjWithPathElementA.length; i++) {
+				Element valueobjectwithpathE = valObjWithPathElementA[i];
+				CIMNamedElementInterface namedIF = parseVALUEOBJECTWITHPATH(valueobjectwithpathE);
+				rtnV.add(namedIF);
+			}
+			return rtnV;
+		}
+
+		// VALUE.OBJECTWITHLOCALPATH
+		Element[] valObjWithLocalPathElementA = searchNodes(pIRetValE, "VALUE.OBJECTWITHLOCALPATH",
+				0, Integer.MAX_VALUE, false);
+		if (valObjWithLocalPathElementA != null) {
+			for (int i = 0; i < valObjWithLocalPathElementA.length; i++) {
+				Element valueobjectwithlocalpathE = valObjWithLocalPathElementA[i];
+				CIMNamedElementInterface namedIF = parseVALUEOBJECTWITHLOCALPATH(valueobjectwithlocalpathE);
+				rtnV.add(namedIF);
+			}
+			return rtnV;
+		}
+
+		// QUALIFIER.DECLARATION
+		Element[] qualiDeclElementA = searchNodes(pIRetValE, "QUALIFIER.DECLARATION", 0,
+				Integer.MAX_VALUE, false);
+		if (qualiDeclElementA != null) {
+			for (int i = 0; i < qualiDeclElementA.length; i++) {
+				Element qualifierdeclarationE = qualiDeclElementA[i];
+				CIMQualifierType o = parseQUALIFIERDECLARATION(qualifierdeclarationE);
+				rtnV.add(o);
+			}
+			return rtnV;
+		}
+		checkOtherNodes(pIRetValE, nodesIRETURNVALUE);
+		return rtnV;
+	}
+
+	/**
+	 * parseObject
+	 * 
+	 * @param pRootE
+	 * @return Object
+	 * @throws CIMXMLParseException
+	 */
+	public static Object parseObject(Element pRootE) throws CIMXMLParseException {
+		Object o = null;
+		String nodeName = pRootE.getNodeName();
+		if (nodeName.equalsIgnoreCase("INSTANCE")) {
+			o = parseINSTANCE(pRootE);
+		} else if (nodeName.equalsIgnoreCase("VALUE.NAMEDINSTANCE")) {
+			o = parseVALUENAMEDINSTANCE(pRootE);
+		} else if (nodeName.equalsIgnoreCase("VALUE.NAMEDOBJECT")) {
+			o = parseVALUENAMEDOBJECT(pRootE);
+		} else if (nodeName.equalsIgnoreCase("VALUE.OBJECTWITHPATH")) {
+			o = parseVALUEOBJECTWITHPATH(pRootE);
+		} else if (nodeName.equalsIgnoreCase("VALUE.OBJECTWITHLOCALPATH")) {
+			o = parseVALUEOBJECTWITHLOCALPATH(pRootE);
+		} else if (nodeName.equalsIgnoreCase("CLASS")) {
+			o = parseCLASS(pRootE);
+		} else if (nodeName.equalsIgnoreCase("CLASSPATH")) {
+			o = parseCLASSPATH(pRootE);
+		} else if (nodeName.equalsIgnoreCase("LOCALCLASSPATH")) {
+			o = parseLOCALCLASSPATH(pRootE);
+		} else if (nodeName.equalsIgnoreCase("OBJECTPATH")) {
+			o = parseOBJECTPATH(pRootE);
+		} else if (nodeName.equalsIgnoreCase("CLASSNAME")) {
+			o = parseCLASSNAME(pRootE);
+		} else if (nodeName.equalsIgnoreCase("INSTANCEPATH")) {
+			o = parseINSTANCEPATH(pRootE);
+		} else if (nodeName.equalsIgnoreCase("LOCALINSTANCEPATH")) {
+			o = parseLOCALINSTANCEPATH(pRootE);
+		} else if (nodeName.equalsIgnoreCase("INSTANCENAME")) {
+			o = parseINSTANCENAME(pRootE);
+		} else if (nodeName.equalsIgnoreCase("QUALIFIER")) {
+			o = parseQUALIFIER(pRootE);
+		} else if (nodeName.equalsIgnoreCase("PROPERTY")) {
+			o = parsePROPERTY(pRootE);
+		} else if (nodeName.equalsIgnoreCase("PROPERTY.ARRAY")) {
+			o = parsePROPERTYARRAY(pRootE);
+		} else if (nodeName.equalsIgnoreCase("PROPERTY.REFERENCE")) {
+			o = parsePROPERTYREFERENCE(pRootE);
+		} else if (nodeName.equalsIgnoreCase("METHOD")) {
+			o = parseMETHOD(pRootE);
+		} else if (nodeName.equalsIgnoreCase("PARAMETER")) {
+			o = parsePARAMETER(pRootE);
+		} else if (nodeName.equalsIgnoreCase("PARAMETER.REFERENCE")) {
+			o = parsePARAMETERREFERENCE(pRootE);
+		} else if (nodeName.equalsIgnoreCase("PARAMETER.ARRAY")) {
+			o = parsePARAMETERARRAY(pRootE);
+		} else if (nodeName.equalsIgnoreCase("PARAMETER.REFARRAY")) {
+			o = parsePARAMETERREFARRAY(pRootE);
+		}
+		return o;
+	}
+
+	// ///////////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * hasNodes
+	 * 
+	 * @param pParentE
+	 * @return boolean
+	 */
+	private static boolean hasNodes(Element pParentE) {
+		NodeList nl = pParentE.getChildNodes();
+		if (nl == null || nl.getLength() == 0) return false;
+		for (int i = 0; i < nl.getLength(); i++) {
+			Node n = nl.item(i);
+			if (!(n instanceof Text) || !("".equalsIgnoreCase(n.getNodeValue().trim()))) return true;
+		}
+		return false;
+	}
+
+	/**
+	 * hasTypeAttrsInNodes
+	 * 
+	 * SVC CIMOM sends typed CIM-XML elements in a non-standard way. The TYPE
+	 * attribute is included in the VALUE or VALUE.ARRAY element not in the
+	 * enclosing element as the standard says.
+	 * 
+	 * @param pParentE
+	 * @return boolean
+	 */
+	private static boolean hasTypeAttrsInNodes(Element pParentE) {
+		NodeList nl = pParentE.getChildNodes();
+		if (nl == null || nl.getLength() == 0) return false;
+		for (int i = 0; i < nl.getLength(); i++) {
+			Node n = nl.item(i);
+			String name = n.getNodeName();
+			if ("VALUE".equalsIgnoreCase(name) || "VALUE.ARRAY".equalsIgnoreCase(name)) {
+				NamedNodeMap nm = n.getAttributes();
+				if (nm != null
+						&& (nm.getNamedItem("TYPE") != null || nm.getNamedItem("PARAMTYPE") != null)) return true;
+			}
+		}
+		return false;
+	}
+
+	private static final HashMap NODENAME_HASH = new HashMap();
+
+	private static void initNodeNameHash(String[] pEnumA) {
+		for (int i = 0; i < pEnumA.length; i++)
+			NODENAME_HASH.put(pEnumA[i], pEnumA[i]);
+	}
+
+	static {
+		initNodeNameHash(new String[] { "CIM", "DECLARATION", "DECLGROUP", "DECLGROUP.WITHNAME",
+				"DECLGROUP.WITHPATH", "QUALIFIER.DECLARATION", "SCOPE", "VALUE", "VALUE.ARRAY",
+				"VALUE.REFERENCE", "VALUE.REFARRAY", "VALUE.OBJECT", "VALUE.NAMEDINSTANCE",
+				"VALUE.NAMEDOBJECT", "VALUE.OBJECTWITHLOCALPATH", "VALUE.OBJECTWITHPATH",
+				"VALUE.NULL", "VALUE.INSTANCEWITHPATH", "NAMESPACEPATH", "LOCALNAMESPACEPATH",
+				"HOST", "NAMESPACE", "CLASSPATH", "LOCALCLASSPATH", "CLASSNAME", "INSTANCEPATH",
+				"LOCALINSTANCEPATH", "INSTANCENAME", "OBJECTPATH", "KEYBINDING", "KEYVALUE",
+				"CLASS", "INSTANCE", "QUALIFIER", "PROPERTY", "PROPERTY.ARRAY",
+				"PROPERTY.REFERENCE", "METHOD", "PARAMETER", "PARAMETER.REFERENCE",
+				"PARAMETER.ARRAY", "PARAMETER.REFARRAY", "MESSAGE", "MULTIREQ", "MULTIEXPREQ",
+				"SIMPLEREQ", "SIMPLEEXPREQ", "IMETHODCALL", "METHODCALL", "EXPMETHODCALL",
+				"PARAMVALUE", "IPARAMVALUE", "EXPPARAMVALUE", "MULTIRSP", "MULTIEXPRSP",
+				"SIMPLERSP", "SIMPLEEXPRSP", "METHODRESPONSE", "EXPMETHODRESPONSE",
+				"IMETHODRESPONSE", "ERROR", "RETURNVALUE", "IRETURNVALUE", "CORRELATOR" });
+	}
+
+	/**
+	 * checkOtherNodes
+	 * 
+	 * @param pParentE
+	 * @param pAllowedChildNodes
+	 */
+	private static void checkOtherNodes(Element pParentE, String[] pAllowedChildNodes)
+			throws CIMXMLParseException {
+		NodeList nl = pParentE.getChildNodes();
+		if (nl == null || nl.getLength() == 0) return;
+		for (int i = 0; i < nl.getLength(); i++) {
+			Node n = nl.item(i);
+			if (n instanceof Text && "".equalsIgnoreCase(n.getNodeValue().trim())) continue;
+			boolean found = false;
+			String name = n.getNodeName().toUpperCase();
+			for (int j = 0; j < pAllowedChildNodes.length; j++) {
+				if (pAllowedChildNodes[j].equalsIgnoreCase(name)) {
+					found = true;
+					break;
+				}
+			}
+			if (!found && NODENAME_HASH.containsKey(name)) throw new CIMXMLParseException(pParentE
+					.getNodeName()
+					+ " element contains invalid child element " + name + "!");
+		}
+	}
+
+	/**
+	 * searchNodes
+	 * 
+	 * @param pParentE
+	 * @param pTagName
+	 * @return Element[]
+	 */
+	public static Element[] searchNodes(Element pParentE, String pTagName) {
+		// return all of child nodes immediately below the parent
+		// return null if not found
+		NodeList nl = pParentE.getChildNodes();
+		if (nl == null || nl.getLength() == 0) return null;
+		Vector resElementV = new Vector();
+		for (int i = 0; i < nl.getLength(); i++) {
+			Node n = nl.item(i);
+			if (n.getNodeName().equals(pTagName)) {
+				resElementV.add(n);
+			}
+		}
+		return resElementV.toArray(new Element[0]);
+	}
+
+	/**
+	 * searchNodes
+	 * 
+	 * @param pParentE
+	 * @param pTagName
+	 * @param pMin
+	 * @param pMax
+	 * @param pAllowOtherNodes
+	 * @return Element[]
+	 * @throws CIMXMLParseException
+	 */
+	public static Element[] searchNodes(Element pParentE, String pTagName, int pMin, int pMax,
+			boolean pAllowOtherNodes) throws CIMXMLParseException {
+		// return all child nodes immediately below parent, null if none found
+
+		NodeList nl = pParentE.getChildNodes();
+		if (nl == null || nl.getLength() == 0) {
+			if (pMin > 0) throw new CIMXMLParseException(pParentE.getNodeName()
+					+ " element must have at least " + pMin + " " + pTagName + " child element(s)!");
+			return null;
+		}
+
+		String otherNode = null;
+		Vector resElementV = new Vector();
+		for (int i = 0; i < nl.getLength(); i++) {
+			Node n = nl.item(i);
+			String name = n.getNodeName().toUpperCase();
+			if (name.equals(pTagName)) {
+				resElementV.add(n);
+			} else if (NODENAME_HASH.containsKey(name)) {
+				otherNode = name;
+			}
+		}
+
+		if (resElementV.size() < pMin) throw new CIMXMLParseException(pParentE.getNodeName()
+				+ " element must have at least " + pMin + " " + pTagName + " child element(s)!");
+		if (resElementV.size() > pMax) throw new CIMXMLParseException(pParentE.getNodeName()
+				+ " element can have no more than " + pMax + " " + pTagName + " child element(s)!");
+		if (resElementV.size() > 0 && !pAllowOtherNodes && otherNode != null) throw new CIMXMLParseException(
+				pParentE.getNodeName() + " element cannot have " + otherNode
+						+ " child element(s) when it already has " + pTagName + " element(s)!");
+		if (resElementV.size() == 0) return null;
+
+		return resElementV.toArray(new Element[0]);
+	}
+
+	/**
+	 * searchFirstNode
+	 * 
+	 * @param pParentE
+	 * @param pTagName
+	 * @return Node
+	 */
+	public static Node searchFirstNode(Element pParentE, String pTagName) {
+		// return the first node which matches to the specific name
+		// return null if not found
+		NodeList nl = pParentE.getChildNodes();
+		for (int i = 0; i < nl.getLength(); i++) {
+			Node n = nl.item(i);
+			if (n.getNodeName().equals(pTagName)) { return n; }
+		}
+		return null;
+	}
+
+	/**
+	 * searchAttribute
+	 * 
+	 * @param pParentN
+	 * @param pAttrName
+	 * @return Node
+	 */
+	public static Node searchAttribute(Node pParentN, String pAttrName) {
+		// return the attribute node with the specific name
+		NamedNodeMap nnm = pParentN.getAttributes();
+		return nnm.getNamedItem(pAttrName);
+	}
+
+	/**
+	 * searchFirstChild
+	 * 
+	 * @param pParentE
+	 * @return Node
+	 */
+	public static Node searchFirstChild(Element pParentE) {
+		// return the first node which matches to the specific name
+		// return null if not found
+		return pParentE.getFirstChild();
+	}
+
+	/**
+	 * createJavaObject
+	 * 
+	 * @param pTypeStr
+	 * @param pValue
+	 * @return Object
+	 * @throws CIMXMLParseException
+	 */
+	public static Object createJavaObject(String pTypeStr, String pValue)
+			throws CIMXMLParseException {
+		// return a java object with the specific type
+		if (pTypeStr == null) pTypeStr = MOF.DT_STR;
+		if (MOF.NULL.equalsIgnoreCase(pTypeStr)) return null;
+		Object o = null;
+		CIMDataType cimType = parseTypeStr(pTypeStr, false);
+		int radix = 10;
+
+		if (pTypeStr.toLowerCase().startsWith("sint") || pTypeStr.toLowerCase().startsWith("uint")) {
+			pValue = pValue.toLowerCase();
+			if (pValue.startsWith("0x") || pValue.startsWith("+0x") || pValue.startsWith("-0x")) {
+				radix = 16;
+				if (pValue.startsWith("-")) pValue = "-" + pValue.substring(3);
+				else pValue = pValue.substring(pValue.indexOf('x') + 1);
+			}
+		}
+
+		switch (cimType.getType()) {
+			case CIMDataType.UINT8:
+				o = new UnsignedInteger8(Short.parseShort(pValue, radix));
+				break;
+			case CIMDataType.UINT16:
+				o = new UnsignedInteger16(Integer.parseInt(pValue, radix));
+				break;
+			case CIMDataType.UINT32:
+				o = new UnsignedInteger32(Long.parseLong(pValue, radix));
+				break;
+			case CIMDataType.UINT64:
+				o = new UnsignedInteger64(new BigInteger(pValue, radix));
+				break;
+			case CIMDataType.SINT8:
+				o = Byte.valueOf(pValue, radix);
+				break;
+			case CIMDataType.SINT16:
+				o = Short.valueOf(pValue, radix);
+				break;
+			case CIMDataType.SINT32:
+				o = Integer.valueOf(pValue, radix);
+				break;
+			case CIMDataType.SINT64:
+				o = Long.valueOf(pValue, radix);
+				break;
+			case CIMDataType.STRING:
+				o = pValue;
+				break;
+			case CIMDataType.BOOLEAN:
+				o = Boolean.valueOf(pValue);
+				break;
+			case CIMDataType.REAL32:
+				o = new Float(pValue);
+				break;
+			case CIMDataType.REAL64:
+				if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
+					if (Util.isBadDoubleString(pValue)) throw new IllegalArgumentException(
+							"Double value string hangs older JVMs!\n" + pValue);
+				}
+				o = new Double(pValue);
+				break;
+			case CIMDataType.DATETIME:
+				o = getDateTime(pValue);
+				break;
+			case CIMDataType.REFERENCE:
+				o = new CIMObjectPath(pValue);
+				break;
+			case CIMDataType.CHAR16:
+				o = Character.valueOf(pValue.charAt(0));
+				break;
+			// case CIMDataType.OBJECT: o = new CIMInstance(); break; //TODO
+			// case CIMDataType.CLASS: o = new CIMClass(value); break; //TODO
+		}
+		return o;
+	}
+
+	private static CIMDateTime getDateTime(String pValue) throws CIMXMLParseException {
+		try {
+			return new CIMDateTimeAbsolute(pValue);
+		} catch (IllegalArgumentException eAbs) {
+			try {
+				return new CIMDateTimeInterval(pValue);
+			} catch (IllegalArgumentException eInt) {
+				throw new CIMXMLParseException("Failed to parse dateTime string: " + pValue + "!\n"
+						+ "CIMDateTimeAbsolute parsing error:\n" + eAbs.getMessage() + "\n"
+						+ "CIMDateTimeInterval parsing error:\n" + eInt.getMessage());
+			}
+		}
+	}
+
+	/**
+	 * parseSIMPLEEXPRSP
+	 * 
+	 * @param pSimpleExpRspE
+	 * @return CIMResponse
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMResponse parseSIMPLEEXPRSP(Element pSimpleExpRspE) throws CIMXMLParseException {
+		// 
+
+		// EXPMETHODRESPONSE
+		Element[] expmethodresponseA = searchNodes(pSimpleExpRspE, "EXPMETHODRESPONSE", 1, 1, false);
+		if (expmethodresponseA != null) return parseEXPMETHODRESPONSE(expmethodresponseA[0]);
+
+		throw new CIMXMLParseException(
+				"SIMPLEEXPRSP element missing EXPMETHODRESPONSE child element!");
+	}
+
+	/**
+	 * parseMULTIEXPRSP
+	 * 
+	 * @param pMultiExpRspE
+	 * @return CIMResponse
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMResponse parseMULTIEXPRSP(Element pMultiExpRspE) throws CIMXMLParseException {
+		// 
+
+		Element[] multiExpRespElementA = searchNodes(pMultiExpRspE, "SIMPLEEXPRSP", 2,
+				Integer.MAX_VALUE, false);
+		if (multiExpRespElementA != null) {
+			CIMResponse multiExpRsp = new CIMResponse();
+			for (int i = 0; i < multiExpRespElementA.length; i++) {
+				Element methodresponseE = multiExpRespElementA[i];
+				CIMResponse rsp = parseSIMPLEEXPRSP(methodresponseE);
+				rsp.setMethod("SIMPLEEXPRSP");
+				multiExpRsp.addResponse(rsp);
+			}
+			return multiExpRsp;
+		}
+
+		throw new CIMXMLParseException("MULTIEXPRSP element missing SIMPLEEXPRSP child element!");
+	}
+
+	private static final String[] nodesEXPMETHODRESPONSE = { "ERROR", "IRETURNVALUE" };
+
+	/**
+	 * parseEXPMETHODRESPONSE
+	 * 
+	 * @param pExpMethodResponseE
+	 * @return CIMResponse
+	 * @throws CIMXMLParseException
+	 */
+	public static CIMResponse parseEXPMETHODRESPONSE(Element pExpMethodResponseE)
+			throws CIMXMLParseException {
+		// 
+
+		CIMResponse response = new CIMResponse();
+
+		if (attribute(pExpMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
+				"EXPMETHODRESPONSE element missing NAME attribute!");
+
+		// ERROR
+		Element[] errorA = searchNodes(pExpMethodResponseE, "ERROR", 0, 1, false);
+		if (errorA != null) {
+			WBEMException exception = parseERROR(errorA[0]);
+			response.setError(exception);
+			return response;
+		}
+
+		// RETURNVALUE
+		Element[] retValElementA = searchNodes(pExpMethodResponseE, "IRETURNVALUE", 0, 1, false);
+		if (retValElementA != null) {
+			Vector v = new Vector();
+			Element returnvalueE = retValElementA[0];
+			v.add(parseIRETURNVALUE(returnvalueE));
+			response.setReturnValue(v);
+			return response;
+		}
+
+		checkOtherNodes(pExpMethodResponseE, nodesEXPMETHODRESPONSE);
+
+		return response;
+	}
+
+	private static final String nodesCORRELATOR[] = { "VALUE" };
+
+	/**
+	 * parseCORRELATOR
+	 * 
+	 * @param pCorrelatorE
+	 * @throws CIMXMLParseException
+	 * */
+	public static void parseCORRELATOR(Element pCorrelatorE) throws CIMXMLParseException {
+		// 
+		// 
+		String name = attribute(pCorrelatorE, "NAME");
+		if (name == null) throw new CIMXMLParseException(
+				"CORRELATOR element missing NAME attribute!");
+		String type = attribute(pCorrelatorE, "TYPE");
+		if (type == null) throw new CIMXMLParseException(
+				"CORRELATOR element missing TYPE attribute!");
+
+		// VALUE
+		Element[] valueA = searchNodes(pCorrelatorE, "VALUE", 1, 1, false);
+		if (valueA != null) {
+			// TypedValue tVal = parseVALUE(valueA[0]);
+		}
+
+		checkOtherNodes(pCorrelatorE, nodesCORRELATOR);
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java
similarity index 89%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java
index 9953896..3b34eb7 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java
@@ -1,393 +1,391 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2012
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1671502    2007-02-08  lupusalex    Remove dependency from Xerces
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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
- * 3510321    2012-03-23  blaschke-oss Handle CDATA in CimXmlSerializer
- * 3513357    2012-04-01  blaschke-oss Handle multiple CDATAs in CimXmlSerializer
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * Class CimXmlSerializer implements a XML serializer for DOM documents that is
- * specialized for CIM-XML. It might not be used as a general purpose serializer
- * since it doesn't support any DOM or XML features not required by CIM-XML.
- * 
- */
-public class CimXmlSerializer {
-
-	/**
-	 * Class XmlWriter implements a writer on an output stream that escapes XML
-	 * values according to the CIM-XML requirements.
-	 * 
-	 */
-	private static class XmlWriter {
-
-		private BufferedWriter iWriter;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pOut
-		 *            The output stream the serialized document is written to
-		 * @param pCharsetName
-		 *            The encoding the use for the output stream
-		 */
-		public XmlWriter(OutputStream pOut, String pCharsetName) {
-			this.iWriter = new BufferedWriter(new OutputStreamWriter(pOut, Charset.forName(
-					pCharsetName).newEncoder()));
-		}
-
-		/**
-		 * Writes text to the stream
-		 * 
-		 * @param pText
-		 *            The text
-		 * @throws IOException
-		 */
-		public void write(String pText) throws IOException {
-			if (pText != null) this.iWriter.write(pText);
-		}
-
-		/**
-		 * Closes the stream
-		 * 
-		 * @throws IOException
-		 */
-		public void close() throws IOException {
-			this.iWriter.close();
-		}
-
-		/**
-		 * Flushes the buffer to the stream
-		 * 
-		 * @throws IOException
-		 */
-		public void flush() throws IOException {
-			this.iWriter.flush();
-		}
-
-		/**
-		 * Writes a XML value (either attribute or text node). The value is
-		 * escaped as follows:
      
-		 * 
      
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
-		 * 
      charresult
      < space&#xnn;
      > ~unchanged (UTF-8)
      spaceunchanged or &#x20;
      
-		 * (First leading, last trailing and every other space are escaped)
      <&lt;
      >&gt;
      &&amp;
      "&quot;
      '&apos;
      otherunchanged
      
-		 * 
-		 * @param pText
-		 *            The text
-		 * @throws IOException
-		 */
-		public void writeValue(final String pText) throws IOException {
-			if (pText == null) { return; }
-			boolean escapeSpace = true;
-			final int oneBeforeLast = pText.length() - 2;
-			for (int i = 0; i < pText.length(); ++i) {
-
-				char currentChar = pText.charAt(i);
-				boolean isSpace = false;
-
-				if (isHighSurrogate(currentChar)) {
-					if (i > oneBeforeLast || !isLowSurrogate(pText.charAt(i + 1))) { throw new IOException(
-							"Illegal Unicode character"); }
-					this.iWriter.write(pText, i++, 2);
-				} else if (currentChar < ' ') {
-					writeAsHex(currentChar);
-				} else if (currentChar > '~') {
-					this.iWriter.write(currentChar);
-				} else {
-					switch (currentChar) {
-						case ' ':
-							isSpace = true;
-							if (escapeSpace) {
-								writeAsHex(currentChar);
-							} else {
-								this.iWriter.write(currentChar);
-							}
-							break;
-						case '<':
-							this.iWriter.write("<");
-							break;
-						case '>':
-							this.iWriter.write(">");
-							break;
-						case '&':
-							this.iWriter.write("&");
-							break;
-						case '"':
-							this.iWriter.write(""");
-							break;
-						case '\'':
-							this.iWriter.write("'");
-							break;
-						default:
-							this.iWriter.write(currentChar);
-					}
-				}
-				escapeSpace = (isSpace && !escapeSpace) || (i == oneBeforeLast);
-			}
-		}
-
-		private void writeAsHex(char pChar) throws IOException {
-			this.iWriter.write("&#x" + Integer.toHexString(pChar) + ";");
-		}
-
-		private boolean isHighSurrogate(char pChar) {
-			return pChar >= WBEMConstants.UTF16_MIN_HIGH_SURROGATE
-					&& pChar <= WBEMConstants.UTF16_MAX_HIGH_SURROGATE;
-		}
-
-		private boolean isLowSurrogate(char pChar) {
-			return pChar >= WBEMConstants.UTF16_MIN_LOW_SURROGATE
-					&& pChar <= WBEMConstants.UTF16_MAX_LOW_SURROGATE;
-		}
-
-	}
-
-	private boolean iPretty;
-
-	private int iIndent = 0;
-
-	private boolean iLastClosed = false;
-
-	private final String CDATA_START = "";
-
-	private CimXmlSerializer(boolean pPretty) {
-		this.iPretty = pPretty;
-	}
-
-	/**
-	 * Serializes a given DOM document as (CIM-)XML to a given output stream.
-	 * The method writes first
-	 * <?xml version="1.0" encoding="UTF-8"?>
-	 * and then serializes the document node. If you want to suppress this
-	 * header just call {@link #serialize(OutputStream, Node, boolean)} on the
-	 * document node.
-	 * 
-	 * @param pOS
-	 *            The output stream
-	 * @param pDoc
-	 *            The document
-	 * @param pPretty
-	 *            If true the XML is nicely wrapped and indented,
-	 *            otherwise it's all in one line
-	 * @throws IOException
-	 *             Whenever something goes wrong
-	 */
-	public static void serialize(OutputStream pOS, Document pDoc, boolean pPretty)
-			throws IOException {
-
-		try {
-			XmlWriter writer = new XmlWriter(pOS, WBEMConstants.UTF8);
-			writer.write("\n");
-			new CimXmlSerializer(pPretty).serializeNode(writer, pDoc.getDocumentElement());
-			writer.flush();
-		} catch (IOException ioe) {
-			throw ioe;
-		} catch (Exception e) {
-			throw new IOException(e.getMessage());
-		}
-	}
-
-	/**
-	 * Serializes a given DOM node as (CIM-)XML to a given output stream
-	 * 
-	 * @param pOS
-	 *            The output stream
-	 * @param pNode
-	 *            The node
-	 * @param pPretty
-	 *            If true the XML is nicely wrapped and indented,
-	 *            otherwise it's all in one line
-	 * @throws IOException
-	 *             Whenever something goes wrong
-	 */
-	public static void serialize(OutputStream pOS, Node pNode, boolean pPretty) throws IOException {
-
-		try {
-			XmlWriter writer = new XmlWriter(pOS, WBEMConstants.UTF8);
-			new CimXmlSerializer(pPretty).serializeNode(writer, pNode);
-			writer.flush();
-		} catch (IOException ioe) {
-			throw ioe;
-		} catch (Exception e) {
-			throw new IOException(e.getMessage());
-		}
-	}
-
-	private void serializeNode(XmlWriter pWriter, Node pNode) throws IOException {
-		switch (pNode.getNodeType()) {
-			case Node.ELEMENT_NODE:
-				pWriter.write(indent());
-				pWriter.write("<");
-				pWriter.write(pNode.getNodeName());
-				NamedNodeMap attributes = pNode.getAttributes();
-				if (attributes != null) {
-					for (int i = 0; i < attributes.getLength(); ++i) {
-						pWriter.write(" ");
-						serializeNode(pWriter, attributes.item(i));
-					}
-				}
-				Node child = pNode.getFirstChild();
-				if (child == null) {
-					pWriter.write("/>");
-					this.iLastClosed = true;
-					break;
-				}
-				pWriter.write(">");
-				++this.iIndent;
-				this.iLastClosed = false;
-				while (child != null) {
-					serializeNode(pWriter, child);
-					child = child.getNextSibling();
-				}
-				--this.iIndent;
-				if (this.iLastClosed) {
-					pWriter.write(indent());
-				}
-				pWriter.write("");
-				this.iLastClosed = true;
-				break;
-			case Node.ATTRIBUTE_NODE:
-				pWriter.write(pNode.getNodeName());
-				pWriter.write("=\"");
-				pWriter.writeValue(pNode.getNodeValue());
-				pWriter.write("\"");
-				break;
-			case Node.TEXT_NODE:
-				String value = pNode.getNodeValue();
-				if (value != null) {
-					int idx = 0;
-					int len = value.length();
-
-					while (idx < len) {
-						int cdata = value.indexOf(this.CDATA_START, idx);
-
-						// rest of string not CDATA, write all (escaped)
-						if (cdata == -1) {
-							pWriter.writeValue(value.substring(idx));
-							break;
-						}
-
-						// write characters before CDATA (escaped)
-						if (idx < cdata) {
-							pWriter.writeValue(value.substring(idx, cdata));
-							idx = cdata;
-						}
-
-						int end = value.indexOf(this.CDATA_END, idx);
-
-						// invalid CDATA
-						if (end == -1) { throw new IOException("CDATA section not closed: " + value); }
-
-						// write CDATA (not escaped)
-						pWriter.write(value.substring(idx, end + this.CDATA_END.length()));
-						idx = end + this.CDATA_END.length();
-					}
-				}
-		}
-	}
-
-	private String indent() {
-		if (!this.iPretty) { return ""; }
-		StringBuffer result = new StringBuffer();
-		result.append('\n');
-		for (int i = 0; i < this.iIndent; ++i) {
-			result.append(' ');
-		}
-		return result.toString();
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2012
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1671502    2007-02-08  lupusalex    Remove dependency from Xerces
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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
+ * 3510321    2012-03-23  blaschke-oss Handle CDATA in CimXmlSerializer
+ * 3513357    2012-04-01  blaschke-oss Handle multiple CDATAs in CimXmlSerializer
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+/**
+ * Class CimXmlSerializer implements a XML serializer for DOM documents that is
+ * specialized for CIM-XML. It might not be used as a general purpose serializer
+ * since it doesn't support any DOM or XML features not required by CIM-XML.
+ * 
+ */
+public class CimXmlSerializer {
+
+	/**
+	 * Class XmlWriter implements a writer on an output stream that escapes XML
+	 * values according to the CIM-XML requirements.
+	 * 
+	 */
+	private static class XmlWriter {
+
+		private BufferedWriter iWriter;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pOut
+		 *            The output stream the serialized document is written to
+		 * @param pCharsetName
+		 *            The encoding the use for the output stream
+		 */
+		public XmlWriter(OutputStream pOut, String pCharsetName) {
+			this.iWriter = new BufferedWriter(new OutputStreamWriter(pOut, Charset.forName(
+					pCharsetName).newEncoder()));
+		}
+
+		/**
+		 * Writes text to the stream
+		 * 
+		 * @param pText
+		 *            The text
+		 * @throws IOException
+		 */
+		public void write(String pText) throws IOException {
+			if (pText != null) this.iWriter.write(pText);
+		}
+
+		/**
+		 * Closes the stream
+		 * 
+		 * @throws IOException
+		 */
+		public void close() throws IOException {
+			this.iWriter.close();
+		}
+
+		/**
+		 * Flushes the buffer to the stream
+		 * 
+		 * @throws IOException
+		 */
+		public void flush() throws IOException {
+			this.iWriter.flush();
+		}
+
+		/**
+		 * Writes a XML value (either attribute or text node). The value is
+		 * escaped as follows:
      
+		 * 
      
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
+		 * 
      charresult
      < space&#xnn;
      > ~unchanged (UTF-8)
      spaceunchanged or &#x20;
      
+		 * (First leading, last trailing and every other space are escaped)
      <&lt;
      >&gt;
      &&amp;
      "&quot;
      '&apos;
      otherunchanged
      
+		 * 
+		 * @param pText
+		 *            The text
+		 * @throws IOException
+		 */
+		public void writeValue(final String pText) throws IOException {
+			if (pText == null) { return; }
+			boolean escapeSpace = true;
+			final int oneBeforeLast = pText.length() - 2;
+			for (int i = 0; i < pText.length(); ++i) {
+
+				char currentChar = pText.charAt(i);
+				boolean isSpace = false;
+
+				if (isHighSurrogate(currentChar)) {
+					if (i > oneBeforeLast || !isLowSurrogate(pText.charAt(i + 1))) { throw new IOException(
+							"Illegal Unicode character"); }
+					this.iWriter.write(pText, i++, 2);
+				} else if (currentChar < ' ') {
+					writeAsHex(currentChar);
+				} else if (currentChar > '~') {
+					this.iWriter.write(currentChar);
+				} else {
+					switch (currentChar) {
+						case ' ':
+							isSpace = true;
+							if (escapeSpace) {
+								writeAsHex(currentChar);
+							} else {
+								this.iWriter.write(currentChar);
+							}
+							break;
+						case '<':
+							this.iWriter.write("<");
+							break;
+						case '>':
+							this.iWriter.write(">");
+							break;
+						case '&':
+							this.iWriter.write("&");
+							break;
+						case '"':
+							this.iWriter.write(""");
+							break;
+						case '\'':
+							this.iWriter.write("'");
+							break;
+						default:
+							this.iWriter.write(currentChar);
+					}
+				}
+				escapeSpace = (isSpace && !escapeSpace) || (i == oneBeforeLast);
+			}
+		}
+
+		private void writeAsHex(char pChar) throws IOException {
+			this.iWriter.write("&#x" + Integer.toHexString(pChar) + ";");
+		}
+
+		private boolean isHighSurrogate(char pChar) {
+			return pChar >= WBEMConstants.UTF16_MIN_HIGH_SURROGATE
+					&& pChar <= WBEMConstants.UTF16_MAX_HIGH_SURROGATE;
+		}
+
+		private boolean isLowSurrogate(char pChar) {
+			return pChar >= WBEMConstants.UTF16_MIN_LOW_SURROGATE
+					&& pChar <= WBEMConstants.UTF16_MAX_LOW_SURROGATE;
+		}
+
+	}
+
+	private boolean iPretty;
+
+	private int iIndent = 0;
+
+	private boolean iLastClosed = false;
+
+	private final String CDATA_START = "";
+
+	private CimXmlSerializer(boolean pPretty) {
+		this.iPretty = pPretty;
+	}
+
+	/**
+	 * Serializes a given DOM document as (CIM-)XML to a given output stream.
+	 * The method writes first
+	 * <?xml version="1.0" encoding="UTF-8"?>
+	 * and then serializes the document node. If you want to suppress this
+	 * header just call {@link #serialize(OutputStream, Node, boolean)} on the
+	 * document node.
+	 * 
+	 * @param pOS
+	 *            The output stream
+	 * @param pDoc
+	 *            The document
+	 * @param pPretty
+	 *            If true the XML is nicely wrapped and indented,
+	 *            otherwise it's all in one line
+	 * @throws IOException
+	 *             Whenever something goes wrong
+	 */
+	public static void serialize(OutputStream pOS, Document pDoc, boolean pPretty)
+			throws IOException {
+
+		try {
+			XmlWriter writer = new XmlWriter(pOS, WBEMConstants.UTF8);
+			writer.write("\n");
+			new CimXmlSerializer(pPretty).serializeNode(writer, pDoc.getDocumentElement());
+			writer.flush();
+		} catch (IOException ioe) {
+			throw ioe;
+		} catch (Exception e) {
+			throw new IOException(e.getMessage());
+		}
+	}
+
+	/**
+	 * Serializes a given DOM node as (CIM-)XML to a given output stream
+	 * 
+	 * @param pOS
+	 *            The output stream
+	 * @param pNode
+	 *            The node
+	 * @param pPretty
+	 *            If true the XML is nicely wrapped and indented,
+	 *            otherwise it's all in one line
+	 * @throws IOException
+	 *             Whenever something goes wrong
+	 */
+	public static void serialize(OutputStream pOS, Node pNode, boolean pPretty) throws IOException {
+
+		try {
+			XmlWriter writer = new XmlWriter(pOS, WBEMConstants.UTF8);
+			new CimXmlSerializer(pPretty).serializeNode(writer, pNode);
+			writer.flush();
+		} catch (IOException ioe) {
+			throw ioe;
+		} catch (Exception e) {
+			throw new IOException(e.getMessage());
+		}
+	}
+
+	private void serializeNode(XmlWriter pWriter, Node pNode) throws IOException {
+		switch (pNode.getNodeType()) {
+			case Node.ELEMENT_NODE:
+				pWriter.write(indent());
+				pWriter.write("<");
+				pWriter.write(pNode.getNodeName());
+				NamedNodeMap attributes = pNode.getAttributes();
+				if (attributes != null) {
+					for (int i = 0; i < attributes.getLength(); ++i) {
+						pWriter.write(" ");
+						serializeNode(pWriter, attributes.item(i));
+					}
+				}
+				Node child = pNode.getFirstChild();
+				if (child == null) {
+					pWriter.write("/>");
+					this.iLastClosed = true;
+					break;
+				}
+				pWriter.write(">");
+				++this.iIndent;
+				this.iLastClosed = false;
+				while (child != null) {
+					serializeNode(pWriter, child);
+					child = child.getNextSibling();
+				}
+				--this.iIndent;
+				if (this.iLastClosed) {
+					pWriter.write(indent());
+				}
+				pWriter.write("");
+				this.iLastClosed = true;
+				break;
+			case Node.ATTRIBUTE_NODE:
+				pWriter.write(pNode.getNodeName());
+				pWriter.write("=\"");
+				pWriter.writeValue(pNode.getNodeValue());
+				pWriter.write("\"");
+				break;
+			case Node.TEXT_NODE:
+				String value = pNode.getNodeValue();
+				if (value != null) {
+					int idx = 0;
+					int len = value.length();
+
+					while (idx < len) {
+						int cdata = value.indexOf(this.CDATA_START, idx);
+
+						// rest of string not CDATA, write all (escaped)
+						if (cdata == -1) {
+							pWriter.writeValue(value.substring(idx));
+							break;
+						}
+
+						// write characters before CDATA (escaped)
+						if (idx < cdata) {
+							pWriter.writeValue(value.substring(idx, cdata));
+							idx = cdata;
+						}
+
+						int end = value.indexOf(this.CDATA_END, idx);
+
+						// invalid CDATA
+						if (end == -1) { throw new IOException("CDATA section not closed: " + value); }
+
+						// write CDATA (not escaped)
+						pWriter.write(value.substring(idx, end + this.CDATA_END.length()));
+						idx = end + this.CDATA_END.length();
+					}
+				}
+		}
+	}
+
+	private String indent() {
+		if (!this.iPretty) { return ""; }
+		StringBuffer result = new StringBuffer();
+		result.append('\n');
+		for (int i = 0; i < this.iIndent; ++i) {
+			result.append(' ');
+		}
+		return result.toString();
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java
index 47f2a01..9b16f2a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java
@@ -1,214 +1,212 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-
-/**
- * Class LocalPathBuilder helps CIM-XML parsers to build local CIMObjectPathes.
- */
-public class LocalPathBuilder {
-
-	private CIMObjectPath iBasePath;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pBasePath
-	 */
-	public LocalPathBuilder(CIMObjectPath pBasePath) {
-		this.iBasePath = pBasePath;
-	}
-
-	/**
-	 * getBasePath
-	 * 
-	 * @return CIMObjectPath
-	 */
-	public CIMObjectPath getBasePath() {
-		return this.iBasePath;
-	}
-
-	/**
-	 * build
-	 * 
-	 * @param pObjPathStr
-	 * @return CIMObjectPath
-	 */
-	public CIMObjectPath build(String pObjPathStr) {
-		return build(this.iBasePath, pObjPathStr);
-	}
-
-	/**
-	 * build
-	 * 
-	 * @param pObjName
-	 * @param pNameSpace
-	 * @return CIMObjectPath
-	 */
-	public CIMObjectPath build(String pObjName, String pNameSpace) {
-		return build(this.iBasePath, pObjName, pNameSpace);
-	}
-
-	/**
-	 * build
-	 * 
-	 * @param pObjName
-	 * @param pNameSpace
-	 * @param pKeys
-	 * @return CIMObjectPath
-	 */
-	public CIMObjectPath build(String pObjName, String pNameSpace, CIMProperty[] pKeys) {
-		return build(this.iBasePath, pObjName, pNameSpace, pKeys);
-	}
-
-	/**
-	 * build
-	 * 
-	 * @param pHost
-	 * @param pNameSpace
-	 * @param pObjName
-	 * @param pKeys
-	 * @return CIMObjectPath
-	 */
-	public CIMObjectPath build(String pHost, String pNameSpace, String pObjName,
-			CIMProperty[] pKeys) {
-		return build(this.iBasePath, pHost, pNameSpace, pObjName, pKeys);
-	}
-
-	/**
-	 * build
-	 * 
-	 * @param pScheme
-	 * @param pHost
-	 * @param pPort
-	 * @param pNameSpace
-	 * @param pObjName
-	 * @param pKeys
-	 * @return CIMObjectPath
-	 */
-	public CIMObjectPath build(String pScheme, String pHost, String pPort, String pNameSpace,
-			String pObjName, CIMProperty[] pKeys) {
-		return build(this.iBasePath, pScheme, pHost, pPort, pNameSpace, pObjName, pKeys);
-	}
-
-	/**
-	 * build
-	 * 
-	 * @param pBasePath
-	 * @param pObjPathStr
-	 * @return CIMObjectPath
-	 */
-	public static CIMObjectPath build(CIMObjectPath pBasePath, String pObjPathStr) {
-		CIMObjectPath path = new CIMObjectPath(pObjPathStr);
-		return build(pBasePath, path.getScheme(), path.getHost(), path.getPort(), path
-				.getNamespace(), path.getObjectName(), path.getKeys());
-	}
-
-	/**
-	 * build
-	 * 
-	 * @param pBasePath
-	 * @param pObjName
-	 * @param pNameSpace
-	 * @return CIMObjectPath
-	 */
-	public static CIMObjectPath build(CIMObjectPath pBasePath, String pObjName, String pNameSpace) {
-		return build(pBasePath, null, null, null, pNameSpace, pObjName, null);
-	}
-
-	/**
-	 * build
-	 * 
-	 * @param pBasePath
-	 * @param pObjName
-	 * @param pNameSpace
-	 * @param pKeys
-	 * @return CIMObjectPath
-	 */
-	public static CIMObjectPath build(CIMObjectPath pBasePath, String pObjName, String pNameSpace,
-			CIMProperty[] pKeys) {
-		return build(pBasePath, null, null, null, pNameSpace, pObjName, pKeys);
-	}
-
-	/**
-	 * build
-	 * 
-	 * @param pBasePath
-	 * @param pHost
-	 * @param pNameSpace
-	 * @param pObjName
-	 * @param pKeys
-	 * @return CIMObjectPath
-	 */
-	public static CIMObjectPath build(CIMObjectPath pBasePath, String pHost, String pNameSpace,
-			String pObjName, CIMProperty[] pKeys) {
-		return build(pBasePath, null, pHost, null, pNameSpace, pObjName, pKeys);
-	}
-
-	/**
-	 * build
-	 * 
-	 * @param pBasePath
-	 * @param pScheme
-	 * @param pHost
-	 * @param pPort
-	 * @param pNameSpace
-	 * @param pObjName
-	 * @param pKeys
-	 * @return CIMObjectPath
-	 */
-	public static CIMObjectPath build(CIMObjectPath pBasePath, String pScheme, String pHost,
-			String pPort, String pNameSpace, String pObjName, CIMProperty[] pKeys) {
-		if (pBasePath == null) return new CIMObjectPath(pScheme, pHost, pPort, pNameSpace,
-				pObjName, pKeys);
-		return new CIMObjectPath(pScheme == null ? pBasePath.getScheme() : pScheme,
-				pHost == null ? pBasePath.getHost() : pHost, pPort == null ? pBasePath.getPort()
-						: pPort, pNameSpace == null ? pBasePath.getNamespace() : pNameSpace,
-				pObjName == null ? pBasePath.getObjectName() : pObjName, pKeys // local
-		// objectpath shouldn't contain keys
-		);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+
+/**
+ * Class LocalPathBuilder helps CIM-XML parsers to build local CIMObjectPathes.
+ */
+public class LocalPathBuilder {
+
+	private CIMObjectPath iBasePath;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pBasePath
+	 */
+	public LocalPathBuilder(CIMObjectPath pBasePath) {
+		this.iBasePath = pBasePath;
+	}
+
+	/**
+	 * getBasePath
+	 * 
+	 * @return CIMObjectPath
+	 */
+	public CIMObjectPath getBasePath() {
+		return this.iBasePath;
+	}
+
+	/**
+	 * build
+	 * 
+	 * @param pObjPathStr
+	 * @return CIMObjectPath
+	 */
+	public CIMObjectPath build(String pObjPathStr) {
+		return build(this.iBasePath, pObjPathStr);
+	}
+
+	/**
+	 * build
+	 * 
+	 * @param pObjName
+	 * @param pNameSpace
+	 * @return CIMObjectPath
+	 */
+	public CIMObjectPath build(String pObjName, String pNameSpace) {
+		return build(this.iBasePath, pObjName, pNameSpace);
+	}
+
+	/**
+	 * build
+	 * 
+	 * @param pObjName
+	 * @param pNameSpace
+	 * @param pKeys
+	 * @return CIMObjectPath
+	 */
+	public CIMObjectPath build(String pObjName, String pNameSpace, CIMProperty[] pKeys) {
+		return build(this.iBasePath, pObjName, pNameSpace, pKeys);
+	}
+
+	/**
+	 * build
+	 * 
+	 * @param pHost
+	 * @param pNameSpace
+	 * @param pObjName
+	 * @param pKeys
+	 * @return CIMObjectPath
+	 */
+	public CIMObjectPath build(String pHost, String pNameSpace, String pObjName,
+			CIMProperty[] pKeys) {
+		return build(this.iBasePath, pHost, pNameSpace, pObjName, pKeys);
+	}
+
+	/**
+	 * build
+	 * 
+	 * @param pScheme
+	 * @param pHost
+	 * @param pPort
+	 * @param pNameSpace
+	 * @param pObjName
+	 * @param pKeys
+	 * @return CIMObjectPath
+	 */
+	public CIMObjectPath build(String pScheme, String pHost, String pPort, String pNameSpace,
+			String pObjName, CIMProperty[] pKeys) {
+		return build(this.iBasePath, pScheme, pHost, pPort, pNameSpace, pObjName, pKeys);
+	}
+
+	/**
+	 * build
+	 * 
+	 * @param pBasePath
+	 * @param pObjPathStr
+	 * @return CIMObjectPath
+	 */
+	public static CIMObjectPath build(CIMObjectPath pBasePath, String pObjPathStr) {
+		CIMObjectPath path = new CIMObjectPath(pObjPathStr);
+		return build(pBasePath, path.getScheme(), path.getHost(), path.getPort(), path
+				.getNamespace(), path.getObjectName(), path.getKeys());
+	}
+
+	/**
+	 * build
+	 * 
+	 * @param pBasePath
+	 * @param pObjName
+	 * @param pNameSpace
+	 * @return CIMObjectPath
+	 */
+	public static CIMObjectPath build(CIMObjectPath pBasePath, String pObjName, String pNameSpace) {
+		return build(pBasePath, null, null, null, pNameSpace, pObjName, null);
+	}
+
+	/**
+	 * build
+	 * 
+	 * @param pBasePath
+	 * @param pObjName
+	 * @param pNameSpace
+	 * @param pKeys
+	 * @return CIMObjectPath
+	 */
+	public static CIMObjectPath build(CIMObjectPath pBasePath, String pObjName, String pNameSpace,
+			CIMProperty[] pKeys) {
+		return build(pBasePath, null, null, null, pNameSpace, pObjName, pKeys);
+	}
+
+	/**
+	 * build
+	 * 
+	 * @param pBasePath
+	 * @param pHost
+	 * @param pNameSpace
+	 * @param pObjName
+	 * @param pKeys
+	 * @return CIMObjectPath
+	 */
+	public static CIMObjectPath build(CIMObjectPath pBasePath, String pHost, String pNameSpace,
+			String pObjName, CIMProperty[] pKeys) {
+		return build(pBasePath, null, pHost, null, pNameSpace, pObjName, pKeys);
+	}
+
+	/**
+	 * build
+	 * 
+	 * @param pBasePath
+	 * @param pScheme
+	 * @param pHost
+	 * @param pPort
+	 * @param pNameSpace
+	 * @param pObjName
+	 * @param pKeys
+	 * @return CIMObjectPath
+	 */
+	public static CIMObjectPath build(CIMObjectPath pBasePath, String pScheme, String pHost,
+			String pPort, String pNameSpace, String pObjName, CIMProperty[] pKeys) {
+		if (pBasePath == null) return new CIMObjectPath(pScheme, pHost, pPort, pNameSpace,
+				pObjName, pKeys);
+		return new CIMObjectPath(pScheme == null ? pBasePath.getScheme() : pScheme,
+				pHost == null ? pBasePath.getHost() : pHost, pPort == null ? pBasePath.getPort()
+						: pPort, pNameSpace == null ? pBasePath.getNamespace() : pNameSpace,
+				pObjName == null ? pBasePath.getObjectName() : pObjName, pKeys // local
+		// objectpath shouldn't contain keys
+		);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/TypedValue.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/TypedValue.java
similarity index 63%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/TypedValue.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/TypedValue.java
index a14c883..6a98cef 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/TypedValue.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/TypedValue.java
@@ -1,85 +1,83 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-/**
- * Class TypedValue is required for the CIM-XML DOM parser.
- * 
- */
-public class TypedValue {
-
-	private CIMDataType iType;
-
-	private Object iValue;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pType
-	 * @param pValue
-	 */
-	public TypedValue(CIMDataType pType, Object pValue) {
-		this.iType = pType;
-		this.iValue = pValue;
-	}
-
-	/**
-	 * getType
-	 * 
-	 * @return CIMDataType
-	 */
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-	/**
-	 * getValue
-	 * 
-	 * @return Object
-	 */
-	public Object getValue() {
-		return this.iValue;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+
+/**
+ * Class TypedValue is required for the CIM-XML DOM parser.
+ * 
+ */
+public class TypedValue {
+
+	private CIMDataType iType;
+
+	private Object iValue;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pType
+	 * @param pValue
+	 */
+	public TypedValue(CIMDataType pType, Object pValue) {
+		this.iType = pType;
+		this.iValue = pValue;
+	}
+
+	/**
+	 * getType
+	 * 
+	 * @return CIMDataType
+	 */
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+	/**
+	 * getValue
+	 * 
+	 * @return Object
+	 */
+	public Object getValue() {
+		return this.iValue;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java
similarity index 86%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java
index c83df7a..e3bc52a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java
@@ -1,592 +1,590 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1735693    2007-06-12  ebak         Empty VALUE.ARRAY elements are parsed as nulls
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
- * 3023340    2010-07-02  blaschke-oss CIMObjectFactory uses # constructor instead of valueOf
- * 3027615    2010-07-12  blaschke-oss Use CLASS_ARRAY_T instead of new CIMDataType(CLASS,0)
- * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
- * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
- *    2693    2013-10-21  blaschke-oss ReturnValueNode allows invalid PARAMTYPE attribute
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTime;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTimeAbsolute;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTimeInterval;
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger16;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger32;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger64;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger8;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.ClassNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.InstanceNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.ValueArrayNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.ValueNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.Util;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.xml.sax.SAXException;
-
-/**
- * Class CIMObjectFactory is responsible for type String and value String
- * parsing.
- */
-public class CIMObjectFactory {
-
-	/**
-	 * getEmbbeddedObjectA
-	 * 
-	 * @param pType
-	 * @param pValueArrayNode
-	 * @param pSession
-	 * @return CIMInstance[], CIMClass[], String[] or null
-	 * @throws SAXException
-	 */
-	public static Object[] getEmbeddedObjA(CIMDataType pType, ValueArrayNode pValueArrayNode,
-			SAXSession pSession) throws SAXException {
-		if (pValueArrayNode == null) return null;
-		return getEmbeddedObjA(pType, (String[]) pValueArrayNode.getValue(), pSession);
-	}
-
-	/**
-	 * getEmbeddedObjectA
-	 * 
-	 * @param pType
-	 * @param pValueStrA
-	 * @param pSession
-	 * @return CIMInstance[], CIMClass[], String[] or null
-	 * @throws SAXException
-	 */
-	public static Object[] getEmbeddedObjA(CIMDataType pType, String[] pValueStrA,
-			SAXSession pSession) throws SAXException {
-		embeddedObjTypeCheck(pType);
-		if (pValueStrA == null || pValueStrA.length == 0) return null;
-		CIMDataType type = null;
-		ArrayList objAL = new ArrayList(pValueStrA.length);
-		for (int i = 0; i < pValueStrA.length; i++) {
-			Object obj = parseEmbeddedObj(pValueStrA[i], pSession);
-			if (type == null) {
-				type = getCIMObjScalarType(obj, false);
-			} else {
-				CIMDataType type2 = getCIMObjScalarType(obj, false);
-				if (type2 != null && type != type2) throw new SAXException(
-						"Embedded Object array contains both Instance and Class objects. "
-								+ "This is not handled!");
-			}
-			objAL.add(obj);
-		}
-		if (type == CIMDataType.OBJECT_T) {
-			return objAL.toArray(EMPTY_INST_A);
-		} else if (type == CIMDataType.CLASS_T) { return objAL.toArray(EMPTY_CLASS_A); }
-		return objAL.toArray(EMPTY_STR_A);
-	}
-
-	/**
-	 * getEmbeddedObject
-	 * 
-	 * @param pType
-	 * @param pValueStr
-	 * @param pSession
-	 * @return CIMInstance, CIMClass or null
-	 * @throws SAXException
-	 */
-	public static Object getEmbeddedObj(CIMDataType pType, String pValueStr, SAXSession pSession)
-			throws SAXException {
-		embeddedObjTypeCheck(pType);
-		return parseEmbeddedObj(pValueStr, pSession);
-	}
-
-	/**
-	 * getEmbeddedObj
-	 * 
-	 * @param pType
-	 * @param pValObj
-	 * @param pSession
-	 * @return Object CIMClass, CIMInstance, String, CIMClass[], CIMInstance[],
-	 *         String[] or null
-	 * @throws SAXException
-	 */
-	public static Object getEmbeddedObj(CIMDataType pType, Object pValObj, SAXSession pSession)
-			throws SAXException {
-		if (pValObj instanceof String) { return getEmbeddedObj(pType, (String) pValObj, pSession); }
-		return getEmbeddedObjA(pType, (String[]) pValObj, pSession);
-	}
-
-	/**
-	 * @param pType
-	 * @param pAL
-	 * @return Object[]
-	 */
-	public static Object[] getObjectArray(CIMDataType pType, ArrayList pAL) {
-		createValFactoryA();
-		// if (pType==null) pType=CIMDataType.STRING_T;
-		ValueFactory factory = cValFactoryA[pType.getType()];
-		return factory.make(pAL);
-	}
-
-	/**
-	 * getObject
-	 * 
-	 * @param pType
-	 * @param pValueStr
-	 * @return Object
-	 * @throws SAXException
-	 */
-	public static Object getObject(CIMDataType pType, String pValueStr) throws SAXException {
-		if (pValueStr == null) return null;
-		createValFactoryA();
-		ValueFactory factory = cValFactoryA[pType.getType()];
-		try {
-			return factory.make(pValueStr);
-		} catch (NumberFormatException e) {
-			throw new SAXException(e);
-		}
-	}
-
-	/**
-	 * getObject
-	 * 
-	 * @param pType
-	 * @param pValueNode
-	 * @return Object
-	 * @throws SAXException
-	 */
-	public static Object getObject(CIMDataType pType, ValueNode pValueNode) throws SAXException {
-		if (pValueNode == null) return null;
-		return getObject(pType, (String) pValueNode.getValue());
-	}
-
-	/**
-	 * getObject
-	 * 
-	 * @param pType
-	 * @param pValueArrayNode
-	 * @return Object
-	 * @throws SAXException
-	 */
-	public static Object getObject(CIMDataType pType, ValueArrayNode pValueArrayNode)
-			throws SAXException {
-		if (pValueArrayNode == null) return null;
-		ArrayList objAL = new ArrayList(pValueArrayNode.size());
-		for (int i = 0; i < pValueArrayNode.size(); i++)
-			objAL.add(getObject(pType, (String) pValueArrayNode.elementAt(i)));
-		return getObjectArray(pType, objAL);
-	}
-
-	/**
-	 * getCIMObjType
-	 * 
-	 * @param pObj
-	 * @param pNullToString
-	 * @return CIMDataType OBJECT_T, CLASS_T, STRING_T
-	 * @throws SAXException
-	 */
-	public static CIMDataType getCIMObjScalarType(Object pObj, boolean pNullToString)
-			throws SAXException {
-		if (pObj == null) return pNullToString ? CIMDataType.STRING_T : null;
-		if (pObj instanceof CIMInstance) {
-			return CIMDataType.OBJECT_T;
-		} else if (pObj instanceof CIMClass) {
-			return CIMDataType.CLASS_T;
-		} else if (pObj instanceof String) { return CIMDataType.STRING_T; }
-		throw new SAXException(pObj.getClass().getName() + " is not a CIMObject!");
-	}
-
-	/**
-	 * getCIMObjType
-	 * 
-	 * @param pObj
-	 * @return CIMDataType OBJECT_T, OBJECT_ARRAY_T
-	 * @throws SAXException
-	 */
-	public static CIMDataType getCIMObjScalarType(Object pObj) throws SAXException {
-		return getCIMObjScalarType(pObj, true);
-	}
-
-	/**
-	 * getCIMObjArrayType
-	 * 
-	 * @param pObj
-	 * @return CIMDataType: OBJECT_ARRAY_T, CLASS_T array, STRING_ARRAY_T
-	 * @throws SAXException
-	 */
-	public static CIMDataType getCIMObjArrayType(Object pObj) throws SAXException {
-		return getCIMObjArrayType(pObj, true);
-	}
-
-	/**
-	 * getArrayCIMObjType
-	 * 
-	 * @param pObj
-	 * @param pNullToString
-	 * @return CIMDataType: OBJECT_ARRAY_T, CLASS_T array, STRING_ARRAY_T or
-	 *         null
-	 * @throws SAXException
-	 */
-	public static CIMDataType getCIMObjArrayType(Object pObj, boolean pNullToString)
-			throws SAXException {
-		if (pObj == null) return pNullToString ? CIMDataType.STRING_ARRAY_T : null;
-		if (pObj instanceof CIMInstance[]) {
-			return CIMDataType.OBJECT_ARRAY_T;
-		} else if (pObj instanceof CIMClass[]) {
-			return CIMDataType.CLASS_ARRAY_T;
-		} else if (pObj instanceof String[]) { return CIMDataType.STRING_ARRAY_T; }
-		throw new SAXException(pObj.getClass().getName() + " is not a CIMObject array!");
-	}
-
-	/**
-	 * getType
-	 * 
-	 * @param pTypeStr
-	 * @return CIMDataType
-	 * @throws SAXException
-	 */
-	public static CIMDataType getType(String pTypeStr) throws SAXException {
-		if (pTypeStr == null) return null;
-		createTypeStrMap();
-		CIMDataType type = cTypeStrMap.get(pTypeStr);
-		if (type == null && !cTypeStrMap.containsKey(pTypeStr)) throw new SAXException(pTypeStr
-				+ " is invalid PARAMTYPE!");
-		return type;
-	}
-
-	static final CIMInstance[] EMPTY_INST_A = new CIMInstance[0];
-
-	static final CIMClass[] EMPTY_CLASS_A = new CIMClass[0];
-
-	static final String[] EMPTY_STR_A = new String[0];
-
-	static final UnsignedInteger8[] EMPTY_UINT8_A = new UnsignedInteger8[0];
-
-	static final UnsignedInteger16[] EMPTY_UINT16_A = new UnsignedInteger16[0];
-
-	static final UnsignedInteger32[] EMPTY_UINT32_A = new UnsignedInteger32[0];
-
-	static final UnsignedInteger64[] EMPTY_UINT64_A = new UnsignedInteger64[0];
-
-	static final Byte[] EMPTY_BYTE_A = new Byte[0];
-
-	static final Short[] EMPTY_SHORT_A = new Short[0];
-
-	static final Integer[] EMPTY_INT_A = new Integer[0];
-
-	static final Long[] EMPTY_LONG_A = new Long[0];
-
-	static final Float[] EMPTY_FLOAT_A = new Float[0];
-
-	static final Double[] EMPTY_DOUBLE_A = new Double[0];
-
-	static final Character[] EMPTY_CHAR_A = new Character[0];
-
-	static final Boolean[] EMPTY_BOOL_A = new Boolean[0];
-
-	static final CIMDateTime[] EMPTY_DT_A = new CIMDateTime[0];
-
-	static final CIMObjectPath[] EMPTY_OP_A = new CIMObjectPath[0];
-
-	private static void embeddedObjTypeCheck(CIMDataType pType) throws SAXException {
-		if (pType.getType() != CIMDataType.STRING) throw new SAXException(
-				"TYPE attribute should be 'string' for EmbeddedObjects!");
-	}
-
-	private static Object parseEmbeddedObj(String pValueStr, SAXSession pSession)
-			throws SAXException {
-		if (pValueStr == null || pValueStr.length() == 0) return null;
-		XMLDefaultHandlerImpl ourHandler = new XMLDefaultHandlerImpl(pSession, true);
-		// XML String of embedded Object is parsed by the SAX parser
-		SAXParserFactory factory = SAXParserFactory.newInstance();
-		try {
-			SAXParser saxParser = factory.newSAXParser();
-			saxParser.parse(new ByteArrayInputStream(pValueStr.getBytes()), ourHandler);
-		} catch (SAXException se) {
-			throw se;
-		} catch (Exception e) {
-			throw new SAXException("Exception occurred during embedded object parsing!", e);
-		}
-		Node node = ourHandler.getRootNode();
-		if (node instanceof InstanceNode) { return ((InstanceNode) node).getCIMInstance(); }
-		if (node instanceof ClassNode) { return ((ClassNode) node).getCIMClass(); }
-		throw new SAXException(node.getNodeName()
-				+ " root element is unexpected for Embedded Object XML String!");
-	}
-
-	private static HashMap cTypeStrMap;
-
-	private synchronized static void createTypeStrMap() {
-		if (cTypeStrMap != null) return;
-		cTypeStrMap = new HashMap();
-		cTypeStrMap.put(MOF.DT_UINT8, CIMDataType.UINT8_T);
-		cTypeStrMap.put(MOF.DT_UINT16, CIMDataType.UINT16_T);
-		cTypeStrMap.put(MOF.DT_UINT32, CIMDataType.UINT32_T);
-		cTypeStrMap.put(MOF.DT_UINT64, CIMDataType.UINT64_T);
-		cTypeStrMap.put(MOF.DT_SINT8, CIMDataType.SINT8_T);
-		cTypeStrMap.put(MOF.DT_SINT16, CIMDataType.SINT16_T);
-		cTypeStrMap.put(MOF.DT_SINT32, CIMDataType.SINT32_T);
-		cTypeStrMap.put(MOF.DT_SINT64, CIMDataType.SINT64_T);
-		cTypeStrMap.put(MOF.DT_REAL32, CIMDataType.REAL32_T);
-		cTypeStrMap.put(MOF.DT_REAL64, CIMDataType.REAL64_T);
-		cTypeStrMap.put(MOF.DT_CHAR16, CIMDataType.CHAR16_T);
-		cTypeStrMap.put(MOF.DT_STR, CIMDataType.STRING_T);
-		cTypeStrMap.put(MOF.DT_BOOL, CIMDataType.BOOLEAN_T);
-		cTypeStrMap.put(MOF.DT_DATETIME, CIMDataType.DATETIME_T);
-		cTypeStrMap.put(MOF.REFERENCE, new CIMDataType(""));
-	}
-
-	private interface ValueFactory {
-
-		/**
-		 * make
-		 * 
-		 * @param pStr
-		 * @return Object
-		 */
-		Object make(String pStr);
-
-		/**
-		 * make
-		 * 
-		 * @param pAL
-		 * @return Object[]
-		 */
-		Object[] make(ArrayList pAL);
-	}
-
-	private static ValueFactory[] cValFactoryA;
-
-	private static void putFactory(int pTypeCode, ValueFactory pFactory) {
-		cValFactoryA[pTypeCode] = pFactory;
-	}
-
-	private synchronized static void createValFactoryA() {
-		if (cValFactoryA != null) return;
-		cValFactoryA = new ValueFactory[64];
-		// unsigned integers
-		putFactory(CIMDataType.UINT8, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new UnsignedInteger8(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_UINT8_A);
-			}
-		});
-		putFactory(CIMDataType.UINT16, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new UnsignedInteger16(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_UINT16_A);
-			}
-		});
-		putFactory(CIMDataType.UINT32, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new UnsignedInteger32(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_UINT32_A);
-			}
-		});
-		putFactory(CIMDataType.UINT64, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new UnsignedInteger64(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_UINT64_A);
-			}
-		});
-		// signed integers
-		putFactory(CIMDataType.SINT8, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new Byte(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_BYTE_A);
-			}
-		});
-		putFactory(CIMDataType.SINT16, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new Short(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_SHORT_A);
-			}
-		});
-		putFactory(CIMDataType.SINT32, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new Integer(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_INT_A);
-			}
-		});
-		putFactory(CIMDataType.SINT64, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new Long(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_LONG_A);
-			}
-		});
-		// floats
-		putFactory(CIMDataType.REAL32, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new Float(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_FLOAT_A);
-			}
-		});
-		putFactory(CIMDataType.REAL64, new ValueFactory() {
-
-			public Object make(String pStr) {
-				if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
-					if (Util.isBadDoubleString(pStr)) throw new IllegalArgumentException(
-							"Double value string hangs older JVMs!\n" + pStr);
-				}
-				return new Double(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_DOUBLE_A);
-			}
-		});
-		// char
-		putFactory(CIMDataType.CHAR16, new ValueFactory() {
-
-			public Object make(String pStr) {
-				if (pStr == null || pStr.length() == 0) throw new IllegalArgumentException(
-						"Cannot make Character from empty String!");
-				return Character.valueOf(pStr.charAt(0));
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_CHAR_A);
-			}
-		});
-		// string
-		putFactory(CIMDataType.STRING, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return pStr;
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_STR_A);
-			}
-		});
-		// boolean
-		putFactory(CIMDataType.BOOLEAN, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return Boolean.valueOf(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_BOOL_A);
-			}
-		});
-		// datetime
-		putFactory(CIMDataType.DATETIME, new ValueFactory() {
-
-			public Object make(String pStr) {
-				try {
-					return new CIMDateTimeAbsolute(pStr);
-				} catch (IllegalArgumentException eA) {
-					try {
-						return new CIMDateTimeInterval(pStr);
-					} catch (IllegalArgumentException eI) {
-						throw new IllegalArgumentException("CIMDataTimeAbsolute:" + eA.getMessage()
-								+ "\nCIMDateTimeInterval:" + eI.getMessage());
-					}
-				}
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_DT_A);
-			}
-		});
-		// reference
-		putFactory(CIMDataType.REFERENCE, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new CIMObjectPath(pStr);
-			}
-
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_OP_A);
-			}
-		});
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1735693    2007-06-12  ebak         Empty VALUE.ARRAY elements are parsed as nulls
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
+ * 3023340    2010-07-02  blaschke-oss CIMObjectFactory uses # constructor instead of valueOf
+ * 3027615    2010-07-12  blaschke-oss Use CLASS_ARRAY_T instead of new CIMDataType(CLASS,0)
+ * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
+ * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
+ *    2693    2013-10-21  blaschke-oss ReturnValueNode allows invalid PARAMTYPE attribute
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
+import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.ClassNode;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.InstanceNode;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.ValueArrayNode;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.ValueNode;
+import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
+import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.metricshub.wbem.javax.cim.CIMDateTime;
+import org.metricshub.wbem.javax.cim.UnsignedInteger16;
+import org.metricshub.wbem.javax.cim.UnsignedInteger32;
+import org.metricshub.wbem.javax.cim.UnsignedInteger64;
+import org.metricshub.wbem.javax.cim.UnsignedInteger8;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.SAXException;
+
+/**
+ * Class CIMObjectFactory is responsible for type String and value String
+ * parsing.
+ */
+public class CIMObjectFactory {
+
+	/**
+	 * getEmbbeddedObjectA
+	 * 
+	 * @param pType
+	 * @param pValueArrayNode
+	 * @param pSession
+	 * @return CIMInstance[], CIMClass[], String[] or null
+	 * @throws SAXException
+	 */
+	public static Object[] getEmbeddedObjA(CIMDataType pType, ValueArrayNode pValueArrayNode,
+			SAXSession pSession) throws SAXException {
+		if (pValueArrayNode == null) return null;
+		return getEmbeddedObjA(pType, (String[]) pValueArrayNode.getValue(), pSession);
+	}
+
+	/**
+	 * getEmbeddedObjectA
+	 * 
+	 * @param pType
+	 * @param pValueStrA
+	 * @param pSession
+	 * @return CIMInstance[], CIMClass[], String[] or null
+	 * @throws SAXException
+	 */
+	public static Object[] getEmbeddedObjA(CIMDataType pType, String[] pValueStrA,
+			SAXSession pSession) throws SAXException {
+		embeddedObjTypeCheck(pType);
+		if (pValueStrA == null || pValueStrA.length == 0) return null;
+		CIMDataType type = null;
+		ArrayList objAL = new ArrayList(pValueStrA.length);
+		for (int i = 0; i < pValueStrA.length; i++) {
+			Object obj = parseEmbeddedObj(pValueStrA[i], pSession);
+			if (type == null) {
+				type = getCIMObjScalarType(obj, false);
+			} else {
+				CIMDataType type2 = getCIMObjScalarType(obj, false);
+				if (type2 != null && type != type2) throw new SAXException(
+						"Embedded Object array contains both Instance and Class objects. "
+								+ "This is not handled!");
+			}
+			objAL.add(obj);
+		}
+		if (type == CIMDataType.OBJECT_T) {
+			return objAL.toArray(EMPTY_INST_A);
+		} else if (type == CIMDataType.CLASS_T) { return objAL.toArray(EMPTY_CLASS_A); }
+		return objAL.toArray(EMPTY_STR_A);
+	}
+
+	/**
+	 * getEmbeddedObject
+	 * 
+	 * @param pType
+	 * @param pValueStr
+	 * @param pSession
+	 * @return CIMInstance, CIMClass or null
+	 * @throws SAXException
+	 */
+	public static Object getEmbeddedObj(CIMDataType pType, String pValueStr, SAXSession pSession)
+			throws SAXException {
+		embeddedObjTypeCheck(pType);
+		return parseEmbeddedObj(pValueStr, pSession);
+	}
+
+	/**
+	 * getEmbeddedObj
+	 * 
+	 * @param pType
+	 * @param pValObj
+	 * @param pSession
+	 * @return Object CIMClass, CIMInstance, String, CIMClass[], CIMInstance[],
+	 *         String[] or null
+	 * @throws SAXException
+	 */
+	public static Object getEmbeddedObj(CIMDataType pType, Object pValObj, SAXSession pSession)
+			throws SAXException {
+		if (pValObj instanceof String) { return getEmbeddedObj(pType, (String) pValObj, pSession); }
+		return getEmbeddedObjA(pType, (String[]) pValObj, pSession);
+	}
+
+	/**
+	 * @param pType
+	 * @param pAL
+	 * @return Object[]
+	 */
+	public static Object[] getObjectArray(CIMDataType pType, ArrayList pAL) {
+		createValFactoryA();
+		// if (pType==null) pType=CIMDataType.STRING_T;
+		ValueFactory factory = cValFactoryA[pType.getType()];
+		return factory.make(pAL);
+	}
+
+	/**
+	 * getObject
+	 * 
+	 * @param pType
+	 * @param pValueStr
+	 * @return Object
+	 * @throws SAXException
+	 */
+	public static Object getObject(CIMDataType pType, String pValueStr) throws SAXException {
+		if (pValueStr == null) return null;
+		createValFactoryA();
+		ValueFactory factory = cValFactoryA[pType.getType()];
+		try {
+			return factory.make(pValueStr);
+		} catch (NumberFormatException e) {
+			throw new SAXException(e);
+		}
+	}
+
+	/**
+	 * getObject
+	 * 
+	 * @param pType
+	 * @param pValueNode
+	 * @return Object
+	 * @throws SAXException
+	 */
+	public static Object getObject(CIMDataType pType, ValueNode pValueNode) throws SAXException {
+		if (pValueNode == null) return null;
+		return getObject(pType, (String) pValueNode.getValue());
+	}
+
+	/**
+	 * getObject
+	 * 
+	 * @param pType
+	 * @param pValueArrayNode
+	 * @return Object
+	 * @throws SAXException
+	 */
+	public static Object getObject(CIMDataType pType, ValueArrayNode pValueArrayNode)
+			throws SAXException {
+		if (pValueArrayNode == null) return null;
+		ArrayList objAL = new ArrayList(pValueArrayNode.size());
+		for (int i = 0; i < pValueArrayNode.size(); i++)
+			objAL.add(getObject(pType, (String) pValueArrayNode.elementAt(i)));
+		return getObjectArray(pType, objAL);
+	}
+
+	/**
+	 * getCIMObjType
+	 * 
+	 * @param pObj
+	 * @param pNullToString
+	 * @return CIMDataType OBJECT_T, CLASS_T, STRING_T
+	 * @throws SAXException
+	 */
+	public static CIMDataType getCIMObjScalarType(Object pObj, boolean pNullToString)
+			throws SAXException {
+		if (pObj == null) return pNullToString ? CIMDataType.STRING_T : null;
+		if (pObj instanceof CIMInstance) {
+			return CIMDataType.OBJECT_T;
+		} else if (pObj instanceof CIMClass) {
+			return CIMDataType.CLASS_T;
+		} else if (pObj instanceof String) { return CIMDataType.STRING_T; }
+		throw new SAXException(pObj.getClass().getName() + " is not a CIMObject!");
+	}
+
+	/**
+	 * getCIMObjType
+	 * 
+	 * @param pObj
+	 * @return CIMDataType OBJECT_T, OBJECT_ARRAY_T
+	 * @throws SAXException
+	 */
+	public static CIMDataType getCIMObjScalarType(Object pObj) throws SAXException {
+		return getCIMObjScalarType(pObj, true);
+	}
+
+	/**
+	 * getCIMObjArrayType
+	 * 
+	 * @param pObj
+	 * @return CIMDataType: OBJECT_ARRAY_T, CLASS_T array, STRING_ARRAY_T
+	 * @throws SAXException
+	 */
+	public static CIMDataType getCIMObjArrayType(Object pObj) throws SAXException {
+		return getCIMObjArrayType(pObj, true);
+	}
+
+	/**
+	 * getArrayCIMObjType
+	 * 
+	 * @param pObj
+	 * @param pNullToString
+	 * @return CIMDataType: OBJECT_ARRAY_T, CLASS_T array, STRING_ARRAY_T or
+	 *         null
+	 * @throws SAXException
+	 */
+	public static CIMDataType getCIMObjArrayType(Object pObj, boolean pNullToString)
+			throws SAXException {
+		if (pObj == null) return pNullToString ? CIMDataType.STRING_ARRAY_T : null;
+		if (pObj instanceof CIMInstance[]) {
+			return CIMDataType.OBJECT_ARRAY_T;
+		} else if (pObj instanceof CIMClass[]) {
+			return CIMDataType.CLASS_ARRAY_T;
+		} else if (pObj instanceof String[]) { return CIMDataType.STRING_ARRAY_T; }
+		throw new SAXException(pObj.getClass().getName() + " is not a CIMObject array!");
+	}
+
+	/**
+	 * getType
+	 * 
+	 * @param pTypeStr
+	 * @return CIMDataType
+	 * @throws SAXException
+	 */
+	public static CIMDataType getType(String pTypeStr) throws SAXException {
+		if (pTypeStr == null) return null;
+		createTypeStrMap();
+		CIMDataType type = cTypeStrMap.get(pTypeStr);
+		if (type == null && !cTypeStrMap.containsKey(pTypeStr)) throw new SAXException(pTypeStr
+				+ " is invalid PARAMTYPE!");
+		return type;
+	}
+
+	static final CIMInstance[] EMPTY_INST_A = new CIMInstance[0];
+
+	static final CIMClass[] EMPTY_CLASS_A = new CIMClass[0];
+
+	static final String[] EMPTY_STR_A = new String[0];
+
+	static final UnsignedInteger8[] EMPTY_UINT8_A = new UnsignedInteger8[0];
+
+	static final UnsignedInteger16[] EMPTY_UINT16_A = new UnsignedInteger16[0];
+
+	static final UnsignedInteger32[] EMPTY_UINT32_A = new UnsignedInteger32[0];
+
+	static final UnsignedInteger64[] EMPTY_UINT64_A = new UnsignedInteger64[0];
+
+	static final Byte[] EMPTY_BYTE_A = new Byte[0];
+
+	static final Short[] EMPTY_SHORT_A = new Short[0];
+
+	static final Integer[] EMPTY_INT_A = new Integer[0];
+
+	static final Long[] EMPTY_LONG_A = new Long[0];
+
+	static final Float[] EMPTY_FLOAT_A = new Float[0];
+
+	static final Double[] EMPTY_DOUBLE_A = new Double[0];
+
+	static final Character[] EMPTY_CHAR_A = new Character[0];
+
+	static final Boolean[] EMPTY_BOOL_A = new Boolean[0];
+
+	static final CIMDateTime[] EMPTY_DT_A = new CIMDateTime[0];
+
+	static final CIMObjectPath[] EMPTY_OP_A = new CIMObjectPath[0];
+
+	private static void embeddedObjTypeCheck(CIMDataType pType) throws SAXException {
+		if (pType.getType() != CIMDataType.STRING) throw new SAXException(
+				"TYPE attribute should be 'string' for EmbeddedObjects!");
+	}
+
+	private static Object parseEmbeddedObj(String pValueStr, SAXSession pSession)
+			throws SAXException {
+		if (pValueStr == null || pValueStr.length() == 0) return null;
+		XMLDefaultHandlerImpl ourHandler = new XMLDefaultHandlerImpl(pSession, true);
+		// XML String of embedded Object is parsed by the SAX parser
+		SAXParserFactory factory = SAXParserFactory.newInstance();
+		try {
+			SAXParser saxParser = factory.newSAXParser();
+			saxParser.parse(new ByteArrayInputStream(pValueStr.getBytes()), ourHandler);
+		} catch (SAXException se) {
+			throw se;
+		} catch (Exception e) {
+			throw new SAXException("Exception occurred during embedded object parsing!", e);
+		}
+		Node node = ourHandler.getRootNode();
+		if (node instanceof InstanceNode) { return ((InstanceNode) node).getCIMInstance(); }
+		if (node instanceof ClassNode) { return ((ClassNode) node).getCIMClass(); }
+		throw new SAXException(node.getNodeName()
+				+ " root element is unexpected for Embedded Object XML String!");
+	}
+
+	private static HashMap cTypeStrMap;
+
+	private synchronized static void createTypeStrMap() {
+		if (cTypeStrMap != null) return;
+		cTypeStrMap = new HashMap();
+		cTypeStrMap.put(MOF.DT_UINT8, CIMDataType.UINT8_T);
+		cTypeStrMap.put(MOF.DT_UINT16, CIMDataType.UINT16_T);
+		cTypeStrMap.put(MOF.DT_UINT32, CIMDataType.UINT32_T);
+		cTypeStrMap.put(MOF.DT_UINT64, CIMDataType.UINT64_T);
+		cTypeStrMap.put(MOF.DT_SINT8, CIMDataType.SINT8_T);
+		cTypeStrMap.put(MOF.DT_SINT16, CIMDataType.SINT16_T);
+		cTypeStrMap.put(MOF.DT_SINT32, CIMDataType.SINT32_T);
+		cTypeStrMap.put(MOF.DT_SINT64, CIMDataType.SINT64_T);
+		cTypeStrMap.put(MOF.DT_REAL32, CIMDataType.REAL32_T);
+		cTypeStrMap.put(MOF.DT_REAL64, CIMDataType.REAL64_T);
+		cTypeStrMap.put(MOF.DT_CHAR16, CIMDataType.CHAR16_T);
+		cTypeStrMap.put(MOF.DT_STR, CIMDataType.STRING_T);
+		cTypeStrMap.put(MOF.DT_BOOL, CIMDataType.BOOLEAN_T);
+		cTypeStrMap.put(MOF.DT_DATETIME, CIMDataType.DATETIME_T);
+		cTypeStrMap.put(MOF.REFERENCE, new CIMDataType(""));
+	}
+
+	private interface ValueFactory {
+
+		/**
+		 * make
+		 * 
+		 * @param pStr
+		 * @return Object
+		 */
+		Object make(String pStr);
+
+		/**
+		 * make
+		 * 
+		 * @param pAL
+		 * @return Object[]
+		 */
+		Object[] make(ArrayList pAL);
+	}
+
+	private static ValueFactory[] cValFactoryA;
+
+	private static void putFactory(int pTypeCode, ValueFactory pFactory) {
+		cValFactoryA[pTypeCode] = pFactory;
+	}
+
+	private synchronized static void createValFactoryA() {
+		if (cValFactoryA != null) return;
+		cValFactoryA = new ValueFactory[64];
+		// unsigned integers
+		putFactory(CIMDataType.UINT8, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return new UnsignedInteger8(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_UINT8_A);
+			}
+		});
+		putFactory(CIMDataType.UINT16, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return new UnsignedInteger16(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_UINT16_A);
+			}
+		});
+		putFactory(CIMDataType.UINT32, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return new UnsignedInteger32(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_UINT32_A);
+			}
+		});
+		putFactory(CIMDataType.UINT64, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return new UnsignedInteger64(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_UINT64_A);
+			}
+		});
+		// signed integers
+		putFactory(CIMDataType.SINT8, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return new Byte(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_BYTE_A);
+			}
+		});
+		putFactory(CIMDataType.SINT16, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return new Short(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_SHORT_A);
+			}
+		});
+		putFactory(CIMDataType.SINT32, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return new Integer(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_INT_A);
+			}
+		});
+		putFactory(CIMDataType.SINT64, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return new Long(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_LONG_A);
+			}
+		});
+		// floats
+		putFactory(CIMDataType.REAL32, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return new Float(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_FLOAT_A);
+			}
+		});
+		putFactory(CIMDataType.REAL64, new ValueFactory() {
+
+			public Object make(String pStr) {
+				if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
+					if (Util.isBadDoubleString(pStr)) throw new IllegalArgumentException(
+							"Double value string hangs older JVMs!\n" + pStr);
+				}
+				return new Double(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_DOUBLE_A);
+			}
+		});
+		// char
+		putFactory(CIMDataType.CHAR16, new ValueFactory() {
+
+			public Object make(String pStr) {
+				if (pStr == null || pStr.length() == 0) throw new IllegalArgumentException(
+						"Cannot make Character from empty String!");
+				return Character.valueOf(pStr.charAt(0));
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_CHAR_A);
+			}
+		});
+		// string
+		putFactory(CIMDataType.STRING, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return pStr;
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_STR_A);
+			}
+		});
+		// boolean
+		putFactory(CIMDataType.BOOLEAN, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return Boolean.valueOf(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_BOOL_A);
+			}
+		});
+		// datetime
+		putFactory(CIMDataType.DATETIME, new ValueFactory() {
+
+			public Object make(String pStr) {
+				try {
+					return new CIMDateTimeAbsolute(pStr);
+				} catch (IllegalArgumentException eA) {
+					try {
+						return new CIMDateTimeInterval(pStr);
+					} catch (IllegalArgumentException eI) {
+						throw new IllegalArgumentException("CIMDataTimeAbsolute:" + eA.getMessage()
+								+ "\nCIMDateTimeInterval:" + eI.getMessage());
+					}
+				}
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_DT_A);
+			}
+		});
+		// reference
+		putFactory(CIMDataType.REFERENCE, new ValueFactory() {
+
+			public Object make(String pStr) {
+				return new CIMObjectPath(pStr);
+			}
+
+			public Object[] make(ArrayList pAL) {
+				return pAL.toArray(EMPTY_OP_A);
+			}
+		});
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java
similarity index 85%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java
index f6b35fc..b24608b 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java
@@ -1,351 +1,348 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
- * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
- * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
- * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
- * 3281781    2011-04-11  blaschke-oss fail to parse Embedded Instance parameter
- * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
- * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
- *    2691    2013-10-18  blaschke-oss RETURNVALUE should not require PARAMTYPE attribute
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMHelper;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractValueNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.ArrayIf;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.QualifiedNodeHandler;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.ValueArrayNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.ValueNode;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * EmbObjHandler helps the parsing of embedded object elements.
- */
-
-public class EmbObjHandler {
-
-	private String iNodeName;
-
-	private CIMDataType iRawType;
-
-	private boolean iHasEmbObjAttr, iHasEmbInstAttr;
-
-	private SAXSession iSession;
-
-	private CIMDataType iType;
-
-	private Object iValue;
-
-	private QualifiedNodeHandler iQualiHandler;
-
-	private AbstractValueNode iAbsValNode;
-
-	/**
-	 * Generic initialization.
-	 * 
-	 * @param pHandler
-	 * @param pNodeName
-	 * @param pAttribs
-	 * @param pSession
-	 * @param pQNodeHandler
-	 * @param pCheckEmbObjAttrib
-	 * @return EmbObjHandler
-	 * @throws SAXException
-	 */
-	public static EmbObjHandler init(EmbObjHandler pHandler, String pNodeName, Attributes pAttribs,
-			SAXSession pSession, QualifiedNodeHandler pQNodeHandler, boolean pCheckEmbObjAttrib)
-			throws SAXException {
-		if (pHandler == null) pHandler = new EmbObjHandler();
-		pHandler.initInst(pNodeName, pAttribs, pSession, pQNodeHandler, pCheckEmbObjAttrib);
-		return pHandler;
-	}
-
-	private EmbObjHandler() {
-	// init() used for instantiation
-	}
-
-	/**
-	 * Generic instance initialization.
-	 * 
-	 * @param pNodeName
-	 * @param pAttribs
-	 * @param pSession
-	 * @param pQNodeHandler
-	 * @param pCheckEmbObjAttrib
-	 * @throws SAXException
-	 */
-	public void initInst(String pNodeName, Attributes pAttribs, SAXSession pSession,
-			QualifiedNodeHandler pQNodeHandler, boolean pCheckEmbObjAttrib) throws SAXException {
-		this.iSession = pSession;
-		this.iNodeName = pNodeName;
-		this.iQualiHandler = pQNodeHandler;
-		this.iType = null;
-		this.iValue = null;
-		this.iAbsValNode = null;
-		this.iRawType = Node.getCIMType(pAttribs, true);
-		if (this.iRawType == null) {
-			this.iRawType = Node.getParamType(pAttribs);
-			/*
-			 * if (iRawType==null) throw new SAXException( iNodeName+" must
-			 * contain a TYPE or a PARAMTYPE attribute!" );
-			 */
-			/*
-			 * SVC CIMOM doesn't add TYPE attribute for the RETURNVALUE element,
-			 * but it adds it to the VALUE element.
-			 */
-		}
-
-		if (pCheckEmbObjAttrib) {
-			// DSPs call for EmbeddedObject AND XML is case sensitive, BUT there
-			// are probably CIMOMs out there that still use EMBEDDEDOBJECT
-			String embObjStr = pAttribs.getValue("EmbeddedObject");
-			if (embObjStr == null) {
-				embObjStr = pAttribs.getValue("EMBEDDEDOBJECT");
-			}
-			if (embObjStr == null) {
-				this.iHasEmbInstAttr = this.iHasEmbObjAttr = false;
-			} else if ("instance".equalsIgnoreCase(embObjStr)) {
-				this.iHasEmbInstAttr = true;
-				this.iHasEmbObjAttr = false;
-			} else if ("object".equalsIgnoreCase(embObjStr)) {
-				this.iHasEmbInstAttr = false;
-				this.iHasEmbObjAttr = true;
-			} else {
-				throw new SAXException(
-						"EmbeddedObject attribute's value must be \"object\" or \"instance\". "
-								+ embObjStr + " is invalid!");
-			}
-		} else {
-			this.iHasEmbInstAttr = this.iHasEmbObjAttr = false;
-		}
-	}
-
-	/**
-	 * isEmbeddedObject For this function Object means CLASS or INSTANCE. Object
-	 * can have other meanings at different places !!! :(
-	 * 
-	 * @return boolean
-	 */
-	private boolean isEmbeddedObject() {
-		return this.iHasEmbInstAttr
-				|| this.iHasEmbObjAttr
-				|| (this.iQualiHandler != null && (this.iQualiHandler.isEmbeddedObject() || this.iQualiHandler
-						.isEmbeddedInstance()));
-	}
-
-	/**
-	 * isEmbeddedClass
-	 * 
-	 * @return boolean
-	 */
-	private boolean isEmbeddedClass() {
-		return this.iHasEmbObjAttr
-				|| (this.iQualiHandler != null && this.iQualiHandler.isEmbeddedObject());
-	}
-
-	/**
-	 * isEmbeddedInstance
-	 * 
-	 * @return boolean
-	 */
-	private boolean isEmbeddedInstance() {
-		return this.iHasEmbInstAttr
-				|| (this.iQualiHandler != null && this.iQualiHandler.isEmbeddedInstance());
-	}
-
-	/**
-	 * getValue
-	 * 
-	 * @return Object
-	 * @throws SAXException
-	 */
-	public Object getValue() throws SAXException {
-		transform();
-		return this.iValue;
-	}
-
-	/**
-	 * getType
-	 * 
-	 * @return Object
-	 * @throws SAXException
-	 */
-	public CIMDataType getType() throws SAXException {
-		transform();
-		return this.iType;
-	}
-
-	/**
-	 * getRawType
-	 * 
-	 * @return the type which is retrieved from the XML attributes
-	 */
-	public CIMDataType getRawType() {
-		return this.iRawType;
-	}
-
-	/**
-	 * getArrayType useful e.g. for PROPERTY.ARRAY
-	 * 
-	 * @return CIMDataType
-	 * @throws SAXException
-	 */
-	public CIMDataType getArrayType() throws SAXException {
-		transform();
-		return this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
-				.getType());
-	}
-
-	/**
-	 * addValueNode
-	 * 
-	 * @param pValueNode
-	 *            - can be ValueNode ore ValueArrayNode for Embedded Objects
-	 */
-	public void addValueNode(AbstractValueNode pValueNode) {
-		if (isEmbeddedObject()
-				&& !(pValueNode == null || pValueNode instanceof ValueNode || pValueNode instanceof ValueArrayNode)) throw new IllegalArgumentException(
-				"pValueNode's type can be ValueNode or ValueArrayNode or it can be null. "
-						+ pValueNode.getClass().getName() + " is an invalid type!");
-		this.iAbsValNode = pValueNode;
-	}
-
-	private void transform() throws SAXException {
-		if (this.iType != null) return;
-		if (this.iAbsValNode == null) {
-			if (isEmbeddedObject()) {
-				if (this.iRawType != CIMDataType.STRING_T) throw new SAXException(
-						"Embedded Object CIM-XML element's type must be string. " + this.iRawType
-								+ " is invalid!");
-				if (this.iSession.strictEmbObjParsing()) {
-					/*
-					 * Here the assumption is that Object = CLASS, Instance =
-					 * INSTANCE.
-					 */
-					this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T : CIMDataType.CLASS_T;
-				} else {
-					/*
-					 * for valueless EmbeddedObject="object" the type can not be
-					 * determined since Pegasus's CIMObject can contain both
-					 * CIMClass and CIMInstance. Is it true for Pegasus 2.7.0
-					 * too?
-					 */
-					this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T : CIMDataType.STRING_T;
-				}
-			} else {
-				this.iType = this.iRawType;
-			}
-			this.iValue = null;
-		} else {
-			setType();
-			if (isEmbeddedObject()) {
-				transformEmbObj();
-			} else {
-				transformNormObj();
-			}
-		}
-	}
-
-	private void transformEmbObj() throws SAXException {
-		if (this.iAbsValNode instanceof ValueNode) {
-			String valueStr = (String) ((ValueNode) this.iAbsValNode).getValue();
-			this.iValue = CIMObjectFactory.getEmbeddedObj(this.iRawType, valueStr, this.iSession);
-			this.iType = CIMObjectFactory.getCIMObjScalarType(this.iValue);
-		} else { // ValueArrayNode
-			this.iValue = CIMObjectFactory.getEmbeddedObjA(this.iRawType,
-					(ValueArrayNode) this.iAbsValNode, this.iSession);
-			this.iType = CIMObjectFactory.getCIMObjArrayType(this.iValue);
-		}
-		if (isEmbeddedInstance() && this.iType.getType() != CIMDataType.OBJECT) throw new SAXException(
-				this.iNodeName + " element is an EmbeddedInstance with non INSTANCE value. "
-						+ "It's not valid!");
-		if (isEmbeddedClass() && this.iType.getType() != CIMDataType.CLASS
-				&& this.iType.getType() != CIMDataType.OBJECT) throw new SAXException(
-				this.iNodeName
-						+ " element is an EmbeddedObject with non CLASS/INSTANCE value. It's not valid!");
-	}
-
-	private void transformNormObj() throws SAXException {
-		if (this.iAbsValNode instanceof ValueNode) {
-			this.iType = this.iRawType;
-			this.iValue = CIMObjectFactory.getObject(this.iType, (ValueNode) this.iAbsValNode);
-		} else if (this.iAbsValNode instanceof ValueArrayNode) {
-			this.iType = CIMHelper.UnboundedArrayDataType(this.iRawType.getType());
-			this.iValue = CIMObjectFactory.getObject(this.iRawType,
-					(ValueArrayNode) this.iAbsValNode);
-		} else {
-			this.iValue = this.iAbsValNode.getValue();
-			if (this.iAbsValNode instanceof ArrayIf) {
-				if (this.iValue instanceof CIMObjectPath[]) this.iType = new CIMDataType("", 0);
-			} else {
-				if (this.iValue instanceof CIMObjectPath) {
-					this.iType = new CIMDataType(((CIMObjectPath) this.iValue).getObjectName());
-				} else {
-					this.iType = this.iRawType;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Required to handle the output XML of some non-standard CIMOMs like SVC
-	 * which adds the TYPE attribute to the sub VALUE or VALUE.ARRAY XML
-	 * element.
-	 * 
-	 * @throws SAXException
-	 */
-	private void setType() throws SAXException {
-		if (this.iType != null || this.iRawType != null) return;
-		this.iRawType = this.iAbsValNode.getType();
-		if (this.iRawType == null) this.iRawType = (this.iAbsValNode instanceof ArrayIf ? CIMDataType.STRING_ARRAY_T
-				: CIMDataType.STRING_T);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
+ * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
+ * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
+ * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
+ * 3281781    2011-04-11  blaschke-oss fail to parse Embedded Instance parameter
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
+ * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
+ *    2691    2013-10-18  blaschke-oss RETURNVALUE should not require PARAMTYPE attribute
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractValueNode;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.ArrayIf;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.QualifiedNodeHandler;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.ValueArrayNode;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.ValueNode;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * EmbObjHandler helps the parsing of embedded object elements.
+ */
+
+public class EmbObjHandler {
+
+	private String iNodeName;
+
+	private CIMDataType iRawType;
+
+	private boolean iHasEmbObjAttr, iHasEmbInstAttr;
+
+	private SAXSession iSession;
+
+	private CIMDataType iType;
+
+	private Object iValue;
+
+	private QualifiedNodeHandler iQualiHandler;
+
+	private AbstractValueNode iAbsValNode;
+
+	/**
+	 * Generic initialization.
+	 * 
+	 * @param pHandler
+	 * @param pNodeName
+	 * @param pAttribs
+	 * @param pSession
+	 * @param pQNodeHandler
+	 * @param pCheckEmbObjAttrib
+	 * @return EmbObjHandler
+	 * @throws SAXException
+	 */
+	public static EmbObjHandler init(EmbObjHandler pHandler, String pNodeName, Attributes pAttribs,
+			SAXSession pSession, QualifiedNodeHandler pQNodeHandler, boolean pCheckEmbObjAttrib)
+			throws SAXException {
+		if (pHandler == null) pHandler = new EmbObjHandler();
+		pHandler.initInst(pNodeName, pAttribs, pSession, pQNodeHandler, pCheckEmbObjAttrib);
+		return pHandler;
+	}
+
+	private EmbObjHandler() {
+	// init() used for instantiation
+	}
+
+	/**
+	 * Generic instance initialization.
+	 * 
+	 * @param pNodeName
+	 * @param pAttribs
+	 * @param pSession
+	 * @param pQNodeHandler
+	 * @param pCheckEmbObjAttrib
+	 * @throws SAXException
+	 */
+	public void initInst(String pNodeName, Attributes pAttribs, SAXSession pSession,
+			QualifiedNodeHandler pQNodeHandler, boolean pCheckEmbObjAttrib) throws SAXException {
+		this.iSession = pSession;
+		this.iNodeName = pNodeName;
+		this.iQualiHandler = pQNodeHandler;
+		this.iType = null;
+		this.iValue = null;
+		this.iAbsValNode = null;
+		this.iRawType = Node.getCIMType(pAttribs, true);
+		if (this.iRawType == null) {
+			this.iRawType = Node.getParamType(pAttribs);
+			/*
+			 * if (iRawType==null) throw new SAXException( iNodeName+" must
+			 * contain a TYPE or a PARAMTYPE attribute!" );
+			 */
+			/*
+			 * SVC CIMOM doesn't add TYPE attribute for the RETURNVALUE element,
+			 * but it adds it to the VALUE element.
+			 */
+		}
+
+		if (pCheckEmbObjAttrib) {
+			// DSPs call for EmbeddedObject AND XML is case sensitive, BUT there
+			// are probably CIMOMs out there that still use EMBEDDEDOBJECT
+			String embObjStr = pAttribs.getValue("EmbeddedObject");
+			if (embObjStr == null) {
+				embObjStr = pAttribs.getValue("EMBEDDEDOBJECT");
+			}
+			if (embObjStr == null) {
+				this.iHasEmbInstAttr = this.iHasEmbObjAttr = false;
+			} else if ("instance".equalsIgnoreCase(embObjStr)) {
+				this.iHasEmbInstAttr = true;
+				this.iHasEmbObjAttr = false;
+			} else if ("object".equalsIgnoreCase(embObjStr)) {
+				this.iHasEmbInstAttr = false;
+				this.iHasEmbObjAttr = true;
+			} else {
+				throw new SAXException(
+						"EmbeddedObject attribute's value must be \"object\" or \"instance\". "
+								+ embObjStr + " is invalid!");
+			}
+		} else {
+			this.iHasEmbInstAttr = this.iHasEmbObjAttr = false;
+		}
+	}
+
+	/**
+	 * isEmbeddedObject For this function Object means CLASS or INSTANCE. Object
+	 * can have other meanings at different places !!! :(
+	 * 
+	 * @return boolean
+	 */
+	private boolean isEmbeddedObject() {
+		return this.iHasEmbInstAttr
+				|| this.iHasEmbObjAttr
+				|| (this.iQualiHandler != null && (this.iQualiHandler.isEmbeddedObject() || this.iQualiHandler
+						.isEmbeddedInstance()));
+	}
+
+	/**
+	 * isEmbeddedClass
+	 * 
+	 * @return boolean
+	 */
+	private boolean isEmbeddedClass() {
+		return this.iHasEmbObjAttr
+				|| (this.iQualiHandler != null && this.iQualiHandler.isEmbeddedObject());
+	}
+
+	/**
+	 * isEmbeddedInstance
+	 * 
+	 * @return boolean
+	 */
+	private boolean isEmbeddedInstance() {
+		return this.iHasEmbInstAttr
+				|| (this.iQualiHandler != null && this.iQualiHandler.isEmbeddedInstance());
+	}
+
+	/**
+	 * getValue
+	 * 
+	 * @return Object
+	 * @throws SAXException
+	 */
+	public Object getValue() throws SAXException {
+		transform();
+		return this.iValue;
+	}
+
+	/**
+	 * getType
+	 * 
+	 * @return Object
+	 * @throws SAXException
+	 */
+	public CIMDataType getType() throws SAXException {
+		transform();
+		return this.iType;
+	}
+
+	/**
+	 * getRawType
+	 * 
+	 * @return the type which is retrieved from the XML attributes
+	 */
+	public CIMDataType getRawType() {
+		return this.iRawType;
+	}
+
+	/**
+	 * getArrayType useful e.g. for PROPERTY.ARRAY
+	 * 
+	 * @return CIMDataType
+	 * @throws SAXException
+	 */
+	public CIMDataType getArrayType() throws SAXException {
+		transform();
+		return this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
+				.getType());
+	}
+
+	/**
+	 * addValueNode
+	 * 
+	 * @param pValueNode
+	 *            - can be ValueNode ore ValueArrayNode for Embedded Objects
+	 */
+	public void addValueNode(AbstractValueNode pValueNode) {
+		if (isEmbeddedObject()
+				&& !(pValueNode == null || pValueNode instanceof ValueNode || pValueNode instanceof ValueArrayNode)) throw new IllegalArgumentException(
+				"pValueNode's type can be ValueNode or ValueArrayNode or it can be null. "
+						+ pValueNode.getClass().getName() + " is an invalid type!");
+		this.iAbsValNode = pValueNode;
+	}
+
+	private void transform() throws SAXException {
+		if (this.iType != null) return;
+		if (this.iAbsValNode == null) {
+			if (isEmbeddedObject()) {
+				if (this.iRawType != CIMDataType.STRING_T) throw new SAXException(
+						"Embedded Object CIM-XML element's type must be string. " + this.iRawType
+								+ " is invalid!");
+				if (this.iSession.strictEmbObjParsing()) {
+					/*
+					 * Here the assumption is that Object = CLASS, Instance =
+					 * INSTANCE.
+					 */
+					this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T : CIMDataType.CLASS_T;
+				} else {
+					/*
+					 * for valueless EmbeddedObject="object" the type can not be
+					 * determined since Pegasus's CIMObject can contain both
+					 * CIMClass and CIMInstance. Is it true for Pegasus 2.7.0
+					 * too?
+					 */
+					this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T : CIMDataType.STRING_T;
+				}
+			} else {
+				this.iType = this.iRawType;
+			}
+			this.iValue = null;
+		} else {
+			setType();
+			if (isEmbeddedObject()) {
+				transformEmbObj();
+			} else {
+				transformNormObj();
+			}
+		}
+	}
+
+	private void transformEmbObj() throws SAXException {
+		if (this.iAbsValNode instanceof ValueNode) {
+			String valueStr = (String) ((ValueNode) this.iAbsValNode).getValue();
+			this.iValue = CIMObjectFactory.getEmbeddedObj(this.iRawType, valueStr, this.iSession);
+			this.iType = CIMObjectFactory.getCIMObjScalarType(this.iValue);
+		} else { // ValueArrayNode
+			this.iValue = CIMObjectFactory.getEmbeddedObjA(this.iRawType,
+					(ValueArrayNode) this.iAbsValNode, this.iSession);
+			this.iType = CIMObjectFactory.getCIMObjArrayType(this.iValue);
+		}
+		if (isEmbeddedInstance() && this.iType.getType() != CIMDataType.OBJECT) throw new SAXException(
+				this.iNodeName + " element is an EmbeddedInstance with non INSTANCE value. "
+						+ "It's not valid!");
+		if (isEmbeddedClass() && this.iType.getType() != CIMDataType.CLASS
+				&& this.iType.getType() != CIMDataType.OBJECT) throw new SAXException(
+				this.iNodeName
+						+ " element is an EmbeddedObject with non CLASS/INSTANCE value. It's not valid!");
+	}
+
+	private void transformNormObj() throws SAXException {
+		if (this.iAbsValNode instanceof ValueNode) {
+			this.iType = this.iRawType;
+			this.iValue = CIMObjectFactory.getObject(this.iType, (ValueNode) this.iAbsValNode);
+		} else if (this.iAbsValNode instanceof ValueArrayNode) {
+			this.iType = CIMHelper.UnboundedArrayDataType(this.iRawType.getType());
+			this.iValue = CIMObjectFactory.getObject(this.iRawType,
+					(ValueArrayNode) this.iAbsValNode);
+		} else {
+			this.iValue = this.iAbsValNode.getValue();
+			if (this.iAbsValNode instanceof ArrayIf) {
+				if (this.iValue instanceof CIMObjectPath[]) this.iType = new CIMDataType("", 0);
+			} else {
+				if (this.iValue instanceof CIMObjectPath) {
+					this.iType = new CIMDataType(((CIMObjectPath) this.iValue).getObjectName());
+				} else {
+					this.iType = this.iRawType;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Required to handle the output XML of some non-standard CIMOMs like SVC
+	 * which adds the TYPE attribute to the sub VALUE or VALUE.ARRAY XML
+	 * element.
+	 * 
+	 * @throws SAXException
+	 */
+	private void setType() throws SAXException {
+		if (this.iType != null || this.iRawType != null) return;
+		this.iRawType = this.iAbsValNode.getType();
+		if (this.iRawType == null) this.iRawType = (this.iAbsValNode instanceof ArrayIf ? CIMDataType.STRING_ARRAY_T
+				: CIMDataType.STRING_T);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java
similarity index 92%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java
index ed613e4..21ac4eb 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java
@@ -1,929 +1,927 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2204488 	  2008-10-28  raman_arora  Fix code to remove compiler warnings
- * 2210455    2008-10-30  blaschke-oss Enhance javadoc, fix potential null pointers
- * 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
- * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
- *    2666    2013-09-19  blaschke-oss CR12: Remove ENUMERATIONCONTEXT
- *    2672    2013-09-26  blaschke-oss Remove SIMPLEREQACK support
- *    2690    2013-10-11  blaschke-oss Remove RESPONSEDESTINATION support
- *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class NodeConstIf
- * 
- */
-public interface NodeConstIf {
-
-	/**
-	 * The CIM element is the root element of every XML Document that is valid
-	 * with respect to this schema. 
      
-	 * 
-	 * 
-	 * <!ELEMENT CIM (MESSAGE|DECLARATION)>
-	 * <!ATTLIST CIM
-	 * 		CIMVERSION CDATA #REQUIRED
-	 * 		DTDVERSION CDATA #REQUIRED>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String CIM = "CIM";
-
-	/**
-	 * The DECLARATION element defines a set of one or more declarations of CIM
-	 * objects. 
      
-	 * 
-	 * 
-	 * 
-	 * <!ELEMENT DECLARATION (DECLGROUP|DECLGROUP.WITHNAME|DECLGROUP.WITHPATH)+>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String DECLARATION = "DECLARATION";
-
-	/**
-	 * The DECLGROUP element defines a logical set of CIM Class, Instance and
-	 * Qualifier declarations. 
      
-	 * 
-	 * 
-	 * <!ELEMENT DECLGROUP ((LOCALNAMESPACEPATH|NAMESPACEPATH)?,QUALIFIER.DECLARATION*,VALUE.OBJECT*)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String DECLGROUP = "DECLGROUP";
-
-	/**
-	 * The DECLGROUP.WITHNAME element defines a logical set of CIM Class,
-	 * Instance and Qualifier declarations. 
      
-	 * 
-	 * 
-	 * <!ELEMENT DECLGROUP.WITHNAME ((LOCALNAMESPACEPATH|NAMESPACEPATH)?,QUALIFIER.DECLARATION*,VALUE.NAMEDOBJECT*)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String DECLGROUP_WITHNAME = "DECLGROUP.WITHNAME";
-
-	/**
-	 * The DECLGROUP.WITHPATH element defines a logical set of CIM Class and
-	 * Instance declarations. 
      
-	 * 
-	 * 
-	 * <!ELEMENT DECLGROUP.WITHPATH (VALUE.OBJECTWITHPATH|VALUE.OBJECTWITHLOCALPATH)*>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String DECLGROUP_WITHPATH = "DECLGROUP.WITHPATH";
-
-	/**
-	 * The QUALIFIER.DECLARATION element defines a single CIM Qualifier
-	 * declaration. 
      
-	 * 
-	 * 
-	 * <!ELEMENT QUALIFIER.DECLARATION (SCOPE?,(VALUE|VALUE.ARRAY)?)>
-	 * <!ATTLIST QUALIFIER.DECLARATION
-	 * 		%CIMName;
-	 * 		%CIMType;               #REQUIRED
-	 * 		ISARRAY (true|false)    #IMPLIED
-	 * 		%ArraySize;
-	 * 		%QualifierFlavor;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String QUALIFIER_DECLARATION = "QUALIFIER.DECLARATION";
-
-	/**
-	 * The SCOPE element defines the scope of a QUALIFIER.DECLARATION in the
-	 * case that there are restrictions on the scope of the Qualifier
-	 * declaration. 
      
-	 * 
-	 * 
-	 * <!ELEMENT SCOPE EMPTY>
-	 * <!ATTLIST SCOPE
-	 * 		CLASS       (true|false) "false"
-	 * 		ASSOCIATION (true|false) "false"
-	 * 		REFERENCE   (true|false) "false"
-	 * 		PROPERTY    (true|false) "false"
-	 * 		METHOD      (true|false) "false"
-	 * 		PARAMETER   (true|false) "false"
-	 * 		INDICATION  (true|false) "false">
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String SCOPE = "SCOPE";
-
-	/**
-	 * The VALUE element is used to define a single (non-array) non-reference
-	 * non-NULL CIM Property value, CIM Qualifier value, CIM Method return
-	 * value, or CIM Method Parameter value. 
      
-	 * 
-	 * 
-	 * <!ELEMENT VALUE (#PCDATA)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE = "VALUE";
-
-	/**
-	 * The VALUE.ARRAY element is used to represent the value of a CIM Property
-	 * or Qualifier that has an array type. 
      
-	 * 
-	 * 
-	 * 
-	 * <!ELEMENT VALUE.ARRAY (VALUE|VALUE.NULL)*>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE_ARRAY = "VALUE.ARRAY";
-
-	/**
-	 * The VALUE.REFERENCE element is used to define a single CIM reference
-	 * Property value. 
      
-	 * 
-	 * 
-	 * <!ELEMENT VALUE.REFERENCE (CLASSPATH|LOCALCLASSPATH|CLASSNAME|INSTANCEPATH|LOCALINSTANCEPATH|INSTANCENAME)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE_REFERENCE = "VALUE.REFERENCE";
-
-	/**
-	 * The VALUE.REFARRAY element is used to represent the value of an array of
-	 * CIM references. 
      
-	 * 
-	 * 
-	 * <!ELEMENT VALUE.REFARRAY (VALUE.REFERENCE|VALUE.NULL)*>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE_REFARRAY = "VALUE.REFARRAY";
-
-	/**
-	 * The VALUE.OBJECT element is used to define a value which is comprised of
-	 * a single CIM Class or Instance definition. 
      
-	 * 
-	 * 
-	 * <!ELEMENT VALUE.OBJECT (CLASS|INSTANCE)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE_OBJECT = "VALUE.OBJECT";
-
-	/**
-	 * The VALUE.NAMEDINSTANCE element is used to define a value which is
-	 * comprised of a single named CIM Instance definition. 
      
-	 * 
-	 * 
-	 * 
-	 * <!ELEMENT VALUE.NAMEDINSTANCE (INSTANCENAME,INSTANCE)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE_NAMEDINSTANCE = "VALUE.NAMEDINSTANCE";
-
-	/**
-	 * The VALUE.NAMEDOBJECT element is used to define a value which is
-	 * comprised of a single named CIM Class or Instance definition. 
      
-	 * 
-	 * 
-	 * <!ELEMENT VALUE.NAMEDOBJECT (CLASS|(INSTANCENAME,INSTANCE))>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE_NAMEDOBJECT = "VALUE.NAMEDOBJECT";
-
-	/**
-	 * The VALUE.OBJECTWITHLOCALPATH element is used to define a value which is
-	 * comprised of a single CIM Object (Class or Instance) definition with
-	 * additional information that defines the local path to that Object. 
      
-	 * 
-	 * 
-	 * <!ELEMENT VALUE.OBJECTWITHLOCALPATH ((LOCALCLASSPATH,CLASS)|(LOCALINSTANCEPATH,INSTANCE))>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE_OBJECTWITHLOCALPATH = "VALUE.OBJECTWITHLOCALPATH";
-
-	/**
-	 * The VALUE.OBJECTWITHPATH element is used to define a value which is
-	 * comprised of a single CIM Object (Class or Instance) definition with
-	 * additional information that defines the absolute path to that Object. 
      
-	 * 
-	 * 
-	 * <!ELEMENT VALUE.OBJECTWITHPATH ((CLASSPATH,CLASS)|(INSTANCEPATH,INSTANCE))>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE_OBJECTWITHPATH = "VALUE.OBJECTWITHPATH";
-
-	/**
-	 * The VALUE.NULL element is used to represent a NULL value. 
      
-	 * 
-	 * 
-	 * <!ELEMENT VALUE.NULL EMPTY>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE_NULL = "VALUE.NULL";
-
-	/**
-	 * The VALUE.INSTANCEWITHPATH element is used to define value that comprises
-	 * a single CIM instance definition with additional information that defines
-	 * the absolute path to that object. 
      
-	 * 
-	 * 
-	 * <!ELEMENT VALUE.INSTANCEWITHPATH (INSTANCEPATH, INSTANCE)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String VALUE_INSTANCEWITHPATH = "VALUE.INSTANCEWITHPATH";
-
-	/**
-	 * The NAMESPACEPATH element is used to define a Namespace Path. 
      
-	 * 
-	 * 
-	 * <!ELEMENT NAMESPACEPATH (HOST,LOCALNAMESPACEPATH)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String NAMESPACEPATH = "NAMESPACEPATH";
-
-	/**
-	 * The LOCALNAMESPACEPATH element is used to define a local Namespace path
-	 * (one without a Host component). 
      
-	 * 
-	 * 
-	 * <!ELEMENT LOCALNAMESPACEPATH (NAMESPACE+)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String LOCALNAMESPACEPATH = "LOCALNAMESPACEPATH";
-
-	/**
-	 * The HOST element is used to define a single Host. 
      
-	 * 
-	 * 
-	 * <!ELEMENT HOST (#PCDATA)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String HOST = "HOST";
-
-	/**
-	 * The NAMESPACE element is used to define a single Namespace component of a
-	 * Namespace path. 
      
-	 * 
-	 * 
-	 * <!ELEMENT NAMESPACE EMPTY>
-	 * <!ATTLIST NAMESPACE
-	 * 		%CIMName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String NAMESPACE = "NAMESPACE";
-
-	/**
-	 * The CLASSPATH element defines the absolute path to a CIM Class. 
      
-	 * 
-	 * 
-	 * <!ELEMENT CLASSPATH (NAMESPACEPATH,CLASSNAME)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String CLASSPATH = "CLASSPATH";
-
-	/**
-	 * The LOCALCLASSPATH element defines the a local path to a CIM Class. 
      
-	 * 
-	 * 
-	 * 
-	 * <!ELEMENT LOCALCLASSPATH (LOCALNAMESPACEPATH, CLASSNAME)>
-	 * 
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String LOCALCLASSPATH = "LOCALCLASSPATH";
-
-	/**
-	 * The CLASSNAME element defines the qualifying name of a CIM Class. 
      
-	 * 
-	 * 
-	 * <!ELEMENT CLASSNAME EMPTY>
-	 * <!ATTLIST CLASSNAME
-	 * 		%CIMName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String CLASSNAME = "CLASSNAME";
-
-	/**
-	 * The INSTANCEPATH element defines the absolute path to a CIM Instance. 
      
-	 * 
-	 * 
-	 * <!ELEMENT INSTANCEPATH (NAMESPACEPATH,INSTANCENAME)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String INSTANCEPATH = "INSTANCEPATH";
-
-	/**
-	 * The LOCALINSTANCEPATH element defines the local path to a CIM Instance. 
      
-	 * 
-	 * 
-	 * <!ELEMENT LOCALINSTANCEPATH (LOCALNAMESPACEPATH,INSTANCENAME)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String LOCALINSTANCEPATH = "LOCALINSTANCEPATH";
-
-	/**
-	 * The INSTANCENAME element defines the location of a CIM Instance within a
-	 * Namespace. 
      
-	 * 
-	 * 
-	 * <!ELEMENT INSTANCENAME (KEYBINDING*|KEYVALUE?|VALUE.REFERENCE?)>
-	 * <!ATTLIST INSTANCENAME
-	 * 		%ClassName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String INSTANCENAME = "INSTANCENAME";
-
-	/**
-	 * The OBJECTPATH element is used to define a full path to a single CIM
-	 * Object (Class or Instance). 
      
-	 * 
-	 * 
-	 * <!ELEMENT OBJECTPATH (INSTANCEPATH|CLASSPATH)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String OBJECTPATH = "OBJECTPATH";
-
-	/**
-	 * The KEYBINDING element defines a single key property value binding. 
      
-	 * 
-	 * 
-	 * <!ELEMENT KEYBINDING (KEYVALUE|VALUE.REFERENCE)>
-	 * <!ATTLIST KEYBINDING
-	 * 		%CIMName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String KEYBINDING = "KEYBINDING";
-
-	/**
-	 * The KEYVALUE element defines a single property key value when the key
-	 * property is a non-reference type. 
      
-	 * 
-	 * 
-	 * <!ELEMENT KEYVALUE (#PCDATA)>
-	 * <!ATTLIST KEYVALUE
-	 * 		VALUETYPE (string|boolean|numeric) "string"
-	 * 		%CIMType; #IMPLIED>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String KEYVALUE = "KEYVALUE";
-
-	/**
-	 * The CLASS element defines a single CIM Class. 
      
-	 * 
-	 * 
-	 * <!ELEMENT CLASS (QUALIFIER*,(PROPERTY|PROPERTY.ARRAY|PROPERTY.REFERENCE)*,METHOD*)>
-	 * <!ATTLIST CLASS
-	 * 		%CIMName;
-	 * 		%SuperClass;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String CLASS = "CLASS";
-
-	/**
-	 * The INSTANCE element defines a single CIM Instance of a CIM Class. 
      
-	 * 
-	 * 
-	 * <!ELEMENT INSTANCE (QUALIFIER*,(PROPERTY|PROPERTY.ARRAY|PROPERTY.REFERENCE)*)>
-	 * <!ATTLIST INSTANCE
-	 * 		%ClassName;
-	 * 		xml:lang NMTOKEN #IMPLIED>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String INSTANCE = "INSTANCE";
-
-	/**
-	 * The QUALIFIER element defines a single CIM Qualifier. 
      
-	 * 
-	 * 
-	 * <!ELEMENT QUALIFIER ((VALUE|VALUE.ARRAY)?)>
-	 * <!ATTLIST QUALIFIER
-	 * 		%CIMName;
-	 * 		%CIMType; #REQUIRED
-	 * 		%Propagated;
-	 * 		%QualifierFlavor;
-	 * 		xml:lang NMTOKEN #IMPLIED>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String QUALIFIER = "QUALIFIER";
-
-	/**
-	 * The PROPERTY element defines the value in a CIM Instance or the
-	 * definition in a CIM Class of a single (non-array) CIM Property that is
-	 * not a reference. 
      
-	 * 
-	 * 
-	 * <!ELEMENT PROPERTY (QUALIFIER*,VALUE?)>
-	 * <!ATTLIST PROPERTY
-	 * 		%CIMName;
-	 * 		%CIMType; #REQUIRED
-	 * 		%ClassOrigin;
-	 * 		%Propagated;
-	 * 		%EmbeddedObject;
-	 * 		xml:lang NMTOKEN #IMPLIED>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String PROPERTY = "PROPERTY";
-
-	/**
-	 * The PROPERTY.ARRAY element defines the value in a CIM Instance or the
-	 * definition in a CIM Class of a single CIM Property with an array type. 
      
-	 * 
-	 * 
-	 * <!ELEMENT PROPERTY.ARRAY (QUALIFIER*,VALUE.ARRAY?)>
-	 * <!ATTLIST PROPERTY.ARRAY
-	 * 		%CIMName;
-	 * 		%CIMType; #REQUIRED
-	 * 		%ArraySize;
-	 * 		%ClassOrigin;
-	 * 		%Propagated;
-	 * 		%EmbeddedObject;
-	 * 		xml:lang NMTOKEN #IMPLIED>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String PROPERTY_ARRAY = "PROPERTY.ARRAY";
-
-	/**
-	 * The PROPERTY.REFERENCE element defines the value in a CIM Instance or the
-	 * definition in a CIM Class of a single CIM Property with reference
-	 * semantics. 
      
-	 * 
-	 * 
-	 * <!ELEMENT PROPERTY.REFERENCE (QUALIFIER*,VALUE.REFERENCE?)>
-	 * <!ATTLIST PROPERTY.REFERENCE
-	 * 		%CIMName;
-	 * 		%ReferenceClass;
-	 * 		%ClassOrigin;
-	 * 		%Propagated;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String PROPERTY_REFERENCE = "PROPERTY.REFERENCE";
-
-	/**
-	 * 
-	 * The METHOD element defines a single CIM Method. 
      
-	 * 
-	 * 
-	 * <!ELEMENT METHOD (QUALIFIER*,(PARAMETER|PARAMETER.REFERENCE|PARAMETER.ARRAY|PARAMETER.REFARRAY)*)>
-	 * <!ATTLIST METHOD
-	 * 		%CIMName;
-	 * 		%CIMType; #IMPLIED
-	 * 		%ClassOrigin;
-	 * 		%Propagated;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String METHOD = "METHOD";
-
-	/**
-	 * The PARAMETER element defines a single (non-array, non-reference)
-	 * Parameter to a CIM Method. 
      
-	 * 
-	 * 
-	 * <!ELEMENT PARAMETER (QUALIFIER*)>
-	 * <!ATTLIST PARAMETER
-	 * 		%CIMName;
-	 * 		%CIMType; #REQUIRED>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String PARAMETER = "PARAMETER";
-
-	/**
-	 * The PARAMETER.REFERENCE element defines a single reference Parameter to a
-	 * CIM Method. 
      
-	 * 
-	 * 
-	 * <!ELEMENT PARAMETER.REFERENCE (QUALIFIER*)>
-	 * <!ATTLIST PARAMETER.REFERENCE
-	 * 		%CIMName;
-	 * 		%ReferenceClass;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String PARAMETER_REFERENCE = "PARAMETER.REFERENCE";
-
-	/**
-	 * The PARAMETER.ARRAY element defines a single Parameter to a CIM Method
-	 * that has an array type. 
      
-	 * 
-	 * 
-	 * <!ELEMENT PARAMETER.ARRAY (QUALIFIER*)>
-	 * <!ATTLIST PARAMETER.ARRAY
-	 * 		%CIMName;
-	 * 		%CIMType; #REQUIRED
-	 * 		%ArraySize;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String PARAMETER_ARRAY = "PARAMETER.ARRAY";
-
-	/**
-	 * The PARAMETER.REFARRAY element defines a single Parameter to a CIM Method
-	 * that has an array of references type. 
      
-	 * 
-	 * 
-	 * <!ELEMENT PARAMETER.REFARRAY (QUALIFIER*)>
-	 * <!ATTLIST PARAMETER.REFARRAY
-	 * 		%CIMName;
-	 * 		%ReferenceClass;
-	 * 		%ArraySize;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String PARAMETER_REFARRAY = "PARAMETER.REFARRAY";
-
-	/*
-	 * TABLE stuff is missing yet
-	 */
-
-	/**
-	 * The MESSAGE element models a single CIM message. 
      
-	 * 
-	 * 
-	 * <!ELEMENT MESSAGE (SIMPLEREQ|MULTIREQ|SIMPLERSP|MULTIRSP|SIMPLEEXPREQ|MULTIEXPREQ|SIMPLEEXPRSP|MULTIEXPRSP)>
-	 * <!ATTLIST MESSAGE
-	 * 		ID              CDATA #REQUIRED
-	 * 		PROTOCOLVERSION CDATA #REQUIRED>>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String MESSAGE = "MESSAGE";
-
-	/**
-	 * The MULTIREQ element defines a Multiple CIM Operation request. 
      
-	 * 
-	 * 
-	 * <!ELEMENT MULTIREQ (SIMPLEREQ,SIMPLEREQ+)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String MULTIREQ = "MULTIREQ";
-
-	/**
-	 * The MULTIEXPREQ element defines a Multiple CIM Export request. 
      
-	 * 
-	 * 
-	 * <!ELEMENT MULTIEXPREQ (SIMPLEEXPREQ,SIMPLEEXPREQ+)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String MULTIEXPREQ = "MULTIEXPREQ";
-
-	/**
-	 * The SIMPLEREQ element defines a Simple CIM Operation request. 
      
-	 * 
-	 * 
-	 * <!ELEMENT SIMPLEREQ (METHODCALL|IMETHODCALL)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String SIMPLEREQ = "SIMPLEREQ";
-
-	/**
-	 * The SIMPLEEXPREQ element defines a Simple CIM Export request. 
      
-	 * 
-	 * 
-	 * <!ELEMENT SIMPLEEXPREQ (EXPMETHODCALL)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String SIMPLEEXPREQ = "SIMPLEEXPREQ";
-
-	/**
-	 * The IMETHODCALL element defines a single intrinsic method invocation. 
      
-	 * 
-	 * 
-	 * <!ELEMENT IMETHODCALL (LOCALNAMESPACEPATH,IPARAMVALUE*)>
-	 * <!ATTLIST IMETHODCALL
-	 * 		%CIMName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String IMETHODCALL = "IMETHODCALL";
-
-	/**
-	 * The METHODCALL element defines a single method invocation on a Class or
-	 * Instance. 
      
-	 * 
-	 * 
-	 * <!ELEMENT METHODCALL ((LOCALCLASSPATH|LOCALINSTANCEPATH),PARAMVALUE*)>
-	 * <!ATTLIST METHODCALL
-	 * 		%CIMName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String METHODCALL = "METHODCALL";
-
-	/**
-	 * The EXPMETHODCALL element defines a single export method invocation. 
      
-	 * 
-	 * 
-	 * <!ELEMENT EXPMETHODCALL (EXPPARAMVALUE*)>
-	 * <!ATTLIST EXPMETHODCALL
-	 * 		%CIMName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String EXPMETHODCALL = "EXPMETHODCALL";
-
-	/**
-	 * The PARAMVALUE element defines a single extrinsic method named parameter
-	 * value. 
      
-	 * 
-	 * 
-	 * <!ELEMENT PARAMVALUE (VALUE|VALUE.REFERENCE|VALUE.ARRAY|VALUE.REFARRAY)?>
-	 * <!ATTLIST PARAMVALUE
-	 * 		%CIMName;
-	 * 		%ParamType; #IMPLIED
-	 * 		%EmbeddedObject;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String PARAMVALUE = "PARAMVALUE";
-
-	/**
-	 * The IPARAMVALUE element defines a single intrinsic method named parameter
-	 * value. 
      
-	 * 
-	 * 
-	 * <!ELEMENT IPARAMVALUE (VALUE|VALUE.ARRAY|VALUE.REFERENCE|CLASSNAME|INSTANCENAME|QUALIFIER.DECLARATION|CLASS|INSTANCE|VALUE.NAMEDINSTANCE)?>
-	 * <!ATTLIST IPARAMVALUE
-	 * 		%CIMName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String IPARAMVALUE = "IPARAMVALUE";
-
-	/**
-	 * The EXPPARAMVALUE element defines a single export method named parameter
-	 * value. 
      
-	 * 
-	 * 
-	 * <!ELEMENT EXPPARAMVALUE (INSTANCE?)>
-	 * <!ATTLIST EXPPARAMVALUE
-	 * 		%CIMName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String EXPPARAMVALUE = "EXPPARAMVALUE";
-
-	/**
-	 * The MULTIRSP element defines a Multiple CIM Operation response. 
      
-	 * 
-	 * 
-	 * <!ELEMENT MULTIRSP (SIMPLERSP,SIMPLERSP+)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String MULTIRSP = "MULTIRSP";
-
-	/**
-	 * The MULTIEXPRSP element defines a Multiple CIM Export response. 
      
-	 * 
-	 * 
-	 * <!ELEMENT MULTIEXPRSP (SIMPLEEXPRSP,SIMPLEEXPRSP+)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String MULTIEXPRSP = "MULTIEXPRSP";
-
-	/**
-	 * The SIMPLERSP element defines a Simple CIM Operation response. 
      
-	 * 
-	 * 
-	 * <!ELEMENT SIMPLERSP (METHODRESPONSE|IMETHODRESPONSE)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String SIMPLERSP = "SIMPLERSP";
-
-	/**
-	 * The SIMPLEEXPRSP element defines a Simple CIM Export response. 
      
-	 * 
-	 * 
-	 * <!ELEMENT SIMPLEEXPRSP (EXPMETHODRESPONSE)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String SIMPLEEXPRSP = "SIMPLEEXPRSP";
-
-	/**
-	 * The METHODRESPONSE defines the response to a single CIM extrinsic method
-	 * invocation. 
      
-	 * 
-	 * 
-	 * 
-	 * <!ELEMENT METHODRESPONSE (ERROR|(RETURNVALUE?,PARAMVALUE*))>
-	 * <!ATTLIST METHODRESPONSE %CIMName;>
-	 * 
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String METHODRESPONSE = "METHODRESPONSE";
-
-	/**
-	 * The EXPMETHODRESPONSE defines the response to a single export method
-	 * invocation. 
      
-	 * 
-	 * 
-	 * <!ELEMENT EXPMETHODRESPONSE (ERROR|IRETURNVALUE?)>
-	 * <!ATTLIST EXPMETHODRESPONSE
-	 * 		%CIMName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String EXPMETHODRESPONSE = "EXPMETHODRESPONSE";
-
-	/**
-	 * The IMETHODRESPONSE defines the response to a single intrinsic CIM method
-	 * invocation. 
      
-	 * 
-	 * 
-	 * <!ELEMENT IMETHODRESPONSE (ERROR|IRETURNVALUE?)>
-	 * <!ATTLIST IMETHODRESPONSE
-	 * 		%CIMName;>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String IMETHODRESPONSE = "IMETHODRESPONSE";
-
-	/**
-	 * The ERROR element is used to define a fundamental error which prevented a
-	 * method from executing normally. 
      
-	 * 
-	 * 
-	 * <!ELEMENT ERROR (INSTANCE*)
-	 * <!ATTLIST ERROR
-	 * 		CODE        CDATA #REQUIRED
-	 * 		DESCRIPTION CDATA #IMPLIED>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String ERROR = "ERROR";
-
-	/**
-	 * The RETURNVALUE element specifies the value returned from an extrinsic
-	 * method call. 
      
-	 * 
-	 * 
-	 * <!ELEMENT RETURNVALUE (VALUE|VALUE.REFERENCE)?>
-	 * <!ATTLIST RETURNVALUE
-	 * 		%EmbeddedObject;
-	 * 		%ParamType; #IMPLIED>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String RETURNVALUE = "RETURNVALUE";
-
-	/**
-	 * The IRETURNVALUE element specifies the value returned from an intrinsic
-	 * method call. 
      
-	 * 
-	 * 
-	 * <!ELEMENT IRETURNVALUE (CLASSNAME*|INSTANCENAME*|VALUE*|VALUE.OBJECTWITHPATH*|VALUE.OBJECTWITHLOCALPATH*VALUE.OBJECT*|OBJECTPATH*|QUALIFIER.DECLARATION*|VALUE.ARRAY?|VALUE.REFERENCE?|CLASS*|INSTANCE*|VALUE.NAMEDINSTANCE*)>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String IRETURNVALUE = "IRETURNVALUE";
-
-	/**
-	 * The CORRELATOR element represents a server-defined operation correlator. 
      
-	 * 
-	 * 
-	 * <!ELEMENT CORRELATOR (VALUE)>
-	 * <!ATTLIST CORRELATOR
-	 * 		%CIMName;
-	 * 		%CIMType; #REQUIRED>
-	 * 
-	 * 
-	 * @see String
-	 */
-	public static final String CORRELATOR = "CORRELATOR";
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2204488 	  2008-10-28  raman_arora  Fix code to remove compiler warnings
+ * 2210455    2008-10-30  blaschke-oss Enhance javadoc, fix potential null pointers
+ * 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
+ * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
+ *    2666    2013-09-19  blaschke-oss CR12: Remove ENUMERATIONCONTEXT
+ *    2672    2013-09-26  blaschke-oss Remove SIMPLEREQACK support
+ *    2690    2013-10-11  blaschke-oss Remove RESPONSEDESTINATION support
+ *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class NodeConstIf
+ * 
+ */
+public interface NodeConstIf {
+
+	/**
+	 * The CIM element is the root element of every XML Document that is valid
+	 * with respect to this schema. 
      
+	 * 
+	 * 
+	 * <!ELEMENT CIM (MESSAGE|DECLARATION)>
+	 * <!ATTLIST CIM
+	 * 		CIMVERSION CDATA #REQUIRED
+	 * 		DTDVERSION CDATA #REQUIRED>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String CIM = "CIM";
+
+	/**
+	 * The DECLARATION element defines a set of one or more declarations of CIM
+	 * objects. 
      
+	 * 
+	 * 
+	 * 
+	 * <!ELEMENT DECLARATION (DECLGROUP|DECLGROUP.WITHNAME|DECLGROUP.WITHPATH)+>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String DECLARATION = "DECLARATION";
+
+	/**
+	 * The DECLGROUP element defines a logical set of CIM Class, Instance and
+	 * Qualifier declarations. 
      
+	 * 
+	 * 
+	 * <!ELEMENT DECLGROUP ((LOCALNAMESPACEPATH|NAMESPACEPATH)?,QUALIFIER.DECLARATION*,VALUE.OBJECT*)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String DECLGROUP = "DECLGROUP";
+
+	/**
+	 * The DECLGROUP.WITHNAME element defines a logical set of CIM Class,
+	 * Instance and Qualifier declarations. 
      
+	 * 
+	 * 
+	 * <!ELEMENT DECLGROUP.WITHNAME ((LOCALNAMESPACEPATH|NAMESPACEPATH)?,QUALIFIER.DECLARATION*,VALUE.NAMEDOBJECT*)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String DECLGROUP_WITHNAME = "DECLGROUP.WITHNAME";
+
+	/**
+	 * The DECLGROUP.WITHPATH element defines a logical set of CIM Class and
+	 * Instance declarations. 
      
+	 * 
+	 * 
+	 * <!ELEMENT DECLGROUP.WITHPATH (VALUE.OBJECTWITHPATH|VALUE.OBJECTWITHLOCALPATH)*>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String DECLGROUP_WITHPATH = "DECLGROUP.WITHPATH";
+
+	/**
+	 * The QUALIFIER.DECLARATION element defines a single CIM Qualifier
+	 * declaration. 
      
+	 * 
+	 * 
+	 * <!ELEMENT QUALIFIER.DECLARATION (SCOPE?,(VALUE|VALUE.ARRAY)?)>
+	 * <!ATTLIST QUALIFIER.DECLARATION
+	 * 		%CIMName;
+	 * 		%CIMType;               #REQUIRED
+	 * 		ISARRAY (true|false)    #IMPLIED
+	 * 		%ArraySize;
+	 * 		%QualifierFlavor;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String QUALIFIER_DECLARATION = "QUALIFIER.DECLARATION";
+
+	/**
+	 * The SCOPE element defines the scope of a QUALIFIER.DECLARATION in the
+	 * case that there are restrictions on the scope of the Qualifier
+	 * declaration. 
      
+	 * 
+	 * 
+	 * <!ELEMENT SCOPE EMPTY>
+	 * <!ATTLIST SCOPE
+	 * 		CLASS       (true|false) "false"
+	 * 		ASSOCIATION (true|false) "false"
+	 * 		REFERENCE   (true|false) "false"
+	 * 		PROPERTY    (true|false) "false"
+	 * 		METHOD      (true|false) "false"
+	 * 		PARAMETER   (true|false) "false"
+	 * 		INDICATION  (true|false) "false">
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String SCOPE = "SCOPE";
+
+	/**
+	 * The VALUE element is used to define a single (non-array) non-reference
+	 * non-NULL CIM Property value, CIM Qualifier value, CIM Method return
+	 * value, or CIM Method Parameter value. 
      
+	 * 
+	 * 
+	 * <!ELEMENT VALUE (#PCDATA)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE = "VALUE";
+
+	/**
+	 * The VALUE.ARRAY element is used to represent the value of a CIM Property
+	 * or Qualifier that has an array type. 
      
+	 * 
+	 * 
+	 * 
+	 * <!ELEMENT VALUE.ARRAY (VALUE|VALUE.NULL)*>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE_ARRAY = "VALUE.ARRAY";
+
+	/**
+	 * The VALUE.REFERENCE element is used to define a single CIM reference
+	 * Property value. 
      
+	 * 
+	 * 
+	 * <!ELEMENT VALUE.REFERENCE (CLASSPATH|LOCALCLASSPATH|CLASSNAME|INSTANCEPATH|LOCALINSTANCEPATH|INSTANCENAME)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE_REFERENCE = "VALUE.REFERENCE";
+
+	/**
+	 * The VALUE.REFARRAY element is used to represent the value of an array of
+	 * CIM references. 
      
+	 * 
+	 * 
+	 * <!ELEMENT VALUE.REFARRAY (VALUE.REFERENCE|VALUE.NULL)*>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE_REFARRAY = "VALUE.REFARRAY";
+
+	/**
+	 * The VALUE.OBJECT element is used to define a value which is comprised of
+	 * a single CIM Class or Instance definition. 
      
+	 * 
+	 * 
+	 * <!ELEMENT VALUE.OBJECT (CLASS|INSTANCE)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE_OBJECT = "VALUE.OBJECT";
+
+	/**
+	 * The VALUE.NAMEDINSTANCE element is used to define a value which is
+	 * comprised of a single named CIM Instance definition. 
      
+	 * 
+	 * 
+	 * 
+	 * <!ELEMENT VALUE.NAMEDINSTANCE (INSTANCENAME,INSTANCE)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE_NAMEDINSTANCE = "VALUE.NAMEDINSTANCE";
+
+	/**
+	 * The VALUE.NAMEDOBJECT element is used to define a value which is
+	 * comprised of a single named CIM Class or Instance definition. 
      
+	 * 
+	 * 
+	 * <!ELEMENT VALUE.NAMEDOBJECT (CLASS|(INSTANCENAME,INSTANCE))>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE_NAMEDOBJECT = "VALUE.NAMEDOBJECT";
+
+	/**
+	 * The VALUE.OBJECTWITHLOCALPATH element is used to define a value which is
+	 * comprised of a single CIM Object (Class or Instance) definition with
+	 * additional information that defines the local path to that Object. 
      
+	 * 
+	 * 
+	 * <!ELEMENT VALUE.OBJECTWITHLOCALPATH ((LOCALCLASSPATH,CLASS)|(LOCALINSTANCEPATH,INSTANCE))>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE_OBJECTWITHLOCALPATH = "VALUE.OBJECTWITHLOCALPATH";
+
+	/**
+	 * The VALUE.OBJECTWITHPATH element is used to define a value which is
+	 * comprised of a single CIM Object (Class or Instance) definition with
+	 * additional information that defines the absolute path to that Object. 
      
+	 * 
+	 * 
+	 * <!ELEMENT VALUE.OBJECTWITHPATH ((CLASSPATH,CLASS)|(INSTANCEPATH,INSTANCE))>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE_OBJECTWITHPATH = "VALUE.OBJECTWITHPATH";
+
+	/**
+	 * The VALUE.NULL element is used to represent a NULL value. 
      
+	 * 
+	 * 
+	 * <!ELEMENT VALUE.NULL EMPTY>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE_NULL = "VALUE.NULL";
+
+	/**
+	 * The VALUE.INSTANCEWITHPATH element is used to define value that comprises
+	 * a single CIM instance definition with additional information that defines
+	 * the absolute path to that object. 
      
+	 * 
+	 * 
+	 * <!ELEMENT VALUE.INSTANCEWITHPATH (INSTANCEPATH, INSTANCE)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String VALUE_INSTANCEWITHPATH = "VALUE.INSTANCEWITHPATH";
+
+	/**
+	 * The NAMESPACEPATH element is used to define a Namespace Path. 
      
+	 * 
+	 * 
+	 * <!ELEMENT NAMESPACEPATH (HOST,LOCALNAMESPACEPATH)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String NAMESPACEPATH = "NAMESPACEPATH";
+
+	/**
+	 * The LOCALNAMESPACEPATH element is used to define a local Namespace path
+	 * (one without a Host component). 
      
+	 * 
+	 * 
+	 * <!ELEMENT LOCALNAMESPACEPATH (NAMESPACE+)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String LOCALNAMESPACEPATH = "LOCALNAMESPACEPATH";
+
+	/**
+	 * The HOST element is used to define a single Host. 
      
+	 * 
+	 * 
+	 * <!ELEMENT HOST (#PCDATA)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String HOST = "HOST";
+
+	/**
+	 * The NAMESPACE element is used to define a single Namespace component of a
+	 * Namespace path. 
      
+	 * 
+	 * 
+	 * <!ELEMENT NAMESPACE EMPTY>
+	 * <!ATTLIST NAMESPACE
+	 * 		%CIMName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String NAMESPACE = "NAMESPACE";
+
+	/**
+	 * The CLASSPATH element defines the absolute path to a CIM Class. 
      
+	 * 
+	 * 
+	 * <!ELEMENT CLASSPATH (NAMESPACEPATH,CLASSNAME)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String CLASSPATH = "CLASSPATH";
+
+	/**
+	 * The LOCALCLASSPATH element defines the a local path to a CIM Class. 
      
+	 * 
+	 * 
+	 * 
+	 * <!ELEMENT LOCALCLASSPATH (LOCALNAMESPACEPATH, CLASSNAME)>
+	 * 
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String LOCALCLASSPATH = "LOCALCLASSPATH";
+
+	/**
+	 * The CLASSNAME element defines the qualifying name of a CIM Class. 
      
+	 * 
+	 * 
+	 * <!ELEMENT CLASSNAME EMPTY>
+	 * <!ATTLIST CLASSNAME
+	 * 		%CIMName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String CLASSNAME = "CLASSNAME";
+
+	/**
+	 * The INSTANCEPATH element defines the absolute path to a CIM Instance. 
      
+	 * 
+	 * 
+	 * <!ELEMENT INSTANCEPATH (NAMESPACEPATH,INSTANCENAME)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String INSTANCEPATH = "INSTANCEPATH";
+
+	/**
+	 * The LOCALINSTANCEPATH element defines the local path to a CIM Instance. 
      
+	 * 
+	 * 
+	 * <!ELEMENT LOCALINSTANCEPATH (LOCALNAMESPACEPATH,INSTANCENAME)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String LOCALINSTANCEPATH = "LOCALINSTANCEPATH";
+
+	/**
+	 * The INSTANCENAME element defines the location of a CIM Instance within a
+	 * Namespace. 
      
+	 * 
+	 * 
+	 * <!ELEMENT INSTANCENAME (KEYBINDING*|KEYVALUE?|VALUE.REFERENCE?)>
+	 * <!ATTLIST INSTANCENAME
+	 * 		%ClassName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String INSTANCENAME = "INSTANCENAME";
+
+	/**
+	 * The OBJECTPATH element is used to define a full path to a single CIM
+	 * Object (Class or Instance). 
      
+	 * 
+	 * 
+	 * <!ELEMENT OBJECTPATH (INSTANCEPATH|CLASSPATH)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String OBJECTPATH = "OBJECTPATH";
+
+	/**
+	 * The KEYBINDING element defines a single key property value binding. 
      
+	 * 
+	 * 
+	 * <!ELEMENT KEYBINDING (KEYVALUE|VALUE.REFERENCE)>
+	 * <!ATTLIST KEYBINDING
+	 * 		%CIMName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String KEYBINDING = "KEYBINDING";
+
+	/**
+	 * The KEYVALUE element defines a single property key value when the key
+	 * property is a non-reference type. 
      
+	 * 
+	 * 
+	 * <!ELEMENT KEYVALUE (#PCDATA)>
+	 * <!ATTLIST KEYVALUE
+	 * 		VALUETYPE (string|boolean|numeric) "string"
+	 * 		%CIMType; #IMPLIED>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String KEYVALUE = "KEYVALUE";
+
+	/**
+	 * The CLASS element defines a single CIM Class. 
      
+	 * 
+	 * 
+	 * <!ELEMENT CLASS (QUALIFIER*,(PROPERTY|PROPERTY.ARRAY|PROPERTY.REFERENCE)*,METHOD*)>
+	 * <!ATTLIST CLASS
+	 * 		%CIMName;
+	 * 		%SuperClass;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String CLASS = "CLASS";
+
+	/**
+	 * The INSTANCE element defines a single CIM Instance of a CIM Class. 
      
+	 * 
+	 * 
+	 * <!ELEMENT INSTANCE (QUALIFIER*,(PROPERTY|PROPERTY.ARRAY|PROPERTY.REFERENCE)*)>
+	 * <!ATTLIST INSTANCE
+	 * 		%ClassName;
+	 * 		xml:lang NMTOKEN #IMPLIED>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String INSTANCE = "INSTANCE";
+
+	/**
+	 * The QUALIFIER element defines a single CIM Qualifier. 
      
+	 * 
+	 * 
+	 * <!ELEMENT QUALIFIER ((VALUE|VALUE.ARRAY)?)>
+	 * <!ATTLIST QUALIFIER
+	 * 		%CIMName;
+	 * 		%CIMType; #REQUIRED
+	 * 		%Propagated;
+	 * 		%QualifierFlavor;
+	 * 		xml:lang NMTOKEN #IMPLIED>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String QUALIFIER = "QUALIFIER";
+
+	/**
+	 * The PROPERTY element defines the value in a CIM Instance or the
+	 * definition in a CIM Class of a single (non-array) CIM Property that is
+	 * not a reference. 
      
+	 * 
+	 * 
+	 * <!ELEMENT PROPERTY (QUALIFIER*,VALUE?)>
+	 * <!ATTLIST PROPERTY
+	 * 		%CIMName;
+	 * 		%CIMType; #REQUIRED
+	 * 		%ClassOrigin;
+	 * 		%Propagated;
+	 * 		%EmbeddedObject;
+	 * 		xml:lang NMTOKEN #IMPLIED>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String PROPERTY = "PROPERTY";
+
+	/**
+	 * The PROPERTY.ARRAY element defines the value in a CIM Instance or the
+	 * definition in a CIM Class of a single CIM Property with an array type. 
      
+	 * 
+	 * 
+	 * <!ELEMENT PROPERTY.ARRAY (QUALIFIER*,VALUE.ARRAY?)>
+	 * <!ATTLIST PROPERTY.ARRAY
+	 * 		%CIMName;
+	 * 		%CIMType; #REQUIRED
+	 * 		%ArraySize;
+	 * 		%ClassOrigin;
+	 * 		%Propagated;
+	 * 		%EmbeddedObject;
+	 * 		xml:lang NMTOKEN #IMPLIED>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String PROPERTY_ARRAY = "PROPERTY.ARRAY";
+
+	/**
+	 * The PROPERTY.REFERENCE element defines the value in a CIM Instance or the
+	 * definition in a CIM Class of a single CIM Property with reference
+	 * semantics. 
      
+	 * 
+	 * 
+	 * <!ELEMENT PROPERTY.REFERENCE (QUALIFIER*,VALUE.REFERENCE?)>
+	 * <!ATTLIST PROPERTY.REFERENCE
+	 * 		%CIMName;
+	 * 		%ReferenceClass;
+	 * 		%ClassOrigin;
+	 * 		%Propagated;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String PROPERTY_REFERENCE = "PROPERTY.REFERENCE";
+
+	/**
+	 * 
+	 * The METHOD element defines a single CIM Method. 
      
+	 * 
+	 * 
+	 * <!ELEMENT METHOD (QUALIFIER*,(PARAMETER|PARAMETER.REFERENCE|PARAMETER.ARRAY|PARAMETER.REFARRAY)*)>
+	 * <!ATTLIST METHOD
+	 * 		%CIMName;
+	 * 		%CIMType; #IMPLIED
+	 * 		%ClassOrigin;
+	 * 		%Propagated;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String METHOD = "METHOD";
+
+	/**
+	 * The PARAMETER element defines a single (non-array, non-reference)
+	 * Parameter to a CIM Method. 
      
+	 * 
+	 * 
+	 * <!ELEMENT PARAMETER (QUALIFIER*)>
+	 * <!ATTLIST PARAMETER
+	 * 		%CIMName;
+	 * 		%CIMType; #REQUIRED>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String PARAMETER = "PARAMETER";
+
+	/**
+	 * The PARAMETER.REFERENCE element defines a single reference Parameter to a
+	 * CIM Method. 
      
+	 * 
+	 * 
+	 * <!ELEMENT PARAMETER.REFERENCE (QUALIFIER*)>
+	 * <!ATTLIST PARAMETER.REFERENCE
+	 * 		%CIMName;
+	 * 		%ReferenceClass;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String PARAMETER_REFERENCE = "PARAMETER.REFERENCE";
+
+	/**
+	 * The PARAMETER.ARRAY element defines a single Parameter to a CIM Method
+	 * that has an array type. 
      
+	 * 
+	 * 
+	 * <!ELEMENT PARAMETER.ARRAY (QUALIFIER*)>
+	 * <!ATTLIST PARAMETER.ARRAY
+	 * 		%CIMName;
+	 * 		%CIMType; #REQUIRED
+	 * 		%ArraySize;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String PARAMETER_ARRAY = "PARAMETER.ARRAY";
+
+	/**
+	 * The PARAMETER.REFARRAY element defines a single Parameter to a CIM Method
+	 * that has an array of references type. 
      
+	 * 
+	 * 
+	 * <!ELEMENT PARAMETER.REFARRAY (QUALIFIER*)>
+	 * <!ATTLIST PARAMETER.REFARRAY
+	 * 		%CIMName;
+	 * 		%ReferenceClass;
+	 * 		%ArraySize;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String PARAMETER_REFARRAY = "PARAMETER.REFARRAY";
+
+	/*
+	 * TABLE stuff is missing yet
+	 */
+
+	/**
+	 * The MESSAGE element models a single CIM message. 
      
+	 * 
+	 * 
+	 * <!ELEMENT MESSAGE (SIMPLEREQ|MULTIREQ|SIMPLERSP|MULTIRSP|SIMPLEEXPREQ|MULTIEXPREQ|SIMPLEEXPRSP|MULTIEXPRSP)>
+	 * <!ATTLIST MESSAGE
+	 * 		ID              CDATA #REQUIRED
+	 * 		PROTOCOLVERSION CDATA #REQUIRED>>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String MESSAGE = "MESSAGE";
+
+	/**
+	 * The MULTIREQ element defines a Multiple CIM Operation request. 
      
+	 * 
+	 * 
+	 * <!ELEMENT MULTIREQ (SIMPLEREQ,SIMPLEREQ+)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String MULTIREQ = "MULTIREQ";
+
+	/**
+	 * The MULTIEXPREQ element defines a Multiple CIM Export request. 
      
+	 * 
+	 * 
+	 * <!ELEMENT MULTIEXPREQ (SIMPLEEXPREQ,SIMPLEEXPREQ+)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String MULTIEXPREQ = "MULTIEXPREQ";
+
+	/**
+	 * The SIMPLEREQ element defines a Simple CIM Operation request. 
      
+	 * 
+	 * 
+	 * <!ELEMENT SIMPLEREQ (METHODCALL|IMETHODCALL)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String SIMPLEREQ = "SIMPLEREQ";
+
+	/**
+	 * The SIMPLEEXPREQ element defines a Simple CIM Export request. 
      
+	 * 
+	 * 
+	 * <!ELEMENT SIMPLEEXPREQ (EXPMETHODCALL)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String SIMPLEEXPREQ = "SIMPLEEXPREQ";
+
+	/**
+	 * The IMETHODCALL element defines a single intrinsic method invocation. 
      
+	 * 
+	 * 
+	 * <!ELEMENT IMETHODCALL (LOCALNAMESPACEPATH,IPARAMVALUE*)>
+	 * <!ATTLIST IMETHODCALL
+	 * 		%CIMName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String IMETHODCALL = "IMETHODCALL";
+
+	/**
+	 * The METHODCALL element defines a single method invocation on a Class or
+	 * Instance. 
      
+	 * 
+	 * 
+	 * <!ELEMENT METHODCALL ((LOCALCLASSPATH|LOCALINSTANCEPATH),PARAMVALUE*)>
+	 * <!ATTLIST METHODCALL
+	 * 		%CIMName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String METHODCALL = "METHODCALL";
+
+	/**
+	 * The EXPMETHODCALL element defines a single export method invocation. 
      
+	 * 
+	 * 
+	 * <!ELEMENT EXPMETHODCALL (EXPPARAMVALUE*)>
+	 * <!ATTLIST EXPMETHODCALL
+	 * 		%CIMName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String EXPMETHODCALL = "EXPMETHODCALL";
+
+	/**
+	 * The PARAMVALUE element defines a single extrinsic method named parameter
+	 * value. 
      
+	 * 
+	 * 
+	 * <!ELEMENT PARAMVALUE (VALUE|VALUE.REFERENCE|VALUE.ARRAY|VALUE.REFARRAY)?>
+	 * <!ATTLIST PARAMVALUE
+	 * 		%CIMName;
+	 * 		%ParamType; #IMPLIED
+	 * 		%EmbeddedObject;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String PARAMVALUE = "PARAMVALUE";
+
+	/**
+	 * The IPARAMVALUE element defines a single intrinsic method named parameter
+	 * value. 
      
+	 * 
+	 * 
+	 * <!ELEMENT IPARAMVALUE (VALUE|VALUE.ARRAY|VALUE.REFERENCE|CLASSNAME|INSTANCENAME|QUALIFIER.DECLARATION|CLASS|INSTANCE|VALUE.NAMEDINSTANCE)?>
+	 * <!ATTLIST IPARAMVALUE
+	 * 		%CIMName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String IPARAMVALUE = "IPARAMVALUE";
+
+	/**
+	 * The EXPPARAMVALUE element defines a single export method named parameter
+	 * value. 
      
+	 * 
+	 * 
+	 * <!ELEMENT EXPPARAMVALUE (INSTANCE?)>
+	 * <!ATTLIST EXPPARAMVALUE
+	 * 		%CIMName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String EXPPARAMVALUE = "EXPPARAMVALUE";
+
+	/**
+	 * The MULTIRSP element defines a Multiple CIM Operation response. 
      
+	 * 
+	 * 
+	 * <!ELEMENT MULTIRSP (SIMPLERSP,SIMPLERSP+)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String MULTIRSP = "MULTIRSP";
+
+	/**
+	 * The MULTIEXPRSP element defines a Multiple CIM Export response. 
      
+	 * 
+	 * 
+	 * <!ELEMENT MULTIEXPRSP (SIMPLEEXPRSP,SIMPLEEXPRSP+)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String MULTIEXPRSP = "MULTIEXPRSP";
+
+	/**
+	 * The SIMPLERSP element defines a Simple CIM Operation response. 
      
+	 * 
+	 * 
+	 * <!ELEMENT SIMPLERSP (METHODRESPONSE|IMETHODRESPONSE)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String SIMPLERSP = "SIMPLERSP";
+
+	/**
+	 * The SIMPLEEXPRSP element defines a Simple CIM Export response. 
      
+	 * 
+	 * 
+	 * <!ELEMENT SIMPLEEXPRSP (EXPMETHODRESPONSE)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String SIMPLEEXPRSP = "SIMPLEEXPRSP";
+
+	/**
+	 * The METHODRESPONSE defines the response to a single CIM extrinsic method
+	 * invocation. 
      
+	 * 
+	 * 
+	 * 
+	 * <!ELEMENT METHODRESPONSE (ERROR|(RETURNVALUE?,PARAMVALUE*))>
+	 * <!ATTLIST METHODRESPONSE %CIMName;>
+	 * 
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String METHODRESPONSE = "METHODRESPONSE";
+
+	/**
+	 * The EXPMETHODRESPONSE defines the response to a single export method
+	 * invocation. 
      
+	 * 
+	 * 
+	 * <!ELEMENT EXPMETHODRESPONSE (ERROR|IRETURNVALUE?)>
+	 * <!ATTLIST EXPMETHODRESPONSE
+	 * 		%CIMName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String EXPMETHODRESPONSE = "EXPMETHODRESPONSE";
+
+	/**
+	 * The IMETHODRESPONSE defines the response to a single intrinsic CIM method
+	 * invocation. 
      
+	 * 
+	 * 
+	 * <!ELEMENT IMETHODRESPONSE (ERROR|IRETURNVALUE?)>
+	 * <!ATTLIST IMETHODRESPONSE
+	 * 		%CIMName;>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String IMETHODRESPONSE = "IMETHODRESPONSE";
+
+	/**
+	 * The ERROR element is used to define a fundamental error which prevented a
+	 * method from executing normally. 
      
+	 * 
+	 * 
+	 * <!ELEMENT ERROR (INSTANCE*)
+	 * <!ATTLIST ERROR
+	 * 		CODE        CDATA #REQUIRED
+	 * 		DESCRIPTION CDATA #IMPLIED>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String ERROR = "ERROR";
+
+	/**
+	 * The RETURNVALUE element specifies the value returned from an extrinsic
+	 * method call. 
      
+	 * 
+	 * 
+	 * <!ELEMENT RETURNVALUE (VALUE|VALUE.REFERENCE)?>
+	 * <!ATTLIST RETURNVALUE
+	 * 		%EmbeddedObject;
+	 * 		%ParamType; #IMPLIED>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String RETURNVALUE = "RETURNVALUE";
+
+	/**
+	 * The IRETURNVALUE element specifies the value returned from an intrinsic
+	 * method call. 
      
+	 * 
+	 * 
+	 * <!ELEMENT IRETURNVALUE (CLASSNAME*|INSTANCENAME*|VALUE*|VALUE.OBJECTWITHPATH*|VALUE.OBJECTWITHLOCALPATH*VALUE.OBJECT*|OBJECTPATH*|QUALIFIER.DECLARATION*|VALUE.ARRAY?|VALUE.REFERENCE?|CLASS*|INSTANCE*|VALUE.NAMEDINSTANCE*)>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String IRETURNVALUE = "IRETURNVALUE";
+
+	/**
+	 * The CORRELATOR element represents a server-defined operation correlator. 
      
+	 * 
+	 * 
+	 * <!ELEMENT CORRELATOR (VALUE)>
+	 * <!ATTLIST CORRELATOR
+	 * 		%CIMName;
+	 * 		%CIMType; #REQUIRED>
+	 * 
+	 * 
+	 * @see String
+	 */
+	public static final String CORRELATOR = "CORRELATOR";
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java
similarity index 89%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java
index 3e5aaaf..c21cd6d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java
@@ -1,492 +1,490 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
- * 3498482    2012-03-09  blaschke-oss Red Hat: Possible XML Hash DoS in sblim
- * 3535383    2012-08-01  blaschke-oss HashDoS fix 3498482
- *    2672    2013-09-26  blaschke-oss Remove SIMPLEREQACK support
- *    2690    2013-10-11  blaschke-oss Remove RESPONSEDESTINATION support
- *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.HashMap;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.*;
-
-/**
- * Class NodeFactory is responsible for Node instance construction.
- * 
- */
-public class NodeFactory implements NodeConstIf {
-
-	/**
-	 * getNodeInstance
-	 * 
-	 * @param pNodeName
-	 *            Should be an XML element name constant which is defined in
-	 *            NodeConstIf
-	 * @return the Node subclass which implements the parsing of pNodeName named
-	 *         XML Element.
-	 */
-	public static Node getNodeInstance(String pNodeName) {
-		createParserMap();
-		return cParserMap.get(pNodeName).create();
-	}
-
-	/**
-	 * getEnum
-	 * 
-	 * @param pNodeName
-	 * @return The corresponding String constant for an XML element name. It
-	 *         must be used, because the Node subclasses use reference based
-	 *         equals comparisons (==).
-	 */
-	public static String getEnum(String pNodeName) {
-		return NODENAME_HASH.get(pNodeName);
-	}
-
-	private static HashMap cParserMap;
-
-	private interface FactoryEntry {
-
-		/**
-		 * create
-		 * 
-		 * @return Node
-		 */
-		public Node create();
-	}
-
-	private synchronized static void createParserMap() {
-		if (cParserMap != null) return;
-		cParserMap = new HashMap();
-		cParserMap.put(CIM, new FactoryEntry() {
-
-			public Node create() {
-				return new CIMNode();
-			}
-		});
-		// DECLARATION - not implemented
-		// DECLGROUP - not implemented
-		// DECLGROUP.WITHNAME - not implemented
-		// DECLGROUP.WITHPATH - not implemented
-		cParserMap.put(QUALIFIER_DECLARATION, new FactoryEntry() {
-
-			public Node create() {
-				return new QualiDeclNode();
-			}
-		});
-		cParserMap.put(SCOPE, new FactoryEntry() {
-
-			public Node create() {
-				return new ScopeNode();
-			}
-		});
-		cParserMap.put(VALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueNode();
-			}
-		});
-		cParserMap.put(VALUE_ARRAY, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueArrayNode();
-			}
-		});
-		cParserMap.put(VALUE_REFERENCE, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueReferenceNode();
-			}
-		});
-		cParserMap.put(VALUE_REFARRAY, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueRefArrayNode();
-			}
-		});
-		cParserMap.put(VALUE_OBJECT, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueObjectNode();
-			}
-		});
-		cParserMap.put(VALUE_NAMEDINSTANCE, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueNamedInstanceNode();
-			}
-		});
-		cParserMap.put(VALUE_OBJECTWITHLOCALPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueObjectWithLocalPathNode();
-			}
-		});
-		cParserMap.put(VALUE_OBJECTWITHPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueObjectWithPathNode();
-			}
-		});
-		cParserMap.put(VALUE_NULL, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueNullNode();
-			}
-		});
-		cParserMap.put(VALUE_INSTANCEWITHPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueInstanceWithPathNode();
-			}
-		});
-		cParserMap.put(NAMESPACEPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new NameSpacePathNode();
-			}
-		});
-		cParserMap.put(LOCALNAMESPACEPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new LocalNameSpacePathNode();
-			}
-		});
-		cParserMap.put(HOST, new FactoryEntry() {
-
-			public Node create() {
-				return new HostNode();
-			}
-		});
-		cParserMap.put(NAMESPACE, new FactoryEntry() {
-
-			public Node create() {
-				return new NameSpaceNode();
-			}
-		});
-		cParserMap.put(CLASSPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new ClassPathNode();
-			}
-		});
-		cParserMap.put(LOCALCLASSPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new LocalClassPathNode();
-			}
-		});
-		cParserMap.put(CLASSNAME, new FactoryEntry() {
-
-			public Node create() {
-				return new ClassNameNode();
-			}
-		});
-		cParserMap.put(INSTANCEPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new InstancePathNode();
-			}
-		});
-		cParserMap.put(LOCALINSTANCEPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new LocalInstancePathNode();
-			}
-		});
-		cParserMap.put(INSTANCENAME, new FactoryEntry() {
-
-			public Node create() {
-				return new InstanceNameNode();
-			}
-		});
-		cParserMap.put(OBJECTPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new ObjectPathNode();
-			}
-		});
-		cParserMap.put(KEYBINDING, new FactoryEntry() {
-
-			public Node create() {
-				return new KeyBindingNode();
-			}
-		});
-		cParserMap.put(KEYVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new KeyValueNode();
-			}
-		});
-		cParserMap.put(CLASS, new FactoryEntry() {
-
-			public Node create() {
-				return new ClassNode();
-			}
-		});
-		cParserMap.put(INSTANCE, new FactoryEntry() {
-
-			public Node create() {
-				return new InstanceNode();
-			}
-		});
-		cParserMap.put(QUALIFIER, new FactoryEntry() {
-
-			public Node create() {
-				return new QualifierNode();
-			}
-		});
-		cParserMap.put(PROPERTY, new FactoryEntry() {
-
-			public Node create() {
-				return new PropertyNode();
-			}
-		});
-		cParserMap.put(PROPERTY_ARRAY, new FactoryEntry() {
-
-			public Node create() {
-				return new PropertyArrayNode();
-			}
-		});
-		cParserMap.put(PROPERTY_REFERENCE, new FactoryEntry() {
-
-			public Node create() {
-				return new PropertyReferenceNode();
-			}
-		});
-		cParserMap.put(METHOD, new FactoryEntry() {
-
-			public Node create() {
-				return new MethodNode();
-			}
-		});
-		cParserMap.put(PARAMETER, new FactoryEntry() {
-
-			public Node create() {
-				return new ParameterNode();
-			}
-		});
-		cParserMap.put(PARAMETER_REFERENCE, new FactoryEntry() {
-
-			public Node create() {
-				return new ParameterReferenceNode();
-			}
-		});
-		cParserMap.put(PARAMETER_ARRAY, new FactoryEntry() {
-
-			public Node create() {
-				return new ParameterArrayNode();
-			}
-		});
-		cParserMap.put(PARAMETER_REFARRAY, new FactoryEntry() {
-
-			public Node create() {
-				return new ParameterRefArrayNode();
-			}
-		});
-		cParserMap.put(MESSAGE, new FactoryEntry() {
-
-			public Node create() {
-				return new MessageNode();
-			}
-		});
-		cParserMap.put(MULTIREQ, new FactoryEntry() {
-
-			public Node create() {
-				return new MultiReqNode();
-			}
-		});
-		cParserMap.put(MULTIEXPREQ, new FactoryEntry() {
-
-			public Node create() {
-				return new MultiExpReqNode();
-			}
-		});
-		cParserMap.put(SIMPLEREQ, new FactoryEntry() {
-
-			public Node create() {
-				return new SimpleReqNode();
-			}
-		});
-		cParserMap.put(SIMPLEEXPREQ, new FactoryEntry() {
-
-			public Node create() {
-				return new SimpleExpReqNode();
-			}
-		});
-		cParserMap.put(IMETHODCALL, new FactoryEntry() {
-
-			public Node create() {
-				return new IMethodCallNode();
-			}
-		});
-		cParserMap.put(METHODCALL, new FactoryEntry() {
-
-			public Node create() {
-				return new MethodCallNode();
-			}
-		});
-		cParserMap.put(EXPMETHODCALL, new FactoryEntry() {
-
-			public Node create() {
-				return new ExpMethodCallNode();
-			}
-		});
-		cParserMap.put(PARAMVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new ParamValueNode();
-			}
-		});
-		cParserMap.put(IPARAMVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new IParamValueNode();
-			}
-		});
-		cParserMap.put(EXPPARAMVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new ExpParamValueNode();
-			}
-		});
-		cParserMap.put(MULTIRSP, new FactoryEntry() {
-
-			public Node create() {
-				return new MultiRspNode();
-			}
-		});
-		cParserMap.put(MULTIEXPRSP, new FactoryEntry() {
-
-			public Node create() {
-				return new MultiExpRspNode();
-			}
-		});
-		cParserMap.put(SIMPLERSP, new FactoryEntry() {
-
-			public Node create() {
-				return new SimpleRspNode();
-			}
-		});
-		cParserMap.put(SIMPLEEXPRSP, new FactoryEntry() {
-
-			public Node create() {
-				return new SimpleExpRspNode();
-			}
-		});
-		cParserMap.put(METHODRESPONSE, new FactoryEntry() {
-
-			public Node create() {
-				return new MethodResponseNode();
-			}
-		});
-		cParserMap.put(EXPMETHODRESPONSE, new FactoryEntry() {
-
-			public Node create() {
-				return new ExpMethodResponseNode();
-			}
-		});
-		cParserMap.put(IMETHODRESPONSE, new FactoryEntry() {
-
-			public Node create() {
-				return new IMethodResponseNode();
-			}
-		});
-		cParserMap.put(ERROR, new FactoryEntry() {
-
-			public Node create() {
-				return new ErrorNode();
-			}
-		});
-		cParserMap.put(RETURNVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new ReturnValueNode();
-			}
-		});
-		cParserMap.put(IRETURNVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new IReturnValueNode();
-			}
-		});
-		cParserMap.put(CORRELATOR, new FactoryEntry() {
-
-			public Node create() {
-				return new CorrelatorNode();
-			}
-		});
-	}
-
-	private static final HashMap NODENAME_HASH = new HashMap();
-
-	private static void initNodeNameHash(String[] pEnumA) {
-		for (int i = 0; i < pEnumA.length; i++)
-			NODENAME_HASH.put(pEnumA[i], pEnumA[i]);
-	}
-
-	static {
-		initNodeNameHash(new String[] { CIM, DECLARATION, DECLGROUP, DECLGROUP_WITHNAME,
-				DECLGROUP_WITHPATH, QUALIFIER_DECLARATION, SCOPE, VALUE, VALUE_ARRAY,
-				VALUE_REFERENCE, VALUE_REFARRAY, VALUE_OBJECT, VALUE_NAMEDINSTANCE,
-				VALUE_NAMEDOBJECT, VALUE_OBJECTWITHLOCALPATH, VALUE_OBJECTWITHPATH, VALUE_NULL,
-				VALUE_INSTANCEWITHPATH,
-
-				NAMESPACEPATH, LOCALNAMESPACEPATH, HOST, NAMESPACE, CLASSPATH, LOCALCLASSPATH,
-				CLASSNAME, INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME, OBJECTPATH, KEYBINDING,
-				KEYVALUE,
-
-				CLASS, INSTANCE, QUALIFIER, PROPERTY, PROPERTY_ARRAY, PROPERTY_REFERENCE, METHOD,
-				PARAMETER, PARAMETER_REFERENCE, PARAMETER_ARRAY, PARAMETER_REFARRAY,
-
-				/*
-				 * TABLE stuff is missing yet
-				 */
-				MESSAGE, MULTIREQ, MULTIEXPREQ, SIMPLEREQ, SIMPLEEXPREQ, IMETHODCALL, METHODCALL,
-				EXPMETHODCALL, PARAMVALUE, IPARAMVALUE, EXPPARAMVALUE, MULTIRSP, MULTIEXPRSP,
-				SIMPLERSP, SIMPLEEXPRSP, METHODRESPONSE, EXPMETHODRESPONSE, IMETHODRESPONSE, ERROR,
-				RETURNVALUE, IRETURNVALUE, CORRELATOR });
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
+ * 3498482    2012-03-09  blaschke-oss Red Hat: Possible XML Hash DoS in sblim
+ * 3535383    2012-08-01  blaschke-oss HashDoS fix 3498482
+ *    2672    2013-09-26  blaschke-oss Remove SIMPLEREQACK support
+ *    2690    2013-10-11  blaschke-oss Remove RESPONSEDESTINATION support
+ *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.HashMap;
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.*;
+
+/**
+ * Class NodeFactory is responsible for Node instance construction.
+ * 
+ */
+public class NodeFactory implements NodeConstIf {
+
+	/**
+	 * getNodeInstance
+	 * 
+	 * @param pNodeName
+	 *            Should be an XML element name constant which is defined in
+	 *            NodeConstIf
+	 * @return the Node subclass which implements the parsing of pNodeName named
+	 *         XML Element.
+	 */
+	public static Node getNodeInstance(String pNodeName) {
+		createParserMap();
+		return cParserMap.get(pNodeName).create();
+	}
+
+	/**
+	 * getEnum
+	 * 
+	 * @param pNodeName
+	 * @return The corresponding String constant for an XML element name. It
+	 *         must be used, because the Node subclasses use reference based
+	 *         equals comparisons (==).
+	 */
+	public static String getEnum(String pNodeName) {
+		return NODENAME_HASH.get(pNodeName);
+	}
+
+	private static HashMap cParserMap;
+
+	private interface FactoryEntry {
+
+		/**
+		 * create
+		 * 
+		 * @return Node
+		 */
+		public Node create();
+	}
+
+	private synchronized static void createParserMap() {
+		if (cParserMap != null) return;
+		cParserMap = new HashMap();
+		cParserMap.put(CIM, new FactoryEntry() {
+
+			public Node create() {
+				return new CIMNode();
+			}
+		});
+		// DECLARATION - not implemented
+		// DECLGROUP - not implemented
+		// DECLGROUP.WITHNAME - not implemented
+		// DECLGROUP.WITHPATH - not implemented
+		cParserMap.put(QUALIFIER_DECLARATION, new FactoryEntry() {
+
+			public Node create() {
+				return new QualiDeclNode();
+			}
+		});
+		cParserMap.put(SCOPE, new FactoryEntry() {
+
+			public Node create() {
+				return new ScopeNode();
+			}
+		});
+		cParserMap.put(VALUE, new FactoryEntry() {
+
+			public Node create() {
+				return new ValueNode();
+			}
+		});
+		cParserMap.put(VALUE_ARRAY, new FactoryEntry() {
+
+			public Node create() {
+				return new ValueArrayNode();
+			}
+		});
+		cParserMap.put(VALUE_REFERENCE, new FactoryEntry() {
+
+			public Node create() {
+				return new ValueReferenceNode();
+			}
+		});
+		cParserMap.put(VALUE_REFARRAY, new FactoryEntry() {
+
+			public Node create() {
+				return new ValueRefArrayNode();
+			}
+		});
+		cParserMap.put(VALUE_OBJECT, new FactoryEntry() {
+
+			public Node create() {
+				return new ValueObjectNode();
+			}
+		});
+		cParserMap.put(VALUE_NAMEDINSTANCE, new FactoryEntry() {
+
+			public Node create() {
+				return new ValueNamedInstanceNode();
+			}
+		});
+		cParserMap.put(VALUE_OBJECTWITHLOCALPATH, new FactoryEntry() {
+
+			public Node create() {
+				return new ValueObjectWithLocalPathNode();
+			}
+		});
+		cParserMap.put(VALUE_OBJECTWITHPATH, new FactoryEntry() {
+
+			public Node create() {
+				return new ValueObjectWithPathNode();
+			}
+		});
+		cParserMap.put(VALUE_NULL, new FactoryEntry() {
+
+			public Node create() {
+				return new ValueNullNode();
+			}
+		});
+		cParserMap.put(VALUE_INSTANCEWITHPATH, new FactoryEntry() {
+
+			public Node create() {
+				return new ValueInstanceWithPathNode();
+			}
+		});
+		cParserMap.put(NAMESPACEPATH, new FactoryEntry() {
+
+			public Node create() {
+				return new NameSpacePathNode();
+			}
+		});
+		cParserMap.put(LOCALNAMESPACEPATH, new FactoryEntry() {
+
+			public Node create() {
+				return new LocalNameSpacePathNode();
+			}
+		});
+		cParserMap.put(HOST, new FactoryEntry() {
+
+			public Node create() {
+				return new HostNode();
+			}
+		});
+		cParserMap.put(NAMESPACE, new FactoryEntry() {
+
+			public Node create() {
+				return new NameSpaceNode();
+			}
+		});
+		cParserMap.put(CLASSPATH, new FactoryEntry() {
+
+			public Node create() {
+				return new ClassPathNode();
+			}
+		});
+		cParserMap.put(LOCALCLASSPATH, new FactoryEntry() {
+
+			public Node create() {
+				return new LocalClassPathNode();
+			}
+		});
+		cParserMap.put(CLASSNAME, new FactoryEntry() {
+
+			public Node create() {
+				return new ClassNameNode();
+			}
+		});
+		cParserMap.put(INSTANCEPATH, new FactoryEntry() {
+
+			public Node create() {
+				return new InstancePathNode();
+			}
+		});
+		cParserMap.put(LOCALINSTANCEPATH, new FactoryEntry() {
+
+			public Node create() {
+				return new LocalInstancePathNode();
+			}
+		});
+		cParserMap.put(INSTANCENAME, new FactoryEntry() {
+
+			public Node create() {
+				return new InstanceNameNode();
+			}
+		});
+		cParserMap.put(OBJECTPATH, new FactoryEntry() {
+
+			public Node create() {
+				return new ObjectPathNode();
+			}
+		});
+		cParserMap.put(KEYBINDING, new FactoryEntry() {
+
+			public Node create() {
+				return new KeyBindingNode();
+			}
+		});
+		cParserMap.put(KEYVALUE, new FactoryEntry() {
+
+			public Node create() {
+				return new KeyValueNode();
+			}
+		});
+		cParserMap.put(CLASS, new FactoryEntry() {
+
+			public Node create() {
+				return new ClassNode();
+			}
+		});
+		cParserMap.put(INSTANCE, new FactoryEntry() {
+
+			public Node create() {
+				return new InstanceNode();
+			}
+		});
+		cParserMap.put(QUALIFIER, new FactoryEntry() {
+
+			public Node create() {
+				return new QualifierNode();
+			}
+		});
+		cParserMap.put(PROPERTY, new FactoryEntry() {
+
+			public Node create() {
+				return new PropertyNode();
+			}
+		});
+		cParserMap.put(PROPERTY_ARRAY, new FactoryEntry() {
+
+			public Node create() {
+				return new PropertyArrayNode();
+			}
+		});
+		cParserMap.put(PROPERTY_REFERENCE, new FactoryEntry() {
+
+			public Node create() {
+				return new PropertyReferenceNode();
+			}
+		});
+		cParserMap.put(METHOD, new FactoryEntry() {
+
+			public Node create() {
+				return new MethodNode();
+			}
+		});
+		cParserMap.put(PARAMETER, new FactoryEntry() {
+
+			public Node create() {
+				return new ParameterNode();
+			}
+		});
+		cParserMap.put(PARAMETER_REFERENCE, new FactoryEntry() {
+
+			public Node create() {
+				return new ParameterReferenceNode();
+			}
+		});
+		cParserMap.put(PARAMETER_ARRAY, new FactoryEntry() {
+
+			public Node create() {
+				return new ParameterArrayNode();
+			}
+		});
+		cParserMap.put(PARAMETER_REFARRAY, new FactoryEntry() {
+
+			public Node create() {
+				return new ParameterRefArrayNode();
+			}
+		});
+		cParserMap.put(MESSAGE, new FactoryEntry() {
+
+			public Node create() {
+				return new MessageNode();
+			}
+		});
+		cParserMap.put(MULTIREQ, new FactoryEntry() {
+
+			public Node create() {
+				return new MultiReqNode();
+			}
+		});
+		cParserMap.put(MULTIEXPREQ, new FactoryEntry() {
+
+			public Node create() {
+				return new MultiExpReqNode();
+			}
+		});
+		cParserMap.put(SIMPLEREQ, new FactoryEntry() {
+
+			public Node create() {
+				return new SimpleReqNode();
+			}
+		});
+		cParserMap.put(SIMPLEEXPREQ, new FactoryEntry() {
+
+			public Node create() {
+				return new SimpleExpReqNode();
+			}
+		});
+		cParserMap.put(IMETHODCALL, new FactoryEntry() {
+
+			public Node create() {
+				return new IMethodCallNode();
+			}
+		});
+		cParserMap.put(METHODCALL, new FactoryEntry() {
+
+			public Node create() {
+				return new MethodCallNode();
+			}
+		});
+		cParserMap.put(EXPMETHODCALL, new FactoryEntry() {
+
+			public Node create() {
+				return new ExpMethodCallNode();
+			}
+		});
+		cParserMap.put(PARAMVALUE, new FactoryEntry() {
+
+			public Node create() {
+				return new ParamValueNode();
+			}
+		});
+		cParserMap.put(IPARAMVALUE, new FactoryEntry() {
+
+			public Node create() {
+				return new IParamValueNode();
+			}
+		});
+		cParserMap.put(EXPPARAMVALUE, new FactoryEntry() {
+
+			public Node create() {
+				return new ExpParamValueNode();
+			}
+		});
+		cParserMap.put(MULTIRSP, new FactoryEntry() {
+
+			public Node create() {
+				return new MultiRspNode();
+			}
+		});
+		cParserMap.put(MULTIEXPRSP, new FactoryEntry() {
+
+			public Node create() {
+				return new MultiExpRspNode();
+			}
+		});
+		cParserMap.put(SIMPLERSP, new FactoryEntry() {
+
+			public Node create() {
+				return new SimpleRspNode();
+			}
+		});
+		cParserMap.put(SIMPLEEXPRSP, new FactoryEntry() {
+
+			public Node create() {
+				return new SimpleExpRspNode();
+			}
+		});
+		cParserMap.put(METHODRESPONSE, new FactoryEntry() {
+
+			public Node create() {
+				return new MethodResponseNode();
+			}
+		});
+		cParserMap.put(EXPMETHODRESPONSE, new FactoryEntry() {
+
+			public Node create() {
+				return new ExpMethodResponseNode();
+			}
+		});
+		cParserMap.put(IMETHODRESPONSE, new FactoryEntry() {
+
+			public Node create() {
+				return new IMethodResponseNode();
+			}
+		});
+		cParserMap.put(ERROR, new FactoryEntry() {
+
+			public Node create() {
+				return new ErrorNode();
+			}
+		});
+		cParserMap.put(RETURNVALUE, new FactoryEntry() {
+
+			public Node create() {
+				return new ReturnValueNode();
+			}
+		});
+		cParserMap.put(IRETURNVALUE, new FactoryEntry() {
+
+			public Node create() {
+				return new IReturnValueNode();
+			}
+		});
+		cParserMap.put(CORRELATOR, new FactoryEntry() {
+
+			public Node create() {
+				return new CorrelatorNode();
+			}
+		});
+	}
+
+	private static final HashMap NODENAME_HASH = new HashMap();
+
+	private static void initNodeNameHash(String[] pEnumA) {
+		for (int i = 0; i < pEnumA.length; i++)
+			NODENAME_HASH.put(pEnumA[i], pEnumA[i]);
+	}
+
+	static {
+		initNodeNameHash(new String[] { CIM, DECLARATION, DECLGROUP, DECLGROUP_WITHNAME,
+				DECLGROUP_WITHPATH, QUALIFIER_DECLARATION, SCOPE, VALUE, VALUE_ARRAY,
+				VALUE_REFERENCE, VALUE_REFARRAY, VALUE_OBJECT, VALUE_NAMEDINSTANCE,
+				VALUE_NAMEDOBJECT, VALUE_OBJECTWITHLOCALPATH, VALUE_OBJECTWITHPATH, VALUE_NULL,
+				VALUE_INSTANCEWITHPATH,
+
+				NAMESPACEPATH, LOCALNAMESPACEPATH, HOST, NAMESPACE, CLASSPATH, LOCALCLASSPATH,
+				CLASSNAME, INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME, OBJECTPATH, KEYBINDING,
+				KEYVALUE,
+
+				CLASS, INSTANCE, QUALIFIER, PROPERTY, PROPERTY_ARRAY, PROPERTY_REFERENCE, METHOD,
+				PARAMETER, PARAMETER_REFERENCE, PARAMETER_ARRAY, PARAMETER_REFARRAY,
+
+				/*
+				 * TABLE stuff is missing yet
+				 */
+				MESSAGE, MULTIREQ, MULTIEXPREQ, SIMPLEREQ, SIMPLEEXPREQ, IMETHODCALL, METHODCALL,
+				EXPMETHODCALL, PARAMVALUE, IPARAMVALUE, EXPPARAMVALUE, MULTIRSP, MULTIEXPRSP,
+				SIMPLERSP, SIMPLEEXPRSP, METHODRESPONSE, EXPMETHODRESPONSE, IMETHODRESPONSE, ERROR,
+				RETURNVALUE, IRETURNVALUE, CORRELATOR });
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java
index 7562925..37724be 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java
@@ -1,161 +1,159 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.HashMap;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
-
-/**
- * NodePool is used by XMLDefaultHandlerImpl to store unused Node instances
- * which can be reused later without instantiating new ones.
- */
-public class NodePool {
-
-	private HashMap iPoolMap = new HashMap(512);
-
-	private int iHitCnt = 0;
-
-	private int iMissCnt = 0;
-
-	/**
-	 * addNode
-	 * 
-	 * @param pNode
-	 */
-	public void addNode(Node pNode) {
-		PoolStack ps = this.iPoolMap.get(pNode.getNodeName());
-		if (ps == null) {
-			this.iPoolMap.put(pNode.getNodeName(), new PoolStack(pNode));
-			return;
-		}
-		ps.put(pNode);
-	}
-
-	/**
-	 * getNode
-	 * 
-	 * @param pNodeName
-	 * @return Node
-	 */
-	public Node getNode(String pNodeName) {
-		PoolStack ps = this.iPoolMap.get(pNodeName);
-		if (ps == null) {
-			++this.iMissCnt;
-			return null;
-		}
-		Node node = ps.get();
-		if (node == null) ++this.iMissCnt;
-		else ++this.iHitCnt;
-		return node;
-	}
-
-	/**
-	 * getHitCnt
-	 * 
-	 * @return int
-	 */
-	public int getHitCnt() {
-		return this.iHitCnt;
-	}
-
-	/**
-	 * getMissCnt
-	 * 
-	 * @return int
-	 */
-	public int getMissCnt() {
-		return this.iMissCnt;
-	}
-
-}
-
-class PoolStack {
-
-	private static final int CAPACITY = 8, MAX_USECNT = CAPACITY - 1, MAX_IDX = MAX_USECNT;
-
-	private Node[] iNodeA = new Node[CAPACITY];
-
-	private int iIdx = 0, iUseCnt = 0;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNode
-	 */
-	public PoolStack(Node pNode) {
-		put(pNode);
-	}
-
-	/**
-	 * put
-	 * 
-	 * @param pNode
-	 */
-	public void put(Node pNode) {
-		if (this.iUseCnt < MAX_USECNT) ++this.iUseCnt;
-		this.iNodeA[this.iIdx] = pNode;
-		incIdx();
-	}
-
-	/**
-	 * get
-	 * 
-	 * @return Node
-	 */
-	public Node get() {
-		if (this.iUseCnt == 0) return null;
-		--this.iUseCnt;
-		decIdx();
-		return this.iNodeA[this.iIdx];
-	}
-
-	private void decIdx() {
-		this.iIdx = (this.iIdx == 0 ? MAX_IDX : this.iIdx - 1);
-	}
-
-	private void incIdx() {
-		this.iIdx = (this.iIdx == MAX_IDX ? 0 : this.iIdx + 1);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.HashMap;
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
+
+/**
+ * NodePool is used by XMLDefaultHandlerImpl to store unused Node instances
+ * which can be reused later without instantiating new ones.
+ */
+public class NodePool {
+
+	private HashMap iPoolMap = new HashMap(512);
+
+	private int iHitCnt = 0;
+
+	private int iMissCnt = 0;
+
+	/**
+	 * addNode
+	 * 
+	 * @param pNode
+	 */
+	public void addNode(Node pNode) {
+		PoolStack ps = this.iPoolMap.get(pNode.getNodeName());
+		if (ps == null) {
+			this.iPoolMap.put(pNode.getNodeName(), new PoolStack(pNode));
+			return;
+		}
+		ps.put(pNode);
+	}
+
+	/**
+	 * getNode
+	 * 
+	 * @param pNodeName
+	 * @return Node
+	 */
+	public Node getNode(String pNodeName) {
+		PoolStack ps = this.iPoolMap.get(pNodeName);
+		if (ps == null) {
+			++this.iMissCnt;
+			return null;
+		}
+		Node node = ps.get();
+		if (node == null) ++this.iMissCnt;
+		else ++this.iHitCnt;
+		return node;
+	}
+
+	/**
+	 * getHitCnt
+	 * 
+	 * @return int
+	 */
+	public int getHitCnt() {
+		return this.iHitCnt;
+	}
+
+	/**
+	 * getMissCnt
+	 * 
+	 * @return int
+	 */
+	public int getMissCnt() {
+		return this.iMissCnt;
+	}
+
+}
+
+class PoolStack {
+
+	private static final int CAPACITY = 8, MAX_USECNT = CAPACITY - 1, MAX_IDX = MAX_USECNT;
+
+	private Node[] iNodeA = new Node[CAPACITY];
+
+	private int iIdx = 0, iUseCnt = 0;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNode
+	 */
+	public PoolStack(Node pNode) {
+		put(pNode);
+	}
+
+	/**
+	 * put
+	 * 
+	 * @param pNode
+	 */
+	public void put(Node pNode) {
+		if (this.iUseCnt < MAX_USECNT) ++this.iUseCnt;
+		this.iNodeA[this.iIdx] = pNode;
+		incIdx();
+	}
+
+	/**
+	 * get
+	 * 
+	 * @return Node
+	 */
+	public Node get() {
+		if (this.iUseCnt == 0) return null;
+		--this.iUseCnt;
+		decIdx();
+		return this.iNodeA[this.iIdx];
+	}
+
+	private void decIdx() {
+		this.iIdx = (this.iIdx == 0 ? MAX_IDX : this.iIdx - 1);
+	}
+
+	private void incIdx() {
+		this.iIdx = (this.iIdx == MAX_IDX ? 0 : this.iIdx + 1);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java
similarity index 65%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java
index f22baf1..bc3c7e5 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java
@@ -1,105 +1,103 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1688273    2007-04-16  ebak         Full support of HTTP trailers
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.InputStreamReader;
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractMessageNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.CIMNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.MessageNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.SimpleRspNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.TrailerException;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.xml.sax.InputSource;
-
-/**
- * Class SAXHelper stores methods to help high level CIM-XML pull and SAX
- * parsing.
- */
-public class SAXHelper {
-
-	/**
-	 * parseInvokeMethodResponse
-	 * 
-	 * @param pIs
-	 * @param pOutArgs
-	 * @param pDefPath
-	 * @return Object, any kind of JSR48 value class
-	 * @throws Exception
-	 */
-	public static Object parseInvokeMethodResponse(InputStreamReader pIs,
-			CIMArgument[] pOutArgs, CIMObjectPath pDefPath) throws Exception {
-		XMLDefaultHandlerImpl hndlr = new XMLDefaultHandlerImpl(pDefPath);
-		SAXParserFactory factory = SAXParserFactory.newInstance();
-		SAXParser saxParser = factory.newSAXParser();
-		try {
-			saxParser.parse(new InputSource(pIs), hndlr);
-		} catch (TrailerException e) {
-			throw e.getWBEMException();
-		}
-
-		CIMNode cimNode = hndlr.getCIMNode();
-		MessageNode msgNode = cimNode.getMessageNode();
-		AbstractMessageNode absMsgNode = msgNode.getAbstractMessageNode();
-		SimpleRspNode simpRspNode = (SimpleRspNode) absMsgNode;
-		CIMError cimErr = simpRspNode.getCIMError();
-		if (cimErr != null) throw new WBEMException(cimErr.getCode(), cimErr.getDescription(),
-				cimErr.getCIMInstances());
-		CIMArgument[] outArgs = simpRspNode.getCIMArguments();
-		if (pOutArgs != null && outArgs != null) {
-			int len = Math.min(pOutArgs.length, outArgs.length);
-			for (int i = 0; i < len; i++)
-				pOutArgs[i] = outArgs[i];
-		}
-		return simpRspNode.getReturnValueCount() == 0 ? null : simpRspNode.readReturnValue();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1688273    2007-04-16  ebak         Full support of HTTP trailers
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.InputStreamReader;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.CIMNode;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.MessageNode;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.SimpleRspNode;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.TrailerException;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractMessageNode;
+import org.xml.sax.InputSource;
+
+/**
+ * Class SAXHelper stores methods to help high level CIM-XML pull and SAX
+ * parsing.
+ */
+public class SAXHelper {
+
+	/**
+	 * parseInvokeMethodResponse
+	 * 
+	 * @param pIs
+	 * @param pOutArgs
+	 * @param pDefPath
+	 * @return Object, any kind of JSR48 value class
+	 * @throws Exception
+	 */
+	public static Object parseInvokeMethodResponse(InputStreamReader pIs,
+			CIMArgument[] pOutArgs, CIMObjectPath pDefPath) throws Exception {
+		XMLDefaultHandlerImpl hndlr = new XMLDefaultHandlerImpl(pDefPath);
+		SAXParserFactory factory = SAXParserFactory.newInstance();
+		SAXParser saxParser = factory.newSAXParser();
+		try {
+			saxParser.parse(new InputSource(pIs), hndlr);
+		} catch (TrailerException e) {
+			throw e.getWBEMException();
+		}
+
+		CIMNode cimNode = hndlr.getCIMNode();
+		MessageNode msgNode = cimNode.getMessageNode();
+		AbstractMessageNode absMsgNode = msgNode.getAbstractMessageNode();
+		SimpleRspNode simpRspNode = (SimpleRspNode) absMsgNode;
+		CIMError cimErr = simpRspNode.getCIMError();
+		if (cimErr != null) throw new WBEMException(cimErr.getCode(), cimErr.getDescription(),
+				cimErr.getCIMInstances());
+		CIMArgument[] outArgs = simpRspNode.getCIMArguments();
+		if (pOutArgs != null && outArgs != null) {
+			int len = Math.min(pOutArgs.length, outArgs.length);
+			for (int i = 0; i < len; i++)
+				pOutArgs[i] = outArgs[i];
+		}
+		return simpRspNode.getReturnValueCount() == 0 ? null : simpRspNode.readReturnValue();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java
similarity index 64%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java
index a44f727..547b3a1 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java
@@ -1,87 +1,84 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-
-/**
- * This class is intended to store variables which are common for a whole
- * CIM-XML SAX parsing session.
- */
-public class SAXSession {
-
-	private CIMObjectPath iDefLocalPath;
-
-	private boolean iStrictEmbObjParsing = WBEMConfiguration.getGlobalConfiguration()
-			.strictEmbObjTypes();
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pDefLocalPath
-	 */
-	public SAXSession(CIMObjectPath pDefLocalPath) {
-		this.iDefLocalPath = pDefLocalPath;
-	}
-
-	/**
-	 * getDefLocalPath
-	 * 
-	 * @return CIMObjectPath
-	 */
-	public CIMObjectPath getDefLocalPath() {
-		return this.iDefLocalPath;
-	}
-
-	/**
-	 * strictEmbObjParsing
-	 * 
-	 * @return boolean
-	 */
-	public boolean strictEmbObjParsing() {
-		return this.iStrictEmbObjParsing;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+
+/**
+ * This class is intended to store variables which are common for a whole
+ * CIM-XML SAX parsing session.
+ */
+public class SAXSession {
+
+	private CIMObjectPath iDefLocalPath;
+
+	private boolean iStrictEmbObjParsing = WBEMConfiguration.getGlobalConfiguration()
+			.strictEmbObjTypes();
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pDefLocalPath
+	 */
+	public SAXSession(CIMObjectPath pDefLocalPath) {
+		this.iDefLocalPath = pDefLocalPath;
+	}
+
+	/**
+	 * getDefLocalPath
+	 * 
+	 * @return CIMObjectPath
+	 */
+	public CIMObjectPath getDefLocalPath() {
+		return this.iDefLocalPath;
+	}
+
+	/**
+	 * strictEmbObjParsing
+	 * 
+	 * @return boolean
+	 */
+	public boolean strictEmbObjParsing() {
+		return this.iStrictEmbObjParsing;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java
index 51123c5..6677a78 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java
@@ -1,296 +1,293 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- *    2713    2013-11-22  blaschke-oss Enforce loose validation of CIM-XML documents
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.CIMNode;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node.NonVolatileIf;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Class XMLDefaultHandlerImpl is DefaultHandler implementation which is used
- * for SAX and PULL style XML parsing.
- */
-public class XMLDefaultHandlerImpl extends DefaultHandler {
-
-	private Node iRootNode;
-
-	private NodeStack iNodeStack = new NodeStack();
-
-	private NodePool iNodePool = new NodePool();
-
-	private StringBuffer iStrBuf;
-
-	private SAXSession iSession;
-
-	private boolean iAnyRoot;
-
-	/**
-	 * NodeStack
-	 */
-	static class NodeStack {
-
-		private ArrayList iAL = new ArrayList();
-
-		/**
-		 * push
-		 * 
-		 * @param pNode
-		 */
-		public void push(Node pNode) {
-			this.iAL.add(pNode);
-		}
-
-		/**
-		 * pop
-		 * 
-		 * @return Node
-		 */
-		public Node pop() {
-			if (this.iAL.size() == 0) return null;
-			return this.iAL.remove(this.iAL.size() - 1);
-		}
-
-		/**
-		 * peek
-		 * 
-		 * @return Node
-		 */
-		public Node peek() {
-			if (this.iAL.size() == 0) return null;
-			return this.iAL.get(this.iAL.size() - 1);
-		}
-
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pSession
-	 *            - stores common variables for the whole parsing session
-	 * @param pAnyRoot
-	 *            - if true any CIM-XML element can be the root element of the
-	 *            XML stream
-	 */
-	public XMLDefaultHandlerImpl(SAXSession pSession, boolean pAnyRoot) {
-		this.iSession = pSession;
-		this.iAnyRoot = pAnyRoot;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLocalPath
-	 *            - CIMObjectPathes without local paths will be extended by this
-	 *            value
-	 * @param pAnyRoot
-	 *            - if true any CIM-XML element can be the root element of the
-	 *            XML stream
-	 */
-	public XMLDefaultHandlerImpl(CIMObjectPath pLocalPath, boolean pAnyRoot) {
-		this(new SAXSession(pLocalPath), pAnyRoot);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLocalPath
-	 *            - CIMObjectPathes without local paths will be extended by this
-	 *            value
-	 */
-	public XMLDefaultHandlerImpl(CIMObjectPath pLocalPath) {
-		this(pLocalPath, false);
-	}
-
-	/**
-	 * Ctor.
-	 */
-	public XMLDefaultHandlerImpl() {
-		this((CIMObjectPath) null, false);
-	}
-
-	/**
-	 * @param uri
-	 * @param localName
-	 */
-	@Override
-	public void startElement(String uri, String localName, String qName, Attributes attributes)
-			throws SAXException {
-		this.iStrBuf = null;
-		String nodeNameEnum = NodeFactory.getEnum(qName);
-		if (nodeNameEnum == null) {
-			LogAndTraceBroker.getBroker()
-					.trace(
-							Level.FINEST,
-							"Ignoring unrecognized starting CIM-XML element found during parsing: "
-									+ qName);
-			return;
-		}
-
-		Node parentNode = getPeekNode();
-		if (parentNode == null) {
-			if (!this.iAnyRoot && nodeNameEnum != NodeConstIf.CIM) throw new SAXException(
-					"First node of CIM-XML document must be CIM! " + nodeNameEnum + " is invalid!");
-		}
-		if (parentNode != null) parentNode.testChild(nodeNameEnum);
-		// let's look for a Node instance in the pool
-		Node node = this.iNodePool.getNode(nodeNameEnum);
-		// create an instance if pool didn't give us one
-		if (node == null) {
-			node = NodeFactory.getNodeInstance(nodeNameEnum);
-		}
-		if (parentNode != null) {
-			if (parentNode instanceof NonVolatileIf) ((NonVolatileIf) parentNode).addChild(node);
-		} else {
-			this.iRootNode = node;
-		}
-		this.iNodeStack.push(node);
-		node.init(attributes, this.iSession);
-	}
-
-	@Override
-	public void characters(char ch[], int start, int length) {
-		String str = new String(ch, start, length);
-		// System.out.println("str("+str.length()+")="+str);
-		if (this.iStrBuf == null) {
-			this.iStrBuf = new StringBuffer(str);
-		} else {
-			this.iStrBuf.append(str);
-		}
-	}
-
-	/**
-	 * @param uri
-	 * @param localName
-	 */
-	@Override
-	public void endElement(String uri, String localName, String qName) throws SAXException {
-		String nodeNameEnum = NodeFactory.getEnum(qName);
-		if (nodeNameEnum == null) {
-			LogAndTraceBroker.getBroker().trace(Level.FINEST,
-					"Ignoring unrecognized ending CIM-XML element found during parsing: " + qName);
-			return;
-		}
-		Node peekNode = this.iNodeStack.pop();
-		try {
-			// pass character data
-			if (this.iStrBuf != null) {
-				peekNode.parseData(this.iStrBuf.toString());
-				this.iStrBuf = null;
-			}
-			// completeness check
-			peekNode.testCompletness();
-
-			// call parent's childParsed()
-			Node parentNode = this.iNodeStack.peek();
-			if (parentNode != null) {
-				parentNode.childParsed(peekNode);
-			}
-		} finally {
-			peekNode.setCompleted();
-			// if peekNode is reusable place it into the NodePool
-			if (!(peekNode instanceof NonVolatileIf)) {
-				this.iNodePool.addNode(peekNode);
-			}
-		}
-	}
-
-	@Override
-	public void endDocument() {
-		String msg = "hits   : " + getNodePoolHits() + "\nmisses : " + getNodePoolMisses();
-		LogAndTraceBroker.getBroker().trace(Level.FINE, msg);
-	}
-
-	/**
-	 * getCIMNode
-	 * 
-	 * @return CIMNode, the root Element of the parsed CIM-XML document
-	 */
-	public CIMNode getCIMNode() {
-		return this.iRootNode instanceof CIMNode ? (CIMNode) this.iRootNode : null;
-	}
-
-	/**
-	 * getRootNode
-	 * 
-	 * @return Node, the root element of the parsed CIM-XML stream
-	 */
-	public Node getRootNode() {
-		return this.iRootNode;
-	}
-
-	/**
-	 * getNodePoolHits
-	 * 
-	 * @return int
-	 */
-	public int getNodePoolHits() {
-		return this.iNodePool.getHitCnt();
-	}
-
-	/**
-	 * getNodePoolMisses
-	 * 
-	 * @return int
-	 */
-	public int getNodePoolMisses() {
-		return this.iNodePool.getMissCnt();
-	}
-
-	private Node getPeekNode() {
-		return this.iNodeStack.peek();
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ *    2713    2013-11-22  blaschke-oss Enforce loose validation of CIM-XML documents
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.CIMNode;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.NonVolatileIf;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+/**
+ * Class XMLDefaultHandlerImpl is DefaultHandler implementation which is used
+ * for SAX and PULL style XML parsing.
+ */
+public class XMLDefaultHandlerImpl extends DefaultHandler {
+
+	private Node iRootNode;
+
+	private NodeStack iNodeStack = new NodeStack();
+
+	private NodePool iNodePool = new NodePool();
+
+	private StringBuffer iStrBuf;
+
+	private SAXSession iSession;
+
+	private boolean iAnyRoot;
+
+	/**
+	 * NodeStack
+	 */
+	static class NodeStack {
+
+		private ArrayList iAL = new ArrayList();
+
+		/**
+		 * push
+		 * 
+		 * @param pNode
+		 */
+		public void push(Node pNode) {
+			this.iAL.add(pNode);
+		}
+
+		/**
+		 * pop
+		 * 
+		 * @return Node
+		 */
+		public Node pop() {
+			if (this.iAL.size() == 0) return null;
+			return this.iAL.remove(this.iAL.size() - 1);
+		}
+
+		/**
+		 * peek
+		 * 
+		 * @return Node
+		 */
+		public Node peek() {
+			if (this.iAL.size() == 0) return null;
+			return this.iAL.get(this.iAL.size() - 1);
+		}
+
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pSession
+	 *            - stores common variables for the whole parsing session
+	 * @param pAnyRoot
+	 *            - if true any CIM-XML element can be the root element of the
+	 *            XML stream
+	 */
+	public XMLDefaultHandlerImpl(SAXSession pSession, boolean pAnyRoot) {
+		this.iSession = pSession;
+		this.iAnyRoot = pAnyRoot;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLocalPath
+	 *            - CIMObjectPathes without local paths will be extended by this
+	 *            value
+	 * @param pAnyRoot
+	 *            - if true any CIM-XML element can be the root element of the
+	 *            XML stream
+	 */
+	public XMLDefaultHandlerImpl(CIMObjectPath pLocalPath, boolean pAnyRoot) {
+		this(new SAXSession(pLocalPath), pAnyRoot);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLocalPath
+	 *            - CIMObjectPathes without local paths will be extended by this
+	 *            value
+	 */
+	public XMLDefaultHandlerImpl(CIMObjectPath pLocalPath) {
+		this(pLocalPath, false);
+	}
+
+	/**
+	 * Ctor.
+	 */
+	public XMLDefaultHandlerImpl() {
+		this((CIMObjectPath) null, false);
+	}
+
+	/**
+	 * @param uri
+	 * @param localName
+	 */
+	@Override
+	public void startElement(String uri, String localName, String qName, Attributes attributes)
+			throws SAXException {
+		this.iStrBuf = null;
+		String nodeNameEnum = NodeFactory.getEnum(qName);
+		if (nodeNameEnum == null) {
+			LogAndTraceBroker.getBroker()
+					.trace(
+							Level.FINEST,
+							"Ignoring unrecognized starting CIM-XML element found during parsing: "
+									+ qName);
+			return;
+		}
+
+		Node parentNode = getPeekNode();
+		if (parentNode == null) {
+			if (!this.iAnyRoot && nodeNameEnum != NodeConstIf.CIM) throw new SAXException(
+					"First node of CIM-XML document must be CIM! " + nodeNameEnum + " is invalid!");
+		}
+		if (parentNode != null) parentNode.testChild(nodeNameEnum);
+		// let's look for a Node instance in the pool
+		Node node = this.iNodePool.getNode(nodeNameEnum);
+		// create an instance if pool didn't give us one
+		if (node == null) {
+			node = NodeFactory.getNodeInstance(nodeNameEnum);
+		}
+		if (parentNode != null) {
+			if (parentNode instanceof NonVolatileIf) ((NonVolatileIf) parentNode).addChild(node);
+		} else {
+			this.iRootNode = node;
+		}
+		this.iNodeStack.push(node);
+		node.init(attributes, this.iSession);
+	}
+
+	@Override
+	public void characters(char ch[], int start, int length) {
+		String str = new String(ch, start, length);
+		// System.out.println("str("+str.length()+")="+str);
+		if (this.iStrBuf == null) {
+			this.iStrBuf = new StringBuffer(str);
+		} else {
+			this.iStrBuf.append(str);
+		}
+	}
+
+	/**
+	 * @param uri
+	 * @param localName
+	 */
+	@Override
+	public void endElement(String uri, String localName, String qName) throws SAXException {
+		String nodeNameEnum = NodeFactory.getEnum(qName);
+		if (nodeNameEnum == null) {
+			LogAndTraceBroker.getBroker().trace(Level.FINEST,
+					"Ignoring unrecognized ending CIM-XML element found during parsing: " + qName);
+			return;
+		}
+		Node peekNode = this.iNodeStack.pop();
+		try {
+			// pass character data
+			if (this.iStrBuf != null) {
+				peekNode.parseData(this.iStrBuf.toString());
+				this.iStrBuf = null;
+			}
+			// completeness check
+			peekNode.testCompletness();
+
+			// call parent's childParsed()
+			Node parentNode = this.iNodeStack.peek();
+			if (parentNode != null) {
+				parentNode.childParsed(peekNode);
+			}
+		} finally {
+			peekNode.setCompleted();
+			// if peekNode is reusable place it into the NodePool
+			if (!(peekNode instanceof NonVolatileIf)) {
+				this.iNodePool.addNode(peekNode);
+			}
+		}
+	}
+
+	@Override
+	public void endDocument() {
+		String msg = "hits   : " + getNodePoolHits() + "\nmisses : " + getNodePoolMisses();
+		LogAndTraceBroker.getBroker().trace(Level.FINE, msg);
+	}
+
+	/**
+	 * getCIMNode
+	 * 
+	 * @return CIMNode, the root Element of the parsed CIM-XML document
+	 */
+	public CIMNode getCIMNode() {
+		return this.iRootNode instanceof CIMNode ? (CIMNode) this.iRootNode : null;
+	}
+
+	/**
+	 * getRootNode
+	 * 
+	 * @return Node, the root element of the parsed CIM-XML stream
+	 */
+	public Node getRootNode() {
+		return this.iRootNode;
+	}
+
+	/**
+	 * getNodePoolHits
+	 * 
+	 * @return int
+	 */
+	public int getNodePoolHits() {
+		return this.iNodePool.getHitCnt();
+	}
+
+	/**
+	 * getNodePoolMisses
+	 * 
+	 * @return int
+	 */
+	public int getNodePoolMisses() {
+		return this.iNodePool.getMissCnt();
+	}
+
+	private Node getPeekNode() {
+		return this.iNodeStack.peek();
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java
similarity index 63%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java
index ee7af8d..adfada9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java
@@ -1,60 +1,58 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class AbstractArrayValueNode is the superclass of all VALUE.ARRAY style
- * nodes.
- */
-public abstract class AbstractArrayValueNode extends AbstractValueNode implements ArrayIf {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractArrayValueNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class AbstractArrayValueNode is the superclass of all VALUE.ARRAY style
+ * nodes.
+ */
+public abstract class AbstractArrayValueNode extends AbstractValueNode implements ArrayIf {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractArrayValueNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java
similarity index 65%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java
index 62239e2..f5bd86e 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java
@@ -1,69 +1,67 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class AbstractMessageNode is the superclass of AbstractResponseNode and
- * AbstractRequestNode classes.
- */
-public abstract class AbstractMessageNode extends Node implements NonVolatileIf {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractMessageNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// not needed
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class AbstractMessageNode is the superclass of AbstractResponseNode and
+ * AbstractRequestNode classes.
+ */
+public abstract class AbstractMessageNode extends Node implements NonVolatileIf {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractMessageNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// not needed
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java
index 15b5533..ce80e34 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java
@@ -1,209 +1,206 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- *    2682    2013-10-02  blaschke-oss (I)MethodCallNode allows no LOCAL*PATH
- *    2690    2013-10-11  blaschke-oss Remove RESPONSEDESTINATION support
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMElementSorter;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT IMETHODCALL (LOCALNAMESPACEPATH, IPARAMVALUE*)
- * ATTLIST IMETHODCALL
- *   %CIMName;
- *   
- * ELEMENT METHODCALL ((LOCALINSTANCEPATH | LOCALCLASSPATH), PARAMVALUE*)
- * ATTLIST METHODCALL
- *   %CIMName;
- * 
      
- */
-public abstract class AbstractMethodCallNode extends Node implements NonVolatileIf, ObjectPathIf {
-
-	private String iName;
-
-	protected CIMObjectPath iPath;
-
-	/**
-	 * (IPARAMVALUE | PARAMVALUE)* -> ArrayList of CIMArgument
-	 */
-	private ArrayList> iArgAL;
-
-	/**
-	 * Sorted array of CIMArguments
-	 */
-	private CIMArgument[] iArgA;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractMethodCallNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iName = getCIMName(pAttribs);
-		this.iPath = null;
-		this.iArgAL = null;
-		this.iArgA = null;
-	}
-
-	/**
-	 * @param pChild
-	 */
-	public void addChild(Node pChild) {
-	// nothing to do
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof AbstractPathNode) {
-			this.iPath = ((AbstractPathNode) pChild).getCIMObjectPath();
-		} else if (pChild instanceof AbstractParamValueNode) {
-			if (this.iArgAL == null) this.iArgAL = new ArrayList>();
-			this.iArgAL.add(((AbstractParamValueNode) pChild).getCIMArgument());
-		}
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	protected abstract void testSpecChild(String pNodeNameEnum) throws SAXException;
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		testSpecChild(pNodeNameEnum);
-	}
-
-	/**
-	 * getName
-	 * 
-	 * @return String, name of the called method
-	 */
-	public String getName() {
-		return this.iName;
-	}
-
-	public CIMObjectPath getCIMObjectPath() {
-		return this.iPath;
-	}
-
-	private static final CIMArgument[] EMPTY_ARG_A = new CIMArgument[0];
-
-	/**
-	 * getCIMArguments
-	 * 
-	 * @return CIMArgument[]
-	 */
-	public CIMArgument[] getCIMArguments() {
-		if (this.iArgA != null) return this.iArgA;
-		this.iArgA = this.iArgAL == null ? null : (CIMArgument[]) this.iArgAL.toArray(EMPTY_ARG_A);
-		return (CIMArgument[]) CIMElementSorter.sort(this.iArgA);
-	}
-
-	/**
-	 * getArgumentCount
-	 * 
-	 * @return int
-	 */
-	public int getArgumentCount() {
-		getCIMArguments();
-		return this.iArgA == null ? 0 : this.iArgA.length;
-	}
-
-	/**
-	 * getArgument
-	 * 
-	 * @param pName
-	 * @return CIMArgument
-	 */
-	public CIMArgument getArgument(String pName) {
-		getCIMArguments();
-		return (CIMArgument) CIMElementSorter.find(this.iArgA, pName);
-	}
-
-	/**
-	 * getArgument
-	 * 
-	 * @param pIdx
-	 * @return CIMArgument
-	 */
-	public CIMArgument getArgument(int pIdx) {
-		getCIMArguments();
-		return this.iArgA == null ? null : this.iArgA[pIdx];
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buf = new StringBuffer("Name: " + getName() + "\nPath: " + getCIMObjectPath()
-				+ "\nParamValues:\n");
-		for (int i = 0; i < getArgumentCount(); i++) {
-			buf.append("  " + getArgument(i) + "\n");
-		}
-		return buf.toString();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ *    2682    2013-10-02  blaschke-oss (I)MethodCallNode allows no LOCAL*PATH
+ *    2690    2013-10-11  blaschke-oss Remove RESPONSEDESTINATION support
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMElementSorter;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT IMETHODCALL (LOCALNAMESPACEPATH, IPARAMVALUE*)
+ * ATTLIST IMETHODCALL
+ *   %CIMName;
+ *   
+ * ELEMENT METHODCALL ((LOCALINSTANCEPATH | LOCALCLASSPATH), PARAMVALUE*)
+ * ATTLIST METHODCALL
+ *   %CIMName;
+ * 
      
+ */
+public abstract class AbstractMethodCallNode extends Node implements NonVolatileIf, ObjectPathIf {
+
+	private String iName;
+
+	protected CIMObjectPath iPath;
+
+	/**
+	 * (IPARAMVALUE | PARAMVALUE)* -> ArrayList of CIMArgument
+	 */
+	private ArrayList> iArgAL;
+
+	/**
+	 * Sorted array of CIMArguments
+	 */
+	private CIMArgument[] iArgA;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractMethodCallNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iName = getCIMName(pAttribs);
+		this.iPath = null;
+		this.iArgAL = null;
+		this.iArgA = null;
+	}
+
+	/**
+	 * @param pChild
+	 */
+	public void addChild(Node pChild) {
+	// nothing to do
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof AbstractPathNode) {
+			this.iPath = ((AbstractPathNode) pChild).getCIMObjectPath();
+		} else if (pChild instanceof AbstractParamValueNode) {
+			if (this.iArgAL == null) this.iArgAL = new ArrayList>();
+			this.iArgAL.add(((AbstractParamValueNode) pChild).getCIMArgument());
+		}
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	protected abstract void testSpecChild(String pNodeNameEnum) throws SAXException;
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		testSpecChild(pNodeNameEnum);
+	}
+
+	/**
+	 * getName
+	 * 
+	 * @return String, name of the called method
+	 */
+	public String getName() {
+		return this.iName;
+	}
+
+	public CIMObjectPath getCIMObjectPath() {
+		return this.iPath;
+	}
+
+	private static final CIMArgument[] EMPTY_ARG_A = new CIMArgument[0];
+
+	/**
+	 * getCIMArguments
+	 * 
+	 * @return CIMArgument[]
+	 */
+	public CIMArgument[] getCIMArguments() {
+		if (this.iArgA != null) return this.iArgA;
+		this.iArgA = this.iArgAL == null ? null : (CIMArgument[]) this.iArgAL.toArray(EMPTY_ARG_A);
+		return (CIMArgument[]) CIMElementSorter.sort(this.iArgA);
+	}
+
+	/**
+	 * getArgumentCount
+	 * 
+	 * @return int
+	 */
+	public int getArgumentCount() {
+		getCIMArguments();
+		return this.iArgA == null ? 0 : this.iArgA.length;
+	}
+
+	/**
+	 * getArgument
+	 * 
+	 * @param pName
+	 * @return CIMArgument
+	 */
+	public CIMArgument getArgument(String pName) {
+		getCIMArguments();
+		return (CIMArgument) CIMElementSorter.find(this.iArgA, pName);
+	}
+
+	/**
+	 * getArgument
+	 * 
+	 * @param pIdx
+	 * @return CIMArgument
+	 */
+	public CIMArgument getArgument(int pIdx) {
+		getCIMArguments();
+		return this.iArgA == null ? null : this.iArgA[pIdx];
+	}
+
+	@Override
+	public String toString() {
+		StringBuffer buf = new StringBuffer("Name: " + getName() + "\nPath: " + getCIMObjectPath()
+				+ "\nParamValues:\n");
+		for (int i = 0; i < getArgumentCount(); i++) {
+			buf.append("  " + getArgument(i) + "\n");
+		}
+		return buf.toString();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java
similarity index 67%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java
index 2452d9f..1a1d94e 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java
@@ -1,74 +1,72 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2750520    2009-04-10  blaschke-oss Code cleanup from empty statement et al
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class AbstractMultiRspNode is superclass of MultiRsp style Node classes.
- */
-public abstract class AbstractMultiRspNode extends AbstractResponseNode {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractMultiRspNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-	/**
-	 * getResponseCount
-	 * 
-	 * @return the number of retrievable responses
-	 */
-	public abstract int getResponseCount();
-
-	/**
-	 * readResponse
-	 * 
-	 * @return AbstractSimpleRspNode
-	 */
-	public abstract AbstractSimpleRspNode readResponse();
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2750520    2009-04-10  blaschke-oss Code cleanup from empty statement et al
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class AbstractMultiRspNode is superclass of MultiRsp style Node classes.
+ */
+public abstract class AbstractMultiRspNode extends AbstractResponseNode {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractMultiRspNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+	/**
+	 * getResponseCount
+	 * 
+	 * @return the number of retrievable responses
+	 */
+	public abstract int getResponseCount();
+
+	/**
+	 * readResponse
+	 * 
+	 * @return AbstractSimpleRspNode
+	 */
+	public abstract AbstractSimpleRspNode readResponse();
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java
similarity index 61%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java
index b0bdda3..3f744d7 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java
@@ -1,64 +1,62 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1660756    2007-02-22  ebak         Embedded object support
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * Class AbstractObjectNode is the superclass of ClassNode and InstanceNode
- * classes.
- */
-public abstract class AbstractObjectNode extends Node implements ValueIf {
-
-	protected CIMObjectPath iLocalPath;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractObjectNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * Class AbstractObjectNode is the superclass of ClassNode and InstanceNode
+ * classes.
+ */
+public abstract class AbstractObjectNode extends Node implements ValueIf {
+
+	protected CIMObjectPath iLocalPath;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractObjectNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java
similarity index 63%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java
index 8c2d950..896915a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java
@@ -1,59 +1,57 @@
-/**
- * (C) Copyright IBM Corp. 2006, 2009
- *
- * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
- * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
- * CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
- *
- * You can obtain a current copy of the Eclipse Public License from
- * http://www.opensource.org/licenses/eclipse-1.0.php
- *
- * @author : Endre Bak, ebak@de.ibm.com  
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class AbstractObjectPathNode is the superclass of ClassPathNode,
- * InstancePathNode LocalClassPathNode and LocalInstancePathNode classes.
- */
-public abstract class AbstractObjectPathNode extends AbstractPathNode {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractObjectPathNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-}
+/**
+ * (C) Copyright IBM Corp. 2006, 2009
+ *
+ * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
+ * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+ * CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+ *
+ * You can obtain a current copy of the Eclipse Public License from
+ * http://www.opensource.org/licenses/eclipse-1.0.php
+ *
+ * @author : Endre Bak, ebak@de.ibm.com  
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class AbstractObjectPathNode is the superclass of ClassPathNode,
+ * InstancePathNode LocalClassPathNode and LocalInstancePathNode classes.
+ */
+public abstract class AbstractObjectPathNode extends AbstractPathNode {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractObjectPathNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java
similarity index 64%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java
index 66175aa..5fa88ef 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java
@@ -1,70 +1,68 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1686000    2007-04-19  ebak         modifyInstance() missing from WBEMClient
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-
-/**
- * Class AbstractParamValueNode is the superclass of IParamValueNode and
- * ParamValueNode classes.
- */
-public abstract class AbstractParamValueNode extends Node implements TypedIf, ValueIf {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractParamValueNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-	/**
-	 * getCIMArgument
-	 * 
-	 * @return CIMArgument
-	 */
-	public abstract CIMArgument getCIMArgument();
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1686000    2007-04-19  ebak         modifyInstance() missing from WBEMClient
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+
+/**
+ * Class AbstractParamValueNode is the superclass of IParamValueNode and
+ * ParamValueNode classes.
+ */
+public abstract class AbstractParamValueNode extends Node implements TypedIf, ValueIf {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractParamValueNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+	/**
+	 * getCIMArgument
+	 * 
+	 * @return CIMArgument
+	 */
+	public abstract CIMArgument getCIMArgument();
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java
index 1c690a2..87140b2 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java
@@ -1,126 +1,123 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
- * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMParameter;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * Class AbstractParameterNode is the superclass of ParameterArrayNode,
- * ParameterNode, ParameterRefArrayNode and ParameterReferenceNode classes.
- */
-public abstract class AbstractParameterNode extends Node implements TypedIf {
-
-	private String iName;
-
-	protected QualifiedNodeHandler iQualiHandler;
-
-	protected SAXSession iSession;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractParameterNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iSession = pSession;
-		this.iQualiHandler = QualifiedNodeHandler.init(this.iQualiHandler);
-		this.iName = getCIMName(pAttribs);
-		specificInit(pAttribs);
-	}
-
-	protected abstract void specificInit(Attributes pAttribs) throws SAXException;
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != QUALIFIER) throw new SAXException(getNodeName() + " cannot have "
-				+ pNodeNameEnum + " child node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		this.iQualiHandler.addQualifierNode(pChild);
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	/**
-	 * getCIMParameter
-	 * 
-	 * @return CIMParameter
-	 */
-	public CIMParameter getCIMParameter() {
-		/*
-		 * CIMParameter(String name, CIMDataType type, CIMQualifier[]
-		 * qualifiers)
-		 * 
-		 * Not dealing with embedded object is faster. Here we don't have to do
-		 * anything with embedded object qualifier, since parameter doesn't have
-		 * value.
-		 * 
-		 * Strict embObj type parsing requires different behavior.
-		 */
-		return new CIMParameter(this.iName, getType(), this.iQualiHandler
-				.getQualis(!this.iSession.strictEmbObjParsing()));
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
+ * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMParameter;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * Class AbstractParameterNode is the superclass of ParameterArrayNode,
+ * ParameterNode, ParameterRefArrayNode and ParameterReferenceNode classes.
+ */
+public abstract class AbstractParameterNode extends Node implements TypedIf {
+
+	private String iName;
+
+	protected QualifiedNodeHandler iQualiHandler;
+
+	protected SAXSession iSession;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractParameterNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iSession = pSession;
+		this.iQualiHandler = QualifiedNodeHandler.init(this.iQualiHandler);
+		this.iName = getCIMName(pAttribs);
+		specificInit(pAttribs);
+	}
+
+	protected abstract void specificInit(Attributes pAttribs) throws SAXException;
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != QUALIFIER) throw new SAXException(getNodeName() + " cannot have "
+				+ pNodeNameEnum + " child node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		this.iQualiHandler.addQualifierNode(pChild);
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	/**
+	 * getCIMParameter
+	 * 
+	 * @return CIMParameter
+	 */
+	public CIMParameter getCIMParameter() {
+		/*
+		 * CIMParameter(String name, CIMDataType type, CIMQualifier[]
+		 * qualifiers)
+		 * 
+		 * Not dealing with embedded object is faster. Here we don't have to do
+		 * anything with embedded object qualifier, since parameter doesn't have
+		 * value.
+		 * 
+		 * Strict embObj type parsing requires different behavior.
+		 */
+		return new CIMParameter(this.iName, getType(), this.iQualiHandler
+				.getQualis(!this.iSession.strictEmbObjParsing()));
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java
similarity index 64%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java
index c57bedd..58dfb19 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java
@@ -1,67 +1,65 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class AbstractPathNode is the superclass of AbstractObjectPathNode,
- * ClassNameNode, InstanceNameNode and ObjectPathNode classes.
- */
-public abstract class AbstractPathNode extends Node implements ObjectPathIf, ValueIf {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractPathNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-	/**
-	 * @see ValueIf#getValue()
-	 * @return CIMObjectPath
-	 */
-	public Object getValue() {
-		return getCIMObjectPath();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class AbstractPathNode is the superclass of AbstractObjectPathNode,
+ * ClassNameNode, InstanceNameNode and ObjectPathNode classes.
+ */
+public abstract class AbstractPathNode extends Node implements ObjectPathIf, ValueIf {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractPathNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+	/**
+	 * @see ValueIf#getValue()
+	 * @return CIMObjectPath
+	 */
+	public Object getValue() {
+		return getCIMObjectPath();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java
index 9e4e10c..72e34e8 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java
@@ -1,164 +1,161 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1714878    2007-05-08  ebak         Empty string property values are parsed as null
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMClassProperty;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifier;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * AbstractPropertyNode is superclass of PropertyArrayNode, PropertyNode and
- * PropertyReferenceNode classes.
- */
-public abstract class AbstractPropertyNode extends Node implements TypedIf, ValueIf {
-
-	// common attributes
-	private String iName;
-
-	private String iClassOrigin;
-
-	private boolean iPropagated;
-
-	protected QualifiedNodeHandler iQualiHandler;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractPropertyNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-	/**
-	 * hasValue
-	 * 
-	 * @return true if it has a value child node
-	 */
-	protected abstract boolean hasValueNode();
-
-	protected abstract void childValueNodeParsed(Node pChild) throws SAXException;
-
-	protected abstract void specificInit(Attributes pAttribs, SAXSession pSession)
-			throws SAXException;
-
-	protected abstract String getChildValueNodeNameEnum();
-
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iQualiHandler = QualifiedNodeHandler.init(this.iQualiHandler);
-		this.iName = getCIMName(pAttribs);
-		this.iClassOrigin = getClassOrigin(pAttribs);
-		this.iPropagated = getPropagated(pAttribs);
-		specificInit(pAttribs, pSession);
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		String valueNodeNameEnum = getChildValueNodeNameEnum();
-		if (pNodeNameEnum == valueNodeNameEnum) {
-			if (hasValueNode()) throw new SAXException(getNodeName() + " node can have only one "
-					+ valueNodeNameEnum + " child node!");
-		} else if (pNodeNameEnum != QUALIFIER) throw new SAXException(getNodeName()
-				+ " node cannot have " + pNodeNameEnum + " child node!");
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void childParsed(Node pChild) throws SAXException {
-		if (!this.iQualiHandler.addQualifierNode(pChild)) {
-			childValueNodeParsed(pChild);
-		}
-	}
-
-	protected CIMQualifier[] getQualis() {
-		// not dealing with embedded object qualifier is faster
-		return this.iQualiHandler.getQualis(true);
-	}
-
-	/**
-	 * getCIMProperty
-	 * 
-	 * @return CIMProperty
-	 */
-	public CIMProperty getCIMProperty() {
-		/*
-		 * CIMProperty( String name, CIMDataType type, Object value, boolean
-		 * key, boolean propagated, String originClass )
-		 */
-		return new CIMProperty(this.iName, getType(), getValue(), this.iQualiHandler
-				.isKeyed(), this.iPropagated, this.iClassOrigin);
-	}
-
-	/**
-	 * getCIMClassProperty
-	 * 
-	 * @return CIMClassProperty
-	 */
-	public CIMClassProperty getCIMClassProperty() {
-		/*
-		 * CIMClassProperty( String pName, CIMDataType pType, Object pValue,
-		 * CIMQualifier[] pQualifiers, boolean pKey, boolean propagated, String
-		 * originClass) );
-		 */
-		return new CIMClassProperty(this.iName, getType(), getValue(), getQualis(),
-				this.iQualiHandler.isKeyed(), this.iPropagated, this.iClassOrigin);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1714878    2007-05-08  ebak         Empty string property values are parsed as null
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMClassProperty;
+import org.metricshub.wbem.javax.cim.CIMQualifier;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * AbstractPropertyNode is superclass of PropertyArrayNode, PropertyNode and
+ * PropertyReferenceNode classes.
+ */
+public abstract class AbstractPropertyNode extends Node implements TypedIf, ValueIf {
+
+	// common attributes
+	private String iName;
+
+	private String iClassOrigin;
+
+	private boolean iPropagated;
+
+	protected QualifiedNodeHandler iQualiHandler;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractPropertyNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+	/**
+	 * hasValue
+	 * 
+	 * @return true if it has a value child node
+	 */
+	protected abstract boolean hasValueNode();
+
+	protected abstract void childValueNodeParsed(Node pChild) throws SAXException;
+
+	protected abstract void specificInit(Attributes pAttribs, SAXSession pSession)
+			throws SAXException;
+
+	protected abstract String getChildValueNodeNameEnum();
+
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iQualiHandler = QualifiedNodeHandler.init(this.iQualiHandler);
+		this.iName = getCIMName(pAttribs);
+		this.iClassOrigin = getClassOrigin(pAttribs);
+		this.iPropagated = getPropagated(pAttribs);
+		specificInit(pAttribs, pSession);
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		String valueNodeNameEnum = getChildValueNodeNameEnum();
+		if (pNodeNameEnum == valueNodeNameEnum) {
+			if (hasValueNode()) throw new SAXException(getNodeName() + " node can have only one "
+					+ valueNodeNameEnum + " child node!");
+		} else if (pNodeNameEnum != QUALIFIER) throw new SAXException(getNodeName()
+				+ " node cannot have " + pNodeNameEnum + " child node!");
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void childParsed(Node pChild) throws SAXException {
+		if (!this.iQualiHandler.addQualifierNode(pChild)) {
+			childValueNodeParsed(pChild);
+		}
+	}
+
+	protected CIMQualifier[] getQualis() {
+		// not dealing with embedded object qualifier is faster
+		return this.iQualiHandler.getQualis(true);
+	}
+
+	/**
+	 * getCIMProperty
+	 * 
+	 * @return CIMProperty
+	 */
+	public CIMProperty getCIMProperty() {
+		/*
+		 * CIMProperty( String name, CIMDataType type, Object value, boolean
+		 * key, boolean propagated, String originClass )
+		 */
+		return new CIMProperty(this.iName, getType(), getValue(), this.iQualiHandler
+				.isKeyed(), this.iPropagated, this.iClassOrigin);
+	}
+
+	/**
+	 * getCIMClassProperty
+	 * 
+	 * @return CIMClassProperty
+	 */
+	public CIMClassProperty getCIMClassProperty() {
+		/*
+		 * CIMClassProperty( String pName, CIMDataType pType, Object pValue,
+		 * CIMQualifier[] pQualifiers, boolean pKey, boolean propagated, String
+		 * originClass) );
+		 */
+		return new CIMClassProperty(this.iName, getType(), getValue(), getQualis(),
+				this.iQualiHandler.isKeyed(), this.iPropagated, this.iClassOrigin);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java
similarity index 62%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java
index 731bc70..d8ad8de 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java
@@ -1,59 +1,57 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class AbstractResponseNode is superclass of AbstractMulitRspNode and
- * AbstractSimpleRspNode classes.
- */
-public abstract class AbstractResponseNode extends AbstractMessageNode {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractResponseNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class AbstractResponseNode is superclass of AbstractMulitRspNode and
+ * AbstractSimpleRspNode classes.
+ */
+public abstract class AbstractResponseNode extends AbstractMessageNode {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractResponseNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java
similarity index 65%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java
index 3d1b5d9..1ec4555 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java
@@ -1,62 +1,60 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class AbstractScalarValueNode is superclass of KeyValueNode,
- * ValueNamedInstanceNode, ValueNode, ValueNullNode, ValueObjectNode,
- * ValueObjectWithLocalPathNode, ValueObjectWithPathNode and ValueReferenceNode
- * classes.
- */
-public abstract class AbstractScalarValueNode extends AbstractValueNode {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractScalarValueNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class AbstractScalarValueNode is superclass of KeyValueNode,
+ * ValueNamedInstanceNode, ValueNode, ValueNullNode, ValueObjectNode,
+ * ValueObjectWithLocalPathNode, ValueObjectWithPathNode and ValueReferenceNode
+ * classes.
+ */
+public abstract class AbstractScalarValueNode extends AbstractValueNode {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractScalarValueNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java
similarity index 62%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java
index ed5c1ef..93fccaf 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java
@@ -1,74 +1,71 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-
-/**
- * Class AbstractSimpleRspNode is the superclass of SimpleExpRspNode and
- * SimpleRspNode classes.
- */
-public abstract class AbstractSimpleRspNode extends AbstractResponseNode implements ErrorIf,
-		RetValPipeIf {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractSimpleRspNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-	public abstract CIMError getCIMError();
-
-	/**
-	 * getCIMArguments
-	 * 
-	 * @return CIMArgument[]
-	 */
-	public abstract CIMArgument[] getCIMArguments();
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+
+/**
+ * Class AbstractSimpleRspNode is the superclass of SimpleExpRspNode and
+ * SimpleRspNode classes.
+ */
+public abstract class AbstractSimpleRspNode extends AbstractResponseNode implements ErrorIf,
+		RetValPipeIf {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractSimpleRspNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+	public abstract CIMError getCIMError();
+
+	/**
+	 * getCIMArguments
+	 * 
+	 * @return CIMArgument[]
+	 */
+	public abstract CIMArgument[] getCIMArguments();
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java
similarity index 63%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java
index 4ab8be9..5dd0b2b 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java
@@ -1,60 +1,58 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class AbstractValueNode is the superclass of AbstractArrayValueNode and
- * AbstractScalarValueNode classes.
- */
-public abstract class AbstractValueNode extends Node implements TypedIf, ValueIf {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 */
-	public AbstractValueNode(String pNameEnum) {
-		super(pNameEnum);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class AbstractValueNode is the superclass of AbstractArrayValueNode and
+ * AbstractScalarValueNode classes.
+ */
+public abstract class AbstractValueNode extends Node implements TypedIf, ValueIf {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 */
+	public AbstractValueNode(String pNameEnum) {
+		super(pNameEnum);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java
similarity index 61%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java
index 814805f..e6f84d9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java
@@ -1,64 +1,62 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * It is implemented by the AbstractArrayValueNode class.
- */
-public interface ArrayIf {
-
-	/**
-	 * size
-	 * 
-	 * @return int
-	 */
-	public int size();
-
-	/**
-	 * elementAt
-	 * 
-	 * @param pIdx
-	 * @return Object
-	 */
-	public Object elementAt(int pIdx);
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * It is implemented by the AbstractArrayValueNode class.
+ */
+public interface ArrayIf {
+
+	/**
+	 * size
+	 * 
+	 * @return int
+	 */
+	public int size();
+
+	/**
+	 * elementAt
+	 * 
+	 * @param pIdx
+	 * @return Object
+	 */
+	public Object elementAt(int pIdx);
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java
index 765f441..a3e7308 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java
@@ -1,157 +1,155 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
- *    2708    2013-11-12  blaschke-oss CIMNode quietly ignores DECLARATION child
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT CIM (MESSAGE | DECLARATION)
- * ATTLIST CIM
- * 	CIMVERSION CDATA #REQUIRED
- * DTDVERSION CDATA #REQUIRED
- * 
      
- */
-public class CIMNode extends Node implements NonVolatileIf {
-
-	/**
-	 * Ctor.
-	 */
-	public CIMNode() {
-		super(CIM);
-	}
-
-	private Node iContent;
-
-	private String iCimVersion, iDtdVersion;
-
-	public void addChild(Node pChild) {
-		this.iContent = pChild;
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iCimVersion = pAttribs.getValue("CIMVERSION");
-		if (this.iCimVersion == null) { throw new SAXException(
-				"CIMVERSION attribute is mandatory for " + getNodeName() + " node!"); }
-		this.iDtdVersion = pAttribs.getValue("DTDVERSION");
-		if (this.iDtdVersion == null) { throw new SAXException(
-				"DTDVERSION attribute is mandatory for " + getNodeName() + " node!"); }
-		this.iContent = null;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-		return;
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iContent != null) {
-			String msg = "CIM node also has a " + this.iContent.getNodeName() + " child node!";
-			throw new SAXException(msg);
-		}
-		if (pNodeNameEnum == MESSAGE) return;
-		String msg = (pNodeNameEnum == DECLARATION) ? "DECLARATION child node not supported by CIM node!"
-				: pNodeNameEnum + " cannot be a child node of CIM node!";
-		throw new SAXException(msg);
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iContent == null) throw new SAXException(
-				"CIM node must have a MESSAGE or a DECLARATION child!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// nothing to do here
-	}
-
-	/**
-	 * getCimVersion
-	 * 
-	 * @return String
-	 */
-	public String getCimVersion() {
-		return this.iCimVersion;
-	}
-
-	/**
-	 * getDtdVersion
-	 * 
-	 * @return String
-	 */
-	public String getDtdVersion() {
-		return this.iDtdVersion;
-	}
-
-	/**
-	 * getMessageNode
-	 * 
-	 * @return MessageNode or null
-	 */
-	public MessageNode getMessageNode() {
-		return (this.iContent instanceof MessageNode) ? (MessageNode) this.iContent : null;
-	}
-
-	// not implemented yet
-	// public DeclarationNode getDeclarationNode() {}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
+ *    2708    2013-11-12  blaschke-oss CIMNode quietly ignores DECLARATION child
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT CIM (MESSAGE | DECLARATION)
+ * ATTLIST CIM
+ * 	CIMVERSION CDATA #REQUIRED
+ * DTDVERSION CDATA #REQUIRED
+ * 
      
+ */
+public class CIMNode extends Node implements NonVolatileIf {
+
+	/**
+	 * Ctor.
+	 */
+	public CIMNode() {
+		super(CIM);
+	}
+
+	private Node iContent;
+
+	private String iCimVersion, iDtdVersion;
+
+	public void addChild(Node pChild) {
+		this.iContent = pChild;
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iCimVersion = pAttribs.getValue("CIMVERSION");
+		if (this.iCimVersion == null) { throw new SAXException(
+				"CIMVERSION attribute is mandatory for " + getNodeName() + " node!"); }
+		this.iDtdVersion = pAttribs.getValue("DTDVERSION");
+		if (this.iDtdVersion == null) { throw new SAXException(
+				"DTDVERSION attribute is mandatory for " + getNodeName() + " node!"); }
+		this.iContent = null;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+		return;
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iContent != null) {
+			String msg = "CIM node also has a " + this.iContent.getNodeName() + " child node!";
+			throw new SAXException(msg);
+		}
+		if (pNodeNameEnum == MESSAGE) return;
+		String msg = (pNodeNameEnum == DECLARATION) ? "DECLARATION child node not supported by CIM node!"
+				: pNodeNameEnum + " cannot be a child node of CIM node!";
+		throw new SAXException(msg);
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iContent == null) throw new SAXException(
+				"CIM node must have a MESSAGE or a DECLARATION child!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// nothing to do here
+	}
+
+	/**
+	 * getCimVersion
+	 * 
+	 * @return String
+	 */
+	public String getCimVersion() {
+		return this.iCimVersion;
+	}
+
+	/**
+	 * getDtdVersion
+	 * 
+	 * @return String
+	 */
+	public String getDtdVersion() {
+		return this.iDtdVersion;
+	}
+
+	/**
+	 * getMessageNode
+	 * 
+	 * @return MessageNode or null
+	 */
+	public MessageNode getMessageNode() {
+		return (this.iContent instanceof MessageNode) ? (MessageNode) this.iContent : null;
+	}
+
+	// not implemented yet
+	// public DeclarationNode getDeclarationNode() {}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java
similarity index 69%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java
index f454266..2de56ec 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java
@@ -1,122 +1,119 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT CLASSNAME EMPTY
- *   ATTLIST CLASSNAME
- *   %CIMName;
- * 
      
- */
-public class ClassNameNode extends AbstractPathNode {
-
-	private String iClassName;
-
-	private CIMObjectPath iLocalPath;
-
-	/**
-	 * Ctor.
-	 */
-	public ClassNameNode() {
-		super(CLASSNAME);
-	}
-
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iLocalPath = pSession.getDefLocalPath();
-		this.iClassName = getCIMName(pAttribs);
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	/**
-	 * @param pNodeNameEnum
-	 */
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		throw new SAXException("CLASSNAME node cannot have any child node!");
-	}
-
-	@Override
-	public void testCompletness() {
-	// no child nodes to test
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// nothing to do
-	}
-
-	/**
-	 * getClassName
-	 * 
-	 * @return String
-	 */
-	public String getClassName() {
-		return this.iClassName;
-	}
-
-	public CIMObjectPath getCIMObjectPath() {
-		return LocalPathBuilder.build(this.iLocalPath, this.iClassName, null);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT CLASSNAME EMPTY
+ *   ATTLIST CLASSNAME
+ *   %CIMName;
+ * 
      
+ */
+public class ClassNameNode extends AbstractPathNode {
+
+	private String iClassName;
+
+	private CIMObjectPath iLocalPath;
+
+	/**
+	 * Ctor.
+	 */
+	public ClassNameNode() {
+		super(CLASSNAME);
+	}
+
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iLocalPath = pSession.getDefLocalPath();
+		this.iClassName = getCIMName(pAttribs);
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	/**
+	 * @param pNodeNameEnum
+	 */
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		throw new SAXException("CLASSNAME node cannot have any child node!");
+	}
+
+	@Override
+	public void testCompletness() {
+	// no child nodes to test
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// nothing to do
+	}
+
+	/**
+	 * getClassName
+	 * 
+	 * @return String
+	 */
+	public String getClassName() {
+		return this.iClassName;
+	}
+
+	public CIMObjectPath getCIMObjectPath() {
+		return LocalPathBuilder.build(this.iLocalPath, this.iClassName, null);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java
index 3df3285..add4f08 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java
@@ -1,184 +1,181 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1783288    2007-09-10  ebak         CIMClass.isAssociation() not working for retrieved classes.
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 3500619    2012-03-16  blaschke-oss JSR48 1.0.0: CIMClass association/key clean up
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMClassProperty;
-import org.sentrysoftware.wbem.javax.cim.CIMMethod;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.GenericExts;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT CLASS (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*, METHOD*)
- * ATTLIST CLASS
- * %CIMName; 
- * %SuperClass;
- * 
      
- */
-public class ClassNode extends AbstractObjectNode {
-
-	private String iName;
-
-	private String iSuperClass;
-
-	private QualifiedNodeHandler iQualiHandler;
-
-	private ArrayList> iCIMClassPropAL;
-
-	private boolean iKeyed;
-
-	private ArrayList> iCIMMethodAL;
-
-	/**
-	 * Ctor.
-	 */
-	public ClassNode() {
-		super(CLASS);
-	}
-
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iLocalPath = pSession.getDefLocalPath();
-		this.iQualiHandler = QualifiedNodeHandler.init(this.iQualiHandler);
-		this.iCIMClassPropAL = GenericExts.initClearArrayList(this.iCIMClassPropAL);
-		this.iKeyed = false;
-		this.iCIMMethodAL = GenericExts.initClearArrayList(this.iCIMMethodAL);
-		this.iName = getCIMName(pAttribs);
-		this.iSuperClass = pAttribs.getValue("SUPERCLASS"); // not mandatory
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PROPERTY, PROPERTY_ARRAY,
-			PROPERTY_REFERENCE, METHOD };
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) return;
-		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (this.iQualiHandler.addQualifierNode(pChild)) return;
-		if (pChild instanceof AbstractPropertyNode) {
-			if (this.iCIMClassPropAL == null) this.iCIMClassPropAL = new ArrayList>();
-			CIMClassProperty prop = ((AbstractPropertyNode) pChild).getCIMClassProperty();
-			if (prop.isKey()) this.iKeyed = true;
-			this.iCIMClassPropAL.add(prop);
-		} else {
-			if (this.iCIMMethodAL == null) this.iCIMMethodAL = new ArrayList>();
-			this.iCIMMethodAL.add(((MethodNode) pChild).getCIMMethod());
-		}
-	}
-
-	@Override
-	public void testCompletness() {
-	// all child nodes are optional
-	}
-
-	/**
-	 * getCIMClass
-	 * 
-	 * @return CIMClass
-	 */
-	public CIMClass getCIMClass() {
-		/*
-		 * ebak: this constructor can add localPath info to the class CIMClass(
-		 * CIMObjectPath path, String superclass, CIMQualifier[] qualifiers,
-		 * CIMClassProperty[] props, CIMMethod[] pMethods, boolean
-		 * pIsAssociation, boolean pIsKeyed )
-		 */
-		return new CIMClass(LocalPathBuilder.build(this.iLocalPath, this.iName, null),
-				this.iSuperClass, this.iQualiHandler.getQualis(), this.iCIMClassPropAL
-						.toArray(EMPTY_PA), this.iCIMMethodAL.toArray(EMPTY_MA), this.iQualiHandler
-						.isAssociation(), this.iKeyed);
-	}
-
-	private static final CIMMethod[] EMPTY_MA = new CIMMethod[0];
-
-	private static final CIMClassProperty[] EMPTY_PA = new CIMClassProperty[0];
-
-	/**
-	 * getCIMClass
-	 * 
-	 * @param pObjPath
-	 * @return CIMClass with the provided object path
-	 */
-	public CIMClass getCIMClass(CIMObjectPath pObjPath) {
-		return new CIMClass(pObjPath, this.iSuperClass, this.iQualiHandler.getQualis(),
-				this.iCIMClassPropAL.toArray(EMPTY_PA), this.iCIMMethodAL.toArray(EMPTY_MA),
-				this.iQualiHandler.isAssociation(), this.iKeyed);
-	}
-
-	/**
-	 * @see ValueIf#getValue()
-	 * @return CIMClass
-	 */
-	public Object getValue() {
-		return getCIMClass();
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1783288    2007-09-10  ebak         CIMClass.isAssociation() not working for retrieved classes.
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3500619    2012-03-16  blaschke-oss JSR48 1.0.0: CIMClass association/key clean up
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMClassProperty;
+import org.metricshub.wbem.javax.cim.CIMMethod;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.GenericExts;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT CLASS (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*, METHOD*)
+ * ATTLIST CLASS
+ * %CIMName; 
+ * %SuperClass;
+ * 
      
+ */
+public class ClassNode extends AbstractObjectNode {
+
+	private String iName;
+
+	private String iSuperClass;
+
+	private QualifiedNodeHandler iQualiHandler;
+
+	private ArrayList> iCIMClassPropAL;
+
+	private boolean iKeyed;
+
+	private ArrayList> iCIMMethodAL;
+
+	/**
+	 * Ctor.
+	 */
+	public ClassNode() {
+		super(CLASS);
+	}
+
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iLocalPath = pSession.getDefLocalPath();
+		this.iQualiHandler = QualifiedNodeHandler.init(this.iQualiHandler);
+		this.iCIMClassPropAL = GenericExts.initClearArrayList(this.iCIMClassPropAL);
+		this.iKeyed = false;
+		this.iCIMMethodAL = GenericExts.initClearArrayList(this.iCIMMethodAL);
+		this.iName = getCIMName(pAttribs);
+		this.iSuperClass = pAttribs.getValue("SUPERCLASS"); // not mandatory
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PROPERTY, PROPERTY_ARRAY,
+			PROPERTY_REFERENCE, METHOD };
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
+			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) return;
+		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (this.iQualiHandler.addQualifierNode(pChild)) return;
+		if (pChild instanceof AbstractPropertyNode) {
+			if (this.iCIMClassPropAL == null) this.iCIMClassPropAL = new ArrayList>();
+			CIMClassProperty prop = ((AbstractPropertyNode) pChild).getCIMClassProperty();
+			if (prop.isKey()) this.iKeyed = true;
+			this.iCIMClassPropAL.add(prop);
+		} else {
+			if (this.iCIMMethodAL == null) this.iCIMMethodAL = new ArrayList>();
+			this.iCIMMethodAL.add(((MethodNode) pChild).getCIMMethod());
+		}
+	}
+
+	@Override
+	public void testCompletness() {
+	// all child nodes are optional
+	}
+
+	/**
+	 * getCIMClass
+	 * 
+	 * @return CIMClass
+	 */
+	public CIMClass getCIMClass() {
+		/*
+		 * ebak: this constructor can add localPath info to the class CIMClass(
+		 * CIMObjectPath path, String superclass, CIMQualifier[] qualifiers,
+		 * CIMClassProperty[] props, CIMMethod[] pMethods, boolean
+		 * pIsAssociation, boolean pIsKeyed )
+		 */
+		return new CIMClass(LocalPathBuilder.build(this.iLocalPath, this.iName, null),
+				this.iSuperClass, this.iQualiHandler.getQualis(), this.iCIMClassPropAL
+						.toArray(EMPTY_PA), this.iCIMMethodAL.toArray(EMPTY_MA), this.iQualiHandler
+						.isAssociation(), this.iKeyed);
+	}
+
+	private static final CIMMethod[] EMPTY_MA = new CIMMethod[0];
+
+	private static final CIMClassProperty[] EMPTY_PA = new CIMClassProperty[0];
+
+	/**
+	 * getCIMClass
+	 * 
+	 * @param pObjPath
+	 * @return CIMClass with the provided object path
+	 */
+	public CIMClass getCIMClass(CIMObjectPath pObjPath) {
+		return new CIMClass(pObjPath, this.iSuperClass, this.iQualiHandler.getQualis(),
+				this.iCIMClassPropAL.toArray(EMPTY_PA), this.iCIMMethodAL.toArray(EMPTY_MA),
+				this.iQualiHandler.isAssociation(), this.iKeyed);
+	}
+
+	/**
+	 * @see ValueIf#getValue()
+	 * @return CIMClass
+	 */
+	public Object getValue() {
+		return getCIMClass();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java
index 616824b..060e9a5 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java
@@ -1,140 +1,137 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1742873    2007-06-25  ebak         IPv6 ready cim-client
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.XMLHostStr;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT CLASSPATH (NAMESPACEPATH, CLASSNAME)
- */
-public class ClassPathNode extends AbstractObjectPathNode {
-
-	// child nodes:
-	private boolean iHasNameSpacePath, iHasClassName;
-
-	private String iLocalNameSpacePathStr;
-
-	private XMLHostStr iHostStr;
-
-	private String iClassNameStr;
-
-	/**
-	 * Ctor.
-	 */
-	public ClassPathNode() {
-		super(CLASSPATH);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		// reset
-		this.iHasNameSpacePath = this.iHasClassName = false;
-		this.iLocalNameSpacePathStr = this.iClassNameStr = null;
-		this.iHostStr = new XMLHostStr();
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == NAMESPACEPATH) {
-			if (this.iHasNameSpacePath) throw new SAXException(
-					"CLASSPATH node already has a NAMESPACEPATH child node!");
-		} else if (pNodeNameEnum == CLASSNAME) {
-			if (this.iHasClassName) throw new SAXException(
-					"CLASSPATH node already has a CLASSNAME child node!");
-		} else throw new SAXException("CLASSPATH node cannot have " + pNodeNameEnum
-				+ " child node!" + " It can have NAMESPACEPATH and CLASSNAME child nodes only!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof NameSpacePathNode) {
-			NameSpacePathNode nsPathNode = (NameSpacePathNode) pChild;
-			this.iLocalNameSpacePathStr = nsPathNode.getLocalNameSpacePath();
-			this.iHostStr.set(nsPathNode.getHostStr());
-			this.iHasNameSpacePath = true;
-		} else {
-			this.iClassNameStr = ((ClassNameNode) pChild).getClassName();
-			this.iHasClassName = true;
-		}
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (!this.iHasNameSpacePath) throw new SAXException(
-				"NAMESPACEPATH child node is mandatory for CLASSPATH node!");
-		if (!this.iHasClassName) throw new SAXException(
-				"CLASSNAME child node is mandatory for CLASSPATH node!");
-	}
-
-	public CIMObjectPath getCIMObjectPath() {
-		/*
-		 * CIMObjectPath( String scheme, String host, String port, String
-		 * namespace, String objectName, CIMProperty[] keys )
-		 */
-		return new CIMObjectPath(this.iHostStr.getProtocol(), this.iHostStr.getHost(),
-				this.iHostStr.getPort(), this.iLocalNameSpacePathStr, this.iClassNameStr, null);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1742873    2007-06-25  ebak         IPv6 ready cim-client
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.util.XMLHostStr;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT CLASSPATH (NAMESPACEPATH, CLASSNAME)
+ */
+public class ClassPathNode extends AbstractObjectPathNode {
+
+	// child nodes:
+	private boolean iHasNameSpacePath, iHasClassName;
+
+	private String iLocalNameSpacePathStr;
+
+	private XMLHostStr iHostStr;
+
+	private String iClassNameStr;
+
+	/**
+	 * Ctor.
+	 */
+	public ClassPathNode() {
+		super(CLASSPATH);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		// reset
+		this.iHasNameSpacePath = this.iHasClassName = false;
+		this.iLocalNameSpacePathStr = this.iClassNameStr = null;
+		this.iHostStr = new XMLHostStr();
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == NAMESPACEPATH) {
+			if (this.iHasNameSpacePath) throw new SAXException(
+					"CLASSPATH node already has a NAMESPACEPATH child node!");
+		} else if (pNodeNameEnum == CLASSNAME) {
+			if (this.iHasClassName) throw new SAXException(
+					"CLASSPATH node already has a CLASSNAME child node!");
+		} else throw new SAXException("CLASSPATH node cannot have " + pNodeNameEnum
+				+ " child node!" + " It can have NAMESPACEPATH and CLASSNAME child nodes only!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof NameSpacePathNode) {
+			NameSpacePathNode nsPathNode = (NameSpacePathNode) pChild;
+			this.iLocalNameSpacePathStr = nsPathNode.getLocalNameSpacePath();
+			this.iHostStr.set(nsPathNode.getHostStr());
+			this.iHasNameSpacePath = true;
+		} else {
+			this.iClassNameStr = ((ClassNameNode) pChild).getClassName();
+			this.iHasClassName = true;
+		}
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (!this.iHasNameSpacePath) throw new SAXException(
+				"NAMESPACEPATH child node is mandatory for CLASSPATH node!");
+		if (!this.iHasClassName) throw new SAXException(
+				"CLASSNAME child node is mandatory for CLASSPATH node!");
+	}
+
+	public CIMObjectPath getCIMObjectPath() {
+		/*
+		 * CIMObjectPath( String scheme, String host, String port, String
+		 * namespace, String objectName, CIMProperty[] keys )
+		 */
+		return new CIMObjectPath(this.iHostStr.getProtocol(), this.iHostStr.getHost(),
+				this.iHostStr.getPort(), this.iLocalNameSpacePathStr, this.iClassNameStr, null);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java
similarity index 70%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java
index 427792d..361198a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java
@@ -1,120 +1,117 @@
-/*
-  (C) Copyright IBM Corp. 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Dave Blaschke, blaschke@us.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT CORRELATOR (VALUE)
- * ATTLIST CORRELATOR
- *   %CIMName;
- *   %CIMType; #REQUIRED
- * 
      
- */
-public class CorrelatorNode extends Node implements TypedIf, ValueIf {
-
-	// private String iName;
-
-	private CIMDataType iType;
-
-	private Object iValue;
-
-	private boolean iHasValue;
-
-	/**
-	 * Ctor.
-	 */
-	public CorrelatorNode() {
-		super(CORRELATOR);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		/* this.iName = */getCIMName(pAttribs);
-		this.iType = getCIMType(pAttribs, false);
-		this.iValue = null;
-		this.iHasValue = false;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != VALUE) throw new SAXException(pNodeNameEnum
-				+ " cannot be the child node of " + getNodeName() + " node!");
-		if (this.iHasValue) throw new SAXException(getNodeName()
-				+ " node can have only one child node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof ValueNode) this.iHasValue = true;
-		this.iValue = ((ValueNode) pChild).getValue();
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (!this.iHasValue) throw new SAXException(getNodeName()
-				+ " node must have one VALUE child node!");
-	}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-	public Object getValue() {
-		return this.iValue;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Dave Blaschke, blaschke@us.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT CORRELATOR (VALUE)
+ * ATTLIST CORRELATOR
+ *   %CIMName;
+ *   %CIMType; #REQUIRED
+ * 
      
+ */
+public class CorrelatorNode extends Node implements TypedIf, ValueIf {
+
+	// private String iName;
+
+	private CIMDataType iType;
+
+	private Object iValue;
+
+	private boolean iHasValue;
+
+	/**
+	 * Ctor.
+	 */
+	public CorrelatorNode() {
+		super(CORRELATOR);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		/* this.iName = */getCIMName(pAttribs);
+		this.iType = getCIMType(pAttribs, false);
+		this.iValue = null;
+		this.iHasValue = false;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != VALUE) throw new SAXException(pNodeNameEnum
+				+ " cannot be the child node of " + getNodeName() + " node!");
+		if (this.iHasValue) throw new SAXException(getNodeName()
+				+ " node can have only one child node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof ValueNode) this.iHasValue = true;
+		this.iValue = ((ValueNode) pChild).getValue();
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (!this.iHasValue) throw new SAXException(getNodeName()
+				+ " node must have one VALUE child node!");
+	}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+	public Object getValue() {
+		return this.iValue;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java
similarity index 58%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java
index c3a230f..5906660 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java
@@ -1,58 +1,56 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-
-/**
- * This interface is implemented by Nodes which can provide CIMError info.
- */
-public interface ErrorIf {
-
-	/**
-	 * getCIMError
-	 * 
-	 * @return CIMError
-	 */
-	public CIMError getCIMError();
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+
+/**
+ * This interface is implemented by Nodes which can provide CIMError info.
+ */
+public interface ErrorIf {
+
+	/**
+	 * getCIMError
+	 * 
+	 * @return CIMError
+	 */
+	public CIMError getCIMError();
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java
similarity index 75%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java
index adf00aa..cee89ba 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java
@@ -1,134 +1,131 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 3293248    2011-05-03  blaschke-oss Support for CIM_ERROR instances within ERROR
- *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT ERROR (INSTANCE*)
- * ATTLIST ERROR
- *   CODE CDATA #REQUIRED
- *   DESCRIPTION CDATA #IMPLIED
- * 
      
- */
-public class ErrorNode extends Node implements ErrorIf {
-
-	private int iCode;
-
-	private String iDesc;
-
-	private ArrayList iCIMInstAL;
-
-	/**
-	 * Ctor.
-	 */
-	public ErrorNode() {
-		super(ERROR);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iCIMInstAL = null;
-		String code = pAttribs.getValue("CODE");
-		if (code == null) throw new SAXException(getNodeName()
-				+ " node must have a CODE attribute!");
-		try {
-			this.iCode = Integer.parseInt(code);
-		} catch (NumberFormatException e) {
-			throw new SAXException("Failed to parse CODE attribute in " + getNodeName() + " node!",
-					e);
-		}
-		this.iDesc = pAttribs.getValue("DESCRIPTION");
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != INSTANCE) throw new SAXException(getNodeName() + " node cannot have "
-				+ pNodeNameEnum + " child node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (this.iCIMInstAL == null) this.iCIMInstAL = new ArrayList();
-		this.iCIMInstAL.add(((InstanceNode) pChild).getCIMInstance());
-	}
-
-	@Override
-	public void testCompletness() {
-	// no mandatory child nodes
-	}
-
-	private static final CIMInstance[] EMPTY_IA = new CIMInstance[0];
-
-	public CIMError getCIMError() {
-		if (this.iCIMInstAL != null) { return new CIMError(this.iCode, this.iDesc, this.iCIMInstAL
-				.toArray(EMPTY_IA)); }
-		return new CIMError(this.iCode, this.iDesc);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 3293248    2011-05-03  blaschke-oss Support for CIM_ERROR instances within ERROR
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT ERROR (INSTANCE*)
+ * ATTLIST ERROR
+ *   CODE CDATA #REQUIRED
+ *   DESCRIPTION CDATA #IMPLIED
+ * 
      
+ */
+public class ErrorNode extends Node implements ErrorIf {
+
+	private int iCode;
+
+	private String iDesc;
+
+	private ArrayList iCIMInstAL;
+
+	/**
+	 * Ctor.
+	 */
+	public ErrorNode() {
+		super(ERROR);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iCIMInstAL = null;
+		String code = pAttribs.getValue("CODE");
+		if (code == null) throw new SAXException(getNodeName()
+				+ " node must have a CODE attribute!");
+		try {
+			this.iCode = Integer.parseInt(code);
+		} catch (NumberFormatException e) {
+			throw new SAXException("Failed to parse CODE attribute in " + getNodeName() + " node!",
+					e);
+		}
+		this.iDesc = pAttribs.getValue("DESCRIPTION");
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != INSTANCE) throw new SAXException(getNodeName() + " node cannot have "
+				+ pNodeNameEnum + " child node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (this.iCIMInstAL == null) this.iCIMInstAL = new ArrayList();
+		this.iCIMInstAL.add(((InstanceNode) pChild).getCIMInstance());
+	}
+
+	@Override
+	public void testCompletness() {
+	// no mandatory child nodes
+	}
+
+	private static final CIMInstance[] EMPTY_IA = new CIMInstance[0];
+
+	public CIMError getCIMError() {
+		if (this.iCIMInstAL != null) { return new CIMError(this.iCode, this.iDesc, this.iCIMInstAL
+				.toArray(EMPTY_IA)); }
+		return new CIMError(this.iCode, this.iDesc);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java
index 518590d..2fd6cc3 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java
@@ -1,131 +1,129 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT EXPMETHODCALL (EXPPARAMVALUE*)
- * ATTLIST EXPMETHODCALL
- *   %CIMName;
- * 
      
- */
-/**
- * Class ExpMethodCallNode is responsible for
- * 
- */
-public class ExpMethodCallNode extends Node implements NonVolatileIf {
-
-	private String iName;
-
-	private ArrayList iExpParamValNodeAList;
-
-	/**
-	 * Ctor.
-	 */
-	public ExpMethodCallNode() {
-		super(EXPMETHODCALL);
-	}
-
-	public void addChild(Node pChild) {
-		if (this.iExpParamValNodeAList == null) this.iExpParamValNodeAList = new ArrayList();
-		this.iExpParamValNodeAList.add(pChild);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iName = getCIMName(pAttribs);
-		if (this.iExpParamValNodeAList != null) this.iExpParamValNodeAList.clear();
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != EXPPARAMVALUE) throw new SAXException(getNodeName()
-				+ " node can have " + EXPPARAMVALUE + " child only! " + pNodeNameEnum
-				+ " is invalid!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// nothing to do yet
-
-	}
-
-	@Override
-	public void testCompletness() {
-	// no mandatory child
-	}
-
-	/**
-	 * getName
-	 * 
-	 * @return String
-	 */
-	public String getName() {
-		return this.iName;
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT EXPMETHODCALL (EXPPARAMVALUE*)
+ * ATTLIST EXPMETHODCALL
+ *   %CIMName;
+ * 
      
+ */
+/**
+ * Class ExpMethodCallNode is responsible for
+ * 
+ */
+public class ExpMethodCallNode extends Node implements NonVolatileIf {
+
+	private String iName;
+
+	private ArrayList iExpParamValNodeAList;
+
+	/**
+	 * Ctor.
+	 */
+	public ExpMethodCallNode() {
+		super(EXPMETHODCALL);
+	}
+
+	public void addChild(Node pChild) {
+		if (this.iExpParamValNodeAList == null) this.iExpParamValNodeAList = new ArrayList();
+		this.iExpParamValNodeAList.add(pChild);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iName = getCIMName(pAttribs);
+		if (this.iExpParamValNodeAList != null) this.iExpParamValNodeAList.clear();
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != EXPPARAMVALUE) throw new SAXException(getNodeName()
+				+ " node can have " + EXPPARAMVALUE + " child only! " + pNodeNameEnum
+				+ " is invalid!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// nothing to do yet
+
+	}
+
+	@Override
+	public void testCompletness() {
+	// no mandatory child
+	}
+
+	/**
+	 * getName
+	 * 
+	 * @return String
+	 */
+	public String getName() {
+		return this.iName;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java
index 1f3384d..27bef4d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java
@@ -1,146 +1,144 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT EXPMETHODRESPONSE (ERROR|IRETURNVALUE?)
- * ATTLIST EXPMETHODRESPONSE
- *   %CIMName;
- * 
      
- */
-public class ExpMethodResponseNode extends Node implements ErrorIf, RetValPipeIf, NonVolatileIf {
-
-	private String iName;
-
-	private ErrorNode iErrorNode;
-
-	private IReturnValueNode iRetValNode;
-
-	/**
-	 * Ctor.
-	 */
-	public ExpMethodResponseNode() {
-		super(EXPMETHODRESPONSE);
-	}
-
-	public void addChild(Node pChild) {
-		if (pChild instanceof ErrorNode) this.iErrorNode = (ErrorNode) pChild;
-		else this.iRetValNode = (IReturnValueNode) pChild;
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iName = getCIMName(pAttribs);
-		this.iErrorNode = null;
-		this.iRetValNode = null;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == ERROR || pNodeNameEnum == IRETURNVALUE) {
-			Node node;
-			if (this.iErrorNode != null) node = this.iErrorNode;
-			else if (this.iRetValNode != null) node = this.iRetValNode;
-			else node = null;
-			if (node != null) throw new SAXException(pNodeNameEnum + " child node is invalid for "
-					+ getNodeName() + " node, since it already has a " + node.getNodeName()
-					+ " child node!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// nothing to do yet
-	}
-
-	@Override
-	public void testCompletness() {
-	// no mandatory child nodes
-	}
-
-	public CIMError getCIMError() {
-		return this.iErrorNode == null ? null : this.iErrorNode.getCIMError();
-	}
-
-	public int getReturnValueCount() {
-		return this.iRetValNode == null ? 0 : this.iRetValNode.getReturnValueCount();
-	}
-
-	public Object readReturnValue() {
-		return this.iRetValNode.readReturnValue();
-	}
-
-	/**
-	 * getName
-	 * 
-	 * @return String
-	 */
-	public String getName() {
-		return this.iName;
-	}
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT EXPMETHODRESPONSE (ERROR|IRETURNVALUE?)
+ * ATTLIST EXPMETHODRESPONSE
+ *   %CIMName;
+ * 
      
+ */
+public class ExpMethodResponseNode extends Node implements ErrorIf, RetValPipeIf, NonVolatileIf {
+
+	private String iName;
+
+	private ErrorNode iErrorNode;
+
+	private IReturnValueNode iRetValNode;
+
+	/**
+	 * Ctor.
+	 */
+	public ExpMethodResponseNode() {
+		super(EXPMETHODRESPONSE);
+	}
+
+	public void addChild(Node pChild) {
+		if (pChild instanceof ErrorNode) this.iErrorNode = (ErrorNode) pChild;
+		else this.iRetValNode = (IReturnValueNode) pChild;
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iName = getCIMName(pAttribs);
+		this.iErrorNode = null;
+		this.iRetValNode = null;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == ERROR || pNodeNameEnum == IRETURNVALUE) {
+			Node node;
+			if (this.iErrorNode != null) node = this.iErrorNode;
+			else if (this.iRetValNode != null) node = this.iRetValNode;
+			else node = null;
+			if (node != null) throw new SAXException(pNodeNameEnum + " child node is invalid for "
+					+ getNodeName() + " node, since it already has a " + node.getNodeName()
+					+ " child node!");
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// nothing to do yet
+	}
+
+	@Override
+	public void testCompletness() {
+	// no mandatory child nodes
+	}
+
+	public CIMError getCIMError() {
+		return this.iErrorNode == null ? null : this.iErrorNode.getCIMError();
+	}
+
+	public int getReturnValueCount() {
+		return this.iRetValNode == null ? 0 : this.iRetValNode.getReturnValueCount();
+	}
+
+	public Object readReturnValue() {
+		return this.iRetValNode.readReturnValue();
+	}
+
+	/**
+	 * getName
+	 * 
+	 * @return String
+	 */
+	public String getName() {
+		return this.iName;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java
index 8eea5b3..0204136 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java
@@ -1,124 +1,122 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- *    2687    2013-10-10  blaschke-oss ExpParamValueNode allows VALUE, (I)METHODRESPONSE children
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT EXPPARAMVALUE (INSTANCE?)
- * ATTLIST EXPPARAMVALUE
- *   %CIMName;
- * 
      
- */
-public class ExpParamValueNode extends Node implements NonVolatileIf {
-
-	private String iName;
-
-	private Node iChildNode;
-
-	/**
-	 * Ctor.
-	 */
-	public ExpParamValueNode() {
-		super(EXPPARAMVALUE);
-	}
-
-	public void addChild(Node pChild) {
-		this.iChildNode = pChild;
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iName = getCIMName(pAttribs);
-		this.iChildNode = null;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iChildNode != null) throw new SAXException(getNodeName()
-				+ " node can have only one child node!");
-		if (pNodeNameEnum != INSTANCE) throw new SAXException(getNodeName() + " node cannot have "
-				+ pNodeNameEnum + " child node!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// nothing to do yet
-	}
-
-	@Override
-	public void testCompletness() {
-	// child node is optional
-	}
-
-	/**
-	 * getName
-	 * 
-	 * @return String
-	 */
-	public String getName() {
-		return this.iName;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ *    2687    2013-10-10  blaschke-oss ExpParamValueNode allows VALUE, (I)METHODRESPONSE children
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT EXPPARAMVALUE (INSTANCE?)
+ * ATTLIST EXPPARAMVALUE
+ *   %CIMName;
+ * 
      
+ */
+public class ExpParamValueNode extends Node implements NonVolatileIf {
+
+	private String iName;
+
+	private Node iChildNode;
+
+	/**
+	 * Ctor.
+	 */
+	public ExpParamValueNode() {
+		super(EXPPARAMVALUE);
+	}
+
+	public void addChild(Node pChild) {
+		this.iChildNode = pChild;
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iName = getCIMName(pAttribs);
+		this.iChildNode = null;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iChildNode != null) throw new SAXException(getNodeName()
+				+ " node can have only one child node!");
+		if (pNodeNameEnum != INSTANCE) throw new SAXException(getNodeName() + " node cannot have "
+				+ pNodeNameEnum + " child node!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// nothing to do yet
+	}
+
+	@Override
+	public void testCompletness() {
+	// child node is optional
+	}
+
+	/**
+	 * getName
+	 * 
+	 * @return String
+	 */
+	public String getName() {
+		return this.iName;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java
similarity index 71%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java
index 658f841..58adab7 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java
@@ -1,113 +1,111 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1742873    2007-06-25  ebak         IPv6 ready cim-client
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT HOST (#PCDATA)
- */
-public class HostNode extends Node {
-
-	private String iHost;
-
-	/**
-	 * Ctor.
-	 */
-	public HostNode() {
-		super(HOST);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iHost = null;
-		// no attributes
-	}
-
-	@Override
-	public void parseData(String pData) {
-		this.iHost = pData;
-	}
-
-	/**
-	 * @param pNodeNameEnum
-	 */
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		throw new SAXException("HOST node cannot have any child node!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// no child node
-
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iHost == null) throw new SAXException(
-				"HOST node must contain the host name as #PCDATA!");
-	}
-
-	/**
-	 * getHostStr
-	 * 
-	 * @return String which may contain the protocol, host and port
-	 */
-	public String getHostStr() {
-		return this.iHost;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1742873    2007-06-25  ebak         IPv6 ready cim-client
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT HOST (#PCDATA)
+ */
+public class HostNode extends Node {
+
+	private String iHost;
+
+	/**
+	 * Ctor.
+	 */
+	public HostNode() {
+		super(HOST);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iHost = null;
+		// no attributes
+	}
+
+	@Override
+	public void parseData(String pData) {
+		this.iHost = pData;
+	}
+
+	/**
+	 * @param pNodeNameEnum
+	 */
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		throw new SAXException("HOST node cannot have any child node!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// no child node
+
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iHost == null) throw new SAXException(
+				"HOST node must contain the host name as #PCDATA!");
+	}
+
+	/**
+	 * getHostStr
+	 * 
+	 * @return String which may contain the protocol, host and port
+	 */
+	public String getHostStr() {
+		return this.iHost;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java
similarity index 72%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java
index 0c214a3..7fc0f18 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java
@@ -1,79 +1,77 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- *    2682    2013-10-02  blaschke-oss (I)MethodCallNode allows no LOCAL*PATH
- *    2690    2013-10-11  blaschke-oss Remove RESPONSEDESTINATION support
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT IMETHODCALL (LOCALNAMESPACEPATH, IPARAMVALUE*) ATTLIST IMETHODCALL
- * %CIMName;
- */
-public class IMethodCallNode extends AbstractMethodCallNode {
-
-	/**
-	 * Ctor.
-	 */
-	public IMethodCallNode() {
-		super(IMETHODCALL);
-	}
-
-	@Override
-	protected void testSpecChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == LOCALNAMESPACEPATH) {
-			if (this.iPath != null) throw new SAXException(getNodeName()
-					+ " node can have only one " + pNodeNameEnum + " child node!");
-		} else if (pNodeNameEnum != IPARAMVALUE) throw new SAXException(getNodeName()
-				+ " node cannot have " + pNodeNameEnum + " child node!");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iPath == null) throw new SAXException(
-				"IMETHODCALL node must have a LOCALNAMESPACEPATH child node!");
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ *    2682    2013-10-02  blaschke-oss (I)MethodCallNode allows no LOCAL*PATH
+ *    2690    2013-10-11  blaschke-oss Remove RESPONSEDESTINATION support
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT IMETHODCALL (LOCALNAMESPACEPATH, IPARAMVALUE*) ATTLIST IMETHODCALL
+ * %CIMName;
+ */
+public class IMethodCallNode extends AbstractMethodCallNode {
+
+	/**
+	 * Ctor.
+	 */
+	public IMethodCallNode() {
+		super(IMETHODCALL);
+	}
+
+	@Override
+	protected void testSpecChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == LOCALNAMESPACEPATH) {
+			if (this.iPath != null) throw new SAXException(getNodeName()
+					+ " node can have only one " + pNodeNameEnum + " child node!");
+		} else if (pNodeNameEnum != IPARAMVALUE) throw new SAXException(getNodeName()
+				+ " node cannot have " + pNodeNameEnum + " child node!");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iPath == null) throw new SAXException(
+				"IMETHODCALL node must have a LOCALNAMESPACEPATH child node!");
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java
index b608dba..b671249 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java
@@ -1,206 +1,203 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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
- * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- *    2697    2012-10-30  blaschke-oss (I)MethodResponseNode allows ERROR with PARAMVALUE
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT IMETHODRESPONSE (ERROR|IRETURNVALUE?)
- * ATTLIST IMETHODRESPONSE
- *   %CIMName; 
- * 
      
- */
-/**
- * Class IMethodResponseNode is responsible for
- * 
- */
-public class IMethodResponseNode extends Node implements ErrorIf, RetValPipeIf, NonVolatileIf {
-
-	private String iName;
-
-	private ErrorNode iErrorNode;
-
-	private IReturnValueNode iRetValNode;
-
-	private ArrayList> iCIMArgAL;
-
-	private static final CIMArgument[] EMPTY_ARG_A = new CIMArgument[0];
-
-	private boolean iHasError;
-
-	private boolean iHasRetVal;
-
-	/**
-	 * Ctor.
-	 */
-	public IMethodResponseNode() {
-		super(IMETHODRESPONSE);
-	}
-
-	public void addChild(Node pChild) {
-		if (pChild instanceof IReturnValueNode) {
-			this.iRetValNode = (IReturnValueNode) pChild;
-		} else if (pChild instanceof ErrorNode) {
-			this.iErrorNode = (ErrorNode) pChild;
-		}
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iName = getCIMName(pAttribs);
-		this.iErrorNode = null;
-		this.iRetValNode = null;
-		if (this.iCIMArgAL != null) this.iCIMArgAL.clear();
-		this.iHasError = false;
-		this.iHasRetVal = false;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == ERROR) {
-			String ownedNodeName;
-			if (this.iHasRetVal) ownedNodeName = IRETURNVALUE;
-			else if (this.iHasError) ownedNodeName = ERROR;
-			else if (this.iCIMArgAL != null && this.iCIMArgAL.size() > 0) ownedNodeName = PARAMVALUE;
-			else ownedNodeName = null;
-			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has a " + ownedNodeName + " child node!");
-		} else if (pNodeNameEnum == IRETURNVALUE) {
-			String ownedNodeName;
-			if (this.iHasRetVal) ownedNodeName = IRETURNVALUE;
-			else if (this.iHasError) ownedNodeName = ERROR;
-			else ownedNodeName = null;
-			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has a " + ownedNodeName + " child node!");
-		} else if (pNodeNameEnum == PARAMVALUE) {
-			if (this.iHasError) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has an ERROR child node!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof ErrorNode) {
-			this.iHasError = true;
-			this.iErrorNode = (ErrorNode) pChild;
-		} else if (pChild instanceof IReturnValueNode) {
-			this.iHasRetVal = true;
-			this.iRetValNode = (IReturnValueNode) pChild;
-		} else
-		// Values of parameters should be stored in array
-		if (pChild instanceof ParamValueNode) {
-			if (this.iCIMArgAL == null) this.iCIMArgAL = new ArrayList>();
-			this.iCIMArgAL.add(((ParamValueNode) pChild).getCIMArgument());
-		}
-	}
-
-	@Override
-	public void testCompletness() {
-	// no mandatory child nodes
-	}
-
-	public CIMError getCIMError() {
-		return this.iErrorNode == null ? null : this.iErrorNode.getCIMError();
-	}
-
-	public int getReturnValueCount() {
-		return this.iRetValNode == null ? 0 : this.iRetValNode.getReturnValueCount();
-	}
-
-	public Object readReturnValue() {
-		return this.iRetValNode.readReturnValue();
-	}
-
-	/**
-	 * getName
-	 * 
-	 * @return String
-	 */
-	public String getName() {
-		return this.iName;
-	}
-
-	/**
-	 * getCIMArguments : returns the array of parsed parameters and their values
-	 * : String name, CIMDataType type, Object value
-	 * 
-	 * @return CIMArgument<?>[]
-	 */
-	public CIMArgument[] getCIMArguments() {
-		if (this.iCIMArgAL == null || this.iCIMArgAL.size() == 0) return null;
-		return this.iCIMArgAL.toArray(EMPTY_ARG_A);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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
+ * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ *    2697    2012-10-30  blaschke-oss (I)MethodResponseNode allows ERROR with PARAMVALUE
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT IMETHODRESPONSE (ERROR|IRETURNVALUE?)
+ * ATTLIST IMETHODRESPONSE
+ *   %CIMName; 
+ * 
      
+ */
+/**
+ * Class IMethodResponseNode is responsible for
+ * 
+ */
+public class IMethodResponseNode extends Node implements ErrorIf, RetValPipeIf, NonVolatileIf {
+
+	private String iName;
+
+	private ErrorNode iErrorNode;
+
+	private IReturnValueNode iRetValNode;
+
+	private ArrayList> iCIMArgAL;
+
+	private static final CIMArgument[] EMPTY_ARG_A = new CIMArgument[0];
+
+	private boolean iHasError;
+
+	private boolean iHasRetVal;
+
+	/**
+	 * Ctor.
+	 */
+	public IMethodResponseNode() {
+		super(IMETHODRESPONSE);
+	}
+
+	public void addChild(Node pChild) {
+		if (pChild instanceof IReturnValueNode) {
+			this.iRetValNode = (IReturnValueNode) pChild;
+		} else if (pChild instanceof ErrorNode) {
+			this.iErrorNode = (ErrorNode) pChild;
+		}
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iName = getCIMName(pAttribs);
+		this.iErrorNode = null;
+		this.iRetValNode = null;
+		if (this.iCIMArgAL != null) this.iCIMArgAL.clear();
+		this.iHasError = false;
+		this.iHasRetVal = false;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == ERROR) {
+			String ownedNodeName;
+			if (this.iHasRetVal) ownedNodeName = IRETURNVALUE;
+			else if (this.iHasError) ownedNodeName = ERROR;
+			else if (this.iCIMArgAL != null && this.iCIMArgAL.size() > 0) ownedNodeName = PARAMVALUE;
+			else ownedNodeName = null;
+			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
+					+ " child node is invalid for " + getNodeName()
+					+ " node, since it already has a " + ownedNodeName + " child node!");
+		} else if (pNodeNameEnum == IRETURNVALUE) {
+			String ownedNodeName;
+			if (this.iHasRetVal) ownedNodeName = IRETURNVALUE;
+			else if (this.iHasError) ownedNodeName = ERROR;
+			else ownedNodeName = null;
+			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
+					+ " child node is invalid for " + getNodeName()
+					+ " node, since it already has a " + ownedNodeName + " child node!");
+		} else if (pNodeNameEnum == PARAMVALUE) {
+			if (this.iHasError) throw new SAXException(pNodeNameEnum
+					+ " child node is invalid for " + getNodeName()
+					+ " node, since it already has an ERROR child node!");
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof ErrorNode) {
+			this.iHasError = true;
+			this.iErrorNode = (ErrorNode) pChild;
+		} else if (pChild instanceof IReturnValueNode) {
+			this.iHasRetVal = true;
+			this.iRetValNode = (IReturnValueNode) pChild;
+		} else
+		// Values of parameters should be stored in array
+		if (pChild instanceof ParamValueNode) {
+			if (this.iCIMArgAL == null) this.iCIMArgAL = new ArrayList>();
+			this.iCIMArgAL.add(((ParamValueNode) pChild).getCIMArgument());
+		}
+	}
+
+	@Override
+	public void testCompletness() {
+	// no mandatory child nodes
+	}
+
+	public CIMError getCIMError() {
+		return this.iErrorNode == null ? null : this.iErrorNode.getCIMError();
+	}
+
+	public int getReturnValueCount() {
+		return this.iRetValNode == null ? 0 : this.iRetValNode.getReturnValueCount();
+	}
+
+	public Object readReturnValue() {
+		return this.iRetValNode.readReturnValue();
+	}
+
+	/**
+	 * getName
+	 * 
+	 * @return String
+	 */
+	public String getName() {
+		return this.iName;
+	}
+
+	/**
+	 * getCIMArguments : returns the array of parsed parameters and their values
+	 * : String name, CIMDataType type, Object value
+	 * 
+	 * @return CIMArgument<?>[]
+	 */
+	public CIMArgument[] getCIMArguments() {
+		if (this.iCIMArgAL == null || this.iCIMArgAL.size() == 0) return null;
+		return this.iCIMArgAL.toArray(EMPTY_ARG_A);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java
index dcf8244..553ee7d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java
@@ -1,169 +1,166 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- *    2680    2013-10-02  blaschke-oss IPARAMVALUE parsing broken on DOM/SAX
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * FIXME: Why hasn't it got TYPE attribute? For VALUE and VALUE.ARRAY it would
- * be necessary.
- * 
- * 
      - * 
- * ELEMENT IPARAMVALUE (VALUE | VALUE.ARRAY | VALUE.REFERENCE | INSTANCENAME | CLASSNAME |
- *   QUALIFIER.DECLARATION | CLASS | INSTANCE | VALUE.NAMEDINSTANCE)?
- * ATTLIST IPARAMVALUE
- *   %CIMName;
- * 
      
- */
-public class IParamValueNode extends AbstractParamValueNode {
-
-	private String iName;
-
-	/**
-	 * child element
-	 */
-	private Object iValue;
-
-	private boolean iIsArray;
-
-	private CIMDataType iType;
-
-	/**
-	 * Ctor.
-	 */
-	public IParamValueNode() {
-		super(IPARAMVALUE);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iValue = null;
-		this.iType = null;
-		this.iName = getCIMName(pAttribs);
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	private static final String[] ALLOWED_CHILDREN = { VALUE, VALUE_ARRAY, VALUE_REFERENCE,
-			INSTANCENAME, CLASSNAME, QUALIFIER_DECLARATION, CLASS, INSTANCE, VALUE_NAMEDINSTANCE };
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		boolean allowed = false;
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++) {
-			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
-				allowed = true;
-				break;
-			}
-		}
-		if (!allowed) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-		/*
-		 * this kind of check is not so strict (ValueNode.getValue() can return
-		 * null)
-		 */
-		if (this.iValue != null) throw new SAXException(getNodeName()
-				+ " node cannot have more than one child node!");
-
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		this.iValue = ((ValueIf) pChild).getValue();
-		this.iIsArray = pChild instanceof ArrayIf;
-		if (pChild instanceof TypedIf) this.iType = ((TypedIf) pChild).getType();
-		else if (pChild instanceof ObjectPathIf) this.iType = CIMDataType
-				.getDataType(((ObjectPathIf) pChild).getCIMObjectPath());
-		else if (pChild instanceof ValueIf) this.iType = CIMDataType.getDataType(((ValueIf) pChild)
-				.getValue());
-	}
-
-	@Override
-	public void testCompletness() {
-	// child node is optional
-	}
-
-	@Override
-	public CIMArgument getCIMArgument() {
-		return new CIMArgument(this.iName, getType(), this.iValue);
-	}
-
-	/**
-	 * getName
-	 * 
-	 * @return String
-	 */
-	public String getName() {
-		return this.iName;
-	}
-
-	public CIMDataType getType() {
-		return this.iType == null ? (this.iIsArray ? CIMDataType.STRING_ARRAY_T
-				: CIMDataType.STRING_T) : this.iType;
-	}
-
-	public Object getValue() {
-		return this.iValue;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ *    2680    2013-10-02  blaschke-oss IPARAMVALUE parsing broken on DOM/SAX
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * FIXME: Why hasn't it got TYPE attribute? For VALUE and VALUE.ARRAY it would
+ * be necessary.
+ * 
+ * 
      + * 
+ * ELEMENT IPARAMVALUE (VALUE | VALUE.ARRAY | VALUE.REFERENCE | INSTANCENAME | CLASSNAME |
+ *   QUALIFIER.DECLARATION | CLASS | INSTANCE | VALUE.NAMEDINSTANCE)?
+ * ATTLIST IPARAMVALUE
+ *   %CIMName;
+ * 
      
+ */
+public class IParamValueNode extends AbstractParamValueNode {
+
+	private String iName;
+
+	/**
+	 * child element
+	 */
+	private Object iValue;
+
+	private boolean iIsArray;
+
+	private CIMDataType iType;
+
+	/**
+	 * Ctor.
+	 */
+	public IParamValueNode() {
+		super(IPARAMVALUE);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iValue = null;
+		this.iType = null;
+		this.iName = getCIMName(pAttribs);
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	private static final String[] ALLOWED_CHILDREN = { VALUE, VALUE_ARRAY, VALUE_REFERENCE,
+			INSTANCENAME, CLASSNAME, QUALIFIER_DECLARATION, CLASS, INSTANCE, VALUE_NAMEDINSTANCE };
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		boolean allowed = false;
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++) {
+			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
+				allowed = true;
+				break;
+			}
+		}
+		if (!allowed) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+		/*
+		 * this kind of check is not so strict (ValueNode.getValue() can return
+		 * null)
+		 */
+		if (this.iValue != null) throw new SAXException(getNodeName()
+				+ " node cannot have more than one child node!");
+
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		this.iValue = ((ValueIf) pChild).getValue();
+		this.iIsArray = pChild instanceof ArrayIf;
+		if (pChild instanceof TypedIf) this.iType = ((TypedIf) pChild).getType();
+		else if (pChild instanceof ObjectPathIf) this.iType = CIMDataType
+				.getDataType(((ObjectPathIf) pChild).getCIMObjectPath());
+		else if (pChild instanceof ValueIf) this.iType = CIMDataType.getDataType(((ValueIf) pChild)
+				.getValue());
+	}
+
+	@Override
+	public void testCompletness() {
+	// child node is optional
+	}
+
+	@Override
+	public CIMArgument getCIMArgument() {
+		return new CIMArgument(this.iName, getType(), this.iValue);
+	}
+
+	/**
+	 * getName
+	 * 
+	 * @return String
+	 */
+	public String getName() {
+		return this.iName;
+	}
+
+	public CIMDataType getType() {
+		return this.iType == null ? (this.iIsArray ? CIMDataType.STRING_ARRAY_T
+				: CIMDataType.STRING_T) : this.iType;
+	}
+
+	public Object getValue() {
+		return this.iValue;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java
similarity index 81%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java
index fd3e0e5..3760369 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java
@@ -1,157 +1,155 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.LinkedList;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * 
- * ELEMENT IRETURNVALUE (
- *   CLASSNAME* | INSTANCENAME* | VALUE* | VALUE.OBJECTWITHPATH* | VALUE.OBJECTWITHLOCALPATH* |
- *   VALUE.OBJECT* | OBJECTPATH* | QUALIFIER.DECLARATION* | VALUE.ARRAY? | VALUE.REFERENCE? |
- *   CLASS* | INSTANCE* | VALUE.NAMEDINSTANCE*
- * )
- * 
      
- */
-public class IReturnValueNode extends Node implements RetValPipeIf, NonVolatileIf {
-
-	private String iChildNameEnum;
-
-	private LinkedList iChildValueLL;
-
-	/**
-	 * Ctor.
-	 */
-	public IReturnValueNode() {
-		super(IRETURNVALUE);
-	}
-
-	/**
-	 * @param pChild
-	 */
-	public void addChild(Node pChild) { /* we don't need it here */}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		// currently it's not really necessary here, since the Node is
-		// NonVolatile
-		this.iChildNameEnum = null;
-		this.iChildValueLL = null;
-		// no attribs
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	private static final String[] ALLOWED_CHILDREN = { CLASSNAME, INSTANCENAME, INSTANCEPATH,
-			VALUE, VALUE_OBJECTWITHPATH, VALUE_OBJECTWITHLOCALPATH, VALUE_OBJECT, OBJECTPATH,
-			QUALIFIER_DECLARATION, VALUE_ARRAY, VALUE_REFERENCE, CLASS, INSTANCE,
-			VALUE_NAMEDINSTANCE, VALUE_INSTANCEWITHPATH };
-
-	// private static final String[] SINGLE_CHILDREN = { VALUE_ARRAY,
-	// VALUE_REFERENCE };
-
-	/**
-	 * @see Node#testChild(java.lang.String)
-	 */
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iChildNameEnum != null) {
-			if (pNodeNameEnum != this.iChildNameEnum) throw new SAXException(getNodeName()
-					+ " node cannot have " + pNodeNameEnum + " child node, since it already has "
-					+ this.iChildNameEnum + " child node(s)!");
-			if (this.iChildNameEnum == VALUE_ARRAY || this.iChildNameEnum == VALUE_REFERENCE) throw new SAXException(
-					getNodeName() + " node can have only one " + this.iChildNameEnum
-							+ " child node!");
-		} else {
-			boolean found = false;
-			for (int i = 0; i < ALLOWED_CHILDREN.length; i++) {
-				if ((found = (pNodeNameEnum == ALLOWED_CHILDREN[i])) == true) break;
-			}
-			if (!found) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-					+ " child node!");
-		}
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (this.iChildValueLL == null) {
-			this.iChildNameEnum = pChild.getNodeName();
-			this.iChildValueLL = new LinkedList();
-		}
-		this.iChildValueLL.add(((ValueIf) pChild).getValue());
-	}
-
-	@Override
-	public void testCompletness() {
-	// child nodes are optional
-	}
-
-	public int getReturnValueCount() {
-		return this.iChildValueLL == null ? 0 : this.iChildValueLL.size();
-	}
-
-	public Object readReturnValue() {
-		return this.iChildValueLL == null ? null : this.iChildValueLL.removeFirst();
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.LinkedList;
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * 
+ * ELEMENT IRETURNVALUE (
+ *   CLASSNAME* | INSTANCENAME* | VALUE* | VALUE.OBJECTWITHPATH* | VALUE.OBJECTWITHLOCALPATH* |
+ *   VALUE.OBJECT* | OBJECTPATH* | QUALIFIER.DECLARATION* | VALUE.ARRAY? | VALUE.REFERENCE? |
+ *   CLASS* | INSTANCE* | VALUE.NAMEDINSTANCE*
+ * )
+ * 
      
+ */
+public class IReturnValueNode extends Node implements RetValPipeIf, NonVolatileIf {
+
+	private String iChildNameEnum;
+
+	private LinkedList iChildValueLL;
+
+	/**
+	 * Ctor.
+	 */
+	public IReturnValueNode() {
+		super(IRETURNVALUE);
+	}
+
+	/**
+	 * @param pChild
+	 */
+	public void addChild(Node pChild) { /* we don't need it here */}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		// currently it's not really necessary here, since the Node is
+		// NonVolatile
+		this.iChildNameEnum = null;
+		this.iChildValueLL = null;
+		// no attribs
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	private static final String[] ALLOWED_CHILDREN = { CLASSNAME, INSTANCENAME, INSTANCEPATH,
+			VALUE, VALUE_OBJECTWITHPATH, VALUE_OBJECTWITHLOCALPATH, VALUE_OBJECT, OBJECTPATH,
+			QUALIFIER_DECLARATION, VALUE_ARRAY, VALUE_REFERENCE, CLASS, INSTANCE,
+			VALUE_NAMEDINSTANCE, VALUE_INSTANCEWITHPATH };
+
+	// private static final String[] SINGLE_CHILDREN = { VALUE_ARRAY,
+	// VALUE_REFERENCE };
+
+	/**
+	 * @see Node#testChild(java.lang.String)
+	 */
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iChildNameEnum != null) {
+			if (pNodeNameEnum != this.iChildNameEnum) throw new SAXException(getNodeName()
+					+ " node cannot have " + pNodeNameEnum + " child node, since it already has "
+					+ this.iChildNameEnum + " child node(s)!");
+			if (this.iChildNameEnum == VALUE_ARRAY || this.iChildNameEnum == VALUE_REFERENCE) throw new SAXException(
+					getNodeName() + " node can have only one " + this.iChildNameEnum
+							+ " child node!");
+		} else {
+			boolean found = false;
+			for (int i = 0; i < ALLOWED_CHILDREN.length; i++) {
+				if ((found = (pNodeNameEnum == ALLOWED_CHILDREN[i])) == true) break;
+			}
+			if (!found) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+					+ " child node!");
+		}
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (this.iChildValueLL == null) {
+			this.iChildNameEnum = pChild.getNodeName();
+			this.iChildValueLL = new LinkedList();
+		}
+		this.iChildValueLL.add(((ValueIf) pChild).getValue());
+	}
+
+	@Override
+	public void testCompletness() {
+	// child nodes are optional
+	}
+
+	public int getReturnValueCount() {
+		return this.iChildValueLL == null ? 0 : this.iChildValueLL.size();
+	}
+
+	public Object readReturnValue() {
+		return this.iChildValueLL == null ? null : this.iChildValueLL.removeFirst();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java
index 18c3d0d..8de2296 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java
@@ -1,164 +1,161 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- *    2707    2013-11-12  blaschke-oss INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * perhaps it's a documentation mistake: ELEMENT INSTANCENAME (KEYBINDING* | KEYVALUE? | VALUE.REFERENCE?)
- * ELEMENT INSTANCENAME (KEYBINDING*)
- * ATTLIST INSTANCENAME
- *  %ClassName;
- * 
      
- */
-public class InstanceNameNode extends AbstractPathNode {
-
-	private String iClassName;
-
-	private ArrayList> iCIMPropAL;
-
-	private CIMObjectPath iLocalPath;
-
-	private String iNodeName;
-
-	/**
-	 * Ctor.
-	 */
-	public InstanceNameNode() {
-		super(INSTANCENAME);
-	}
-
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iLocalPath = pSession.getDefLocalPath();
-		if (this.iCIMPropAL != null) this.iCIMPropAL.clear();
-		this.iClassName = getClassName(pAttribs);
-		this.iNodeName = null;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	private static final String[] ALLOWED_CHILDREN = { KEYBINDING, KEYVALUE, VALUE_REFERENCE };
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
-				if (this.iNodeName != null && this.iNodeName != pNodeNameEnum) throw new SAXException(
-						getNodeName() + " node cannot have " + pNodeNameEnum
-								+ " child node, it already has a " + this.iNodeName + "!");
-				if (pNodeNameEnum != KEYBINDING) {
-					if (this.iNodeName != null) throw new SAXException(getNodeName()
-							+ " node can have only one " + pNodeNameEnum + " child node!");
-				}
-				this.iNodeName = pNodeNameEnum;
-				return;
-			}
-		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (this.iCIMPropAL == null) this.iCIMPropAL = new ArrayList>();
-		if (pChild instanceof KeyBindingNode) this.iCIMPropAL.add(((KeyBindingNode) pChild)
-				.getCIMProperty());
-		else this.iCIMPropAL.add(new CIMProperty("", ((AbstractScalarValueNode) pChild)
-				.getType(), ((AbstractScalarValueNode) pChild).getValue(), true, false, null));
-	}
-
-	@Override
-	public void testCompletness() {
-	// no mandatory child nodes
-	}
-
-	/**
-	 * getClassName
-	 * 
-	 * @return String
-	 */
-	public String getClassName() {
-		return this.iClassName;
-	}
-
-	private static final CIMProperty[] EMPTY_PA = new CIMProperty[0];
-
-	/**
-	 * getKeys
-	 * 
-	 * @return CIMProperty[]
-	 */
-	public CIMProperty[] getKeys() {
-		if (this.iCIMPropAL == null || this.iCIMPropAL.size() == 0) return null;
-		return this.iCIMPropAL.toArray(EMPTY_PA);
-	}
-
-	public CIMObjectPath getCIMObjectPath() {
-		/*
-		 * CIMObjectPath(String objectName, String namespace, CIMProperty[]
-		 * keys)
-		 */
-		return LocalPathBuilder.build(this.iLocalPath, this.iClassName, null, getKeys());
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ *    2707    2013-11-12  blaschke-oss INSTANCENAME ignores KEYVALUE and VALUE.REFERENCE children
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * perhaps it's a documentation mistake: ELEMENT INSTANCENAME (KEYBINDING* | KEYVALUE? | VALUE.REFERENCE?)
+ * ELEMENT INSTANCENAME (KEYBINDING*)
+ * ATTLIST INSTANCENAME
+ *  %ClassName;
+ * 
      
+ */
+public class InstanceNameNode extends AbstractPathNode {
+
+	private String iClassName;
+
+	private ArrayList> iCIMPropAL;
+
+	private CIMObjectPath iLocalPath;
+
+	private String iNodeName;
+
+	/**
+	 * Ctor.
+	 */
+	public InstanceNameNode() {
+		super(INSTANCENAME);
+	}
+
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iLocalPath = pSession.getDefLocalPath();
+		if (this.iCIMPropAL != null) this.iCIMPropAL.clear();
+		this.iClassName = getClassName(pAttribs);
+		this.iNodeName = null;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	private static final String[] ALLOWED_CHILDREN = { KEYBINDING, KEYVALUE, VALUE_REFERENCE };
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
+			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
+				if (this.iNodeName != null && this.iNodeName != pNodeNameEnum) throw new SAXException(
+						getNodeName() + " node cannot have " + pNodeNameEnum
+								+ " child node, it already has a " + this.iNodeName + "!");
+				if (pNodeNameEnum != KEYBINDING) {
+					if (this.iNodeName != null) throw new SAXException(getNodeName()
+							+ " node can have only one " + pNodeNameEnum + " child node!");
+				}
+				this.iNodeName = pNodeNameEnum;
+				return;
+			}
+		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (this.iCIMPropAL == null) this.iCIMPropAL = new ArrayList>();
+		if (pChild instanceof KeyBindingNode) this.iCIMPropAL.add(((KeyBindingNode) pChild)
+				.getCIMProperty());
+		else this.iCIMPropAL.add(new CIMProperty("", ((AbstractScalarValueNode) pChild)
+				.getType(), ((AbstractScalarValueNode) pChild).getValue(), true, false, null));
+	}
+
+	@Override
+	public void testCompletness() {
+	// no mandatory child nodes
+	}
+
+	/**
+	 * getClassName
+	 * 
+	 * @return String
+	 */
+	public String getClassName() {
+		return this.iClassName;
+	}
+
+	private static final CIMProperty[] EMPTY_PA = new CIMProperty[0];
+
+	/**
+	 * getKeys
+	 * 
+	 * @return CIMProperty[]
+	 */
+	public CIMProperty[] getKeys() {
+		if (this.iCIMPropAL == null || this.iCIMPropAL.size() == 0) return null;
+		return this.iCIMPropAL.toArray(EMPTY_PA);
+	}
+
+	public CIMObjectPath getCIMObjectPath() {
+		/*
+		 * CIMObjectPath(String objectName, String namespace, CIMProperty[]
+		 * keys)
+		 */
+		return LocalPathBuilder.build(this.iLocalPath, this.iClassName, null, getKeys());
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java
index 62f4a73..aa603f9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java
@@ -1,166 +1,163 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMHelper;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT INSTANCE (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*)
- * ATTLIST INSTANCE
- *   %ClassName;
- *   xml:lang   NMTOKEN      #IMPLIED
- * 
      
- */
-public class InstanceNode extends AbstractObjectNode {
-
-	private String iClassName;
-
-	/**
-	 * FIXME: What to do with the qualifiers? JSR48 doesn't specify qualifiers
-	 * for CIMInstance!
-	 */
-	private QualifiedNodeHandler iQualiHandler;
-
-	private ArrayList> iCIMPropAL;
-
-	/**
-	 * Ctor.
-	 */
-	public InstanceNode() {
-		super(INSTANCE);
-	}
-
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iLocalPath = pSession.getDefLocalPath();
-		this.iQualiHandler = new QualifiedNodeHandler();
-		this.iCIMPropAL = null;
-		this.iClassName = getClassName(pAttribs);
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PROPERTY, PROPERTY_ARRAY,
-			PROPERTY_REFERENCE };
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) return;
-		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (this.iQualiHandler.addQualifierNode(pChild)) return;
-		if (this.iCIMPropAL == null) this.iCIMPropAL = new ArrayList>();
-		this.iCIMPropAL.add(((AbstractPropertyNode) pChild).getCIMProperty());
-	}
-
-	@Override
-	public void testCompletness() {
-	// all child nodes are optional
-	}
-
-	/**
-	 * getCIMInstance
-	 * 
-	 * @return CIMInstance
-	 */
-	public CIMInstance getCIMInstance() {
-		return new CIMInstance(LocalPathBuilder.build(this.iLocalPath, this.iClassName, null),
-				getProps());
-	}
-
-	/**
-	 * getCIMInstance
-	 * 
-	 * @param pObjPath
-	 * @return CIMInstance with the provided object path
-	 */
-	public CIMInstance getCIMInstance(CIMObjectPath pObjPath) {
-		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
-				.CIMInstanceWithSynchonizedNumericKeyDataTypes(pObjPath, getProps());
-		return new CIMInstance(pObjPath, getProps());
-	}
-
-	/**
-	 * @see ValueIf#getValue()
-	 * @return CIMInstance
-	 */
-	public Object getValue() {
-		return getCIMInstance();
-	}
-
-	private static final CIMProperty[] EMPTY_PA = new CIMProperty[0];
-
-	private CIMProperty[] getProps() {
-		if (this.iCIMPropAL == null) return null;
-		return this.iCIMPropAL.toArray(EMPTY_PA);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT INSTANCE (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*)
+ * ATTLIST INSTANCE
+ *   %ClassName;
+ *   xml:lang   NMTOKEN      #IMPLIED
+ * 
      
+ */
+public class InstanceNode extends AbstractObjectNode {
+
+	private String iClassName;
+
+	/**
+	 * FIXME: What to do with the qualifiers? JSR48 doesn't specify qualifiers
+	 * for CIMInstance!
+	 */
+	private QualifiedNodeHandler iQualiHandler;
+
+	private ArrayList> iCIMPropAL;
+
+	/**
+	 * Ctor.
+	 */
+	public InstanceNode() {
+		super(INSTANCE);
+	}
+
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iLocalPath = pSession.getDefLocalPath();
+		this.iQualiHandler = new QualifiedNodeHandler();
+		this.iCIMPropAL = null;
+		this.iClassName = getClassName(pAttribs);
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PROPERTY, PROPERTY_ARRAY,
+			PROPERTY_REFERENCE };
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
+			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) return;
+		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (this.iQualiHandler.addQualifierNode(pChild)) return;
+		if (this.iCIMPropAL == null) this.iCIMPropAL = new ArrayList>();
+		this.iCIMPropAL.add(((AbstractPropertyNode) pChild).getCIMProperty());
+	}
+
+	@Override
+	public void testCompletness() {
+	// all child nodes are optional
+	}
+
+	/**
+	 * getCIMInstance
+	 * 
+	 * @return CIMInstance
+	 */
+	public CIMInstance getCIMInstance() {
+		return new CIMInstance(LocalPathBuilder.build(this.iLocalPath, this.iClassName, null),
+				getProps());
+	}
+
+	/**
+	 * getCIMInstance
+	 * 
+	 * @param pObjPath
+	 * @return CIMInstance with the provided object path
+	 */
+	public CIMInstance getCIMInstance(CIMObjectPath pObjPath) {
+		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
+				.CIMInstanceWithSynchonizedNumericKeyDataTypes(pObjPath, getProps());
+		return new CIMInstance(pObjPath, getProps());
+	}
+
+	/**
+	 * @see ValueIf#getValue()
+	 * @return CIMInstance
+	 */
+	public Object getValue() {
+		return getCIMInstance();
+	}
+
+	private static final CIMProperty[] EMPTY_PA = new CIMProperty[0];
+
+	private CIMProperty[] getProps() {
+		if (this.iCIMPropAL == null) return null;
+		return this.iCIMPropAL.toArray(EMPTY_PA);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java
index 70b75fe..3f34d17 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java
@@ -1,149 +1,146 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1742873    2007-06-25  ebak         IPv6 ready cim-client
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.XMLHostStr;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT INSTANCEPATH (NAMESPACEPATH, INSTANCENAME)
- */
-public class InstancePathNode extends AbstractObjectPathNode {
-
-	// INSTANCEPATH
-	private boolean iHasInstancePath;
-
-	private String iLocalNameSpacePathStr;
-
-	private XMLHostStr iHostStr;
-
-	// INSTANCENAME
-	private boolean iHasInstanceName;
-
-	private String iClassNameStr;
-
-	private CIMProperty[] iKeys;
-
-	/**
-	 * Ctor.
-	 */
-	public InstancePathNode() {
-		super(INSTANCEPATH);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iHasInstanceName = this.iHasInstancePath = false;
-		this.iLocalNameSpacePathStr = this.iClassNameStr = null;
-		this.iHostStr = new XMLHostStr();
-		this.iKeys = null;
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == NAMESPACEPATH) {
-			if (this.iHasInstancePath) throw new SAXException(
-					"INSTANCEPATH node can have only one NAMESPACEPATH child node!");
-		} else if (pNodeNameEnum == INSTANCENAME) {
-			if (this.iHasInstanceName) throw new SAXException(
-					"INSTANCEPATH node can have only one INSTANCENAME child node!");
-		} else throw new SAXException("INSTANCEPATH node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof NameSpacePathNode) {
-			NameSpacePathNode nsPathNode = (NameSpacePathNode) pChild;
-			this.iHostStr.set(nsPathNode.getHostStr());
-			this.iLocalNameSpacePathStr = nsPathNode.getLocalNameSpacePath();
-			this.iHasInstancePath = true;
-		} else {
-			InstanceNameNode instNameNode = (InstanceNameNode) pChild;
-			this.iClassNameStr = instNameNode.getClassName();
-			this.iKeys = instNameNode.getKeys();
-			this.iHasInstanceName = true;
-		}
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (!this.iHasInstancePath) throw new SAXException(
-				"INSTANCEPATH node must have a NAMESPACEPATH child node!");
-		if (!this.iHasInstanceName) throw new SAXException(
-				"INSTANCEPATH node must have an INSTANCENAME child node!");
-	}
-
-	public CIMObjectPath getCIMObjectPath() {
-		/*
-		 * CIMObjectPath( String scheme, String host, String port, String
-		 * namespace, String objectName, CIMProperty[] keys )
-		 */
-		return new CIMObjectPath(this.iHostStr.getProtocol(), this.iHostStr.getHost(),
-				this.iHostStr.getPort(), this.iLocalNameSpacePathStr, this.iClassNameStr,
-				this.iKeys);
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1742873    2007-06-25  ebak         IPv6 ready cim-client
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.util.XMLHostStr;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT INSTANCEPATH (NAMESPACEPATH, INSTANCENAME)
+ */
+public class InstancePathNode extends AbstractObjectPathNode {
+
+	// INSTANCEPATH
+	private boolean iHasInstancePath;
+
+	private String iLocalNameSpacePathStr;
+
+	private XMLHostStr iHostStr;
+
+	// INSTANCENAME
+	private boolean iHasInstanceName;
+
+	private String iClassNameStr;
+
+	private CIMProperty[] iKeys;
+
+	/**
+	 * Ctor.
+	 */
+	public InstancePathNode() {
+		super(INSTANCEPATH);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iHasInstanceName = this.iHasInstancePath = false;
+		this.iLocalNameSpacePathStr = this.iClassNameStr = null;
+		this.iHostStr = new XMLHostStr();
+		this.iKeys = null;
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == NAMESPACEPATH) {
+			if (this.iHasInstancePath) throw new SAXException(
+					"INSTANCEPATH node can have only one NAMESPACEPATH child node!");
+		} else if (pNodeNameEnum == INSTANCENAME) {
+			if (this.iHasInstanceName) throw new SAXException(
+					"INSTANCEPATH node can have only one INSTANCENAME child node!");
+		} else throw new SAXException("INSTANCEPATH node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof NameSpacePathNode) {
+			NameSpacePathNode nsPathNode = (NameSpacePathNode) pChild;
+			this.iHostStr.set(nsPathNode.getHostStr());
+			this.iLocalNameSpacePathStr = nsPathNode.getLocalNameSpacePath();
+			this.iHasInstancePath = true;
+		} else {
+			InstanceNameNode instNameNode = (InstanceNameNode) pChild;
+			this.iClassNameStr = instNameNode.getClassName();
+			this.iKeys = instNameNode.getKeys();
+			this.iHasInstanceName = true;
+		}
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (!this.iHasInstancePath) throw new SAXException(
+				"INSTANCEPATH node must have a NAMESPACEPATH child node!");
+		if (!this.iHasInstanceName) throw new SAXException(
+				"INSTANCEPATH node must have an INSTANCENAME child node!");
+	}
+
+	public CIMObjectPath getCIMObjectPath() {
+		/*
+		 * CIMObjectPath( String scheme, String host, String port, String
+		 * namespace, String objectName, CIMProperty[] keys )
+		 */
+		return new CIMObjectPath(this.iHostStr.getProtocol(), this.iHostStr.getHost(),
+				this.iHostStr.getPort(), this.iLocalNameSpacePathStr, this.iClassNameStr,
+				this.iKeys);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java
index 60a5ac6..d4da725 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java
@@ -1,130 +1,127 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT KEYBINDING (KEYVALUE | VALUE.REFERENCE) ATTLIST KEYBINDING %CIMName;
- */
-public class KeyBindingNode extends Node {
-
-	private String iName;
-
-	// child element
-	private boolean iHasChild;
-
-	private CIMDataType iType;
-
-	private Object iValue;
-
-	/**
-	 * Ctor.
-	 */
-	public KeyBindingNode() {
-		super(KEYBINDING);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iHasChild = false;
-		this.iValue = null;
-		this.iName = getCIMName(pAttribs);
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iHasChild) throw new SAXException("KEYBINDING node can only have one child node!");
-		if (pNodeNameEnum != KEYVALUE && pNodeNameEnum != VALUE_REFERENCE) throw new SAXException(
-				"KEYBINDING node's child node can be KEYVALUE or VALUE_REFERENCE but not "
-						+ pNodeNameEnum);
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		AbstractScalarValueNode abstScalarValNode = (AbstractScalarValueNode) pChild;
-		this.iType = abstScalarValNode.getType();
-		this.iValue = abstScalarValNode.getValue();
-		this.iHasChild = true;
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (!this.iHasChild) throw new SAXException(
-				"KEYBINDING node must have a KEYVALUE or VALUE_REFERENCE child node!");
-	}
-
-	/**
-	 * getCIMProperty
-	 * 
-	 * @return CIMProperty
-	 */
-	public CIMProperty getCIMProperty() {
-		// CIMProperty(
-		// String name, CIMDataType type, Object value, boolean key, boolean
-		// propagated, String originClass
-		// )
-		return new CIMProperty(this.iName, this.iType, this.iValue, true, false, null);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT KEYBINDING (KEYVALUE | VALUE.REFERENCE) ATTLIST KEYBINDING %CIMName;
+ */
+public class KeyBindingNode extends Node {
+
+	private String iName;
+
+	// child element
+	private boolean iHasChild;
+
+	private CIMDataType iType;
+
+	private Object iValue;
+
+	/**
+	 * Ctor.
+	 */
+	public KeyBindingNode() {
+		super(KEYBINDING);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iHasChild = false;
+		this.iValue = null;
+		this.iName = getCIMName(pAttribs);
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iHasChild) throw new SAXException("KEYBINDING node can only have one child node!");
+		if (pNodeNameEnum != KEYVALUE && pNodeNameEnum != VALUE_REFERENCE) throw new SAXException(
+				"KEYBINDING node's child node can be KEYVALUE or VALUE_REFERENCE but not "
+						+ pNodeNameEnum);
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		AbstractScalarValueNode abstScalarValNode = (AbstractScalarValueNode) pChild;
+		this.iType = abstScalarValNode.getType();
+		this.iValue = abstScalarValNode.getValue();
+		this.iHasChild = true;
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (!this.iHasChild) throw new SAXException(
+				"KEYBINDING node must have a KEYVALUE or VALUE_REFERENCE child node!");
+	}
+
+	/**
+	 * getCIMProperty
+	 * 
+	 * @return CIMProperty
+	 */
+	public CIMProperty getCIMProperty() {
+		// CIMProperty(
+		// String name, CIMDataType type, Object value, boolean key, boolean
+		// propagated, String originClass
+		// )
+		return new CIMProperty(this.iName, this.iType, this.iValue, true, false, null);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java
index 7a5f6d3..f323511 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java
@@ -1,224 +1,221 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1769504	  2007-08-08  ebak         Type identification for VALUETYPE="numeric"
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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
- * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
- * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
- * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
- *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
- *    2683    2013-10-07  blaschke-oss KEYVALUE VALUETYPE optional, "string" default
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTimeAbsolute;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTimeInterval;
-import org.sentrysoftware.wbem.javax.cim.UnsignedInteger64;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.Util;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT KEYVALUE (#PCDATA) ATTLIST KEYVALUE VALUETYPE (string | boolean |
- * numeric) "string" %CIMType; #IMPLIED
- */
-public class KeyValueNode extends AbstractScalarValueNode {
-
-	private CIMDataType iType;
-
-	private String iValueTypeStr;
-
-	private Object iValue;
-
-	/**
-	 * Ctor.
-	 */
-	public KeyValueNode() {
-		super(KEYVALUE);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iType = getCIMType(pAttribs, true);
-		this.iValue = null;
-		if (this.iType != null) {
-			if (this.iType.isArray()) throw new SAXException("KEYVALUE node cannot be array typed!");
-			return;
-		}
-		// let's see the VALUETYPE attribute
-		this.iValueTypeStr = pAttribs.getValue("VALUETYPE");
-		if (this.iValueTypeStr == null) this.iValueTypeStr = "string";
-	}
-
-	@Override
-	public void parseData(String pData) throws SAXException {
-		if (this.iType == null) {
-			setTypeAndValue(pData);
-		} else {
-			this.iValue = CIMObjectFactory.getObject(this.iType, pData);
-		}
-	}
-
-	/**
-	 * @param pNodeNameEnum
-	 */
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		throw new SAXException("KEYVALUE node cannot have any child nodes!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// no child
-	}
-
-	@Override
-	public void testCompletness() {
-	// nothing to do
-	}
-
-	public Object getValue() {
-		/*
-		 * null key values are not allowed, empty #PCDATA means empty String
-		 */
-		return this.iValue == null ? "" : this.iValue;
-	}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-	private void setTypeAndValue(String pValue) throws SAXException {
-		// determine iType from iValueTypeStr if required
-		if (this.iType != null) return;
-
-		if (this.iValueTypeStr.equals("numeric")) {
-			if (!setUInt64(pValue) && !setSInt64(pValue) && !setReal64(pValue)) throw new SAXException(
-					"Unparseable \"number\" value in " + getNodeName() + " node: " + pValue + "!");
-		} else if (this.iValueTypeStr.equals(MOF.DT_STR)) {
-			if (!setDTAbsolute(pValue) && !setDTInterval(pValue)) {
-				this.iValue = pValue;
-				this.iType = CIMDataType.STRING_T;
-			}
-		} else if (this.iValueTypeStr.equals(MOF.DT_BOOL)) {
-			if (!setBoolean(pValue)) throw new SAXException("Unparseable \"boolean\" value in "
-					+ getNodeName() + " node: " + pValue + "!");
-		} else {
-			throw new SAXException("KEYVALUE node's VALUETYPE attribute must be " + MOF.DT_STR
-					+ ", " + MOF.DT_BOOL + " or numeric! " + pValue + " is not allowed!");
-		}
-	}
-
-	private boolean setUInt64(String pValue) {
-		try {
-			this.iValue = new UnsignedInteger64(pValue);
-		} catch (NumberFormatException e) {
-			return false;
-		}
-		this.iType = CIMDataType.UINT64_T;
-		return true;
-	}
-
-	private boolean setSInt64(String pValue) {
-		try {
-			this.iValue = new Long(pValue);
-		} catch (NumberFormatException e) {
-			return false;
-		}
-		this.iType = CIMDataType.SINT64_T;
-		return true;
-	}
-
-	private boolean setReal64(String pValue) {
-		try {
-			if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
-				if (Util.isBadDoubleString(pValue)) return false;
-			}
-			this.iValue = new Double(pValue);
-		} catch (NumberFormatException e) {
-			return false;
-		}
-		this.iType = CIMDataType.REAL64_T;
-		return true;
-	}
-
-	private boolean setBoolean(String pValue) {
-		this.iValue = Boolean.valueOf(pValue);
-		this.iType = CIMDataType.BOOLEAN_T;
-		return true;
-	}
-
-	private boolean setDTAbsolute(String pValue) {
-		try {
-			this.iValue = new CIMDateTimeAbsolute(pValue);
-		} catch (IllegalArgumentException e) {
-			return false;
-		}
-		this.iType = CIMDataType.DATETIME_T;
-		return true;
-	}
-
-	private boolean setDTInterval(String pValue) {
-		try {
-			this.iValue = new CIMDateTimeInterval(pValue);
-		} catch (IllegalArgumentException e) {
-			return false;
-		}
-		this.iType = CIMDataType.DATETIME_T;
-		return true;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1769504	  2007-08-08  ebak         Type identification for VALUETYPE="numeric"
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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
+ * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
+ * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
+ * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
+ *    2683    2013-10-07  blaschke-oss KEYVALUE VALUETYPE optional, "string" default
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
+import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
+import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.metricshub.wbem.javax.cim.UnsignedInteger64;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT KEYVALUE (#PCDATA) ATTLIST KEYVALUE VALUETYPE (string | boolean |
+ * numeric) "string" %CIMType; #IMPLIED
+ */
+public class KeyValueNode extends AbstractScalarValueNode {
+
+	private CIMDataType iType;
+
+	private String iValueTypeStr;
+
+	private Object iValue;
+
+	/**
+	 * Ctor.
+	 */
+	public KeyValueNode() {
+		super(KEYVALUE);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iType = getCIMType(pAttribs, true);
+		this.iValue = null;
+		if (this.iType != null) {
+			if (this.iType.isArray()) throw new SAXException("KEYVALUE node cannot be array typed!");
+			return;
+		}
+		// let's see the VALUETYPE attribute
+		this.iValueTypeStr = pAttribs.getValue("VALUETYPE");
+		if (this.iValueTypeStr == null) this.iValueTypeStr = "string";
+	}
+
+	@Override
+	public void parseData(String pData) throws SAXException {
+		if (this.iType == null) {
+			setTypeAndValue(pData);
+		} else {
+			this.iValue = CIMObjectFactory.getObject(this.iType, pData);
+		}
+	}
+
+	/**
+	 * @param pNodeNameEnum
+	 */
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		throw new SAXException("KEYVALUE node cannot have any child nodes!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// no child
+	}
+
+	@Override
+	public void testCompletness() {
+	// nothing to do
+	}
+
+	public Object getValue() {
+		/*
+		 * null key values are not allowed, empty #PCDATA means empty String
+		 */
+		return this.iValue == null ? "" : this.iValue;
+	}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+	private void setTypeAndValue(String pValue) throws SAXException {
+		// determine iType from iValueTypeStr if required
+		if (this.iType != null) return;
+
+		if (this.iValueTypeStr.equals("numeric")) {
+			if (!setUInt64(pValue) && !setSInt64(pValue) && !setReal64(pValue)) throw new SAXException(
+					"Unparseable \"number\" value in " + getNodeName() + " node: " + pValue + "!");
+		} else if (this.iValueTypeStr.equals(MOF.DT_STR)) {
+			if (!setDTAbsolute(pValue) && !setDTInterval(pValue)) {
+				this.iValue = pValue;
+				this.iType = CIMDataType.STRING_T;
+			}
+		} else if (this.iValueTypeStr.equals(MOF.DT_BOOL)) {
+			if (!setBoolean(pValue)) throw new SAXException("Unparseable \"boolean\" value in "
+					+ getNodeName() + " node: " + pValue + "!");
+		} else {
+			throw new SAXException("KEYVALUE node's VALUETYPE attribute must be " + MOF.DT_STR
+					+ ", " + MOF.DT_BOOL + " or numeric! " + pValue + " is not allowed!");
+		}
+	}
+
+	private boolean setUInt64(String pValue) {
+		try {
+			this.iValue = new UnsignedInteger64(pValue);
+		} catch (NumberFormatException e) {
+			return false;
+		}
+		this.iType = CIMDataType.UINT64_T;
+		return true;
+	}
+
+	private boolean setSInt64(String pValue) {
+		try {
+			this.iValue = new Long(pValue);
+		} catch (NumberFormatException e) {
+			return false;
+		}
+		this.iType = CIMDataType.SINT64_T;
+		return true;
+	}
+
+	private boolean setReal64(String pValue) {
+		try {
+			if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
+				if (Util.isBadDoubleString(pValue)) return false;
+			}
+			this.iValue = new Double(pValue);
+		} catch (NumberFormatException e) {
+			return false;
+		}
+		this.iType = CIMDataType.REAL64_T;
+		return true;
+	}
+
+	private boolean setBoolean(String pValue) {
+		this.iValue = Boolean.valueOf(pValue);
+		this.iType = CIMDataType.BOOLEAN_T;
+		return true;
+	}
+
+	private boolean setDTAbsolute(String pValue) {
+		try {
+			this.iValue = new CIMDateTimeAbsolute(pValue);
+		} catch (IllegalArgumentException e) {
+			return false;
+		}
+		this.iType = CIMDataType.DATETIME_T;
+		return true;
+	}
+
+	private boolean setDTInterval(String pValue) {
+		try {
+			this.iValue = new CIMDateTimeInterval(pValue);
+		} catch (IllegalArgumentException e) {
+			return false;
+		}
+		this.iType = CIMDataType.DATETIME_T;
+		return true;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java
index 3aa8a67..bf0fbb3 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java
@@ -1,136 +1,133 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2974884    2010-04-20  blaschke-oss Exception when attaching 2 CDRoms with invoke method
- * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT LOCALCLASSPATH (LOCALNAMESPACEPATH, CLASSNAME)
- */
-public class LocalClassPathNode extends AbstractObjectPathNode {
-
-	// LOCALNAMESPACEPATH
-	private boolean iHasLocalNameSpacePath, iHasClassName;
-
-	private String iNameSpaceStr;
-
-	// CLASSNAME
-	private String iClassNameStr;
-
-	// ---
-	private CIMObjectPath iLocalPath;
-
-	/**
-	 * Ctor.
-	 */
-	public LocalClassPathNode() {
-		super(LOCALCLASSPATH);
-	}
-
-	/**
-	 * @param pAttribs
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iLocalPath = pSession.getDefLocalPath();
-		this.iHasLocalNameSpacePath = this.iHasClassName = false;
-		this.iNameSpaceStr = this.iClassNameStr = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == LOCALNAMESPACEPATH) {
-			if (this.iHasLocalNameSpacePath) throw new SAXException(
-					"LOCALCLASSPATH node already has a LOCALNAMESPACEPATH child node!");
-		} else if (pNodeNameEnum == CLASSNAME) {
-			if (this.iHasClassName) throw new SAXException(
-					"LOCALCLASSPATH node already has a CLASSNAME child node!");
-		} else throw new SAXException("LOCALCLASSPATH node cannot have " + pNodeNameEnum
-				+ " child node!"
-				+ " It can have LOCALNAMESPACEPATH and CLASSNAME child nodes only!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof LocalNameSpacePathNode) {
-			this.iNameSpaceStr = ((LocalNameSpacePathNode) pChild).getNameSpace();
-			this.iHasLocalNameSpacePath = true;
-		} else {
-			this.iClassNameStr = ((ClassNameNode) pChild).getClassName();
-			this.iHasClassName = true;
-		}
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (!this.iHasLocalNameSpacePath) throw new SAXException(
-				"LOCALNAMESPACE child node is mandatory for LOCALCLASSPATH node!");
-		if (!this.iHasClassName) throw new SAXException(
-				"CLASSNAME child node is mandatory for LOCALCLASSPATH node!");
-	}
-
-	public CIMObjectPath getCIMObjectPath() {
-		return LocalPathBuilder.build(this.iLocalPath, this.iClassNameStr, this.iNameSpaceStr);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2974884    2010-04-20  blaschke-oss Exception when attaching 2 CDRoms with invoke method
+ * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT LOCALCLASSPATH (LOCALNAMESPACEPATH, CLASSNAME)
+ */
+public class LocalClassPathNode extends AbstractObjectPathNode {
+
+	// LOCALNAMESPACEPATH
+	private boolean iHasLocalNameSpacePath, iHasClassName;
+
+	private String iNameSpaceStr;
+
+	// CLASSNAME
+	private String iClassNameStr;
+
+	// ---
+	private CIMObjectPath iLocalPath;
+
+	/**
+	 * Ctor.
+	 */
+	public LocalClassPathNode() {
+		super(LOCALCLASSPATH);
+	}
+
+	/**
+	 * @param pAttribs
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iLocalPath = pSession.getDefLocalPath();
+		this.iHasLocalNameSpacePath = this.iHasClassName = false;
+		this.iNameSpaceStr = this.iClassNameStr = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == LOCALNAMESPACEPATH) {
+			if (this.iHasLocalNameSpacePath) throw new SAXException(
+					"LOCALCLASSPATH node already has a LOCALNAMESPACEPATH child node!");
+		} else if (pNodeNameEnum == CLASSNAME) {
+			if (this.iHasClassName) throw new SAXException(
+					"LOCALCLASSPATH node already has a CLASSNAME child node!");
+		} else throw new SAXException("LOCALCLASSPATH node cannot have " + pNodeNameEnum
+				+ " child node!"
+				+ " It can have LOCALNAMESPACEPATH and CLASSNAME child nodes only!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof LocalNameSpacePathNode) {
+			this.iNameSpaceStr = ((LocalNameSpacePathNode) pChild).getNameSpace();
+			this.iHasLocalNameSpacePath = true;
+		} else {
+			this.iClassNameStr = ((ClassNameNode) pChild).getClassName();
+			this.iHasClassName = true;
+		}
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (!this.iHasLocalNameSpacePath) throw new SAXException(
+				"LOCALNAMESPACE child node is mandatory for LOCALCLASSPATH node!");
+		if (!this.iHasClassName) throw new SAXException(
+				"CLASSNAME child node is mandatory for LOCALCLASSPATH node!");
+	}
+
+	public CIMObjectPath getCIMObjectPath() {
+		return LocalPathBuilder.build(this.iLocalPath, this.iClassNameStr, this.iNameSpaceStr);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java
index 0624ef6..f4eb1d4 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java
@@ -1,145 +1,142 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT LOCALINSTANCEPATH (LOCALNAMESPACEPATH, INSTANCENAME)
- */
-public class LocalInstancePathNode extends AbstractObjectPathNode {
-
-	// LOCALNAMESPACEPATH
-	private boolean iHasLocalNameSpacePath;
-
-	private String iNameSpaceStr;
-
-	// INSTANCENAME
-	private boolean iHasInstanceName;
-
-	private String iClassNameStr;
-
-	private CIMProperty[] iKeys;
-
-	// base localpath
-	private CIMObjectPath iLocalPath;
-
-	/**
-	 * Ctor.
-	 */
-	public LocalInstancePathNode() {
-		super(LOCALINSTANCEPATH);
-	}
-
-	/**
-	 * @param pAttribs
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iLocalPath = pSession.getDefLocalPath();
-		this.iHasLocalNameSpacePath = this.iHasInstanceName = false;
-		this.iNameSpaceStr = this.iClassNameStr = null;
-		this.iKeys = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == LOCALNAMESPACEPATH) {
-			if (this.iHasLocalNameSpacePath) throw new SAXException(getNodeName()
-					+ " node can have only one LOCALNAMESPACEPATH child node!");
-		} else if (pNodeNameEnum == INSTANCENAME) {
-			if (this.iHasInstanceName) throw new SAXException(getNodeName()
-					+ " node can have only one INSTANCENAME child node!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof LocalNameSpacePathNode) {
-			this.iHasLocalNameSpacePath = true;
-			this.iNameSpaceStr = ((LocalNameSpacePathNode) pChild).getNameSpace();
-		} else {
-			this.iHasInstanceName = true;
-			InstanceNameNode instNameNode = (InstanceNameNode) pChild;
-			this.iClassNameStr = instNameNode.getClassName();
-			this.iKeys = instNameNode.getKeys();
-		}
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (!this.iHasLocalNameSpacePath) throw new SAXException(getNodeName()
-				+ " node must have a LOCALNAMESPACEPATH child node!");
-		if (!this.iHasInstanceName) throw new SAXException(getNodeName()
-				+ " node must have a INSTANCENAME child node!");
-	}
-
-	public CIMObjectPath getCIMObjectPath() {
-		// CIMObjectPath(String objectName, String namespace, CIMProperty[]
-		// keys)
-		return LocalPathBuilder.build(this.iLocalPath, this.iClassNameStr, this.iNameSpaceStr,
-				this.iKeys);
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT LOCALINSTANCEPATH (LOCALNAMESPACEPATH, INSTANCENAME)
+ */
+public class LocalInstancePathNode extends AbstractObjectPathNode {
+
+	// LOCALNAMESPACEPATH
+	private boolean iHasLocalNameSpacePath;
+
+	private String iNameSpaceStr;
+
+	// INSTANCENAME
+	private boolean iHasInstanceName;
+
+	private String iClassNameStr;
+
+	private CIMProperty[] iKeys;
+
+	// base localpath
+	private CIMObjectPath iLocalPath;
+
+	/**
+	 * Ctor.
+	 */
+	public LocalInstancePathNode() {
+		super(LOCALINSTANCEPATH);
+	}
+
+	/**
+	 * @param pAttribs
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iLocalPath = pSession.getDefLocalPath();
+		this.iHasLocalNameSpacePath = this.iHasInstanceName = false;
+		this.iNameSpaceStr = this.iClassNameStr = null;
+		this.iKeys = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == LOCALNAMESPACEPATH) {
+			if (this.iHasLocalNameSpacePath) throw new SAXException(getNodeName()
+					+ " node can have only one LOCALNAMESPACEPATH child node!");
+		} else if (pNodeNameEnum == INSTANCENAME) {
+			if (this.iHasInstanceName) throw new SAXException(getNodeName()
+					+ " node can have only one INSTANCENAME child node!");
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof LocalNameSpacePathNode) {
+			this.iHasLocalNameSpacePath = true;
+			this.iNameSpaceStr = ((LocalNameSpacePathNode) pChild).getNameSpace();
+		} else {
+			this.iHasInstanceName = true;
+			InstanceNameNode instNameNode = (InstanceNameNode) pChild;
+			this.iClassNameStr = instNameNode.getClassName();
+			this.iKeys = instNameNode.getKeys();
+		}
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (!this.iHasLocalNameSpacePath) throw new SAXException(getNodeName()
+				+ " node must have a LOCALNAMESPACEPATH child node!");
+		if (!this.iHasInstanceName) throw new SAXException(getNodeName()
+				+ " node must have a INSTANCENAME child node!");
+	}
+
+	public CIMObjectPath getCIMObjectPath() {
+		// CIMObjectPath(String objectName, String namespace, CIMProperty[]
+		// keys)
+		return LocalPathBuilder.build(this.iLocalPath, this.iClassNameStr, this.iNameSpaceStr,
+				this.iKeys);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java
index 1f6e362..4948b9d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java
@@ -1,141 +1,138 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
- *    2711    2013-11-13  blaschke-oss LOCALNAMESPACEPATH allows 0 NAMESPACE children
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT LOCALNAMESPACEPATH (NAMESPACE+)
- */
-public class LocalNameSpacePathNode extends AbstractPathNode {
-
-	private StringBuffer iNameSpaceStrBuf;
-
-	private String iNameSpaceStr;
-
-	private CIMObjectPath iNameSpacePath;
-
-	private CIMObjectPath iLocalPath;
-
-	/**
-	 * Ctor.
-	 */
-	public LocalNameSpacePathNode() {
-		super(LOCALNAMESPACEPATH);
-	}
-
-	/**
-	 * @param pAttribs
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iLocalPath = pSession.getDefLocalPath();
-		this.iNameSpaceStrBuf = null;
-		this.iNameSpaceStr = null;
-		this.iNameSpacePath = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != NAMESPACE) throw new SAXException(getNodeName()
-				+ " node can have NAMESPACE child node only! " + pNodeNameEnum
-				+ " child node is invalid!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		String nsStr = ((NameSpaceNode) pChild).getNameSpace();
-		if (this.iNameSpaceStrBuf == null) {
-			this.iNameSpaceStrBuf = new StringBuffer(nsStr);
-		} else {
-			this.iNameSpaceStrBuf.append('/' + nsStr);
-		}
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iNameSpaceStrBuf == null) {
-			if (WBEMConfiguration.getGlobalConfiguration().allowEmptyLocalNameSpacePath()
-					&& this.iLocalPath != null && this.iLocalPath.getNamespace() != null) return;
-			throw new SAXException(getNodeName()
-					+ " node must have at least one NAMESPACE child node!");
-		}
-	}
-
-	/**
-	 * getNameSpace
-	 * 
-	 * @return String
-	 */
-	public String getNameSpace() {
-		if (this.iNameSpaceStr != null) return this.iNameSpaceStr;
-		return this.iNameSpaceStr = (this.iNameSpaceStrBuf == null ? this.iLocalPath.getNamespace()
-				: this.iNameSpaceStrBuf.toString());
-	}
-
-	public CIMObjectPath getCIMObjectPath() {
-		if (this.iNameSpacePath != null) return this.iNameSpacePath;
-		return this.iNameSpacePath = new CIMObjectPath(null, null, null, getNameSpace(), null, null);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ *    2711    2013-11-13  blaschke-oss LOCALNAMESPACEPATH allows 0 NAMESPACE children
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT LOCALNAMESPACEPATH (NAMESPACE+)
+ */
+public class LocalNameSpacePathNode extends AbstractPathNode {
+
+	private StringBuffer iNameSpaceStrBuf;
+
+	private String iNameSpaceStr;
+
+	private CIMObjectPath iNameSpacePath;
+
+	private CIMObjectPath iLocalPath;
+
+	/**
+	 * Ctor.
+	 */
+	public LocalNameSpacePathNode() {
+		super(LOCALNAMESPACEPATH);
+	}
+
+	/**
+	 * @param pAttribs
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iLocalPath = pSession.getDefLocalPath();
+		this.iNameSpaceStrBuf = null;
+		this.iNameSpaceStr = null;
+		this.iNameSpacePath = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != NAMESPACE) throw new SAXException(getNodeName()
+				+ " node can have NAMESPACE child node only! " + pNodeNameEnum
+				+ " child node is invalid!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		String nsStr = ((NameSpaceNode) pChild).getNameSpace();
+		if (this.iNameSpaceStrBuf == null) {
+			this.iNameSpaceStrBuf = new StringBuffer(nsStr);
+		} else {
+			this.iNameSpaceStrBuf.append('/' + nsStr);
+		}
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iNameSpaceStrBuf == null) {
+			if (WBEMConfiguration.getGlobalConfiguration().allowEmptyLocalNameSpacePath()
+					&& this.iLocalPath != null && this.iLocalPath.getNamespace() != null) return;
+			throw new SAXException(getNodeName()
+					+ " node must have at least one NAMESPACE child node!");
+		}
+	}
+
+	/**
+	 * getNameSpace
+	 * 
+	 * @return String
+	 */
+	public String getNameSpace() {
+		if (this.iNameSpaceStr != null) return this.iNameSpaceStr;
+		return this.iNameSpaceStr = (this.iNameSpaceStrBuf == null ? this.iLocalPath.getNamespace()
+				: this.iNameSpaceStrBuf.toString());
+	}
+
+	public CIMObjectPath getCIMObjectPath() {
+		if (this.iNameSpacePath != null) return this.iNameSpacePath;
+		return this.iNameSpacePath = new CIMObjectPath(null, null, null, getNameSpace(), null, null);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java
index aecabf6..94ea368 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java
@@ -1,136 +1,134 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT MESSAGE (SIMPLEREQ | MULTIREQ | SIMPLERSP | MULTIRSP | SIMPLEEXPREQ | MULTIEXPREQ |
- *    SIMPLEEXPRSP | MULTIEXPRSP)
- * ATTLIST MESSAGE
- *    ID CDATA #REQUIRED
- *    PROTOCOLVERSION CDATA #REQUIRED
- * 
      
- */
-public class MessageNode extends Node implements NonVolatileIf {
-
-	private String iID;
-
-	private String iProtocolVersion;
-
-	private AbstractMessageNode iAbstractMsgNode;
-
-	/**
-	 * Ctor.
-	 */
-	public MessageNode() {
-		super(MESSAGE);
-	}
-
-	public void addChild(Node pChild) {
-		this.iAbstractMsgNode = (AbstractMessageNode) pChild;
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iID = pAttribs.getValue("ID");
-		if (this.iID == null) throw new SAXException("ID attribute is mandatory for MESSAGE node!");
-		this.iProtocolVersion = pAttribs.getValue("PROTOCOLVERSION");
-		if (this.iProtocolVersion == null) throw new SAXException(
-				"PROTOCOLVERSION attribute is mandatory for MESSAGE node!");
-		this.iAbstractMsgNode = null;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	private static final String[] ALLOWED_CHILDREN = { SIMPLEREQ, MULTIREQ, SIMPLERSP, MULTIRSP,
-			SIMPLEEXPREQ, MULTIEXPREQ, SIMPLEEXPRSP, MULTIEXPRSP };
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iAbstractMsgNode != null) throw new SAXException(
-				"MESSAGE node can have only one child node!");
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (pNodeNameEnum == ALLOWED_CHILDREN[i]) return;
-		throw new SAXException("MESSAGE node cannot have " + pNodeNameEnum + " child node!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// nothing to do
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iAbstractMsgNode == null) throw new SAXException(
-				"MESSAGE node must have a child node!");
-	}
-
-	/**
-	 * getAbstractMessageNode
-	 * 
-	 * @return AbstractMessageNode
-	 */
-	public AbstractMessageNode getAbstractMessageNode() {
-		return this.iAbstractMsgNode;
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT MESSAGE (SIMPLEREQ | MULTIREQ | SIMPLERSP | MULTIRSP | SIMPLEEXPREQ | MULTIEXPREQ |
+ *    SIMPLEEXPRSP | MULTIEXPRSP)
+ * ATTLIST MESSAGE
+ *    ID CDATA #REQUIRED
+ *    PROTOCOLVERSION CDATA #REQUIRED
+ * 
      
+ */
+public class MessageNode extends Node implements NonVolatileIf {
+
+	private String iID;
+
+	private String iProtocolVersion;
+
+	private AbstractMessageNode iAbstractMsgNode;
+
+	/**
+	 * Ctor.
+	 */
+	public MessageNode() {
+		super(MESSAGE);
+	}
+
+	public void addChild(Node pChild) {
+		this.iAbstractMsgNode = (AbstractMessageNode) pChild;
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iID = pAttribs.getValue("ID");
+		if (this.iID == null) throw new SAXException("ID attribute is mandatory for MESSAGE node!");
+		this.iProtocolVersion = pAttribs.getValue("PROTOCOLVERSION");
+		if (this.iProtocolVersion == null) throw new SAXException(
+				"PROTOCOLVERSION attribute is mandatory for MESSAGE node!");
+		this.iAbstractMsgNode = null;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	private static final String[] ALLOWED_CHILDREN = { SIMPLEREQ, MULTIREQ, SIMPLERSP, MULTIRSP,
+			SIMPLEEXPREQ, MULTIEXPREQ, SIMPLEEXPRSP, MULTIEXPRSP };
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iAbstractMsgNode != null) throw new SAXException(
+				"MESSAGE node can have only one child node!");
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
+			if (pNodeNameEnum == ALLOWED_CHILDREN[i]) return;
+		throw new SAXException("MESSAGE node cannot have " + pNodeNameEnum + " child node!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// nothing to do
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iAbstractMsgNode == null) throw new SAXException(
+				"MESSAGE node must have a child node!");
+	}
+
+	/**
+	 * getAbstractMessageNode
+	 * 
+	 * @return AbstractMessageNode
+	 */
+	public AbstractMessageNode getAbstractMessageNode() {
+		return this.iAbstractMsgNode;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java
index a4c8963..cdae094 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java
@@ -1,79 +1,77 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- *    2682    2013-10-02  blaschke-oss (I)MethodCallNode allows no LOCAL*PATH
- *    2690    2013-10-11  blaschke-oss Remove RESPONSEDESTINATION support
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT METHODCALL ((LOCALINSTANCEPATH | LOCALCLASSPATH), PARAMVALUE*)
- * ATTLIST METHODCALL %CIMName;
- */
-public class MethodCallNode extends AbstractMethodCallNode {
-
-	/**
-	 * Ctor.
-	 */
-	public MethodCallNode() {
-		super(METHODCALL);
-	}
-
-	@Override
-	protected void testSpecChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == LOCALCLASSPATH || pNodeNameEnum == LOCALINSTANCEPATH) {
-			if (this.iPath != null) throw new SAXException(getNodeName()
-					+ " node can have only one LOCALINSTANCEPATH or LOCALCLASSPATH child node!");
-		} else if (pNodeNameEnum != PARAMVALUE) throw new SAXException(getNodeName()
-				+ " node cannot have " + pNodeNameEnum + " child node!");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iPath == null) throw new SAXException(
-				"METHODCALL node must have a LOCALINSTANCEPATH or LOCALCLASSPATH child node!");
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ *    2682    2013-10-02  blaschke-oss (I)MethodCallNode allows no LOCAL*PATH
+ *    2690    2013-10-11  blaschke-oss Remove RESPONSEDESTINATION support
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT METHODCALL ((LOCALINSTANCEPATH | LOCALCLASSPATH), PARAMVALUE*)
+ * ATTLIST METHODCALL %CIMName;
+ */
+public class MethodCallNode extends AbstractMethodCallNode {
+
+	/**
+	 * Ctor.
+	 */
+	public MethodCallNode() {
+		super(METHODCALL);
+	}
+
+	@Override
+	protected void testSpecChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == LOCALCLASSPATH || pNodeNameEnum == LOCALINSTANCEPATH) {
+			if (this.iPath != null) throw new SAXException(getNodeName()
+					+ " node can have only one LOCALINSTANCEPATH or LOCALCLASSPATH child node!");
+		} else if (pNodeNameEnum != PARAMVALUE) throw new SAXException(getNodeName()
+				+ " node cannot have " + pNodeNameEnum + " child node!");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iPath == null) throw new SAXException(
+				"METHODCALL node must have a LOCALINSTANCEPATH or LOCALCLASSPATH child node!");
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java
index e9979f1..bb07d2d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java
@@ -1,178 +1,175 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
- *    2703    2013-11-08  blaschke-oss MethodNode should not require TYPE attribute
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMMethod;
-import org.sentrysoftware.wbem.javax.cim.CIMParameter;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * 
- * ELEMENT METHOD (QUALIFIER*, (PARAMETER | PARAMETER.REFERENCE | PARAMETER.ARRAY | PARAMETER.REFARRAY)*)
- * ATTLIST METHOD
- *   %CIMName;
- *   %CIMType;              #IMPLIED
- *   %ClassOrigin;
- *   %Propagated;>
- * 
      
- */
-public class MethodNode extends Node {
-
-	private String iName;
-
-	private CIMDataType iType;
-
-	private String iClassOrigin;
-
-	private boolean iPropagated;
-
-	private QualifiedNodeHandler iQualiHandler;
-
-	private EmbObjHandler iEmbObjHandler;
-
-	private SAXSession iSession;
-
-	/**
-	 * PARAMETER.XXX*, AbstractParameterNode*
-	 */
-	private ArrayList> iCIMParamAL;
-
-	/**
-	 * Ctor.
-	 */
-	public MethodNode() {
-		super(METHOD);
-	}
-
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iSession = pSession;
-		this.iQualiHandler = QualifiedNodeHandler.init(this.iQualiHandler);
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				this.iSession, this.iQualiHandler, true);
-
-		if (this.iCIMParamAL != null) this.iCIMParamAL.clear();
-
-		this.iName = getCIMName(pAttribs);
-
-		this.iType = getCIMType(pAttribs, true);
-		if (this.iType != null && this.iType.isArray()) throw new SAXException(
-				"METHOD node's TYPE cannot be an array!");
-		this.iClassOrigin = getClassOrigin(pAttribs);
-		this.iPropagated = getPropagated(pAttribs);
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PARAMETER, PARAMETER_REFERENCE,
-			PARAMETER_ARRAY, PARAMETER_REFARRAY };
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (pNodeNameEnum.equalsIgnoreCase(ALLOWED_CHILDREN[i])) return;
-		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (this.iQualiHandler.addQualifierNode(pChild)) return;
-		if (this.iCIMParamAL == null) this.iCIMParamAL = new ArrayList>();
-		this.iCIMParamAL.add(((AbstractParameterNode) pChild).getCIMParameter());
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		this.iType = this.iEmbObjHandler.getType();
-		if (this.iType != null && this.iType.isArray()) throw new SAXException(
-				"METHOD node's TYPE attribute cannot be an array!");
-	}
-
-	/**
-	 * getCIMMethod
-	 * 
-	 * @return CIMMethod
-	 */
-	public CIMMethod getCIMMethod() {
-		/*
-		 * CIMMethod( String name, CIMDataType type, CIMQualifier[] qualifiers,
-		 * CIMParameter[] parameters, boolean propagated, String originClass );
-		 * 
-		 * EmbeddedObject qualifier mustn't be removed. Return type cannot be
-		 * changed.
-		 * 
-		 * The situation changed by the introduction of the strict embedded
-		 * object type parsing.
-		 */
-		return new CIMMethod(this.iName, this.iType, this.iQualiHandler
-				.getQualis(!this.iSession.strictEmbObjParsing()), this.iCIMParamAL == null ? null
-				: (CIMParameter[]) this.iCIMParamAL.toArray(EMPTY_PA), this.iPropagated,
-				this.iClassOrigin);
-	}
-
-	private static final CIMParameter[] EMPTY_PA = new CIMParameter[0];
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1848607    2007-12-11  ebak         Strict EmbeddedObject types
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ *    2703    2013-11-08  blaschke-oss MethodNode should not require TYPE attribute
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMMethod;
+import org.metricshub.wbem.javax.cim.CIMParameter;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * 
+ * ELEMENT METHOD (QUALIFIER*, (PARAMETER | PARAMETER.REFERENCE | PARAMETER.ARRAY | PARAMETER.REFARRAY)*)
+ * ATTLIST METHOD
+ *   %CIMName;
+ *   %CIMType;              #IMPLIED
+ *   %ClassOrigin;
+ *   %Propagated;>
+ * 
      
+ */
+public class MethodNode extends Node {
+
+	private String iName;
+
+	private CIMDataType iType;
+
+	private String iClassOrigin;
+
+	private boolean iPropagated;
+
+	private QualifiedNodeHandler iQualiHandler;
+
+	private EmbObjHandler iEmbObjHandler;
+
+	private SAXSession iSession;
+
+	/**
+	 * PARAMETER.XXX*, AbstractParameterNode*
+	 */
+	private ArrayList> iCIMParamAL;
+
+	/**
+	 * Ctor.
+	 */
+	public MethodNode() {
+		super(METHOD);
+	}
+
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iSession = pSession;
+		this.iQualiHandler = QualifiedNodeHandler.init(this.iQualiHandler);
+		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
+				this.iSession, this.iQualiHandler, true);
+
+		if (this.iCIMParamAL != null) this.iCIMParamAL.clear();
+
+		this.iName = getCIMName(pAttribs);
+
+		this.iType = getCIMType(pAttribs, true);
+		if (this.iType != null && this.iType.isArray()) throw new SAXException(
+				"METHOD node's TYPE cannot be an array!");
+		this.iClassOrigin = getClassOrigin(pAttribs);
+		this.iPropagated = getPropagated(pAttribs);
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PARAMETER, PARAMETER_REFERENCE,
+			PARAMETER_ARRAY, PARAMETER_REFARRAY };
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
+			if (pNodeNameEnum.equalsIgnoreCase(ALLOWED_CHILDREN[i])) return;
+		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (this.iQualiHandler.addQualifierNode(pChild)) return;
+		if (this.iCIMParamAL == null) this.iCIMParamAL = new ArrayList>();
+		this.iCIMParamAL.add(((AbstractParameterNode) pChild).getCIMParameter());
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		this.iType = this.iEmbObjHandler.getType();
+		if (this.iType != null && this.iType.isArray()) throw new SAXException(
+				"METHOD node's TYPE attribute cannot be an array!");
+	}
+
+	/**
+	 * getCIMMethod
+	 * 
+	 * @return CIMMethod
+	 */
+	public CIMMethod getCIMMethod() {
+		/*
+		 * CIMMethod( String name, CIMDataType type, CIMQualifier[] qualifiers,
+		 * CIMParameter[] parameters, boolean propagated, String originClass );
+		 * 
+		 * EmbeddedObject qualifier mustn't be removed. Return type cannot be
+		 * changed.
+		 * 
+		 * The situation changed by the introduction of the strict embedded
+		 * object type parsing.
+		 */
+		return new CIMMethod(this.iName, this.iType, this.iQualiHandler
+				.getQualis(!this.iSession.strictEmbObjParsing()), this.iCIMParamAL == null ? null
+				: (CIMParameter[]) this.iCIMParamAL.toArray(EMPTY_PA), this.iPropagated,
+				this.iClassOrigin);
+	}
+
+	private static final CIMParameter[] EMPTY_PA = new CIMParameter[0];
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java
index b3736b9..b74a306 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java
@@ -1,200 +1,197 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- *    2697    2012-10-30  blaschke-oss (I)MethodResponseNode allows ERROR with PARAMVALUE
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT METHODRESPONSE (ERROR|(RETURNVALUE?,PARAMVALUE*))
- * ATTLIST METHODRESPONSE
- *   %CIMName;
- * 
      
- */
-public class MethodResponseNode extends Node implements ErrorIf, RetValPipeIf, NonVolatileIf {
-
-	private String iName;
-
-	private CIMError iError;
-
-	private Object iRetVal;
-
-	private ArrayList> iCIMArgAL;
-
-	private boolean iHasError;
-
-	private boolean iHasRetVal;
-
-	/**
-	 * Ctor.
-	 */
-	public MethodResponseNode() {
-		super(METHODRESPONSE);
-	}
-
-	/**
-	 * @param pChild
-	 */
-	public void addChild(Node pChild) {
-	// nothing to do
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iName = getCIMName(pAttribs);
-		this.iError = null;
-		this.iRetVal = null;
-		if (this.iCIMArgAL != null) this.iCIMArgAL.clear();
-		this.iHasError = false;
-		this.iHasRetVal = false;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == ERROR) {
-			String ownedNodeName;
-			if (this.iHasRetVal) ownedNodeName = RETURNVALUE;
-			else if (this.iHasError) ownedNodeName = ERROR;
-			else if (this.iCIMArgAL != null && this.iCIMArgAL.size() > 0) ownedNodeName = PARAMVALUE;
-			else ownedNodeName = null;
-			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has a " + ownedNodeName + " child node!");
-		} else if (pNodeNameEnum == RETURNVALUE) {
-			String ownedNodeName;
-			if (this.iHasRetVal) ownedNodeName = RETURNVALUE;
-			else if (this.iHasError) ownedNodeName = ERROR;
-			else ownedNodeName = null;
-			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has a " + ownedNodeName + " child node!");
-		} else if (pNodeNameEnum == PARAMVALUE) {
-			if (this.iHasError) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has an ERROR child node!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof ErrorNode) {
-			this.iHasError = true;
-			this.iError = ((ErrorNode) pChild).getCIMError();
-		} else if (pChild instanceof ReturnValueNode) {
-			this.iHasRetVal = true;
-			this.iRetVal = ((ReturnValueNode) pChild).getValue();
-		} else if (pChild instanceof ParamValueNode) {
-			if (this.iCIMArgAL == null) this.iCIMArgAL = new ArrayList>();
-			this.iCIMArgAL.add(((ParamValueNode) pChild).getCIMArgument());
-		}
-	}
-
-	@Override
-	public void testCompletness() {
-	// no mandatory child
-	}
-
-	public CIMError getCIMError() {
-		return this.iError;
-	}
-
-	private static final CIMArgument[] EMPTY_ARG_A = new CIMArgument[0];
-
-	/**
-	 * getCIMArguments : returns the array of parsed parameters and their values
-	 * : String name, CIMDataType type, Object value
-	 * 
-	 * @return CIMArgument<?>[]
-	 */
-	public CIMArgument[] getCIMArguments() {
-		if (this.iCIMArgAL == null || this.iCIMArgAL.size() == 0) return null;
-		return this.iCIMArgAL.toArray(EMPTY_ARG_A);
-	}
-
-	public int getReturnValueCount() {
-		return this.iRetVal == null ? 0 : 1;
-	}
-
-	public Object readReturnValue() {
-		Object val = this.iRetVal;
-		this.iRetVal = null;
-		return val;
-	}
-
-	/**
-	 * getName
-	 * 
-	 * @return String
-	 */
-	public String getName() {
-		return this.iName;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ *    2697    2012-10-30  blaschke-oss (I)MethodResponseNode allows ERROR with PARAMVALUE
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT METHODRESPONSE (ERROR|(RETURNVALUE?,PARAMVALUE*))
+ * ATTLIST METHODRESPONSE
+ *   %CIMName;
+ * 
      
+ */
+public class MethodResponseNode extends Node implements ErrorIf, RetValPipeIf, NonVolatileIf {
+
+	private String iName;
+
+	private CIMError iError;
+
+	private Object iRetVal;
+
+	private ArrayList> iCIMArgAL;
+
+	private boolean iHasError;
+
+	private boolean iHasRetVal;
+
+	/**
+	 * Ctor.
+	 */
+	public MethodResponseNode() {
+		super(METHODRESPONSE);
+	}
+
+	/**
+	 * @param pChild
+	 */
+	public void addChild(Node pChild) {
+	// nothing to do
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iName = getCIMName(pAttribs);
+		this.iError = null;
+		this.iRetVal = null;
+		if (this.iCIMArgAL != null) this.iCIMArgAL.clear();
+		this.iHasError = false;
+		this.iHasRetVal = false;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == ERROR) {
+			String ownedNodeName;
+			if (this.iHasRetVal) ownedNodeName = RETURNVALUE;
+			else if (this.iHasError) ownedNodeName = ERROR;
+			else if (this.iCIMArgAL != null && this.iCIMArgAL.size() > 0) ownedNodeName = PARAMVALUE;
+			else ownedNodeName = null;
+			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
+					+ " child node is invalid for " + getNodeName()
+					+ " node, since it already has a " + ownedNodeName + " child node!");
+		} else if (pNodeNameEnum == RETURNVALUE) {
+			String ownedNodeName;
+			if (this.iHasRetVal) ownedNodeName = RETURNVALUE;
+			else if (this.iHasError) ownedNodeName = ERROR;
+			else ownedNodeName = null;
+			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
+					+ " child node is invalid for " + getNodeName()
+					+ " node, since it already has a " + ownedNodeName + " child node!");
+		} else if (pNodeNameEnum == PARAMVALUE) {
+			if (this.iHasError) throw new SAXException(pNodeNameEnum
+					+ " child node is invalid for " + getNodeName()
+					+ " node, since it already has an ERROR child node!");
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof ErrorNode) {
+			this.iHasError = true;
+			this.iError = ((ErrorNode) pChild).getCIMError();
+		} else if (pChild instanceof ReturnValueNode) {
+			this.iHasRetVal = true;
+			this.iRetVal = ((ReturnValueNode) pChild).getValue();
+		} else if (pChild instanceof ParamValueNode) {
+			if (this.iCIMArgAL == null) this.iCIMArgAL = new ArrayList>();
+			this.iCIMArgAL.add(((ParamValueNode) pChild).getCIMArgument());
+		}
+	}
+
+	@Override
+	public void testCompletness() {
+	// no mandatory child
+	}
+
+	public CIMError getCIMError() {
+		return this.iError;
+	}
+
+	private static final CIMArgument[] EMPTY_ARG_A = new CIMArgument[0];
+
+	/**
+	 * getCIMArguments : returns the array of parsed parameters and their values
+	 * : String name, CIMDataType type, Object value
+	 * 
+	 * @return CIMArgument<?>[]
+	 */
+	public CIMArgument[] getCIMArguments() {
+		if (this.iCIMArgAL == null || this.iCIMArgAL.size() == 0) return null;
+		return this.iCIMArgAL.toArray(EMPTY_ARG_A);
+	}
+
+	public int getReturnValueCount() {
+		return this.iRetVal == null ? 0 : 1;
+	}
+
+	public Object readReturnValue() {
+		Object val = this.iRetVal;
+		this.iRetVal = null;
+		return val;
+	}
+
+	/**
+	 * getName
+	 * 
+	 * @return String
+	 */
+	public String getName() {
+		return this.iName;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java
index 2578cdd..c9087f9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java
@@ -1,105 +1,103 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT MULTIEXPREQ (SIMPLEEXPREQ, SIMPLEEXPREQ+)
- */
-public class MultiExpReqNode extends AbstractMessageNode {
-
-	private ArrayList iSimpleExpReqAList;
-
-	/**
-	 * Ctor.
-	 */
-	public MultiExpReqNode() {
-		super(MULTIEXPREQ);
-	}
-
-	public void addChild(Node pChild) {
-		if (this.iSimpleExpReqAList == null) this.iSimpleExpReqAList = new ArrayList();
-		this.iSimpleExpReqAList.add(pChild);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		if (this.iSimpleExpReqAList != null) this.iSimpleExpReqAList.clear();
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != SIMPLEEXPREQ) throw new SAXException(
-				"MULTIEXPREQ node can have SIMPLEEXPREQ child nodes only! " + pNodeNameEnum
-						+ " child node is invalid!");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iSimpleExpReqAList == null || this.iSimpleExpReqAList.size() < 2) throw new SAXException(
-				"MULTIEXPREQ node must have at least two SIMPLEEXPREQ child nodes!");
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT MULTIEXPREQ (SIMPLEEXPREQ, SIMPLEEXPREQ+)
+ */
+public class MultiExpReqNode extends AbstractMessageNode {
+
+	private ArrayList iSimpleExpReqAList;
+
+	/**
+	 * Ctor.
+	 */
+	public MultiExpReqNode() {
+		super(MULTIEXPREQ);
+	}
+
+	public void addChild(Node pChild) {
+		if (this.iSimpleExpReqAList == null) this.iSimpleExpReqAList = new ArrayList();
+		this.iSimpleExpReqAList.add(pChild);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		if (this.iSimpleExpReqAList != null) this.iSimpleExpReqAList.clear();
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != SIMPLEEXPREQ) throw new SAXException(
+				"MULTIEXPREQ node can have SIMPLEEXPREQ child nodes only! " + pNodeNameEnum
+						+ " child node is invalid!");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iSimpleExpReqAList == null || this.iSimpleExpReqAList.size() < 2) throw new SAXException(
+				"MULTIEXPREQ node must have at least two SIMPLEEXPREQ child nodes!");
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java
index 662481c..8a08d4e 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java
@@ -1,106 +1,104 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT MULTIEXPRSP (SIMPLEEXPRSP, SIMPLEEXPRSP+)
- */
-public class MultiExpRspNode extends AbstractMessageNode {
-
-	private ArrayList iSimpleExpRspAList;
-
-	/**
-	 * Ctor.
-	 */
-	public MultiExpRspNode() {
-		super(MULTIEXPRSP);
-	}
-
-	public void addChild(Node pChild) {
-		if (this.iSimpleExpRspAList == null) this.iSimpleExpRspAList = new ArrayList();
-		this.iSimpleExpRspAList.add(pChild);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		if (this.iSimpleExpRspAList != null) this.iSimpleExpRspAList.clear();
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != SIMPLEEXPRSP) throw new SAXException(getNodeName()
-				+ " node can have SIMPLEEXPRSP child node only! " + pNodeNameEnum
-				+ " child node is invalid!");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iSimpleExpRspAList == null || this.iSimpleExpRspAList.size() < 2) throw new SAXException(
-				getNodeName() + " node must have at least two SIMPLEEXPRSP child nodes!");
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT MULTIEXPRSP (SIMPLEEXPRSP, SIMPLEEXPRSP+)
+ */
+public class MultiExpRspNode extends AbstractMessageNode {
+
+	private ArrayList iSimpleExpRspAList;
+
+	/**
+	 * Ctor.
+	 */
+	public MultiExpRspNode() {
+		super(MULTIEXPRSP);
+	}
+
+	public void addChild(Node pChild) {
+		if (this.iSimpleExpRspAList == null) this.iSimpleExpRspAList = new ArrayList();
+		this.iSimpleExpRspAList.add(pChild);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		if (this.iSimpleExpRspAList != null) this.iSimpleExpRspAList.clear();
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != SIMPLEEXPRSP) throw new SAXException(getNodeName()
+				+ " node can have SIMPLEEXPRSP child node only! " + pNodeNameEnum
+				+ " child node is invalid!");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iSimpleExpRspAList == null || this.iSimpleExpRspAList.size() < 2) throw new SAXException(
+				getNodeName() + " node must have at least two SIMPLEEXPRSP child nodes!");
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java
index 903bcd2..960d1c6 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java
@@ -1,114 +1,112 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT MULTIREQ (SIMPLEREQ, SIMPLEREQ+)
- */
-public class MultiReqNode extends AbstractMessageNode {
-
-	private ArrayList iSimpleReqAList;
-
-	/**
-	 * Ctor.
-	 */
-	public MultiReqNode() {
-		super(MULTIREQ);
-	}
-
-	public void addChild(Node pChild) {
-		if (this.iSimpleReqAList == null) this.iSimpleReqAList = new ArrayList();
-		this.iSimpleReqAList.add(pChild);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		if (this.iSimpleReqAList != null) this.iSimpleReqAList.clear();
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != SIMPLEREQ) throw new SAXException(
-				"MULTIREQ node can have SIMPLEREQ child nodes only! " + pNodeNameEnum
-						+ " child node is invalid!");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iSimpleReqAList == null || this.iSimpleReqAList.size() < 2) throw new SAXException(
-				"MULTIREQ node must have at least 2 SIMPLEREQ child nodes!");
-	}
-
-	/**
-	 * size
-	 * 
-	 * @return int
-	 */
-	public int size() {
-		return this.iSimpleReqAList == null ? 0 : this.iSimpleReqAList.size();
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT MULTIREQ (SIMPLEREQ, SIMPLEREQ+)
+ */
+public class MultiReqNode extends AbstractMessageNode {
+
+	private ArrayList iSimpleReqAList;
+
+	/**
+	 * Ctor.
+	 */
+	public MultiReqNode() {
+		super(MULTIREQ);
+	}
+
+	public void addChild(Node pChild) {
+		if (this.iSimpleReqAList == null) this.iSimpleReqAList = new ArrayList();
+		this.iSimpleReqAList.add(pChild);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		if (this.iSimpleReqAList != null) this.iSimpleReqAList.clear();
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != SIMPLEREQ) throw new SAXException(
+				"MULTIREQ node can have SIMPLEREQ child nodes only! " + pNodeNameEnum
+						+ " child node is invalid!");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iSimpleReqAList == null || this.iSimpleReqAList.size() < 2) throw new SAXException(
+				"MULTIREQ node must have at least 2 SIMPLEREQ child nodes!");
+	}
+
+	/**
+	 * size
+	 * 
+	 * @return int
+	 */
+	public int size() {
+		return this.iSimpleReqAList == null ? 0 : this.iSimpleReqAList.size();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java
index 1ca4564..441a2a6 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java
@@ -1,105 +1,103 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT MULTIRSP (SIMPLERSP, SIMPLERSP+)
- */
-public class MultiRspNode extends AbstractMessageNode {
-
-	private ArrayList iSimpleRspAList;
-
-	/**
-	 * Ctor.
-	 */
-	public MultiRspNode() {
-		super(MULTIRSP);
-	}
-
-	public void addChild(Node pChild) {
-		if (this.iSimpleRspAList == null) this.iSimpleRspAList = new ArrayList();
-		this.iSimpleRspAList.add(pChild);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		if (this.iSimpleRspAList != null) this.iSimpleRspAList.clear();
-		// no attribs
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != SIMPLERSP) throw new SAXException(getNodeName() + " node cannot have "
-				+ pNodeNameEnum + " child node!");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iSimpleRspAList == null || this.iSimpleRspAList.size() < 2) throw new SAXException(
-				getNodeName() + " node must have at least two SIMPLERSP child nodes!");
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT MULTIRSP (SIMPLERSP, SIMPLERSP+)
+ */
+public class MultiRspNode extends AbstractMessageNode {
+
+	private ArrayList iSimpleRspAList;
+
+	/**
+	 * Ctor.
+	 */
+	public MultiRspNode() {
+		super(MULTIRSP);
+	}
+
+	public void addChild(Node pChild) {
+		if (this.iSimpleRspAList == null) this.iSimpleRspAList = new ArrayList();
+		this.iSimpleRspAList.add(pChild);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		if (this.iSimpleRspAList != null) this.iSimpleRspAList.clear();
+		// no attribs
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != SIMPLERSP) throw new SAXException(getNodeName() + " node cannot have "
+				+ pNodeNameEnum + " child node!");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iSimpleRspAList == null || this.iSimpleRspAList.size() < 2) throw new SAXException(
+				getNodeName() + " node must have at least two SIMPLERSP child nodes!");
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java
similarity index 71%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java
index 31c707a..2289772 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java
@@ -1,114 +1,112 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
- *    2673    2013-09-26  blaschke-oss NameSpaceNode does not need testCompletness()
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT NAMESPACE EMPTY ATTRLIST NAMESPACE %CIMName;
- * 
- */
-public class NameSpaceNode extends Node {
-
-	private String iNameSpaceValue;
-
-	/**
-	 * Ctor.
-	 */
-	public NameSpaceNode() {
-		super(NAMESPACE);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iNameSpaceValue = getCIMName(pAttribs);
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	/**
-	 * @param pNodeNameEnum
-	 */
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		throw new SAXException("NAMESPACE node cannot have any child node!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// no child
-	}
-
-	@Override
-	public void testCompletness() {
-	// no child
-	}
-
-	/**
-	 * getNameSpace
-	 * 
-	 * @return String
-	 */
-	public String getNameSpace() {
-		return this.iNameSpaceValue;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
+ *    2673    2013-09-26  blaschke-oss NameSpaceNode does not need testCompletness()
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT NAMESPACE EMPTY ATTRLIST NAMESPACE %CIMName;
+ * 
+ */
+public class NameSpaceNode extends Node {
+
+	private String iNameSpaceValue;
+
+	/**
+	 * Ctor.
+	 */
+	public NameSpaceNode() {
+		super(NAMESPACE);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iNameSpaceValue = getCIMName(pAttribs);
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	/**
+	 * @param pNodeNameEnum
+	 */
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		throw new SAXException("NAMESPACE node cannot have any child node!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// no child
+	}
+
+	@Override
+	public void testCompletness() {
+	// no child
+	}
+
+	/**
+	 * getNameSpace
+	 * 
+	 * @return String
+	 */
+	public String getNameSpace() {
+		return this.iNameSpaceValue;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java
index 9900892..344e5d9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java
@@ -1,144 +1,142 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1742873    2007-06-25  ebak         IPv6 ready cim-client
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT NAMESPACEPATH (HOST, LOCALNAMESPACEPATH)
- */
-public class NameSpacePathNode extends Node {
-
-	// HOST
-	private boolean iHasHost;
-
-	private String iHostStr;
-
-	// LOCALNAMESPACEPATH
-	private boolean iHasLocalNameSpacePath;
-
-	private String iLocalNameSpacePathStr;
-
-	/**
-	 * Ctor.
-	 */
-	public NameSpacePathNode() {
-		super(NAMESPACEPATH);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iHasHost = this.iHasLocalNameSpacePath = false;
-		this.iHostStr = this.iLocalNameSpacePathStr = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == HOST) {
-			if (this.iHasHost) throw new SAXException(getNodeName()
-					+ " node can have only one HOST child node!");
-		} else if (pNodeNameEnum == LOCALNAMESPACEPATH) {
-			if (this.iHasLocalNameSpacePath) throw new SAXException(getNodeName()
-					+ " node can have only one LOCALNAMESPACEPATH child node!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof HostNode) {
-			this.iHasHost = true;
-			this.iHostStr = ((HostNode) pChild).getHostStr();
-		} else {
-			this.iHasLocalNameSpacePath = true;
-			this.iLocalNameSpacePathStr = ((LocalNameSpacePathNode) pChild).getNameSpace();
-		}
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (!this.iHasHost) throw new SAXException("HOST child node is mandatory for "
-				+ getNodeName() + " node!");
-		if (!this.iHasLocalNameSpacePath) throw new SAXException(
-				"LOCALNAMESPACEPATH child node is mandatory for " + getNodeName() + " node!");
-	}
-
-	/**
-	 * getHostStr
-	 * 
-	 * @return String which may contain the protocol, host and port
-	 */
-	public String getHostStr() {
-		return this.iHostStr;
-	}
-
-	/**
-	 * getLocalNameSpacePath
-	 * 
-	 * @return String
-	 */
-	public String getLocalNameSpacePath() {
-		return this.iLocalNameSpacePathStr;
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1742873    2007-06-25  ebak         IPv6 ready cim-client
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT NAMESPACEPATH (HOST, LOCALNAMESPACEPATH)
+ */
+public class NameSpacePathNode extends Node {
+
+	// HOST
+	private boolean iHasHost;
+
+	private String iHostStr;
+
+	// LOCALNAMESPACEPATH
+	private boolean iHasLocalNameSpacePath;
+
+	private String iLocalNameSpacePathStr;
+
+	/**
+	 * Ctor.
+	 */
+	public NameSpacePathNode() {
+		super(NAMESPACEPATH);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iHasHost = this.iHasLocalNameSpacePath = false;
+		this.iHostStr = this.iLocalNameSpacePathStr = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == HOST) {
+			if (this.iHasHost) throw new SAXException(getNodeName()
+					+ " node can have only one HOST child node!");
+		} else if (pNodeNameEnum == LOCALNAMESPACEPATH) {
+			if (this.iHasLocalNameSpacePath) throw new SAXException(getNodeName()
+					+ " node can have only one LOCALNAMESPACEPATH child node!");
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof HostNode) {
+			this.iHasHost = true;
+			this.iHostStr = ((HostNode) pChild).getHostStr();
+		} else {
+			this.iHasLocalNameSpacePath = true;
+			this.iLocalNameSpacePathStr = ((LocalNameSpacePathNode) pChild).getNameSpace();
+		}
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (!this.iHasHost) throw new SAXException("HOST child node is mandatory for "
+				+ getNodeName() + " node!");
+		if (!this.iHasLocalNameSpacePath) throw new SAXException(
+				"LOCALNAMESPACEPATH child node is mandatory for " + getNodeName() + " node!");
+	}
+
+	/**
+	 * getHostStr
+	 * 
+	 * @return String which may contain the protocol, host and port
+	 */
+	public String getHostStr() {
+		return this.iHostStr;
+	}
+
+	/**
+	 * getLocalNameSpacePath
+	 * 
+	 * @return String
+	 */
+	public String getLocalNameSpacePath() {
+		return this.iLocalNameSpacePathStr;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java
similarity index 87%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java
index 08ecdda..c7d541a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java
@@ -1,395 +1,392 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1735614    2007-06-12  ebak         Wrong ARRAYSIZE attribute handling in SAX/PULL
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2038305    2008-08-14  blaschke-oss SAXException SBLIM Java Client V2.0.7
- * 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)
- * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
- * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
- *    2605    2013-03-20  buccella     SAX parser throws wrong exception
- *    2693    2013-10-21  blaschke-oss ReturnValueNode allows invalid PARAMTYPE attribute
- *    2702    2013-11-07  blaschke-oss Bad PROPERTY.ARRAY ARRAYSIZE generates NumberFormatException
- *    2706    2013-11-11  blaschke-oss Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMFlavor;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMHelper;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.NodeConstIf;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.MOF;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * Class Node is the abstract base class of all parseable XML elements. It
- * contains helper functions for the implementations.
- */
-public abstract class Node implements NodeConstIf {
-
-	private String iNameEnum;
-
-	private boolean iCompleted;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNameEnum
-	 *            The name of the node which must be a String constant which is
-	 *            defined inside this class (because the implementation compares
-	 *            by reference).
-	 */
-	public Node(String pNameEnum) {
-		this.iNameEnum = pNameEnum;
-	}
-
-	/**
-	 * getNodeName
-	 * 
-	 * @return The name of the node. This name have to be one of the String
-	 *         constant defined in the class.
-	 */
-	public String getNodeName() {
-		return this.iNameEnum;
-	}
-
-	/**
-	 * The SAX ContentHandler implementation calls this method after testChild()
-	 * and addChild() calls. The implementation must reset it's instance unless
-	 * it implements NonVolatileIf
-	 * 
-	 * @param pAttribs
-	 * @param pSession
-	 *            - stores variables which are common for the whole SAX parsing
-	 *            session
-	 * @throws SAXException
-	 */
-	public abstract void init(Attributes pAttribs, SAXSession pSession) throws SAXException;
-
-	/**
-	 * XML element's data have to be passed
-	 * 
-	 * @param pData
-	 *            - String which is concatenated in SAX's
-	 *            DefaultHandler.characters() implementation.
-	 * @throws SAXException
-	 */
-	public abstract void parseData(String pData) throws SAXException;
-
-	/**
-	 * It have to be called by SAX's DefaultHandler implementation when it
-	 * detects a new child element (startElement()).
-	 * 
-	 * @param pNodeNameEnum
-	 *            - the name of the child element, it must be one of the String
-	 *            constant defined in class Node, because the implementer
-	 *            subclasses uses reference based equals comparisons (==)
-	 * @throws SAXException
-	 *             - It have to be thrown when the Node cannot have
-	 *             pNodeNameEnum named child Node.
-	 */
-	public abstract void testChild(String pNodeNameEnum) throws SAXException;
-
-	/**
-	 * It have to be called by SAX's DefaultHandler.endElement(). It's task is
-	 * to check that the Element is built up correctly. The implementer function
-	 * can do some post processing here. testCompletness
-	 * 
-	 * @throws SAXException
-	 *             It must be thrown when the Node is not valid.
-	 */
-	public abstract void testCompletness() throws SAXException;
-
-	/**
-	 * Have to be called by SAX's DefaultHandler.endElement()
-	 * 
-	 * @param pChild
-	 * @throws SAXException
-	 *             - parent Nodes can make conversions here (e.g. type string
-	 *             into CIMDataType), failed operation should throw
-	 *             SAXException)
-	 */
-	public abstract void childParsed(Node pChild) throws SAXException;
-
-	/**
-	 * completed
-	 * 
-	 * @return true if the parsing of the node is completed
-	 */
-	public boolean isCompleted() {
-		return this.iCompleted;
-	}
-
-	/**
-	 * Have to be called by SAX's DefaultHandler at endElement(), after calling
-	 * testCompletness().
-	 */
-	public void setCompleted() {
-		this.iCompleted = true;
-	}
-
-	/**
-	 * When a Node instance is going to be reused, this function must be called
-	 * before.
-	 */
-	public void clearCompleted() {
-		this.iCompleted = false;
-	}
-
-	/**
-	 * ENTITY % CIMName "NAME CDATA #REQUIRED"
-	 * 
-	 * @param pAttribs
-	 * @return String
-	 * @throws SAXException
-	 */
-	public static String getCIMName(Attributes pAttribs) throws SAXException {
-		String name = pAttribs.getValue("NAME");
-		if (name == null) throw new SAXException("NAME attribute not found!");
-		return name;
-	}
-
-	/**
-	 * ENTITY % ClassName "CLASSNAME CDATA #REQUIRED"
-	 * 
-	 * @param pAttribs
-	 * @return String
-	 * @throws SAXException
-	 */
-	public static String getClassName(Attributes pAttribs) throws SAXException {
-		String name = pAttribs.getValue("CLASSNAME");
-		if (name == null) throw new SAXException("CLASSNAME attribute not found!");
-		return name;
-	}
-
-	/**
-	 * ENTITY % ReferenceClass "REFERENCECLASS CDATA #IMPLIED"
-	 * 
-	 * @param pAttribs
-	 * @return String
-	 */
-	public static String getReferenceClass(Attributes pAttribs) {
-		return pAttribs.getValue("REFERENCECLASS");
-	}
-
-	/**
-	 * ENTITY % ClassOrigin "CLASSORIGIN CDATA #IMPLIED
-	 * 
-	 * @param pAttribs
-	 * @return String
-	 */
-	public static String getClassOrigin(Attributes pAttribs) {
-		return pAttribs.getValue("CLASSORIGIN");
-	}
-
-	/**
-	 * ENTITY % Propagated "PROPAGATED (true|false) 'false'" getPropagated
-	 * 
-	 * @param pAttribs
-	 * @return boolean
-	 */
-	public static boolean getPropagated(Attributes pAttribs) {
-		String str = pAttribs.getValue("PROPAGATED");
-		return MOF.TRUE.equalsIgnoreCase(str);
-	}
-
-	/**
-	 * ENTITY % ArraySize "ARRAYSIZE CDATA #IMPLIED"
-	 * 
-	 * @param pAttribs
-	 * @return int
-	 * @throws SAXException
-	 */
-	public static int getArraySize(Attributes pAttribs) throws SAXException {
-		String arraySizeStr = pAttribs.getValue("ARRAYSIZE");
-		// 0 - unbounded size
-		int size = 0;
-		try {
-			size = arraySizeStr == null || arraySizeStr.length() == 0 ? 0 : Integer
-					.parseInt(arraySizeStr);
-		} catch (NumberFormatException e) {
-			throw new SAXException(arraySizeStr + " is not a valid ARRAYSIZE attribute!");
-		}
-		if (size < 0) throw new SAXException("ARRAYSIZE cannot be " + size + "!");
-		return size;
-	}
-
-	/**
-	 * ENTITY % CIMType "TYPE
-	 * (boolean|string|char16|uint8|sint8|uint16|sint16|uint32
-	 * |sint32|uint64|sint64|datetime|real32|real64)" getCIMType
-	 * 
-	 * @param pAttribs
-	 * @param pOptional
-	 * @return CIMDataType
-	 * @throws SAXException
-	 */
-	public static CIMDataType getCIMType(Attributes pAttribs, boolean pOptional)
-			throws SAXException {
-		String typeStr = pAttribs.getValue("TYPE");
-		if (typeStr == null) {
-			if (pOptional) return null;
-			throw new SAXException("TYPE attribute not found!");
-		}
-		CIMDataType type = CIMObjectFactory.getType(typeStr);
-		if (type == null) throw new SAXException(typeStr + " is not a valid TYPE attribute!");
-		if (type.getType() == CIMDataType.REFERENCE) throw new SAXException(
-				"TYPE attribute cannot be \"reference\"!");
-		// Is it array?
-		// Yes if ISARRAY is true or ARRAYSIZE>-1.
-		boolean isArray = hasTrueAttribute(pAttribs, "ISARRAY");
-		String arraySizeStr = pAttribs.getValue("ARRAYSIZE");
-		int arraySize;
-		try {
-			arraySize = (arraySizeStr == null || arraySizeStr.length() == 0 ? (isArray ? 0 : -1)
-					: Integer.parseInt(arraySizeStr));
-		} catch (NumberFormatException e) {
-			throw new SAXException(arraySizeStr + " is not a valid ARRAYSIZE attribute!");
-		}
-		if (isArray || arraySize >= 0) {
-			if (arraySize > 0) return new CIMDataType(type.getType(), arraySize);
-			return CIMHelper.UnboundedArrayDataType(type.getType());
-		}
-		return type;
-	}
-
-	/**
-	 * getCIMType(pAttribs, pOptional=false);
-	 * 
-	 * @param pAttribs
-	 * @return CIMDataType
-	 * @throws SAXException
-	 */
-	public static CIMDataType getCIMType(Attributes pAttribs) throws SAXException {
-		return getCIMType(pAttribs, false);
-	}
-
-	/**
-	 * ENTITY % ParamType "PARAMTYPE (
-	 * boolean|string|char16|uint8|sint8|uint16|sint16
-	 * |uint32|sint32|uint64|sint64|datetime| real32|real64|reference)
-	 * 
-	 * @param pAttribs
-	 * @return CIMDataType
-	 * @throws SAXException
-	 */
-	public static CIMDataType getParamType(Attributes pAttribs) throws SAXException {
-		String typeStr = pAttribs.getValue("PARAMTYPE");
-		return CIMObjectFactory.getType(typeStr);
-	}
-
-	/**
-	 * 
      -	 * ENTITY % QualifierFlavor "
-	 * OVERRIDABLE    (true|false)  'true'
-	 * TOSUBCLASS     (true|false)  'true'
-	 * TOINSTANCE     (true|false)  'false'
-	 * TRANSLATABLE   (true|false)  'false'"
-	 * 
      
-	 * 
-	 * @param pAttribs
-	 * @return int - CIMFlavor bit mixture
-	 */
-	public int getQualifierFlavor(Attributes pAttribs) {
-		int flavors = 0;
-		if (!getBoolAttribute(pAttribs, "OVERRIDABLE", true)) flavors |= CIMFlavor.DISABLEOVERRIDE;
-		if (!getBoolAttribute(pAttribs, "TOSUBCLASS", true)) flavors |= CIMFlavor.RESTRICTED;
-		if (getBoolAttribute(pAttribs, "TRANSLATABLE", false)) flavors |= CIMFlavor.TRANSLATE;
-		return flavors;
-	}
-
-	/**
-	 * hasTrueAttribute
-	 * 
-	 * @param pAttribs
-	 * @param pName
-	 * @return boolean
-	 */
-	public static boolean hasTrueAttribute(Attributes pAttribs, String pName) {
-		return MOF.TRUE.equalsIgnoreCase(pAttribs.getValue(pName));
-	}
-
-	/**
-	 * getBoolAttribute
-	 * 
-	 * @param pAttribs
-	 * @param pName
-	 * @param pDefVal
-	 * @return boolean
-	 */
-	public static boolean getBoolAttribute(Attributes pAttribs, String pName, boolean pDefVal) {
-		String val = pAttribs.getValue(pName);
-		if (MOF.TRUE.equalsIgnoreCase(val)) return true;
-		if (MOF.FALSE.equalsIgnoreCase(val)) return false;
-		return pDefVal;
-	}
-
-	/**
-	 * duplicatedNode
-	 * 
-	 * @param pParsedNodeName
-	 * @param pNewNodeName
-	 * @throws SAXException
-	 */
-	public void duplicatedNode(String pParsedNodeName, String pNewNodeName) throws SAXException {
-		throw new SAXException(getNodeName() + " has a " + pParsedNodeName
-				+ " child node which disallows an additional " + pNewNodeName + " child node!");
-	}
-
-	/**
-	 * illegalChildNodePair
-	 * 
-	 * @param pNodeName0
-	 * @param pNodeName1
-	 * @throws SAXException
-	 */
-	public void illegalChildNodePair(String pNodeName0, String pNodeName1) throws SAXException {
-		throw new SAXException(pNodeName0 + ", " + pNodeName1 + " child node pair is illegal for "
-				+ getNodeName() + " node!");
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1735614    2007-06-12  ebak         Wrong ARRAYSIZE attribute handling in SAX/PULL
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2038305    2008-08-14  blaschke-oss SAXException SBLIM Java Client V2.0.7
+ * 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)
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
+ * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ *    2605    2013-03-20  buccella     SAX parser throws wrong exception
+ *    2693    2013-10-21  blaschke-oss ReturnValueNode allows invalid PARAMTYPE attribute
+ *    2702    2013-11-07  blaschke-oss Bad PROPERTY.ARRAY ARRAYSIZE generates NumberFormatException
+ *    2706    2013-11-11  blaschke-oss Bad PARAMETER.REFARRAY ARRAYSIZE generates NumberFormatException
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
+import org.metricshub.wbem.javax.cim.CIMFlavor;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.NodeConstIf;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * Class Node is the abstract base class of all parseable XML elements. It
+ * contains helper functions for the implementations.
+ */
+public abstract class Node implements NodeConstIf {
+
+	private String iNameEnum;
+
+	private boolean iCompleted;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNameEnum
+	 *            The name of the node which must be a String constant which is
+	 *            defined inside this class (because the implementation compares
+	 *            by reference).
+	 */
+	public Node(String pNameEnum) {
+		this.iNameEnum = pNameEnum;
+	}
+
+	/**
+	 * getNodeName
+	 * 
+	 * @return The name of the node. This name have to be one of the String
+	 *         constant defined in the class.
+	 */
+	public String getNodeName() {
+		return this.iNameEnum;
+	}
+
+	/**
+	 * The SAX ContentHandler implementation calls this method after testChild()
+	 * and addChild() calls. The implementation must reset it's instance unless
+	 * it implements NonVolatileIf
+	 * 
+	 * @param pAttribs
+	 * @param pSession
+	 *            - stores variables which are common for the whole SAX parsing
+	 *            session
+	 * @throws SAXException
+	 */
+	public abstract void init(Attributes pAttribs, SAXSession pSession) throws SAXException;
+
+	/**
+	 * XML element's data have to be passed
+	 * 
+	 * @param pData
+	 *            - String which is concatenated in SAX's
+	 *            DefaultHandler.characters() implementation.
+	 * @throws SAXException
+	 */
+	public abstract void parseData(String pData) throws SAXException;
+
+	/**
+	 * It have to be called by SAX's DefaultHandler implementation when it
+	 * detects a new child element (startElement()).
+	 * 
+	 * @param pNodeNameEnum
+	 *            - the name of the child element, it must be one of the String
+	 *            constant defined in class Node, because the implementer
+	 *            subclasses uses reference based equals comparisons (==)
+	 * @throws SAXException
+	 *             - It have to be thrown when the Node cannot have
+	 *             pNodeNameEnum named child Node.
+	 */
+	public abstract void testChild(String pNodeNameEnum) throws SAXException;
+
+	/**
+	 * It have to be called by SAX's DefaultHandler.endElement(). It's task is
+	 * to check that the Element is built up correctly. The implementer function
+	 * can do some post processing here. testCompletness
+	 * 
+	 * @throws SAXException
+	 *             It must be thrown when the Node is not valid.
+	 */
+	public abstract void testCompletness() throws SAXException;
+
+	/**
+	 * Have to be called by SAX's DefaultHandler.endElement()
+	 * 
+	 * @param pChild
+	 * @throws SAXException
+	 *             - parent Nodes can make conversions here (e.g. type string
+	 *             into CIMDataType), failed operation should throw
+	 *             SAXException)
+	 */
+	public abstract void childParsed(Node pChild) throws SAXException;
+
+	/**
+	 * completed
+	 * 
+	 * @return true if the parsing of the node is completed
+	 */
+	public boolean isCompleted() {
+		return this.iCompleted;
+	}
+
+	/**
+	 * Have to be called by SAX's DefaultHandler at endElement(), after calling
+	 * testCompletness().
+	 */
+	public void setCompleted() {
+		this.iCompleted = true;
+	}
+
+	/**
+	 * When a Node instance is going to be reused, this function must be called
+	 * before.
+	 */
+	public void clearCompleted() {
+		this.iCompleted = false;
+	}
+
+	/**
+	 * ENTITY % CIMName "NAME CDATA #REQUIRED"
+	 * 
+	 * @param pAttribs
+	 * @return String
+	 * @throws SAXException
+	 */
+	public static String getCIMName(Attributes pAttribs) throws SAXException {
+		String name = pAttribs.getValue("NAME");
+		if (name == null) throw new SAXException("NAME attribute not found!");
+		return name;
+	}
+
+	/**
+	 * ENTITY % ClassName "CLASSNAME CDATA #REQUIRED"
+	 * 
+	 * @param pAttribs
+	 * @return String
+	 * @throws SAXException
+	 */
+	public static String getClassName(Attributes pAttribs) throws SAXException {
+		String name = pAttribs.getValue("CLASSNAME");
+		if (name == null) throw new SAXException("CLASSNAME attribute not found!");
+		return name;
+	}
+
+	/**
+	 * ENTITY % ReferenceClass "REFERENCECLASS CDATA #IMPLIED"
+	 * 
+	 * @param pAttribs
+	 * @return String
+	 */
+	public static String getReferenceClass(Attributes pAttribs) {
+		return pAttribs.getValue("REFERENCECLASS");
+	}
+
+	/**
+	 * ENTITY % ClassOrigin "CLASSORIGIN CDATA #IMPLIED
+	 * 
+	 * @param pAttribs
+	 * @return String
+	 */
+	public static String getClassOrigin(Attributes pAttribs) {
+		return pAttribs.getValue("CLASSORIGIN");
+	}
+
+	/**
+	 * ENTITY % Propagated "PROPAGATED (true|false) 'false'" getPropagated
+	 * 
+	 * @param pAttribs
+	 * @return boolean
+	 */
+	public static boolean getPropagated(Attributes pAttribs) {
+		String str = pAttribs.getValue("PROPAGATED");
+		return MOF.TRUE.equalsIgnoreCase(str);
+	}
+
+	/**
+	 * ENTITY % ArraySize "ARRAYSIZE CDATA #IMPLIED"
+	 * 
+	 * @param pAttribs
+	 * @return int
+	 * @throws SAXException
+	 */
+	public static int getArraySize(Attributes pAttribs) throws SAXException {
+		String arraySizeStr = pAttribs.getValue("ARRAYSIZE");
+		// 0 - unbounded size
+		int size = 0;
+		try {
+			size = arraySizeStr == null || arraySizeStr.length() == 0 ? 0 : Integer
+					.parseInt(arraySizeStr);
+		} catch (NumberFormatException e) {
+			throw new SAXException(arraySizeStr + " is not a valid ARRAYSIZE attribute!");
+		}
+		if (size < 0) throw new SAXException("ARRAYSIZE cannot be " + size + "!");
+		return size;
+	}
+
+	/**
+	 * ENTITY % CIMType "TYPE
+	 * (boolean|string|char16|uint8|sint8|uint16|sint16|uint32
+	 * |sint32|uint64|sint64|datetime|real32|real64)" getCIMType
+	 * 
+	 * @param pAttribs
+	 * @param pOptional
+	 * @return CIMDataType
+	 * @throws SAXException
+	 */
+	public static CIMDataType getCIMType(Attributes pAttribs, boolean pOptional)
+			throws SAXException {
+		String typeStr = pAttribs.getValue("TYPE");
+		if (typeStr == null) {
+			if (pOptional) return null;
+			throw new SAXException("TYPE attribute not found!");
+		}
+		CIMDataType type = CIMObjectFactory.getType(typeStr);
+		if (type == null) throw new SAXException(typeStr + " is not a valid TYPE attribute!");
+		if (type.getType() == CIMDataType.REFERENCE) throw new SAXException(
+				"TYPE attribute cannot be \"reference\"!");
+		// Is it array?
+		// Yes if ISARRAY is true or ARRAYSIZE>-1.
+		boolean isArray = hasTrueAttribute(pAttribs, "ISARRAY");
+		String arraySizeStr = pAttribs.getValue("ARRAYSIZE");
+		int arraySize;
+		try {
+			arraySize = (arraySizeStr == null || arraySizeStr.length() == 0 ? (isArray ? 0 : -1)
+					: Integer.parseInt(arraySizeStr));
+		} catch (NumberFormatException e) {
+			throw new SAXException(arraySizeStr + " is not a valid ARRAYSIZE attribute!");
+		}
+		if (isArray || arraySize >= 0) {
+			if (arraySize > 0) return new CIMDataType(type.getType(), arraySize);
+			return CIMHelper.UnboundedArrayDataType(type.getType());
+		}
+		return type;
+	}
+
+	/**
+	 * getCIMType(pAttribs, pOptional=false);
+	 * 
+	 * @param pAttribs
+	 * @return CIMDataType
+	 * @throws SAXException
+	 */
+	public static CIMDataType getCIMType(Attributes pAttribs) throws SAXException {
+		return getCIMType(pAttribs, false);
+	}
+
+	/**
+	 * ENTITY % ParamType "PARAMTYPE (
+	 * boolean|string|char16|uint8|sint8|uint16|sint16
+	 * |uint32|sint32|uint64|sint64|datetime| real32|real64|reference)
+	 * 
+	 * @param pAttribs
+	 * @return CIMDataType
+	 * @throws SAXException
+	 */
+	public static CIMDataType getParamType(Attributes pAttribs) throws SAXException {
+		String typeStr = pAttribs.getValue("PARAMTYPE");
+		return CIMObjectFactory.getType(typeStr);
+	}
+
+	/**
+	 * 
      +	 * ENTITY % QualifierFlavor "
+	 * OVERRIDABLE    (true|false)  'true'
+	 * TOSUBCLASS     (true|false)  'true'
+	 * TOINSTANCE     (true|false)  'false'
+	 * TRANSLATABLE   (true|false)  'false'"
+	 * 
      
+	 * 
+	 * @param pAttribs
+	 * @return int - CIMFlavor bit mixture
+	 */
+	public int getQualifierFlavor(Attributes pAttribs) {
+		int flavors = 0;
+		if (!getBoolAttribute(pAttribs, "OVERRIDABLE", true)) flavors |= CIMFlavor.DISABLEOVERRIDE;
+		if (!getBoolAttribute(pAttribs, "TOSUBCLASS", true)) flavors |= CIMFlavor.RESTRICTED;
+		if (getBoolAttribute(pAttribs, "TRANSLATABLE", false)) flavors |= CIMFlavor.TRANSLATE;
+		return flavors;
+	}
+
+	/**
+	 * hasTrueAttribute
+	 * 
+	 * @param pAttribs
+	 * @param pName
+	 * @return boolean
+	 */
+	public static boolean hasTrueAttribute(Attributes pAttribs, String pName) {
+		return MOF.TRUE.equalsIgnoreCase(pAttribs.getValue(pName));
+	}
+
+	/**
+	 * getBoolAttribute
+	 * 
+	 * @param pAttribs
+	 * @param pName
+	 * @param pDefVal
+	 * @return boolean
+	 */
+	public static boolean getBoolAttribute(Attributes pAttribs, String pName, boolean pDefVal) {
+		String val = pAttribs.getValue(pName);
+		if (MOF.TRUE.equalsIgnoreCase(val)) return true;
+		if (MOF.FALSE.equalsIgnoreCase(val)) return false;
+		return pDefVal;
+	}
+
+	/**
+	 * duplicatedNode
+	 * 
+	 * @param pParsedNodeName
+	 * @param pNewNodeName
+	 * @throws SAXException
+	 */
+	public void duplicatedNode(String pParsedNodeName, String pNewNodeName) throws SAXException {
+		throw new SAXException(getNodeName() + " has a " + pParsedNodeName
+				+ " child node which disallows an additional " + pNewNodeName + " child node!");
+	}
+
+	/**
+	 * illegalChildNodePair
+	 * 
+	 * @param pNodeName0
+	 * @param pNodeName1
+	 * @throws SAXException
+	 */
+	public void illegalChildNodePair(String pNodeName0, String pNodeName1) throws SAXException {
+		throw new SAXException(pNodeName0 + ", " + pNodeName1 + " child node pair is illegal for "
+				+ getNodeName() + " node!");
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java
similarity index 63%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java
index 63304a4..d99dd16 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java
@@ -1,59 +1,57 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * This interface have to be implemented by those Node classes which instances
- * cannot be reused. (e.g. CIM, MESSAGE, SIMPLERSP, IMETHODRESPONSE,
- * IRETURNVALUE)
- */
-public interface NonVolatileIf {
-
-	/**
-	 * Have to be called by SAX's DefaultHandler.startElement() after
-	 * testChild() call.
-	 * 
-	 * @param pChild
-	 */
-	public abstract void addChild(Node pChild);
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * This interface have to be implemented by those Node classes which instances
+ * cannot be reused. (e.g. CIM, MESSAGE, SIMPLERSP, IMETHODRESPONSE,
+ * IRETURNVALUE)
+ */
+public interface NonVolatileIf {
+
+	/**
+	 * Have to be called by SAX's DefaultHandler.startElement() after
+	 * testChild() call.
+	 * 
+	 * @param pChild
+	 */
+	public abstract void addChild(Node pChild);
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java
similarity index 58%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java
index 45c449b..6eaef1a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java
@@ -1,57 +1,55 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * It's implemented by Nodes which can construct a CIMObjectPath.
- */
-public interface ObjectPathIf {
-
-	/**
-	 * getCIMObjectPath
-	 * 
-	 * @return CIMObjectPath
-	 */
-	CIMObjectPath getCIMObjectPath();
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * It's implemented by Nodes which can construct a CIMObjectPath.
+ */
+public interface ObjectPathIf {
+
+	/**
+	 * getCIMObjectPath
+	 * 
+	 * @return CIMObjectPath
+	 */
+	CIMObjectPath getCIMObjectPath();
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java
index 771540d..4bdb6ce 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java
@@ -1,114 +1,111 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- *    2677    2013-09-30  blaschke-oss ObjectPathNode allows all child nodes
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT OBJECTPATH (INSTANCEPATH | CLASSPATH)
- */
-public class ObjectPathNode extends AbstractPathNode {
-
-	// (INSTANCEPATH | CLASSPATH)
-	private CIMObjectPath iObjPath;
-
-	// private AbstractObjectPathNode iChildNode;
-
-	/**
-	 * Ctor.
-	 */
-	public ObjectPathNode() {
-		super(OBJECTPATH);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iObjPath = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iObjPath != null) throw new SAXException(getNodeName()
-				+ " node can have only one INSTANCEPATH or CLASSPATH child node!" + " Additional "
-				+ pNodeNameEnum + " child node is invalid!");
-		if (pNodeNameEnum != CLASSPATH && pNodeNameEnum != INSTANCEPATH) throw new SAXException(
-				getNodeName() + " node child node can be CLASSPATH or INSTANCEPATH but a "
-						+ pNodeNameEnum + " node was found!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		this.iObjPath = ((AbstractObjectPathNode) pChild).getCIMObjectPath();
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iObjPath == null) throw new SAXException(getNodeName()
-				+ " node must have a INSTANCEPATH or CLASSPATH child node!");
-	}
-
-	public CIMObjectPath getCIMObjectPath() {
-		return this.iObjPath;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ *    2677    2013-09-30  blaschke-oss ObjectPathNode allows all child nodes
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT OBJECTPATH (INSTANCEPATH | CLASSPATH)
+ */
+public class ObjectPathNode extends AbstractPathNode {
+
+	// (INSTANCEPATH | CLASSPATH)
+	private CIMObjectPath iObjPath;
+
+	// private AbstractObjectPathNode iChildNode;
+
+	/**
+	 * Ctor.
+	 */
+	public ObjectPathNode() {
+		super(OBJECTPATH);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iObjPath = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iObjPath != null) throw new SAXException(getNodeName()
+				+ " node can have only one INSTANCEPATH or CLASSPATH child node!" + " Additional "
+				+ pNodeNameEnum + " child node is invalid!");
+		if (pNodeNameEnum != CLASSPATH && pNodeNameEnum != INSTANCEPATH) throw new SAXException(
+				getNodeName() + " node child node can be CLASSPATH or INSTANCEPATH but a "
+						+ pNodeNameEnum + " node was found!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		this.iObjPath = ((AbstractObjectPathNode) pChild).getCIMObjectPath();
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iObjPath == null) throw new SAXException(getNodeName()
+				+ " node must have a INSTANCEPATH or CLASSPATH child node!");
+	}
+
+	public CIMObjectPath getCIMObjectPath() {
+		return this.iObjPath;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java
index 9bb19fe..883e421 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java
@@ -1,182 +1,179 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- *    2605    2013-03-20  buccella     SAX parser throws wrong exception
- *    2537    2013-10-17  blaschke-oss Add new data types for PARAMVALUE
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT PARAMVALUE (VALUE | VALUE.REFERENCE | VALUE.ARRAY | VALUE.REFARRAY |
- * CLASSNAME | INSTANCENAME | CLASS | INSTANCE | VALUE.NAMEDINSTANCE)? ATTLIST
- * PARAMVALUE %CIMName; %ParamType; #IMPLIED %EmbeddedObject; #IMPLIED - new
- */
-public class ParamValueNode extends AbstractParamValueNode {
-
-	private String iName;
-
-	private EmbObjHandler iEmbObjHandler;
-
-	private CIMDataType iType;
-
-	// VALUE.xxx node
-	private boolean iHasChild;
-
-	private boolean iHasTypeValue;
-
-	private Object iValue;
-
-	/**
-	 * Ctor.
-	 */
-	public ParamValueNode() {
-		super(PARAMVALUE);
-	}
-
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				pSession, null, true);
-		this.iHasChild = false;
-		this.iHasTypeValue = false;
-		this.iName = getCIMName(pAttribs);
-		this.iType = null;
-		this.iValue = null;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	private static final String[] ALLOWED_CHILDREN = { VALUE, VALUE_REFERENCE, VALUE_ARRAY,
-			VALUE_REFARRAY, CLASSNAME, INSTANCENAME, CLASS, INSTANCE, VALUE_NAMEDINSTANCE };
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		boolean allowed = false;
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++) {
-			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
-				allowed = true;
-				break;
-			}
-		}
-		if (!allowed) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-		if (this.iHasChild) throw new SAXException(getNodeName()
-				+ " node cannot have more than one child node!");
-		// type check
-		CIMDataType rawType = this.iEmbObjHandler.getRawType();
-		if (rawType != null) {
-			if (pNodeNameEnum == VALUE_REFERENCE || pNodeNameEnum == VALUE_REFARRAY) {
-				if (rawType.getType() != CIMDataType.REFERENCE) throw new SAXException(
-						"PARAMVALUE node's PARAMTYPE attribute is not reference (" + rawType
-								+ "), but a " + pNodeNameEnum + " child node is found!");
-			}
-		}
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof AbstractValueNode) {
-			this.iEmbObjHandler.addValueNode((AbstractValueNode) pChild);
-		} else {
-			this.iValue = ((ValueIf) pChild).getValue();
-			if (pChild instanceof TypedIf) this.iType = ((TypedIf) pChild).getType();
-			else if (pChild instanceof ObjectPathIf) this.iType = CIMDataType
-					.getDataType(((ObjectPathIf) pChild).getCIMObjectPath());
-			else if (pChild instanceof ValueIf) this.iType = CIMDataType
-					.getDataType(((ValueIf) pChild).getValue());
-			this.iHasTypeValue = true;
-		}
-		this.iHasChild = true;
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (!this.iHasTypeValue) {
-			// here is a type and value conversion
-			this.iType = this.iEmbObjHandler.getType();
-			this.iValue = this.iEmbObjHandler.getValue();
-		}
-	}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-	/**
-	 * getCIMArgument
-	 * 
-	 * @return CIMArgument
-	 */
-	@Override
-	public CIMArgument getCIMArgument() {
-		/*
-		 * CIMArgument(String name, CIMDataType type, Object value)
-		 */
-		return new CIMArgument(this.iName, this.iType, this.iValue);
-	}
-
-	/**
-	 * @see ValueIf#getValue()
-	 */
-	public Object getValue() {
-		return this.iValue;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1719991    2007-05-16  ebak         FVT: regression ClassCastException in EmbObjHandler
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ *    2605    2013-03-20  buccella     SAX parser throws wrong exception
+ *    2537    2013-10-17  blaschke-oss Add new data types for PARAMVALUE
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT PARAMVALUE (VALUE | VALUE.REFERENCE | VALUE.ARRAY | VALUE.REFARRAY |
+ * CLASSNAME | INSTANCENAME | CLASS | INSTANCE | VALUE.NAMEDINSTANCE)? ATTLIST
+ * PARAMVALUE %CIMName; %ParamType; #IMPLIED %EmbeddedObject; #IMPLIED - new
+ */
+public class ParamValueNode extends AbstractParamValueNode {
+
+	private String iName;
+
+	private EmbObjHandler iEmbObjHandler;
+
+	private CIMDataType iType;
+
+	// VALUE.xxx node
+	private boolean iHasChild;
+
+	private boolean iHasTypeValue;
+
+	private Object iValue;
+
+	/**
+	 * Ctor.
+	 */
+	public ParamValueNode() {
+		super(PARAMVALUE);
+	}
+
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
+				pSession, null, true);
+		this.iHasChild = false;
+		this.iHasTypeValue = false;
+		this.iName = getCIMName(pAttribs);
+		this.iType = null;
+		this.iValue = null;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	private static final String[] ALLOWED_CHILDREN = { VALUE, VALUE_REFERENCE, VALUE_ARRAY,
+			VALUE_REFARRAY, CLASSNAME, INSTANCENAME, CLASS, INSTANCE, VALUE_NAMEDINSTANCE };
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		boolean allowed = false;
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++) {
+			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
+				allowed = true;
+				break;
+			}
+		}
+		if (!allowed) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+		if (this.iHasChild) throw new SAXException(getNodeName()
+				+ " node cannot have more than one child node!");
+		// type check
+		CIMDataType rawType = this.iEmbObjHandler.getRawType();
+		if (rawType != null) {
+			if (pNodeNameEnum == VALUE_REFERENCE || pNodeNameEnum == VALUE_REFARRAY) {
+				if (rawType.getType() != CIMDataType.REFERENCE) throw new SAXException(
+						"PARAMVALUE node's PARAMTYPE attribute is not reference (" + rawType
+								+ "), but a " + pNodeNameEnum + " child node is found!");
+			}
+		}
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof AbstractValueNode) {
+			this.iEmbObjHandler.addValueNode((AbstractValueNode) pChild);
+		} else {
+			this.iValue = ((ValueIf) pChild).getValue();
+			if (pChild instanceof TypedIf) this.iType = ((TypedIf) pChild).getType();
+			else if (pChild instanceof ObjectPathIf) this.iType = CIMDataType
+					.getDataType(((ObjectPathIf) pChild).getCIMObjectPath());
+			else if (pChild instanceof ValueIf) this.iType = CIMDataType
+					.getDataType(((ValueIf) pChild).getValue());
+			this.iHasTypeValue = true;
+		}
+		this.iHasChild = true;
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (!this.iHasTypeValue) {
+			// here is a type and value conversion
+			this.iType = this.iEmbObjHandler.getType();
+			this.iValue = this.iEmbObjHandler.getValue();
+		}
+	}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+	/**
+	 * getCIMArgument
+	 * 
+	 * @return CIMArgument
+	 */
+	@Override
+	public CIMArgument getCIMArgument() {
+		/*
+		 * CIMArgument(String name, CIMDataType type, Object value)
+		 */
+		return new CIMArgument(this.iName, this.iType, this.iValue);
+	}
+
+	/**
+	 * @see ValueIf#getValue()
+	 */
+	public Object getValue() {
+		return this.iValue;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java
similarity index 69%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java
index 67a2fce..2c80f8c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java
@@ -1,92 +1,89 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- *    2705    2013-11-11  blaschke-oss PARAMETER.ARRAY does not require TYPE attribute
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT PARAMETER.ARRAY (QUALIFIER*)
- * ATTLIST PARAMETER.ARRAY
- *   %CIMName;
- *   %CIMType;              #REQUIRED
- *   %ArraySize;
- * 
      
- */
-public class ParameterArrayNode extends AbstractParameterNode {
-
-	private CIMDataType iType;
-
-	private EmbObjHandler iEmbObjHandler;
-
-	/**
-	 * Ctor.
-	 */
-	public ParameterArrayNode() {
-		super(PARAMETER_ARRAY);
-	}
-
-	@Override
-	protected void specificInit(Attributes pAttribs) throws SAXException {
-		if (getCIMType(pAttribs, true) == null) throw new SAXException(
-				"PARAMETER.ARRAY element missing TYPE attribute!");
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				this.iSession, this.iQualiHandler, true);
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		this.iType = this.iEmbObjHandler.getArrayType();
-	}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ *    2705    2013-11-11  blaschke-oss PARAMETER.ARRAY does not require TYPE attribute
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT PARAMETER.ARRAY (QUALIFIER*)
+ * ATTLIST PARAMETER.ARRAY
+ *   %CIMName;
+ *   %CIMType;              #REQUIRED
+ *   %ArraySize;
+ * 
      
+ */
+public class ParameterArrayNode extends AbstractParameterNode {
+
+	private CIMDataType iType;
+
+	private EmbObjHandler iEmbObjHandler;
+
+	/**
+	 * Ctor.
+	 */
+	public ParameterArrayNode() {
+		super(PARAMETER_ARRAY);
+	}
+
+	@Override
+	protected void specificInit(Attributes pAttribs) throws SAXException {
+		if (getCIMType(pAttribs, true) == null) throw new SAXException(
+				"PARAMETER.ARRAY element missing TYPE attribute!");
+		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
+				this.iSession, this.iQualiHandler, true);
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		this.iType = this.iEmbObjHandler.getArrayType();
+	}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java
similarity index 69%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java
index 44cdcf5..7f2239e 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java
@@ -1,88 +1,85 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- *    2704    2013-11-11  blaschke-oss PARAMETER does not require TYPE attribute
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT PARAMETER (QUALIFIER*) ATTLIST PARAMETER %CIMName; %CIMType;
- */
-public class ParameterNode extends AbstractParameterNode {
-
-	private CIMDataType iType;
-
-	private EmbObjHandler iEmbObjHandler;
-
-	/**
-	 * Ctor.
-	 */
-	public ParameterNode() {
-		super(PARAMETER);
-	}
-
-	@Override
-	protected void specificInit(Attributes pAttribs) throws SAXException {
-		if (getCIMType(pAttribs, true) == null) throw new SAXException(
-				"PARAMETER element missing TYPE attribute!");
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				this.iSession, this.iQualiHandler, true);
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		this.iType = this.iEmbObjHandler.getType();
-		if (this.iType.isArray()) throw new SAXException(
-				"PARAMETER node's TYPE attribute cannot be an array!");
-	}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ *    2704    2013-11-11  blaschke-oss PARAMETER does not require TYPE attribute
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT PARAMETER (QUALIFIER*) ATTLIST PARAMETER %CIMName; %CIMType;
+ */
+public class ParameterNode extends AbstractParameterNode {
+
+	private CIMDataType iType;
+
+	private EmbObjHandler iEmbObjHandler;
+
+	/**
+	 * Ctor.
+	 */
+	public ParameterNode() {
+		super(PARAMETER);
+	}
+
+	@Override
+	protected void specificInit(Attributes pAttribs) throws SAXException {
+		if (getCIMType(pAttribs, true) == null) throw new SAXException(
+				"PARAMETER element missing TYPE attribute!");
+		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
+				this.iSession, this.iQualiHandler, true);
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		this.iType = this.iEmbObjHandler.getType();
+		if (this.iType.isArray()) throw new SAXException(
+				"PARAMETER node's TYPE attribute cannot be an array!");
+	}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java
similarity index 71%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java
index b7dd3fb..6d8d383 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java
@@ -1,89 +1,86 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1735614    2007-06-12  ebak         Wrong ARRAYSIZE attribute handling in SAX/PULL
- * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2433593    2008-12-18  rgummada     isArray returns true for method parameters of type reference
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- *    2605    2013-03-20  buccella     SAX parser throws wrong exception
- *    2636    2013-05-08  blaschke-oss Nested embedded instances cause CIMXMLParseException
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT PARAMETER.REFARRAY (QUALIFIER*)
- * ATTLIST PARAMETER.REFARRAY
- *   %CIMName;
- *   %ReferenceClass;
- *   %ArraySize;
- * 
      
- */
-public class ParameterRefArrayNode extends AbstractParameterNode {
-
-	private CIMDataType iType;
-
-	/**
-	 * Ctor.
-	 */
-	public ParameterRefArrayNode() {
-		super(PARAMETER_REFARRAY);
-	}
-
-	@Override
-	protected void specificInit(Attributes pAttribs) throws SAXException {
-		String refClass = getReferenceClass(pAttribs);
-		this.iType = new CIMDataType(refClass != null ? refClass : "", getArraySize(pAttribs));
-
-	}
-
-	@Override
-	public void testCompletness() { /* */}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1735614    2007-06-12  ebak         Wrong ARRAYSIZE attribute handling in SAX/PULL
+ * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2433593    2008-12-18  rgummada     isArray returns true for method parameters of type reference
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ *    2605    2013-03-20  buccella     SAX parser throws wrong exception
+ *    2636    2013-05-08  blaschke-oss Nested embedded instances cause CIMXMLParseException
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT PARAMETER.REFARRAY (QUALIFIER*)
+ * ATTLIST PARAMETER.REFARRAY
+ *   %CIMName;
+ *   %ReferenceClass;
+ *   %ArraySize;
+ * 
      
+ */
+public class ParameterRefArrayNode extends AbstractParameterNode {
+
+	private CIMDataType iType;
+
+	/**
+	 * Ctor.
+	 */
+	public ParameterRefArrayNode() {
+		super(PARAMETER_REFARRAY);
+	}
+
+	@Override
+	protected void specificInit(Attributes pAttribs) throws SAXException {
+		String refClass = getReferenceClass(pAttribs);
+		this.iType = new CIMDataType(refClass != null ? refClass : "", getArraySize(pAttribs));
+
+	}
+
+	@Override
+	public void testCompletness() { /* */}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java
similarity index 68%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java
index a59b476..20bd71a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java
@@ -1,83 +1,80 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- *    2636    2013-05-08  blaschke-oss Nested embedded instances cause CIMXMLParseException
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.xml.sax.Attributes;
-
-/**
- * 
      - * ELEMENT PARAMETER.REFERENCE (QUALIFIER*)
- * ATTLIST PARAMETER.REFERENCE
- *   %CIMName;
- *   %ReferenceClass;
- * 
      
- */
-public class ParameterReferenceNode extends AbstractParameterNode {
-
-	private CIMDataType iType;
-
-	/**
-	 * Ctor.
-	 */
-	public ParameterReferenceNode() {
-		super(PARAMETER_REFERENCE);
-	}
-
-	@Override
-	protected void specificInit(Attributes pAttribs) {
-		String refClass = getReferenceClass(pAttribs);
-		this.iType = new CIMDataType(refClass != null ? refClass : "");
-	}
-
-	@Override
-	public void testCompletness() { /* */}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ *    2636    2013-05-08  blaschke-oss Nested embedded instances cause CIMXMLParseException
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.xml.sax.Attributes;
+
+/**
+ * 
      + * ELEMENT PARAMETER.REFERENCE (QUALIFIER*)
+ * ATTLIST PARAMETER.REFERENCE
+ *   %CIMName;
+ *   %ReferenceClass;
+ * 
      
+ */
+public class ParameterReferenceNode extends AbstractParameterNode {
+
+	private CIMDataType iType;
+
+	/**
+	 * Ctor.
+	 */
+	public ParameterReferenceNode() {
+		super(PARAMETER_REFERENCE);
+	}
+
+	@Override
+	protected void specificInit(Attributes pAttribs) {
+		String refClass = getReferenceClass(pAttribs);
+		this.iType = new CIMDataType(refClass != null ? refClass : "");
+	}
+
+	@Override
+	public void testCompletness() { /* */}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java
similarity index 75%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java
index 8383e9c..07147ba 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java
@@ -1,142 +1,139 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- *    2701    2013-11-07  blaschke-oss PROPERTY.ARRAY does not require TYPE attribute
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifier;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT PROPERTY.ARRAY (QUALIFIER*, VALUE.ARRAY?)
- * ATTLIST PROPERTY.ARRAY 
- *   %CIMName;
- *   %CIMType;              #REQUIRED
- *   %ArraySize;
- *   %ClassOrigin;
- *   %Propagated;
- *   %EmbeddedObject;    	#IMPLIED - new
- *   xml:lang   NMTOKEN     #IMPLIED
- * 
      
- */
-public class PropertyArrayNode extends AbstractPropertyNode {
-
-	// VALUE.ARRAY
-	// required for super.testChild()
-	private boolean iHasValueArray;
-
-	private boolean iHasTypeAttribute;
-
-	private CIMDataType iType;
-
-	private Object iValue;
-
-	private EmbObjHandler iEmbObjHandler;
-
-	/**
-	 * Ctor.
-	 */
-	public PropertyArrayNode() {
-		super(PROPERTY_ARRAY);
-	}
-
-	@Override
-	protected void specificInit(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iHasTypeAttribute = (getCIMType(pAttribs, true) != null);
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				pSession, this.iQualiHandler, true);
-		this.iHasValueArray = false;
-	}
-
-	@Override
-	protected void childValueNodeParsed(Node pChild) throws SAXException {
-		if (!this.iHasTypeAttribute && ((ValueArrayNode) pChild).getType() == null) throw new SAXException(
-				"PROPERTY.ARRAY element missing TYPE attribute!");
-		this.iEmbObjHandler.addValueNode((ValueArrayNode) pChild);
-		this.iHasValueArray = true;
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		/*
-		 * Value and type conversion are placed here. It can throw Exception.
-		 */
-		this.iType = this.iEmbObjHandler.getArrayType();
-		this.iValue = this.iEmbObjHandler.getValue();
-	}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-	@Override
-	protected String getChildValueNodeNameEnum() {
-		return VALUE_ARRAY;
-	}
-
-	public Object getValue() {
-		// if iHasValueArray is false iObjA is null, since nulled in init()
-		return this.iValue;
-	}
-
-	@Override
-	protected boolean hasValueNode() {
-		return this.iHasValueArray;
-	}
-
-	@Override
-	protected CIMQualifier[] getQualis() {
-		return this.iQualiHandler.getQualis(this.iType == CIMDataType.STRING_ARRAY_T);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ *    2701    2013-11-07  blaschke-oss PROPERTY.ARRAY does not require TYPE attribute
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMQualifier;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT PROPERTY.ARRAY (QUALIFIER*, VALUE.ARRAY?)
+ * ATTLIST PROPERTY.ARRAY 
+ *   %CIMName;
+ *   %CIMType;              #REQUIRED
+ *   %ArraySize;
+ *   %ClassOrigin;
+ *   %Propagated;
+ *   %EmbeddedObject;    	#IMPLIED - new
+ *   xml:lang   NMTOKEN     #IMPLIED
+ * 
      
+ */
+public class PropertyArrayNode extends AbstractPropertyNode {
+
+	// VALUE.ARRAY
+	// required for super.testChild()
+	private boolean iHasValueArray;
+
+	private boolean iHasTypeAttribute;
+
+	private CIMDataType iType;
+
+	private Object iValue;
+
+	private EmbObjHandler iEmbObjHandler;
+
+	/**
+	 * Ctor.
+	 */
+	public PropertyArrayNode() {
+		super(PROPERTY_ARRAY);
+	}
+
+	@Override
+	protected void specificInit(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iHasTypeAttribute = (getCIMType(pAttribs, true) != null);
+		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
+				pSession, this.iQualiHandler, true);
+		this.iHasValueArray = false;
+	}
+
+	@Override
+	protected void childValueNodeParsed(Node pChild) throws SAXException {
+		if (!this.iHasTypeAttribute && ((ValueArrayNode) pChild).getType() == null) throw new SAXException(
+				"PROPERTY.ARRAY element missing TYPE attribute!");
+		this.iEmbObjHandler.addValueNode((ValueArrayNode) pChild);
+		this.iHasValueArray = true;
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		/*
+		 * Value and type conversion are placed here. It can throw Exception.
+		 */
+		this.iType = this.iEmbObjHandler.getArrayType();
+		this.iValue = this.iEmbObjHandler.getValue();
+	}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+	@Override
+	protected String getChildValueNodeNameEnum() {
+		return VALUE_ARRAY;
+	}
+
+	public Object getValue() {
+		// if iHasValueArray is false iObjA is null, since nulled in init()
+		return this.iValue;
+	}
+
+	@Override
+	protected boolean hasValueNode() {
+		return this.iHasValueArray;
+	}
+
+	@Override
+	protected CIMQualifier[] getQualis() {
+		return this.iQualiHandler.getQualis(this.iType == CIMDataType.STRING_ARRAY_T);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java
index 830e030..2887239 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java
@@ -1,139 +1,136 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- *    2700    2013-11-07  blaschke-oss PROPERTY does not require TYPE attribute
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifier;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT PROPERTY (QUALIFIER*, VALUE?)
- * ATTLIST PROPERTY 
- *   %CIMName;
- *   %ClassOrigin;
- *   %Propagated;
- *   %CIMType;              #REQUIRED
- *   %EmbeddedObject;       #IMPLIED  - new
- *   xml:lang   NMTOKEN     #IMPLIED
- * 
      
- */
-public class PropertyNode extends AbstractPropertyNode {
-
-	private CIMDataType iType;
-
-	// VALUE element
-	private boolean iHasValue;
-
-	private boolean iHasTypeAttribute;
-
-	private Object iValue;
-
-	private EmbObjHandler iEmbObjHandler;
-
-	/**
-	 * Ctor.
-	 */
-	public PropertyNode() {
-		super(PROPERTY);
-	}
-
-	@Override
-	protected void specificInit(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iHasTypeAttribute = (getCIMType(pAttribs, true) != null);
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				pSession, this.iQualiHandler, true);
-		this.iHasValue = false;
-	}
-
-	@Override
-	public void childValueNodeParsed(Node pChild) throws SAXException {
-		this.iHasValue = true;
-		if (!this.iHasTypeAttribute && ((ValueNode) pChild).getType() == null) throw new SAXException(
-				"PROPERTY element missing TYPE attribute!");
-		this.iEmbObjHandler.addValueNode((ValueNode) pChild);
-	}
-
-	@Override
-	protected String getChildValueNodeNameEnum() {
-		return VALUE;
-	}
-
-	@Override
-	protected boolean hasValueNode() {
-		return this.iHasValue;
-	}
-
-	@Override
-	protected CIMQualifier[] getQualis() {
-		return this.iQualiHandler.getQualis(getType() == CIMDataType.STRING_T);
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		/*
-		 * Value and type conversion are placed here. It can throw Exception.
-		 */
-		this.iType = this.iEmbObjHandler.getType();
-		this.iValue = this.iEmbObjHandler.getValue();
-	}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-	public Object getValue() {
-		return this.iValue;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ *    2700    2013-11-07  blaschke-oss PROPERTY does not require TYPE attribute
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMQualifier;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT PROPERTY (QUALIFIER*, VALUE?)
+ * ATTLIST PROPERTY 
+ *   %CIMName;
+ *   %ClassOrigin;
+ *   %Propagated;
+ *   %CIMType;              #REQUIRED
+ *   %EmbeddedObject;       #IMPLIED  - new
+ *   xml:lang   NMTOKEN     #IMPLIED
+ * 
      
+ */
+public class PropertyNode extends AbstractPropertyNode {
+
+	private CIMDataType iType;
+
+	// VALUE element
+	private boolean iHasValue;
+
+	private boolean iHasTypeAttribute;
+
+	private Object iValue;
+
+	private EmbObjHandler iEmbObjHandler;
+
+	/**
+	 * Ctor.
+	 */
+	public PropertyNode() {
+		super(PROPERTY);
+	}
+
+	@Override
+	protected void specificInit(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iHasTypeAttribute = (getCIMType(pAttribs, true) != null);
+		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
+				pSession, this.iQualiHandler, true);
+		this.iHasValue = false;
+	}
+
+	@Override
+	public void childValueNodeParsed(Node pChild) throws SAXException {
+		this.iHasValue = true;
+		if (!this.iHasTypeAttribute && ((ValueNode) pChild).getType() == null) throw new SAXException(
+				"PROPERTY element missing TYPE attribute!");
+		this.iEmbObjHandler.addValueNode((ValueNode) pChild);
+	}
+
+	@Override
+	protected String getChildValueNodeNameEnum() {
+		return VALUE;
+	}
+
+	@Override
+	protected boolean hasValueNode() {
+		return this.iHasValue;
+	}
+
+	@Override
+	protected CIMQualifier[] getQualis() {
+		return this.iQualiHandler.getQualis(getType() == CIMDataType.STRING_T);
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		/*
+		 * Value and type conversion are placed here. It can throw Exception.
+		 */
+		this.iType = this.iEmbObjHandler.getType();
+		this.iValue = this.iEmbObjHandler.getValue();
+	}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+	public Object getValue() {
+		return this.iValue;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java
index 2719b7a..027e1ca 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java
@@ -1,121 +1,118 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- *    2636    2013-05-08  blaschke-oss Nested embedded instances cause CIMXMLParseException
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-
-/**
- * 
      - * 
- * ELEMENT PROPERTY.REFERENCE (QUALIFIER*, (VALUE.REFERENCE)?)
- * ATTLIST PROPERTY.REFERENCE
- *   %CIMName; 
- *   %ReferenceClass; 
- *   %ClassOrigin;
- *   %Propagated;
- * 
      
- */
-public class PropertyReferenceNode extends AbstractPropertyNode {
-
-	private String iRefClassName;
-
-	// VALUE.REFERENCE
-	private boolean iHasValueRef;
-
-	private Object iValue;
-
-	/**
-	 * Ctor.
-	 */
-	public PropertyReferenceNode() {
-		super(PROPERTY_REFERENCE);
-	}
-
-	@Override
-	protected void childValueNodeParsed(Node pChild) {
-		this.iValue = ((ValueReferenceNode) pChild).getValue();
-		this.iHasValueRef = true;
-	}
-
-	@Override
-	protected String getChildValueNodeNameEnum() {
-		return VALUE_REFERENCE;
-	}
-
-	public Object getValue() {
-		return this.iHasValueRef ? this.iValue : null;
-	}
-
-	@Override
-	protected boolean hasValueNode() {
-		return this.iHasValueRef;
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	protected void specificInit(Attributes pAttribs, SAXSession pSession) {
-		this.iHasValueRef = false;
-		this.iRefClassName = getReferenceClass(pAttribs);
-	}
-
-	@Override
-	public void testCompletness() {
-	//
-	}
-
-	public CIMDataType getType() {
-		return new CIMDataType(this.iRefClassName != null ? this.iRefClassName : "");
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ *    2636    2013-05-08  blaschke-oss Nested embedded instances cause CIMXMLParseException
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+
+/**
+ * 
      + * 
+ * ELEMENT PROPERTY.REFERENCE (QUALIFIER*, (VALUE.REFERENCE)?)
+ * ATTLIST PROPERTY.REFERENCE
+ *   %CIMName; 
+ *   %ReferenceClass; 
+ *   %ClassOrigin;
+ *   %Propagated;
+ * 
      
+ */
+public class PropertyReferenceNode extends AbstractPropertyNode {
+
+	private String iRefClassName;
+
+	// VALUE.REFERENCE
+	private boolean iHasValueRef;
+
+	private Object iValue;
+
+	/**
+	 * Ctor.
+	 */
+	public PropertyReferenceNode() {
+		super(PROPERTY_REFERENCE);
+	}
+
+	@Override
+	protected void childValueNodeParsed(Node pChild) {
+		this.iValue = ((ValueReferenceNode) pChild).getValue();
+		this.iHasValueRef = true;
+	}
+
+	@Override
+	protected String getChildValueNodeNameEnum() {
+		return VALUE_REFERENCE;
+	}
+
+	public Object getValue() {
+		return this.iHasValueRef ? this.iValue : null;
+	}
+
+	@Override
+	protected boolean hasValueNode() {
+		return this.iHasValueRef;
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	protected void specificInit(Attributes pAttribs, SAXSession pSession) {
+		this.iHasValueRef = false;
+		this.iRefClassName = getReferenceClass(pAttribs);
+	}
+
+	@Override
+	public void testCompletness() {
+	//
+	}
+
+	public CIMDataType getType() {
+		return new CIMDataType(this.iRefClassName != null ? this.iRefClassName : "");
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java
index b2e4671..4858f34 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java
@@ -1,223 +1,220 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
- * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
- *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifierType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMHelper;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT QUALIFIER.DECLARATION (SCOPE?, (VALUE | VALUE.ARRAY)?)
- * ATTLIST QUALIFIER.DECLARATION 
- * 	%CIMName;               
- * 	%CIMType;               #REQUIRED
- * 	ISARRAY    (true|false) #IMPLIED
- * 	%ArraySize;
- * 	%QualifierFlavor;
- * 
      
- */
-public class QualiDeclNode extends Node implements TypedIf, ValueIf {
-
-	// child nodes
-	// SCOPE
-	private boolean iHasScope;
-
-	private int iScope;
-
-	// VALUE
-	private String iValueNodeName;
-
-	private Object iValue;
-
-	// attributes
-	private String iName;
-
-	private CIMDataType iType;
-
-	private int iFlavor;
-
-	/**
-	 * Ctor.
-	 */
-	public QualiDeclNode() {
-		super(QUALIFIER_DECLARATION);
-	}
-
-	/**
-	 * getName
-	 * 
-	 * @return String
-	 */
-	public String getName() {
-		return this.iName;
-	}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-	/**
-	 * getFlavor
-	 * 
-	 * @return int - CIMFlavor bitset
-	 */
-	public int getFlavor() {
-		return this.iFlavor;
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iHasScope = false;
-		this.iScope = 0;
-		this.iValueNodeName = null;
-		this.iValue = null;
-		this.iName = getCIMName(pAttribs);
-		this.iType = getCIMType(pAttribs, true);
-		this.iFlavor = getQualifierFlavor(pAttribs);
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == VALUE || pNodeNameEnum == VALUE_ARRAY) {
-			if (this.iValueNodeName != null) throw new SAXException("Cannot add " + pNodeNameEnum
-					+ " node, this " + getNodeName() + " node has already got a "
-					+ this.iValueNodeName + " node!");
-		} else if (pNodeNameEnum == SCOPE) {
-			if (this.iHasScope) throw new SAXException("Cannot add " + pNodeNameEnum
-					+ " node, this " + getNodeName() + " node has already got one!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-	}
-
-	/**
-	 * Required to handle the output XML of some non-standard CIMOMs like SVC
-	 * which adds the TYPE attribute to the sub VALUE or VALUE.ARRAY XML
-	 * element.
-	 * 
-	 * @param pTypedIf
-	 * @throws SAXException
-	 */
-	private void setType(TypedIf pTypedIf) throws SAXException {
-		if (this.iType != null) return;
-		this.iType = pTypedIf.getType();
-		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
-				+ getNodeName() + " node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) throws SAXException {
-		if (pChild instanceof ScopeNode) {
-			this.iHasScope = true;
-			this.iScope = ((ScopeNode) pChild).getScope();
-		} else {
-			this.iValueNodeName = pChild.getNodeName();
-			if (pChild instanceof ValueArrayNode) {
-				ValueArrayNode valAChild = (ValueArrayNode) pChild;
-				setType(valAChild);
-				this.iValue = CIMObjectFactory.getObject(this.iType, valAChild);
-				// making array type
-				if (!this.iType.isArray()) this.iType = CIMHelper.UnboundedArrayDataType(this.iType
-						.getType());
-			} else if (pChild instanceof ValueNode) {
-				ValueNode valChild = (ValueNode) pChild;
-				setType(valChild);
-				this.iValue = CIMObjectFactory.getObject(this.iType, valChild);
-			} else {
-				this.iValue = null;
-			}
-		}
-
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
-				+ getNodeName() + " node!");
-	}
-
-	/**
-	 * getCIMQualifierType
-	 * 
-	 * @return CIMQualifierType
-	 */
-	public CIMQualifierType getCIMQualifierType() {
-		/*
-		 * CIMQualifierType( CIMObjectPath pPath, CIMDataType pType, Object
-		 * pValue, int pScope, int pFlavor )
-		 */
-		return new CIMQualifierType(new CIMObjectPath(null, null, null, null, this.iName,
-				null), this.iType, this.iValue, this.iScope, this.iFlavor);
-	}
-
-	public Object getValue() {
-		return getCIMQualifierType();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
+ * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMQualifierType;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT QUALIFIER.DECLARATION (SCOPE?, (VALUE | VALUE.ARRAY)?)
+ * ATTLIST QUALIFIER.DECLARATION 
+ * 	%CIMName;               
+ * 	%CIMType;               #REQUIRED
+ * 	ISARRAY    (true|false) #IMPLIED
+ * 	%ArraySize;
+ * 	%QualifierFlavor;
+ * 
      
+ */
+public class QualiDeclNode extends Node implements TypedIf, ValueIf {
+
+	// child nodes
+	// SCOPE
+	private boolean iHasScope;
+
+	private int iScope;
+
+	// VALUE
+	private String iValueNodeName;
+
+	private Object iValue;
+
+	// attributes
+	private String iName;
+
+	private CIMDataType iType;
+
+	private int iFlavor;
+
+	/**
+	 * Ctor.
+	 */
+	public QualiDeclNode() {
+		super(QUALIFIER_DECLARATION);
+	}
+
+	/**
+	 * getName
+	 * 
+	 * @return String
+	 */
+	public String getName() {
+		return this.iName;
+	}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+	/**
+	 * getFlavor
+	 * 
+	 * @return int - CIMFlavor bitset
+	 */
+	public int getFlavor() {
+		return this.iFlavor;
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iHasScope = false;
+		this.iScope = 0;
+		this.iValueNodeName = null;
+		this.iValue = null;
+		this.iName = getCIMName(pAttribs);
+		this.iType = getCIMType(pAttribs, true);
+		this.iFlavor = getQualifierFlavor(pAttribs);
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == VALUE || pNodeNameEnum == VALUE_ARRAY) {
+			if (this.iValueNodeName != null) throw new SAXException("Cannot add " + pNodeNameEnum
+					+ " node, this " + getNodeName() + " node has already got a "
+					+ this.iValueNodeName + " node!");
+		} else if (pNodeNameEnum == SCOPE) {
+			if (this.iHasScope) throw new SAXException("Cannot add " + pNodeNameEnum
+					+ " node, this " + getNodeName() + " node has already got one!");
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child node!");
+	}
+
+	/**
+	 * Required to handle the output XML of some non-standard CIMOMs like SVC
+	 * which adds the TYPE attribute to the sub VALUE or VALUE.ARRAY XML
+	 * element.
+	 * 
+	 * @param pTypedIf
+	 * @throws SAXException
+	 */
+	private void setType(TypedIf pTypedIf) throws SAXException {
+		if (this.iType != null) return;
+		this.iType = pTypedIf.getType();
+		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
+				+ getNodeName() + " node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) throws SAXException {
+		if (pChild instanceof ScopeNode) {
+			this.iHasScope = true;
+			this.iScope = ((ScopeNode) pChild).getScope();
+		} else {
+			this.iValueNodeName = pChild.getNodeName();
+			if (pChild instanceof ValueArrayNode) {
+				ValueArrayNode valAChild = (ValueArrayNode) pChild;
+				setType(valAChild);
+				this.iValue = CIMObjectFactory.getObject(this.iType, valAChild);
+				// making array type
+				if (!this.iType.isArray()) this.iType = CIMHelper.UnboundedArrayDataType(this.iType
+						.getType());
+			} else if (pChild instanceof ValueNode) {
+				ValueNode valChild = (ValueNode) pChild;
+				setType(valChild);
+				this.iValue = CIMObjectFactory.getObject(this.iType, valChild);
+			} else {
+				this.iValue = null;
+			}
+		}
+
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
+				+ getNodeName() + " node!");
+	}
+
+	/**
+	 * getCIMQualifierType
+	 * 
+	 * @return CIMQualifierType
+	 */
+	public CIMQualifierType getCIMQualifierType() {
+		/*
+		 * CIMQualifierType( CIMObjectPath pPath, CIMDataType pType, Object
+		 * pValue, int pScope, int pFlavor )
+		 */
+		return new CIMQualifierType(new CIMObjectPath(null, null, null, null, this.iName,
+				null), this.iType, this.iValue, this.iScope, this.iFlavor);
+	}
+
+	public Object getValue() {
+		return getCIMQualifierType();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java
index 01ac197..db2dc73 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java
@@ -1,200 +1,197 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1783288    2007-09-10  ebak         CIMClass.isAssociation() not working for retrieved classes.
- * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2013628    2008-07-30  rgummada     SAXException when listing classes
- * 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)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
- * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifier;
-
-import org.sentrysoftware.wbem.sblim.cimclient.GenericExts;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
-
-/**
- * Class QualifiedNodeHandler helps parsing XML elements with QUALIFIER child
- * elements.
- */
-public class QualifiedNodeHandler {
-
-	private static final Boolean TRUE = Boolean.TRUE;
-
-	private ArrayList> iQualiAL;
-
-	private CIMQualifiedElementInterfaceImpl iQualiImpl;
-
-	private boolean iHasEmbObjQuali, iHasEmbInstQuali;
-
-	private boolean iHasKeyQuali, iHasAssocQuali;
-
-	/**
-	 * init
-	 * 
-	 * @param pQNH
-	 *            - if it's null it returns with a new instance otherwise it
-	 *            inits and returns pQNH
-	 * @return a QualifiedNodeHandler instance
-	 */
-	public static QualifiedNodeHandler init(QualifiedNodeHandler pQNH) {
-		if (pQNH == null) pQNH = new QualifiedNodeHandler();
-		pQNH.init();
-		return pQNH;
-	}
-
-	/**
-	 * init - for reusing an existing QualifiedNodeHandler instance
-	 */
-	public void init() {
-		this.iQualiAL = GenericExts.initClearArrayList(this.iQualiAL);
-		this.iHasEmbObjQuali = this.iHasEmbInstQuali = this.iHasKeyQuali = this.iHasAssocQuali = false;
-		this.iQualiImpl = null;
-	}
-
-	/**
-	 * addQualifierNode
-	 * 
-	 * @param pNode
-	 * @return false if pNode is not instance of QualifierNode
-	 */
-	public boolean addQualifierNode(Node pNode) {
-		if (!(pNode instanceof QualifierNode)) return false;
-		if (this.iQualiAL == null) this.iQualiAL = new ArrayList>();
-		CIMQualifier quali = ((QualifierNode) pNode).getQualifier();
-		if (quali != null) {
-			// check for null,
-			// because it can be null if child node is not populated
-			if (CIMDataType.BOOLEAN_T.equals(quali.getDataType()) && TRUE.equals(quali.getValue())) {
-				if ("EmbeddedObject".equalsIgnoreCase(quali.getName())) {
-					this.iHasEmbObjQuali = true;
-				} else if ("KEY".equalsIgnoreCase(quali.getName())) {
-					this.iHasKeyQuali = true;
-				} else if ("ASSOCIATION".equalsIgnoreCase(quali.getName())) {
-					this.iHasAssocQuali = true;
-				}
-			} else if (CIMDataType.STRING_T.equals(quali.getDataType())
-					&& "EMBEDDEDINSTANCE".equalsIgnoreCase(quali.getName())) {
-				this.iHasEmbInstQuali = true;
-			}
-			this.iQualiAL.add(quali);
-		}
-		return true;
-	}
-
-	/**
-	 * getQualis
-	 * 
-	 * @return CIMQualifier[]
-	 */
-	public CIMQualifier[] getQualis() {
-		return getQualis(false);
-	}
-
-	/**
-	 * getQualis
-	 * 
-	 * @param pIncludeEmbObj
-	 * @return CIMQualifier[]
-	 */
-	public CIMQualifier[] getQualis(boolean pIncludeEmbObj) {
-		makeQualiImpl(pIncludeEmbObj);
-		return this.iQualiImpl.getQualifiers();
-	}
-
-	/**
-	 * isKeyed
-	 * 
-	 * @return boolean
-	 */
-	public boolean isKeyed() {
-		return this.iHasKeyQuali;
-	}
-
-	/**
-	 * isAssociation
-	 * 
-	 * @return boolean
-	 */
-	public boolean isAssociation() {
-		return this.iHasAssocQuali;
-	}
-
-	/**
-	 * isEmbeddedObject
-	 * 
-	 * @return boolean
-	 */
-	public boolean isEmbeddedObject() {
-		return this.iHasEmbObjQuali;
-	}
-
-	/**
-	 * isEmbeddedInstance
-	 * 
-	 * @return boolean
-	 */
-	public boolean isEmbeddedInstance() {
-		return this.iHasEmbInstQuali;
-	}
-
-	private static final CIMQualifier[] EMPTY_QA = new CIMQualifier[0];
-
-	private void makeQualiImpl(boolean pIncludeEmbObj) {
-		if (this.iQualiImpl != null) return;
-		if (this.iQualiAL == null) {
-			this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(null);
-			return;
-		}
-		this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(this.iQualiAL.toArray(EMPTY_QA),
-				this.iHasKeyQuali, pIncludeEmbObj);
-		this.iQualiAL = null;
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1783288    2007-09-10  ebak         CIMClass.isAssociation() not working for retrieved classes.
+ * 1820763    2007-10-29  ebak         Supporting the EmbeddedInstance qualifier
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2013628    2008-07-30  rgummada     SAXException when listing classes
+ * 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)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
+ * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMQualifier;
+import org.metricshub.wbem.sblim.cimclient.GenericExts;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
+
+/**
+ * Class QualifiedNodeHandler helps parsing XML elements with QUALIFIER child
+ * elements.
+ */
+public class QualifiedNodeHandler {
+
+	private static final Boolean TRUE = Boolean.TRUE;
+
+	private ArrayList> iQualiAL;
+
+	private CIMQualifiedElementInterfaceImpl iQualiImpl;
+
+	private boolean iHasEmbObjQuali, iHasEmbInstQuali;
+
+	private boolean iHasKeyQuali, iHasAssocQuali;
+
+	/**
+	 * init
+	 * 
+	 * @param pQNH
+	 *            - if it's null it returns with a new instance otherwise it
+	 *            inits and returns pQNH
+	 * @return a QualifiedNodeHandler instance
+	 */
+	public static QualifiedNodeHandler init(QualifiedNodeHandler pQNH) {
+		if (pQNH == null) pQNH = new QualifiedNodeHandler();
+		pQNH.init();
+		return pQNH;
+	}
+
+	/**
+	 * init - for reusing an existing QualifiedNodeHandler instance
+	 */
+	public void init() {
+		this.iQualiAL = GenericExts.initClearArrayList(this.iQualiAL);
+		this.iHasEmbObjQuali = this.iHasEmbInstQuali = this.iHasKeyQuali = this.iHasAssocQuali = false;
+		this.iQualiImpl = null;
+	}
+
+	/**
+	 * addQualifierNode
+	 * 
+	 * @param pNode
+	 * @return false if pNode is not instance of QualifierNode
+	 */
+	public boolean addQualifierNode(Node pNode) {
+		if (!(pNode instanceof QualifierNode)) return false;
+		if (this.iQualiAL == null) this.iQualiAL = new ArrayList>();
+		CIMQualifier quali = ((QualifierNode) pNode).getQualifier();
+		if (quali != null) {
+			// check for null,
+			// because it can be null if child node is not populated
+			if (CIMDataType.BOOLEAN_T.equals(quali.getDataType()) && TRUE.equals(quali.getValue())) {
+				if ("EmbeddedObject".equalsIgnoreCase(quali.getName())) {
+					this.iHasEmbObjQuali = true;
+				} else if ("KEY".equalsIgnoreCase(quali.getName())) {
+					this.iHasKeyQuali = true;
+				} else if ("ASSOCIATION".equalsIgnoreCase(quali.getName())) {
+					this.iHasAssocQuali = true;
+				}
+			} else if (CIMDataType.STRING_T.equals(quali.getDataType())
+					&& "EMBEDDEDINSTANCE".equalsIgnoreCase(quali.getName())) {
+				this.iHasEmbInstQuali = true;
+			}
+			this.iQualiAL.add(quali);
+		}
+		return true;
+	}
+
+	/**
+	 * getQualis
+	 * 
+	 * @return CIMQualifier[]
+	 */
+	public CIMQualifier[] getQualis() {
+		return getQualis(false);
+	}
+
+	/**
+	 * getQualis
+	 * 
+	 * @param pIncludeEmbObj
+	 * @return CIMQualifier[]
+	 */
+	public CIMQualifier[] getQualis(boolean pIncludeEmbObj) {
+		makeQualiImpl(pIncludeEmbObj);
+		return this.iQualiImpl.getQualifiers();
+	}
+
+	/**
+	 * isKeyed
+	 * 
+	 * @return boolean
+	 */
+	public boolean isKeyed() {
+		return this.iHasKeyQuali;
+	}
+
+	/**
+	 * isAssociation
+	 * 
+	 * @return boolean
+	 */
+	public boolean isAssociation() {
+		return this.iHasAssocQuali;
+	}
+
+	/**
+	 * isEmbeddedObject
+	 * 
+	 * @return boolean
+	 */
+	public boolean isEmbeddedObject() {
+		return this.iHasEmbObjQuali;
+	}
+
+	/**
+	 * isEmbeddedInstance
+	 * 
+	 * @return boolean
+	 */
+	public boolean isEmbeddedInstance() {
+		return this.iHasEmbInstQuali;
+	}
+
+	private static final CIMQualifier[] EMPTY_QA = new CIMQualifier[0];
+
+	private void makeQualiImpl(boolean pIncludeEmbObj) {
+		if (this.iQualiImpl != null) return;
+		if (this.iQualiAL == null) {
+			this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(null);
+			return;
+		}
+		this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(this.iQualiAL.toArray(EMPTY_QA),
+				this.iHasKeyQuali, pIncludeEmbObj);
+		this.iQualiAL = null;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java
index e23b8f0..7090da9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java
@@ -1,189 +1,186 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2013628    2008-07-30  rgummada     SAXException when listing classes
- * 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)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
- *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifier;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMHelper;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT QUALIFIER ((VALUE | VALUE.ARRAY)?)
- * ATTLIST QUALIFIER 
- *  %CIMName;
- *  %CIMType;              #REQUIRED
- *  %Propagated;
- *  %QualifierFlavor;
- *  xml:lang   NMTOKEN     #IMPLIED
- * 
      
- */
-public class QualifierNode extends Node {
-
-	private String iName;
-
-	private CIMDataType iType;
-
-	private boolean iPropagated;
-
-	private int iFlavor;
-
-	// (VALUE | VALUE.ARRAY)
-	// it can be built when child is available
-	private CIMQualifier iQuali;
-
-	/**
-	 * Ctor.
-	 */
-	public QualifierNode() {
-		super(QUALIFIER);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iQuali = null;
-		this.iName = getCIMName(pAttribs);
-		/*
-		 * non-standard CIMOM can supply the type info in the sub Node
-		 */
-		this.iType = getCIMType(pAttribs, true);
-
-		this.iPropagated = getPropagated(pAttribs);
-		this.iFlavor = getQualifierFlavor(pAttribs);
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iQuali != null) throw new SAXException(getNodeName()
-				+ " node can have only one VALUE or VALUE.ARRAY child node!");
-		if (pNodeNameEnum != VALUE && pNodeNameEnum != VALUE_ARRAY) throw new SAXException(
-				pNodeNameEnum + " child node is not valid for " + getNodeName() + " node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) throws SAXException {
-		AbstractValueNode absValNode = (AbstractValueNode) pChild;
-		Object value;
-		CIMDataType type;
-		if (absValNode instanceof ValueArrayNode) {
-			ValueArrayNode valANode = (ValueArrayNode) absValNode;
-			setType(valANode);
-			// create array value
-			value = CIMObjectFactory.getObject(this.iType, valANode);
-			// constructs array type
-			type = this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
-					.getType());
-		} else if (absValNode instanceof ValueNode) {
-			ValueNode valNode = (ValueNode) absValNode;
-			setType(valNode);
-			String valueStr = (String) valNode.getValue();
-			type = this.iType;
-			value = CIMObjectFactory.getObject(type, valueStr);
-		} else {
-			type = CIMDataType.STRING_T;
-			value = null;
-		}
-		this.iQuali = new CIMQualifier(this.iName, type, value, this.iFlavor,
-				this.iPropagated);
-	}
-
-	@Override
-	public void testCompletness() {
-	// child node is optional, hence commented to support
-	// servers that do not implement default value to qualifier node
-	/*
-	 * if (iQuali == null) throw new SAXException(getNodeName() + " must have a
-	 * VALUE or VALUE.ARRAY child node!");
-	 */
-	}
-
-	/**
-	 * getQualifier
-	 * 
-	 * @return CIMQualifier
-	 */
-	public CIMQualifier getQualifier() {
-		return this.iQuali;
-	}
-
-	/**
-	 * Required to handle the output XML of some non-standard CIMOMs like SVC
-	 * which adds the TYPE attribute to the sub VALUE or VALUE.ARRAY XML
-	 * element.
-	 * 
-	 * @param pTypedIf
-	 * @throws SAXException
-	 */
-	private void setType(TypedIf pTypedIf) throws SAXException {
-		if (this.iType != null) return;
-		this.iType = pTypedIf.getType();
-		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
-				+ getNodeName() + " node!");
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2013628    2008-07-30  rgummada     SAXException when listing classes
+ * 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)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMQualifier;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT QUALIFIER ((VALUE | VALUE.ARRAY)?)
+ * ATTLIST QUALIFIER 
+ *  %CIMName;
+ *  %CIMType;              #REQUIRED
+ *  %Propagated;
+ *  %QualifierFlavor;
+ *  xml:lang   NMTOKEN     #IMPLIED
+ * 
      
+ */
+public class QualifierNode extends Node {
+
+	private String iName;
+
+	private CIMDataType iType;
+
+	private boolean iPropagated;
+
+	private int iFlavor;
+
+	// (VALUE | VALUE.ARRAY)
+	// it can be built when child is available
+	private CIMQualifier iQuali;
+
+	/**
+	 * Ctor.
+	 */
+	public QualifierNode() {
+		super(QUALIFIER);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iQuali = null;
+		this.iName = getCIMName(pAttribs);
+		/*
+		 * non-standard CIMOM can supply the type info in the sub Node
+		 */
+		this.iType = getCIMType(pAttribs, true);
+
+		this.iPropagated = getPropagated(pAttribs);
+		this.iFlavor = getQualifierFlavor(pAttribs);
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iQuali != null) throw new SAXException(getNodeName()
+				+ " node can have only one VALUE or VALUE.ARRAY child node!");
+		if (pNodeNameEnum != VALUE && pNodeNameEnum != VALUE_ARRAY) throw new SAXException(
+				pNodeNameEnum + " child node is not valid for " + getNodeName() + " node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) throws SAXException {
+		AbstractValueNode absValNode = (AbstractValueNode) pChild;
+		Object value;
+		CIMDataType type;
+		if (absValNode instanceof ValueArrayNode) {
+			ValueArrayNode valANode = (ValueArrayNode) absValNode;
+			setType(valANode);
+			// create array value
+			value = CIMObjectFactory.getObject(this.iType, valANode);
+			// constructs array type
+			type = this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
+					.getType());
+		} else if (absValNode instanceof ValueNode) {
+			ValueNode valNode = (ValueNode) absValNode;
+			setType(valNode);
+			String valueStr = (String) valNode.getValue();
+			type = this.iType;
+			value = CIMObjectFactory.getObject(type, valueStr);
+		} else {
+			type = CIMDataType.STRING_T;
+			value = null;
+		}
+		this.iQuali = new CIMQualifier(this.iName, type, value, this.iFlavor,
+				this.iPropagated);
+	}
+
+	@Override
+	public void testCompletness() {
+	// child node is optional, hence commented to support
+	// servers that do not implement default value to qualifier node
+	/*
+	 * if (iQuali == null) throw new SAXException(getNodeName() + " must have a
+	 * VALUE or VALUE.ARRAY child node!");
+	 */
+	}
+
+	/**
+	 * getQualifier
+	 * 
+	 * @return CIMQualifier
+	 */
+	public CIMQualifier getQualifier() {
+		return this.iQuali;
+	}
+
+	/**
+	 * Required to handle the output XML of some non-standard CIMOMs like SVC
+	 * which adds the TYPE attribute to the sub VALUE or VALUE.ARRAY XML
+	 * element.
+	 * 
+	 * @param pTypedIf
+	 * @throws SAXException
+	 */
+	private void setType(TypedIf pTypedIf) throws SAXException {
+		if (this.iType != null) return;
+		this.iType = pTypedIf.getType();
+		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
+				+ getNodeName() + " node!");
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java
similarity index 62%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java
index 7bda54b..d7e1d98 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java
@@ -1,63 +1,61 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-05  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * RetValPipeIf is a FIFO interface which helps PULL parsing.
- */
-public interface RetValPipeIf {
-
-	/**
-	 * getReturnValueCount
-	 * 
-	 * @return the currently available return values
-	 */
-	public abstract int getReturnValueCount();
-
-	/**
-	 * readReturnValue
-	 * 
-	 * @return a return value Object from a FIFO
-	 */
-	public abstract Object readReturnValue();
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-05  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * RetValPipeIf is a FIFO interface which helps PULL parsing.
+ */
+public interface RetValPipeIf {
+
+	/**
+	 * getReturnValueCount
+	 * 
+	 * @return the currently available return values
+	 */
+	public abstract int getReturnValueCount();
+
+	/**
+	 * readReturnValue
+	 * 
+	 * @return a return value Object from a FIFO
+	 */
+	public abstract Object readReturnValue();
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java
index efe742f..2dc244f 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java
@@ -1,145 +1,142 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1742873    2007-06-25  ebak         IPv6 ready cim-client
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3194700    2011-03-01  blaschke-oss Exception thrown on extrinsic methods
- * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT RETURNVALUE (VALUE | VALUE.REFERENCE)?
- * ATTLIST RETURNVALUE
- *   %ParamType;       #IMPLIED
- *   %EmbeddedObject;  #IMPLIED - new
- * 
      
- */
-public class ReturnValueNode extends Node implements TypedIf, ValueIf {
-
-	private EmbObjHandler iEmbObjHandler;
-
-	private CIMDataType iType;
-
-	// (VALUE | VALUE.REFERENCE)
-	private boolean iHasValue;
-
-	private Object iValue;
-
-	/**
-	 * Ctor.
-	 */
-	public ReturnValueNode() {
-		super(RETURNVALUE);
-	}
-
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iType = null;
-		this.iValue = null;
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				pSession, null, true);
-		this.iHasValue = false;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == VALUE || pNodeNameEnum == VALUE_REFERENCE) {
-			if (this.iHasValue) throw new SAXException(getNodeName()
-					+ " node can have only one child node!");
-		} else throw new SAXException(pNodeNameEnum + " cannot be the child node of "
-				+ getNodeName() + " node!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) throws SAXException {
-		AbstractValueNode valNode = (AbstractValueNode) pChild;
-		if (valNode instanceof ValueReferenceNode) {
-			if (this.iType != null && this.iType.getType() != CIMDataType.REFERENCE) throw new SAXException(
-					getNodeName() + " node's child node is VALUE.REFERENCE "
-							+ "but its type based on PARAMTYPE attribute is " + this.iType + "!");
-			ValueReferenceNode valRefNode = (ValueReferenceNode) valNode;
-			this.iValue = valRefNode.getCIMObjectPath();
-			this.iType = valRefNode.getType();
-		} else { // VALUE node
-			this.iEmbObjHandler.addValueNode((ValueNode) pChild);
-		}
-		this.iHasValue = true;
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		// DSP0203 v2.3 changed these from required to optional
-		// if (!this.iHasValue) throw new SAXException(getNodeName()
-		// + " node must have a VALUE or VALUE.REFERENCE child node!");
-		if (this.iType == null) {
-			this.iType = this.iEmbObjHandler.getType();
-			this.iValue = this.iEmbObjHandler.getValue();
-		}
-	}
-
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-	public Object getValue() {
-		return this.iValue;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1689085    2007-04-10  ebak         Embedded object enhancements for Pegasus
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1742873    2007-06-25  ebak         IPv6 ready cim-client
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3194700    2011-03-01  blaschke-oss Exception thrown on extrinsic methods
+ * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.EmbObjHandler;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT RETURNVALUE (VALUE | VALUE.REFERENCE)?
+ * ATTLIST RETURNVALUE
+ *   %ParamType;       #IMPLIED
+ *   %EmbeddedObject;  #IMPLIED - new
+ * 
      
+ */
+public class ReturnValueNode extends Node implements TypedIf, ValueIf {
+
+	private EmbObjHandler iEmbObjHandler;
+
+	private CIMDataType iType;
+
+	// (VALUE | VALUE.REFERENCE)
+	private boolean iHasValue;
+
+	private Object iValue;
+
+	/**
+	 * Ctor.
+	 */
+	public ReturnValueNode() {
+		super(RETURNVALUE);
+	}
+
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iType = null;
+		this.iValue = null;
+		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
+				pSession, null, true);
+		this.iHasValue = false;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == VALUE || pNodeNameEnum == VALUE_REFERENCE) {
+			if (this.iHasValue) throw new SAXException(getNodeName()
+					+ " node can have only one child node!");
+		} else throw new SAXException(pNodeNameEnum + " cannot be the child node of "
+				+ getNodeName() + " node!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) throws SAXException {
+		AbstractValueNode valNode = (AbstractValueNode) pChild;
+		if (valNode instanceof ValueReferenceNode) {
+			if (this.iType != null && this.iType.getType() != CIMDataType.REFERENCE) throw new SAXException(
+					getNodeName() + " node's child node is VALUE.REFERENCE "
+							+ "but its type based on PARAMTYPE attribute is " + this.iType + "!");
+			ValueReferenceNode valRefNode = (ValueReferenceNode) valNode;
+			this.iValue = valRefNode.getCIMObjectPath();
+			this.iType = valRefNode.getType();
+		} else { // VALUE node
+			this.iEmbObjHandler.addValueNode((ValueNode) pChild);
+		}
+		this.iHasValue = true;
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		// DSP0203 v2.3 changed these from required to optional
+		// if (!this.iHasValue) throw new SAXException(getNodeName()
+		// + " node must have a VALUE or VALUE.REFERENCE child node!");
+		if (this.iType == null) {
+			this.iType = this.iEmbObjHandler.getType();
+			this.iValue = this.iEmbObjHandler.getValue();
+		}
+	}
+
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+	public Object getValue() {
+		return this.iValue;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java
similarity index 75%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java
index c8a1061..465b28c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java
@@ -1,130 +1,128 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMScope;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT SCOPE EMPTY
- * ATTLIST SCOPE
- *     CLASS (true | false) "false"
- *     ASSOCIATION (true | false) "false"
- *     REFERENCE (true | false) "false"
- *     PROPERTY (true | false) "false"
- *     METHOD (true | false) "false"
- *     PARAMETER (true | false) "false"
- *     INDICATION (true | false) "false"
- * 
      
- */
-public class ScopeNode extends Node {
-
-	private int iScope;
-
-	/**
-	 * Ctor.
-	 */
-	public ScopeNode() {
-		super(SCOPE);
-	}
-
-	/**
-	 * getScope
-	 * 
-	 * @return int - set of CIMScope bits
-	 */
-	public int getScope() {
-		return this.iScope;
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iScope = 0;
-		if (hasTrueAttribute(pAttribs, "CLASS")) this.iScope |= CIMScope.CLASS;
-		if (hasTrueAttribute(pAttribs, "ASSOCIATION")) this.iScope |= CIMScope.ASSOCIATION;
-		if (hasTrueAttribute(pAttribs, "REFERENCE")) this.iScope |= CIMScope.REFERENCE;
-		if (hasTrueAttribute(pAttribs, "PROPERTY")) this.iScope |= CIMScope.PROPERTY;
-		if (hasTrueAttribute(pAttribs, "METHOD")) this.iScope |= CIMScope.METHOD;
-		if (hasTrueAttribute(pAttribs, "PARAMETER")) this.iScope |= CIMScope.PARAMETER;
-		if (hasTrueAttribute(pAttribs, "INDICATION")) this.iScope |= CIMScope.INDICATION;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	/**
-	 * @param pNodeNameEnum
-	 */
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		throw new SAXException("SCOPE node cannot have any child node!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// no child
-	}
-
-	@Override
-	public void testCompletness() {
-	// Nothing to test, since it doesn't have any child node.
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMScope;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT SCOPE EMPTY
+ * ATTLIST SCOPE
+ *     CLASS (true | false) "false"
+ *     ASSOCIATION (true | false) "false"
+ *     REFERENCE (true | false) "false"
+ *     PROPERTY (true | false) "false"
+ *     METHOD (true | false) "false"
+ *     PARAMETER (true | false) "false"
+ *     INDICATION (true | false) "false"
+ * 
      
+ */
+public class ScopeNode extends Node {
+
+	private int iScope;
+
+	/**
+	 * Ctor.
+	 */
+	public ScopeNode() {
+		super(SCOPE);
+	}
+
+	/**
+	 * getScope
+	 * 
+	 * @return int - set of CIMScope bits
+	 */
+	public int getScope() {
+		return this.iScope;
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iScope = 0;
+		if (hasTrueAttribute(pAttribs, "CLASS")) this.iScope |= CIMScope.CLASS;
+		if (hasTrueAttribute(pAttribs, "ASSOCIATION")) this.iScope |= CIMScope.ASSOCIATION;
+		if (hasTrueAttribute(pAttribs, "REFERENCE")) this.iScope |= CIMScope.REFERENCE;
+		if (hasTrueAttribute(pAttribs, "PROPERTY")) this.iScope |= CIMScope.PROPERTY;
+		if (hasTrueAttribute(pAttribs, "METHOD")) this.iScope |= CIMScope.METHOD;
+		if (hasTrueAttribute(pAttribs, "PARAMETER")) this.iScope |= CIMScope.PARAMETER;
+		if (hasTrueAttribute(pAttribs, "INDICATION")) this.iScope |= CIMScope.INDICATION;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	/**
+	 * @param pNodeNameEnum
+	 */
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		throw new SAXException("SCOPE node cannot have any child node!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// no child
+	}
+
+	@Override
+	public void testCompletness() {
+	// Nothing to test, since it doesn't have any child node.
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java
index 6469e0d..2c99bb2 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java
@@ -1,108 +1,106 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT SIMPLEEXPREQ (CORRELATOR*, EXPMETHODCALL)
- */
-public class SimpleExpReqNode extends AbstractMessageNode {
-
-	private ExpMethodCallNode iMethodCallNode;
-
-	/**
-	 * Ctor.
-	 */
-	public SimpleExpReqNode() {
-		super(SIMPLEEXPREQ);
-	}
-
-	public void addChild(Node pChild) {
-		if (pChild instanceof ExpMethodCallNode) {
-			this.iMethodCallNode = (ExpMethodCallNode) pChild;
-		} else if (pChild instanceof CorrelatorNode) {
-			// TODO: return to WBEMClient API if JSR48 changes
-		}
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iMethodCallNode = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == EXPMETHODCALL) {
-			if (this.iMethodCallNode != null) throw new SAXException(getNodeName()
-					+ " node can have only one child node!");
-		} else if (pNodeNameEnum != CORRELATOR) throw new SAXException(getNodeName()
-				+ " node cannot have " + pNodeNameEnum + " child node!");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iMethodCallNode == null) throw new SAXException(getNodeName()
-				+ " node must have a child node!");
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT SIMPLEEXPREQ (CORRELATOR*, EXPMETHODCALL)
+ */
+public class SimpleExpReqNode extends AbstractMessageNode {
+
+	private ExpMethodCallNode iMethodCallNode;
+
+	/**
+	 * Ctor.
+	 */
+	public SimpleExpReqNode() {
+		super(SIMPLEEXPREQ);
+	}
+
+	public void addChild(Node pChild) {
+		if (pChild instanceof ExpMethodCallNode) {
+			this.iMethodCallNode = (ExpMethodCallNode) pChild;
+		} else if (pChild instanceof CorrelatorNode) {
+			// TODO: return to WBEMClient API if JSR48 changes
+		}
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iMethodCallNode = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == EXPMETHODCALL) {
+			if (this.iMethodCallNode != null) throw new SAXException(getNodeName()
+					+ " node can have only one child node!");
+		} else if (pNodeNameEnum != CORRELATOR) throw new SAXException(getNodeName()
+				+ " node cannot have " + pNodeNameEnum + " child node!");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iMethodCallNode == null) throw new SAXException(getNodeName()
+				+ " node must have a child node!");
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java
similarity index 75%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java
index d097f89..15f3724 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java
@@ -1,132 +1,129 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT SIMPLEEXPRSP (EXPMETHODRESPONSE)
- * ELEMENT EXPMETHODRESPONSE (ERROR|IRETURNVALUE?)
- * 
      
- */
-public class SimpleExpRspNode extends AbstractSimpleRspNode {
-
-	private ExpMethodResponseNode iExpMethodRspNode;
-
-	/**
-	 * Ctor.
-	 */
-	public SimpleExpRspNode() {
-		super(SIMPLEEXPRSP);
-	}
-
-	public void addChild(Node pChild) {
-		this.iExpMethodRspNode = (ExpMethodResponseNode) pChild;
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iExpMethodRspNode = null;
-		// no attribs
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iExpMethodRspNode != null) throw new SAXException(getNodeName()
-				+ " node can have only one child node!");
-		if (pNodeNameEnum != EXPMETHODRESPONSE) throw new SAXException(getNodeName()
-				+ " node's child node can be EXPMETHODRESPONSE only! " + pNodeNameEnum
-				+ " is invalid!");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iExpMethodRspNode == null) throw new SAXException(getNodeName()
-				+ " node must have an EXPMETHODRESPONSE child node!");
-	}
-
-	@Override
-	public CIMError getCIMError() {
-		// can be null if it's value was read out before
-		if (this.iExpMethodRspNode == null) return null;
-		return this.iExpMethodRspNode.getCIMError();
-	}
-
-	@Override
-	public CIMArgument[] getCIMArguments() {
-		// no out arguments
-		return null;
-	}
-
-	public int getReturnValueCount() {
-		return this.iExpMethodRspNode == null ? 0 : this.iExpMethodRspNode.getReturnValueCount();
-	}
-
-	public Object readReturnValue() {
-		return this.iExpMethodRspNode == null ? null : this.iExpMethodRspNode.readReturnValue();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT SIMPLEEXPRSP (EXPMETHODRESPONSE)
+ * ELEMENT EXPMETHODRESPONSE (ERROR|IRETURNVALUE?)
+ * 
      
+ */
+public class SimpleExpRspNode extends AbstractSimpleRspNode {
+
+	private ExpMethodResponseNode iExpMethodRspNode;
+
+	/**
+	 * Ctor.
+	 */
+	public SimpleExpRspNode() {
+		super(SIMPLEEXPRSP);
+	}
+
+	public void addChild(Node pChild) {
+		this.iExpMethodRspNode = (ExpMethodResponseNode) pChild;
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iExpMethodRspNode = null;
+		// no attribs
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iExpMethodRspNode != null) throw new SAXException(getNodeName()
+				+ " node can have only one child node!");
+		if (pNodeNameEnum != EXPMETHODRESPONSE) throw new SAXException(getNodeName()
+				+ " node's child node can be EXPMETHODRESPONSE only! " + pNodeNameEnum
+				+ " is invalid!");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iExpMethodRspNode == null) throw new SAXException(getNodeName()
+				+ " node must have an EXPMETHODRESPONSE child node!");
+	}
+
+	@Override
+	public CIMError getCIMError() {
+		// can be null if it's value was read out before
+		if (this.iExpMethodRspNode == null) return null;
+		return this.iExpMethodRspNode.getCIMError();
+	}
+
+	@Override
+	public CIMArgument[] getCIMArguments() {
+		// no out arguments
+		return null;
+	}
+
+	public int getReturnValueCount() {
+		return this.iExpMethodRspNode == null ? 0 : this.iExpMethodRspNode.getReturnValueCount();
+	}
+
+	public Object readReturnValue() {
+		return this.iExpMethodRspNode == null ? null : this.iExpMethodRspNode.readReturnValue();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java
index 3003998..442fcf9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java
@@ -1,122 +1,120 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- *    2712    2013-11-14  blaschke-oss SimpleReqNode allows any CIM element as child
- *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT SIMPLEREQ (CORRELATOR*, (METHODCALL | IMETHODCALL))
- */
-public class SimpleReqNode extends AbstractMessageNode {
-
-	private AbstractMethodCallNode iMethodCallNode;
-
-	/**
-	 * Ctor.
-	 */
-	public SimpleReqNode() {
-		super(SIMPLEREQ);
-	}
-
-	public void addChild(Node pChild) {
-		if (pChild instanceof AbstractMethodCallNode) {
-			this.iMethodCallNode = (AbstractMethodCallNode) pChild;
-		} else if (pChild instanceof CorrelatorNode) {
-			// TODO: return to WBEMClient API if JSR48 changes
-		}
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iMethodCallNode = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	/**
-	 * @param pNodeNameEnum
-	 */
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == IMETHODCALL || pNodeNameEnum == METHODCALL) {
-			if (this.iMethodCallNode != null) throw new SAXException(
-					"SIMPLEREQ node can have only one child node!");
-		} else if (pNodeNameEnum != CORRELATOR) throw new SAXException(
-				"SIMPLEREQ node cannot have " + pNodeNameEnum + " child node!");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iMethodCallNode == null) throw new SAXException(
-				"SIMPLEREQ node must have a child node!");
-	}
-
-	/**
-	 * getAbstractMethodCallNode
-	 * 
-	 * @return AbstractMethodCallNode
-	 */
-	public AbstractMethodCallNode getAbstractMethodCallNode() {
-		return this.iMethodCallNode;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1686000    2007-04-20  ebak         modifyInstance() missing from WBEMClient
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ *    2712    2013-11-14  blaschke-oss SimpleReqNode allows any CIM element as child
+ *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT SIMPLEREQ (CORRELATOR*, (METHODCALL | IMETHODCALL))
+ */
+public class SimpleReqNode extends AbstractMessageNode {
+
+	private AbstractMethodCallNode iMethodCallNode;
+
+	/**
+	 * Ctor.
+	 */
+	public SimpleReqNode() {
+		super(SIMPLEREQ);
+	}
+
+	public void addChild(Node pChild) {
+		if (pChild instanceof AbstractMethodCallNode) {
+			this.iMethodCallNode = (AbstractMethodCallNode) pChild;
+		} else if (pChild instanceof CorrelatorNode) {
+			// TODO: return to WBEMClient API if JSR48 changes
+		}
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iMethodCallNode = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	/**
+	 * @param pNodeNameEnum
+	 */
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == IMETHODCALL || pNodeNameEnum == METHODCALL) {
+			if (this.iMethodCallNode != null) throw new SAXException(
+					"SIMPLEREQ node can have only one child node!");
+		} else if (pNodeNameEnum != CORRELATOR) throw new SAXException(
+				"SIMPLEREQ node cannot have " + pNodeNameEnum + " child node!");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iMethodCallNode == null) throw new SAXException(
+				"SIMPLEREQ node must have a child node!");
+	}
+
+	/**
+	 * getAbstractMethodCallNode
+	 * 
+	 * @return AbstractMethodCallNode
+	 */
+	public AbstractMethodCallNode getAbstractMethodCallNode() {
+		return this.iMethodCallNode;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java
index 9c6c913..4218e61 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java
@@ -1,144 +1,141 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics 
- * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- *    2672    2013-09-26  blaschke-oss Remove SIMPLEREQACK support
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT SIMPLERSP (METHODRESPONSE | IMETHODRESPONSE)
- * 
- * ELEMENT METHODRESPONSE (ERROR|(RETURNVALUE?,PARAMVALUE*))
- * ELEMENT IMETHODRESPONSE (ERROR|IRETURNVALUE?) *
- * 
      
- */
-public class SimpleRspNode extends AbstractSimpleRspNode {
-
-	private Node iChildNode;
-
-	/**
-	 * Ctor.
-	 */
-	public SimpleRspNode() {
-		super(SIMPLERSP);
-	}
-
-	public void addChild(Node pChild) {
-		this.iChildNode = pChild;
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iChildNode = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iChildNode != null) throw new SAXException(getNodeName()
-				+ " node can have only one child node!");
-		if (pNodeNameEnum != METHODRESPONSE && pNodeNameEnum != IMETHODRESPONSE) throw new SAXException(
-				getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iChildNode == null) throw new SAXException(getNodeName()
-				+ " node must have a child node!");
-	}
-
-	@Override
-	public CIMError getCIMError() {
-		if (this.iChildNode instanceof ErrorIf) { return ((ErrorIf) this.iChildNode).getCIMError(); }
-		return null;
-	}
-
-	/**
-	 * getCIMArguments : returns the array of parsed parameters and their values
-	 * : String name, CIMDataType type, Object value
-	 * 
-	 * @return CIMArgument<?>[]
-	 */
-	@Override
-	public CIMArgument[] getCIMArguments() {
-		if (this.iChildNode instanceof MethodResponseNode) return ((MethodResponseNode) this.iChildNode)
-				.getCIMArguments();
-		else if (this.iChildNode instanceof IMethodResponseNode) return ((IMethodResponseNode) this.iChildNode)
-				.getCIMArguments();
-		return null;
-	}
-
-	public int getReturnValueCount() {
-		if (this.iChildNode instanceof RetValPipeIf) { return ((RetValPipeIf) this.iChildNode)
-				.getReturnValueCount(); }
-		return 0;
-	}
-
-	public Object readReturnValue() {
-		return ((RetValPipeIf) this.iChildNode).readReturnValue();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics 
+ * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ *    2672    2013-09-26  blaschke-oss Remove SIMPLEREQACK support
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT SIMPLERSP (METHODRESPONSE | IMETHODRESPONSE)
+ * 
+ * ELEMENT METHODRESPONSE (ERROR|(RETURNVALUE?,PARAMVALUE*))
+ * ELEMENT IMETHODRESPONSE (ERROR|IRETURNVALUE?) *
+ * 
      
+ */
+public class SimpleRspNode extends AbstractSimpleRspNode {
+
+	private Node iChildNode;
+
+	/**
+	 * Ctor.
+	 */
+	public SimpleRspNode() {
+		super(SIMPLERSP);
+	}
+
+	public void addChild(Node pChild) {
+		this.iChildNode = pChild;
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iChildNode = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iChildNode != null) throw new SAXException(getNodeName()
+				+ " node can have only one child node!");
+		if (pNodeNameEnum != METHODRESPONSE && pNodeNameEnum != IMETHODRESPONSE) throw new SAXException(
+				getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iChildNode == null) throw new SAXException(getNodeName()
+				+ " node must have a child node!");
+	}
+
+	@Override
+	public CIMError getCIMError() {
+		if (this.iChildNode instanceof ErrorIf) { return ((ErrorIf) this.iChildNode).getCIMError(); }
+		return null;
+	}
+
+	/**
+	 * getCIMArguments : returns the array of parsed parameters and their values
+	 * : String name, CIMDataType type, Object value
+	 * 
+	 * @return CIMArgument<?>[]
+	 */
+	@Override
+	public CIMArgument[] getCIMArguments() {
+		if (this.iChildNode instanceof MethodResponseNode) return ((MethodResponseNode) this.iChildNode)
+				.getCIMArguments();
+		else if (this.iChildNode instanceof IMethodResponseNode) return ((IMethodResponseNode) this.iChildNode)
+				.getCIMArguments();
+		return null;
+	}
+
+	public int getReturnValueCount() {
+		if (this.iChildNode instanceof RetValPipeIf) { return ((RetValPipeIf) this.iChildNode)
+				.getReturnValueCount(); }
+		return 0;
+	}
+
+	public Object readReturnValue() {
+		return ((RetValPipeIf) this.iChildNode).readReturnValue();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java
similarity index 59%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java
index 62f19e8..88d3487 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java
@@ -1,57 +1,55 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-/**
- * TypedIf is implemented by those classes which can provide a CIMDataType.
- */
-public interface TypedIf {
-
-	/**
-	 * getType
-	 * 
-	 * @return null if the type is unknown
-	 */
-	public CIMDataType getType();
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+
+/**
+ * TypedIf is implemented by those classes which can provide a CIMDataType.
+ */
+public interface TypedIf {
+
+	/**
+	 * getType
+	 * 
+	 * @return null if the type is unknown
+	 */
+	public CIMDataType getType();
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java
index 21ad628..8c5dcf9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java
@@ -1,157 +1,154 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 1735693    2007-06-12  ebak         Empty VALUE.ARRAY elements are parsed as nulls
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
- *    2715    2013-11-26  blaschke-oss Add VALUE.NULL support
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.GenericExts;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMHelper;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT VALUE.ARRAY (VALUE|VALUE.NULL)*
      
- * For non-standard CIMOMs the TYPE and PARAMTYPE attributes are handled.
- */
-public class ValueArrayNode extends AbstractArrayValueNode {
-
-	// VALUE *
-	private ArrayList iValueAL;
-
-	private CIMDataType iType;
-
-	/**
-	 * Ctor.
-	 */
-	public ValueArrayNode() {
-		super(VALUE_ARRAY);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iValueAL = GenericExts.initClearArrayList(this.iValueAL);
-		/*
-		 * For supporting non-standard CIMOMs TYPE and PARAMTYPE attributes are
-		 * handled
-		 */
-		CIMDataType scalarType = getCIMType(pAttribs, true);
-		if (scalarType == null) scalarType = getParamType(pAttribs);
-		// make array type
-		this.iType = scalarType == null ? null : CIMHelper.UnboundedArrayDataType(scalarType
-				.getType());
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != VALUE && pNodeNameEnum != VALUE_NULL) throw new SAXException(
-				"Only VALUE and VALUE.NULL nodes can be added to VALUE.ARRAY nodes but "
-						+ pNodeNameEnum + " found!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (this.iValueAL == null) this.iValueAL = new ArrayList();
-		if (pChild instanceof ValueNode) this.iValueAL.add(((ValueNode) pChild).getValue());
-		else if (pChild instanceof ValueNullNode) this.iValueAL.add(null);
-	}
-
-	@Override
-	public void testCompletness() {
-	// Nothing to test, since it is OK if it doesn't have child node.
-	}
-
-	/**
-	 * @see ArrayIf#elementAt(int)
-	 * @return String value of VALUE child node
-	 */
-	public Object elementAt(int pIdx) {
-		return this.iValueAL.get(pIdx);
-	}
-
-	public int size() {
-		return this.iValueAL == null ? 0 : this.iValueAL.size();
-	}
-
-	/**
-	 * @see TypedIf#getType()
-	 * @return usually null, because the type is unknown, but can return
-	 *         non-null in case of non-standard CIMOM.
-	 */
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-	private static final String[] EMPTY_SA = new String[0];
-
-	/**
-	 * @see ValueIf#getValue() If
-	 *      the getType() returns non-null value, the container Node have to
-	 *      convert the String into the corresponding Java object.
-	 * @return String[]
-	 */
-	public Object getValue() {
-		return this.iValueAL == null ? EMPTY_SA : this.iValueAL.toArray(EMPTY_SA);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 1735693    2007-06-12  ebak         Empty VALUE.ARRAY elements are parsed as nulls
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
+ *    2715    2013-11-26  blaschke-oss Add VALUE.NULL support
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.GenericExts;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT VALUE.ARRAY (VALUE|VALUE.NULL)*
      
+ * For non-standard CIMOMs the TYPE and PARAMTYPE attributes are handled.
+ */
+public class ValueArrayNode extends AbstractArrayValueNode {
+
+	// VALUE *
+	private ArrayList iValueAL;
+
+	private CIMDataType iType;
+
+	/**
+	 * Ctor.
+	 */
+	public ValueArrayNode() {
+		super(VALUE_ARRAY);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iValueAL = GenericExts.initClearArrayList(this.iValueAL);
+		/*
+		 * For supporting non-standard CIMOMs TYPE and PARAMTYPE attributes are
+		 * handled
+		 */
+		CIMDataType scalarType = getCIMType(pAttribs, true);
+		if (scalarType == null) scalarType = getParamType(pAttribs);
+		// make array type
+		this.iType = scalarType == null ? null : CIMHelper.UnboundedArrayDataType(scalarType
+				.getType());
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != VALUE && pNodeNameEnum != VALUE_NULL) throw new SAXException(
+				"Only VALUE and VALUE.NULL nodes can be added to VALUE.ARRAY nodes but "
+						+ pNodeNameEnum + " found!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (this.iValueAL == null) this.iValueAL = new ArrayList();
+		if (pChild instanceof ValueNode) this.iValueAL.add(((ValueNode) pChild).getValue());
+		else if (pChild instanceof ValueNullNode) this.iValueAL.add(null);
+	}
+
+	@Override
+	public void testCompletness() {
+	// Nothing to test, since it is OK if it doesn't have child node.
+	}
+
+	/**
+	 * @see ArrayIf#elementAt(int)
+	 * @return String value of VALUE child node
+	 */
+	public Object elementAt(int pIdx) {
+		return this.iValueAL.get(pIdx);
+	}
+
+	public int size() {
+		return this.iValueAL == null ? 0 : this.iValueAL.size();
+	}
+
+	/**
+	 * @see TypedIf#getType()
+	 * @return usually null, because the type is unknown, but can return
+	 *         non-null in case of non-standard CIMOM.
+	 */
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+	private static final String[] EMPTY_SA = new String[0];
+
+	/**
+	 * @see ValueIf#getValue() If
+	 *      the getType() returns non-null value, the container Node have to
+	 *      convert the String into the corresponding Java object.
+	 * @return String[]
+	 */
+	public Object getValue() {
+		return this.iValueAL == null ? EMPTY_SA : this.iValueAL.toArray(EMPTY_SA);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java
similarity index 62%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java
index fae702d..0fc079c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java
@@ -1,58 +1,56 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * ValueIf should be implemented by Nodes which are able to return JSR48 value
- * objects. (like: CIMDataTime, Integer, String, CIMClass, CIMInstance,
- * UnsignetInteger8, ...)
- * 
- */
-public interface ValueIf {
-
-	/**
-	 * getValue
-	 * 
-	 * @return if type is unknown it returns a String
-	 */
-	public Object getValue();
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * ValueIf should be implemented by Nodes which are able to return JSR48 value
+ * objects. (like: CIMDataTime, Integer, String, CIMClass, CIMInstance,
+ * UnsignetInteger8, ...)
+ * 
+ */
+public interface ValueIf {
+
+	/**
+	 * getValue
+	 * 
+	 * @return if type is unknown it returns a String
+	 */
+	public Object getValue();
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java
index e00cbf2..3f7d858 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java
@@ -1,149 +1,146 @@
-/*
-  (C) Copyright IBM Corp. 2009, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Ramandeep S Arora, IBM,  arorar@us.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
- * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMHelper;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT VALUE.INSTANCEWITHPATH (INSTANCEPATH, INSTANCE)
- * 
- * ELEMENT INSTANCEPATH (NAMESPACEPATH,INSTANCENAME)
- *    
- * ELEMENT INSTANCE (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*)
- * ATTLIST INSTANCE
- *   %ClassName;
- *   xml:lang   NMTOKEN      #IMPLIED
- * 
      
- */
-public class ValueInstanceWithPathNode extends AbstractScalarValueNode {
-
-	// INSTANCEPATH
-	private CIMObjectPath iCIMInstPath;
-
-	// INSTANCE
-	private CIMInstance iCIMInstance;
-
-	/**
-	 * Ctor.
-	 */
-	public ValueInstanceWithPathNode() {
-		super(VALUE_INSTANCEWITHPATH);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		// no attribute
-		this.iCIMInstPath = null;
-		this.iCIMInstance = null;
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == INSTANCEPATH) {
-			if (this.iCIMInstPath != null) throw new SAXException(
-					"VALUE.INSTANCEWITHPATH node can have only one INSTANCEPATH node, but another one was found!");
-		} else if (pNodeNameEnum == INSTANCE) {
-			if (this.iCIMInstance != null) throw new SAXException(
-					"VALUE.INSTANCEWITHPATH node can have only one INSTANCE node, but another one was found!");
-		} else {
-			throw new SAXException("VALUE.INSTANCEWITHPATH node cannot have " + pNodeNameEnum
-					+ " child node!");
-		}
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof InstancePathNode) {
-			this.iCIMInstPath = ((InstancePathNode) pChild).getCIMObjectPath();
-		} else {
-			this.iCIMInstance = ((InstanceNode) pChild).getCIMInstance();
-		}
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iCIMInstPath == null) throw new SAXException(
-				"VALUE.INSTANCEWITHPATH node must have an INSTANCEPATH child node!");
-		if (this.iCIMInstance == null) throw new SAXException(
-				"VALUE.INSTANCEWITHPATH node must have an INSTANCE child node!");
-	}
-
-	/**
-	 * @see ValueIf#getValue()
-	 * @return CIMInstance
-	 */
-	public Object getValue() {
-		/*
-		 * INSTANCENAME contains the key properties only, INSTANCE contains
-		 * non-key properties too.
-		 */
-		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
-				.CIMInstanceWithSynchonizedNumericKeyDataTypes(this.iCIMInstPath, this.iCIMInstance
-						.getProperties());
-		return new CIMInstance(this.iCIMInstPath, this.iCIMInstance.getProperties());
-	}
-
-	public CIMDataType getType() {
-		return CIMDataType.OBJECT_T;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2009, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Ramandeep S Arora, IBM,  arorar@us.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
+ * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT VALUE.INSTANCEWITHPATH (INSTANCEPATH, INSTANCE)
+ * 
+ * ELEMENT INSTANCEPATH (NAMESPACEPATH,INSTANCENAME)
+ *    
+ * ELEMENT INSTANCE (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*)
+ * ATTLIST INSTANCE
+ *   %ClassName;
+ *   xml:lang   NMTOKEN      #IMPLIED
+ * 
      
+ */
+public class ValueInstanceWithPathNode extends AbstractScalarValueNode {
+
+	// INSTANCEPATH
+	private CIMObjectPath iCIMInstPath;
+
+	// INSTANCE
+	private CIMInstance iCIMInstance;
+
+	/**
+	 * Ctor.
+	 */
+	public ValueInstanceWithPathNode() {
+		super(VALUE_INSTANCEWITHPATH);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		// no attribute
+		this.iCIMInstPath = null;
+		this.iCIMInstance = null;
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == INSTANCEPATH) {
+			if (this.iCIMInstPath != null) throw new SAXException(
+					"VALUE.INSTANCEWITHPATH node can have only one INSTANCEPATH node, but another one was found!");
+		} else if (pNodeNameEnum == INSTANCE) {
+			if (this.iCIMInstance != null) throw new SAXException(
+					"VALUE.INSTANCEWITHPATH node can have only one INSTANCE node, but another one was found!");
+		} else {
+			throw new SAXException("VALUE.INSTANCEWITHPATH node cannot have " + pNodeNameEnum
+					+ " child node!");
+		}
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof InstancePathNode) {
+			this.iCIMInstPath = ((InstancePathNode) pChild).getCIMObjectPath();
+		} else {
+			this.iCIMInstance = ((InstanceNode) pChild).getCIMInstance();
+		}
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iCIMInstPath == null) throw new SAXException(
+				"VALUE.INSTANCEWITHPATH node must have an INSTANCEPATH child node!");
+		if (this.iCIMInstance == null) throw new SAXException(
+				"VALUE.INSTANCEWITHPATH node must have an INSTANCE child node!");
+	}
+
+	/**
+	 * @see ValueIf#getValue()
+	 * @return CIMInstance
+	 */
+	public Object getValue() {
+		/*
+		 * INSTANCENAME contains the key properties only, INSTANCE contains
+		 * non-key properties too.
+		 */
+		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
+				.CIMInstanceWithSynchonizedNumericKeyDataTypes(this.iCIMInstPath, this.iCIMInstance
+						.getProperties());
+		return new CIMInstance(this.iCIMInstPath, this.iCIMInstance.getProperties());
+	}
+
+	public CIMDataType getType() {
+		return CIMDataType.OBJECT_T;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java
index 790fe3b..dd774be 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java
@@ -1,161 +1,158 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cim.CIMHelper;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * 
      - * ELEMENT VALUE.NAMEDINSTANCE (INSTANCENAME, INSTANCE)
- * 
- * ELEMENT INSTANCENAME (KEYBINDING* | KEYVALUE? | VALUE.REFERENCE?)
- * ATTLIST INSTANCENAME
- *   %ClassName;
- *   
- * ELEMENT INSTANCE (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*)
- * ATTLIST INSTANCE
- *   %ClassName;
- *   xml:lang   NMTOKEN      #IMPLIED 
- * FIXME: Why INSTANCE has qualifiers? CIMInstance doesn't have!
- * FIXME: InstanceName and instance provides redundant information. Why?
- * 
      
- */
-public class ValueNamedInstanceNode extends AbstractScalarValueNode {
-
-	// INSTANCENAME
-	private CIMObjectPath iCIMInstPath;
-
-	// INSTANCE
-	private CIMInstance iCIMInstance;
-
-	/**
-	 * Ctor.
-	 */
-	public ValueNamedInstanceNode() {
-		super(VALUE_NAMEDINSTANCE);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iCIMInstPath = null;
-		this.iCIMInstance = null;
-		// no attribute
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == INSTANCENAME) {
-			if (this.iCIMInstPath != null) throw new SAXException(
-					"VALUE.NAMEDINSTANCE node can have only one INSTANCENAME node, but another one was found!");
-		} else if (pNodeNameEnum == INSTANCE) {
-			if (this.iCIMInstance != null) throw new SAXException(
-					"VALUE.NAMEDINSTANCE node can have only one INSTANCE node, but another one was found!");
-		} else {
-			throw new SAXException("VALUE.NAMEDINSTANCE node cannot have " + pNodeNameEnum
-					+ " child node!");
-		}
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (pChild instanceof InstanceNameNode) {
-			this.iCIMInstPath = ((InstanceNameNode) pChild).getCIMObjectPath();
-		} else {
-			this.iCIMInstance = ((InstanceNode) pChild).getCIMInstance();
-		}
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iCIMInstPath == null) throw new SAXException(
-				"VALUE.NAMEDINSTANCE node must have an INSTANCENAME child node!");
-		if (this.iCIMInstance == null) throw new SAXException(
-				"VALUE.NAMEDINSTANCE node must have an INSTANCE child node!");
-	}
-
-	/**
-	 * @see ValueIf#getValue()
-	 * @return CIMInstance
-	 */
-	public Object getValue() {
-		// CIMObjectPath op=iInstanceNameNode.getCIMObjectPath();
-		/*
-		 * INSTANCENAME contains the key properties only, INSTANCE contains the
-		 * non-key properties too.
-		 */
-		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
-				.CIMInstanceWithSynchonizedNumericKeyDataTypes(this.iCIMInstPath, this.iCIMInstance
-						.getProperties());
-		return new CIMInstance(this.iCIMInstPath, this.iCIMInstance.getProperties());
-	}
-
-	public CIMDataType getType() {
-		return CIMDataType.OBJECT_T;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * 
      + * ELEMENT VALUE.NAMEDINSTANCE (INSTANCENAME, INSTANCE)
+ * 
+ * ELEMENT INSTANCENAME (KEYBINDING* | KEYVALUE? | VALUE.REFERENCE?)
+ * ATTLIST INSTANCENAME
+ *   %ClassName;
+ *   
+ * ELEMENT INSTANCE (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*)
+ * ATTLIST INSTANCE
+ *   %ClassName;
+ *   xml:lang   NMTOKEN      #IMPLIED 
+ * FIXME: Why INSTANCE has qualifiers? CIMInstance doesn't have!
+ * FIXME: InstanceName and instance provides redundant information. Why?
+ * 
      
+ */
+public class ValueNamedInstanceNode extends AbstractScalarValueNode {
+
+	// INSTANCENAME
+	private CIMObjectPath iCIMInstPath;
+
+	// INSTANCE
+	private CIMInstance iCIMInstance;
+
+	/**
+	 * Ctor.
+	 */
+	public ValueNamedInstanceNode() {
+		super(VALUE_NAMEDINSTANCE);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iCIMInstPath = null;
+		this.iCIMInstance = null;
+		// no attribute
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == INSTANCENAME) {
+			if (this.iCIMInstPath != null) throw new SAXException(
+					"VALUE.NAMEDINSTANCE node can have only one INSTANCENAME node, but another one was found!");
+		} else if (pNodeNameEnum == INSTANCE) {
+			if (this.iCIMInstance != null) throw new SAXException(
+					"VALUE.NAMEDINSTANCE node can have only one INSTANCE node, but another one was found!");
+		} else {
+			throw new SAXException("VALUE.NAMEDINSTANCE node cannot have " + pNodeNameEnum
+					+ " child node!");
+		}
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (pChild instanceof InstanceNameNode) {
+			this.iCIMInstPath = ((InstanceNameNode) pChild).getCIMObjectPath();
+		} else {
+			this.iCIMInstance = ((InstanceNode) pChild).getCIMInstance();
+		}
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iCIMInstPath == null) throw new SAXException(
+				"VALUE.NAMEDINSTANCE node must have an INSTANCENAME child node!");
+		if (this.iCIMInstance == null) throw new SAXException(
+				"VALUE.NAMEDINSTANCE node must have an INSTANCE child node!");
+	}
+
+	/**
+	 * @see ValueIf#getValue()
+	 * @return CIMInstance
+	 */
+	public Object getValue() {
+		// CIMObjectPath op=iInstanceNameNode.getCIMObjectPath();
+		/*
+		 * INSTANCENAME contains the key properties only, INSTANCE contains the
+		 * non-key properties too.
+		 */
+		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
+				.CIMInstanceWithSynchonizedNumericKeyDataTypes(this.iCIMInstPath, this.iCIMInstance
+						.getProperties());
+		return new CIMInstance(this.iCIMInstPath, this.iCIMInstance.getProperties());
+	}
+
+	public CIMDataType getType() {
+		return CIMDataType.OBJECT_T;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java
similarity index 75%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java
index 9c08fbe..ca92305 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java
@@ -1,134 +1,131 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
- * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT VALUE (#PCDATA)
      
- * For non-standard CIMOMs the TYPE and PARAMTYPE attributes are supported.
- */
-public class ValueNode extends AbstractScalarValueNode {
-
-	private CIMDataType iType;
-
-	private String iData;
-
-	/**
-	 * Ctor.
-	 */
-	public ValueNode() {
-		super(VALUE);
-	}
-
-	/**
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iData = null;
-		/*
-		 * For supporting non-standard CIMOMs TYPE and PARAMTYPE attributes are
-		 * handled
-		 */
-		this.iType = getCIMType(pAttribs, true);
-		if (this.iType == null) this.iType = getParamType(pAttribs);
-	}
-
-	@Override
-	public void parseData(String pData) {
-		this.iData = pData;
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		throw new SAXException("VALUE node cannot have any child node! (" + pNodeNameEnum + ")");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// no child
-	}
-
-	@Override
-	public void testCompletness() {
-	// no child nodes
-	}
-
-	/**
-	 * @see ValueIf#getValue() If
-	 *      the getType() returns non-null value, the container Node have to
-	 *      convert the String into the corresponding Java object.
-	 * @return String
-	 */
-	public Object getValue() {
-		/*
-		 * If iData is null we return empty String. If null values have to be
-		 * represented by avoiding the VALUE element, or placing VALUE.NULLs
-		 * into VALUE.ARRAYs.
-		 */
-		return this.iData == null ? "" : this.iData;
-	}
-
-	/**
-	 * @see TypedIf#getType()
-	 * @return usually null, because the type is unknown, but can return
-	 *         non-null in case of non-standard CIMOM.
-	 */
-	public CIMDataType getType() {
-		return this.iType;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1712656    2007-05-04  ebak         Correct type identification for SVC CIMOM
+ * 1714878    2007-05-08  ebak         Empty string property values are parsed as nulls
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT VALUE (#PCDATA)
      
+ * For non-standard CIMOMs the TYPE and PARAMTYPE attributes are supported.
+ */
+public class ValueNode extends AbstractScalarValueNode {
+
+	private CIMDataType iType;
+
+	private String iData;
+
+	/**
+	 * Ctor.
+	 */
+	public ValueNode() {
+		super(VALUE);
+	}
+
+	/**
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
+		this.iData = null;
+		/*
+		 * For supporting non-standard CIMOMs TYPE and PARAMTYPE attributes are
+		 * handled
+		 */
+		this.iType = getCIMType(pAttribs, true);
+		if (this.iType == null) this.iType = getParamType(pAttribs);
+	}
+
+	@Override
+	public void parseData(String pData) {
+		this.iData = pData;
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		throw new SAXException("VALUE node cannot have any child node! (" + pNodeNameEnum + ")");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// no child
+	}
+
+	@Override
+	public void testCompletness() {
+	// no child nodes
+	}
+
+	/**
+	 * @see ValueIf#getValue() If
+	 *      the getType() returns non-null value, the container Node have to
+	 *      convert the String into the corresponding Java object.
+	 * @return String
+	 */
+	public Object getValue() {
+		/*
+		 * If iData is null we return empty String. If null values have to be
+		 * represented by avoiding the VALUE element, or placing VALUE.NULLs
+		 * into VALUE.ARRAYs.
+		 */
+		return this.iData == null ? "" : this.iData;
+	}
+
+	/**
+	 * @see TypedIf#getType()
+	 * @return usually null, because the type is unknown, but can return
+	 *         non-null in case of non-standard CIMOM.
+	 */
+	public CIMDataType getType() {
+		return this.iType;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java
similarity index 68%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java
index 6f2d735..32f5069 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java
@@ -1,116 +1,113 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT VALUE.NULL EMPTY
- */
-public class ValueNullNode extends AbstractScalarValueNode {
-
-	/**
-	 * Ctor.
-	 */
-	public ValueNullNode() {
-		super(VALUE_NULL);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-	// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	/**
-	 * @param pNodeNameEnum
-	 */
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		throw new SAXException("VALUE.NULL node cannot have any child node!");
-	}
-
-	/**
-	 * @param pChild
-	 */
-	@Override
-	public void childParsed(Node pChild) {
-	// no child
-	}
-
-	@Override
-	public void testCompletness() {
-	// nothing to test
-	}
-
-	/**
-	 * @see ValueIf#getValue()
-	 * @return null
-	 */
-	public Object getValue() {
-		return null;
-	}
-
-	public CIMDataType getType() {
-		// type is unknown
-		return null;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT VALUE.NULL EMPTY
+ */
+public class ValueNullNode extends AbstractScalarValueNode {
+
+	/**
+	 * Ctor.
+	 */
+	public ValueNullNode() {
+		super(VALUE_NULL);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+	// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	/**
+	 * @param pNodeNameEnum
+	 */
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		throw new SAXException("VALUE.NULL node cannot have any child node!");
+	}
+
+	/**
+	 * @param pChild
+	 */
+	@Override
+	public void childParsed(Node pChild) {
+	// no child
+	}
+
+	@Override
+	public void testCompletness() {
+	// nothing to test
+	}
+
+	/**
+	 * @see ValueIf#getValue()
+	 * @return null
+	 */
+	public Object getValue() {
+		return null;
+	}
+
+	public CIMDataType getType() {
+		// type is unknown
+		return null;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java
index 803de02..7f820eb 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java
@@ -1,127 +1,124 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1679534    2007-03-13  ebak         wrong ValueObjectNode.testChild()
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
- *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMNamedElementInterface;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT VALUE.OBJECT (CLASS | INSTANCE)
- */
-public class ValueObjectNode extends AbstractScalarValueNode {
-
-	private CIMNamedElementInterface iCIMObject;
-
-	/**
-	 * Ctor.
-	 */
-	public ValueObjectNode() {
-		super(VALUE_OBJECT);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iCIMObject = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iCIMObject != null) throw new SAXException("This " + getNodeName()
-				+ " node can have only one child but an additional " + pNodeNameEnum
-				+ " node found!");
-		if (pNodeNameEnum != CLASS && pNodeNameEnum != INSTANCE) throw new SAXException(
-				getNodeName() + " node child node can be CLASS or INSTANCE but a " + pNodeNameEnum
-						+ " node was found!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		AbstractObjectNode objNode = (AbstractObjectNode) pChild;
-		if (objNode instanceof ClassNode) this.iCIMObject = ((ClassNode) objNode).getCIMClass();
-		else this.iCIMObject = ((InstanceNode) objNode).getCIMInstance();
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iCIMObject == null) throw new SAXException(
-				"VALUE.OBJECT node must have a CLASS or INSTANCE child node!");
-	}
-
-	/**
-	 * @seeValueIf#getValue()
-	 * @return CIMClass or CIMInstance
-	 */
-	public Object getValue() {
-		return this.iCIMObject;
-	}
-
-	public CIMDataType getType() {
-		if (this.iCIMObject instanceof CIMClass) return CIMDataType.CLASS_T;
-		return CIMDataType.OBJECT_T;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1679534    2007-03-13  ebak         wrong ValueObjectNode.testChild()
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT VALUE.OBJECT (CLASS | INSTANCE)
+ */
+public class ValueObjectNode extends AbstractScalarValueNode {
+
+	private CIMNamedElementInterface iCIMObject;
+
+	/**
+	 * Ctor.
+	 */
+	public ValueObjectNode() {
+		super(VALUE_OBJECT);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iCIMObject = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iCIMObject != null) throw new SAXException("This " + getNodeName()
+				+ " node can have only one child but an additional " + pNodeNameEnum
+				+ " node found!");
+		if (pNodeNameEnum != CLASS && pNodeNameEnum != INSTANCE) throw new SAXException(
+				getNodeName() + " node child node can be CLASS or INSTANCE but a " + pNodeNameEnum
+						+ " node was found!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		AbstractObjectNode objNode = (AbstractObjectNode) pChild;
+		if (objNode instanceof ClassNode) this.iCIMObject = ((ClassNode) objNode).getCIMClass();
+		else this.iCIMObject = ((InstanceNode) objNode).getCIMInstance();
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iCIMObject == null) throw new SAXException(
+				"VALUE.OBJECT node must have a CLASS or INSTANCE child node!");
+	}
+
+	/**
+	 * @seeValueIf#getValue()
+	 * @return CIMClass or CIMInstance
+	 */
+	public Object getValue() {
+		return this.iCIMObject;
+	}
+
+	public CIMDataType getType() {
+		if (this.iCIMObject instanceof CIMClass) return CIMDataType.CLASS_T;
+		return CIMDataType.OBJECT_T;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java
index 8fafce5..91f5ff0 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java
@@ -1,162 +1,159 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMNamedElementInterface;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT VALUE.OBJECTWITHLOCALPATH ((LOCALCLASSPATH, CLASS) |
- * (LOCALINSTANCEPATH, INSTANCE))
- */
-public class ValueObjectWithLocalPathNode extends AbstractScalarValueNode {
-
-	// ObjectPath element
-	private String iPathNodeNameEnum;
-
-	private CIMObjectPath iObjPath;
-
-	// Object element
-	private String iObjNodeNameEnum;
-
-	private CIMNamedElementInterface iCIMObj;
-
-	/**
-	 * Ctor.
-	 */
-	public ValueObjectWithLocalPathNode() {
-		super(VALUE_OBJECTWITHLOCALPATH);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iPathNodeNameEnum = this.iObjNodeNameEnum = null;
-		this.iObjPath = null;
-		this.iCIMObj = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == LOCALCLASSPATH) {
-			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum,
-					LOCALCLASSPATH);
-			if (this.iObjNodeNameEnum == INSTANCE) illegalChildNodePair(LOCALCLASSPATH, INSTANCE);
-		} else if (pNodeNameEnum == CLASS) {
-			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, CLASS);
-			if (this.iPathNodeNameEnum == LOCALINSTANCEPATH) illegalChildNodePair(
-					LOCALINSTANCEPATH, CLASS);
-		} else if (pNodeNameEnum == LOCALINSTANCEPATH) {
-			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum,
-					LOCALINSTANCEPATH);
-			if (this.iObjNodeNameEnum == CLASS) illegalChildNodePair(LOCALINSTANCEPATH, CLASS);
-		} else if (pNodeNameEnum == INSTANCE) {
-			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, INSTANCE);
-			if (this.iPathNodeNameEnum == LOCALCLASSPATH) illegalChildNodePair(LOCALCLASSPATH,
-					INSTANCE);
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) throws SAXException {
-		if (pChild instanceof AbstractObjectPathNode) {
-			this.iPathNodeNameEnum = pChild.getNodeName();
-			this.iObjPath = ((AbstractObjectPathNode) pChild).getCIMObjectPath();
-		} else { // ClassNode or InstanceNode, iObjPath must be available
-			// here
-			this.iObjNodeNameEnum = pChild.getNodeName();
-			if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
-					+ " first child should contain an object path!");
-			if (pChild instanceof ClassNode) {
-				this.iCIMObj = ((ClassNode) pChild).getCIMClass(this.iObjPath);
-			} else {
-				this.iCIMObj = ((InstanceNode) pChild).getCIMInstance(this.iObjPath);
-			}
-		}
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
-				+ " node must have a LOCALCLASSPATH or a LOCALINSTANCEPATH child node!");
-		if (this.iObjNodeNameEnum == null) throw new SAXException(getNodeName()
-				+ " node must have a CLASS or INSTANCE child node!");
-	}
-
-	/**
-	 * @see ValueIf#getValue()
-	 * @return CIMClass or CIMInstance
-	 */
-	public Object getValue() {
-		return this.iCIMObj;
-	}
-
-	public CIMDataType getType() {
-		if (this.iCIMObj instanceof CIMClass) return CIMDataType.CLASS_T;
-		return CIMDataType.OBJECT_T;
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT VALUE.OBJECTWITHLOCALPATH ((LOCALCLASSPATH, CLASS) |
+ * (LOCALINSTANCEPATH, INSTANCE))
+ */
+public class ValueObjectWithLocalPathNode extends AbstractScalarValueNode {
+
+	// ObjectPath element
+	private String iPathNodeNameEnum;
+
+	private CIMObjectPath iObjPath;
+
+	// Object element
+	private String iObjNodeNameEnum;
+
+	private CIMNamedElementInterface iCIMObj;
+
+	/**
+	 * Ctor.
+	 */
+	public ValueObjectWithLocalPathNode() {
+		super(VALUE_OBJECTWITHLOCALPATH);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iPathNodeNameEnum = this.iObjNodeNameEnum = null;
+		this.iObjPath = null;
+		this.iCIMObj = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == LOCALCLASSPATH) {
+			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum,
+					LOCALCLASSPATH);
+			if (this.iObjNodeNameEnum == INSTANCE) illegalChildNodePair(LOCALCLASSPATH, INSTANCE);
+		} else if (pNodeNameEnum == CLASS) {
+			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, CLASS);
+			if (this.iPathNodeNameEnum == LOCALINSTANCEPATH) illegalChildNodePair(
+					LOCALINSTANCEPATH, CLASS);
+		} else if (pNodeNameEnum == LOCALINSTANCEPATH) {
+			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum,
+					LOCALINSTANCEPATH);
+			if (this.iObjNodeNameEnum == CLASS) illegalChildNodePair(LOCALINSTANCEPATH, CLASS);
+		} else if (pNodeNameEnum == INSTANCE) {
+			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, INSTANCE);
+			if (this.iPathNodeNameEnum == LOCALCLASSPATH) illegalChildNodePair(LOCALCLASSPATH,
+					INSTANCE);
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) throws SAXException {
+		if (pChild instanceof AbstractObjectPathNode) {
+			this.iPathNodeNameEnum = pChild.getNodeName();
+			this.iObjPath = ((AbstractObjectPathNode) pChild).getCIMObjectPath();
+		} else { // ClassNode or InstanceNode, iObjPath must be available
+			// here
+			this.iObjNodeNameEnum = pChild.getNodeName();
+			if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
+					+ " first child should contain an object path!");
+			if (pChild instanceof ClassNode) {
+				this.iCIMObj = ((ClassNode) pChild).getCIMClass(this.iObjPath);
+			} else {
+				this.iCIMObj = ((InstanceNode) pChild).getCIMInstance(this.iObjPath);
+			}
+		}
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
+				+ " node must have a LOCALCLASSPATH or a LOCALINSTANCEPATH child node!");
+		if (this.iObjNodeNameEnum == null) throw new SAXException(getNodeName()
+				+ " node must have a CLASS or INSTANCE child node!");
+	}
+
+	/**
+	 * @see ValueIf#getValue()
+	 * @return CIMClass or CIMInstance
+	 */
+	public Object getValue() {
+		return this.iCIMObj;
+	}
+
+	public CIMDataType getType() {
+		if (this.iCIMObj instanceof CIMClass) return CIMDataType.CLASS_T;
+		return CIMDataType.OBJECT_T;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java
index 22dab7b..4f876fd 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java
@@ -1,158 +1,155 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMNamedElementInterface;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT VALUE.OBJECTWITHPATH ((CLASSPATH, CLASS) | (INSTANCEPATH, INSTANCE))
- */
-public class ValueObjectWithPathNode extends AbstractScalarValueNode {
-
-	// ObjectPath element
-	private String iPathNodeNameEnum;
-
-	private CIMObjectPath iObjPath;
-
-	// CIMObject element
-	private String iObjNodeNameEnum;
-
-	private CIMNamedElementInterface iCIMObj;
-
-	/**
-	 * Ctor.
-	 */
-	public ValueObjectWithPathNode() {
-		super(VALUE_OBJECTWITHPATH);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iPathNodeNameEnum = this.iObjNodeNameEnum = null;
-		this.iObjPath = null;
-		this.iCIMObj = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum == CLASSPATH) {
-			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum, CLASSPATH);
-			if (this.iObjNodeNameEnum == INSTANCE) illegalChildNodePair(CLASSPATH, INSTANCE);
-		} else if (pNodeNameEnum == CLASS) {
-			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, CLASS);
-			if (this.iPathNodeNameEnum == INSTANCEPATH) illegalChildNodePair(INSTANCEPATH, CLASS);
-		} else if (pNodeNameEnum == INSTANCEPATH) {
-			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum, INSTANCEPATH);
-			if (this.iObjNodeNameEnum == CLASS) illegalChildNodePair(INSTANCEPATH, CLASS);
-		} else if (pNodeNameEnum == INSTANCE) {
-			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, INSTANCE);
-			if (this.iPathNodeNameEnum == CLASSPATH) illegalChildNodePair(CLASSPATH, INSTANCE);
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child!");
-
-	}
-
-	@Override
-	public void childParsed(Node pChild) throws SAXException {
-		if (pChild instanceof AbstractObjectPathNode) {
-			this.iPathNodeNameEnum = pChild.getNodeName();
-			this.iObjPath = ((AbstractObjectPathNode) pChild).getCIMObjectPath();
-		} else { // ClassNode or InstanceNode, iObjPath must be available
-			// here
-			this.iObjNodeNameEnum = pChild.getNodeName();
-			if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
-					+ " first child should contain an object path!");
-			if (pChild instanceof ClassNode) {
-				this.iCIMObj = ((ClassNode) pChild).getCIMClass(this.iObjPath);
-			} else {
-				this.iCIMObj = ((InstanceNode) pChild).getCIMInstance(this.iObjPath);
-			}
-		}
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
-				+ " node must have a CLASSPATH or a INSTANCEPATH child node!");
-		if (this.iObjNodeNameEnum == null) throw new SAXException(getNodeName()
-				+ " node must have a CLASS or INSTANCE child node!");
-	}
-
-	/**
-	 * @see ValueIf#getValue()
-	 * @return CIMClass or CIMInstance
-	 */
-	public Object getValue() {
-		return this.iCIMObj;
-	}
-
-	public CIMDataType getType() {
-		if (this.iCIMObj instanceof CIMClass) return CIMDataType.CLASS_T;
-		return CIMDataType.OBJECT_T;
-	}
-
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT VALUE.OBJECTWITHPATH ((CLASSPATH, CLASS) | (INSTANCEPATH, INSTANCE))
+ */
+public class ValueObjectWithPathNode extends AbstractScalarValueNode {
+
+	// ObjectPath element
+	private String iPathNodeNameEnum;
+
+	private CIMObjectPath iObjPath;
+
+	// CIMObject element
+	private String iObjNodeNameEnum;
+
+	private CIMNamedElementInterface iCIMObj;
+
+	/**
+	 * Ctor.
+	 */
+	public ValueObjectWithPathNode() {
+		super(VALUE_OBJECTWITHPATH);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iPathNodeNameEnum = this.iObjNodeNameEnum = null;
+		this.iObjPath = null;
+		this.iCIMObj = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum == CLASSPATH) {
+			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum, CLASSPATH);
+			if (this.iObjNodeNameEnum == INSTANCE) illegalChildNodePair(CLASSPATH, INSTANCE);
+		} else if (pNodeNameEnum == CLASS) {
+			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, CLASS);
+			if (this.iPathNodeNameEnum == INSTANCEPATH) illegalChildNodePair(INSTANCEPATH, CLASS);
+		} else if (pNodeNameEnum == INSTANCEPATH) {
+			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum, INSTANCEPATH);
+			if (this.iObjNodeNameEnum == CLASS) illegalChildNodePair(INSTANCEPATH, CLASS);
+		} else if (pNodeNameEnum == INSTANCE) {
+			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, INSTANCE);
+			if (this.iPathNodeNameEnum == CLASSPATH) illegalChildNodePair(CLASSPATH, INSTANCE);
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
+				+ " child!");
+
+	}
+
+	@Override
+	public void childParsed(Node pChild) throws SAXException {
+		if (pChild instanceof AbstractObjectPathNode) {
+			this.iPathNodeNameEnum = pChild.getNodeName();
+			this.iObjPath = ((AbstractObjectPathNode) pChild).getCIMObjectPath();
+		} else { // ClassNode or InstanceNode, iObjPath must be available
+			// here
+			this.iObjNodeNameEnum = pChild.getNodeName();
+			if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
+					+ " first child should contain an object path!");
+			if (pChild instanceof ClassNode) {
+				this.iCIMObj = ((ClassNode) pChild).getCIMClass(this.iObjPath);
+			} else {
+				this.iCIMObj = ((InstanceNode) pChild).getCIMInstance(this.iObjPath);
+			}
+		}
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
+				+ " node must have a CLASSPATH or a INSTANCEPATH child node!");
+		if (this.iObjNodeNameEnum == null) throw new SAXException(getNodeName()
+				+ " node must have a CLASS or INSTANCE child node!");
+	}
+
+	/**
+	 * @see ValueIf#getValue()
+	 * @return CIMClass or CIMInstance
+	 */
+	public Object getValue() {
+		return this.iCIMObj;
+	}
+
+	public CIMDataType getType() {
+		if (this.iCIMObj instanceof CIMClass) return CIMDataType.CLASS_T;
+		return CIMDataType.OBJECT_T;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java
index 5cb05c1..2601e9c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java
@@ -1,143 +1,140 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2750520    2009-04-10  blaschke-oss Code cleanup from empty statement et al
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
- * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
- *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
- *    2715    2013-11-26  blaschke-oss Add VALUE.NULL support
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.GenericExts;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT VALUE.REFARRAY (VALUE.REFERENCE|VALUE.NULL)*
- */
-public class ValueRefArrayNode extends AbstractArrayValueNode {
-
-	private ArrayList iCIMObjPathAL;
-
-	/**
-	 * Ctor.
-	 */
-	public ValueRefArrayNode() {
-		super(VALUE_REFARRAY);
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iCIMObjPathAL = GenericExts.initClearArrayList(this.iCIMObjPathAL);
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// no data
-	}
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != VALUE_REFERENCE && pNodeNameEnum != VALUE_NULL) throw new SAXException(
-				getNodeName()
-						+ " node child node can be VALUE.REFERENCE or VALUE.NULL only while it is "
-						+ pNodeNameEnum + "!");
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		if (this.iCIMObjPathAL == null) this.iCIMObjPathAL = new ArrayList();
-		if (pChild instanceof ValueReferenceNode) this.iCIMObjPathAL
-				.add(((ValueReferenceNode) pChild).getCIMObjectPath());
-		else if (pChild instanceof ValueNullNode) this.iCIMObjPathAL.add(null);
-	}
-
-	@Override
-	public void testCompletness() {
-	// child nodes are not mandatory
-	}
-
-	/**
-	 * @see ArrayIf#elementAt(int)
-	 * @return CIMObjectPath
-	 */
-	public Object elementAt(int pIdx) {
-		return this.iCIMObjPathAL == null ? null : this.iCIMObjPathAL.get(pIdx);
-	}
-
-	public int size() {
-		return this.iCIMObjPathAL == null ? 0 : this.iCIMObjPathAL.size();
-	}
-
-	public CIMDataType getType() {
-		return new CIMDataType("", 0);
-	}
-
-	private static final CIMObjectPath[] EMPTY_OPA = new CIMObjectPath[0];
-
-	/**
-	 * @see ValueIf#getValue()
-	 * @return CIMObjectPath[]
-	 */
-	public Object getValue() {
-		return size() == 0 ? null : this.iCIMObjPathAL.toArray(EMPTY_OPA);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2750520    2009-04-10  blaschke-oss Code cleanup from empty statement et al
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
+ * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
+ *    2715    2013-11-26  blaschke-oss Add VALUE.NULL support
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.GenericExts;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT VALUE.REFARRAY (VALUE.REFERENCE|VALUE.NULL)*
+ */
+public class ValueRefArrayNode extends AbstractArrayValueNode {
+
+	private ArrayList iCIMObjPathAL;
+
+	/**
+	 * Ctor.
+	 */
+	public ValueRefArrayNode() {
+		super(VALUE_REFARRAY);
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iCIMObjPathAL = GenericExts.initClearArrayList(this.iCIMObjPathAL);
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// no data
+	}
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (pNodeNameEnum != VALUE_REFERENCE && pNodeNameEnum != VALUE_NULL) throw new SAXException(
+				getNodeName()
+						+ " node child node can be VALUE.REFERENCE or VALUE.NULL only while it is "
+						+ pNodeNameEnum + "!");
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		if (this.iCIMObjPathAL == null) this.iCIMObjPathAL = new ArrayList();
+		if (pChild instanceof ValueReferenceNode) this.iCIMObjPathAL
+				.add(((ValueReferenceNode) pChild).getCIMObjectPath());
+		else if (pChild instanceof ValueNullNode) this.iCIMObjPathAL.add(null);
+	}
+
+	@Override
+	public void testCompletness() {
+	// child nodes are not mandatory
+	}
+
+	/**
+	 * @see ArrayIf#elementAt(int)
+	 * @return CIMObjectPath
+	 */
+	public Object elementAt(int pIdx) {
+		return this.iCIMObjPathAL == null ? null : this.iCIMObjPathAL.get(pIdx);
+	}
+
+	public int size() {
+		return this.iCIMObjPathAL == null ? 0 : this.iCIMObjPathAL.size();
+	}
+
+	public CIMDataType getType() {
+		return new CIMDataType("", 0);
+	}
+
+	private static final CIMObjectPath[] EMPTY_OPA = new CIMObjectPath[0];
+
+	/**
+	 * @see ValueIf#getValue()
+	 * @return CIMObjectPath[]
+	 */
+	public Object getValue() {
+		return size() == 0 ? null : this.iCIMObjPathAL.toArray(EMPTY_OPA);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java
index 65e04db..05c1f65 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java
@@ -1,147 +1,144 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1660756    2007-02-22  ebak         Embedded object support
- * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
- * 3466280    2012-04-23  blaschke-oss get instance failure for CIM_IndicationSubscription
- *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.node;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * ELEMENT VALUE.REFERENCE (CLASSPATH | LOCALCLASSPATH | CLASSNAME |
- * INSTANCEPATH | LOCALINSTANCEPATH | INSTANCENAME)
- */
-public class ValueReferenceNode extends AbstractScalarValueNode implements ObjectPathIf {
-
-	private CIMObjectPath iCIMObjPath;
-
-	private String iChildNodeName = null;
-
-	/**
-	 * Ctor.
-	 */
-	public ValueReferenceNode() {
-		super(VALUE_REFERENCE);
-	}
-
-	@Override
-	public void childParsed(Node pChild) {
-		this.iCIMObjPath = ((AbstractPathNode) pChild).getCIMObjectPath();
-		if ((CLASSNAME.equalsIgnoreCase(this.iChildNodeName) || INSTANCENAME
-				.equalsIgnoreCase(this.iChildNodeName))
-				&& this.iCIMObjPath.getNamespace() != null) {
-			// LocalPathBuilder includes default namespace in CLASSNAME and
-			// INSTANCENAME elements, needs to be stripped
-			this.iCIMObjPath = new CIMObjectPath(this.iCIMObjPath.getScheme(), this.iCIMObjPath
-					.getHost(), this.iCIMObjPath.getPort(), null, this.iCIMObjPath.getObjectName(),
-					this.iCIMObjPath.getKeys(), this.iCIMObjPath.getXmlSchemaName());
-		}
-	}
-
-	/**
-	 * @param pAttribs
-	 * @param pSession
-	 */
-	@Override
-	public void init(Attributes pAttribs, SAXSession pSession) {
-		this.iCIMObjPath = null;
-		this.iChildNodeName = null;
-		// no attributes
-	}
-
-	/**
-	 * @param pData
-	 */
-	@Override
-	public void parseData(String pData) {
-	// there is no data
-	}
-
-	private static final String[] ALLOWED_CHILDREN = { CLASSPATH, LOCALCLASSPATH, CLASSNAME,
-			INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME };
-
-	@Override
-	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iCIMObjPath != null) throw new SAXException("Child node " + pNodeNameEnum
-				+ " is illegal, since VALUE.REFERENCE already has a child!");
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
-				this.iChildNodeName = pNodeNameEnum;
-				return;
-			}
-		throw new SAXException("Invalid child node in " + getNodeName() + " node: " + pNodeNameEnum
-				+ "! Valid nodes are CLASSPATH, LOCALCLASSPATH, CLASSNAME, "
-				+ "INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME");
-	}
-
-	@Override
-	public void testCompletness() throws SAXException {
-		if (this.iCIMObjPath == null) throw new SAXException(
-				"VALUE.REFERENCE node must have a child node!");
-	}
-
-	/**
-	 * @see ValueIf#getValue()
-	 * @return CIMObjectPath
-	 */
-	public Object getValue() {
-		return this.iCIMObjPath;
-	}
-
-	public CIMDataType getType() {
-		return this.iCIMObjPath == null ? null : new CIMDataType(this.iCIMObjPath.getObjectName());
-	}
-
-	public CIMObjectPath getCIMObjectPath() {
-		return this.iCIMObjPath;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
+ * 1663270    2007-02-19  ebak         Minor performance problems
+ * 1660756    2007-02-22  ebak         Embedded object support
+ * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ * 3466280    2012-04-23  blaschke-oss get instance failure for CIM_IndicationSubscription
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * ELEMENT VALUE.REFERENCE (CLASSPATH | LOCALCLASSPATH | CLASSNAME |
+ * INSTANCEPATH | LOCALINSTANCEPATH | INSTANCENAME)
+ */
+public class ValueReferenceNode extends AbstractScalarValueNode implements ObjectPathIf {
+
+	private CIMObjectPath iCIMObjPath;
+
+	private String iChildNodeName = null;
+
+	/**
+	 * Ctor.
+	 */
+	public ValueReferenceNode() {
+		super(VALUE_REFERENCE);
+	}
+
+	@Override
+	public void childParsed(Node pChild) {
+		this.iCIMObjPath = ((AbstractPathNode) pChild).getCIMObjectPath();
+		if ((CLASSNAME.equalsIgnoreCase(this.iChildNodeName) || INSTANCENAME
+				.equalsIgnoreCase(this.iChildNodeName))
+				&& this.iCIMObjPath.getNamespace() != null) {
+			// LocalPathBuilder includes default namespace in CLASSNAME and
+			// INSTANCENAME elements, needs to be stripped
+			this.iCIMObjPath = new CIMObjectPath(this.iCIMObjPath.getScheme(), this.iCIMObjPath
+					.getHost(), this.iCIMObjPath.getPort(), null, this.iCIMObjPath.getObjectName(),
+					this.iCIMObjPath.getKeys(), this.iCIMObjPath.getXmlSchemaName());
+		}
+	}
+
+	/**
+	 * @param pAttribs
+	 * @param pSession
+	 */
+	@Override
+	public void init(Attributes pAttribs, SAXSession pSession) {
+		this.iCIMObjPath = null;
+		this.iChildNodeName = null;
+		// no attributes
+	}
+
+	/**
+	 * @param pData
+	 */
+	@Override
+	public void parseData(String pData) {
+	// there is no data
+	}
+
+	private static final String[] ALLOWED_CHILDREN = { CLASSPATH, LOCALCLASSPATH, CLASSNAME,
+			INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME };
+
+	@Override
+	public void testChild(String pNodeNameEnum) throws SAXException {
+		if (this.iCIMObjPath != null) throw new SAXException("Child node " + pNodeNameEnum
+				+ " is illegal, since VALUE.REFERENCE already has a child!");
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
+			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
+				this.iChildNodeName = pNodeNameEnum;
+				return;
+			}
+		throw new SAXException("Invalid child node in " + getNodeName() + " node: " + pNodeNameEnum
+				+ "! Valid nodes are CLASSPATH, LOCALCLASSPATH, CLASSNAME, "
+				+ "INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME");
+	}
+
+	@Override
+	public void testCompletness() throws SAXException {
+		if (this.iCIMObjPath == null) throw new SAXException(
+				"VALUE.REFERENCE node must have a child node!");
+	}
+
+	/**
+	 * @see ValueIf#getValue()
+	 * @return CIMObjectPath
+	 */
+	public Object getValue() {
+		return this.iCIMObjPath;
+	}
+
+	public CIMDataType getType() {
+		return this.iCIMObjPath == null ? null : new CIMDataType(this.iCIMObjPath.getObjectName());
+	}
+
+	public CIMObjectPath getCIMObjectPath() {
+		return this.iCIMObjPath;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/node/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/cimxml/sax/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/discovery/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/discovery/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
similarity index 81%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
index cf25c9e..27c97b3 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
@@ -1,256 +1,254 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
- * 1729361    2007-06-04  lupusalex    Multicast discovery is broken in DiscovererSLP
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-13  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.discovery.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Vector;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.sblim.cimclient.discovery.Discoverer;
-import org.sentrysoftware.wbem.sblim.cimclient.discovery.WBEMServiceAdvertisement;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.slp.Locator;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationManager;
-import org.sentrysoftware.wbem.sblim.slp.ServiceType;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPDefaults;
-
-/**
- * Class DiscovererSLP is the SLP specific implementation of the Discoverer
- * interface.
- * 
- * @since 2.0.2
- */
-public class DiscovererSLP extends Object implements Discoverer {
-
-	private static final String SERVICE_WBEM = "service:wbem";
-
-	private static final ServiceType SERVICE_TYPE = new ServiceType(SERVICE_WBEM);
-
-	private static final Vector ATTRIBUTES = new Vector();
-
-	private Locale iLocale;
-
-	private Vector iScopes;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLocale
-	 *            The locale setting to use for the Locator
-	 */
-	public DiscovererSLP(Locale pLocale) {
-		this.iLocale = pLocale;
-		this.iScopes = new Vector();
-		this.iScopes.add(SLPDefaults.DEFAULT_SCOPE);
-	}
-
-	/**
-	 * Returns locale
-	 * 
-	 * @return The value of locale.
-	 */
-	public Locale getLocale() {
-		return this.iLocale;
-	}
-
-	/**
-	 * Sets locale
-	 * 
-	 * @param pLocale
-	 *            The new value of locale.
-	 */
-	public void setLocale(Locale pLocale) {
-		this.iLocale = pLocale;
-	}
-
-	/**
-	 * Returns scopes
-	 * 
-	 * @return The value of scopes.
-	 */
-	public Vector getScopes() {
-		return this.iScopes;
-	}
-
-	/**
-	 * Sets scopes
-	 * 
-	 * @param pScopes
-	 *            The new value of scopes.
-	 */
-	public void setScopes(Vector pScopes) {
-		this.iScopes = pScopes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.sblim.cimclient.discovery.Discoverer#findWbemServices(String[])
-	 */
-	public WBEMServiceAdvertisement[] findWbemServices(final String[] pDirectoryUrls) {
-
-		List advertisements = new ArrayList();
-
-		if (pDirectoryUrls != null && pDirectoryUrls.length > 0) {
-			for (int i = 0; i < pDirectoryUrls.length; ++i) {
-				advertisements.addAll(findWbemServices(pDirectoryUrls[i]));
-			}
-		} else {
-			advertisements.addAll(findWbemServices((String) null));
-		}
-
-		return advertisements.toArray(new WBEMServiceAdvertisement[advertisements.size()]);
-	}
-
-	private List findWbemServices(final String pDA) {
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-		logger.trace(Level.FINEST, "SLP discovery started on DA " + pDA);
-		try {
-
-			Vector agents;
-			if (pDA != null) {
-				agents = new Vector();
-				InetAddress address = InetAddress.getByName(pDA);
-				if (address == null) { return new LinkedList(); }
-				agents.add(address);
-			} else {
-				agents = null;
-			}
-
-			final Locator locator = ServiceLocationManager.getLocator(this.iLocale);
-
-			List advertisements = new ArrayList();
-			Enumeration serviceEnum = locator.findServices(SERVICE_TYPE, this.iScopes, "",
-					agents);
-
-			while (serviceEnum != null && serviceEnum.hasMoreElements()) {
-				ServiceURL url;
-				try {
-					url = (ServiceURL) serviceEnum.nextElement();
-				} catch (RuntimeException e) {
-					logger.trace(Level.FINE, e.getMessage(), e);
-					continue;
-				}
-				Enumeration attributeEnum = locator.findAttributes(url, this.iScopes,
-						ATTRIBUTES, agents);
-				List attributes = new ArrayList();
-				while (attributeEnum != null && attributeEnum.hasMoreElements()) {
-					try {
-						attributes.add(attributeEnum.nextElement().toString());
-					} catch (RuntimeException e) {
-						logger.trace(Level.FINE, e.getMessage(), e);
-						continue;
-					}
-				}
-				advertisements.add(new WBEMServiceAdvertisementSLP(pDA, url, attributes));
-			}
-			logger.trace(Level.FINEST, "SLP discovery completed on DA " + pDA + ". "
-					+ advertisements.size() + " WBEM services found");
-			logger.exit();
-			return advertisements;
-
-		} catch (ServiceLocationException e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINE, "SLP discovery failed with error", e);
-		} catch (Exception e) {
-			LogAndTraceBroker.getBroker()
-					.trace(Level.FINE, "Exception during service discovery", e);
-		}
-		logger.exit();
-		return new LinkedList();
-	}
-
-	public String[] findDirectoryServices() {
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-		try {
-			ArrayList agents = new ArrayList();
-
-			final Locator locator = ServiceLocationManager.getLocator(this.iLocale);
-
-			Enumeration serviceEnum = locator.findServices(SLPDefaults.DA_SERVICE_TYPE,
-					this.iScopes, "");
-
-			while (serviceEnum != null && serviceEnum.hasMoreElements()) {
-				ServiceURL url = (ServiceURL) serviceEnum.nextElement();
-				agents.add(url.getHost());
-			}
-
-			logger.trace(Level.FINER, "SLP DA discovery completed in local subnet. "
-					+ agents.size() + " DAs found:" + agents.toString());
-			if (agents.size() == 0) {
-				serviceEnum = locator.findServices(SLPDefaults.SA_SERVICE_TYPE, this.iScopes, "");
-
-				while (serviceEnum != null && serviceEnum.hasMoreElements()) {
-					ServiceURL url = (ServiceURL) serviceEnum.nextElement();
-					agents.add(url.getHost());
-				}
-				logger.trace(Level.FINER, "SLP SA discovery completed in local subnet. "
-						+ agents.size() + " SAs found:" + agents.toString());
-			}
-
-			logger.exit();
-			return agents.toArray(new String[agents.size()]);
-
-		} catch (ServiceLocationException e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINE, "SLP discovery failed with error", e);
-		} catch (Exception e) {
-			LogAndTraceBroker.getBroker()
-					.trace(Level.FINE, "Exception during service discovery", e);
-		}
-		logger.exit();
-		return new String[0];
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
+ * 1729361    2007-06-04  lupusalex    Multicast discovery is broken in DiscovererSLP
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-13  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.discovery.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Vector;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.sblim.cimclient.discovery.WBEMServiceAdvertisement;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.slp.Locator;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.ServiceLocationManager;
+import org.metricshub.wbem.sblim.slp.ServiceType;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
+import org.metricshub.wbem.sblim.cimclient.discovery.Discoverer;
+
+/**
+ * Class DiscovererSLP is the SLP specific implementation of the Discoverer
+ * interface.
+ * 
+ * @since 2.0.2
+ */
+public class DiscovererSLP extends Object implements Discoverer {
+
+	private static final String SERVICE_WBEM = "service:wbem";
+
+	private static final ServiceType SERVICE_TYPE = new ServiceType(SERVICE_WBEM);
+
+	private static final Vector ATTRIBUTES = new Vector();
+
+	private Locale iLocale;
+
+	private Vector iScopes;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLocale
+	 *            The locale setting to use for the Locator
+	 */
+	public DiscovererSLP(Locale pLocale) {
+		this.iLocale = pLocale;
+		this.iScopes = new Vector();
+		this.iScopes.add(SLPDefaults.DEFAULT_SCOPE);
+	}
+
+	/**
+	 * Returns locale
+	 * 
+	 * @return The value of locale.
+	 */
+	public Locale getLocale() {
+		return this.iLocale;
+	}
+
+	/**
+	 * Sets locale
+	 * 
+	 * @param pLocale
+	 *            The new value of locale.
+	 */
+	public void setLocale(Locale pLocale) {
+		this.iLocale = pLocale;
+	}
+
+	/**
+	 * Returns scopes
+	 * 
+	 * @return The value of scopes.
+	 */
+	public Vector getScopes() {
+		return this.iScopes;
+	}
+
+	/**
+	 * Sets scopes
+	 * 
+	 * @param pScopes
+	 *            The new value of scopes.
+	 */
+	public void setScopes(Vector pScopes) {
+		this.iScopes = pScopes;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.sblim.cimclient.discovery.Discoverer#findWbemServices(String[])
+	 */
+	public WBEMServiceAdvertisement[] findWbemServices(final String[] pDirectoryUrls) {
+
+		List advertisements = new ArrayList();
+
+		if (pDirectoryUrls != null && pDirectoryUrls.length > 0) {
+			for (int i = 0; i < pDirectoryUrls.length; ++i) {
+				advertisements.addAll(findWbemServices(pDirectoryUrls[i]));
+			}
+		} else {
+			advertisements.addAll(findWbemServices((String) null));
+		}
+
+		return advertisements.toArray(new WBEMServiceAdvertisement[advertisements.size()]);
+	}
+
+	private List findWbemServices(final String pDA) {
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+		logger.trace(Level.FINEST, "SLP discovery started on DA " + pDA);
+		try {
+
+			Vector agents;
+			if (pDA != null) {
+				agents = new Vector();
+				InetAddress address = InetAddress.getByName(pDA);
+				if (address == null) { return new LinkedList(); }
+				agents.add(address);
+			} else {
+				agents = null;
+			}
+
+			final Locator locator = ServiceLocationManager.getLocator(this.iLocale);
+
+			List advertisements = new ArrayList();
+			Enumeration serviceEnum = locator.findServices(SERVICE_TYPE, this.iScopes, "",
+					agents);
+
+			while (serviceEnum != null && serviceEnum.hasMoreElements()) {
+				ServiceURL url;
+				try {
+					url = (ServiceURL) serviceEnum.nextElement();
+				} catch (RuntimeException e) {
+					logger.trace(Level.FINE, e.getMessage(), e);
+					continue;
+				}
+				Enumeration attributeEnum = locator.findAttributes(url, this.iScopes,
+						ATTRIBUTES, agents);
+				List attributes = new ArrayList();
+				while (attributeEnum != null && attributeEnum.hasMoreElements()) {
+					try {
+						attributes.add(attributeEnum.nextElement().toString());
+					} catch (RuntimeException e) {
+						logger.trace(Level.FINE, e.getMessage(), e);
+						continue;
+					}
+				}
+				advertisements.add(new WBEMServiceAdvertisementSLP(pDA, url, attributes));
+			}
+			logger.trace(Level.FINEST, "SLP discovery completed on DA " + pDA + ". "
+					+ advertisements.size() + " WBEM services found");
+			logger.exit();
+			return advertisements;
+
+		} catch (ServiceLocationException e) {
+			LogAndTraceBroker.getBroker().trace(Level.FINE, "SLP discovery failed with error", e);
+		} catch (Exception e) {
+			LogAndTraceBroker.getBroker()
+					.trace(Level.FINE, "Exception during service discovery", e);
+		}
+		logger.exit();
+		return new LinkedList();
+	}
+
+	public String[] findDirectoryServices() {
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+		try {
+			ArrayList agents = new ArrayList();
+
+			final Locator locator = ServiceLocationManager.getLocator(this.iLocale);
+
+			Enumeration serviceEnum = locator.findServices(SLPDefaults.DA_SERVICE_TYPE,
+					this.iScopes, "");
+
+			while (serviceEnum != null && serviceEnum.hasMoreElements()) {
+				ServiceURL url = (ServiceURL) serviceEnum.nextElement();
+				agents.add(url.getHost());
+			}
+
+			logger.trace(Level.FINER, "SLP DA discovery completed in local subnet. "
+					+ agents.size() + " DAs found:" + agents.toString());
+			if (agents.size() == 0) {
+				serviceEnum = locator.findServices(SLPDefaults.SA_SERVICE_TYPE, this.iScopes, "");
+
+				while (serviceEnum != null && serviceEnum.hasMoreElements()) {
+					ServiceURL url = (ServiceURL) serviceEnum.nextElement();
+					agents.add(url.getHost());
+				}
+				logger.trace(Level.FINER, "SLP SA discovery completed in local subnet. "
+						+ agents.size() + " SAs found:" + agents.toString());
+			}
+
+			logger.exit();
+			return agents.toArray(new String[agents.size()]);
+
+		} catch (ServiceLocationException e) {
+			LogAndTraceBroker.getBroker().trace(Level.FINE, "SLP discovery failed with error", e);
+		} catch (Exception e) {
+			LogAndTraceBroker.getBroker()
+					.trace(Level.FINE, "Exception during service discovery", e);
+		}
+		logger.exit();
+		return new String[0];
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java
index 0617404..887a6bc 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java
@@ -1,295 +1,293 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.discovery.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import javax.security.auth.Subject;
-import org.sentrysoftware.wbem.javax.wbem.client.WBEMClient;
-import org.sentrysoftware.wbem.javax.wbem.client.WBEMClientFactory;
-
-import org.sentrysoftware.wbem.sblim.cimclient.discovery.WBEMServiceAdvertisement;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-
-/**
- * Class WBEMServiceAdvertisementSLP is the SLP specific implementation if the
- * WBEMServiceAdvertisement interface.
- * 
- * 
- * @since 2.0.2
- */
-public class WBEMServiceAdvertisementSLP implements WBEMServiceAdvertisement {
-
-	private static final Pattern ATTR_PATTERN = Pattern.compile("[(]?(.+)=([^)]+)[)]?");
-
-	private String iDA;
-
-	private ServiceURL iServiceUrl;
-
-	private Map iAttributeMap;
-
-	private boolean iExpired = false;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pDA
-	 *            The Directory Agent from which this advertisement was received
-	 * @param pUrl
-	 *            The SLP service url returned by Locator.findServices().
-	 * @param pAttributes
-	 *            The attribute list (List<String>) where each entry looks
-	 *            either like this key=value or this
-	 *            (key=value).
-	 */
-	public WBEMServiceAdvertisementSLP(String pDA, ServiceURL pUrl, List pAttributes) {
-		if (pDA == null || pUrl == null) throw new IllegalArgumentException(
-				"Directory and URL must not be null");
-		this.iDA = pDA;
-		this.iServiceUrl = pUrl;
-		parseAttributes(pAttributes);
-
-	}
-
-	private void parseAttributes(List pAttributes) {
-		this.iAttributeMap = new HashMap();
-		Iterator iter = pAttributes.iterator();
-		while (iter.hasNext()) {
-			String attribute = iter.next();
-			Matcher matcher = ATTR_PATTERN.matcher(attribute);
-			if (matcher.matches()) {
-				String key = matcher.group(1).trim();
-				String value = matcher.group(2).trim();
-				this.iAttributeMap.put(key, value);
-			} else {
-				LogAndTraceBroker.getBroker().trace(Level.FINE,
-						"SLP discovery returned invalid attribute: " + attribute);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.sblim.cimclient.discovery.WbemService#getAttribute(java.lang.String)
-	 */
-	public String getAttribute(String pAttributeName) {
-		return this.iAttributeMap.get(pAttributeName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.sblim.cimclient.discovery.WbemService#getAttributes()
-	 */
-	public Set> getAttributes() {
-		return this.iAttributeMap.entrySet();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.sblim.cimclient.discovery.WbemService#getConcreteServiceType()
-	 */
-	public String getConcreteServiceType() {
-		return this.iServiceUrl.getServiceType().getConcreteTypeName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.sblim.cimclient.discovery.WbemService#getServiceUrl()
-	 */
-	public String getServiceUrl() {
-		return getConcreteServiceType() + "://" + this.iServiceUrl.getHost() + ":"
-				+ String.valueOf(this.iServiceUrl.getPort());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.sblim.cimclient.discovery.WBEMServiceAdvertisement#createClient(javax
-	 * .security.auth.Subject, java.util.Locale[])
-	 */
-	public WBEMClient createClient(Subject pSubject, Locale[] pLocales) throws Exception {
-		String communication = getAttribute(COMM_MECHANISM);
-		if (communication.equalsIgnoreCase("OTHER")) {
-			communication = getAttribute(OTHER_COMM_MECHN_DESC);
-		}
-		WBEMClient client = WBEMClientFactory.getClient(communication);
-		CIMObjectPath path = new CIMObjectPath(this.iServiceUrl.getServiceType()
-				.getConcreteTypeName(), this.iServiceUrl.getHost(), String.valueOf(this.iServiceUrl
-				.getPort()), null, null, null);
-		client.initialize(path, pSubject, pLocales);
-		return client;
-	}
-
-	public String getDirectory() {
-		return this.iDA;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		StringBuffer buffer = new StringBuffer();
-		// buffer.append(iServiceUrl.getServiceType());
-		// buffer.append("://");
-		// buffer.append(iServiceUrl.getHost());
-		buffer.append(getServiceUrl());
-		buffer.append("{slp da=\"");
-		buffer.append(this.iDA);
-		buffer.append("\", attributes=[");
-		Iterator> iter = this.iAttributeMap.entrySet().iterator();
-		while (iter.hasNext()) {
-			Entry entry = iter.next();
-			buffer.append("\"");
-			buffer.append(entry.getKey());
-			buffer.append("=");
-			buffer.append(entry.getValue());
-			buffer.append("\"");
-			if (iter.hasNext()) buffer.append(", ");
-		}
-		buffer.append("]}");
-		return buffer.toString();
-	}
-
-	public String[] getInteropNamespaces() {
-		return parseCommaSeparatedList(getAttribute(INTEROP_NS));
-	}
-
-	private String[] parseCommaSeparatedList(String pAttribute) {
-		String[] split = pAttribute.split("[,\\n]");
-		int emptyCount = 0;
-		for (int i = 0; i < split.length; ++i) {
-			split[i] = split[i].trim();
-			if (split[i].length() == 0) {
-				++emptyCount;
-			}
-		}
-		if (emptyCount > 0) {
-			String[] result = new String[split.length - emptyCount];
-			int j = 0;
-			for (int i = 0; i < split.length; ++i) {
-				if (split[i].length() > 0) {
-					result[j++] = split[i];
-				}
-			}
-			return result;
-		}
-		return split;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.sblim.cimclient.discovery.WBEMServiceAdvertisement#getServiceId()
-	 */
-	public String getServiceId() {
-		return getAttribute(SERVICE_ID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.sblim.cimclient.discovery.WBEMServiceAdvertisement#isExpired()
-	 */
-	public boolean isExpired() {
-		return this.iExpired;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.sblim.cimclient.discovery.WBEMServiceAdvertisement#setExpired(boolean
-	 * )
-	 */
-	public void setExpired(boolean pExpired) {
-		this.iExpired = pExpired;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object pObj) {
-		if (pObj == this) { return true; }
-		if (pObj != null && pObj instanceof WBEMServiceAdvertisement) {
-			WBEMServiceAdvertisement that = (WBEMServiceAdvertisement) pObj;
-			return getServiceUrl().equals(that.getServiceUrl())
-					&& getDirectory().equals(that.getDirectory());
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return this.iServiceUrl.hashCode() + this.iDA.hashCode();
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1678915    2007-03-12  lupusalex    Integrated WBEM service discovery via SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.discovery.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.security.auth.Subject;
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.wbem.client.WBEMClient;
+import org.metricshub.wbem.javax.wbem.client.WBEMClientFactory;
+import org.metricshub.wbem.sblim.cimclient.discovery.WBEMServiceAdvertisement;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+
+/**
+ * Class WBEMServiceAdvertisementSLP is the SLP specific implementation if the
+ * WBEMServiceAdvertisement interface.
+ * 
+ * 
+ * @since 2.0.2
+ */
+public class WBEMServiceAdvertisementSLP implements WBEMServiceAdvertisement {
+
+	private static final Pattern ATTR_PATTERN = Pattern.compile("[(]?(.+)=([^)]+)[)]?");
+
+	private String iDA;
+
+	private ServiceURL iServiceUrl;
+
+	private Map iAttributeMap;
+
+	private boolean iExpired = false;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pDA
+	 *            The Directory Agent from which this advertisement was received
+	 * @param pUrl
+	 *            The SLP service url returned by Locator.findServices().
+	 * @param pAttributes
+	 *            The attribute list (List<String>) where each entry looks
+	 *            either like this key=value or this
+	 *            (key=value).
+	 */
+	public WBEMServiceAdvertisementSLP(String pDA, ServiceURL pUrl, List pAttributes) {
+		if (pDA == null || pUrl == null) throw new IllegalArgumentException(
+				"Directory and URL must not be null");
+		this.iDA = pDA;
+		this.iServiceUrl = pUrl;
+		parseAttributes(pAttributes);
+
+	}
+
+	private void parseAttributes(List pAttributes) {
+		this.iAttributeMap = new HashMap();
+		Iterator iter = pAttributes.iterator();
+		while (iter.hasNext()) {
+			String attribute = iter.next();
+			Matcher matcher = ATTR_PATTERN.matcher(attribute);
+			if (matcher.matches()) {
+				String key = matcher.group(1).trim();
+				String value = matcher.group(2).trim();
+				this.iAttributeMap.put(key, value);
+			} else {
+				LogAndTraceBroker.getBroker().trace(Level.FINE,
+						"SLP discovery returned invalid attribute: " + attribute);
+			}
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.sblim.cimclient.discovery.WbemService#getAttribute(java.lang.String)
+	 */
+	public String getAttribute(String pAttributeName) {
+		return this.iAttributeMap.get(pAttributeName);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.sblim.cimclient.discovery.WbemService#getAttributes()
+	 */
+	public Set> getAttributes() {
+		return this.iAttributeMap.entrySet();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.sblim.cimclient.discovery.WbemService#getConcreteServiceType()
+	 */
+	public String getConcreteServiceType() {
+		return this.iServiceUrl.getServiceType().getConcreteTypeName();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.sblim.cimclient.discovery.WbemService#getServiceUrl()
+	 */
+	public String getServiceUrl() {
+		return getConcreteServiceType() + "://" + this.iServiceUrl.getHost() + ":"
+				+ String.valueOf(this.iServiceUrl.getPort());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.sblim.cimclient.discovery.WBEMServiceAdvertisement#createClient(javax
+	 * .security.auth.Subject, java.util.Locale[])
+	 */
+	public WBEMClient createClient(Subject pSubject, Locale[] pLocales) throws Exception {
+		String communication = getAttribute(COMM_MECHANISM);
+		if (communication.equalsIgnoreCase("OTHER")) {
+			communication = getAttribute(OTHER_COMM_MECHN_DESC);
+		}
+		WBEMClient client = WBEMClientFactory.getClient(communication);
+		CIMObjectPath path = new CIMObjectPath(this.iServiceUrl.getServiceType()
+				.getConcreteTypeName(), this.iServiceUrl.getHost(), String.valueOf(this.iServiceUrl
+				.getPort()), null, null, null);
+		client.initialize(path, pSubject, pLocales);
+		return client;
+	}
+
+	public String getDirectory() {
+		return this.iDA;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		// buffer.append(iServiceUrl.getServiceType());
+		// buffer.append("://");
+		// buffer.append(iServiceUrl.getHost());
+		buffer.append(getServiceUrl());
+		buffer.append("{slp da=\"");
+		buffer.append(this.iDA);
+		buffer.append("\", attributes=[");
+		Iterator> iter = this.iAttributeMap.entrySet().iterator();
+		while (iter.hasNext()) {
+			Entry entry = iter.next();
+			buffer.append("\"");
+			buffer.append(entry.getKey());
+			buffer.append("=");
+			buffer.append(entry.getValue());
+			buffer.append("\"");
+			if (iter.hasNext()) buffer.append(", ");
+		}
+		buffer.append("]}");
+		return buffer.toString();
+	}
+
+	public String[] getInteropNamespaces() {
+		return parseCommaSeparatedList(getAttribute(INTEROP_NS));
+	}
+
+	private String[] parseCommaSeparatedList(String pAttribute) {
+		String[] split = pAttribute.split("[,\\n]");
+		int emptyCount = 0;
+		for (int i = 0; i < split.length; ++i) {
+			split[i] = split[i].trim();
+			if (split[i].length() == 0) {
+				++emptyCount;
+			}
+		}
+		if (emptyCount > 0) {
+			String[] result = new String[split.length - emptyCount];
+			int j = 0;
+			for (int i = 0; i < split.length; ++i) {
+				if (split[i].length() > 0) {
+					result[j++] = split[i];
+				}
+			}
+			return result;
+		}
+		return split;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.sblim.cimclient.discovery.WBEMServiceAdvertisement#getServiceId()
+	 */
+	public String getServiceId() {
+		return getAttribute(SERVICE_ID);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.sblim.cimclient.discovery.WBEMServiceAdvertisement#isExpired()
+	 */
+	public boolean isExpired() {
+		return this.iExpired;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.sblim.cimclient.discovery.WBEMServiceAdvertisement#setExpired(boolean
+	 * )
+	 */
+	public void setExpired(boolean pExpired) {
+		this.iExpired = pExpired;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object pObj) {
+		if (pObj == this) { return true; }
+		if (pObj != null && pObj instanceof WBEMServiceAdvertisement) {
+			WBEMServiceAdvertisement that = (WBEMServiceAdvertisement) pObj;
+			return getServiceUrl().equals(that.getServiceUrl())
+					&& getDirectory().equals(that.getDirectory());
+		}
+		return false;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		return this.iServiceUrl.hashCode() + this.iDA.hashCode();
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/discovery/slp/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/discovery/slp/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java
index de5deb2..884ab88 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java
@@ -1,121 +1,119 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1516242    2006-11-27  lupusalex    Support of OpenPegasus local authentication
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * Class AuthorizationHandler manages AdAuthorizationInfo instances
- * 
- */
-public class AuthorizationHandler {
-
-	private ArrayList iAuthList = new ArrayList();
-
-	/**
-	 * Adds an AuthorizationInfo to the handler
-	 * 
-	 * @param pAuthorizationInfo
-	 *            The AuthorizationInfo to add
-	 */
-	public synchronized void addAuthorizationInfo(AuthorizationInfo pAuthorizationInfo) {
-		this.iAuthList.add(pAuthorizationInfo);
-	}
-
-	/**
-	 * Returns the corresponding AuthorizationInfo for a given set of parameters
-	 * 
-	 * @param pAuthorizationModule
-	 *            The authorization module
-	 * @param pProxy
-	 *            Proxy authentication ?
-	 * @param pAddr
-	 *            Host address
-	 * @param pPort
-	 *            Host port
-	 * @param pProtocol
-	 *            Protocol
-	 * @param pRealm
-	 *            Realm
-	 * @param pScheme
-	 *            Scheme
-	 * @return The AuthorizationInfo or null if none fits
-	 */
-	public synchronized AuthorizationInfo getAuthorizationInfo(String pAuthorizationModule,
-			Boolean pProxy, String pAddr, int pPort, String pProtocol, String pRealm, String pScheme) {
-
-		AuthorizationInfo request = AuthorizationInfo.createAuthorizationInfo(pAuthorizationModule,
-				pProxy, pAddr, pPort, pProtocol, pRealm, pScheme);
-
-		Iterator iter = this.iAuthList.iterator();
-		while (iter.hasNext()) {
-			AuthorizationInfo authInfo = iter.next();
-
-			if (authInfo.match(request)) return authInfo;
-
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the AuthorizationInfo at a given index
-	 * 
-	 * @param pIndex
-	 *            The index
-	 * @return The AuthorizationInfo
-	 */
-	public synchronized AuthorizationInfo getAuthorizationInfo(int pIndex) {
-		return this.iAuthList.get(pIndex);
-	}
-
-	@Override
-	public String toString() {
-		return "AuthorizationHandler=[AuthInfoList=" + this.iAuthList + "]";
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1516242    2006-11-27  lupusalex    Support of OpenPegasus local authentication
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * Class AuthorizationHandler manages AdAuthorizationInfo instances
+ * 
+ */
+public class AuthorizationHandler {
+
+	private ArrayList iAuthList = new ArrayList();
+
+	/**
+	 * Adds an AuthorizationInfo to the handler
+	 * 
+	 * @param pAuthorizationInfo
+	 *            The AuthorizationInfo to add
+	 */
+	public synchronized void addAuthorizationInfo(AuthorizationInfo pAuthorizationInfo) {
+		this.iAuthList.add(pAuthorizationInfo);
+	}
+
+	/**
+	 * Returns the corresponding AuthorizationInfo for a given set of parameters
+	 * 
+	 * @param pAuthorizationModule
+	 *            The authorization module
+	 * @param pProxy
+	 *            Proxy authentication ?
+	 * @param pAddr
+	 *            Host address
+	 * @param pPort
+	 *            Host port
+	 * @param pProtocol
+	 *            Protocol
+	 * @param pRealm
+	 *            Realm
+	 * @param pScheme
+	 *            Scheme
+	 * @return The AuthorizationInfo or null if none fits
+	 */
+	public synchronized AuthorizationInfo getAuthorizationInfo(String pAuthorizationModule,
+			Boolean pProxy, String pAddr, int pPort, String pProtocol, String pRealm, String pScheme) {
+
+		AuthorizationInfo request = AuthorizationInfo.createAuthorizationInfo(pAuthorizationModule,
+				pProxy, pAddr, pPort, pProtocol, pRealm, pScheme);
+
+		Iterator iter = this.iAuthList.iterator();
+		while (iter.hasNext()) {
+			AuthorizationInfo authInfo = iter.next();
+
+			if (authInfo.match(request)) return authInfo;
+
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the AuthorizationInfo at a given index
+	 * 
+	 * @param pIndex
+	 *            The index
+	 * @return The AuthorizationInfo
+	 */
+	public synchronized AuthorizationInfo getAuthorizationInfo(int pIndex) {
+		return this.iAuthList.get(pIndex);
+	}
+
+	@Override
+	public String toString() {
+		return "AuthorizationHandler=[AuthInfoList=" + this.iAuthList + "]";
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java
similarity index 87%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java
index 9101121..3a9691c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java
@@ -1,515 +1,513 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- *   17970    2005-08-11  pineiro5     Logon from z/OS not possible
- * 1516242    2006-07-05  lupusalex    Support of OpenPegasus local authentication
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.PasswordAuthentication;
-import java.net.URI;
-import java.security.NoSuchAlgorithmException;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.Messages;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-
-/**
- * Abstract superclass for HTTP authorization information.
- * 
- * @see WwwAuthInfo
- * @see PegasusLocalAuthInfo
- */
-public abstract class AuthorizationInfo {
-
-	protected String iAddr;
-
-	protected int iPort;
-
-	protected String iProtocol;
-
-	protected String iRealm;
-
-	protected String iScheme;
-
-	protected PasswordAuthentication iCredentials;
-
-	protected long iNc = 1;
-
-	protected String iCnonce;
-
-	protected String iOpaque;
-
-	protected String iAlgorithm;
-
-	protected String iUri;
-
-	protected String iNonce;
-
-	protected String iQop;
-
-	protected String iA1;
-
-	protected String iResponse;
-
-	// protected byte[] iDigest;
-
-	/**
-	 * Initialize
-	 * 
-	 * @param pProxy
-	 *            Proxy authentication ?
-	 * @param pAddress
-	 *            Server address
-	 * @param pPort
-	 *            Server port
-	 * @param pProtocol
-	 *            Protocol
-	 * @param pRealm
-	 *            Realm
-	 * @param pScheme
-	 *            Scheme
-	 */
-	public void init(Boolean pProxy, String pAddress, int pPort, String pProtocol, String pRealm,
-			String pScheme) {
-		this.iAddr = pAddress;
-		this.iPort = pPort;
-		this.iProtocol = pProtocol;
-		this.iRealm = pRealm;
-		this.iScheme = pScheme;
-	}
-
-	/**
-	 * Sets opaque
-	 * 
-	 * @param opaque
-	 *            new Value
-	 */
-	public void setOpaque(String opaque) {
-		this.iOpaque = opaque;
-	}
-
-	/**
-	 * Returns opaque
-	 * 
-	 * @return Opaque
-	 */
-	public String getOpaque() {
-		return this.iOpaque;
-	}
-
-	/**
-	 * Returns Qop
-	 * 
-	 * @return Qop
-	 */
-	public String getQop() {
-		return this.iQop;
-	}
-
-	/**
-	 * Sets Qop
-	 * 
-	 * @param qop
-	 *            New value
-	 */
-	public void setQop(String qop) {
-		this.iQop = qop;
-	}
-
-	/**
-	 * Returns nc
-	 * 
-	 * @return nc
-	 */
-	public long getNc() {
-		return this.iNc;
-	}
-
-	/**
-	 * Sets nc
-	 * 
-	 * @param nc
-	 *            New value
-	 */
-	public void setNc(long nc) {
-		this.iNc = nc;
-	}
-
-	/**
-	 * Sets nonce
-	 * 
-	 * @param nonce
-	 *            New Value
-	 */
-	public void setNonce(String nonce) {
-		this.iNonce = nonce;
-	}
-
-	/**
-	 * Returns nonce
-	 * 
-	 * @return nonce
-	 */
-	public String getNonce() {
-		return this.iNonce;
-	}
-
-	/**
-	 * Set cnonce
-	 * 
-	 * @param cnonce
-	 *            New value
-	 */
-	public void setCnonce(String cnonce) {
-		this.iCnonce = cnonce;
-	}
-
-	/**
-	 * Returns cnonce
-	 * 
-	 * @return cnonce
-	 */
-	public String getCnonce() {
-		return this.iCnonce;
-	}
-
-	/**
-	 * Set algorithm
-	 * 
-	 * @param algorithm
-	 *            New value
-	 */
-	public void setAlgorithm(String algorithm) {
-		this.iAlgorithm = algorithm;
-	}
-
-	/**
-	 * Returns algorithm
-	 * 
-	 * @return algorithm
-	 */
-	public String getAlgorithm() {
-		return this.iAlgorithm;
-	}
-
-	/**
-	 * Returns A1
-	 * 
-	 * @return A1
-	 */
-	public String getA1() {
-		return this.iA1;
-	}
-
-	/**
-	 * Sets A1
-	 * 
-	 * @param A1
-	 *            New value
-	 */
-	public void setA1(String A1) {
-		this.iA1 = A1;
-	}
-
-	/**
-	 * Sets response
-	 * 
-	 * @param response
-	 *            New value
-	 */
-	public void setResponse(String response) {
-		this.iResponse = response;
-	}
-
-	/**
-	 * Returns response
-	 * 
-	 * @return New value
-	 */
-	public String getResponse() {
-		return this.iResponse;
-	}
-
-	/**
-	 * Returns URI
-	 * 
-	 * @return URI
-	 */
-	public String getURI() {
-		return this.iUri;
-	}
-
-	/**
-	 * Sets URI
-	 * 
-	 * @param uri
-	 *            New value
-	 */
-	public void setURI(String uri) {
-		this.iUri = uri;
-	}
-
-	/**
-	 * Sets credentials
-	 * 
-	 * @param credentials
-	 *            New value
-	 */
-	public void setCredentials(PasswordAuthentication credentials) {
-		this.iCredentials = credentials;
-	}
-
-	/**
-	 * Returns the address
-	 * 
-	 * @return The server address
-	 */
-	public String getAddr() {
-		return this.iAddr;
-	}
-
-	/**
-	 * Returns the port
-	 * 
-	 * @return The server port
-	 */
-	public int getPort() {
-		return this.iPort;
-	}
-
-	/**
-	 * Returns the protocol
-	 * 
-	 * @return The protocol
-	 */
-	public String getProtocol() {
-		return this.iProtocol;
-	}
-
-	/**
-	 * Returns the realm
-	 * 
-	 * @return The realm
-	 */
-	public String getRealm() {
-		return this.iRealm;
-	}
-
-	/**
-	 * Sets the realm
-	 * 
-	 * @param realm
-	 *            New value
-	 */
-	public void setRealm(String realm) {
-		this.iRealm = realm;
-	}
-
-	/**
-	 * Returns the scheme
-	 * 
-	 * @return The scheme
-	 */
-	public String getScheme() {
-		return this.iScheme;
-	}
-
-	/**
-	 * Sets the scheme
-	 * 
-	 * @param scheme
-	 *            New value
-	 */
-	public void setScheme(String scheme) {
-		this.iScheme = scheme;
-	}
-
-	/**
-	 * Returns the credentials
-	 * 
-	 * @return The credentials
-	 */
-	public PasswordAuthentication getCredentials() {
-		return this.iCredentials;
-	}
-
-	/**
-	 * Compares two authorization informations.
-	 * 
-	 * @param obj
-	 *            The other authorization information
-	 * @return true if type, realm, scheme, address, protocol and
-	 *         port of both authorization informations are equal,
-	 *         false otherwise.
-	 */
-	public boolean match(Object obj) {
-		if (obj == null || !(obj instanceof AuthorizationInfo)) return false;
-		AuthorizationInfo that = (AuthorizationInfo) obj;
-
-		boolean type = getClass().equals(that.getClass());
-		// boolean prxt = (iProxy == null || that.iProxy == null)?
-		// true:iProxy.equals(that.iProxy);
-		boolean prmpt = (this.iRealm == null || that.iRealm == null) ? true : this.iRealm
-				.equals(that.iRealm);
-		boolean schm = (this.iScheme == null || that.iScheme == null) ? true : this.iScheme
-				.equals(that.iScheme);
-		boolean adr = (this.iAddr == null || that.iAddr == null) ? true : this.iAddr
-				.equals(that.iAddr);
-		boolean prot = (this.iProtocol == null || that.iProtocol == null) ? true : this.iProtocol
-				.equals(that.iProtocol);
-		boolean prt = (this.iPort <= 0 || that.iPort <= 0) ? true : (this.iPort == that.iPort);
-		return (type && prmpt && schm && adr && prot && prt);
-	}
-
-	/**
-	 * Updates the authorization information according to a received challenge.
-	 * 
-	 * @param challenge
-	 *            The received challenge
-	 * @param authenticate
-	 *            The authenticate header field
-	 * @param url
-	 *            The url of the CIM server
-	 * @param requestMethod
-	 *            The HTTP request method (POST or MPOST)
-	 * @throws NoSuchAlgorithmException
-	 */
-	public abstract void updateAuthenticationInfo(Challenge challenge, String authenticate,
-			URI url, String requestMethod) throws NoSuchAlgorithmException;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public abstract String toString();
-
-	/**
-	 * Gets the HTTP header field name for this authentication information
-	 * 
-	 * @return The field name
-	 */
-	public abstract String getHeaderFieldName();
-
-	/**
-	 * Determines if the authorization information is already sent on the very
-	 * first http request or after the "401 Unauthorized" response
-	 * 
-	 * @return true or false
-	 */
-	public abstract boolean isSentOnFirstRequest();
-
-	/**
-	 * Determines if the connection is kept alive after the "401 Unauthorized"
-	 * response
-	 * 
-	 * @return true or false
-	 */
-	public abstract boolean isKeptAlive();
-
-	/**
-	 * Factory method for AuthorizationInfo objects. Returns an instance of a
-	 * subclass according to the requested type.
-	 * 
-	 * @param pModule
-	 *            The authorization info type to be constructed
-	 * @param pProxy
-	 *            Proxy authentication ?
-	 * @param pAddress
-	 *            Server address
-	 * @param pPort
-	 *            Server port
-	 * @param pProtocol
-	 *            Protocol (http/https)
-	 * @param pRealm
-	 *            Realm
-	 * @param pScheme
-	 *            Scheme (e.g. Basic, Digest)
-	 * @return An instance of a AuthorizationInfo subclass or null
-	 * @see WBEMConfiguration#getHttpAuthenticationModule()
-	 * @see WwwAuthInfo
-	 * @see PegasusLocalAuthInfo
-	 */
-	public static AuthorizationInfo createAuthorizationInfo(String pModule, Boolean pProxy,
-			String pAddress, int pPort, String pProtocol, String pRealm, String pScheme) {
-
-		AuthorizationInfo info = createAuthorizationInfo(pModule);
-
-		if (info != null) {
-			info.init(pProxy, pAddress, pPort, pProtocol, pRealm, pScheme);
-		}
-
-		return info;
-
-	}
-
-	/**
-	 * Factory method for AuthorizationInfo objects. Returns an instance of a
-	 * subclass according to the requested type.
-	 * 
-	 * @param pModule
-	 *            The authorization info type to be constructed
-	 * @return An instance of a AuthorizationInfo subclass or null
-	 */
-	public static AuthorizationInfo createAuthorizationInfo(String pModule) {
-
-		if (WwwAuthInfo.class.getName().equals(pModule)) { return new WwwAuthInfo(); }
-		if (PegasusLocalAuthInfo.class.getName().equals(pModule)) { return new PegasusLocalAuthInfo(); }
-
-		try {
-			Class module = Class.forName(pModule);
-			AuthorizationInfo info = (AuthorizationInfo) module.newInstance();
-			return info;
-		} catch (Exception e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"Exception while loading authentication module", e);
-			LogAndTraceBroker.getBroker().message(Messages.HTTP_AUTH_MODULE_INVALID, pModule);
-		}
-		return null;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ *   17970    2005-08-11  pineiro5     Logon from z/OS not possible
+ * 1516242    2006-07-05  lupusalex    Support of OpenPegasus local authentication
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.PasswordAuthentication;
+import java.net.URI;
+import java.security.NoSuchAlgorithmException;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+
+/**
+ * Abstract superclass for HTTP authorization information.
+ * 
+ * @see WwwAuthInfo
+ * @see PegasusLocalAuthInfo
+ */
+public abstract class AuthorizationInfo {
+
+	protected String iAddr;
+
+	protected int iPort;
+
+	protected String iProtocol;
+
+	protected String iRealm;
+
+	protected String iScheme;
+
+	protected PasswordAuthentication iCredentials;
+
+	protected long iNc = 1;
+
+	protected String iCnonce;
+
+	protected String iOpaque;
+
+	protected String iAlgorithm;
+
+	protected String iUri;
+
+	protected String iNonce;
+
+	protected String iQop;
+
+	protected String iA1;
+
+	protected String iResponse;
+
+	// protected byte[] iDigest;
+
+	/**
+	 * Initialize
+	 * 
+	 * @param pProxy
+	 *            Proxy authentication ?
+	 * @param pAddress
+	 *            Server address
+	 * @param pPort
+	 *            Server port
+	 * @param pProtocol
+	 *            Protocol
+	 * @param pRealm
+	 *            Realm
+	 * @param pScheme
+	 *            Scheme
+	 */
+	public void init(Boolean pProxy, String pAddress, int pPort, String pProtocol, String pRealm,
+			String pScheme) {
+		this.iAddr = pAddress;
+		this.iPort = pPort;
+		this.iProtocol = pProtocol;
+		this.iRealm = pRealm;
+		this.iScheme = pScheme;
+	}
+
+	/**
+	 * Sets opaque
+	 * 
+	 * @param opaque
+	 *            new Value
+	 */
+	public void setOpaque(String opaque) {
+		this.iOpaque = opaque;
+	}
+
+	/**
+	 * Returns opaque
+	 * 
+	 * @return Opaque
+	 */
+	public String getOpaque() {
+		return this.iOpaque;
+	}
+
+	/**
+	 * Returns Qop
+	 * 
+	 * @return Qop
+	 */
+	public String getQop() {
+		return this.iQop;
+	}
+
+	/**
+	 * Sets Qop
+	 * 
+	 * @param qop
+	 *            New value
+	 */
+	public void setQop(String qop) {
+		this.iQop = qop;
+	}
+
+	/**
+	 * Returns nc
+	 * 
+	 * @return nc
+	 */
+	public long getNc() {
+		return this.iNc;
+	}
+
+	/**
+	 * Sets nc
+	 * 
+	 * @param nc
+	 *            New value
+	 */
+	public void setNc(long nc) {
+		this.iNc = nc;
+	}
+
+	/**
+	 * Sets nonce
+	 * 
+	 * @param nonce
+	 *            New Value
+	 */
+	public void setNonce(String nonce) {
+		this.iNonce = nonce;
+	}
+
+	/**
+	 * Returns nonce
+	 * 
+	 * @return nonce
+	 */
+	public String getNonce() {
+		return this.iNonce;
+	}
+
+	/**
+	 * Set cnonce
+	 * 
+	 * @param cnonce
+	 *            New value
+	 */
+	public void setCnonce(String cnonce) {
+		this.iCnonce = cnonce;
+	}
+
+	/**
+	 * Returns cnonce
+	 * 
+	 * @return cnonce
+	 */
+	public String getCnonce() {
+		return this.iCnonce;
+	}
+
+	/**
+	 * Set algorithm
+	 * 
+	 * @param algorithm
+	 *            New value
+	 */
+	public void setAlgorithm(String algorithm) {
+		this.iAlgorithm = algorithm;
+	}
+
+	/**
+	 * Returns algorithm
+	 * 
+	 * @return algorithm
+	 */
+	public String getAlgorithm() {
+		return this.iAlgorithm;
+	}
+
+	/**
+	 * Returns A1
+	 * 
+	 * @return A1
+	 */
+	public String getA1() {
+		return this.iA1;
+	}
+
+	/**
+	 * Sets A1
+	 * 
+	 * @param A1
+	 *            New value
+	 */
+	public void setA1(String A1) {
+		this.iA1 = A1;
+	}
+
+	/**
+	 * Sets response
+	 * 
+	 * @param response
+	 *            New value
+	 */
+	public void setResponse(String response) {
+		this.iResponse = response;
+	}
+
+	/**
+	 * Returns response
+	 * 
+	 * @return New value
+	 */
+	public String getResponse() {
+		return this.iResponse;
+	}
+
+	/**
+	 * Returns URI
+	 * 
+	 * @return URI
+	 */
+	public String getURI() {
+		return this.iUri;
+	}
+
+	/**
+	 * Sets URI
+	 * 
+	 * @param uri
+	 *            New value
+	 */
+	public void setURI(String uri) {
+		this.iUri = uri;
+	}
+
+	/**
+	 * Sets credentials
+	 * 
+	 * @param credentials
+	 *            New value
+	 */
+	public void setCredentials(PasswordAuthentication credentials) {
+		this.iCredentials = credentials;
+	}
+
+	/**
+	 * Returns the address
+	 * 
+	 * @return The server address
+	 */
+	public String getAddr() {
+		return this.iAddr;
+	}
+
+	/**
+	 * Returns the port
+	 * 
+	 * @return The server port
+	 */
+	public int getPort() {
+		return this.iPort;
+	}
+
+	/**
+	 * Returns the protocol
+	 * 
+	 * @return The protocol
+	 */
+	public String getProtocol() {
+		return this.iProtocol;
+	}
+
+	/**
+	 * Returns the realm
+	 * 
+	 * @return The realm
+	 */
+	public String getRealm() {
+		return this.iRealm;
+	}
+
+	/**
+	 * Sets the realm
+	 * 
+	 * @param realm
+	 *            New value
+	 */
+	public void setRealm(String realm) {
+		this.iRealm = realm;
+	}
+
+	/**
+	 * Returns the scheme
+	 * 
+	 * @return The scheme
+	 */
+	public String getScheme() {
+		return this.iScheme;
+	}
+
+	/**
+	 * Sets the scheme
+	 * 
+	 * @param scheme
+	 *            New value
+	 */
+	public void setScheme(String scheme) {
+		this.iScheme = scheme;
+	}
+
+	/**
+	 * Returns the credentials
+	 * 
+	 * @return The credentials
+	 */
+	public PasswordAuthentication getCredentials() {
+		return this.iCredentials;
+	}
+
+	/**
+	 * Compares two authorization informations.
+	 * 
+	 * @param obj
+	 *            The other authorization information
+	 * @return true if type, realm, scheme, address, protocol and
+	 *         port of both authorization informations are equal,
+	 *         false otherwise.
+	 */
+	public boolean match(Object obj) {
+		if (obj == null || !(obj instanceof AuthorizationInfo)) return false;
+		AuthorizationInfo that = (AuthorizationInfo) obj;
+
+		boolean type = getClass().equals(that.getClass());
+		// boolean prxt = (iProxy == null || that.iProxy == null)?
+		// true:iProxy.equals(that.iProxy);
+		boolean prmpt = (this.iRealm == null || that.iRealm == null) ? true : this.iRealm
+				.equals(that.iRealm);
+		boolean schm = (this.iScheme == null || that.iScheme == null) ? true : this.iScheme
+				.equals(that.iScheme);
+		boolean adr = (this.iAddr == null || that.iAddr == null) ? true : this.iAddr
+				.equals(that.iAddr);
+		boolean prot = (this.iProtocol == null || that.iProtocol == null) ? true : this.iProtocol
+				.equals(that.iProtocol);
+		boolean prt = (this.iPort <= 0 || that.iPort <= 0) ? true : (this.iPort == that.iPort);
+		return (type && prmpt && schm && adr && prot && prt);
+	}
+
+	/**
+	 * Updates the authorization information according to a received challenge.
+	 * 
+	 * @param challenge
+	 *            The received challenge
+	 * @param authenticate
+	 *            The authenticate header field
+	 * @param url
+	 *            The url of the CIM server
+	 * @param requestMethod
+	 *            The HTTP request method (POST or MPOST)
+	 * @throws NoSuchAlgorithmException
+	 */
+	public abstract void updateAuthenticationInfo(Challenge challenge, String authenticate,
+			URI url, String requestMethod) throws NoSuchAlgorithmException;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public abstract String toString();
+
+	/**
+	 * Gets the HTTP header field name for this authentication information
+	 * 
+	 * @return The field name
+	 */
+	public abstract String getHeaderFieldName();
+
+	/**
+	 * Determines if the authorization information is already sent on the very
+	 * first http request or after the "401 Unauthorized" response
+	 * 
+	 * @return true or false
+	 */
+	public abstract boolean isSentOnFirstRequest();
+
+	/**
+	 * Determines if the connection is kept alive after the "401 Unauthorized"
+	 * response
+	 * 
+	 * @return true or false
+	 */
+	public abstract boolean isKeptAlive();
+
+	/**
+	 * Factory method for AuthorizationInfo objects. Returns an instance of a
+	 * subclass according to the requested type.
+	 * 
+	 * @param pModule
+	 *            The authorization info type to be constructed
+	 * @param pProxy
+	 *            Proxy authentication ?
+	 * @param pAddress
+	 *            Server address
+	 * @param pPort
+	 *            Server port
+	 * @param pProtocol
+	 *            Protocol (http/https)
+	 * @param pRealm
+	 *            Realm
+	 * @param pScheme
+	 *            Scheme (e.g. Basic, Digest)
+	 * @return An instance of a AuthorizationInfo subclass or null
+	 * @see WBEMConfiguration#getHttpAuthenticationModule()
+	 * @see WwwAuthInfo
+	 * @see PegasusLocalAuthInfo
+	 */
+	public static AuthorizationInfo createAuthorizationInfo(String pModule, Boolean pProxy,
+			String pAddress, int pPort, String pProtocol, String pRealm, String pScheme) {
+
+		AuthorizationInfo info = createAuthorizationInfo(pModule);
+
+		if (info != null) {
+			info.init(pProxy, pAddress, pPort, pProtocol, pRealm, pScheme);
+		}
+
+		return info;
+
+	}
+
+	/**
+	 * Factory method for AuthorizationInfo objects. Returns an instance of a
+	 * subclass according to the requested type.
+	 * 
+	 * @param pModule
+	 *            The authorization info type to be constructed
+	 * @return An instance of a AuthorizationInfo subclass or null
+	 */
+	public static AuthorizationInfo createAuthorizationInfo(String pModule) {
+
+		if (WwwAuthInfo.class.getName().equals(pModule)) { return new WwwAuthInfo(); }
+		if (PegasusLocalAuthInfo.class.getName().equals(pModule)) { return new PegasusLocalAuthInfo(); }
+
+		try {
+			Class module = Class.forName(pModule);
+			AuthorizationInfo info = (AuthorizationInfo) module.newInstance();
+			return info;
+		} catch (Exception e) {
+			LogAndTraceBroker.getBroker().trace(Level.FINER,
+					"Exception while loading authentication module", e);
+			LogAndTraceBroker.getBroker().message(Messages.HTTP_AUTH_MODULE_INVALID, pModule);
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/BASE64Encoder.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/BASE64Encoder.java
similarity index 81%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/BASE64Encoder.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/BASE64Encoder.java
index f728a81..d907f98 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/BASE64Encoder.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/BASE64Encoder.java
@@ -1,143 +1,141 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 17970      2005-08-11  pineiro5     Logon from z/OS not possible
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.UnsupportedEncodingException;
-
-/**
- * Class BASE64Encoder implements the BASE64 encoding algorithm
- * 
- */
-public final class BASE64Encoder {
-
-	private static byte BASE64_ALPHABET[] = { 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-			78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103,
-			104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
-			121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 43, 47 };
-
-	private BASE64Encoder() {
-	// no instances
-	}
-
-	/**
-	 * Encodes a given byte array
-	 * 
-	 * @param pPlain
-	 *            The raw bytes
-	 * @return The encoded bytes
-	 */
-	public static String encode(byte[] pPlain) {
-		byte encoded[];
-		int totalBits = pPlain.length << 3;
-		int remainder = totalBits % 24;
-		int totalEncoded = totalBits / 24;
-
-		int size = totalEncoded;
-		if (remainder > 0) size++;
-
-		encoded = new byte[size << 2];
-
-		short highBits = 0;
-		short lowBits = 0;
-		short byte1 = 0;
-		short byte2 = 0;
-		short byte3 = 0;
-		int dest = 0;
-		int source = 0;
-		for (int i = 0; i < totalEncoded; i++) {
-			byte1 = (short) (pPlain[source++] & 0xFF);
-			byte2 = (short) (pPlain[source++] & 0xFF);
-			byte3 = (short) (pPlain[source++] & 0xFF);
-
-			highBits = (short) (byte1 & 0x03);
-			lowBits = (short) (byte2 & 0x0F);
-
-			short val1 = (short) (byte1 >> 2);
-			short val2 = (short) (byte2 >> 4);
-			short val3 = (short) (byte3 >> 6);
-
-			encoded[dest++] = BASE64_ALPHABET[val1];
-			encoded[dest++] = BASE64_ALPHABET[val2 | (highBits << 4)];
-			encoded[dest++] = BASE64_ALPHABET[(lowBits << 2) | val3];
-			encoded[dest++] = BASE64_ALPHABET[byte3 & 0x3f];
-		}
-
-		if (remainder == 8) {
-			byte1 = (short) (pPlain[source] & 0xFF);
-			highBits = (short) (byte1 & 0x03);
-			short val1 = (short) (byte1 >> 2);
-			encoded[dest++] = BASE64_ALPHABET[val1];
-			encoded[dest++] = BASE64_ALPHABET[highBits << 4];
-			encoded[dest++] = (byte) 61; // '='
-			encoded[dest++] = (byte) 61; // '='
-		} else if (remainder == 16) {
-			byte1 = (short) (pPlain[source++] & 0xFF);
-			byte2 = (short) (pPlain[source++] & 0xFF);
-			highBits = (short) (byte1 & 0x03);
-			lowBits = (short) (byte2 & 0x0F);
-
-			short val1 = (short) (byte1 >> 2);
-			short val2 = (short) (byte2 >> 4);
-
-			encoded[dest++] = BASE64_ALPHABET[val1];
-			encoded[dest++] = BASE64_ALPHABET[val2 | (highBits << 4)];
-			encoded[dest++] = BASE64_ALPHABET[lowBits << 2];
-			encoded[dest++] = (byte) 61; // '='
-		}
-		String res;
-		try {
-			res = new String(encoded, "ASCII");
-		} catch (UnsupportedEncodingException e) {
-			try {
-				res = new String(encoded, "UTF-8");
-			} catch (UnsupportedEncodingException e1) {
-				res = new String(encoded);
-			}
-		}
-		return res;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 17970      2005-08-11  pineiro5     Logon from z/OS not possible
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Class BASE64Encoder implements the BASE64 encoding algorithm
+ * 
+ */
+public final class BASE64Encoder {
+
+	private static byte BASE64_ALPHABET[] = { 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+			78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103,
+			104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
+			121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 43, 47 };
+
+	private BASE64Encoder() {
+	// no instances
+	}
+
+	/**
+	 * Encodes a given byte array
+	 * 
+	 * @param pPlain
+	 *            The raw bytes
+	 * @return The encoded bytes
+	 */
+	public static String encode(byte[] pPlain) {
+		byte encoded[];
+		int totalBits = pPlain.length << 3;
+		int remainder = totalBits % 24;
+		int totalEncoded = totalBits / 24;
+
+		int size = totalEncoded;
+		if (remainder > 0) size++;
+
+		encoded = new byte[size << 2];
+
+		short highBits = 0;
+		short lowBits = 0;
+		short byte1 = 0;
+		short byte2 = 0;
+		short byte3 = 0;
+		int dest = 0;
+		int source = 0;
+		for (int i = 0; i < totalEncoded; i++) {
+			byte1 = (short) (pPlain[source++] & 0xFF);
+			byte2 = (short) (pPlain[source++] & 0xFF);
+			byte3 = (short) (pPlain[source++] & 0xFF);
+
+			highBits = (short) (byte1 & 0x03);
+			lowBits = (short) (byte2 & 0x0F);
+
+			short val1 = (short) (byte1 >> 2);
+			short val2 = (short) (byte2 >> 4);
+			short val3 = (short) (byte3 >> 6);
+
+			encoded[dest++] = BASE64_ALPHABET[val1];
+			encoded[dest++] = BASE64_ALPHABET[val2 | (highBits << 4)];
+			encoded[dest++] = BASE64_ALPHABET[(lowBits << 2) | val3];
+			encoded[dest++] = BASE64_ALPHABET[byte3 & 0x3f];
+		}
+
+		if (remainder == 8) {
+			byte1 = (short) (pPlain[source] & 0xFF);
+			highBits = (short) (byte1 & 0x03);
+			short val1 = (short) (byte1 >> 2);
+			encoded[dest++] = BASE64_ALPHABET[val1];
+			encoded[dest++] = BASE64_ALPHABET[highBits << 4];
+			encoded[dest++] = (byte) 61; // '='
+			encoded[dest++] = (byte) 61; // '='
+		} else if (remainder == 16) {
+			byte1 = (short) (pPlain[source++] & 0xFF);
+			byte2 = (short) (pPlain[source++] & 0xFF);
+			highBits = (short) (byte1 & 0x03);
+			lowBits = (short) (byte2 & 0x0F);
+
+			short val1 = (short) (byte1 >> 2);
+			short val2 = (short) (byte2 >> 4);
+
+			encoded[dest++] = BASE64_ALPHABET[val1];
+			encoded[dest++] = BASE64_ALPHABET[val2 | (highBits << 4)];
+			encoded[dest++] = BASE64_ALPHABET[lowBits << 2];
+			encoded[dest++] = (byte) 61; // '='
+		}
+		String res;
+		try {
+			res = new String(encoded, "ASCII");
+		} catch (UnsupportedEncodingException e) {
+			try {
+				res = new String(encoded, "UTF-8");
+			} catch (UnsupportedEncodingException e1) {
+				res = new String(encoded);
+			}
+		}
+		return res;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/Challenge.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/Challenge.java
similarity index 88%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/Challenge.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/Challenge.java
index 41d3c59..e41d1b2 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/Challenge.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/Challenge.java
@@ -1,282 +1,280 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3596303    2013-01-04  blaschke-oss windows http response WWW-Authenticate: Negotiate fails
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Vector;
-
-/**
- * Class Challenge holds a http authentication challenge
- * 
- */
-public class Challenge {
-
-	private String iScheme;
-
-	private HttpHeader iParams;
-
-	private Challenge() {
-	// hidden ctor
-	}
-
-	/**
-	 * Returns the parameters
-	 * 
-	 * @return The parameters
-	 */
-	public HttpHeader getParams() {
-		return this.iParams;
-	}
-
-	/**
-	 * Returns the scheme
-	 * 
-	 * @return The scheme
-	 */
-	public String getScheme() {
-		return this.iScheme;
-	}
-
-	/**
-	 * Returns the realm
-	 * 
-	 * @return The realm
-	 */
-	public String getRealm() {
-		return this.iParams.getField("realm");
-	}
-
-	/**
-	 * Parses the challenge as received from the host. RFC 2617 defines the
-	 * following syntax for a challenge:
-	 * 
-	 * 
      -	 * challenge = auth-scheme 1*SP 1#auth-param 
-	 * auth-scheme = token 
-	 * auth-param = token "=" ( token | quoted-string )
-	 * 
      
-	 * 
-	 * @param pLine
-	 *            The challenge string
-	 * @return The parsed challenge
-	 * @throws HttpParseException
-	 *             If the challenge string is ill-formed
-	 */
-	public static Challenge[] parseChallenge(String pLine) throws HttpParseException {
-		if (pLine == null || pLine.length() == 0) throw new IllegalArgumentException(
-				"Invalid challenge, empty");
-		pLine = pLine.trim();
-		if (pLine.length() == 0) throw new IllegalArgumentException("Invalid challenge, empty");
-
-		Vector challenges = new Vector();
-
-		try {
-			int start = 0, end = 0;
-
-			// Break up comma-separated list into tokens
-			Vector tokensBetweenCommas = new Vector();
-			while ((end = indexOfOutsideQuotedString(pLine, ',', start)) > 0) {
-				tokensBetweenCommas.add(removeWhitespace(pLine.substring(start, end)));
-				start = end + 1;
-			}
-			if (start < pLine.length()) tokensBetweenCommas.add(removeWhitespace(pLine
-					.substring(start)));
-
-			// Break up tokens into auth-scheme and auth-param
-			Vector tokens = new Vector();
-			for (int i = 0; i < tokensBetweenCommas.size(); i++) {
-				String token = tokensBetweenCommas.elementAt(i);
-
-				if (token.length() == 0) continue;
-
-				start = 0;
-				end = indexOfOutsideQuotedString(token, ' ', start);
-
-				if (end == -1) {
-					tokens.add(token);
-				} else {
-					tokens.add(token.substring(0, end));
-					start = end + 1;
-					end = indexOfOutsideQuotedString(token, ' ', start);
-
-					if (end == -1) {
-						// RFC 2617 indicates this token should be of the
-						// name=value format, but at least one old CIMOM (SVC
-						// ICAT) does not follow this rule. The Client
-						// effectively ignores this token, and so must continue
-						// to do so.
-						if (indexOfOutsideQuotedString(token, '=', start) == -1) {
-							// throw new
-							// HttpParseException("Invalid challenge, second token must be name=value in "
-							// + token);
-						} else {
-							tokens.add(token.substring(start));
-						}
-					} else {
-						throw new HttpParseException("Invalid challenge, too many tokens in "
-								+ token);
-					}
-				}
-			}
-
-			Challenge challenge = new Challenge();
-			challenge.iScheme = null;
-			challenge.iParams = new HttpHeader();
-
-			for (int i = 0; i < tokens.size(); i++) {
-				String token = tokens.elementAt(i);
-
-				int equalSign = indexOfOutsideQuotedString(token, '=', 0);
-				if (equalSign == 0) {
-					throw new HttpParseException(
-							"Invalid challenge, no token before equal sign in " + token);
-				} else if (equalSign > 0) {
-					// param
-					if (challenge.iScheme == null) throw new HttpParseException(
-							"Invalid challenge, param without scheme");
-					String name = token.substring(0, equalSign);
-					String value = token.substring(equalSign + 1);
-					if (value.length() == 0) {
-						throw new HttpParseException(
-								"Invalid challenge, no token after equal sign in " + token);
-					} else if (value.startsWith("\"") && value.endsWith("\"") && value.length() > 1) {
-						challenge.iParams.addField(name, value.substring(1, value.length() - 1));
-					} else {
-						challenge.iParams.addField(name, value);
-					}
-				} else {
-					// scheme
-					if (challenge.iScheme != null) {
-						// new scheme
-						challenges.add(challenge);
-
-						challenge = new Challenge();
-						challenge.iParams = new HttpHeader();
-					}
-					challenge.iScheme = new String(token);
-				}
-			}
-
-			if (challenge.iScheme != null) {
-				challenges.add(challenge);
-			}
-		} catch (HttpParseException e) {
-			throw e;
-		} catch (Exception e) {
-			throw new HttpParseException("Invalid challenge, " + e.getMessage());
-		}
-
-		return challenges.toArray(new Challenge[challenges.size()]);
-
-	}
-
-	/*
-	 * Removes unnecessary whitespace from a challenge such that
-	 * "  scheme   name  =  value  " becomes "scheme name=value"
-	 */
-	private static String removeWhitespace(String str) throws HttpParseException {
-		char inBuf[] = str.trim().toCharArray();
-		StringBuilder outStr = new StringBuilder();
-		boolean inQuotes = false;
-
-		for (int inIdx = 0; inIdx < inBuf.length; inIdx++) {
-			if (inQuotes || !Character.isSpaceChar(inBuf[inIdx])) {
-				if (inBuf[inIdx] == '=' && outStr.length() == 0) throw new HttpParseException(
-						"Invalid challenge, no token before equal sign in " + str);
-
-				outStr.append(inBuf[inIdx]);
-			} else {
-				// Whitespace not within quoted string
-				int i = skipSpaces(inBuf, inIdx + 1);
-				if (i >= inBuf.length) throw new HttpParseException(
-						"Invalid challenge, no token after space in " + str);
-
-				if (inBuf[i] == '=') {
-					// auth-param, remove all whitespace up to next token
-					i = skipSpaces(inBuf, i + 1);
-					if (i >= inBuf.length) throw new HttpParseException(
-							"Invalid challenge, no token after equal sign in " + str);
-					outStr.append('=');
-				} else {
-					// another token, combine all whitespace up to next token
-					// into single space
-					outStr.append(' ');
-				}
-				outStr.append(inBuf[i]);
-				inIdx = i;
-			}
-			if (inBuf[inIdx] == '\"') inQuotes = !inQuotes;
-		}
-		if (inQuotes) throw new HttpParseException(
-				"Invalid challenge, quoted string not terminated in " + str);
-		return outStr.toString();
-	}
-
-	private static int skipSpaces(char[] buf, int pos) {
-		while (pos < buf.length && Character.isSpaceChar(buf[pos]))
-			pos++;
-		return pos;
-	}
-
-	private static int indexOfOutsideQuotedString(String str, int ch, int pos)
-			throws HttpParseException {
-		int len = str.length();
-		boolean inQuotes = false;
-
-		while (pos < len) {
-			if (str.charAt(pos) == '\"') {
-				inQuotes = !inQuotes;
-			} else if (str.charAt(pos) == ch) {
-				if (!inQuotes) return pos;
-			}
-			pos++;
-		}
-		if (inQuotes) throw new HttpParseException(
-				"Invalid callenge, quoted string not terminated in " + str);
-		return -1;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3596303    2013-01-04  blaschke-oss windows http response WWW-Authenticate: Negotiate fails
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Vector;
+
+/**
+ * Class Challenge holds a http authentication challenge
+ * 
+ */
+public class Challenge {
+
+	private String iScheme;
+
+	private HttpHeader iParams;
+
+	private Challenge() {
+	// hidden ctor
+	}
+
+	/**
+	 * Returns the parameters
+	 * 
+	 * @return The parameters
+	 */
+	public HttpHeader getParams() {
+		return this.iParams;
+	}
+
+	/**
+	 * Returns the scheme
+	 * 
+	 * @return The scheme
+	 */
+	public String getScheme() {
+		return this.iScheme;
+	}
+
+	/**
+	 * Returns the realm
+	 * 
+	 * @return The realm
+	 */
+	public String getRealm() {
+		return this.iParams.getField("realm");
+	}
+
+	/**
+	 * Parses the challenge as received from the host. RFC 2617 defines the
+	 * following syntax for a challenge:
+	 * 
+	 * 
      +	 * challenge = auth-scheme 1*SP 1#auth-param 
+	 * auth-scheme = token 
+	 * auth-param = token "=" ( token | quoted-string )
+	 * 
      
+	 * 
+	 * @param pLine
+	 *            The challenge string
+	 * @return The parsed challenge
+	 * @throws HttpParseException
+	 *             If the challenge string is ill-formed
+	 */
+	public static Challenge[] parseChallenge(String pLine) throws HttpParseException {
+		if (pLine == null || pLine.length() == 0) throw new IllegalArgumentException(
+				"Invalid challenge, empty");
+		pLine = pLine.trim();
+		if (pLine.length() == 0) throw new IllegalArgumentException("Invalid challenge, empty");
+
+		Vector challenges = new Vector();
+
+		try {
+			int start = 0, end = 0;
+
+			// Break up comma-separated list into tokens
+			Vector tokensBetweenCommas = new Vector();
+			while ((end = indexOfOutsideQuotedString(pLine, ',', start)) > 0) {
+				tokensBetweenCommas.add(removeWhitespace(pLine.substring(start, end)));
+				start = end + 1;
+			}
+			if (start < pLine.length()) tokensBetweenCommas.add(removeWhitespace(pLine
+					.substring(start)));
+
+			// Break up tokens into auth-scheme and auth-param
+			Vector tokens = new Vector();
+			for (int i = 0; i < tokensBetweenCommas.size(); i++) {
+				String token = tokensBetweenCommas.elementAt(i);
+
+				if (token.length() == 0) continue;
+
+				start = 0;
+				end = indexOfOutsideQuotedString(token, ' ', start);
+
+				if (end == -1) {
+					tokens.add(token);
+				} else {
+					tokens.add(token.substring(0, end));
+					start = end + 1;
+					end = indexOfOutsideQuotedString(token, ' ', start);
+
+					if (end == -1) {
+						// RFC 2617 indicates this token should be of the
+						// name=value format, but at least one old CIMOM (SVC
+						// ICAT) does not follow this rule. The Client
+						// effectively ignores this token, and so must continue
+						// to do so.
+						if (indexOfOutsideQuotedString(token, '=', start) == -1) {
+							// throw new
+							// HttpParseException("Invalid challenge, second token must be name=value in "
+							// + token);
+						} else {
+							tokens.add(token.substring(start));
+						}
+					} else {
+						throw new HttpParseException("Invalid challenge, too many tokens in "
+								+ token);
+					}
+				}
+			}
+
+			Challenge challenge = new Challenge();
+			challenge.iScheme = null;
+			challenge.iParams = new HttpHeader();
+
+			for (int i = 0; i < tokens.size(); i++) {
+				String token = tokens.elementAt(i);
+
+				int equalSign = indexOfOutsideQuotedString(token, '=', 0);
+				if (equalSign == 0) {
+					throw new HttpParseException(
+							"Invalid challenge, no token before equal sign in " + token);
+				} else if (equalSign > 0) {
+					// param
+					if (challenge.iScheme == null) throw new HttpParseException(
+							"Invalid challenge, param without scheme");
+					String name = token.substring(0, equalSign);
+					String value = token.substring(equalSign + 1);
+					if (value.length() == 0) {
+						throw new HttpParseException(
+								"Invalid challenge, no token after equal sign in " + token);
+					} else if (value.startsWith("\"") && value.endsWith("\"") && value.length() > 1) {
+						challenge.iParams.addField(name, value.substring(1, value.length() - 1));
+					} else {
+						challenge.iParams.addField(name, value);
+					}
+				} else {
+					// scheme
+					if (challenge.iScheme != null) {
+						// new scheme
+						challenges.add(challenge);
+
+						challenge = new Challenge();
+						challenge.iParams = new HttpHeader();
+					}
+					challenge.iScheme = new String(token);
+				}
+			}
+
+			if (challenge.iScheme != null) {
+				challenges.add(challenge);
+			}
+		} catch (HttpParseException e) {
+			throw e;
+		} catch (Exception e) {
+			throw new HttpParseException("Invalid challenge, " + e.getMessage());
+		}
+
+		return challenges.toArray(new Challenge[challenges.size()]);
+
+	}
+
+	/*
+	 * Removes unnecessary whitespace from a challenge such that
+	 * "  scheme   name  =  value  " becomes "scheme name=value"
+	 */
+	private static String removeWhitespace(String str) throws HttpParseException {
+		char inBuf[] = str.trim().toCharArray();
+		StringBuilder outStr = new StringBuilder();
+		boolean inQuotes = false;
+
+		for (int inIdx = 0; inIdx < inBuf.length; inIdx++) {
+			if (inQuotes || !Character.isSpaceChar(inBuf[inIdx])) {
+				if (inBuf[inIdx] == '=' && outStr.length() == 0) throw new HttpParseException(
+						"Invalid challenge, no token before equal sign in " + str);
+
+				outStr.append(inBuf[inIdx]);
+			} else {
+				// Whitespace not within quoted string
+				int i = skipSpaces(inBuf, inIdx + 1);
+				if (i >= inBuf.length) throw new HttpParseException(
+						"Invalid challenge, no token after space in " + str);
+
+				if (inBuf[i] == '=') {
+					// auth-param, remove all whitespace up to next token
+					i = skipSpaces(inBuf, i + 1);
+					if (i >= inBuf.length) throw new HttpParseException(
+							"Invalid challenge, no token after equal sign in " + str);
+					outStr.append('=');
+				} else {
+					// another token, combine all whitespace up to next token
+					// into single space
+					outStr.append(' ');
+				}
+				outStr.append(inBuf[i]);
+				inIdx = i;
+			}
+			if (inBuf[inIdx] == '\"') inQuotes = !inQuotes;
+		}
+		if (inQuotes) throw new HttpParseException(
+				"Invalid challenge, quoted string not terminated in " + str);
+		return outStr.toString();
+	}
+
+	private static int skipSpaces(char[] buf, int pos) {
+		while (pos < buf.length && Character.isSpaceChar(buf[pos]))
+			pos++;
+		return pos;
+	}
+
+	private static int indexOfOutsideQuotedString(String str, int ch, int pos)
+			throws HttpParseException {
+		int len = str.length();
+		boolean inQuotes = false;
+
+		while (pos < len) {
+			if (str.charAt(pos) == '\"') {
+				inQuotes = !inQuotes;
+			} else if (str.charAt(pos) == ch) {
+				if (!inQuotes) return pos;
+			}
+			pos++;
+		}
+		if (inQuotes) throw new HttpParseException(
+				"Invalid callenge, quoted string not terminated in " + str);
+		return -1;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpClient.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClient.java
similarity index 93%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpClient.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClient.java
index 02752bf..c324b87 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpClient.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClient.java
@@ -1,1290 +1,1288 @@
-/*
-  HttpClient.java
-
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 13799      2004-12-07  thschaef     Fix chunking support 
- * 17620      2005-06-29  thschaef     eliminate ASCIIPrintStream1 in import statement
- * 17970      2005-08-11  pineiro5     Logon from z/OS not possible
- * 1353168    2005-11-24  fiuczy       Possible NullPointerExcection in HttpClient.streamFinished()
- * 1422316    2006-05-15  lupusalex    Disable delayed acknowledgement
- * 1486379    2006-05-29  lupusalex    CIM client retries twice when HTTP/1.1 401 is returned
- * 1498130    2006-05-31  lupusalex    Selection of xml parser on a per connection basis
- * 1516244    2006-07-10  ebak         GCJ support
- * 1536711    2006-08-15  lupusalex    NullPointerException causes client call to never return
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565091    2006-10-17  ebak         ssl handshake exception
- * 1516242    2006-11-27  lupusalex    Support of OpenPegasus local authentication
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 1604329    2006-12-18  lupusalex    Fix OpenPegasus auth module
- * 1620526    2007-01-08  lupusalex    Socket Leak in HTTPClient.getResponseCode()
- * 1627832    2007-01-08  lupuslaex    Incorrect retry behaviour on HTTP 401
- * 1637546    2007-01-27  lupusalex    CIMEnumerationImpl has faulty close function
- * 1647148    2007-01-29  lupusalex    HttpClient.resetSocket() doesn't set socket timeout
- * 1647159    2007-01-29  lupusalex    HttpClientPool runs out of HttpClients
- * 1649595    2007-02-01  lupusalex    No chunkig requested
- * 1660743    2007-02-15  lupusalex    SSLContext is static
- * 1702832    2007-04-18  lupusalex    WBEMClientCIMXL.setCustomSocketFactory() not implemented
- * 1715511    2007-05-09  lupusalex    FVT: Wrong HTTP header values 
- * 1892046    2008-02-13  blaschke-oss Basic/digest authentication problem for Japanese users
- * 1931216    2008-04-01  blaschke-oss In HTTPClient need to get status before closing connection
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2204488 	  2008-10-28  raman_arora  Fix code to remove compiler warnings
- * 2372030    2008-12-01  blaschke-oss Add property to control synchronized SSL handshaking
- * 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)
- * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
- * 2750520    2009-04-10  blaschke-oss Code cleanup from empty statement et al
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 2817962    2009-08-05  blaschke-oss socket creation connects w/o a timeout
- * 2994776    2010-05-05  blaschke-oss http 401 gives CIM_ERR_FAILED instead of CIM_ERR_ACCESS_DENIED
- * 2997865    2010-05-07  blaschke-oss Infinite loop in HttpClient
- * 3004762    2010-06-16  blaschke-oss HTTPClient infinite loop for HTTP 407
- * 3022554    2010-06-30  blaschke-oss Flushing socket ignores skip() return code
- * 3046073    2010-09-07  blaschke-oss Performance hit due to socket conn. creation with timeout
- * 3195069    2011-02-28  blaschke-oss Need support to disable SSL Handshake
- * 3235440    2011-03-22  blaschke-oss NullPointerException when socket factory returns null
- * 3323310    2011-06-20  blaschke-oss Need the ability to override certain Global Properties
- * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
- * 3444912    2011-11-29  blaschke-oss Client delay during SSL handshake
- * 3492224    2012-02-23  blaschke-oss Need two different timeouts for Socket connections
- * 3504304    2012-03-14  blaschke-oss Rename socket timeout variables
- * 3523918    2012-05-06  blaschke-oss "java.io.IOException: Unexpected EOF" returned as HTTP 401
- * 3524050    2012-06-06  blaschke-oss Improve WWW-Authenticate in HTTPClient.java
- * 3557283    2012-11-05  blaschke-oss Print full response when get EOF from CIMOM
- * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
- *    2619    2013-02-22  blaschke-oss Host should contain port when not 5988/5989
- *    2621    2013-02-23  blaschke-oss Not all chunked input has trailers
- *    2618    2013-02-27  blaschke-oss Need to add property to disable weak cipher suites for the secure indication
- *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
- *    2654    2013-07-29  blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF
- *    2655    2013-08-14  blaschke-oss Content-length must be ignored when Transfer-encoding present
- *    2151    2013-08-20  blaschke-oss gzip compression not supported
- *    2709    2013-11-13  blaschke-oss Lower the level of the EOF message to FINE
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.net.URI;
-import java.security.AccessController;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivilegedAction;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.zip.GZIPInputStream;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.HandshakeCompletedEvent;
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-import org.sentrysoftware.wbem.sblim.cimclient.WBEMConfigurationProperties;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpHeader.HeaderEntry;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.BoundedInputStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.ChunkedInputStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.KeepAliveInputStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.PersistentInputStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.Messages;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConstants;
-
-/**
- * Class HttpClient implements a HTTP client
- * 
- */
-public class HttpClient implements HandshakeCompletedListener {
-
-	private static class HostPortPair {
-
-		String iHost;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param url
-		 *            The url
-		 */
-		public HostPortPair(URI url) {
-			this.iHost = url.getScheme().toLowerCase() + ':' + url.getHost().toLowerCase() + ':'
-					+ url.getPort();
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if (!(o instanceof HostPortPair)) return false;
-
-			return this.iHost.equals(((HostPortPair) o).iHost);
-		}
-
-		@Override
-		public int hashCode() {
-			return this.iHost.hashCode();
-		}
-
-		@Override
-		public String toString() {
-			return "HostPortPair=[+" + this.iHost + "]";
-		}
-	}
-
-	private static class GetProperty implements PrivilegedAction {
-
-		String iPropertyName;
-
-		GetProperty(String propertyName) {
-			this.iPropertyName = propertyName;
-		}
-
-		public Object run() {
-			return System.getProperty(this.iPropertyName);
-		}
-	}
-
-	private static String iEncoding;
-
-	static {
-		try {
-			iEncoding = (String) AccessController.doPrivileged(new PrivilegedAction() {
-
-				public Object run() {
-					return System.getProperty("file.encoding", "ISO8859_1");
-				}
-			});
-			if (!isASCIISuperset(iEncoding)) iEncoding = "ISO8859_1";
-		} catch (Exception exception) {
-			iEncoding = "ISO8859_1";
-		}
-	}
-
-	/**
-	 * Converts a byte array to a String of hex digits
-	 * 
-	 * @param digest
-	 *            The byte array
-	 * @return The hex string
-	 */
-	public static String convertToHexString(byte[] digest) {
-		char hexDigit[] = "0123456789abcdef".toCharArray();
-
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < digest.length; i++) {
-			int b = digest[i];
-			buf.append(hexDigit[(b >> 4) & 0xF]);
-			buf.append(hexDigit[(b) & 0xF]);
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * Returns a client from a http client pool
-	 * 
-	 * @param url
-	 *            The url to connect to
-	 * @param clientPool
-	 *            The client pool
-	 * @param auth_handler
-	 *            The authentication handler to use
-	 * @return A http client from the pool
-	 */
-	public static HttpClient getClient(URI url, HttpClientPool clientPool,
-			AuthorizationHandler auth_handler) {
-
-		return clientPool.retrieveAvailableConnectionFromPool(url, auth_handler);
-	}
-
-	protected static String dequote(String str) {
-		int len = str.length();
-		if (len > 1 && str.charAt(0) == '\"' && str.charAt(len - 1) == '\"') return str.substring(
-				1, len - 1);
-		return str;
-	}
-
-	protected static void handleRsp(String authInfo, AuthorizationInfo prevAuthInfo)
-			throws IOException {
-		if (authInfo != null) {
-			HttpHeader params = HttpHeader.parse(authInfo);
-
-			String nonce = params.getField("nextnonce");
-			if (nonce != null) {
-				prevAuthInfo.setNonce(nonce);
-				prevAuthInfo.setNc(0);
-			} else {
-				nonce = prevAuthInfo.getNonce();
-			}
-			String qop = params.getField("qop");
-			if (qop != null) {
-				if (!"auth".equalsIgnoreCase(qop) && !"auth-int".equalsIgnoreCase(qop)) {
-					// TODO
-					throw new IOException(
-							"Authentication Digest with integrity check not supported");
-				}
-				byte[] rspauth;
-				String rspauthStr = dequote(params.getField("rspauth"));
-				if (rspauthStr != null) {
-					rspauth = parseHex(rspauthStr);
-
-					String cnonce = dequote(params.getField("cnonce"));
-					if (cnonce != null && !cnonce.equals(prevAuthInfo.getCnonce())) { throw new IOException(
-							"Digest authentication: Invalid nonce counter"); }
-					String ncStr = params.getField("nc");
-					if (ncStr != null) {
-						try {
-							long nc = Long.parseLong(ncStr, 16);
-							if (nc != prevAuthInfo.getNc()) { throw new IOException(); }
-						} catch (Exception e) {
-							throw new IOException("Digest authentication: Invalid nonce counter");
-						}
-					}
-
-					String HA1, HA2;
-					MessageDigest md5;
-					try {
-						md5 = MessageDigest.getInstance("MD5");
-						md5.reset();
-						byte[] bytes = prevAuthInfo.getA1().getBytes("UTF-8");
-						md5.update(bytes);
-						HA1 = convertToHexString(md5.digest());
-						if ("MD5-sess".equalsIgnoreCase(params.getField("algorithm"))) {
-							md5.reset();
-							md5.update((HA1 + ":" + nonce + ":" + cnonce).getBytes("UTF-8"));
-							HA1 = convertToHexString(md5.digest());
-						}
-
-						HA2 = ":" + prevAuthInfo.getURI();
-						if ("auth-int".equalsIgnoreCase(qop)) {
-							md5.reset();
-							md5.update(new byte[] {});
-							HA2 += ":" + convertToHexString(md5.digest());
-						}
-						md5.reset();
-						md5.update(HA2.getBytes("UTF-8"));
-						HA2 = convertToHexString(md5.digest());
-
-						md5.reset();
-						md5.update((HA1 + ":" + nonce + ":" + ncStr + ":" + cnonce + ":" + qop
-								+ ":" + HA2).getBytes("UTF-8"));
-						String hsh = convertToHexString(md5.digest());
-						byte[] hash = parseHex(hsh);
-
-						if (!Arrays.equals(hash, rspauth)) throw new IOException(
-								"Digest Authentication failed!");
-
-					} catch (NoSuchAlgorithmException e1) {
-						throw new IOException(
-								"Unable to validate Authentication response: NoSuchAlgorithmException");
-					}
-				}
-			} else {
-				// TODO compute md5 of the entity-body
-			}
-		}
-	}
-
-	protected static byte[] parseHex(String hex) {
-		byte[] value = new byte[hex.length() >> 1];
-		int n = 0;
-		for (int i = 0; i < value.length; i++) {
-			value[i] = (byte) (0xff & Integer.parseInt(hex.substring(n, n + 1), 16));
-			n += 2;
-		}
-		return value;
-	}
-
-	private static boolean isASCIISuperset(String charset) throws Exception {
-		String asciiSuperSet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_.!~*'();/?:@&=+$,";
-		byte abyte0[] = { 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 71, 72,
-				73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99,
-				100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
-				116, 117, 118, 119, 120, 121, 122, 45, 95, 46, 33, 126, 42, 39, 40, 41, 59, 47, 63,
-				58, 64, 38, 61, 43, 36, 44 };
-		byte convertedArray[] = asciiSuperSet.getBytes(charset);
-		return Arrays.equals(convertedArray, abyte0);
-	}
-
-	private boolean iConnected = false;
-
-	private HttpClientPool iHttpClientPool;
-
-	private AuthorizationHandler iAuth_handler;
-
-	private SSLSession iSession;
-
-	private InputStream iIStream;
-
-	private boolean iUseHttp11 = true;
-
-	private boolean iKeepAlive = true;
-
-	private HttpClientMethod iMethod;
-
-	private OutputStream iOStream;
-
-	private AuthorizationInfo iPrevAuthInfo;
-
-	private AuthorizationInfo iPrevProxy;
-
-	private HttpHeader iRequestHeaders = new HttpHeader();
-
-	private String iRequestMethod = "POST";
-
-	private boolean iReset = true;
-
-	private HttpClientMethod iResponse;
-
-	private HttpHeader iResponseHeaders = new HttpHeader();
-
-	private InputStream iServerInput;
-
-	private ByteArrayOutputStream iServerOutput;
-
-	private Socket iSocket;
-
-	private URI iUrl;
-
-	private long iPreviousResponseTime = -1;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param url
-	 *            The url to connect to
-	 * @param clientPool
-	 *            The associated client pool
-	 * @param auth_handler
-	 *            The authentication handler
-	 */
-	public HttpClient(URI url, HttpClientPool clientPool, AuthorizationHandler auth_handler) {
-		this.iUrl = url;
-		this.iAuth_handler = auth_handler;
-		this.iHttpClientPool = clientPool;
-	}
-
-	/**
-	 * Connects to the http server
-	 * 
-	 * @throws IOException
-	 */
-	public void connect() throws IOException {
-		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-		try {
-			this.iReset = true;
-			this.iResponse = null;
-			this.iConnected = true;
-			this.iServerOutput = null;
-			resetSocket();
-		} finally {
-			logger.exit();
-		}
-	}
-
-	/**
-	 * Disconnects the session
-	 */
-	public synchronized void disconnect() {
-		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-		this.iConnected = false;
-		if (this.iSocket != null) {
-			try {
-				this.iSocket.close();
-			} catch (IOException e) {
-				logger.trace(Level.FINE, "Unexpected problem closing http socket", e);
-			}
-			this.iSocket = null;
-			this.iServerInput = null;
-			this.iReset = true;
-			this.iResponse = null;
-		}
-		logger.exit();
-	}
-
-	@Override
-	protected void finalize() throws Throwable {
-		try {
-			this.iSocket.close();
-		} catch (IOException e) {
-			// bad luck
-		} finally {
-			super.finalize();
-		}
-	}
-
-	/**
-	 * Returns the http header field value for a given index
-	 * 
-	 * @param index
-	 *            The index
-	 * @return The header field value
-	 */
-	public synchronized String getHeaderFieldValue(int index) {
-
-		if (index < 0) throw new IllegalArgumentException();
-		if (index == 0) return this.iResponse.toString();
-
-		Iterator> iterator = this.iResponseHeaders.iterator();
-		while (iterator.hasNext() && --index >= 0) {
-			Entry entry = iterator.next();
-			if (index == 0) return entry.getValue().toString();
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the http header field for a given name
-	 * 
-	 * @param name
-	 *            The name
-	 * @return The header field
-	 */
-	public synchronized String getHeaderField(String name) {
-		return this.iResponseHeaders.getField(name);
-	}
-
-	/**
-	 * Return the http header field name for a given index
-	 * 
-	 * @param index
-	 *            The index
-	 * @return The name
-	 */
-	public synchronized String getHeaderFieldName(int index) {
-		if (index < 0) throw new IllegalArgumentException();
-		if (index == 0) return null;
-
-		Iterator> iterator = this.iResponseHeaders.iterator();
-		while (iterator.hasNext() && --index >= 0) {
-			Entry entry = iterator.next();
-			if (index == 0) return entry.getKey().toString();
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the input stream of this http connection
-	 * 
-	 * @return The input stream
-	 * @throws IOException
-	 */
-	public synchronized InputStream getInputStream() throws IOException {
-		if (getResponseCode() < 500 && this.iResponse != null && this.iServerInput != null) return this.iServerInput;
-
-		throw new IOException("Failed to open an input stream from server: HTTPResponse "
-				+ getResponseCode());
-	}
-
-	/**
-	 * Returns the output stream of this http connection
-	 * 
-	 * @return The output stream
-	 */
-	public synchronized OutputStream getOutputStream() {
-		if (this.iServerOutput == null) {
-			this.iServerOutput = new ByteArrayOutputStream();
-		}
-		return this.iServerOutput;
-	}
-
-	/**
-	 * Returns the request method
-	 * 
-	 * @return The request method
-	 */
-	public String getRequestMethod() {
-		return this.iRequestMethod;
-	}
-
-	/**
-	 * Returns the request property for a given key
-	 * 
-	 * @param key
-	 *            The key
-	 * @return The property
-	 */
-	public String getRequestProperty(String key) {
-		return this.iRequestHeaders.getField(key);
-	}
-
-	/**
-	 * Returns the response code
-	 * 
-	 * @return The response code
-	 * @throws IOException
-	 */
-	public synchronized int getResponseCode() throws IOException {
-		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-		try {
-			long ResponseTime = -1;
-			Exception delayedException = null;
-			if (this.iReset && this.iResponse == null) {
-				boolean authFailed = false;
-				int IoRetry = 1;
-				int AuthentificationRetry = 1;
-				do {
-					logger.trace(Level.FINER, "Attempting http request (retry counters:" + IoRetry
-							+ "/" + AuthentificationRetry + ")");
-					long RequestTime = System.currentTimeMillis();
-
-					if (this.iPreviousResponseTime != -1) {
-						long time = RequestTime - this.iPreviousResponseTime;
-						long maxTime = this.iHttpClientPool.getConfigurationContext()
-								.getSocketIdleTimeout();
-						if (maxTime > 0 && time > maxTime) {
-							logger.trace(Level.FINER, "Closing socket after " + time
-									+ "ms of idle time");
-
-							if (this.iSocket != null && !this.iSocket.isClosed()) {
-								try {
-									this.iSocket.close();
-								} catch (IOException e) {
-									logger.trace(Level.FINER,
-											"Exception caught while closing socket", e);
-								}
-							}
-							this.iSocket = null;
-							this.iReset = true;
-							this.iResponse = null;
-						}
-					}
-
-					ResponseTime = -1;
-					resetSocket();
-					this.iReset = false;
-					try {
-						ASCIIPrintStream out = (ASCIIPrintStream) this.iOStream;
-						if (out == null) throw new IOException("could not open output stream");
-
-						String file = this.iUrl.getPath();
-						if (file == null || file.length() == 0) file = "/";
-						String query = this.iUrl.getQuery();
-						if (query != null) file = file + '?' + query;
-
-						this.iMethod = new HttpClientMethod(this.iRequestMethod, this.iUrl
-								.getPath(), 1, this.iUseHttp11 ? 1 : 0);
-						logger.trace(Level.FINER, "HTTP Operation= " + this.iMethod);
-
-						this.iMethod.write(out);
-
-						StringBuilder hostField = new StringBuilder(this.iUrl.getHost());
-						if (this.iUrl.getPort() > 0
-								&& ((WBEMConstants.HTTPS.equalsIgnoreCase(this.iUrl.getScheme()) && this.iUrl
-										.getPort() != WBEMConstants.DEFAULT_WBEM_SECURE_PORT) || (WBEMConstants.HTTP
-										.equalsIgnoreCase(this.iUrl.getScheme()) && this.iUrl
-										.getPort() != WBEMConstants.DEFAULT_WBEM_PORT))) {
-							hostField.append(':');
-							hostField.append(this.iUrl.getPort());
-						}
-						this.iRequestHeaders.addField("Host", hostField.toString());
-
-						if (this.iServerOutput != null) this.iRequestHeaders.addField(
-								"Content-length", "" + this.iServerOutput.size());
-						else this.iRequestHeaders.addField("Content-length", "0");
-						if (this.iHttpClientPool.getConfigurationContext().isHttpChunked()) {
-							this.iRequestHeaders.addField("TE", "trailers");
-						}
-
-						if (iUseHttp11 && !iHttpClientPool.getConfigurationContext().useKeepAliveStrictMode()) {
-							// AMMO-863 Systematic use of the Keep-alive
-							// header is not recommended with HTTP/1.1
-							// And may cause issues with EMC's VAPP appliances
-							// so we made the header available only when
-							// new strict mode is disabled
-							logger.trace(Level.INFO,
-							             "HTTP 1.1 protocol and 'Connection=Keep-alive' strict mode disabled, we add the header");
-							iRequestHeaders.addField("Connection", "Keep-alive");
-						}
-
-						if (this.iPrevAuthInfo == null) {
-							AuthorizationInfo authInfo = this.iAuth_handler.getAuthorizationInfo(0);
-							String authenticate = this.iHttpClientPool.getConfigurationContext()
-									.getHttpWwwAuthenticateInfo();
-
-							if (authInfo.isSentOnFirstRequest()) {
-								this.iRequestHeaders.addField(authInfo.getHeaderFieldName(),
-										authInfo.toString());
-							} else if (authenticate != null) {
-								try {
-									this.iPrevAuthInfo = getAuthentication(false,
-											this.iPrevAuthInfo, authenticate);
-									if (this.iPrevAuthInfo != null) {
-										this.iRequestHeaders.addField(this.iPrevAuthInfo
-												.getHeaderFieldName(), this.iPrevAuthInfo
-												.toString());
-									}
-								} catch (NoSuchAlgorithmException e) {
-									logger.trace(Level.FINER, "Unable to find digest algorithm", e);
-								} catch (IllegalArgumentException e) {
-									logger
-											.trace(
-													Level.FINER,
-													WBEMConfigurationProperties.HTTP_WWW_AUTHENTICATE_INFO
-															+ " did not contain WWW-Authenticate information",
-													e);
-								} catch (HttpParseException e) {
-									logger
-											.trace(
-													Level.FINER,
-													WBEMConfigurationProperties.HTTP_WWW_AUTHENTICATE_INFO
-															+ " did not contain valid WWW-Authenticate information",
-													e);
-								}
-							}
-						} else {
-							this.iRequestHeaders.addField(this.iPrevAuthInfo.getHeaderFieldName(),
-									this.iPrevAuthInfo.toString());
-						}
-
-						if (this.iPrevProxy != null) this.iRequestHeaders.addField(
-								"Proxy-authorization", this.iPrevProxy.toString());
-
-						boolean isGzipped = false;
-						if (this.iHttpClientPool.getConfigurationContext().isGzipEncodingEnabled()) {
-							isGzipped = true;
-							this.iRequestHeaders.addField("Accept-Encoding", "gzip,identity;q=0.5");
-						}
-
-						this.iRequestHeaders.write(out);
-
-						logger.trace(Level.FINER, "Request HTTP Headers= " + this.iRequestHeaders);
-
-						if (out.checkError() != null) {
-							delayedException = out.checkError();
-							logger.trace(Level.FINER,
-									"Exception caught while writing to the http output stream.",
-									delayedException);
-							if (this.iSocket != null && !this.iSocket.isClosed()) {
-								try {
-									this.iSocket.close();
-								} catch (IOException e) {
-									logger.trace(Level.FINER,
-											"Exception caught while closing socket", e);
-								}
-							}
-							this.iSocket = null;
-							this.iReset = true;
-							this.iResponse = null;
-							--IoRetry;
-							continue;
-						}
-						if (this.iServerOutput != null) {
-							this.iServerOutput.writeTo(out);
-						}
-						out.flush();
-
-						// byte[] header = new byte[8];
-						// istream.mark(8);
-						// int totalRead;
-						// int k;
-						// for (totalRead = 0; totalRead < 8; totalRead += k) {
-						// k = istream.read(header, totalRead, 8 - totalRead);
-						// if (k < 0)
-						// break;
-						// }
-						//				
-						// if (header[0] != 72 // HTTP1.
-						// || header[1] != 84
-						// || header[2] != 84
-						// || header[3] != 80
-						// || header[4] != 47
-						// || header[5] != 49
-						// || header[6] != 46
-						// || totalRead != 8) {
-						// retry = 0;
-						// throw new IOException("Unexpected end of file from
-						// server. Header does not match HTTP header: "+new
-						// String(header));
-						// }
-						//						
-						// istream.reset();
-
-						this.iResponse = new HttpClientMethod(this.iIStream);
-						logger.trace(Level.FINER, "HTTP Response= " + this.iResponse);
-						ResponseTime = System.currentTimeMillis();
-
-						this.iResponseHeaders = new HttpHeader(this.iIStream);
-						logger.trace(Level.FINER, "Response HTTP Headers= "
-								+ this.iResponseHeaders.toString());
-						this.iKeepAlive = false;
-						if ("Keep-alive".equalsIgnoreCase(this.iResponseHeaders
-								.getField("Connection"))
-								|| (this.iResponse.getMajorVersion() == 1 && this.iResponse
-										.getMinorVersion() == 1)
-								|| this.iResponseHeaders.getField("Keep-alive") != null) {
-							this.iKeepAlive = true;
-						}
-
-						this.iServerInput = new PersistentInputStream(this.iIStream);
-						// String keepAliveHdr =
-						// iResponseHeaders.getField("Keep-Alive");
-
-						String contentLength = this.iResponseHeaders.getField("Content-length");
-						long length = -1;
-						try {
-							if (contentLength != null && contentLength.length() > 0) length = Long
-									.parseLong(contentLength);
-						} catch (Exception e) {
-							logger.trace(Level.FINER,
-									"Exception while parsing the content length of http response",
-									e);
-						}
-						this.iKeepAlive = (length >= 0 || this.iResponse.getStatus() == 304 || this.iResponse
-								.getStatus() == 204);
-
-						if (isGzipped) {
-							String contentEncoding = this.iResponseHeaders
-									.getField("Content-Encoding");
-							if (contentEncoding != null
-									&& contentEncoding.toLowerCase().contains("gzip")) {
-								length = -1; // ignore Content-length
-								this.iServerInput = new GZIPInputStream(this.iServerInput);
-							}
-						}
-
-						String transferEncoding = this.iResponseHeaders
-								.getField("Transfer-encoding");
-						if (transferEncoding != null) {
-							length = -1; // ignore Content-length
-							if (transferEncoding.toLowerCase().endsWith("chunked")) {
-								this.iServerInput = new ChunkedInputStream(this.iServerInput,
-										this.iResponseHeaders.getField("Trailer"), "Response");
-								this.iKeepAlive = true;
-							}
-						}
-
-						if (length >= 0) this.iServerInput = new BoundedInputStream(
-								this.iServerInput, length);
-
-						logger.trace(Level.FINER, "KeepAlive="
-								+ (this.iKeepAlive ? "true" : "false"));
-
-						if (this.iKeepAlive) {
-							this.iServerInput = new KeepAliveInputStream(this.iServerInput, this);
-						}
-
-						switch (this.iResponse.getStatus()) {
-							case 100: {
-								continue;
-							}
-							case HttpURLConnection.HTTP_OK:
-								String authInfo = this.iResponseHeaders
-										.getField("Authentication-Info");
-								handleRsp(authInfo, this.iPrevAuthInfo);
-
-								authInfo = this.iResponseHeaders.getField("Authentication-Proxy");
-								handleRsp(authInfo, this.iPrevProxy);
-
-								if (this.iServerOutput != null) this.iServerOutput = null;
-
-								this.iPreviousResponseTime = ResponseTime;
-								return HttpURLConnection.HTTP_OK;
-
-							case HttpURLConnection.HTTP_UNAUTHORIZED:
-								--AuthentificationRetry;
-								String authenticate = this.iResponseHeaders
-										.getField("WWW-Authenticate");
-								try {
-									this.iPrevAuthInfo = getAuthentication(false,
-											this.iPrevAuthInfo, authenticate);
-									if (this.iPrevAuthInfo != null) {
-										this.iRequestHeaders.addField(this.iPrevAuthInfo
-												.getHeaderFieldName(), this.iPrevAuthInfo
-												.toString());
-									}
-								} catch (NoSuchAlgorithmException e) {
-									logger.trace(Level.FINER, "Unable to find digest algorithm", e);
-								} catch (IllegalArgumentException e) {
-									logger
-											.trace(
-													Level.FINER,
-													"HTTP 401 response did not contain WWW-Authenticate information",
-													e);
-								} catch (HttpParseException e) {
-									logger
-											.trace(
-													Level.FINER,
-													"HTTP 401 response did not contain valid WWW-Authenticate information",
-													e);
-								}
-
-								if (!authFailed) {
-									authFailed = true;
-									logger
-											.trace(Level.FINER,
-													"Authorization failed, retrying with authorization info.");
-								}
-								if (this.iPrevAuthInfo != null && this.iPrevAuthInfo.isKeptAlive()) {
-									this.iKeepAlive = true;
-								}
-								break;
-							case HttpURLConnection.HTTP_PROXY_AUTH:
-								--AuthentificationRetry;
-								logger.message(Messages.HTTP_PROXY_AUTH_UNSUPPORTED, this.iUrl);
-
-								// TODO implement http proxy authentication
-								/*
-								 * authenticate =
-								 * responseHeaders.getField("Proxy-Authenticate"
-								 * ); prevProxy = getAuthentication(true,
-								 * prevProxy, authenticate, this); if
-								 * (prevAuthInfo != null)
-								 * requestHeaders.addField
-								 * ("Proxy-Authorization",
-								 * prevProxy.toString());
-								 * 
-								 * while ((total = serverInput.available()) > 0)
-								 * { serverInput.skip(total); } break;
-								 */
-								break;
-							default:
-								int status = this.iResponse.getStatus();
-								if (!this.iKeepAlive) closeConnection();
-								else this.iServerInput.close();
-								this.iPreviousResponseTime = ResponseTime;
-								return status;
-						}
-					} catch (SocketTimeoutException e) {
-						throw e;
-					} catch (IOException e) {
-						logger.message(Messages.HTTP_CONNECTION_FAILED, new Object[] { this.iUrl,
-								e.getMessage() });
-						StringBuilder msg = new StringBuilder("Http connection failed ");
-						if (ResponseTime != -1) {
-							msg.append("after");
-							msg.append(ResponseTime - RequestTime);
-							msg.append(" milliseconds");
-						} else {
-							msg.append("before response received");
-						}
-						if (this.iPreviousResponseTime != -1) {
-							msg.append(", ");
-							msg.append(System.currentTimeMillis() - this.iPreviousResponseTime);
-							msg.append(" milliseconds after previous response on same socket");
-						}
-						logger.trace(Level.FINE, msg.toString(), e);
-						delayedException = e;
-						if (this.iSocket != null && !this.iSocket.isClosed()) {
-							try {
-								this.iSocket.close();
-							} catch (IOException e2) {
-								logger.trace(Level.FINER, "Exception caught while closing socket",
-										e2);
-							}
-						}
-						this.iSocket = null;
-						this.iReset = true;
-						this.iResponse = null;
-						--IoRetry;
-					}
-
-				} while (AuthentificationRetry >= 0 && IoRetry >= 0);
-			}
-
-			if (this.iResponse != null) {
-				logger.trace(Level.FINER, "http response code=" + this.iResponse.getStatus());
-				if (ResponseTime != -1) this.iPreviousResponseTime = ResponseTime;
-				return this.iResponse.getStatus();
-			}
-			throw (IOException) (delayedException != null ? delayedException : new Exception(
-					"Unable to get response after maximum retries"));
-		} finally {
-			logger.exit();
-		}
-	}
-
-	/**
-	 * Returns the response message
-	 * 
-	 * @return The response message
-	 */
-	public String getResponseMessage() {
-		if (this.iResponse != null) return this.iResponse.getResponseMessage();
-		return null;
-	}
-
-	public void handshakeCompleted(HandshakeCompletedEvent event) {
-		LogAndTraceBroker.getBroker().trace(Level.FINER, "Http handshake completed.");
-		this.iSession = event.getSession();
-	}
-
-	/**
-	 * Resets state
-	 */
-	public void reset() {
-		this.iRequestHeaders.clear();
-		this.iResponseHeaders.clear();
-		this.iResponse = null;
-		this.iReset = true;
-	}
-
-	/**
-	 * Sets the request method
-	 * 
-	 * @param method
-	 *            The request method
-	 */
-	public void setRequestMethod(String method) {
-		this.iRequestMethod = method;
-	}
-
-	/**
-	 * Sets the request property
-	 * 
-	 * @param key
-	 *            The property name
-	 * @param value
-	 *            The value
-	 */
-	public void setRequestProperty(String key, String value) {
-		this.iRequestHeaders.addField(key, value);
-	}
-
-	/**
-	 * Releases the client and returns it to the pool
-	 */
-	public void streamFinished() {
-		streamFinished(true);
-	}
-
-	/**
-	 * Releases the client and returns it to the pool
-	 * 
-	 * @param keep
-	 *            if true return to the pool, if false
-	 *            drop.
-	 */
-	public void streamFinished(boolean keep) {
-
-		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		HostPortPair hpp = new HostPortPair(this.iUrl);
-		if (keep) { // TODO configurable from property file
-			logger.trace(Level.FINER, "Adding http client to pool (" + hpp + ")");
-			this.iHttpClientPool.returnAvailableConnectionToPool(this);
-		} else {
-			logger.trace(Level.FINER, "Disconnectiong http client (" + hpp + ")");
-			this.iHttpClientPool.removeConnectionFromPool(this);
-			disconnect();
-		}
-		logger.exit();
-	}
-
-	/**
-	 * Enables/Disables use of http 1.1
-	 * 
-	 * @param bool
-	 *            if true http 1.1 is enabled.
-	 */
-	public void useHttp11(boolean bool) {
-		this.iUseHttp11 = bool;
-	}
-
-	/**
-	 * Returns if a proxy is used
-	 * 
-	 * @return true if a proxy is used
-	 */
-	public boolean usingProxy() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	protected AuthorizationInfo getAuthentication(boolean proxy, AuthorizationInfo prevAuthInfo,
-			String authenticate) throws HttpParseException, NoSuchAlgorithmException {
-		Challenge[] challenges = Challenge.parseChallenge(authenticate);
-
-		// AuthorizationHandler auth_handler =
-		// AuthorizationHandler.getInstance();
-		int cntr = 0;
-		prevAuthInfo = null;
-		while (cntr < challenges.length) {
-			Challenge challenge = challenges[cntr];
-			cntr++;
-			// if (challenge.getScheme().equalsIgnoreCase("Digest")) {
-			// HttpHeader headers = challenge.getParams();
-			// String stale = headers.getField("stale");
-			// }
-			prevAuthInfo = this.iAuth_handler.getAuthorizationInfo(this.iHttpClientPool
-					.getConfigurationContext().getHttpAuthenticationModule(), proxy ? Boolean.TRUE
-					: Boolean.FALSE, this.iUrl.getHost(), this.iUrl.getPort(), this.iUrl
-					.getScheme(), challenge.getRealm(), challenge.getScheme());
-
-			if (prevAuthInfo != null) {
-				prevAuthInfo.updateAuthenticationInfo(challenge, authenticate, this.iUrl,
-						this.iRequestMethod);
-				return prevAuthInfo;
-			}
-		}
-		return null;
-	}
-
-	private void closeConnection() {
-		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-		if (this.iSocket != null) {
-			try {
-				this.iSocket.close();
-			} catch (IOException e) {
-				logger.trace(Level.FINER, "Exception while closing the socket", e);
-			}
-			this.iSocket = null;
-			this.iServerInput = null;
-			// response = null;
-		}
-		logger.exit();
-	}
-
-	private String[] parseProperty(String propertyName) {
-		String s = (String) AccessController.doPrivileged(new GetProperty(propertyName));
-		String as[];
-		if (s == null || s.length() == 0) {
-			as = null;
-		} else {
-			Vector vector = new Vector();
-			for (StringTokenizer stringtokenizer = new StringTokenizer(s, ","); stringtokenizer
-					.hasMoreElements(); vector.addElement(stringtokenizer.nextElement())) {
-				// add each token to vector
-			}
-			as = new String[vector.size()];
-			for (int i1 = 0; i1 < as.length; i1++)
-				as[i1] = (String) vector.elementAt(i1);
-		}
-		return as;
-	}
-
-	private void resetSocket() throws IOException {
-		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-		if (!this.iKeepAlive) {
-			logger.trace(Level.FINER, "KeepAlive=false, closing http connection...");
-			closeConnection();
-		}
-
-		int httpTimeout = this.iHttpClientPool.getConfigurationContext().getHttpTimeout();
-		logger.trace(Level.FINER, "Setting http timeout=" + httpTimeout);
-
-		if (this.iSocket == null) {
-			// Determine whether we need to connect with a timeout or not
-			boolean socketConnectWithTimeout = this.iHttpClientPool.getConfigurationContext()
-					.socketConnectWithTimeout();
-			logger.trace(Level.FINER, "Socket=null, creating http socket "
-					+ (socketConnectWithTimeout ? "with" : "without") + " timeout.");
-
-			// On Java 5+ InetSocketAddress(String,int) constructor will call
-			// any security manager's checkConnect method
-			if (!socketConnectWithTimeout) {
-				SecurityManager sm = System.getSecurityManager();
-				if (sm != null) {
-					sm.checkConnect(this.iUrl.getHost(), this.iUrl.getPort());
-				}
-			}
-
-			SocketFactory factory = this.iHttpClientPool.getConfigurationContext()
-					.getCustomSocketFactory();
-			if (factory == null) {
-				factory = HttpSocketFactory
-						.getInstance()
-						.getClientSocketFactory(
-								WBEMConstants.HTTPS.equalsIgnoreCase(this.iUrl.getScheme()) ? this.iHttpClientPool
-										.getSslContext()
-										: null);
-				if (factory == null) {
-					logger.message(Messages.HTTP_NO_SOCKET_FACTORY, this.iUrl.getScheme());
-					throw new IllegalStateException("Unable to load socket factory:"
-							+ this.iUrl.getScheme());
-				}
-			}
-			logger.trace(Level.FINER, "Creating new http for url " + this.iUrl.toString());
-			if (socketConnectWithTimeout) {
-				int connectTimeout = this.iHttpClientPool.getConfigurationContext()
-						.getSocketConnectTimeout();
-				logger.trace(Level.FINER, "Setting socket connect timeout=" + connectTimeout);
-
-				if (factory instanceof SSLSocketFactory) {
-					Socket sock = new Socket();
-					sock.connect(new InetSocketAddress(this.iUrl.getHost(), this.iUrl.getPort()),
-							connectTimeout);
-					this.iSocket = ((SSLSocketFactory) factory).createSocket(sock, this.iUrl
-							.getHost(), this.iUrl.getPort(), true);
-
-				} else {
-					this.iSocket = factory.createSocket();
-					if (this.iSocket != null) this.iSocket.connect(new InetSocketAddress(this.iUrl
-							.getHost(), this.iUrl.getPort()), connectTimeout);
-				}
-			} else {
-				this.iSocket = factory.createSocket(this.iUrl.getHost(), this.iUrl.getPort());
-			}
-			if (this.iSocket == null) {
-				logger.trace(Level.WARNING, "Socket factory " + factory.getClass().getName()
-						+ " returned null socket");
-				throw new IOException("Socket factory did not create socket");
-			}
-
-			this.iPreviousResponseTime = -1;
-			this.iSocket.setTcpNoDelay(true);
-			this.iSocket.setKeepAlive(true);
-			this.iSocket.setSoTimeout(httpTimeout);
-
-			if (this.iSocket instanceof SSLSocket) {
-				// Determine whether we need to perform SSL handshake or not
-				boolean performHandshake = this.iHttpClientPool.getConfigurationContext()
-						.performSslHandshake();
-				logger.trace(Level.FINER, "SSL socket created, handshake "
-						+ (performHandshake ? "will" : "will not") + " be performed.");
-
-				if (performHandshake) {
-					SSLSocket sk = (SSLSocket) this.iSocket;
-
-					String protocols[] = parseProperty("https.protocols");
-					if (protocols != null) {
-						logger.trace(Level.FINER,
-								"Setting SSLSocket.setEnabledProtocols() from \"https.protocols\"="
-										+ String.valueOf(Arrays.asList(protocols)));
-						sk.setEnabledProtocols(protocols);
-					}
-
-					String ciphersuites[] = parseProperty("https.cipherSuites");
-					if (ciphersuites != null) {
-						logger.trace(Level.FINER,
-								"Setting SSLSocket.setEnableCipheSuites() from \"https.cipherSuites\"="
-										+ String.valueOf(Arrays.asList(ciphersuites)));
-						sk.setEnabledCipherSuites(ciphersuites);
-					}
-
-					String disableCipherSuites = this.iHttpClientPool.getConfigurationContext()
-							.getSslClientCipherSuitesToDisable();
-					if (disableCipherSuites != null) {
-						sk.setEnabledCipherSuites(this.iHttpClientPool.getUpdatedCipherSuites(sk
-								.getEnabledCipherSuites(), disableCipherSuites));
-					}
-
-					// Determine whether we need to perform synchronized SSL
-					// handshake or not
-					boolean synchronizedHandshake = this.iHttpClientPool.getConfigurationContext()
-							.synchronizedSslHandshake();
-					logger.trace(Level.FINER, "Starting "
-							+ (synchronizedHandshake ? "synchronized" : "unsynchronized")
-							+ " http handshake.");
-
-					sk.addHandshakeCompletedListener(this);
-					if (synchronizedHandshake) {
-						synchronized (SSLSocket.class) {
-							sk.startHandshake();
-						}
-					} else {
-						sk.startHandshake();
-					}
-				}
-			}
-
-			this.iIStream = new BufferedInputStream(this.iSocket.getInputStream());
-			this.iOStream = new ASCIIPrintStream(new BufferedOutputStream(this.iSocket
-					.getOutputStream(), 1024), false, iEncoding);
-			this.iServerInput = null;
-		} else {
-			if (this.iServerInput != null && !(this.iServerInput instanceof KeepAliveInputStream)) {
-				logger.trace(Level.FINER, "Socket!=null, flushing the stream...");
-				long totalBytes = 0;
-				long total;
-				while ((total = this.iServerInput.available()) > 0) {
-					total = this.iServerInput.skip(total);
-					if (total >= 0) totalBytes += total;
-				}
-				logger.trace(Level.FINER, "total bytes on the stream=" + totalBytes);
-			}
-			this.iSocket.setSoTimeout(httpTimeout);
-		}
-	}
-
-	/**
-	 * Returns connected
-	 * 
-	 * @return The value of connected.
-	 */
-	public boolean isConnected() {
-		return this.iConnected;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer result = new StringBuffer();
-		result.append('[');
-		result.append("URI=");
-		result.append(this.iUrl);
-		result.append(", ");
-		result.append(this.iConnected ? "connected" : "not connected");
-		result.append(", ");
-		result.append(this.iKeepAlive ? "kept alive" : "not kept alive");
-		result.append(", ");
-		result.append(this.iUseHttp11 ? "HTTP 1.1" : "HTTP 1.0");
-		result.append(", ");
-		result.append("Method=");
-		result.append(this.iMethod);
-		result.append(", ");
-		result.append("Request Method=");
-		result.append(this.iRequestMethod);
-		result.append(", ");
-		result.append("Protocol=");
-		result.append(this.iSession != null ? this.iSession.getProtocol() : "http");
-		result.append(", ");
-		result.append("CipherSuite=");
-		result.append(this.iSession != null ? this.iSession.getCipherSuite() : "n/a");
-		result.append(']');
-		return result.toString();
-	}
-}
+/*
+  HttpClient.java
+
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 13799      2004-12-07  thschaef     Fix chunking support 
+ * 17620      2005-06-29  thschaef     eliminate ASCIIPrintStream1 in import statement
+ * 17970      2005-08-11  pineiro5     Logon from z/OS not possible
+ * 1353168    2005-11-24  fiuczy       Possible NullPointerExcection in HttpClient.streamFinished()
+ * 1422316    2006-05-15  lupusalex    Disable delayed acknowledgement
+ * 1486379    2006-05-29  lupusalex    CIM client retries twice when HTTP/1.1 401 is returned
+ * 1498130    2006-05-31  lupusalex    Selection of xml parser on a per connection basis
+ * 1516244    2006-07-10  ebak         GCJ support
+ * 1536711    2006-08-15  lupusalex    NullPointerException causes client call to never return
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565091    2006-10-17  ebak         ssl handshake exception
+ * 1516242    2006-11-27  lupusalex    Support of OpenPegasus local authentication
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 1604329    2006-12-18  lupusalex    Fix OpenPegasus auth module
+ * 1620526    2007-01-08  lupusalex    Socket Leak in HTTPClient.getResponseCode()
+ * 1627832    2007-01-08  lupuslaex    Incorrect retry behaviour on HTTP 401
+ * 1637546    2007-01-27  lupusalex    CIMEnumerationImpl has faulty close function
+ * 1647148    2007-01-29  lupusalex    HttpClient.resetSocket() doesn't set socket timeout
+ * 1647159    2007-01-29  lupusalex    HttpClientPool runs out of HttpClients
+ * 1649595    2007-02-01  lupusalex    No chunkig requested
+ * 1660743    2007-02-15  lupusalex    SSLContext is static
+ * 1702832    2007-04-18  lupusalex    WBEMClientCIMXL.setCustomSocketFactory() not implemented
+ * 1715511    2007-05-09  lupusalex    FVT: Wrong HTTP header values 
+ * 1892046    2008-02-13  blaschke-oss Basic/digest authentication problem for Japanese users
+ * 1931216    2008-04-01  blaschke-oss In HTTPClient need to get status before closing connection
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2204488 	  2008-10-28  raman_arora  Fix code to remove compiler warnings
+ * 2372030    2008-12-01  blaschke-oss Add property to control synchronized SSL handshaking
+ * 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)
+ * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
+ * 2750520    2009-04-10  blaschke-oss Code cleanup from empty statement et al
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 2817962    2009-08-05  blaschke-oss socket creation connects w/o a timeout
+ * 2994776    2010-05-05  blaschke-oss http 401 gives CIM_ERR_FAILED instead of CIM_ERR_ACCESS_DENIED
+ * 2997865    2010-05-07  blaschke-oss Infinite loop in HttpClient
+ * 3004762    2010-06-16  blaschke-oss HTTPClient infinite loop for HTTP 407
+ * 3022554    2010-06-30  blaschke-oss Flushing socket ignores skip() return code
+ * 3046073    2010-09-07  blaschke-oss Performance hit due to socket conn. creation with timeout
+ * 3195069    2011-02-28  blaschke-oss Need support to disable SSL Handshake
+ * 3235440    2011-03-22  blaschke-oss NullPointerException when socket factory returns null
+ * 3323310    2011-06-20  blaschke-oss Need the ability to override certain Global Properties
+ * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
+ * 3444912    2011-11-29  blaschke-oss Client delay during SSL handshake
+ * 3492224    2012-02-23  blaschke-oss Need two different timeouts for Socket connections
+ * 3504304    2012-03-14  blaschke-oss Rename socket timeout variables
+ * 3523918    2012-05-06  blaschke-oss "java.io.IOException: Unexpected EOF" returned as HTTP 401
+ * 3524050    2012-06-06  blaschke-oss Improve WWW-Authenticate in HTTPClient.java
+ * 3557283    2012-11-05  blaschke-oss Print full response when get EOF from CIMOM
+ * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
+ *    2619    2013-02-22  blaschke-oss Host should contain port when not 5988/5989
+ *    2621    2013-02-23  blaschke-oss Not all chunked input has trailers
+ *    2618    2013-02-27  blaschke-oss Need to add property to disable weak cipher suites for the secure indication
+ *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
+ *    2654    2013-07-29  blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF
+ *    2655    2013-08-14  blaschke-oss Content-length must be ignored when Transfer-encoding present
+ *    2151    2013-08-20  blaschke-oss gzip compression not supported
+ *    2709    2013-11-13  blaschke-oss Lower the level of the EOF message to FINE
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.net.URI;
+import java.security.AccessController;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import java.util.Vector;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+import java.util.zip.GZIPInputStream;
+
+import javax.net.SocketFactory;
+import javax.net.ssl.HandshakeCompletedEvent;
+import javax.net.ssl.HandshakeCompletedListener;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
+import org.metricshub.wbem.sblim.cimclient.WBEMConfigurationProperties;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader.HeaderEntry;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.BoundedInputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.ChunkedInputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.KeepAliveInputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.PersistentInputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
+
+/**
+ * Class HttpClient implements a HTTP client
+ * 
+ */
+public class HttpClient implements HandshakeCompletedListener {
+
+	private static class HostPortPair {
+
+		String iHost;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param url
+		 *            The url
+		 */
+		public HostPortPair(URI url) {
+			this.iHost = url.getScheme().toLowerCase() + ':' + url.getHost().toLowerCase() + ':'
+					+ url.getPort();
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (!(o instanceof HostPortPair)) return false;
+
+			return this.iHost.equals(((HostPortPair) o).iHost);
+		}
+
+		@Override
+		public int hashCode() {
+			return this.iHost.hashCode();
+		}
+
+		@Override
+		public String toString() {
+			return "HostPortPair=[+" + this.iHost + "]";
+		}
+	}
+
+	private static class GetProperty implements PrivilegedAction {
+
+		String iPropertyName;
+
+		GetProperty(String propertyName) {
+			this.iPropertyName = propertyName;
+		}
+
+		public Object run() {
+			return System.getProperty(this.iPropertyName);
+		}
+	}
+
+	private static String iEncoding;
+
+	static {
+		try {
+			iEncoding = (String) AccessController.doPrivileged(new PrivilegedAction() {
+
+				public Object run() {
+					return System.getProperty("file.encoding", "ISO8859_1");
+				}
+			});
+			if (!isASCIISuperset(iEncoding)) iEncoding = "ISO8859_1";
+		} catch (Exception exception) {
+			iEncoding = "ISO8859_1";
+		}
+	}
+
+	/**
+	 * Converts a byte array to a String of hex digits
+	 * 
+	 * @param digest
+	 *            The byte array
+	 * @return The hex string
+	 */
+	public static String convertToHexString(byte[] digest) {
+		char hexDigit[] = "0123456789abcdef".toCharArray();
+
+		StringBuffer buf = new StringBuffer();
+		for (int i = 0; i < digest.length; i++) {
+			int b = digest[i];
+			buf.append(hexDigit[(b >> 4) & 0xF]);
+			buf.append(hexDigit[(b) & 0xF]);
+		}
+		return buf.toString();
+	}
+
+	/**
+	 * Returns a client from a http client pool
+	 * 
+	 * @param url
+	 *            The url to connect to
+	 * @param clientPool
+	 *            The client pool
+	 * @param auth_handler
+	 *            The authentication handler to use
+	 * @return A http client from the pool
+	 */
+	public static HttpClient getClient(URI url, HttpClientPool clientPool,
+			AuthorizationHandler auth_handler) {
+
+		return clientPool.retrieveAvailableConnectionFromPool(url, auth_handler);
+	}
+
+	protected static String dequote(String str) {
+		int len = str.length();
+		if (len > 1 && str.charAt(0) == '\"' && str.charAt(len - 1) == '\"') return str.substring(
+				1, len - 1);
+		return str;
+	}
+
+	protected static void handleRsp(String authInfo, AuthorizationInfo prevAuthInfo)
+			throws IOException {
+		if (authInfo != null) {
+			HttpHeader params = HttpHeader.parse(authInfo);
+
+			String nonce = params.getField("nextnonce");
+			if (nonce != null) {
+				prevAuthInfo.setNonce(nonce);
+				prevAuthInfo.setNc(0);
+			} else {
+				nonce = prevAuthInfo.getNonce();
+			}
+			String qop = params.getField("qop");
+			if (qop != null) {
+				if (!"auth".equalsIgnoreCase(qop) && !"auth-int".equalsIgnoreCase(qop)) {
+					// TODO
+					throw new IOException(
+							"Authentication Digest with integrity check not supported");
+				}
+				byte[] rspauth;
+				String rspauthStr = dequote(params.getField("rspauth"));
+				if (rspauthStr != null) {
+					rspauth = parseHex(rspauthStr);
+
+					String cnonce = dequote(params.getField("cnonce"));
+					if (cnonce != null && !cnonce.equals(prevAuthInfo.getCnonce())) { throw new IOException(
+							"Digest authentication: Invalid nonce counter"); }
+					String ncStr = params.getField("nc");
+					if (ncStr != null) {
+						try {
+							long nc = Long.parseLong(ncStr, 16);
+							if (nc != prevAuthInfo.getNc()) { throw new IOException(); }
+						} catch (Exception e) {
+							throw new IOException("Digest authentication: Invalid nonce counter");
+						}
+					}
+
+					String HA1, HA2;
+					MessageDigest md5;
+					try {
+						md5 = MessageDigest.getInstance("MD5");
+						md5.reset();
+						byte[] bytes = prevAuthInfo.getA1().getBytes("UTF-8");
+						md5.update(bytes);
+						HA1 = convertToHexString(md5.digest());
+						if ("MD5-sess".equalsIgnoreCase(params.getField("algorithm"))) {
+							md5.reset();
+							md5.update((HA1 + ":" + nonce + ":" + cnonce).getBytes("UTF-8"));
+							HA1 = convertToHexString(md5.digest());
+						}
+
+						HA2 = ":" + prevAuthInfo.getURI();
+						if ("auth-int".equalsIgnoreCase(qop)) {
+							md5.reset();
+							md5.update(new byte[] {});
+							HA2 += ":" + convertToHexString(md5.digest());
+						}
+						md5.reset();
+						md5.update(HA2.getBytes("UTF-8"));
+						HA2 = convertToHexString(md5.digest());
+
+						md5.reset();
+						md5.update((HA1 + ":" + nonce + ":" + ncStr + ":" + cnonce + ":" + qop
+								+ ":" + HA2).getBytes("UTF-8"));
+						String hsh = convertToHexString(md5.digest());
+						byte[] hash = parseHex(hsh);
+
+						if (!Arrays.equals(hash, rspauth)) throw new IOException(
+								"Digest Authentication failed!");
+
+					} catch (NoSuchAlgorithmException e1) {
+						throw new IOException(
+								"Unable to validate Authentication response: NoSuchAlgorithmException");
+					}
+				}
+			} else {
+				// TODO compute md5 of the entity-body
+			}
+		}
+	}
+
+	protected static byte[] parseHex(String hex) {
+		byte[] value = new byte[hex.length() >> 1];
+		int n = 0;
+		for (int i = 0; i < value.length; i++) {
+			value[i] = (byte) (0xff & Integer.parseInt(hex.substring(n, n + 1), 16));
+			n += 2;
+		}
+		return value;
+	}
+
+	private static boolean isASCIISuperset(String charset) throws Exception {
+		String asciiSuperSet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_.!~*'();/?:@&=+$,";
+		byte abyte0[] = { 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 71, 72,
+				73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99,
+				100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
+				116, 117, 118, 119, 120, 121, 122, 45, 95, 46, 33, 126, 42, 39, 40, 41, 59, 47, 63,
+				58, 64, 38, 61, 43, 36, 44 };
+		byte convertedArray[] = asciiSuperSet.getBytes(charset);
+		return Arrays.equals(convertedArray, abyte0);
+	}
+
+	private boolean iConnected = false;
+
+	private HttpClientPool iHttpClientPool;
+
+	private AuthorizationHandler iAuth_handler;
+
+	private SSLSession iSession;
+
+	private InputStream iIStream;
+
+	private boolean iUseHttp11 = true;
+
+	private boolean iKeepAlive = true;
+
+	private HttpClientMethod iMethod;
+
+	private OutputStream iOStream;
+
+	private AuthorizationInfo iPrevAuthInfo;
+
+	private AuthorizationInfo iPrevProxy;
+
+	private HttpHeader iRequestHeaders = new HttpHeader();
+
+	private String iRequestMethod = "POST";
+
+	private boolean iReset = true;
+
+	private HttpClientMethod iResponse;
+
+	private HttpHeader iResponseHeaders = new HttpHeader();
+
+	private InputStream iServerInput;
+
+	private ByteArrayOutputStream iServerOutput;
+
+	private Socket iSocket;
+
+	private URI iUrl;
+
+	private long iPreviousResponseTime = -1;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param url
+	 *            The url to connect to
+	 * @param clientPool
+	 *            The associated client pool
+	 * @param auth_handler
+	 *            The authentication handler
+	 */
+	public HttpClient(URI url, HttpClientPool clientPool, AuthorizationHandler auth_handler) {
+		this.iUrl = url;
+		this.iAuth_handler = auth_handler;
+		this.iHttpClientPool = clientPool;
+	}
+
+	/**
+	 * Connects to the http server
+	 * 
+	 * @throws IOException
+	 */
+	public void connect() throws IOException {
+		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+		try {
+			this.iReset = true;
+			this.iResponse = null;
+			this.iConnected = true;
+			this.iServerOutput = null;
+			resetSocket();
+		} finally {
+			logger.exit();
+		}
+	}
+
+	/**
+	 * Disconnects the session
+	 */
+	public synchronized void disconnect() {
+		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+		this.iConnected = false;
+		if (this.iSocket != null) {
+			try {
+				this.iSocket.close();
+			} catch (IOException e) {
+				logger.trace(Level.FINE, "Unexpected problem closing http socket", e);
+			}
+			this.iSocket = null;
+			this.iServerInput = null;
+			this.iReset = true;
+			this.iResponse = null;
+		}
+		logger.exit();
+	}
+
+	@Override
+	protected void finalize() throws Throwable {
+		try {
+			this.iSocket.close();
+		} catch (IOException e) {
+			// bad luck
+		} finally {
+			super.finalize();
+		}
+	}
+
+	/**
+	 * Returns the http header field value for a given index
+	 * 
+	 * @param index
+	 *            The index
+	 * @return The header field value
+	 */
+	public synchronized String getHeaderFieldValue(int index) {
+
+		if (index < 0) throw new IllegalArgumentException();
+		if (index == 0) return this.iResponse.toString();
+
+		Iterator> iterator = this.iResponseHeaders.iterator();
+		while (iterator.hasNext() && --index >= 0) {
+			Entry entry = iterator.next();
+			if (index == 0) return entry.getValue().toString();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the http header field for a given name
+	 * 
+	 * @param name
+	 *            The name
+	 * @return The header field
+	 */
+	public synchronized String getHeaderField(String name) {
+		return this.iResponseHeaders.getField(name);
+	}
+
+	/**
+	 * Return the http header field name for a given index
+	 * 
+	 * @param index
+	 *            The index
+	 * @return The name
+	 */
+	public synchronized String getHeaderFieldName(int index) {
+		if (index < 0) throw new IllegalArgumentException();
+		if (index == 0) return null;
+
+		Iterator> iterator = this.iResponseHeaders.iterator();
+		while (iterator.hasNext() && --index >= 0) {
+			Entry entry = iterator.next();
+			if (index == 0) return entry.getKey().toString();
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the input stream of this http connection
+	 * 
+	 * @return The input stream
+	 * @throws IOException
+	 */
+	public synchronized InputStream getInputStream() throws IOException {
+		if (getResponseCode() < 500 && this.iResponse != null && this.iServerInput != null) return this.iServerInput;
+
+		throw new IOException("Failed to open an input stream from server: HTTPResponse "
+				+ getResponseCode());
+	}
+
+	/**
+	 * Returns the output stream of this http connection
+	 * 
+	 * @return The output stream
+	 */
+	public synchronized OutputStream getOutputStream() {
+		if (this.iServerOutput == null) {
+			this.iServerOutput = new ByteArrayOutputStream();
+		}
+		return this.iServerOutput;
+	}
+
+	/**
+	 * Returns the request method
+	 * 
+	 * @return The request method
+	 */
+	public String getRequestMethod() {
+		return this.iRequestMethod;
+	}
+
+	/**
+	 * Returns the request property for a given key
+	 * 
+	 * @param key
+	 *            The key
+	 * @return The property
+	 */
+	public String getRequestProperty(String key) {
+		return this.iRequestHeaders.getField(key);
+	}
+
+	/**
+	 * Returns the response code
+	 * 
+	 * @return The response code
+	 * @throws IOException
+	 */
+	public synchronized int getResponseCode() throws IOException {
+		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+		try {
+			long ResponseTime = -1;
+			Exception delayedException = null;
+			if (this.iReset && this.iResponse == null) {
+				boolean authFailed = false;
+				int IoRetry = 1;
+				int AuthentificationRetry = 1;
+				do {
+					logger.trace(Level.FINER, "Attempting http request (retry counters:" + IoRetry
+							+ "/" + AuthentificationRetry + ")");
+					long RequestTime = System.currentTimeMillis();
+
+					if (this.iPreviousResponseTime != -1) {
+						long time = RequestTime - this.iPreviousResponseTime;
+						long maxTime = this.iHttpClientPool.getConfigurationContext()
+								.getSocketIdleTimeout();
+						if (maxTime > 0 && time > maxTime) {
+							logger.trace(Level.FINER, "Closing socket after " + time
+									+ "ms of idle time");
+
+							if (this.iSocket != null && !this.iSocket.isClosed()) {
+								try {
+									this.iSocket.close();
+								} catch (IOException e) {
+									logger.trace(Level.FINER,
+											"Exception caught while closing socket", e);
+								}
+							}
+							this.iSocket = null;
+							this.iReset = true;
+							this.iResponse = null;
+						}
+					}
+
+					ResponseTime = -1;
+					resetSocket();
+					this.iReset = false;
+					try {
+						ASCIIPrintStream out = (ASCIIPrintStream) this.iOStream;
+						if (out == null) throw new IOException("could not open output stream");
+
+						String file = this.iUrl.getPath();
+						if (file == null || file.length() == 0) file = "/";
+						String query = this.iUrl.getQuery();
+						if (query != null) file = file + '?' + query;
+
+						this.iMethod = new HttpClientMethod(this.iRequestMethod, this.iUrl
+								.getPath(), 1, this.iUseHttp11 ? 1 : 0);
+						logger.trace(Level.FINER, "HTTP Operation= " + this.iMethod);
+
+						this.iMethod.write(out);
+
+						StringBuilder hostField = new StringBuilder(this.iUrl.getHost());
+						if (this.iUrl.getPort() > 0
+								&& ((WBEMConstants.HTTPS.equalsIgnoreCase(this.iUrl.getScheme()) && this.iUrl
+										.getPort() != WBEMConstants.DEFAULT_WBEM_SECURE_PORT) || (WBEMConstants.HTTP
+										.equalsIgnoreCase(this.iUrl.getScheme()) && this.iUrl
+										.getPort() != WBEMConstants.DEFAULT_WBEM_PORT))) {
+							hostField.append(':');
+							hostField.append(this.iUrl.getPort());
+						}
+						this.iRequestHeaders.addField("Host", hostField.toString());
+
+						if (this.iServerOutput != null) this.iRequestHeaders.addField(
+								"Content-length", "" + this.iServerOutput.size());
+						else this.iRequestHeaders.addField("Content-length", "0");
+						if (this.iHttpClientPool.getConfigurationContext().isHttpChunked()) {
+							this.iRequestHeaders.addField("TE", "trailers");
+						}
+
+						if (iUseHttp11 && !iHttpClientPool.getConfigurationContext().useKeepAliveStrictMode()) {
+							// AMMO-863 Systematic use of the Keep-alive
+							// header is not recommended with HTTP/1.1
+							// And may cause issues with EMC's VAPP appliances
+							// so we made the header available only when
+							// new strict mode is disabled
+							logger.trace(Level.INFO,
+							             "HTTP 1.1 protocol and 'Connection=Keep-alive' strict mode disabled, we add the header");
+							iRequestHeaders.addField("Connection", "Keep-alive");
+						}
+
+						if (this.iPrevAuthInfo == null) {
+							AuthorizationInfo authInfo = this.iAuth_handler.getAuthorizationInfo(0);
+							String authenticate = this.iHttpClientPool.getConfigurationContext()
+									.getHttpWwwAuthenticateInfo();
+
+							if (authInfo.isSentOnFirstRequest()) {
+								this.iRequestHeaders.addField(authInfo.getHeaderFieldName(),
+										authInfo.toString());
+							} else if (authenticate != null) {
+								try {
+									this.iPrevAuthInfo = getAuthentication(false,
+											this.iPrevAuthInfo, authenticate);
+									if (this.iPrevAuthInfo != null) {
+										this.iRequestHeaders.addField(this.iPrevAuthInfo
+												.getHeaderFieldName(), this.iPrevAuthInfo
+												.toString());
+									}
+								} catch (NoSuchAlgorithmException e) {
+									logger.trace(Level.FINER, "Unable to find digest algorithm", e);
+								} catch (IllegalArgumentException e) {
+									logger
+											.trace(
+													Level.FINER,
+													WBEMConfigurationProperties.HTTP_WWW_AUTHENTICATE_INFO
+															+ " did not contain WWW-Authenticate information",
+													e);
+								} catch (HttpParseException e) {
+									logger
+											.trace(
+													Level.FINER,
+													WBEMConfigurationProperties.HTTP_WWW_AUTHENTICATE_INFO
+															+ " did not contain valid WWW-Authenticate information",
+													e);
+								}
+							}
+						} else {
+							this.iRequestHeaders.addField(this.iPrevAuthInfo.getHeaderFieldName(),
+									this.iPrevAuthInfo.toString());
+						}
+
+						if (this.iPrevProxy != null) this.iRequestHeaders.addField(
+								"Proxy-authorization", this.iPrevProxy.toString());
+
+						boolean isGzipped = false;
+						if (this.iHttpClientPool.getConfigurationContext().isGzipEncodingEnabled()) {
+							isGzipped = true;
+							this.iRequestHeaders.addField("Accept-Encoding", "gzip,identity;q=0.5");
+						}
+
+						this.iRequestHeaders.write(out);
+
+						logger.trace(Level.FINER, "Request HTTP Headers= " + this.iRequestHeaders);
+
+						if (out.checkError() != null) {
+							delayedException = out.checkError();
+							logger.trace(Level.FINER,
+									"Exception caught while writing to the http output stream.",
+									delayedException);
+							if (this.iSocket != null && !this.iSocket.isClosed()) {
+								try {
+									this.iSocket.close();
+								} catch (IOException e) {
+									logger.trace(Level.FINER,
+											"Exception caught while closing socket", e);
+								}
+							}
+							this.iSocket = null;
+							this.iReset = true;
+							this.iResponse = null;
+							--IoRetry;
+							continue;
+						}
+						if (this.iServerOutput != null) {
+							this.iServerOutput.writeTo(out);
+						}
+						out.flush();
+
+						// byte[] header = new byte[8];
+						// istream.mark(8);
+						// int totalRead;
+						// int k;
+						// for (totalRead = 0; totalRead < 8; totalRead += k) {
+						// k = istream.read(header, totalRead, 8 - totalRead);
+						// if (k < 0)
+						// break;
+						// }
+						//				
+						// if (header[0] != 72 // HTTP1.
+						// || header[1] != 84
+						// || header[2] != 84
+						// || header[3] != 80
+						// || header[4] != 47
+						// || header[5] != 49
+						// || header[6] != 46
+						// || totalRead != 8) {
+						// retry = 0;
+						// throw new IOException("Unexpected end of file from
+						// server. Header does not match HTTP header: "+new
+						// String(header));
+						// }
+						//						
+						// istream.reset();
+
+						this.iResponse = new HttpClientMethod(this.iIStream);
+						logger.trace(Level.FINER, "HTTP Response= " + this.iResponse);
+						ResponseTime = System.currentTimeMillis();
+
+						this.iResponseHeaders = new HttpHeader(this.iIStream);
+						logger.trace(Level.FINER, "Response HTTP Headers= "
+								+ this.iResponseHeaders.toString());
+						this.iKeepAlive = false;
+						if ("Keep-alive".equalsIgnoreCase(this.iResponseHeaders
+								.getField("Connection"))
+								|| (this.iResponse.getMajorVersion() == 1 && this.iResponse
+										.getMinorVersion() == 1)
+								|| this.iResponseHeaders.getField("Keep-alive") != null) {
+							this.iKeepAlive = true;
+						}
+
+						this.iServerInput = new PersistentInputStream(this.iIStream);
+						// String keepAliveHdr =
+						// iResponseHeaders.getField("Keep-Alive");
+
+						String contentLength = this.iResponseHeaders.getField("Content-length");
+						long length = -1;
+						try {
+							if (contentLength != null && contentLength.length() > 0) length = Long
+									.parseLong(contentLength);
+						} catch (Exception e) {
+							logger.trace(Level.FINER,
+									"Exception while parsing the content length of http response",
+									e);
+						}
+						this.iKeepAlive = (length >= 0 || this.iResponse.getStatus() == 304 || this.iResponse
+								.getStatus() == 204);
+
+						if (isGzipped) {
+							String contentEncoding = this.iResponseHeaders
+									.getField("Content-Encoding");
+							if (contentEncoding != null
+									&& contentEncoding.toLowerCase().contains("gzip")) {
+								length = -1; // ignore Content-length
+								this.iServerInput = new GZIPInputStream(this.iServerInput);
+							}
+						}
+
+						String transferEncoding = this.iResponseHeaders
+								.getField("Transfer-encoding");
+						if (transferEncoding != null) {
+							length = -1; // ignore Content-length
+							if (transferEncoding.toLowerCase().endsWith("chunked")) {
+								this.iServerInput = new ChunkedInputStream(this.iServerInput,
+										this.iResponseHeaders.getField("Trailer"), "Response");
+								this.iKeepAlive = true;
+							}
+						}
+
+						if (length >= 0) this.iServerInput = new BoundedInputStream(
+								this.iServerInput, length);
+
+						logger.trace(Level.FINER, "KeepAlive="
+								+ (this.iKeepAlive ? "true" : "false"));
+
+						if (this.iKeepAlive) {
+							this.iServerInput = new KeepAliveInputStream(this.iServerInput, this);
+						}
+
+						switch (this.iResponse.getStatus()) {
+							case 100: {
+								continue;
+							}
+							case HttpURLConnection.HTTP_OK:
+								String authInfo = this.iResponseHeaders
+										.getField("Authentication-Info");
+								handleRsp(authInfo, this.iPrevAuthInfo);
+
+								authInfo = this.iResponseHeaders.getField("Authentication-Proxy");
+								handleRsp(authInfo, this.iPrevProxy);
+
+								if (this.iServerOutput != null) this.iServerOutput = null;
+
+								this.iPreviousResponseTime = ResponseTime;
+								return HttpURLConnection.HTTP_OK;
+
+							case HttpURLConnection.HTTP_UNAUTHORIZED:
+								--AuthentificationRetry;
+								String authenticate = this.iResponseHeaders
+										.getField("WWW-Authenticate");
+								try {
+									this.iPrevAuthInfo = getAuthentication(false,
+											this.iPrevAuthInfo, authenticate);
+									if (this.iPrevAuthInfo != null) {
+										this.iRequestHeaders.addField(this.iPrevAuthInfo
+												.getHeaderFieldName(), this.iPrevAuthInfo
+												.toString());
+									}
+								} catch (NoSuchAlgorithmException e) {
+									logger.trace(Level.FINER, "Unable to find digest algorithm", e);
+								} catch (IllegalArgumentException e) {
+									logger
+											.trace(
+													Level.FINER,
+													"HTTP 401 response did not contain WWW-Authenticate information",
+													e);
+								} catch (HttpParseException e) {
+									logger
+											.trace(
+													Level.FINER,
+													"HTTP 401 response did not contain valid WWW-Authenticate information",
+													e);
+								}
+
+								if (!authFailed) {
+									authFailed = true;
+									logger
+											.trace(Level.FINER,
+													"Authorization failed, retrying with authorization info.");
+								}
+								if (this.iPrevAuthInfo != null && this.iPrevAuthInfo.isKeptAlive()) {
+									this.iKeepAlive = true;
+								}
+								break;
+							case HttpURLConnection.HTTP_PROXY_AUTH:
+								--AuthentificationRetry;
+								logger.message(Messages.HTTP_PROXY_AUTH_UNSUPPORTED, this.iUrl);
+
+								// TODO implement http proxy authentication
+								/*
+								 * authenticate =
+								 * responseHeaders.getField("Proxy-Authenticate"
+								 * ); prevProxy = getAuthentication(true,
+								 * prevProxy, authenticate, this); if
+								 * (prevAuthInfo != null)
+								 * requestHeaders.addField
+								 * ("Proxy-Authorization",
+								 * prevProxy.toString());
+								 * 
+								 * while ((total = serverInput.available()) > 0)
+								 * { serverInput.skip(total); } break;
+								 */
+								break;
+							default:
+								int status = this.iResponse.getStatus();
+								if (!this.iKeepAlive) closeConnection();
+								else this.iServerInput.close();
+								this.iPreviousResponseTime = ResponseTime;
+								return status;
+						}
+					} catch (SocketTimeoutException e) {
+						throw e;
+					} catch (IOException e) {
+						logger.message(Messages.HTTP_CONNECTION_FAILED, new Object[] { this.iUrl,
+								e.getMessage() });
+						StringBuilder msg = new StringBuilder("Http connection failed ");
+						if (ResponseTime != -1) {
+							msg.append("after");
+							msg.append(ResponseTime - RequestTime);
+							msg.append(" milliseconds");
+						} else {
+							msg.append("before response received");
+						}
+						if (this.iPreviousResponseTime != -1) {
+							msg.append(", ");
+							msg.append(System.currentTimeMillis() - this.iPreviousResponseTime);
+							msg.append(" milliseconds after previous response on same socket");
+						}
+						logger.trace(Level.FINE, msg.toString(), e);
+						delayedException = e;
+						if (this.iSocket != null && !this.iSocket.isClosed()) {
+							try {
+								this.iSocket.close();
+							} catch (IOException e2) {
+								logger.trace(Level.FINER, "Exception caught while closing socket",
+										e2);
+							}
+						}
+						this.iSocket = null;
+						this.iReset = true;
+						this.iResponse = null;
+						--IoRetry;
+					}
+
+				} while (AuthentificationRetry >= 0 && IoRetry >= 0);
+			}
+
+			if (this.iResponse != null) {
+				logger.trace(Level.FINER, "http response code=" + this.iResponse.getStatus());
+				if (ResponseTime != -1) this.iPreviousResponseTime = ResponseTime;
+				return this.iResponse.getStatus();
+			}
+			throw (IOException) (delayedException != null ? delayedException : new Exception(
+					"Unable to get response after maximum retries"));
+		} finally {
+			logger.exit();
+		}
+	}
+
+	/**
+	 * Returns the response message
+	 * 
+	 * @return The response message
+	 */
+	public String getResponseMessage() {
+		if (this.iResponse != null) return this.iResponse.getResponseMessage();
+		return null;
+	}
+
+	public void handshakeCompleted(HandshakeCompletedEvent event) {
+		LogAndTraceBroker.getBroker().trace(Level.FINER, "Http handshake completed.");
+		this.iSession = event.getSession();
+	}
+
+	/**
+	 * Resets state
+	 */
+	public void reset() {
+		this.iRequestHeaders.clear();
+		this.iResponseHeaders.clear();
+		this.iResponse = null;
+		this.iReset = true;
+	}
+
+	/**
+	 * Sets the request method
+	 * 
+	 * @param method
+	 *            The request method
+	 */
+	public void setRequestMethod(String method) {
+		this.iRequestMethod = method;
+	}
+
+	/**
+	 * Sets the request property
+	 * 
+	 * @param key
+	 *            The property name
+	 * @param value
+	 *            The value
+	 */
+	public void setRequestProperty(String key, String value) {
+		this.iRequestHeaders.addField(key, value);
+	}
+
+	/**
+	 * Releases the client and returns it to the pool
+	 */
+	public void streamFinished() {
+		streamFinished(true);
+	}
+
+	/**
+	 * Releases the client and returns it to the pool
+	 * 
+	 * @param keep
+	 *            if true return to the pool, if false
+	 *            drop.
+	 */
+	public void streamFinished(boolean keep) {
+
+		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		HostPortPair hpp = new HostPortPair(this.iUrl);
+		if (keep) { // TODO configurable from property file
+			logger.trace(Level.FINER, "Adding http client to pool (" + hpp + ")");
+			this.iHttpClientPool.returnAvailableConnectionToPool(this);
+		} else {
+			logger.trace(Level.FINER, "Disconnectiong http client (" + hpp + ")");
+			this.iHttpClientPool.removeConnectionFromPool(this);
+			disconnect();
+		}
+		logger.exit();
+	}
+
+	/**
+	 * Enables/Disables use of http 1.1
+	 * 
+	 * @param bool
+	 *            if true http 1.1 is enabled.
+	 */
+	public void useHttp11(boolean bool) {
+		this.iUseHttp11 = bool;
+	}
+
+	/**
+	 * Returns if a proxy is used
+	 * 
+	 * @return true if a proxy is used
+	 */
+	public boolean usingProxy() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	protected AuthorizationInfo getAuthentication(boolean proxy, AuthorizationInfo prevAuthInfo,
+			String authenticate) throws HttpParseException, NoSuchAlgorithmException {
+		Challenge[] challenges = Challenge.parseChallenge(authenticate);
+
+		// AuthorizationHandler auth_handler =
+		// AuthorizationHandler.getInstance();
+		int cntr = 0;
+		prevAuthInfo = null;
+		while (cntr < challenges.length) {
+			Challenge challenge = challenges[cntr];
+			cntr++;
+			// if (challenge.getScheme().equalsIgnoreCase("Digest")) {
+			// HttpHeader headers = challenge.getParams();
+			// String stale = headers.getField("stale");
+			// }
+			prevAuthInfo = this.iAuth_handler.getAuthorizationInfo(this.iHttpClientPool
+					.getConfigurationContext().getHttpAuthenticationModule(), proxy ? Boolean.TRUE
+					: Boolean.FALSE, this.iUrl.getHost(), this.iUrl.getPort(), this.iUrl
+					.getScheme(), challenge.getRealm(), challenge.getScheme());
+
+			if (prevAuthInfo != null) {
+				prevAuthInfo.updateAuthenticationInfo(challenge, authenticate, this.iUrl,
+						this.iRequestMethod);
+				return prevAuthInfo;
+			}
+		}
+		return null;
+	}
+
+	private void closeConnection() {
+		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+		if (this.iSocket != null) {
+			try {
+				this.iSocket.close();
+			} catch (IOException e) {
+				logger.trace(Level.FINER, "Exception while closing the socket", e);
+			}
+			this.iSocket = null;
+			this.iServerInput = null;
+			// response = null;
+		}
+		logger.exit();
+	}
+
+	private String[] parseProperty(String propertyName) {
+		String s = (String) AccessController.doPrivileged(new GetProperty(propertyName));
+		String as[];
+		if (s == null || s.length() == 0) {
+			as = null;
+		} else {
+			Vector vector = new Vector();
+			for (StringTokenizer stringtokenizer = new StringTokenizer(s, ","); stringtokenizer
+					.hasMoreElements(); vector.addElement(stringtokenizer.nextElement())) {
+				// add each token to vector
+			}
+			as = new String[vector.size()];
+			for (int i1 = 0; i1 < as.length; i1++)
+				as[i1] = (String) vector.elementAt(i1);
+		}
+		return as;
+	}
+
+	private void resetSocket() throws IOException {
+		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+		if (!this.iKeepAlive) {
+			logger.trace(Level.FINER, "KeepAlive=false, closing http connection...");
+			closeConnection();
+		}
+
+		int httpTimeout = this.iHttpClientPool.getConfigurationContext().getHttpTimeout();
+		logger.trace(Level.FINER, "Setting http timeout=" + httpTimeout);
+
+		if (this.iSocket == null) {
+			// Determine whether we need to connect with a timeout or not
+			boolean socketConnectWithTimeout = this.iHttpClientPool.getConfigurationContext()
+					.socketConnectWithTimeout();
+			logger.trace(Level.FINER, "Socket=null, creating http socket "
+					+ (socketConnectWithTimeout ? "with" : "without") + " timeout.");
+
+			// On Java 5+ InetSocketAddress(String,int) constructor will call
+			// any security manager's checkConnect method
+			if (!socketConnectWithTimeout) {
+				SecurityManager sm = System.getSecurityManager();
+				if (sm != null) {
+					sm.checkConnect(this.iUrl.getHost(), this.iUrl.getPort());
+				}
+			}
+
+			SocketFactory factory = this.iHttpClientPool.getConfigurationContext()
+					.getCustomSocketFactory();
+			if (factory == null) {
+				factory = HttpSocketFactory
+						.getInstance()
+						.getClientSocketFactory(
+								WBEMConstants.HTTPS.equalsIgnoreCase(this.iUrl.getScheme()) ? this.iHttpClientPool
+										.getSslContext()
+										: null);
+				if (factory == null) {
+					logger.message(Messages.HTTP_NO_SOCKET_FACTORY, this.iUrl.getScheme());
+					throw new IllegalStateException("Unable to load socket factory:"
+							+ this.iUrl.getScheme());
+				}
+			}
+			logger.trace(Level.FINER, "Creating new http for url " + this.iUrl.toString());
+			if (socketConnectWithTimeout) {
+				int connectTimeout = this.iHttpClientPool.getConfigurationContext()
+						.getSocketConnectTimeout();
+				logger.trace(Level.FINER, "Setting socket connect timeout=" + connectTimeout);
+
+				if (factory instanceof SSLSocketFactory) {
+					Socket sock = new Socket();
+					sock.connect(new InetSocketAddress(this.iUrl.getHost(), this.iUrl.getPort()),
+							connectTimeout);
+					this.iSocket = ((SSLSocketFactory) factory).createSocket(sock, this.iUrl
+							.getHost(), this.iUrl.getPort(), true);
+
+				} else {
+					this.iSocket = factory.createSocket();
+					if (this.iSocket != null) this.iSocket.connect(new InetSocketAddress(this.iUrl
+							.getHost(), this.iUrl.getPort()), connectTimeout);
+				}
+			} else {
+				this.iSocket = factory.createSocket(this.iUrl.getHost(), this.iUrl.getPort());
+			}
+			if (this.iSocket == null) {
+				logger.trace(Level.WARNING, "Socket factory " + factory.getClass().getName()
+						+ " returned null socket");
+				throw new IOException("Socket factory did not create socket");
+			}
+
+			this.iPreviousResponseTime = -1;
+			this.iSocket.setTcpNoDelay(true);
+			this.iSocket.setKeepAlive(true);
+			this.iSocket.setSoTimeout(httpTimeout);
+
+			if (this.iSocket instanceof SSLSocket) {
+				// Determine whether we need to perform SSL handshake or not
+				boolean performHandshake = this.iHttpClientPool.getConfigurationContext()
+						.performSslHandshake();
+				logger.trace(Level.FINER, "SSL socket created, handshake "
+						+ (performHandshake ? "will" : "will not") + " be performed.");
+
+				if (performHandshake) {
+					SSLSocket sk = (SSLSocket) this.iSocket;
+
+					String protocols[] = parseProperty("https.protocols");
+					if (protocols != null) {
+						logger.trace(Level.FINER,
+								"Setting SSLSocket.setEnabledProtocols() from \"https.protocols\"="
+										+ String.valueOf(Arrays.asList(protocols)));
+						sk.setEnabledProtocols(protocols);
+					}
+
+					String ciphersuites[] = parseProperty("https.cipherSuites");
+					if (ciphersuites != null) {
+						logger.trace(Level.FINER,
+								"Setting SSLSocket.setEnableCipheSuites() from \"https.cipherSuites\"="
+										+ String.valueOf(Arrays.asList(ciphersuites)));
+						sk.setEnabledCipherSuites(ciphersuites);
+					}
+
+					String disableCipherSuites = this.iHttpClientPool.getConfigurationContext()
+							.getSslClientCipherSuitesToDisable();
+					if (disableCipherSuites != null) {
+						sk.setEnabledCipherSuites(this.iHttpClientPool.getUpdatedCipherSuites(sk
+								.getEnabledCipherSuites(), disableCipherSuites));
+					}
+
+					// Determine whether we need to perform synchronized SSL
+					// handshake or not
+					boolean synchronizedHandshake = this.iHttpClientPool.getConfigurationContext()
+							.synchronizedSslHandshake();
+					logger.trace(Level.FINER, "Starting "
+							+ (synchronizedHandshake ? "synchronized" : "unsynchronized")
+							+ " http handshake.");
+
+					sk.addHandshakeCompletedListener(this);
+					if (synchronizedHandshake) {
+						synchronized (SSLSocket.class) {
+							sk.startHandshake();
+						}
+					} else {
+						sk.startHandshake();
+					}
+				}
+			}
+
+			this.iIStream = new BufferedInputStream(this.iSocket.getInputStream());
+			this.iOStream = new ASCIIPrintStream(new BufferedOutputStream(this.iSocket
+					.getOutputStream(), 1024), false, iEncoding);
+			this.iServerInput = null;
+		} else {
+			if (this.iServerInput != null && !(this.iServerInput instanceof KeepAliveInputStream)) {
+				logger.trace(Level.FINER, "Socket!=null, flushing the stream...");
+				long totalBytes = 0;
+				long total;
+				while ((total = this.iServerInput.available()) > 0) {
+					total = this.iServerInput.skip(total);
+					if (total >= 0) totalBytes += total;
+				}
+				logger.trace(Level.FINER, "total bytes on the stream=" + totalBytes);
+			}
+			this.iSocket.setSoTimeout(httpTimeout);
+		}
+	}
+
+	/**
+	 * Returns connected
+	 * 
+	 * @return The value of connected.
+	 */
+	public boolean isConnected() {
+		return this.iConnected;
+	}
+
+	@Override
+	public String toString() {
+		StringBuffer result = new StringBuffer();
+		result.append('[');
+		result.append("URI=");
+		result.append(this.iUrl);
+		result.append(", ");
+		result.append(this.iConnected ? "connected" : "not connected");
+		result.append(", ");
+		result.append(this.iKeepAlive ? "kept alive" : "not kept alive");
+		result.append(", ");
+		result.append(this.iUseHttp11 ? "HTTP 1.1" : "HTTP 1.0");
+		result.append(", ");
+		result.append("Method=");
+		result.append(this.iMethod);
+		result.append(", ");
+		result.append("Request Method=");
+		result.append(this.iRequestMethod);
+		result.append(", ");
+		result.append("Protocol=");
+		result.append(this.iSession != null ? this.iSession.getProtocol() : "http");
+		result.append(", ");
+		result.append("CipherSuite=");
+		result.append(this.iSession != null ? this.iSession.getCipherSuite() : "n/a");
+		result.append(']');
+		return result.toString();
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpClientMethod.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientMethod.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpClientMethod.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientMethod.java
index c54b70f..c6e5e6f 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpClientMethod.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientMethod.java
@@ -1,201 +1,199 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
-
-/**
- * Class HttpClientMethod encapsulates a http client method
- * 
- */
-public class HttpClientMethod extends HttpMethod {
-
-	private boolean iIncomming = true;
-
-	private String iHttpHeader;
-
-	private int iMinor, iMajor;
-
-	private int iStatus;
-
-	private String iMethod;
-
-	private String iRequest;
-
-	private String iResponse;
-
-	/**
-	 * Ctor. Creates an outgoing http method
-	 * 
-	 * @param pMethod
-	 *            The method
-	 * @param pRequest
-	 *            The request
-	 * @param pMajor
-	 *            The major version
-	 * @param pMinor
-	 *            The minor version
-	 */
-	public HttpClientMethod(String pMethod, String pRequest, int pMajor, int pMinor) {
-		this.iMinor = pMinor;
-		this.iMajor = pMajor;
-		this.iRequest = pRequest;
-		this.iMethod = pMethod;
-		this.iIncomming = false;
-	}
-
-	/**
-	 * Ctor. Parses an incoming http method from a given input stream
-	 * 
-	 * @param pReader
-	 *            The input stream
-	 * @throws IOException
-	 */
-	public HttpClientMethod(InputStream pReader) throws IOException {
-		String line = null;
-
-		do {
-			line = readLine(pReader);
-		} while (line == null || line.length() == 0);
-		int rqt = line.indexOf(' ');
-		int prev = 0;
-		if (rqt > -1) { // Parse the header
-			int next = rqt;
-			this.iHttpHeader = line.substring(prev, next).toUpperCase();
-
-			prev = this.iHttpHeader.indexOf('/');
-			if (prev > 0 && this.iHttpHeader.substring(0, prev).equalsIgnoreCase("HTTP")) {
-				next = this.iHttpHeader.indexOf('.', prev + 1);
-				try {
-					this.iMajor = Integer.parseInt(this.iHttpHeader.substring(prev + 1, next));
-					this.iMinor = Integer.parseInt(this.iHttpHeader.substring(next + 1));
-				} catch (Exception e) {
-					throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
-				}
-				prev = rqt;
-				rqt = line.indexOf(' ', prev + 1);
-				if (rqt > -1) {
-					try {
-						this.iStatus = Integer.parseInt(line.substring(prev + 1, rqt));
-					} catch (Exception e) {
-						throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
-					}
-					this.iResponse = line.substring(rqt + 1);
-					return;
-				}
-			} else throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
-		}
-		throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
-	}
-
-	/**
-	 * Returns the major version
-	 * 
-	 * @return The major version
-	 */
-	public int getMajorVersion() {
-		return this.iMajor;
-	}
-
-	/**
-	 * Returns the minor version
-	 * 
-	 * @return The minor version
-	 */
-	public int getMinorVersion() {
-		return this.iMinor;
-	}
-
-	/**
-	 * Returns the method name
-	 * 
-	 * @return The method name
-	 */
-	public String getMethodName() {
-		return this.iMethod;
-	}
-
-	/**
-	 * Return the status
-	 * 
-	 * @return The status
-	 */
-	public int getStatus() {
-		return this.iStatus;
-	}
-
-	/**
-	 * Writes the method to a given stream
-	 * 
-	 * @param pStream
-	 *            The stream
-	 */
-	public void write(ASCIIPrintStream pStream) {
-		pStream.print(this.iMethod + " " + this.iRequest + " HTTP/" + this.iMajor + "."
-				+ this.iMinor + "\r\n");
-	}
-
-	/**
-	 * Returns the response message
-	 * 
-	 * @return The response message
-	 */
-	public String getResponseMessage() {
-		return this.iResponse;
-	}
-
-	@Override
-	public String toString() {
-		if (this.iIncomming) { return this.iHttpHeader + " " + this.iStatus + " " + this.iResponse; }
-		return this.iMethod + " " + this.iRequest + " HTTP/" + this.iMajor + "." + this.iMinor;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
+
+/**
+ * Class HttpClientMethod encapsulates a http client method
+ * 
+ */
+public class HttpClientMethod extends HttpMethod {
+
+	private boolean iIncomming = true;
+
+	private String iHttpHeader;
+
+	private int iMinor, iMajor;
+
+	private int iStatus;
+
+	private String iMethod;
+
+	private String iRequest;
+
+	private String iResponse;
+
+	/**
+	 * Ctor. Creates an outgoing http method
+	 * 
+	 * @param pMethod
+	 *            The method
+	 * @param pRequest
+	 *            The request
+	 * @param pMajor
+	 *            The major version
+	 * @param pMinor
+	 *            The minor version
+	 */
+	public HttpClientMethod(String pMethod, String pRequest, int pMajor, int pMinor) {
+		this.iMinor = pMinor;
+		this.iMajor = pMajor;
+		this.iRequest = pRequest;
+		this.iMethod = pMethod;
+		this.iIncomming = false;
+	}
+
+	/**
+	 * Ctor. Parses an incoming http method from a given input stream
+	 * 
+	 * @param pReader
+	 *            The input stream
+	 * @throws IOException
+	 */
+	public HttpClientMethod(InputStream pReader) throws IOException {
+		String line = null;
+
+		do {
+			line = readLine(pReader);
+		} while (line == null || line.length() == 0);
+		int rqt = line.indexOf(' ');
+		int prev = 0;
+		if (rqt > -1) { // Parse the header
+			int next = rqt;
+			this.iHttpHeader = line.substring(prev, next).toUpperCase();
+
+			prev = this.iHttpHeader.indexOf('/');
+			if (prev > 0 && this.iHttpHeader.substring(0, prev).equalsIgnoreCase("HTTP")) {
+				next = this.iHttpHeader.indexOf('.', prev + 1);
+				try {
+					this.iMajor = Integer.parseInt(this.iHttpHeader.substring(prev + 1, next));
+					this.iMinor = Integer.parseInt(this.iHttpHeader.substring(next + 1));
+				} catch (Exception e) {
+					throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
+				}
+				prev = rqt;
+				rqt = line.indexOf(' ', prev + 1);
+				if (rqt > -1) {
+					try {
+						this.iStatus = Integer.parseInt(line.substring(prev + 1, rqt));
+					} catch (Exception e) {
+						throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
+					}
+					this.iResponse = line.substring(rqt + 1);
+					return;
+				}
+			} else throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
+		}
+		throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
+	}
+
+	/**
+	 * Returns the major version
+	 * 
+	 * @return The major version
+	 */
+	public int getMajorVersion() {
+		return this.iMajor;
+	}
+
+	/**
+	 * Returns the minor version
+	 * 
+	 * @return The minor version
+	 */
+	public int getMinorVersion() {
+		return this.iMinor;
+	}
+
+	/**
+	 * Returns the method name
+	 * 
+	 * @return The method name
+	 */
+	public String getMethodName() {
+		return this.iMethod;
+	}
+
+	/**
+	 * Return the status
+	 * 
+	 * @return The status
+	 */
+	public int getStatus() {
+		return this.iStatus;
+	}
+
+	/**
+	 * Writes the method to a given stream
+	 * 
+	 * @param pStream
+	 *            The stream
+	 */
+	public void write(ASCIIPrintStream pStream) {
+		pStream.print(this.iMethod + " " + this.iRequest + " HTTP/" + this.iMajor + "."
+				+ this.iMinor + "\r\n");
+	}
+
+	/**
+	 * Returns the response message
+	 * 
+	 * @return The response message
+	 */
+	public String getResponseMessage() {
+		return this.iResponse;
+	}
+
+	@Override
+	public String toString() {
+		if (this.iIncomming) { return this.iHttpHeader + " " + this.iStatus + " " + this.iResponse; }
+		return this.iMethod + " " + this.iRequest + " HTTP/" + this.iMajor + "." + this.iMinor;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpClientPool.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientPool.java
similarity index 88%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpClientPool.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientPool.java
index f5f046e..06b7f4f 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpClientPool.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientPool.java
@@ -1,332 +1,330 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1353168    2005-11-24  fiuczy       Possible NullPointerExcection in HttpClient.streamFinished()
- * 1498130    2006-05-31  lupusalex    Selection of xml parser on a per connection basis
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 1646434    2007-01-28  lupusalex    CIMClient close() invalidates all it's enumerations
- * 1647159    2007-01-29  lupusalex    HttpClientPool runs out of HttpClients
- * 1660743    2007-02-15  lupusalex    SSLContext is static
- * 1714902    2007-05-08  lupusalex    Threading related weak spots
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
- *    2618    2013-02-27  blaschke-oss Need to add property to disable weak cipher suites for the secure indication
- *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.logging.Level;
-
-import javax.net.ssl.SSLContext;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.Util;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-
-/**
- * Class HttpClientPool implements a pool for http client connections
- * 
- */
-public class HttpClientPool {
-
-	/**
-	 * Guarded by "this"
-	 */
-	private List iAllConnections;
-
-	/**
-	 * Guarded by "this"
-	 */
-	private List iAvailableConnections;
-
-	/**
-	 * Guarded by "this"
-	 */
-	private boolean iClosed = false;
-
-	private final int iPoolSize;
-
-	private final WBEMConfiguration iConfiguration;
-
-	/**
-	 * Guarded by "this"
-	 */
-	private SSLContext iSslContext;
-
-	private String[] iEnabledCipherSuites = null;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pConfiguration
-	 *            The configuration for this session. Must be non-null.
-	 */
-	public HttpClientPool(WBEMConfiguration pConfiguration) {
-		super();
-		this.iConfiguration = pConfiguration;
-		this.iAllConnections = new ArrayList(pConfiguration.getHttpPoolSize());
-		this.iAvailableConnections = new ArrayList(pConfiguration.getHttpPoolSize());
-		this.iPoolSize = pConfiguration.getHttpPoolSize();
-		this.iSslContext = null;
-		this.iEnabledCipherSuites = null;
-	}
-
-	/**
-	 * Returns the number of connections in this pool that are available/free
-	 * for (re-)use.
-	 * 
-	 * @return number of available/free connections in pool
-	 */
-	public synchronized int getNumberOfAllConnections() {
-		return this.iAllConnections.size();
-	}
-
-	/**
-	 * Returns the number of all connections in this pool.
-	 * 
-	 * @return number of all connections in pool
-	 */
-	public synchronized int getNumberOfAvailableConnections() {
-		return this.iAvailableConnections.size();
-	}
-
-	/**
-	 * Returns the configuration context of this pool
-	 * 
-	 * @return The configuration
-	 */
-	public WBEMConfiguration getConfigurationContext() {
-		return this.iConfiguration;
-	}
-
-	/**
-	 * Returns the SSL context for the clients in this pool. The context is
-	 * initialized on the first call of this method (lazy initialization).
-	 * 
-	 * @return The SSL context
-	 */
-	public synchronized SSLContext getSslContext() {
-		if (this.iSslContext == null) {
-			this.iSslContext = HttpSocketFactory.getInstance().getClientSSLContext(
-					this.iConfiguration);
-		}
-		return this.iSslContext;
-	}
-
-	/**
-	 * Returns the available connections of this pool for a given
-	 * URI&AuthorizationHandler
-	 * 
-	 * @param pUri
-	 *            The uri
-	 * @param pHandler
-	 *            The authorization handler
-	 * @return A connection if one is available, null otherwise
-	 */
-	public synchronized HttpClient retrieveAvailableConnectionFromPool(URI pUri,
-			AuthorizationHandler pHandler) {
-		if (this.iClosed) {
-			LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Attempt to get client from closed http client pool,");
-			throw new IllegalStateException("HttpClientPool is closed. Retrieve connection failed.");
-		}
-		if (getNumberOfAvailableConnections() > 0) {
-			LogAndTraceBroker.getBroker().trace(
-					Level.FINE,
-					"Reusing client (" + pUri.toString() + ", max: " + getPoolSize() + ", current:"
-							+ getNumberOfAvailableConnections());
-
-			return this.iAvailableConnections.remove(0);
-		}
-
-		LogAndTraceBroker.getBroker().trace(
-				Level.FINE,
-				"New client (" + pUri.toString() + ", max: " + getPoolSize() + ", current:"
-						+ getNumberOfAvailableConnections());
-		HttpClient client = new HttpClient(pUri, this, pHandler);
-		addConnectionToPool(client);
-		return client;
-	}
-
-	/**
-	 * Add the connection to the pool. Connection is added as available
-	 * connection. Use method {@link #addConnectionToPool(HttpClient)} to add
-	 * the connection without being available for reuse.
-	 * 
-	 * @param httpClient
-	 *            connection that is to be added to the pool
-	 * @return true if connection was added otherwise false
-	 */
-	public synchronized boolean returnAvailableConnectionToPool(HttpClient httpClient) {
-		if (httpClient == null) { return false; }
-
-		if (this.iClosed) {
-			this.iAllConnections.remove(httpClient);
-			httpClient.disconnect();
-			return false;
-		}
-
-		if (getPoolSize() > this.iAvailableConnections.size()) {
-			if (!this.iAvailableConnections.contains(httpClient)) {
-				// ensure that the connection exists in allConnections owned by
-				// pool
-				addConnectionToPool(httpClient);
-				this.iAvailableConnections.add(httpClient);
-				return true;
-			}
-		} else {
-			LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Http pool size reached, discarding client.");
-			this.iAllConnections.remove(httpClient);
-			this.iAvailableConnections.remove(httpClient);
-			httpClient.disconnect();
-		}
-		return false; // connection was not added to pool
-	}
-
-	/**
-	 * Add the connection to the pool, but does NOT add it as available
-	 * connection. Use method
-	 * {@link #returnAvailableConnectionToPool(HttpClient)} to also add the
-	 * connection to the available connections.
-	 * 
-	 * @param httpClient
-	 *            connection that is to be added to the pool
-	 * @return true if connection was added otherwise false
-	 */
-	public synchronized boolean addConnectionToPool(HttpClient httpClient) {
-		if (this.iClosed) {
-			LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Attempt to add client to closed http client pool,");
-			throw new IllegalStateException("HttpClientPool is closed. Add connection failed.");
-		}
-		if (httpClient != null && !this.iAllConnections.contains(httpClient)) {
-			// if connection is not in pool add it
-			this.iAllConnections.add(httpClient);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Removes a connection completely from the pool.
-	 * 
-	 * @param httpClient
-	 *            connection that is to be removed from the pool
-	 * @return true if connection was removed otherwise false
-	 */
-	public synchronized boolean removeConnectionFromPool(HttpClient httpClient) {
-		if (httpClient != null) {
-			this.iAvailableConnections.remove(httpClient);
-			if (this.iAllConnections.remove(httpClient)) { return true; }
-			return false; // connection was not in pool!
-		}
-		return false; // no connection given
-	}
-
-	/**
-	 * Closes the pool. This will disconnect all clients in the pool.
-	 */
-	public synchronized void closePool() {
-		this.iClosed = true;
-		Iterator iter = this.iAvailableConnections.iterator();
-		while (iter.hasNext()) {
-			HttpClient httpClient = iter.next();
-			this.iAllConnections.remove(httpClient);
-			httpClient.disconnect();
-		}
-		this.iAvailableConnections.clear();
-	}
-
-	@Override
-	protected void finalize() throws Throwable {
-		closePool();
-		super.finalize();
-	}
-
-	/**
-	 * Returns poolSize
-	 * 
-	 * @return The value of poolSize.
-	 */
-	public int getPoolSize() {
-		return this.iPoolSize;
-	}
-
-	/**
-	 * Returns updated array of cipher suites which is current cipher suites
-	 * less any cipher suites listed to be disabled
-	 * 
-	 * NOTE: The updated array is generated only upon first invocation and then
-	 * saved, effectively making this a lazy initialization of the cipher suites
-	 * on a HttpClientPool basis - it has to be done here and not in WBEMClient
-	 * where it belongs because socket characteristics are not known to
-	 * WBEMClient
-	 * 
-	 * @param pCurrentCipherSuites
-	 *            The currently enabled cipher suites
-	 * @param pDisableCipherSuites
-	 *            The list of cipher suites to be disabled
-	 * @return The updated enabled cipher suites
-	 */
-	public synchronized String[] getUpdatedCipherSuites(String[] pCurrentCipherSuites,
-			String pDisableCipherSuites) {
-		if (this.iEnabledCipherSuites == null) {
-			this.iEnabledCipherSuites = Util.getFilteredStringArray(pCurrentCipherSuites,
-					pDisableCipherSuites);
-			int before = pCurrentCipherSuites.length;
-			int after = this.iEnabledCipherSuites.length;
-			if (before > 0 && after == 0) LogAndTraceBroker.getBroker().trace(Level.WARNING,
-					"All cipher suites disabled for client!");
-			else if (before > after) LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Some (" + (before - after) + ") cipher suites disabled for client");
-			else if (before == after) LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"No cipher suites disabled for client");
-		}
-		return this.iEnabledCipherSuites;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1353168    2005-11-24  fiuczy       Possible NullPointerExcection in HttpClient.streamFinished()
+ * 1498130    2006-05-31  lupusalex    Selection of xml parser on a per connection basis
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 1646434    2007-01-28  lupusalex    CIMClient close() invalidates all it's enumerations
+ * 1647159    2007-01-29  lupusalex    HttpClientPool runs out of HttpClients
+ * 1660743    2007-02-15  lupusalex    SSLContext is static
+ * 1714902    2007-05-08  lupusalex    Threading related weak spots
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
+ *    2618    2013-02-27  blaschke-oss Need to add property to disable weak cipher suites for the secure indication
+ *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.logging.Level;
+
+import javax.net.ssl.SSLContext;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+
+/**
+ * Class HttpClientPool implements a pool for http client connections
+ * 
+ */
+public class HttpClientPool {
+
+	/**
+	 * Guarded by "this"
+	 */
+	private List iAllConnections;
+
+	/**
+	 * Guarded by "this"
+	 */
+	private List iAvailableConnections;
+
+	/**
+	 * Guarded by "this"
+	 */
+	private boolean iClosed = false;
+
+	private final int iPoolSize;
+
+	private final WBEMConfiguration iConfiguration;
+
+	/**
+	 * Guarded by "this"
+	 */
+	private SSLContext iSslContext;
+
+	private String[] iEnabledCipherSuites = null;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pConfiguration
+	 *            The configuration for this session. Must be non-null.
+	 */
+	public HttpClientPool(WBEMConfiguration pConfiguration) {
+		super();
+		this.iConfiguration = pConfiguration;
+		this.iAllConnections = new ArrayList(pConfiguration.getHttpPoolSize());
+		this.iAvailableConnections = new ArrayList(pConfiguration.getHttpPoolSize());
+		this.iPoolSize = pConfiguration.getHttpPoolSize();
+		this.iSslContext = null;
+		this.iEnabledCipherSuites = null;
+	}
+
+	/**
+	 * Returns the number of connections in this pool that are available/free
+	 * for (re-)use.
+	 * 
+	 * @return number of available/free connections in pool
+	 */
+	public synchronized int getNumberOfAllConnections() {
+		return this.iAllConnections.size();
+	}
+
+	/**
+	 * Returns the number of all connections in this pool.
+	 * 
+	 * @return number of all connections in pool
+	 */
+	public synchronized int getNumberOfAvailableConnections() {
+		return this.iAvailableConnections.size();
+	}
+
+	/**
+	 * Returns the configuration context of this pool
+	 * 
+	 * @return The configuration
+	 */
+	public WBEMConfiguration getConfigurationContext() {
+		return this.iConfiguration;
+	}
+
+	/**
+	 * Returns the SSL context for the clients in this pool. The context is
+	 * initialized on the first call of this method (lazy initialization).
+	 * 
+	 * @return The SSL context
+	 */
+	public synchronized SSLContext getSslContext() {
+		if (this.iSslContext == null) {
+			this.iSslContext = HttpSocketFactory.getInstance().getClientSSLContext(
+					this.iConfiguration);
+		}
+		return this.iSslContext;
+	}
+
+	/**
+	 * Returns the available connections of this pool for a given
+	 * URI&AuthorizationHandler
+	 * 
+	 * @param pUri
+	 *            The uri
+	 * @param pHandler
+	 *            The authorization handler
+	 * @return A connection if one is available, null otherwise
+	 */
+	public synchronized HttpClient retrieveAvailableConnectionFromPool(URI pUri,
+			AuthorizationHandler pHandler) {
+		if (this.iClosed) {
+			LogAndTraceBroker.getBroker().trace(Level.FINE,
+					"Attempt to get client from closed http client pool,");
+			throw new IllegalStateException("HttpClientPool is closed. Retrieve connection failed.");
+		}
+		if (getNumberOfAvailableConnections() > 0) {
+			LogAndTraceBroker.getBroker().trace(
+					Level.FINE,
+					"Reusing client (" + pUri.toString() + ", max: " + getPoolSize() + ", current:"
+							+ getNumberOfAvailableConnections());
+
+			return this.iAvailableConnections.remove(0);
+		}
+
+		LogAndTraceBroker.getBroker().trace(
+				Level.FINE,
+				"New client (" + pUri.toString() + ", max: " + getPoolSize() + ", current:"
+						+ getNumberOfAvailableConnections());
+		HttpClient client = new HttpClient(pUri, this, pHandler);
+		addConnectionToPool(client);
+		return client;
+	}
+
+	/**
+	 * Add the connection to the pool. Connection is added as available
+	 * connection. Use method {@link #addConnectionToPool(HttpClient)} to add
+	 * the connection without being available for reuse.
+	 * 
+	 * @param httpClient
+	 *            connection that is to be added to the pool
+	 * @return true if connection was added otherwise false
+	 */
+	public synchronized boolean returnAvailableConnectionToPool(HttpClient httpClient) {
+		if (httpClient == null) { return false; }
+
+		if (this.iClosed) {
+			this.iAllConnections.remove(httpClient);
+			httpClient.disconnect();
+			return false;
+		}
+
+		if (getPoolSize() > this.iAvailableConnections.size()) {
+			if (!this.iAvailableConnections.contains(httpClient)) {
+				// ensure that the connection exists in allConnections owned by
+				// pool
+				addConnectionToPool(httpClient);
+				this.iAvailableConnections.add(httpClient);
+				return true;
+			}
+		} else {
+			LogAndTraceBroker.getBroker().trace(Level.FINE,
+					"Http pool size reached, discarding client.");
+			this.iAllConnections.remove(httpClient);
+			this.iAvailableConnections.remove(httpClient);
+			httpClient.disconnect();
+		}
+		return false; // connection was not added to pool
+	}
+
+	/**
+	 * Add the connection to the pool, but does NOT add it as available
+	 * connection. Use method
+	 * {@link #returnAvailableConnectionToPool(HttpClient)} to also add the
+	 * connection to the available connections.
+	 * 
+	 * @param httpClient
+	 *            connection that is to be added to the pool
+	 * @return true if connection was added otherwise false
+	 */
+	public synchronized boolean addConnectionToPool(HttpClient httpClient) {
+		if (this.iClosed) {
+			LogAndTraceBroker.getBroker().trace(Level.FINE,
+					"Attempt to add client to closed http client pool,");
+			throw new IllegalStateException("HttpClientPool is closed. Add connection failed.");
+		}
+		if (httpClient != null && !this.iAllConnections.contains(httpClient)) {
+			// if connection is not in pool add it
+			this.iAllConnections.add(httpClient);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Removes a connection completely from the pool.
+	 * 
+	 * @param httpClient
+	 *            connection that is to be removed from the pool
+	 * @return true if connection was removed otherwise false
+	 */
+	public synchronized boolean removeConnectionFromPool(HttpClient httpClient) {
+		if (httpClient != null) {
+			this.iAvailableConnections.remove(httpClient);
+			if (this.iAllConnections.remove(httpClient)) { return true; }
+			return false; // connection was not in pool!
+		}
+		return false; // no connection given
+	}
+
+	/**
+	 * Closes the pool. This will disconnect all clients in the pool.
+	 */
+	public synchronized void closePool() {
+		this.iClosed = true;
+		Iterator iter = this.iAvailableConnections.iterator();
+		while (iter.hasNext()) {
+			HttpClient httpClient = iter.next();
+			this.iAllConnections.remove(httpClient);
+			httpClient.disconnect();
+		}
+		this.iAvailableConnections.clear();
+	}
+
+	@Override
+	protected void finalize() throws Throwable {
+		closePool();
+		super.finalize();
+	}
+
+	/**
+	 * Returns poolSize
+	 * 
+	 * @return The value of poolSize.
+	 */
+	public int getPoolSize() {
+		return this.iPoolSize;
+	}
+
+	/**
+	 * Returns updated array of cipher suites which is current cipher suites
+	 * less any cipher suites listed to be disabled
+	 * 
+	 * NOTE: The updated array is generated only upon first invocation and then
+	 * saved, effectively making this a lazy initialization of the cipher suites
+	 * on a HttpClientPool basis - it has to be done here and not in WBEMClient
+	 * where it belongs because socket characteristics are not known to
+	 * WBEMClient
+	 * 
+	 * @param pCurrentCipherSuites
+	 *            The currently enabled cipher suites
+	 * @param pDisableCipherSuites
+	 *            The list of cipher suites to be disabled
+	 * @return The updated enabled cipher suites
+	 */
+	public synchronized String[] getUpdatedCipherSuites(String[] pCurrentCipherSuites,
+			String pDisableCipherSuites) {
+		if (this.iEnabledCipherSuites == null) {
+			this.iEnabledCipherSuites = Util.getFilteredStringArray(pCurrentCipherSuites,
+					pDisableCipherSuites);
+			int before = pCurrentCipherSuites.length;
+			int after = this.iEnabledCipherSuites.length;
+			if (before > 0 && after == 0) LogAndTraceBroker.getBroker().trace(Level.WARNING,
+					"All cipher suites disabled for client!");
+			else if (before > after) LogAndTraceBroker.getBroker().trace(Level.FINE,
+					"Some (" + (before - after) + ") cipher suites disabled for client");
+			else if (before == after) LogAndTraceBroker.getBroker().trace(Level.FINER,
+					"No cipher suites disabled for client");
+		}
+		return this.iEnabledCipherSuites;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java
similarity index 86%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java
index 517375f..d13b10c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java
@@ -1,286 +1,284 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 17931      2005-07-28  thschaef     Add InetAddress to CIM Event
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 1649779    2007-02-01  lupusalex    Indication listener threads freeze
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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
- * 3185818    2011-02-18  blaschke-oss indicationOccured URL incorrect
- * 3495662    2012-02-29  blaschke-oss Invalid HTML from HttpConnectionHandler.writeError
- *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
- *    2657    2013-08-20  blaschke-oss Potential null pointer exception in handleConnection
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-
-import javax.net.ssl.SSLSocket;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConstants;
-
-/**
- * Class HttpConnectionHandler is responsible for handling an incoming
- * connection
- * 
- */
-public class HttpConnectionHandler {
-
-	/**
-	 * MAJOR_VERSION
-	 */
-	public static final int MAJOR_VERSION = 1;
-
-	/**
-	 * MINOR_VERSION
-	 */
-	public static final int MINOR_VERSION = 1;
-
-	HttpContentHandler iHandler;
-
-	private int iHeaderTimeout;
-
-	private int iMaxAllowedTimeouts;
-
-	private Map iSuspectIPs = new HashMap();
-
-	private StringBuilder iBlockedIPs = null;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHandler
-	 *            The content handler
-	 * @param pProperties
-	 *            The configuration properties
-	 */
-	public HttpConnectionHandler(HttpContentHandler pHandler, WBEMConfiguration pProperties) {
-		this.iHandler = pHandler;
-		this.iHeaderTimeout = pProperties.getListenerHttpHeaderTimeout();
-		this.iMaxAllowedTimeouts = pProperties.getListenerMaxAllowedTimeouts();
-	}
-
-	private synchronized void addSuspectIP(String pSuspectIP) {
-		if (this.iMaxAllowedTimeouts == 0) return;
-
-		Integer times = this.iSuspectIPs.get(pSuspectIP);
-		if (times == null) {
-			this.iSuspectIPs.put(pSuspectIP, Integer.valueOf(1));
-		} else {
-			int timesVal = times.intValue() + 1;
-			this.iSuspectIPs.put(pSuspectIP, Integer.valueOf(timesVal));
-			if (timesVal >= this.iMaxAllowedTimeouts) {
-				boolean newIP = false;
-				if (this.iBlockedIPs == null) {
-					this.iBlockedIPs = new StringBuilder(pSuspectIP);
-					newIP = true;
-				} else if (this.iBlockedIPs.indexOf(pSuspectIP) == -1) {
-					this.iBlockedIPs.append(',');
-					this.iBlockedIPs.append(pSuspectIP);
-					newIP = true;
-				}
-				if (newIP) LogAndTraceBroker.getBroker().trace(
-						Level.WARNING,
-						"Maximum allowable timeouts exceeded, all future connections ignored from "
-								+ pSuspectIP);
-			}
-		}
-	}
-
-	private synchronized boolean isBlockedIP(Socket socket) {
-		return (this.iBlockedIPs != null && this.iBlockedIPs.indexOf(socket.getInetAddress()
-				.getHostAddress()) != -1);
-	}
-
-	/**
-	 * Handles the incoming connection and forwards to the content handler
-	 * 
-	 * @param socket
-	 *            The socket of the connection
-	 */
-	public void handleConnection(Socket socket) {
-		InputStream is = null;
-		OutputStream os = null;
-		if (isBlockedIP(socket)) {
-			LogAndTraceBroker.getBroker().trace(
-					Level.FINEST,
-					"Incoming connection ignored from blocked IP "
-							+ socket.getInetAddress().getHostAddress());
-		} else try {
-			is = socket.getInputStream();
-			os = socket.getOutputStream();
-			do { // handle persistent connections
-				MessageReader reader = new MessageReader(is, this.iHeaderTimeout);
-				boolean persistent = reader.isPersistentConnectionSupported();
-				persistent = false;
-				boolean chunk = reader.isChunkSupported();
-
-				HttpServerMethod readerMethod = reader.getMethod();
-				if (readerMethod.getMethodName().equals("POST")
-						|| readerMethod.getMethodName().equals("M-POST")) {
-					// TODO: validate authorization
-
-					MessageWriter writer = new MessageWriter(os, persistent, chunk);
-					try {
-						StringBuilder localURL = new StringBuilder(
-								socket instanceof SSLSocket ? "https://" : "http://");
-						InetAddress localAddress = socket.getLocalAddress();
-						if (localAddress != null) {
-							localURL.append(localAddress.getHostAddress());
-							int port = socket.getLocalPort();
-							if (port > 0) {
-								localURL.append(":");
-								localURL.append(port);
-							}
-						}
-
-						// 17931
-						this.iHandler.handleContent(reader, writer, socket.getInetAddress(),
-								localURL.toString());
-						writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
-								readerMethod.getMinorVersion(), 200, "OK"));
-					} catch (HttpException e) {
-						writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
-								readerMethod.getMinorVersion(), e.getStatus(), e.getMessage()));
-					} catch (Throwable t) {
-						writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
-								readerMethod.getMinorVersion(), 501, "Not Implemented"));
-						// TODO: define the correct error description
-						writer.reset();
-						// TODO: report an specific error
-						writeError(writer.getOutputStream(), "error", "error");
-					} finally {
-						try {
-							writer.close();
-						} catch (IOException e) {
-							LogAndTraceBroker.getBroker().trace(Level.FINER,
-									"Exception while closing output stream from server socket", e);
-						}
-					}
-				} else {
-					persistent = false;
-					MessageWriter writer = new MessageWriter(os, false, false);
-					HttpHeader header = new HttpHeader();
-					writer.setHeader(header);
-					// header.addField("Connection", persistent?
-					// "Keep-Alive","close");
-					writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
-							readerMethod.getMinorVersion(), 501, "Not Implemented"));
-					writeError(writer.getOutputStream(), "", "");
-					try {
-						writer.close();
-					} catch (IOException e) {
-						LogAndTraceBroker.getBroker().trace(Level.FINER,
-								"Exception while closing output stream from server socket", e);
-					}
-				}
-
-				if (!persistent) break;
-				try {
-					reader.close();
-				} catch (IOException e) {
-					LogAndTraceBroker.getBroker().trace(Level.FINER,
-							"Exception while closing input stream from server socket", e);
-				}
-			} while (true);
-		} catch (IOException e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"Exception while reading from server socket", e);
-
-			if (e instanceof SocketTimeoutException
-					|| WBEMConstants.INDICATION_DOS_EXCEPTION_MESSAGE.equalsIgnoreCase(e
-							.getMessage())) {
-				addSuspectIP(socket.getInetAddress().getHostAddress());
-			}
-		}
-		try {
-			socket.close();
-		} catch (IOException e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"Exception while closing server socket", e);
-		}
-	}
-
-	/**
-	 * Closes the handler. Will also close the content handler.
-	 */
-	public void close() {
-		this.iHandler.close();
-	}
-
-	private void writeError(ASCIIPrintStream dos, String title, String body) {
-		dos.print("  " + title + "" + body
-				+ "");
-
-	}
-
-	/**
-	 * Get the IPs blocked by the listener associated with the specified port.
-	 * 
-	 * @return The comma-separated list of blocked IPs.
-	 */
-	public synchronized String getBlockedIPs() {
-		return (this.iBlockedIPs == null) ? null : this.iBlockedIPs.toString();
-	}
-
-	/**
-	 * Set the IPs to be blocked by the listener associated with the specified
-	 * port.
-	 * 
-	 * @param pIPs
-	 *            The comma-separated list of blocked IPs.
-	 */
-	public synchronized void setBlockedIPs(String pIPs) {
-		this.iBlockedIPs = (pIPs == null || pIPs.trim().length() == 0) ? null : new StringBuilder(
-				pIPs);
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 17931      2005-07-28  thschaef     Add InetAddress to CIM Event
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 1649779    2007-02-01  lupusalex    Indication listener threads freeze
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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
+ * 3185818    2011-02-18  blaschke-oss indicationOccured URL incorrect
+ * 3495662    2012-02-29  blaschke-oss Invalid HTML from HttpConnectionHandler.writeError
+ *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
+ *    2657    2013-08-20  blaschke-oss Potential null pointer exception in handleConnection
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+
+import javax.net.ssl.SSLSocket;
+
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
+
+/**
+ * Class HttpConnectionHandler is responsible for handling an incoming
+ * connection
+ * 
+ */
+public class HttpConnectionHandler {
+
+	/**
+	 * MAJOR_VERSION
+	 */
+	public static final int MAJOR_VERSION = 1;
+
+	/**
+	 * MINOR_VERSION
+	 */
+	public static final int MINOR_VERSION = 1;
+
+	HttpContentHandler iHandler;
+
+	private int iHeaderTimeout;
+
+	private int iMaxAllowedTimeouts;
+
+	private Map iSuspectIPs = new HashMap();
+
+	private StringBuilder iBlockedIPs = null;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHandler
+	 *            The content handler
+	 * @param pProperties
+	 *            The configuration properties
+	 */
+	public HttpConnectionHandler(HttpContentHandler pHandler, WBEMConfiguration pProperties) {
+		this.iHandler = pHandler;
+		this.iHeaderTimeout = pProperties.getListenerHttpHeaderTimeout();
+		this.iMaxAllowedTimeouts = pProperties.getListenerMaxAllowedTimeouts();
+	}
+
+	private synchronized void addSuspectIP(String pSuspectIP) {
+		if (this.iMaxAllowedTimeouts == 0) return;
+
+		Integer times = this.iSuspectIPs.get(pSuspectIP);
+		if (times == null) {
+			this.iSuspectIPs.put(pSuspectIP, Integer.valueOf(1));
+		} else {
+			int timesVal = times.intValue() + 1;
+			this.iSuspectIPs.put(pSuspectIP, Integer.valueOf(timesVal));
+			if (timesVal >= this.iMaxAllowedTimeouts) {
+				boolean newIP = false;
+				if (this.iBlockedIPs == null) {
+					this.iBlockedIPs = new StringBuilder(pSuspectIP);
+					newIP = true;
+				} else if (this.iBlockedIPs.indexOf(pSuspectIP) == -1) {
+					this.iBlockedIPs.append(',');
+					this.iBlockedIPs.append(pSuspectIP);
+					newIP = true;
+				}
+				if (newIP) LogAndTraceBroker.getBroker().trace(
+						Level.WARNING,
+						"Maximum allowable timeouts exceeded, all future connections ignored from "
+								+ pSuspectIP);
+			}
+		}
+	}
+
+	private synchronized boolean isBlockedIP(Socket socket) {
+		return (this.iBlockedIPs != null && this.iBlockedIPs.indexOf(socket.getInetAddress()
+				.getHostAddress()) != -1);
+	}
+
+	/**
+	 * Handles the incoming connection and forwards to the content handler
+	 * 
+	 * @param socket
+	 *            The socket of the connection
+	 */
+	public void handleConnection(Socket socket) {
+		InputStream is = null;
+		OutputStream os = null;
+		if (isBlockedIP(socket)) {
+			LogAndTraceBroker.getBroker().trace(
+					Level.FINEST,
+					"Incoming connection ignored from blocked IP "
+							+ socket.getInetAddress().getHostAddress());
+		} else try {
+			is = socket.getInputStream();
+			os = socket.getOutputStream();
+			do { // handle persistent connections
+				MessageReader reader = new MessageReader(is, this.iHeaderTimeout);
+				boolean persistent = reader.isPersistentConnectionSupported();
+				persistent = false;
+				boolean chunk = reader.isChunkSupported();
+
+				HttpServerMethod readerMethod = reader.getMethod();
+				if (readerMethod.getMethodName().equals("POST")
+						|| readerMethod.getMethodName().equals("M-POST")) {
+					// TODO: validate authorization
+
+					MessageWriter writer = new MessageWriter(os, persistent, chunk);
+					try {
+						StringBuilder localURL = new StringBuilder(
+								socket instanceof SSLSocket ? "https://" : "http://");
+						InetAddress localAddress = socket.getLocalAddress();
+						if (localAddress != null) {
+							localURL.append(localAddress.getHostAddress());
+							int port = socket.getLocalPort();
+							if (port > 0) {
+								localURL.append(":");
+								localURL.append(port);
+							}
+						}
+
+						// 17931
+						this.iHandler.handleContent(reader, writer, socket.getInetAddress(),
+								localURL.toString());
+						writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
+								readerMethod.getMinorVersion(), 200, "OK"));
+					} catch (HttpException e) {
+						writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
+								readerMethod.getMinorVersion(), e.getStatus(), e.getMessage()));
+					} catch (Throwable t) {
+						writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
+								readerMethod.getMinorVersion(), 501, "Not Implemented"));
+						// TODO: define the correct error description
+						writer.reset();
+						// TODO: report an specific error
+						writeError(writer.getOutputStream(), "error", "error");
+					} finally {
+						try {
+							writer.close();
+						} catch (IOException e) {
+							LogAndTraceBroker.getBroker().trace(Level.FINER,
+									"Exception while closing output stream from server socket", e);
+						}
+					}
+				} else {
+					persistent = false;
+					MessageWriter writer = new MessageWriter(os, false, false);
+					HttpHeader header = new HttpHeader();
+					writer.setHeader(header);
+					// header.addField("Connection", persistent?
+					// "Keep-Alive","close");
+					writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
+							readerMethod.getMinorVersion(), 501, "Not Implemented"));
+					writeError(writer.getOutputStream(), "", "");
+					try {
+						writer.close();
+					} catch (IOException e) {
+						LogAndTraceBroker.getBroker().trace(Level.FINER,
+								"Exception while closing output stream from server socket", e);
+					}
+				}
+
+				if (!persistent) break;
+				try {
+					reader.close();
+				} catch (IOException e) {
+					LogAndTraceBroker.getBroker().trace(Level.FINER,
+							"Exception while closing input stream from server socket", e);
+				}
+			} while (true);
+		} catch (IOException e) {
+			LogAndTraceBroker.getBroker().trace(Level.FINER,
+					"Exception while reading from server socket", e);
+
+			if (e instanceof SocketTimeoutException
+					|| WBEMConstants.INDICATION_DOS_EXCEPTION_MESSAGE.equalsIgnoreCase(e
+							.getMessage())) {
+				addSuspectIP(socket.getInetAddress().getHostAddress());
+			}
+		}
+		try {
+			socket.close();
+		} catch (IOException e) {
+			LogAndTraceBroker.getBroker().trace(Level.FINER,
+					"Exception while closing server socket", e);
+		}
+	}
+
+	/**
+	 * Closes the handler. Will also close the content handler.
+	 */
+	public void close() {
+		this.iHandler.close();
+	}
+
+	private void writeError(ASCIIPrintStream dos, String title, String body) {
+		dos.print("  " + title + "" + body
+				+ "");
+
+	}
+
+	/**
+	 * Get the IPs blocked by the listener associated with the specified port.
+	 * 
+	 * @return The comma-separated list of blocked IPs.
+	 */
+	public synchronized String getBlockedIPs() {
+		return (this.iBlockedIPs == null) ? null : this.iBlockedIPs.toString();
+	}
+
+	/**
+	 * Set the IPs to be blocked by the listener associated with the specified
+	 * port.
+	 * 
+	 * @param pIPs
+	 *            The comma-separated list of blocked IPs.
+	 */
+	public synchronized void setBlockedIPs(String pIPs) {
+		this.iBlockedIPs = (pIPs == null || pIPs.trim().length() == 0) ? null : new StringBuilder(
+				pIPs);
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpContentHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpContentHandler.java
similarity index 71%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpContentHandler.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpContentHandler.java
index 561e0d6..3a9d6e8 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpContentHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpContentHandler.java
@@ -1,80 +1,78 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2011
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 17931      2005-07-28  thschaef     Add InetAddress to CIM Event
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3185818    2011-02-18  blaschke-oss indicationOccured URL incorrect
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.net.InetAddress;
-
-/**
- * Class HttpContentHandler is responsible for handling the content of an http
- * connection.
- * 
- */
-public abstract class HttpContentHandler {
-
-	/**
-	 * Handles the content of a given connection
-	 * 
-	 * @param pMessageReader
-	 *            The reader of the connection
-	 * @param pMessageWriter
-	 *            The writer of the connection
-	 * @param pInetAddress
-	 *            The remote network address
-	 * @param pLocalAddress
-	 *            The local network address
-	 * @throws HttpException
-	 * @throws IOException
-	 */
-	public abstract void handleContent(MessageReader pMessageReader, MessageWriter pMessageWriter,
-			InetAddress pInetAddress, String pLocalAddress) throws HttpException, IOException;
-
-	/**
-	 * Closes the handler
-	 */
-	public abstract void close();
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2011
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 17931      2005-07-28  thschaef     Add InetAddress to CIM Event
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3185818    2011-02-18  blaschke-oss indicationOccured URL incorrect
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.net.InetAddress;
+
+/**
+ * Class HttpContentHandler is responsible for handling the content of an http
+ * connection.
+ * 
+ */
+public abstract class HttpContentHandler {
+
+	/**
+	 * Handles the content of a given connection
+	 * 
+	 * @param pMessageReader
+	 *            The reader of the connection
+	 * @param pMessageWriter
+	 *            The writer of the connection
+	 * @param pInetAddress
+	 *            The remote network address
+	 * @param pLocalAddress
+	 *            The local network address
+	 * @throws HttpException
+	 * @throws IOException
+	 */
+	public abstract void handleContent(MessageReader pMessageReader, MessageWriter pMessageWriter,
+			InetAddress pInetAddress, String pLocalAddress) throws HttpException, IOException;
+
+	/**
+	 * Closes the handler
+	 */
+	public abstract void close();
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpException.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpException.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpException.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpException.java
index 65bb6c1..1021a10 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpException.java
@@ -1,117 +1,115 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-
-/**
- * Class HttpException represents HTTP related problems
- * 
- */
-public class HttpException extends IOException {
-
-	private static final long serialVersionUID = 934925248736106630L;
-
-	int iStatus;
-
-	/**
-	 * Ctor. Equivalent to HttpException(-1, null, null)
-	 */
-	public HttpException() {
-		this(-1, null, null);
-	}
-
-	/**
-	 * Ctor. Equivalent to HttpException(-1, reason, null)
-	 * 
-	 * @param reason
-	 *            The reason
-	 */
-	public HttpException(String reason) {
-		this(-1, reason, null);
-	}
-
-	/**
-	 * Ctor. Equivalent to HttpException(-1, reason, null)
-	 * 
-	 * @param status
-	 *            The status
-	 * @param reason
-	 *            The reason
-	 */
-	public HttpException(int status, String reason) {
-		this(status, reason, null);
-	}
-
-	/**
-	 * Ctor. Equivalent to HttpException(-1, reason, null)
-	 * 
-	 * @param status
-	 *            The status
-	 * @param reason
-	 *            The reason
-	 * @param cimError
-	 *            The CIM error
-	 */
-	public HttpException(int status, String reason, String cimError) {
-		super(reason);
-		this.iStatus = status;
-	}
-
-	/**
-	 * Returns the status
-	 * 
-	 * @return The status
-	 */
-	public int getStatus() {
-		return this.iStatus;
-	}
-
-	@Override
-	public String toString() {
-		return super.toString() + "(status:" + this.iStatus + ")";
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+
+/**
+ * Class HttpException represents HTTP related problems
+ * 
+ */
+public class HttpException extends IOException {
+
+	private static final long serialVersionUID = 934925248736106630L;
+
+	int iStatus;
+
+	/**
+	 * Ctor. Equivalent to HttpException(-1, null, null)
+	 */
+	public HttpException() {
+		this(-1, null, null);
+	}
+
+	/**
+	 * Ctor. Equivalent to HttpException(-1, reason, null)
+	 * 
+	 * @param reason
+	 *            The reason
+	 */
+	public HttpException(String reason) {
+		this(-1, reason, null);
+	}
+
+	/**
+	 * Ctor. Equivalent to HttpException(-1, reason, null)
+	 * 
+	 * @param status
+	 *            The status
+	 * @param reason
+	 *            The reason
+	 */
+	public HttpException(int status, String reason) {
+		this(status, reason, null);
+	}
+
+	/**
+	 * Ctor. Equivalent to HttpException(-1, reason, null)
+	 * 
+	 * @param status
+	 *            The status
+	 * @param reason
+	 *            The reason
+	 * @param cimError
+	 *            The CIM error
+	 */
+	public HttpException(int status, String reason, String cimError) {
+		super(reason);
+		this.iStatus = status;
+	}
+
+	/**
+	 * Returns the status
+	 * 
+	 * @return The status
+	 */
+	public int getStatus() {
+		return this.iStatus;
+	}
+
+	@Override
+	public String toString() {
+		return super.toString() + "(status:" + this.iStatus + ")";
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpHeader.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeader.java
similarity index 89%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpHeader.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeader.java
index 123e5fd..493d56d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpHeader.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeader.java
@@ -1,538 +1,535 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag     Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 17970    2005-08-11  pineiro5     Logon from z/OS not possible
- * 1353138  2005-11-24  fiuczy       CIMObject element in HTTP header wrong encoded
- * 1535756  2006-08-07  lupusalex    Make code warning free
- * 1516242  2006-11-27  lupusalex    Support of OpenPegasus local authentication
- * 1565892  2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 1688273  2007-04-19  lupusalex    Full support of HTTP trailers
- * 1715612  2007-05-09  lupusalex    FVT: Status 0 in trailer is parsed as error
- * 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)
- * 2641758  2009-02-27  blaschke-oss CIM Client does not recognize HTTP extension headers
- * 3304058  2011-05-20  blaschke-oss Use same date format in change history
- * 3553858  2012-08-06  blaschke-oss Append duplicate HTTP header fields instead of replace
- * 3601894  2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
- *    2635  2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
- *    2718  2013-11-29  blaschke-oss Bad CIMStatusCode generates NumberFormatException
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.BitSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.TrailerException;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.Messages;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConstants;
-
-/**
- * Class HttpHeader represents a http header block
- * 
- */
-public class HttpHeader {
-
-	private static BitSet cDontNeedEncoding;
-
-	private static final String HEX_STR = "0123456789ABCDEF";
-
-	private static String cDfltEncName = null;
-
-	static {
-		cDontNeedEncoding = new BitSet(256);
-		int i;
-		for (i = 'a'; i <= 'z'; i++) {
-			cDontNeedEncoding.set(i);
-		}
-		for (i = 'A'; i <= 'Z'; i++) {
-			cDontNeedEncoding.set(i);
-		}
-		for (i = '0'; i <= '9'; i++) {
-			cDontNeedEncoding.set(i);
-		}
-		cDontNeedEncoding.set(' ');
-		cDontNeedEncoding.set('-');
-		cDontNeedEncoding.set('_');
-		cDontNeedEncoding.set('/');
-		cDontNeedEncoding.set('.');
-		cDontNeedEncoding.set('*');
-
-	}
-
-	private Hashtable iFields = new Hashtable();
-
-	/**
-	 * Ctor.
-	 */
-	public HttpHeader() {
-	// empty
-	}
-
-	/**
-	 * Ctor. Parses the header from an input stream
-	 * 
-	 * @param pReader
-	 *            The input stream
-	 * @throws IOException
-	 */
-	public HttpHeader(InputStream pReader) throws IOException {
-		this(pReader, 0);
-	}
-
-	/**
-	 * Ctor. Parses the header from an input stream
-	 * 
-	 * @param pReader
-	 *            The input stream
-	 * @param pTimeout
-	 *            Maximum allowable time to read header
-	 * @throws IOException
-	 */
-	public HttpHeader(InputStream pReader, long pTimeout) throws IOException {
-		String line = null;
-		long timeStart = System.currentTimeMillis();
-		// TODO: this needs to be optimized!!!
-		while (((line = HttpMethod.readLine(pReader)) != null) && (line.length() > 0)) {
-			// get the header
-			if (pTimeout > 0 && (System.currentTimeMillis() - timeStart > pTimeout)) { throw new IOException(
-					WBEMConstants.INDICATION_DOS_EXCEPTION_MESSAGE); }
-			try {
-				int separator;
-				if ((separator = line.indexOf(':')) > -1) {
-					String header;
-					String value;
-					int headerStartIndex = 0;
-
-					// Ignore prefix-match from HTTP extension (RFC 2774), it'll
-					// look like "nn-"
-					if (line.indexOf('-') == 2 && Character.isDigit(line.charAt(0))
-							&& Character.isDigit(line.charAt(1))) {
-						headerStartIndex = 3;
-					}
-
-					header = line.substring(headerStartIndex, separator);
-					value = line.substring(separator + 1);
-					// TODO validate header and value, they must not be empty
-					// entries
-					if (value.length() > 0 && value.startsWith(" ")) addParsedField(header, value
-							.substring(1));
-					else addParsedField(header, value);
-				} else {
-					LogAndTraceBroker.getBroker().message(Messages.HTTP_INVALID_HEADER, line);
-				}
-			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINER,
-						"Exception while parsing http header", e);
-				LogAndTraceBroker.getBroker().message(Messages.HTTP_INVALID_HEADER, line);
-			}
-		}
-		return;
-	}
-
-	/**
-	 * Adds a header field for client output (this means duplicate header
-	 * entries are replaced)
-	 * 
-	 * @param pName
-	 *            The name of the header field
-	 * @param pValue
-	 *            The value
-	 */
-	public void addField(String pName, String pValue) {
-		if (pName == null || pName.length() == 0) return;
-
-		if (pValue != null) {
-			this.iFields.put(new HeaderEntry(pName), pValue);
-		} else {
-			this.iFields.remove(new HeaderEntry(pName));
-		}
-	}
-
-	/**
-	 * Adds a header field from parsed server input (this means duplicate header
-	 * entries are appended in comma-separated list as defined by RFC 2616)
-	 * 
-	 * @param pName
-	 *            The name of the header field
-	 * @param pValue
-	 *            The value
-	 */
-	public void addParsedField(String pName, String pValue) {
-		if (pName == null || pName.length() == 0) return;
-
-		if (pValue != null) {
-			String oldValue = this.iFields.put(new HeaderEntry(pName), pValue);
-			if (oldValue != null) {
-				// Field already exists, so append value to existing value; it
-				// is done checking put() return code, instead of checking get()
-				// return code prior to put(), because typical user case does
-				// not include duplicate fields
-				StringBuilder combinedValue = new StringBuilder(oldValue);
-				combinedValue.append(',');
-				combinedValue.append(pValue);
-				this.iFields.put(new HeaderEntry(pName), combinedValue.toString());
-			}
-		} else {
-			this.iFields.remove(new HeaderEntry(pName));
-		}
-	}
-
-	/**
-	 * Clears all header fields
-	 */
-	public void clear() {
-		this.iFields.clear();
-	}
-
-	/**
-	 * Return an iterator over the header fields
-	 * 
-	 * @return The iterator
-	 */
-	public Iterator> iterator() {
-		return this.iFields.entrySet().iterator();
-	}
-
-	/**
-	 * Parses a line from a header block
-	 * 
-	 * @param pLine
-	 *            The line
-	 * @return The http header
-	 */
-	public static HttpHeader parse(String pLine) {
-		int prev = 0;
-		int next = 0;
-		HttpHeader header = new HttpHeader();
-		if (pLine != null && pLine.length() > 0) {
-			next = pLine.indexOf(',');
-			while (next > -1) {
-				String hdr = pLine.substring(prev, next);
-				int separator = hdr.indexOf('=');
-				if (separator > -1) {
-					String key;
-					String value;
-					key = hdr.substring(0, separator);
-					value = hdr.substring(separator + 1);
-
-					header.addParsedField(key, value);
-				} else {
-					// something goes wrong. no separator found
-				}
-				prev = next + 1;
-				while (Character.isSpaceChar(pLine.charAt(prev)))
-					prev++;
-				next = pLine.indexOf(',', prev);
-			}
-			String hdr = pLine.substring(prev);
-			int separator = hdr.indexOf('=');
-			if (separator > -1) {
-				header.addParsedField(hdr.substring(0, separator), hdr.substring(separator + 1));
-			}
-		}
-
-		return header;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer buf = new StringBuffer();
-		int i = 0;
-		Iterator> iterator = this.iFields.entrySet().iterator();
-		while (iterator.hasNext()) {
-			if (i++ > 0) buf.append(',');
-			Entry entry = iterator.next();
-			buf.append(entry.getKey().toString());
-			buf.append(": ");
-			buf.append(entry.getValue().toString());
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * Removes a field from the header
-	 * 
-	 * @param pName
-	 *            The name of the field
-	 */
-	public void removeField(String pName) {
-		this.iFields.remove(new HeaderEntry(pName));
-	}
-
-	/**
-	 * Returns a field from the header
-	 * 
-	 * @param pName
-	 *            The name of the field
-	 * @return The value
-	 */
-	public String getField(String pName) {
-		return this.iFields.get(new HeaderEntry(pName));
-	}
-
-	/**
-	 * Writes a header block to a stream
-	 * 
-	 * @param pWriter
-	 *            The stream
-	 */
-	public void write(ASCIIPrintStream pWriter) {
-
-		Iterator> iterator = this.iFields.entrySet().iterator();
-		while (iterator.hasNext()) {
-			Entry entry = iterator.next();
-			pWriter.print(entry.getKey().toString());
-			pWriter.print(": ");
-			pWriter.print(entry.getValue().toString());
-			pWriter.print("\r\n");
-		}
-		pWriter.print("\r\n");
-	}
-
-	/**
-	 * Encodes raw data
-	 * 
-	 * @param pData
-	 *            The raw data
-	 * @return The encoded data
-	 */
-	public static synchronized String encode(byte[] pData) {
-		String str = null;
-		try {
-			if (cDfltEncName == null) cDfltEncName = (String) AccessController
-					.doPrivileged(new GetProperty("file.encoding"));
-			str = encode(pData, cDfltEncName);
-		} catch (UnsupportedEncodingException e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"Exception while encoding http header data", e);
-		}
-		return str;
-	}
-
-	/**
-	 * Encodes raw data for a given character set
-	 * 
-	 * @param pData
-	 *            The raw data
-	 * @param pEnc
-	 *            The character set
-	 * @return The encoded data
-	 * @throws UnsupportedEncodingException
-	 */
-	public static String encode(byte[] pData, String pEnc) throws UnsupportedEncodingException {
-
-		int maxBytesPerChar = 10;
-		// BufferedWriter validates encoding
-		ByteArrayOutputStream buf = new ByteArrayOutputStream(maxBytesPerChar);
-		new BufferedWriter(new OutputStreamWriter(buf, pEnc));
-		StringBuffer out = new StringBuffer(pData.length);
-
-		for (int i = 0; i < pData.length; i++) {
-			int c = pData[i] & 0xFF;
-			if (cDontNeedEncoding.get(c)) {
-				if (c == ' ') {
-					out.append("%20");
-				} else {
-					out.append((char) c);
-				}
-			} else {
-				out.append('%');
-				out.append(HEX_STR.charAt((c >> 4) & 0x0f));
-				out.append(HEX_STR.charAt(c & 0x0f));
-			}
-		}
-
-		return out.toString();
-	}
-
-	/**
-	 * Encodes a given string for a given character set
-	 * 
-	 * @param pData
-	 *            The source string
-	 * @param pSourceEnc
-	 *            The source character set
-	 * @param pTargetEnc
-	 *            The target character set
-	 * @return The encoded string
-	 * @throws UnsupportedEncodingException
-	 */
-	public static String encode(String pData, String pSourceEnc, String pTargetEnc)
-			throws UnsupportedEncodingException {
-
-		return encode(pData.getBytes(pSourceEnc), pTargetEnc);
-	}
-
-	/**
-	 * Class HeaderEntry represents a single header field
-	 * 
-	 */
-	public static class HeaderEntry {
-
-		String iHeader;
-
-		int iHashcode;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pName
-		 *            The name of the header field
-		 */
-		public HeaderEntry(String pName) {
-			this.iHeader = pName;
-			this.iHashcode = pName.toUpperCase().hashCode();
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-			if (obj == null || !(obj instanceof HeaderEntry)) return false;
-			return this.iHeader.equalsIgnoreCase(((HeaderEntry) obj).iHeader);
-		}
-
-		@Override
-		public String toString() {
-			return this.iHeader;
-		}
-
-		@Override
-		public int hashCode() {
-			return this.iHashcode;
-		}
-	}
-
-	/**
-	 * Class GetProperty implements privileged access to system properties
-	 * 
-	 */
-	private static class GetProperty implements PrivilegedAction {
-
-		String iPropertyName;
-
-		GetProperty(String propertyName) {
-			this.iPropertyName = propertyName;
-		}
-
-		public Object run() {
-			return System.getProperty(this.iPropertyName);
-		}
-	}
-
-	/**
-	 * Throws a TrailerException if it contains recognized CIM errors in http
-	 * trailer entries.
-	 * 
-	 * @throws TrailerException
-	 */
-	public void examineTrailer() throws TrailerException {
-		examineTrailer(null);
-	}
-
-	/**
-	 * Throws a TrailerException if it contains recognized CIM errors in http
-	 * trailer entries.
-	 * 
-	 * @param pOrigin
-	 *            The origin of the trailer (response, request, etc.)
-	 * @throws TrailerException
-	 */
-	public void examineTrailer(String pOrigin) throws TrailerException {
-		Iterator> itr = this.iterator();
-		int code = 0, i = 0;
-		String desc = null;
-		StringBuilder hdrs = null;
-		if (LogAndTraceBroker.getBroker().isLoggableTrace(Level.FINER)) hdrs = new StringBuilder();
-		while (itr.hasNext()) {
-			Entry ent = itr.next();
-			String keyStr = ent.getKey().toString();
-			if (hdrs != null) {
-				if (i++ > 0) hdrs.append(',');
-				hdrs.append(keyStr);
-				hdrs.append(": ");
-				hdrs.append(this.getField(keyStr));
-			}
-			try {
-				if (keyStr.equalsIgnoreCase(WBEMConstants.HTTP_TRAILER_STATUS_CODE)) {
-					String valStr = URLDecoder.decode(this.getField(keyStr), WBEMConstants.UTF8);
-					try {
-						code = Integer.parseInt(valStr);
-					} catch (NumberFormatException e) {
-						String msg = new String(WBEMConstants.HTTP_TRAILER_STATUS_CODE + " \""
-								+ valStr + "\" invalid, setting to CIM_ERR_FAILED");
-						LogAndTraceBroker.getBroker().trace(Level.FINER, msg, e);
-						code = WBEMException.CIM_ERR_FAILED;
-						if (desc == null) desc = msg;
-					}
-				} else if (keyStr.equalsIgnoreCase(WBEMConstants.HTTP_TRAILER_STATUS_DESCRIPTION)) {
-					desc = URLDecoder.decode(this.getField(keyStr), WBEMConstants.UTF8);
-				}
-			} catch (UnsupportedEncodingException e) {
-				// if UTF-8 isn't supported we're in real trouble
-				throw new Error(e);
-			}
-		}
-		if (hdrs != null && hdrs.length() > 0) LogAndTraceBroker.getBroker().trace(
-				Level.FINER,
-				(pOrigin == null ? "Unknown" : pOrigin) + " HTTP Trailer Headers= "
-						+ hdrs.toString());
-		if (code > 0) {
-			if (desc != null) { throw new TrailerException(new WBEMException(code, desc)); }
-			throw new TrailerException(new WBEMException(code));
-		}
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag     Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 17970    2005-08-11  pineiro5     Logon from z/OS not possible
+ * 1353138  2005-11-24  fiuczy       CIMObject element in HTTP header wrong encoded
+ * 1535756  2006-08-07  lupusalex    Make code warning free
+ * 1516242  2006-11-27  lupusalex    Support of OpenPegasus local authentication
+ * 1565892  2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 1688273  2007-04-19  lupusalex    Full support of HTTP trailers
+ * 1715612  2007-05-09  lupusalex    FVT: Status 0 in trailer is parsed as error
+ * 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)
+ * 2641758  2009-02-27  blaschke-oss CIM Client does not recognize HTTP extension headers
+ * 3304058  2011-05-20  blaschke-oss Use same date format in change history
+ * 3553858  2012-08-06  blaschke-oss Append duplicate HTTP header fields instead of replace
+ * 3601894  2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
+ *    2635  2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
+ *    2718  2013-11-29  blaschke-oss Bad CIMStatusCode generates NumberFormatException
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.BufferedWriter;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.BitSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.TrailerException;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
+
+/**
+ * Class HttpHeader represents a http header block
+ * 
+ */
+public class HttpHeader {
+
+	private static BitSet cDontNeedEncoding;
+
+	private static final String HEX_STR = "0123456789ABCDEF";
+
+	private static String cDfltEncName = null;
+
+	static {
+		cDontNeedEncoding = new BitSet(256);
+		int i;
+		for (i = 'a'; i <= 'z'; i++) {
+			cDontNeedEncoding.set(i);
+		}
+		for (i = 'A'; i <= 'Z'; i++) {
+			cDontNeedEncoding.set(i);
+		}
+		for (i = '0'; i <= '9'; i++) {
+			cDontNeedEncoding.set(i);
+		}
+		cDontNeedEncoding.set(' ');
+		cDontNeedEncoding.set('-');
+		cDontNeedEncoding.set('_');
+		cDontNeedEncoding.set('/');
+		cDontNeedEncoding.set('.');
+		cDontNeedEncoding.set('*');
+
+	}
+
+	private Hashtable iFields = new Hashtable();
+
+	/**
+	 * Ctor.
+	 */
+	public HttpHeader() {
+	// empty
+	}
+
+	/**
+	 * Ctor. Parses the header from an input stream
+	 * 
+	 * @param pReader
+	 *            The input stream
+	 * @throws IOException
+	 */
+	public HttpHeader(InputStream pReader) throws IOException {
+		this(pReader, 0);
+	}
+
+	/**
+	 * Ctor. Parses the header from an input stream
+	 * 
+	 * @param pReader
+	 *            The input stream
+	 * @param pTimeout
+	 *            Maximum allowable time to read header
+	 * @throws IOException
+	 */
+	public HttpHeader(InputStream pReader, long pTimeout) throws IOException {
+		String line = null;
+		long timeStart = System.currentTimeMillis();
+		// TODO: this needs to be optimized!!!
+		while (((line = HttpMethod.readLine(pReader)) != null) && (line.length() > 0)) {
+			// get the header
+			if (pTimeout > 0 && (System.currentTimeMillis() - timeStart > pTimeout)) { throw new IOException(
+					WBEMConstants.INDICATION_DOS_EXCEPTION_MESSAGE); }
+			try {
+				int separator;
+				if ((separator = line.indexOf(':')) > -1) {
+					String header;
+					String value;
+					int headerStartIndex = 0;
+
+					// Ignore prefix-match from HTTP extension (RFC 2774), it'll
+					// look like "nn-"
+					if (line.indexOf('-') == 2 && Character.isDigit(line.charAt(0))
+							&& Character.isDigit(line.charAt(1))) {
+						headerStartIndex = 3;
+					}
+
+					header = line.substring(headerStartIndex, separator);
+					value = line.substring(separator + 1);
+					// TODO validate header and value, they must not be empty
+					// entries
+					if (value.length() > 0 && value.startsWith(" ")) addParsedField(header, value
+							.substring(1));
+					else addParsedField(header, value);
+				} else {
+					LogAndTraceBroker.getBroker().message(Messages.HTTP_INVALID_HEADER, line);
+				}
+			} catch (Exception e) {
+				LogAndTraceBroker.getBroker().trace(Level.FINER,
+						"Exception while parsing http header", e);
+				LogAndTraceBroker.getBroker().message(Messages.HTTP_INVALID_HEADER, line);
+			}
+		}
+		return;
+	}
+
+	/**
+	 * Adds a header field for client output (this means duplicate header
+	 * entries are replaced)
+	 * 
+	 * @param pName
+	 *            The name of the header field
+	 * @param pValue
+	 *            The value
+	 */
+	public void addField(String pName, String pValue) {
+		if (pName == null || pName.length() == 0) return;
+
+		if (pValue != null) {
+			this.iFields.put(new HeaderEntry(pName), pValue);
+		} else {
+			this.iFields.remove(new HeaderEntry(pName));
+		}
+	}
+
+	/**
+	 * Adds a header field from parsed server input (this means duplicate header
+	 * entries are appended in comma-separated list as defined by RFC 2616)
+	 * 
+	 * @param pName
+	 *            The name of the header field
+	 * @param pValue
+	 *            The value
+	 */
+	public void addParsedField(String pName, String pValue) {
+		if (pName == null || pName.length() == 0) return;
+
+		if (pValue != null) {
+			String oldValue = this.iFields.put(new HeaderEntry(pName), pValue);
+			if (oldValue != null) {
+				// Field already exists, so append value to existing value; it
+				// is done checking put() return code, instead of checking get()
+				// return code prior to put(), because typical user case does
+				// not include duplicate fields
+				StringBuilder combinedValue = new StringBuilder(oldValue);
+				combinedValue.append(',');
+				combinedValue.append(pValue);
+				this.iFields.put(new HeaderEntry(pName), combinedValue.toString());
+			}
+		} else {
+			this.iFields.remove(new HeaderEntry(pName));
+		}
+	}
+
+	/**
+	 * Clears all header fields
+	 */
+	public void clear() {
+		this.iFields.clear();
+	}
+
+	/**
+	 * Return an iterator over the header fields
+	 * 
+	 * @return The iterator
+	 */
+	public Iterator> iterator() {
+		return this.iFields.entrySet().iterator();
+	}
+
+	/**
+	 * Parses a line from a header block
+	 * 
+	 * @param pLine
+	 *            The line
+	 * @return The http header
+	 */
+	public static HttpHeader parse(String pLine) {
+		int prev = 0;
+		int next = 0;
+		HttpHeader header = new HttpHeader();
+		if (pLine != null && pLine.length() > 0) {
+			next = pLine.indexOf(',');
+			while (next > -1) {
+				String hdr = pLine.substring(prev, next);
+				int separator = hdr.indexOf('=');
+				if (separator > -1) {
+					String key;
+					String value;
+					key = hdr.substring(0, separator);
+					value = hdr.substring(separator + 1);
+
+					header.addParsedField(key, value);
+				} else {
+					// something goes wrong. no separator found
+				}
+				prev = next + 1;
+				while (Character.isSpaceChar(pLine.charAt(prev)))
+					prev++;
+				next = pLine.indexOf(',', prev);
+			}
+			String hdr = pLine.substring(prev);
+			int separator = hdr.indexOf('=');
+			if (separator > -1) {
+				header.addParsedField(hdr.substring(0, separator), hdr.substring(separator + 1));
+			}
+		}
+
+		return header;
+	}
+
+	@Override
+	public String toString() {
+		StringBuffer buf = new StringBuffer();
+		int i = 0;
+		Iterator> iterator = this.iFields.entrySet().iterator();
+		while (iterator.hasNext()) {
+			if (i++ > 0) buf.append(',');
+			Entry entry = iterator.next();
+			buf.append(entry.getKey().toString());
+			buf.append(": ");
+			buf.append(entry.getValue().toString());
+		}
+		return buf.toString();
+	}
+
+	/**
+	 * Removes a field from the header
+	 * 
+	 * @param pName
+	 *            The name of the field
+	 */
+	public void removeField(String pName) {
+		this.iFields.remove(new HeaderEntry(pName));
+	}
+
+	/**
+	 * Returns a field from the header
+	 * 
+	 * @param pName
+	 *            The name of the field
+	 * @return The value
+	 */
+	public String getField(String pName) {
+		return this.iFields.get(new HeaderEntry(pName));
+	}
+
+	/**
+	 * Writes a header block to a stream
+	 * 
+	 * @param pWriter
+	 *            The stream
+	 */
+	public void write(ASCIIPrintStream pWriter) {
+
+		Iterator> iterator = this.iFields.entrySet().iterator();
+		while (iterator.hasNext()) {
+			Entry entry = iterator.next();
+			pWriter.print(entry.getKey().toString());
+			pWriter.print(": ");
+			pWriter.print(entry.getValue().toString());
+			pWriter.print("\r\n");
+		}
+		pWriter.print("\r\n");
+	}
+
+	/**
+	 * Encodes raw data
+	 * 
+	 * @param pData
+	 *            The raw data
+	 * @return The encoded data
+	 */
+	public static synchronized String encode(byte[] pData) {
+		String str = null;
+		try {
+			if (cDfltEncName == null) cDfltEncName = (String) AccessController
+					.doPrivileged(new GetProperty("file.encoding"));
+			str = encode(pData, cDfltEncName);
+		} catch (UnsupportedEncodingException e) {
+			LogAndTraceBroker.getBroker().trace(Level.FINER,
+					"Exception while encoding http header data", e);
+		}
+		return str;
+	}
+
+	/**
+	 * Encodes raw data for a given character set
+	 * 
+	 * @param pData
+	 *            The raw data
+	 * @param pEnc
+	 *            The character set
+	 * @return The encoded data
+	 * @throws UnsupportedEncodingException
+	 */
+	public static String encode(byte[] pData, String pEnc) throws UnsupportedEncodingException {
+
+		int maxBytesPerChar = 10;
+		// BufferedWriter validates encoding
+		ByteArrayOutputStream buf = new ByteArrayOutputStream(maxBytesPerChar);
+		new BufferedWriter(new OutputStreamWriter(buf, pEnc));
+		StringBuffer out = new StringBuffer(pData.length);
+
+		for (int i = 0; i < pData.length; i++) {
+			int c = pData[i] & 0xFF;
+			if (cDontNeedEncoding.get(c)) {
+				if (c == ' ') {
+					out.append("%20");
+				} else {
+					out.append((char) c);
+				}
+			} else {
+				out.append('%');
+				out.append(HEX_STR.charAt((c >> 4) & 0x0f));
+				out.append(HEX_STR.charAt(c & 0x0f));
+			}
+		}
+
+		return out.toString();
+	}
+
+	/**
+	 * Encodes a given string for a given character set
+	 * 
+	 * @param pData
+	 *            The source string
+	 * @param pSourceEnc
+	 *            The source character set
+	 * @param pTargetEnc
+	 *            The target character set
+	 * @return The encoded string
+	 * @throws UnsupportedEncodingException
+	 */
+	public static String encode(String pData, String pSourceEnc, String pTargetEnc)
+			throws UnsupportedEncodingException {
+
+		return encode(pData.getBytes(pSourceEnc), pTargetEnc);
+	}
+
+	/**
+	 * Class HeaderEntry represents a single header field
+	 * 
+	 */
+	public static class HeaderEntry {
+
+		String iHeader;
+
+		int iHashcode;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pName
+		 *            The name of the header field
+		 */
+		public HeaderEntry(String pName) {
+			this.iHeader = pName;
+			this.iHashcode = pName.toUpperCase().hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj == null || !(obj instanceof HeaderEntry)) return false;
+			return this.iHeader.equalsIgnoreCase(((HeaderEntry) obj).iHeader);
+		}
+
+		@Override
+		public String toString() {
+			return this.iHeader;
+		}
+
+		@Override
+		public int hashCode() {
+			return this.iHashcode;
+		}
+	}
+
+	/**
+	 * Class GetProperty implements privileged access to system properties
+	 * 
+	 */
+	private static class GetProperty implements PrivilegedAction {
+
+		String iPropertyName;
+
+		GetProperty(String propertyName) {
+			this.iPropertyName = propertyName;
+		}
+
+		public Object run() {
+			return System.getProperty(this.iPropertyName);
+		}
+	}
+
+	/**
+	 * Throws a TrailerException if it contains recognized CIM errors in http
+	 * trailer entries.
+	 * 
+	 * @throws TrailerException
+	 */
+	public void examineTrailer() throws TrailerException {
+		examineTrailer(null);
+	}
+
+	/**
+	 * Throws a TrailerException if it contains recognized CIM errors in http
+	 * trailer entries.
+	 * 
+	 * @param pOrigin
+	 *            The origin of the trailer (response, request, etc.)
+	 * @throws TrailerException
+	 */
+	public void examineTrailer(String pOrigin) throws TrailerException {
+		Iterator> itr = this.iterator();
+		int code = 0, i = 0;
+		String desc = null;
+		StringBuilder hdrs = null;
+		if (LogAndTraceBroker.getBroker().isLoggableTrace(Level.FINER)) hdrs = new StringBuilder();
+		while (itr.hasNext()) {
+			Entry ent = itr.next();
+			String keyStr = ent.getKey().toString();
+			if (hdrs != null) {
+				if (i++ > 0) hdrs.append(',');
+				hdrs.append(keyStr);
+				hdrs.append(": ");
+				hdrs.append(this.getField(keyStr));
+			}
+			try {
+				if (keyStr.equalsIgnoreCase(WBEMConstants.HTTP_TRAILER_STATUS_CODE)) {
+					String valStr = URLDecoder.decode(this.getField(keyStr), WBEMConstants.UTF8);
+					try {
+						code = Integer.parseInt(valStr);
+					} catch (NumberFormatException e) {
+						String msg = new String(WBEMConstants.HTTP_TRAILER_STATUS_CODE + " \""
+								+ valStr + "\" invalid, setting to CIM_ERR_FAILED");
+						LogAndTraceBroker.getBroker().trace(Level.FINER, msg, e);
+						code = WBEMException.CIM_ERR_FAILED;
+						if (desc == null) desc = msg;
+					}
+				} else if (keyStr.equalsIgnoreCase(WBEMConstants.HTTP_TRAILER_STATUS_DESCRIPTION)) {
+					desc = URLDecoder.decode(this.getField(keyStr), WBEMConstants.UTF8);
+				}
+			} catch (UnsupportedEncodingException e) {
+				// if UTF-8 isn't supported we're in real trouble
+				throw new Error(e);
+			}
+		}
+		if (hdrs != null && hdrs.length() > 0) LogAndTraceBroker.getBroker().trace(
+				Level.FINER,
+				(pOrigin == null ? "Unknown" : pOrigin) + " HTTP Trailer Headers= "
+						+ hdrs.toString());
+		if (code > 0) {
+			if (desc != null) { throw new TrailerException(new WBEMException(code, desc)); }
+			throw new TrailerException(new WBEMException(code));
+		}
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java
similarity index 86%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java
index f4a7ffc..05cbdae 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java
@@ -1,245 +1,243 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2750520    2009-04-10  blaschke-oss Code cleanup from empty statement et al
- * 3001353    2010-05-18  blaschke-oss HttpHeaderParser ignores return value of toLowerCase()
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Vector;
-
-/**
- * Class HttpHeaderParser parses http headers
- * 
- */
-public class HttpHeaderParser {
-
-	String iRaw;
-
-	Vector iNameValuePair;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 *            The header block
-	 */
-	public HttpHeaderParser(String pHeader) {
-		this.iRaw = pHeader;
-		this.iNameValuePair = new Vector();
-		if (this.iRaw != null) {
-			this.iRaw = this.iRaw.trim();
-			char charArray[] = this.iRaw.toCharArray();
-			int startPosValue = 0;
-			int currentPos = 0;
-			boolean isName = true;
-			boolean withinQuote = false;
-			int len = charArray.length;
-			String nvp[] = new String[2];
-			do {
-				char c = charArray[currentPos];
-				if (c == '=') {
-					nvp[0] = (new String(charArray, startPosValue, currentPos - startPosValue))
-							.toLowerCase();
-					isName = false;
-					startPosValue = ++currentPos;
-				} else if (c == '"') {
-					if (withinQuote) {
-						nvp[1] = new String(charArray, startPosValue, currentPos - startPosValue);
-						this.iNameValuePair.add(nvp);
-						nvp = new String[2];
-						withinQuote = false;
-						while (++currentPos < len
-								&& (charArray[currentPos] == ' ' || charArray[currentPos] == ',' || charArray[currentPos] == ';')) {
-							// ignore spaces and preceding comma
-						}
-						isName = true;
-						startPosValue = currentPos;
-					} else {
-						withinQuote = true;
-						startPosValue = ++currentPos;
-					}
-				} else if (c == ' ' || c == ',' || c == ';') {
-					if (withinQuote) {
-						currentPos++;
-					} else {
-						if (isName) {
-							nvp[0] = (new String(charArray, startPosValue, currentPos
-									- startPosValue)).toLowerCase();
-							this.iNameValuePair.add(nvp);
-							nvp = new String[2];
-						} else {
-							nvp[1] = new String(charArray, startPosValue, currentPos
-									- startPosValue);
-							this.iNameValuePair.add(nvp);
-							nvp = new String[2];
-						}
-
-						while (++currentPos < len
-								&& (charArray[currentPos] == ' ' || charArray[currentPos] == ',' || charArray[currentPos] == ';')) {
-							// ignore spaces and preceding comma
-						}
-						isName = true;
-						startPosValue = currentPos;
-					}
-				} else {
-					currentPos++;
-				}
-			} while (currentPos < len);
-
-			if (--currentPos > startPosValue) {
-				if (!isName) {
-					if (charArray[currentPos] == '"') {
-						nvp[1] = new String(charArray, startPosValue, currentPos - startPosValue);
-						this.iNameValuePair.add(nvp);
-						nvp = new String[2];
-					} else {
-						nvp[1] = new String(charArray, startPosValue,
-								(currentPos - startPosValue) + 1);
-						this.iNameValuePair.add(nvp);
-						nvp = new String[2];
-					}
-				} else {
-					nvp[0] = (new String(charArray, startPosValue, (currentPos - startPosValue) + 1))
-							.toLowerCase();
-				}
-				this.iNameValuePair.add(nvp);
-			} else if (currentPos == startPosValue) {
-				if (!isName) {
-					if (charArray[currentPos] == '"') {
-						nvp[1] = String.valueOf(charArray[currentPos - 1]);
-						this.iNameValuePair.add(nvp);
-						nvp = new String[2];
-					} else {
-						nvp[1] = String.valueOf(charArray[currentPos]);
-						this.iNameValuePair.add(nvp);
-						nvp = new String[2];
-					}
-				} else {
-					nvp[0] = String.valueOf(charArray[currentPos]).toLowerCase();
-				}
-				this.iNameValuePair.add(nvp);
-			}
-		}
-	}
-
-	/**
-	 * Returns the header field at a given index
-	 * 
-	 * @param pIndex
-	 *            The index
-	 * @return The field name
-	 */
-	public String getField(int pIndex) {
-		if (pIndex < 0 || pIndex > this.iNameValuePair.size()) return null;
-		return this.iNameValuePair.elementAt(pIndex)[0];
-	}
-
-	/**
-	 * Returns the value of a header field at a given index
-	 * 
-	 * @param pIndex
-	 * @return The value
-	 */
-	public String getValue(int pIndex) {
-		if (pIndex < 0 || pIndex > this.iNameValuePair.size()) return null;
-		return this.iNameValuePair.elementAt(pIndex)[1];
-	}
-
-	/**
-	 * Returns the value of a header field for a given name
-	 * 
-	 * @param pName
-	 *            The name
-	 * @return The value
-	 */
-	public String getValue(String pName) {
-		return getValue(pName, null);
-	}
-
-	/**
-	 * Returns the value of a header field for a given name specifying a
-	 * default.
-	 * 
-	 * @param pName
-	 *            The name of the header field
-	 * @param pDefault
-	 *            The value returned if no field of the given name exists
-	 * @return The value
-	 */
-	public String getValue(String pName, String pDefault) {
-		if (pName == null) return pDefault;
-		pName = pName.toLowerCase();
-		for (int i = 0; i < this.iNameValuePair.size(); i++) {
-			if (this.iNameValuePair.elementAt(i)[0] == null) return pDefault;
-			if (pName.equals(this.iNameValuePair.elementAt(i)[0])) return this.iNameValuePair
-					.elementAt(i)[1];
-		}
-		return pDefault;
-	}
-
-	/**
-	 * Returns the value of a numeric header field for a given name specifying a
-	 * default.
-	 * 
-	 * @param pName
-	 *            The name of the header field
-	 * @param pDefault
-	 *            The value returned if no field of the given name exists
-	 * @return The value
-	 */
-	public int getIntValue(String pName, int pDefault) {
-		try {
-			return Integer.parseInt(getValue(pName, String.valueOf(pDefault)));
-		} catch (Exception e) {
-			return pDefault;
-		}
-	}
-
-	@Override
-	public String toString() {
-		return "raw:" + this.iRaw;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2750520    2009-04-10  blaschke-oss Code cleanup from empty statement et al
+ * 3001353    2010-05-18  blaschke-oss HttpHeaderParser ignores return value of toLowerCase()
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Vector;
+
+/**
+ * Class HttpHeaderParser parses http headers
+ * 
+ */
+public class HttpHeaderParser {
+
+	String iRaw;
+
+	Vector iNameValuePair;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 *            The header block
+	 */
+	public HttpHeaderParser(String pHeader) {
+		this.iRaw = pHeader;
+		this.iNameValuePair = new Vector();
+		if (this.iRaw != null) {
+			this.iRaw = this.iRaw.trim();
+			char charArray[] = this.iRaw.toCharArray();
+			int startPosValue = 0;
+			int currentPos = 0;
+			boolean isName = true;
+			boolean withinQuote = false;
+			int len = charArray.length;
+			String nvp[] = new String[2];
+			do {
+				char c = charArray[currentPos];
+				if (c == '=') {
+					nvp[0] = (new String(charArray, startPosValue, currentPos - startPosValue))
+							.toLowerCase();
+					isName = false;
+					startPosValue = ++currentPos;
+				} else if (c == '"') {
+					if (withinQuote) {
+						nvp[1] = new String(charArray, startPosValue, currentPos - startPosValue);
+						this.iNameValuePair.add(nvp);
+						nvp = new String[2];
+						withinQuote = false;
+						while (++currentPos < len
+								&& (charArray[currentPos] == ' ' || charArray[currentPos] == ',' || charArray[currentPos] == ';')) {
+							// ignore spaces and preceding comma
+						}
+						isName = true;
+						startPosValue = currentPos;
+					} else {
+						withinQuote = true;
+						startPosValue = ++currentPos;
+					}
+				} else if (c == ' ' || c == ',' || c == ';') {
+					if (withinQuote) {
+						currentPos++;
+					} else {
+						if (isName) {
+							nvp[0] = (new String(charArray, startPosValue, currentPos
+									- startPosValue)).toLowerCase();
+							this.iNameValuePair.add(nvp);
+							nvp = new String[2];
+						} else {
+							nvp[1] = new String(charArray, startPosValue, currentPos
+									- startPosValue);
+							this.iNameValuePair.add(nvp);
+							nvp = new String[2];
+						}
+
+						while (++currentPos < len
+								&& (charArray[currentPos] == ' ' || charArray[currentPos] == ',' || charArray[currentPos] == ';')) {
+							// ignore spaces and preceding comma
+						}
+						isName = true;
+						startPosValue = currentPos;
+					}
+				} else {
+					currentPos++;
+				}
+			} while (currentPos < len);
+
+			if (--currentPos > startPosValue) {
+				if (!isName) {
+					if (charArray[currentPos] == '"') {
+						nvp[1] = new String(charArray, startPosValue, currentPos - startPosValue);
+						this.iNameValuePair.add(nvp);
+						nvp = new String[2];
+					} else {
+						nvp[1] = new String(charArray, startPosValue,
+								(currentPos - startPosValue) + 1);
+						this.iNameValuePair.add(nvp);
+						nvp = new String[2];
+					}
+				} else {
+					nvp[0] = (new String(charArray, startPosValue, (currentPos - startPosValue) + 1))
+							.toLowerCase();
+				}
+				this.iNameValuePair.add(nvp);
+			} else if (currentPos == startPosValue) {
+				if (!isName) {
+					if (charArray[currentPos] == '"') {
+						nvp[1] = String.valueOf(charArray[currentPos - 1]);
+						this.iNameValuePair.add(nvp);
+						nvp = new String[2];
+					} else {
+						nvp[1] = String.valueOf(charArray[currentPos]);
+						this.iNameValuePair.add(nvp);
+						nvp = new String[2];
+					}
+				} else {
+					nvp[0] = String.valueOf(charArray[currentPos]).toLowerCase();
+				}
+				this.iNameValuePair.add(nvp);
+			}
+		}
+	}
+
+	/**
+	 * Returns the header field at a given index
+	 * 
+	 * @param pIndex
+	 *            The index
+	 * @return The field name
+	 */
+	public String getField(int pIndex) {
+		if (pIndex < 0 || pIndex > this.iNameValuePair.size()) return null;
+		return this.iNameValuePair.elementAt(pIndex)[0];
+	}
+
+	/**
+	 * Returns the value of a header field at a given index
+	 * 
+	 * @param pIndex
+	 * @return The value
+	 */
+	public String getValue(int pIndex) {
+		if (pIndex < 0 || pIndex > this.iNameValuePair.size()) return null;
+		return this.iNameValuePair.elementAt(pIndex)[1];
+	}
+
+	/**
+	 * Returns the value of a header field for a given name
+	 * 
+	 * @param pName
+	 *            The name
+	 * @return The value
+	 */
+	public String getValue(String pName) {
+		return getValue(pName, null);
+	}
+
+	/**
+	 * Returns the value of a header field for a given name specifying a
+	 * default.
+	 * 
+	 * @param pName
+	 *            The name of the header field
+	 * @param pDefault
+	 *            The value returned if no field of the given name exists
+	 * @return The value
+	 */
+	public String getValue(String pName, String pDefault) {
+		if (pName == null) return pDefault;
+		pName = pName.toLowerCase();
+		for (int i = 0; i < this.iNameValuePair.size(); i++) {
+			if (this.iNameValuePair.elementAt(i)[0] == null) return pDefault;
+			if (pName.equals(this.iNameValuePair.elementAt(i)[0])) return this.iNameValuePair
+					.elementAt(i)[1];
+		}
+		return pDefault;
+	}
+
+	/**
+	 * Returns the value of a numeric header field for a given name specifying a
+	 * default.
+	 * 
+	 * @param pName
+	 *            The name of the header field
+	 * @param pDefault
+	 *            The value returned if no field of the given name exists
+	 * @return The value
+	 */
+	public int getIntValue(String pName, int pDefault) {
+		try {
+			return Integer.parseInt(getValue(pName, String.valueOf(pDefault)));
+		} catch (Exception e) {
+			return pDefault;
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "raw:" + this.iRaw;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpMethod.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpMethod.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpMethod.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpMethod.java
index 22cd891..f5e63b4 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpMethod.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpMethod.java
@@ -1,120 +1,118 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 12917      2004-11-11  thschaef     HTTP Header parsing does not work for UNIX line delimitor
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 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)
- * 2750520    2009-04-10  blaschke-oss Code cleanup from empty statement et al
- * 3557283    2012-11-05  blaschke-oss Print full response when get EOF from CIMOM
- *    2709    2013-11-13  blaschke-oss Lower the level of the EOF message to FINE
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-
-/**
- * Class HttpMethod provides a method to read a line from a given input stream
- * 
- */
-public abstract class HttpMethod {
-
-	/**
-	 * Reads a line from a given input stream
-	 * 
-	 * @param pStream
-	 *            The input stream
-	 * @return The line
-	 * @throws IOException
-	 */
-	public static String readLine(InputStream pStream) throws IOException {
-
-		if (pStream == null) return null;
-
-		char buffer[] = new char[16];
-		int used = 0;
-		int prevChar;
-		boolean flag = true;
-
-		for (; (prevChar = pStream.read()) >= 0; buffer[used++] = (char) prevChar) {
-
-			flag = false;
-
-			// @12917 - thschaef
-			// see http://www.w3.org/Protocols/HTTP/AsImplemented.html for
-			// details
-			// Lines shall be delimited by an optional carriage return followed
-			// by a mandatory line feed character.
-			// The client should not assume that the carriage return will be
-			// present. Lines may be of any length.
-			// Well-behaved servers should restrict line length to 80 characters
-			// excluding the CR LF pair.
-
-			// if (prevChar == 13) continue;
-			if (prevChar == 10) break;
-
-			if (used >= buffer.length) {
-				char tmp[] = new char[buffer.length << 1];
-				System.arraycopy(buffer, 0, tmp, 0, used);
-				buffer = tmp;
-			}
-		}
-		if (flag) {
-			LogAndTraceBroker
-					.getBroker()
-					.trace(
-							Level.FINE,
-							"Unexpected EOF trying to read line from input stream - CIMOM closed its end of socket, check it for connection issues");
-			throw new IOException("Unexpected EOF");
-		}
-
-		for (; used > 0 && buffer[used - 1] <= ' '; used--) {
-			// back up over blanks and non-printables at end of line
-		}
-
-		return String.copyValueOf(buffer, 0, used);
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 12917      2004-11-11  thschaef     HTTP Header parsing does not work for UNIX line delimitor
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 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)
+ * 2750520    2009-04-10  blaschke-oss Code cleanup from empty statement et al
+ * 3557283    2012-11-05  blaschke-oss Print full response when get EOF from CIMOM
+ *    2709    2013-11-13  blaschke-oss Lower the level of the EOF message to FINE
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+
+/**
+ * Class HttpMethod provides a method to read a line from a given input stream
+ * 
+ */
+public abstract class HttpMethod {
+
+	/**
+	 * Reads a line from a given input stream
+	 * 
+	 * @param pStream
+	 *            The input stream
+	 * @return The line
+	 * @throws IOException
+	 */
+	public static String readLine(InputStream pStream) throws IOException {
+
+		if (pStream == null) return null;
+
+		char buffer[] = new char[16];
+		int used = 0;
+		int prevChar;
+		boolean flag = true;
+
+		for (; (prevChar = pStream.read()) >= 0; buffer[used++] = (char) prevChar) {
+
+			flag = false;
+
+			// @12917 - thschaef
+			// see http://www.w3.org/Protocols/HTTP/AsImplemented.html for
+			// details
+			// Lines shall be delimited by an optional carriage return followed
+			// by a mandatory line feed character.
+			// The client should not assume that the carriage return will be
+			// present. Lines may be of any length.
+			// Well-behaved servers should restrict line length to 80 characters
+			// excluding the CR LF pair.
+
+			// if (prevChar == 13) continue;
+			if (prevChar == 10) break;
+
+			if (used >= buffer.length) {
+				char tmp[] = new char[buffer.length << 1];
+				System.arraycopy(buffer, 0, tmp, 0, used);
+				buffer = tmp;
+			}
+		}
+		if (flag) {
+			LogAndTraceBroker
+					.getBroker()
+					.trace(
+							Level.FINE,
+							"Unexpected EOF trying to read line from input stream - CIMOM closed its end of socket, check it for connection issues");
+			throw new IOException("Unexpected EOF");
+		}
+
+		for (; used > 0 && buffer[used - 1] <= ' '; used--) {
+			// back up over blanks and non-printables at end of line
+		}
+
+		return String.copyValueOf(buffer, 0, used);
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpParseException.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpParseException.java
similarity index 66%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpParseException.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpParseException.java
index fa0e013..9735f00 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpParseException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpParseException.java
@@ -1,72 +1,70 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Class HttpParseException represents problems parsing http challenges
- * 
- */
-public class HttpParseException extends HttpException {
-
-	private static final long serialVersionUID = -6546559439537187479L;
-
-	/**
-	 * Ctor.
-	 */
-	public HttpParseException() {
-		super();
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pReason
-	 *            The reason
-	 */
-	public HttpParseException(String pReason) {
-		super(pReason);
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Class HttpParseException represents problems parsing http challenges
+ * 
+ */
+public class HttpParseException extends HttpException {
+
+	private static final long serialVersionUID = -6546559439537187479L;
+
+	/**
+	 * Ctor.
+	 */
+	public HttpParseException() {
+		super();
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pReason
+	 *            The reason
+	 */
+	public HttpParseException(String pReason) {
+		super(pReason);
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpServerConnection.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerConnection.java
similarity index 89%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpServerConnection.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerConnection.java
index deb2604..f60ff10 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpServerConnection.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerConnection.java
@@ -1,444 +1,442 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1422316    2005-05-08  lupusalex    Disable delayed acknowledgment
- * 1483270    2006-05-15  lupusalex    Using Several Cim Clients cause an indication problem
- * 1498130    2006-05-31  lupusalex    Selection of xml parser on a per connection basis
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 1649779    2007-02-01  lupusalex    Indication listener threads freeze
- * 1660743    2007-02-15  lupusalex    SSLContext is static
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2204488 	  2008-10-28  raman_arora  Fix code to remove compiler warnings
- * 2210455    2008-10-30  blaschke-oss Enhance javadoc, fix potential null pointers
- * 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)
- * 3027392    2010-07-09  blaschke-oss Nullcheck of value previously dereferenced
- * 3206904    2011-03-11  lupusalex    Indication listener deadlock causes JVM to run out sockets
- * 3536399    2012-08-25  hellerda     Add client/listener peer authentication properties
- *    2618    2013-02-27  blaschke-oss Need to add property to disable weak cipher suites for the secure indication
- *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLServerSocket;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.ThreadPool;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.Util;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-
-/**
- * Class HttpServerConnection implements the outer shell of a HTTP server. It
- * accepts incoming connections and puts them in a queue to be serviced by an
- * independent thread
- * 
- */
-public class HttpServerConnection implements Runnable {
-
-	private int iPort;
-
-	private ServerSocket iServerSocket;
-
-	private HttpConnectionHandler iHandler;
-
-	private HttpConnectionDispatcher iDispatcher;
-
-	private volatile boolean iClose = true;
-
-	private String iServerName;
-
-	private boolean iSsl;
-
-	private Thread iRunner;
-
-	private WBEMConfiguration iSessionProperties;
-
-	private final int iTimeout;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHandler
-	 *            The connection handler
-	 * @param pLocalAddress
-	 *            The local address to bind the port to. If null the port is
-	 *            bound to all local addresses. For use on multi-homed systems
-	 * @param pPort
-	 *            The local port. If zero any free port will be chosen.
-	 * @param pSsl
-	 *            SSL secured connection ?
-	 * @param pProperties
-	 *            The configuration context
-	 * @throws IOException
-	 */
-	public HttpServerConnection(HttpConnectionHandler pHandler, String pLocalAddress, int pPort,
-			boolean pSsl, WBEMConfiguration pProperties) throws IOException {
-
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		this.iPort = pPort;
-		this.iHandler = pHandler;
-		this.iSsl = pSsl;
-		this.iServerName = pSsl ? "HTTPS Server" : "HTTP Server";
-		this.iSessionProperties = (pProperties != null) ? pProperties : WBEMConfiguration
-				.getGlobalConfiguration();
-		SSLContext sslContext = pSsl ? HttpSocketFactory.getInstance().getServerSSLContext(
-				this.iSessionProperties) : null;
-		this.iServerSocket = (pLocalAddress != null && pLocalAddress.length() > 0) ? HttpSocketFactory
-				.getInstance().getServerSocketFactory(sslContext).createServerSocket(pPort, 50,
-						InetAddress.getByName(pLocalAddress))
-				: HttpSocketFactory.getInstance().getServerSocketFactory(sslContext)
-						.createServerSocket(pPort);
-		if (this.iServerSocket instanceof SSLServerSocket) {
-			if (this.iSessionProperties.getSslListenerPeerVerification().equalsIgnoreCase("ignore")) {
-				logger.trace(Level.FINER, "Listener peer verification: ignore");
-				((SSLServerSocket) this.iServerSocket).setNeedClientAuth(false);
-			} else if (this.iSessionProperties.getSslListenerPeerVerification().equalsIgnoreCase(
-					"accept")) {
-				logger.trace(Level.FINER, "Listener peer verification: accept");
-				((SSLServerSocket) this.iServerSocket).setWantClientAuth(true);
-			} else {
-				logger.trace(Level.FINER, "Listener peer verification: require");
-				((SSLServerSocket) this.iServerSocket).setNeedClientAuth(true);
-			}
-
-			String disableCipherSuites = this.iSessionProperties
-					.getSslListenerCipherSuitesToDisable();
-			if (disableCipherSuites != null) {
-				SSLServerSocket sslSock = (SSLServerSocket) this.iServerSocket;
-				String[] currentCipherSuites = sslSock.getEnabledCipherSuites();
-				String[] updatedCipherSuites = Util.getFilteredStringArray(currentCipherSuites,
-						disableCipherSuites);
-				sslSock.setEnabledCipherSuites(updatedCipherSuites);
-				int before = currentCipherSuites.length;
-				int after = updatedCipherSuites.length;
-				if (before > 0 && after == 0) logger.trace(Level.WARNING,
-						"All cipher suites disabled for listener!");
-				else if (before > after) logger.trace(Level.FINE, "Some (" + (before - after)
-						+ ") cipher suites disabled for listener");
-				else if (before == after) logger.trace(Level.FINER,
-						"No cipher suites disabled for listener");
-			}
-		}
-		this.iTimeout = this.iSessionProperties.getListenerHttpTimeout();
-		logger.exit();
-	}
-
-	/**
-	 * Set the name of the thread
-	 * 
-	 * @param pName
-	 *            The new value
-	 */
-	public void setName(String pName) {
-		if (this.iRunner != null) this.iRunner.setName(pName);
-	}
-
-	/**
-	 * Returns the port
-	 * 
-	 * @return The port
-	 */
-	public int getPort() {
-		return this.iServerSocket.getLocalPort();
-	}
-
-	/**
-	 * Returns the local ip address the socket is bound to
-	 * 
-	 * @return The ip address
-	 * @throws UnknownHostException
-	 */
-	public String getLocalIp() throws UnknownHostException {
-		String ip = this.iServerSocket.getInetAddress().getHostAddress();
-		String localhost = InetAddress.getLocalHost().getHostAddress();
-		return "0.0.0.0".equals(ip) ? localhost : ip;
-	}
-
-	/**
-	 * Returns the local hostname the socket is bound to
-	 * 
-	 * @return The host name
-	 * @throws UnknownHostException
-	 */
-	public String getLocalHostName() throws UnknownHostException {
-		String ip = this.iServerSocket.getInetAddress().getHostName();
-		String localhost = InetAddress.getLocalHost().getHostName();
-		return "0.0.0.0".equals(ip) ? localhost : ip;
-	}
-
-	/**
-	 * Return whether this connection is SSL secured
-	 * 
-	 * @return true if SSL is enabled, false otherwise
-	 */
-	public boolean isSSL() {
-		return this.iSsl;
-	}
-
-	/**
-	 * Starts a thread that waits for incoming connections
-	 */
-	public void start() {
-		if (this.iClose) {
-			this.iClose = false;
-			ThreadGroup group = new ThreadGroup("CIMListener on port " + String.valueOf(this.iPort));
-			this.iDispatcher = new HttpConnectionDispatcher(group, this.iHandler, new ThreadPool(
-					this.iSessionProperties.getListenerMinPoolSize(), this.iSessionProperties
-							.getListenerMaxPoolSize(),
-					this.iSessionProperties.getListenerBacklog(), this.iSessionProperties
-							.getListenerMaxIdle(), group, "Handler "), this.iSessionProperties
-					.getListenerMaxQueueSize());
-			this.iDispatcher.start();
-			this.iRunner = new Thread(group, this, this.iServerName);
-			this.iRunner.setDaemon(true);
-
-			this.iRunner.start();
-		}
-	}
-
-	public void run() {
-		while (!this.iClose) {
-			try {
-				Socket socket = this.iServerSocket.accept();
-				try {
-					socket.setTcpNoDelay(true);
-					socket.setSoTimeout(this.iTimeout);
-				} catch (IOException e) {
-					LogAndTraceBroker.getBroker().trace(Level.FINE,
-							"Exception while adjusting socket options", e);
-				}
-				boolean dispatched = this.iDispatcher.dispatch(socket);
-				if (!dispatched) {
-					MessageWriter writer = new MessageWriter(socket.getOutputStream(), false, false);
-					try {
-						writer.setMethod(new HttpServerMethod(1, 1, 503,
-								"Service temporarily overloaded"));
-						writer.getHeader().addField("Retry-After", "10");
-						writer.close();
-					} catch (IOException e) {
-						LogAndTraceBroker.getBroker().trace(Level.FINE,
-								"Exception while sending HTTP 503", e);
-					} finally {
-						socket.close();
-					}
-					LogAndTraceBroker
-							.getBroker()
-							.trace(Level.FINE,
-									"HttpServerConnection failed to dispatch incoming connection, sent 503");
-				} else {
-					LogAndTraceBroker.getBroker().trace(Level.FINE,
-							"HttpServerConnection dispatched incoming connection");
-				}
-			} catch (Throwable t) {
-				if (t instanceof SocketException && this.iClose) {
-					break;
-				}
-				try {
-					LogAndTraceBroker.getBroker().trace(Level.FINE,
-							"Exception while waiting for incoming http connections");
-				} catch (Throwable t2) {
-					// just give up
-				}
-			}
-		}
-
-		// shutdown
-
-		try {
-			LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Shutting down CIMListener on port " + this.iPort);
-		} catch (Throwable t) {
-			// do nothing
-		}
-		try {
-			// give the handlers a chance to process all already accepted
-			// connections before complete shutdown
-			Thread.sleep(5000);
-		} catch (InterruptedException e) {
-			// just ignore
-		}
-		try {
-			this.iDispatcher.close();
-		} catch (Exception e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Exception while closing http connection dispatcher", e);
-		}
-		this.iDispatcher = null;
-		this.iRunner = null;
-	}
-
-	/**
-	 * Closes the socket and shuts down the listening threads
-	 */
-	public void close() {
-		if (!this.iClose) {
-			this.iClose = true;
-			try {
-				this.iServerSocket.close();
-				this.iServerSocket = null;
-			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINE,
-						"Exception while closing server socket", e);
-			}
-		}
-	}
-
-	/**
-	 * Class HttpConnectionDispatcher is responsible for dispatching the
-	 * incoming connections to the handlers. It doesn't execute the handler
-	 * directly but creates a runnable that is submitted to a thread pool which
-	 * takes care of execution.
-	 * 
-	 */
-	private static class HttpConnectionDispatcher extends Thread {
-
-		private BlockingQueue iConnectionPool;
-
-		private volatile boolean iAlive = true;
-
-		private HttpConnectionHandler iHandler;
-
-		private ThreadPool iThreadPool;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pGroup
-		 *            The thread group to use for this thread and it's children
-		 * @param pHandler
-		 *            The connection handler
-		 * @param pPool
-		 *            The thread pool
-		 * @param pQueueSize
-		 *            The fixed capacity for the queue of pending connections
-		 */
-		public HttpConnectionDispatcher(ThreadGroup pGroup, HttpConnectionHandler pHandler,
-				ThreadPool pPool, int pQueueSize) {
-			super(pGroup, "Connection Dispatcher");
-			setDaemon(true);
-			this.iConnectionPool = new ArrayBlockingQueue(pQueueSize > 0 ? pQueueSize : 1);
-			this.iHandler = pHandler;
-			this.iThreadPool = pPool;
-		}
-
-		/**
-		 * Dispatches a connection
-		 * 
-		 * @param pSocket
-		 *            The socket of the connection
-		 * @return true if dispatch was successful
-		 */
-		public boolean dispatch(Socket pSocket) {
-			try {
-				return this.iConnectionPool.offer(pSocket, 20, TimeUnit.MILLISECONDS);
-			} catch (InterruptedException e) {
-				/* */
-			}
-			return false;
-		}
-
-		/**
-		 * Gets the next pending connection
-		 * 
-		 * @return The socket of the connection
-		 */
-		public Socket getConnection() {
-			try {
-				return this.iConnectionPool.poll(100, TimeUnit.MILLISECONDS);
-			} catch (InterruptedException e) {
-				// just ignore it, it is expected
-			}
-			return null;
-		}
-
-		@Override
-		public void run() {
-			while (this.iAlive) {
-				try {
-					Socket socket = getConnection();
-					if (socket != null) {
-						this.iThreadPool.execute(new HttpServerWorker(this.iHandler, socket));
-					}
-				} catch (Throwable t) {
-					try {
-						LogAndTraceBroker.getBroker().trace(Level.FINE,
-								"Exception while submitting worker to thread pool", t);
-					} catch (Throwable t1) {
-						// forget it
-					}
-				}
-			}
-			try {
-				this.iHandler.close();
-			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINE,
-						"Exception while closing http connection handler", e);
-			}
-			try {
-				this.iThreadPool.shutdown();
-			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINE,
-						"Exception during shut down of thread pool", e);
-			}
-		}
-
-		/**
-		 * Closes the dispatcher
-		 */
-		public void close() {
-			this.iAlive = false;
-		}
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1422316    2005-05-08  lupusalex    Disable delayed acknowledgment
+ * 1483270    2006-05-15  lupusalex    Using Several Cim Clients cause an indication problem
+ * 1498130    2006-05-31  lupusalex    Selection of xml parser on a per connection basis
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 1649779    2007-02-01  lupusalex    Indication listener threads freeze
+ * 1660743    2007-02-15  lupusalex    SSLContext is static
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2204488 	  2008-10-28  raman_arora  Fix code to remove compiler warnings
+ * 2210455    2008-10-30  blaschke-oss Enhance javadoc, fix potential null pointers
+ * 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)
+ * 3027392    2010-07-09  blaschke-oss Nullcheck of value previously dereferenced
+ * 3206904    2011-03-11  lupusalex    Indication listener deadlock causes JVM to run out sockets
+ * 3536399    2012-08-25  hellerda     Add client/listener peer authentication properties
+ *    2618    2013-02-27  blaschke-oss Need to add property to disable weak cipher suites for the secure indication
+ *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocket;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.util.ThreadPool;
+import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+
+/**
+ * Class HttpServerConnection implements the outer shell of a HTTP server. It
+ * accepts incoming connections and puts them in a queue to be serviced by an
+ * independent thread
+ * 
+ */
+public class HttpServerConnection implements Runnable {
+
+	private int iPort;
+
+	private ServerSocket iServerSocket;
+
+	private HttpConnectionHandler iHandler;
+
+	private HttpConnectionDispatcher iDispatcher;
+
+	private volatile boolean iClose = true;
+
+	private String iServerName;
+
+	private boolean iSsl;
+
+	private Thread iRunner;
+
+	private WBEMConfiguration iSessionProperties;
+
+	private final int iTimeout;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHandler
+	 *            The connection handler
+	 * @param pLocalAddress
+	 *            The local address to bind the port to. If null the port is
+	 *            bound to all local addresses. For use on multi-homed systems
+	 * @param pPort
+	 *            The local port. If zero any free port will be chosen.
+	 * @param pSsl
+	 *            SSL secured connection ?
+	 * @param pProperties
+	 *            The configuration context
+	 * @throws IOException
+	 */
+	public HttpServerConnection(HttpConnectionHandler pHandler, String pLocalAddress, int pPort,
+			boolean pSsl, WBEMConfiguration pProperties) throws IOException {
+
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		this.iPort = pPort;
+		this.iHandler = pHandler;
+		this.iSsl = pSsl;
+		this.iServerName = pSsl ? "HTTPS Server" : "HTTP Server";
+		this.iSessionProperties = (pProperties != null) ? pProperties : WBEMConfiguration
+				.getGlobalConfiguration();
+		SSLContext sslContext = pSsl ? HttpSocketFactory.getInstance().getServerSSLContext(
+				this.iSessionProperties) : null;
+		this.iServerSocket = (pLocalAddress != null && pLocalAddress.length() > 0) ? HttpSocketFactory
+				.getInstance().getServerSocketFactory(sslContext).createServerSocket(pPort, 50,
+						InetAddress.getByName(pLocalAddress))
+				: HttpSocketFactory.getInstance().getServerSocketFactory(sslContext)
+						.createServerSocket(pPort);
+		if (this.iServerSocket instanceof SSLServerSocket) {
+			if (this.iSessionProperties.getSslListenerPeerVerification().equalsIgnoreCase("ignore")) {
+				logger.trace(Level.FINER, "Listener peer verification: ignore");
+				((SSLServerSocket) this.iServerSocket).setNeedClientAuth(false);
+			} else if (this.iSessionProperties.getSslListenerPeerVerification().equalsIgnoreCase(
+					"accept")) {
+				logger.trace(Level.FINER, "Listener peer verification: accept");
+				((SSLServerSocket) this.iServerSocket).setWantClientAuth(true);
+			} else {
+				logger.trace(Level.FINER, "Listener peer verification: require");
+				((SSLServerSocket) this.iServerSocket).setNeedClientAuth(true);
+			}
+
+			String disableCipherSuites = this.iSessionProperties
+					.getSslListenerCipherSuitesToDisable();
+			if (disableCipherSuites != null) {
+				SSLServerSocket sslSock = (SSLServerSocket) this.iServerSocket;
+				String[] currentCipherSuites = sslSock.getEnabledCipherSuites();
+				String[] updatedCipherSuites = Util.getFilteredStringArray(currentCipherSuites,
+						disableCipherSuites);
+				sslSock.setEnabledCipherSuites(updatedCipherSuites);
+				int before = currentCipherSuites.length;
+				int after = updatedCipherSuites.length;
+				if (before > 0 && after == 0) logger.trace(Level.WARNING,
+						"All cipher suites disabled for listener!");
+				else if (before > after) logger.trace(Level.FINE, "Some (" + (before - after)
+						+ ") cipher suites disabled for listener");
+				else if (before == after) logger.trace(Level.FINER,
+						"No cipher suites disabled for listener");
+			}
+		}
+		this.iTimeout = this.iSessionProperties.getListenerHttpTimeout();
+		logger.exit();
+	}
+
+	/**
+	 * Set the name of the thread
+	 * 
+	 * @param pName
+	 *            The new value
+	 */
+	public void setName(String pName) {
+		if (this.iRunner != null) this.iRunner.setName(pName);
+	}
+
+	/**
+	 * Returns the port
+	 * 
+	 * @return The port
+	 */
+	public int getPort() {
+		return this.iServerSocket.getLocalPort();
+	}
+
+	/**
+	 * Returns the local ip address the socket is bound to
+	 * 
+	 * @return The ip address
+	 * @throws UnknownHostException
+	 */
+	public String getLocalIp() throws UnknownHostException {
+		String ip = this.iServerSocket.getInetAddress().getHostAddress();
+		String localhost = InetAddress.getLocalHost().getHostAddress();
+		return "0.0.0.0".equals(ip) ? localhost : ip;
+	}
+
+	/**
+	 * Returns the local hostname the socket is bound to
+	 * 
+	 * @return The host name
+	 * @throws UnknownHostException
+	 */
+	public String getLocalHostName() throws UnknownHostException {
+		String ip = this.iServerSocket.getInetAddress().getHostName();
+		String localhost = InetAddress.getLocalHost().getHostName();
+		return "0.0.0.0".equals(ip) ? localhost : ip;
+	}
+
+	/**
+	 * Return whether this connection is SSL secured
+	 * 
+	 * @return true if SSL is enabled, false otherwise
+	 */
+	public boolean isSSL() {
+		return this.iSsl;
+	}
+
+	/**
+	 * Starts a thread that waits for incoming connections
+	 */
+	public void start() {
+		if (this.iClose) {
+			this.iClose = false;
+			ThreadGroup group = new ThreadGroup("CIMListener on port " + String.valueOf(this.iPort));
+			this.iDispatcher = new HttpConnectionDispatcher(group, this.iHandler, new ThreadPool(
+					this.iSessionProperties.getListenerMinPoolSize(), this.iSessionProperties
+							.getListenerMaxPoolSize(),
+					this.iSessionProperties.getListenerBacklog(), this.iSessionProperties
+							.getListenerMaxIdle(), group, "Handler "), this.iSessionProperties
+					.getListenerMaxQueueSize());
+			this.iDispatcher.start();
+			this.iRunner = new Thread(group, this, this.iServerName);
+			this.iRunner.setDaemon(true);
+
+			this.iRunner.start();
+		}
+	}
+
+	public void run() {
+		while (!this.iClose) {
+			try {
+				Socket socket = this.iServerSocket.accept();
+				try {
+					socket.setTcpNoDelay(true);
+					socket.setSoTimeout(this.iTimeout);
+				} catch (IOException e) {
+					LogAndTraceBroker.getBroker().trace(Level.FINE,
+							"Exception while adjusting socket options", e);
+				}
+				boolean dispatched = this.iDispatcher.dispatch(socket);
+				if (!dispatched) {
+					MessageWriter writer = new MessageWriter(socket.getOutputStream(), false, false);
+					try {
+						writer.setMethod(new HttpServerMethod(1, 1, 503,
+								"Service temporarily overloaded"));
+						writer.getHeader().addField("Retry-After", "10");
+						writer.close();
+					} catch (IOException e) {
+						LogAndTraceBroker.getBroker().trace(Level.FINE,
+								"Exception while sending HTTP 503", e);
+					} finally {
+						socket.close();
+					}
+					LogAndTraceBroker
+							.getBroker()
+							.trace(Level.FINE,
+									"HttpServerConnection failed to dispatch incoming connection, sent 503");
+				} else {
+					LogAndTraceBroker.getBroker().trace(Level.FINE,
+							"HttpServerConnection dispatched incoming connection");
+				}
+			} catch (Throwable t) {
+				if (t instanceof SocketException && this.iClose) {
+					break;
+				}
+				try {
+					LogAndTraceBroker.getBroker().trace(Level.FINE,
+							"Exception while waiting for incoming http connections");
+				} catch (Throwable t2) {
+					// just give up
+				}
+			}
+		}
+
+		// shutdown
+
+		try {
+			LogAndTraceBroker.getBroker().trace(Level.FINE,
+					"Shutting down CIMListener on port " + this.iPort);
+		} catch (Throwable t) {
+			// do nothing
+		}
+		try {
+			// give the handlers a chance to process all already accepted
+			// connections before complete shutdown
+			Thread.sleep(5000);
+		} catch (InterruptedException e) {
+			// just ignore
+		}
+		try {
+			this.iDispatcher.close();
+		} catch (Exception e) {
+			LogAndTraceBroker.getBroker().trace(Level.FINE,
+					"Exception while closing http connection dispatcher", e);
+		}
+		this.iDispatcher = null;
+		this.iRunner = null;
+	}
+
+	/**
+	 * Closes the socket and shuts down the listening threads
+	 */
+	public void close() {
+		if (!this.iClose) {
+			this.iClose = true;
+			try {
+				this.iServerSocket.close();
+				this.iServerSocket = null;
+			} catch (Exception e) {
+				LogAndTraceBroker.getBroker().trace(Level.FINE,
+						"Exception while closing server socket", e);
+			}
+		}
+	}
+
+	/**
+	 * Class HttpConnectionDispatcher is responsible for dispatching the
+	 * incoming connections to the handlers. It doesn't execute the handler
+	 * directly but creates a runnable that is submitted to a thread pool which
+	 * takes care of execution.
+	 * 
+	 */
+	private static class HttpConnectionDispatcher extends Thread {
+
+		private BlockingQueue iConnectionPool;
+
+		private volatile boolean iAlive = true;
+
+		private HttpConnectionHandler iHandler;
+
+		private ThreadPool iThreadPool;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pGroup
+		 *            The thread group to use for this thread and it's children
+		 * @param pHandler
+		 *            The connection handler
+		 * @param pPool
+		 *            The thread pool
+		 * @param pQueueSize
+		 *            The fixed capacity for the queue of pending connections
+		 */
+		public HttpConnectionDispatcher(ThreadGroup pGroup, HttpConnectionHandler pHandler,
+				ThreadPool pPool, int pQueueSize) {
+			super(pGroup, "Connection Dispatcher");
+			setDaemon(true);
+			this.iConnectionPool = new ArrayBlockingQueue(pQueueSize > 0 ? pQueueSize : 1);
+			this.iHandler = pHandler;
+			this.iThreadPool = pPool;
+		}
+
+		/**
+		 * Dispatches a connection
+		 * 
+		 * @param pSocket
+		 *            The socket of the connection
+		 * @return true if dispatch was successful
+		 */
+		public boolean dispatch(Socket pSocket) {
+			try {
+				return this.iConnectionPool.offer(pSocket, 20, TimeUnit.MILLISECONDS);
+			} catch (InterruptedException e) {
+				/* */
+			}
+			return false;
+		}
+
+		/**
+		 * Gets the next pending connection
+		 * 
+		 * @return The socket of the connection
+		 */
+		public Socket getConnection() {
+			try {
+				return this.iConnectionPool.poll(100, TimeUnit.MILLISECONDS);
+			} catch (InterruptedException e) {
+				// just ignore it, it is expected
+			}
+			return null;
+		}
+
+		@Override
+		public void run() {
+			while (this.iAlive) {
+				try {
+					Socket socket = getConnection();
+					if (socket != null) {
+						this.iThreadPool.execute(new HttpServerWorker(this.iHandler, socket));
+					}
+				} catch (Throwable t) {
+					try {
+						LogAndTraceBroker.getBroker().trace(Level.FINE,
+								"Exception while submitting worker to thread pool", t);
+					} catch (Throwable t1) {
+						// forget it
+					}
+				}
+			}
+			try {
+				this.iHandler.close();
+			} catch (Exception e) {
+				LogAndTraceBroker.getBroker().trace(Level.FINE,
+						"Exception while closing http connection handler", e);
+			}
+			try {
+				this.iThreadPool.shutdown();
+			} catch (Exception e) {
+				LogAndTraceBroker.getBroker().trace(Level.FINE,
+						"Exception during shut down of thread pool", e);
+			}
+		}
+
+		/**
+		 * Closes the dispatcher
+		 */
+		public void close() {
+			this.iAlive = false;
+		}
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpServerMethod.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerMethod.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpServerMethod.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerMethod.java
index 412cf78..7ebf745 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpServerMethod.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerMethod.java
@@ -1,179 +1,177 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 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)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
-
-/**
- * Class HttpServerMethod is responsible for
- * 
- */
-public class HttpServerMethod extends HttpMethod {
-
-	private String iMethodName;
-
-	private String iFile;
-
-	private String iProtocol;
-
-	private int iMinor, iMajor;
-
-	private int iStatus;
-
-	private String iReason;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pMajor
-	 *            Major version
-	 * @param pMinor
-	 *            Minor version
-	 * @param pStatus
-	 *            Status
-	 * @param pReason
-	 *            Reason
-	 */
-	public HttpServerMethod(int pMajor, int pMinor, int pStatus, String pReason) {
-		this.iMinor = pMinor;
-		this.iMajor = pMajor;
-		this.iStatus = pStatus;
-		this.iReason = pReason;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pReader
-	 *            Inputstream
-	 * @throws IOException
-	 * @throws HttpException
-	 */
-	public HttpServerMethod(InputStream pReader) throws IOException, HttpException {
-		String line;
-
-		do {
-			line = HttpMethod.readLine(pReader);
-		} while (line == null || line.length() == 0);
-		int next = line.indexOf(' ');
-		int prev = 0;
-		if (next > -1) {
-			this.iMethodName = line.substring(0, next).toUpperCase();
-			if (this.iMethodName.equals("GET") && (line.indexOf(' ', next + 1) == -1)) { // Simple
-				// request
-				this.iFile = line.substring(next + 1);
-			} else { // FullRequest
-				prev = next + 1;
-				next = line.indexOf(' ', prev);
-				this.iFile = line.substring(prev, next);
-
-				prev = next + 1;
-				this.iProtocol = line.substring(prev).toUpperCase();
-
-				prev = this.iProtocol.indexOf('/');
-				next = this.iProtocol.indexOf('.', prev + 1);
-				try {
-					this.iMajor = Integer.parseInt(this.iProtocol.substring(prev + 1, next));
-					this.iMinor = Integer.parseInt(this.iProtocol.substring(next + 1));
-				} catch (Exception e) {
-					throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
-				}
-			}
-		} else throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
-	}
-
-	/**
-	 * Returns the major version
-	 * 
-	 * @return The major version
-	 */
-	public int getMajorVersion() {
-		return this.iMajor;
-	}
-
-	/**
-	 * Returns the minor version
-	 * 
-	 * @return The minor version
-	 */
-	public int getMinorVersion() {
-		return this.iMinor;
-	}
-
-	/**
-	 * Returns the method name
-	 * 
-	 * @return The method name
-	 */
-	public String getMethodName() {
-		return this.iMethodName;
-	}
-
-	/**
-	 * Returns the file
-	 * 
-	 * @return The file
-	 */
-	public String getFile() {
-		return this.iFile;
-	}
-
-	/**
-	 * Write to a given output stream
-	 * 
-	 * @param pStream
-	 *            the output stream
-	 */
-	public void write(ASCIIPrintStream pStream) {
-		pStream.print("HTTP/" + this.iMajor + "." + this.iMinor + " " + this.iStatus + " "
-				+ this.iReason + "\r\n");
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 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)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
+
+/**
+ * Class HttpServerMethod is responsible for
+ * 
+ */
+public class HttpServerMethod extends HttpMethod {
+
+	private String iMethodName;
+
+	private String iFile;
+
+	private String iProtocol;
+
+	private int iMinor, iMajor;
+
+	private int iStatus;
+
+	private String iReason;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pMajor
+	 *            Major version
+	 * @param pMinor
+	 *            Minor version
+	 * @param pStatus
+	 *            Status
+	 * @param pReason
+	 *            Reason
+	 */
+	public HttpServerMethod(int pMajor, int pMinor, int pStatus, String pReason) {
+		this.iMinor = pMinor;
+		this.iMajor = pMajor;
+		this.iStatus = pStatus;
+		this.iReason = pReason;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pReader
+	 *            Inputstream
+	 * @throws IOException
+	 * @throws HttpException
+	 */
+	public HttpServerMethod(InputStream pReader) throws IOException, HttpException {
+		String line;
+
+		do {
+			line = HttpMethod.readLine(pReader);
+		} while (line == null || line.length() == 0);
+		int next = line.indexOf(' ');
+		int prev = 0;
+		if (next > -1) {
+			this.iMethodName = line.substring(0, next).toUpperCase();
+			if (this.iMethodName.equals("GET") && (line.indexOf(' ', next + 1) == -1)) { // Simple
+				// request
+				this.iFile = line.substring(next + 1);
+			} else { // FullRequest
+				prev = next + 1;
+				next = line.indexOf(' ', prev);
+				this.iFile = line.substring(prev, next);
+
+				prev = next + 1;
+				this.iProtocol = line.substring(prev).toUpperCase();
+
+				prev = this.iProtocol.indexOf('/');
+				next = this.iProtocol.indexOf('.', prev + 1);
+				try {
+					this.iMajor = Integer.parseInt(this.iProtocol.substring(prev + 1, next));
+					this.iMinor = Integer.parseInt(this.iProtocol.substring(next + 1));
+				} catch (Exception e) {
+					throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
+				}
+			}
+		} else throw new HttpException(HttpURLConnection.HTTP_BAD_METHOD, "Bad method");
+	}
+
+	/**
+	 * Returns the major version
+	 * 
+	 * @return The major version
+	 */
+	public int getMajorVersion() {
+		return this.iMajor;
+	}
+
+	/**
+	 * Returns the minor version
+	 * 
+	 * @return The minor version
+	 */
+	public int getMinorVersion() {
+		return this.iMinor;
+	}
+
+	/**
+	 * Returns the method name
+	 * 
+	 * @return The method name
+	 */
+	public String getMethodName() {
+		return this.iMethodName;
+	}
+
+	/**
+	 * Returns the file
+	 * 
+	 * @return The file
+	 */
+	public String getFile() {
+		return this.iFile;
+	}
+
+	/**
+	 * Write to a given output stream
+	 * 
+	 * @param pStream
+	 *            the output stream
+	 */
+	public void write(ASCIIPrintStream pStream) {
+		pStream.print("HTTP/" + this.iMajor + "." + this.iMinor + " " + this.iStatus + " "
+				+ this.iReason + "\r\n");
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpServerWorker.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerWorker.java
similarity index 65%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpServerWorker.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerWorker.java
index 0223773..b9a73ce 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpServerWorker.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerWorker.java
@@ -1,84 +1,82 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1498927    2006-06-01  lupusalex    Fill gaps in logging coverage
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.Socket;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.Messages;
-
-/**
- * Class HttpServerWorker forwards incoming connections to a handler
- * 
- */
-public class HttpServerWorker implements Runnable {
-
-	HttpConnectionHandler iHandler;
-
-	Socket iSocket;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHandler
-	 *            The handler
-	 * @param pSocket
-	 *            The socket
-	 */
-	public HttpServerWorker(HttpConnectionHandler pHandler, Socket pSocket) {
-		this.iHandler = pHandler;
-		this.iSocket = pSocket;
-	}
-
-	public void run() {
-		try {
-			this.iHandler.handleConnection(this.iSocket);
-		} catch (Exception e) {
-			LogAndTraceBroker.getBroker().message(Messages.HTTP_HANDLE_CONNECTION_FAILED, e);
-		}
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1498927    2006-06-01  lupusalex    Fill gaps in logging coverage
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.Socket;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
+
+/**
+ * Class HttpServerWorker forwards incoming connections to a handler
+ * 
+ */
+public class HttpServerWorker implements Runnable {
+
+	HttpConnectionHandler iHandler;
+
+	Socket iSocket;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHandler
+	 *            The handler
+	 * @param pSocket
+	 *            The socket
+	 */
+	public HttpServerWorker(HttpConnectionHandler pHandler, Socket pSocket) {
+		this.iHandler = pHandler;
+		this.iSocket = pSocket;
+	}
+
+	public void run() {
+		try {
+			this.iHandler.handleConnection(this.iSocket);
+		} catch (Exception e) {
+			LogAndTraceBroker.getBroker().message(Messages.HTTP_HANDLE_CONNECTION_FAILED, e);
+		}
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java
similarity index 91%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java
index ad545b3..1cda5a7 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java
@@ -1,497 +1,495 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1498130    2006-05-31  lupusalex    Selection of xml parser on a per connection basis
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1558663    2006-09-14  lupusalex    Support custom socket factories in client connections
- * 1573723    2006-10-09  lupusalex    Selection of JSSE provider via properties file not feasible
- * 1573723    2006-10-30  lupusalex    rework: Selection of JSSE provider via properties file not feasible
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 1660743    2007-02-15  lupusalex    SSLContext is static
- * 1711092    2006-05-02  lupusalex    Some fixes/additions of log&trace messages
- * 1815707    2007-10-18  ebak         TLS support
- * 1815707    2007-10-30  ebak         rework: TLS support
- * 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)
- * 3001345    2010-05-18  blaschke-oss File handle leaks in HttpSocketFactory and LogAndTraceBroker
- * 3027618    2010-07-14  blaschke-oss Close files/readers in finally blocks
- * 3111718    2010-11-18  blaschke-oss org.sblim.cimclient SSL Code is using the wrong SSL Property
- * 3536399    2012-08-25  hellerda     Add client/listener peer authentication properties
- *    2647    2013-07-01  blaschke-oss Add two ssl protocol properties for http server and client
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.Socket;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.Security;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.logging.Level;
-
-import javax.net.ServerSocketFactory;
-import javax.net.SocketFactory;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509KeyManager;
-import javax.net.ssl.X509TrustManager;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.Messages;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-
-/**
- * Class HttpSocketFactory manages socket factories
- * 
- */
-public class HttpSocketFactory {
-
-	private static HttpSocketFactory cInstance = new HttpSocketFactory();
-
-	private HttpSocketFactory() {
-	// empty
-	}
-
-	/**
-	 * Returns the singleton instance
-	 * 
-	 * @return The instance
-	 */
-	public static HttpSocketFactory getInstance() {
-		return cInstance;
-	}
-
-	/**
-	 * Returns a server socket factory
-	 * 
-	 * @param pContext
-	 *            The corresponding SSL context or null for
-	 *            insecure connections
-	 * 
-	 * @return The factory
-	 */
-	public ServerSocketFactory getServerSocketFactory(SSLContext pContext) {
-		return pContext != null ? pContext.getServerSocketFactory() : ServerSocketFactory
-				.getDefault();
-	}
-
-	/**
-	 * Returns a client socket factory
-	 * 
-	 * @param pContext
-	 *            The SSL context or null for insecure connections
-	 * @return The factory
-	 */
-	public SocketFactory getClientSocketFactory(SSLContext pContext) {
-		return pContext != null ? pContext.getSocketFactory() : SocketFactory.getDefault();
-	}
-
-	/**
-	 * Returns a SSLContext for client sockets corresponding to a given set of
-	 * configuration properties
-	 * 
-	 * @param pProperties
-	 *            The configuration to apply
-	 * @return The SSL context
-	 */
-	public SSLContext getClientSSLContext(final WBEMConfiguration pProperties) {
-		return getSSLContext(pProperties, false);
-	}
-
-	/**
-	 * Returns a SSLContext for server sockets corresponding to a given set of
-	 * configuration properties
-	 * 
-	 * @param pProperties
-	 *            The configuration to apply
-	 * @return The SSL context
-	 */
-	public SSLContext getServerSSLContext(final WBEMConfiguration pProperties) {
-		return getSSLContext(pProperties, true);
-	}
-
-	/**
-	 * Returns a SSLContext corresponding to a given set of configuration
-	 * properties
-	 * 
-	 * @param pProperties
-	 *            The configuration to apply
-	 * @param pIsServer
-	 *            true if a server socket context is requested,
-	 *            false otherwise
-	 * @return The SSL context
-	 */
-	private SSLContext getSSLContext(final WBEMConfiguration pProperties, boolean pIsServer) {
-
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		final String provider = pIsServer ? pProperties.getSslServerSocketProvider() : pProperties
-				.getSslSocketProvider();
-		logger.trace(Level.FINER, "Loading JSSE provider:" + provider);
-
-		final Provider securityProvider;
-
-		try {
-			Class providerClass = Class.forName(provider);
-			securityProvider = (java.security.Provider) providerClass.newInstance();
-			if (Security.getProvider(securityProvider.getName()) == null) {
-				Security.addProvider(securityProvider);
-			}
-		} catch (Exception e) {
-			logger.trace(Level.FINER, "Exception while loading JSSE provider", e);
-			logger.message(Messages.SSL_JSSE_PROVIDER_LOAD_FAILED, provider);
-			logger.exit();
-			throw new RuntimeException(e);
-		}
-
-		try {
-			KeyManager[] keyManager = loadKeystore(pProperties, securityProvider, pIsServer);
-
-			TrustManager[] trustManager = loadTruststore(pProperties, securityProvider, pIsServer);
-
-			String sslProtocol = pIsServer ? pProperties.getSslListenerProtocol() : pProperties
-					.getSslClientProtocol();
-
-			SSLContext sslContext = SSLContext.getInstance(sslProtocol != null ? sslProtocol
-					: pProperties.getSslProtocol(), securityProvider);
-
-			sslContext.init(keyManager, trustManager, null);
-
-			logger.exit();
-
-			return sslContext;
-
-		} catch (Exception e) {
-			logger.trace(Level.FINER, "Exception while initializing SSL context (provider:"
-					+ provider + ")", e);
-			logger.message(Messages.SSL_CONTEXT_INIT_FAILED);
-			logger.exit();
-			return null;
-		}
-	}
-
-	private TrustManager[] loadTruststore(final WBEMConfiguration pProperties,
-			final Provider pSecurityProvider, boolean pIsServer) {
-
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		final TrustManager[] trustAll = new X509TrustManager[] { new AllTrustManager() };
-		final TrustManager[] trustNone = new X509TrustManager[] { new NoTrustManager() };
-		TrustManager[] trustManager = trustNone;
-
-		final String truststorePath = pProperties.getSslTrustStorePath();
-		final char[] truststorePassword = pProperties.getSslTrustStorePassword().toCharArray();
-		final String truststoreType = pProperties.getSslTrustStoreType();
-		final String trustManagerAlgorithm = pProperties.getSslTrustManagerAlgorithm();
-		final boolean clientPeerVerification = pProperties.getSslClientPeerVerification();
-		final String listenerPeerVerification = pProperties.getSslListenerPeerVerification();
-
-		logger.trace(Level.FINER, "Using SSL truststore \"" + truststorePath + "\" ("
-				+ truststoreType + "/" + trustManagerAlgorithm + ")");
-
-		if (pIsServer && listenerPeerVerification.equalsIgnoreCase("ignore")
-				|| (!pIsServer && !clientPeerVerification)) {
-			trustManager = trustAll;
-			if (truststorePath == null || truststorePath.trim().length() == 0) {
-				logger.trace(Level.FINER, "Peer verification disabled for "
-						+ (pIsServer ? "Listener" : "Client"));
-			} else {
-				logger.message(Messages.SSL_TRUSTSTORE_INACTIVE);
-			}
-		} else {
-			if (truststorePath == null || truststorePath.trim().length() == 0) {
-				logger.trace(Level.FINER, "Peer verification enabled for "
-						+ (pIsServer ? "Listener" : "Client") + " but no truststore specified!");
-				logger.message(Messages.SSL_TRUSTSTORE_NULL);
-			} else {
-				logger.trace(Level.FINER, "Peer verification enabled for "
-						+ (pIsServer ? "Listener" : "Client"));
-				FileInputStream fis = null;
-				try {
-					final KeyStore trustStore = KeyStore.getInstance(truststoreType);
-					fis = new FileInputStream(truststorePath);
-					trustStore.load(fis, truststorePassword);
-					final TrustManagerFactory trustManagerFactory = TrustManagerFactory
-							.getInstance(trustManagerAlgorithm, pSecurityProvider);
-					trustManagerFactory.init(trustStore);
-					trustManager = trustManagerFactory.getTrustManagers();
-					logger.trace(Level.FINER, "Truststore successfully loaded for "
-							+ (pIsServer ? "Listener" : "Client"));
-				} catch (FileNotFoundException e) {
-					logger.trace(Level.FINER, "Exception while loading truststore", e);
-					logger.message(Messages.SSL_TRUSTSTORE_NOT_FOUND, truststorePath);
-				} catch (IOException e) {
-					logger.trace(Level.FINER, "Exception while loading truststore", e);
-					logger.message(Messages.SSL_TRUSTSTORE_NOT_READABLE, truststorePath);
-				} catch (NoSuchAlgorithmException e) {
-					logger.trace(Level.FINER, "Exception while loading truststore", e);
-					logger
-							.message(Messages.SSL_TRUSTSTORE_INVALID_ALGORITHM,
-									trustManagerAlgorithm);
-				} catch (CertificateException e) {
-					logger.trace(Level.FINER, "Exception while loading truststore", e);
-					logger.message(Messages.SSL_TRUSTSTORE_INVALID_CERT, truststorePath);
-				} catch (KeyStoreException e) {
-					logger.trace(Level.FINER, "Exception while loading truststore", e);
-					logger.message(Messages.SSL_TRUSTSTORE_INVALID, truststoreType);
-				} catch (Exception e) {
-					logger.trace(Level.FINER, "Exception while loading truststore", e);
-					logger.message(Messages.SSL_TRUSTSTORE_OTHER, truststorePath);
-				} finally {
-					if (fis != null) {
-						try {
-							fis.close();
-						} catch (IOException e) {
-							logger.trace(Level.FINER, "Exception while closing truststore", e);
-						}
-					}
-				}
-			}
-		}
-
-		if (trustManager == trustAll) {
-			logger.message(Messages.SSL_TRUSTSTORE_FALLBACK);
-		} else if (trustManager == trustNone) {
-			logger.message(Messages.SSL_TRUSTSTORE_FALLBACK_NOTRUST);
-		} else {
-			logger.message(Messages.SSL_TRUSTSTORE_ACTIVE);
-		}
-
-		logger.exit();
-		return trustManager;
-	}
-
-	private KeyManager[] loadKeystore(final WBEMConfiguration pProperties,
-			final Provider pSecurityProvider, boolean pIsServer) {
-
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		final KeyManager[] noKeys = new KeyManager[] { new EmptyKeyManager() };
-		KeyManager[] keyManager = noKeys;
-
-		final String keystorePath = pProperties.getSslKeyStorePath();
-		final char[] keystorePassword = pProperties.getSslKeyStorePassword().toCharArray();
-		final String keystoreType = pProperties.getSslKeyStoreType();
-		final String keyManagerAlgorithm = pProperties.getSslKeyManagerAlgorithm();
-
-		logger.trace(Level.FINER, "Using SSL keystore \"" + keystorePath + "\" (" + keystoreType
-				+ "/" + keyManagerAlgorithm + ")");
-
-		if (keystorePath == null || keystorePath.trim().length() == 0) {
-			logger.trace(Level.FINER, "Keystore not specified for "
-					+ (pIsServer ? "Listener" : "Client"));
-			logger.message(Messages.SSL_KEYSTORE_NULL);
-		} else {
-			logger.trace(Level.FINER, "Keystore specified and activated for "
-					+ (pIsServer ? "Listener" : "Client"));
-			FileInputStream fis = null;
-			try {
-				final KeyStore keystore = KeyStore.getInstance(keystoreType);
-				fis = new FileInputStream(keystorePath);
-				keystore.load(fis, keystorePassword);
-
-				final KeyManagerFactory keymanagerfactory = KeyManagerFactory.getInstance(
-						keyManagerAlgorithm, pSecurityProvider);
-				keymanagerfactory.init(keystore, keystorePassword);
-				keyManager = keymanagerfactory.getKeyManagers();
-				logger.trace(Level.FINER, "Keystore successfully loaded for "
-						+ (pIsServer ? "Listener" : "Client"));
-			} catch (FileNotFoundException e) {
-				logger.trace(Level.FINER, "Exception while loading keystore", e);
-				logger.message(Messages.SSL_KEYSTORE_NOT_FOUND, keystorePath);
-			} catch (IOException e) {
-				logger.trace(Level.FINER, "Exception while loading keystore", e);
-				logger.message(Messages.SSL_KEYSTORE_NOT_READABLE, keystorePath);
-			} catch (NoSuchAlgorithmException e) {
-				logger.trace(Level.FINER, "Exception while loading keystore", e);
-				logger.message(Messages.SSL_KEYSTORE_INVALID_ALGORITHM, keyManagerAlgorithm);
-			} catch (CertificateException e) {
-				logger.trace(Level.FINER, "Exception while loading keystore", e);
-				logger.message(Messages.SSL_KEYSTORE_INVALID_CERT, keystorePath);
-			} catch (UnrecoverableKeyException e) {
-				logger.trace(Level.FINER, "Exception while loading keystore", e);
-				logger.message(Messages.SSL_KEYSTORE_UNRECOVERABLE_KEY, keystorePath);
-			} catch (KeyStoreException e) {
-				logger.trace(Level.FINER, "Exception while loading keystore", e);
-				logger.message(Messages.SSL_KEYSTORE_INVALID, keystoreType);
-			} catch (Exception e) {
-				logger.trace(Level.FINER, "Exception while loading keystore", e);
-				logger.message(Messages.SSL_KEYSTORE_OTHER, keystorePath);
-			} finally {
-				if (fis != null) {
-					try {
-						fis.close();
-					} catch (IOException e) {
-						logger.trace(Level.FINER, "Exception while closing keystore", e);
-					}
-				}
-			}
-		}
-
-		if (keyManager == noKeys) {
-			logger.message(Messages.SSL_KEYSTORE_FALLBACK);
-		}
-
-		logger.exit();
-		return keyManager;
-	}
-
-}
-
-class AllTrustManager implements X509TrustManager {
-
-	/**
-	 * @param arg0
-	 * @param arg1
-	 */
-	public void checkClientTrusted(X509Certificate[] arg0, String arg1) {
-		return;
-	}
-
-	/**
-	 * @param arg0
-	 * @param arg1
-	 */
-	public void checkServerTrusted(X509Certificate[] arg0, String arg1) {
-		return;
-	}
-
-	public X509Certificate[] getAcceptedIssuers() {
-		return null;
-	}
-}
-
-class NoTrustManager implements X509TrustManager {
-
-	/**
-	 * @param arg0
-	 * @param arg1
-	 * @throws CertificateException
-	 */
-	public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
-		throw new CertificateException();
-	}
-
-	/**
-	 * @param arg0
-	 * @param arg1
-	 * @throws CertificateException
-	 */
-	public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
-		throw new CertificateException();
-	}
-
-	public X509Certificate[] getAcceptedIssuers() {
-		return null;
-	}
-}
-
-class EmptyKeyManager implements X509KeyManager {
-
-	/**
-	 * @param keyType
-	 * @param issuers
-	 * @param socket
-	 * @return String chooseClientAlias
-	 */
-	public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) {
-		return null;
-	}
-
-	/**
-	 * @param keyType
-	 * @param issuers
-	 * @param socket
-	 * @return String chooseServerAlias
-	 */
-	public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
-		return null;
-	}
-
-	/**
-	 * @param alias
-	 * @return X509Certificate[]
-	 */
-	public X509Certificate[] getCertificateChain(String alias) {
-		return null;
-	}
-
-	/**
-	 * @param keyType
-	 * @param issuers
-	 * @return String[]
-	 */
-	public String[] getClientAliases(String keyType, Principal[] issuers) {
-		return null;
-	}
-
-	/**
-	 * @param alias
-	 * @return PrivateKey
-	 */
-	public PrivateKey getPrivateKey(String alias) {
-		return null;
-	}
-
-	/**
-	 * @param keyType
-	 * @param issuers
-	 * @return String[]
-	 */
-	public String[] getServerAliases(String keyType, Principal[] issuers) {
-		return null;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1498130    2006-05-31  lupusalex    Selection of xml parser on a per connection basis
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1558663    2006-09-14  lupusalex    Support custom socket factories in client connections
+ * 1573723    2006-10-09  lupusalex    Selection of JSSE provider via properties file not feasible
+ * 1573723    2006-10-30  lupusalex    rework: Selection of JSSE provider via properties file not feasible
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 1660743    2007-02-15  lupusalex    SSLContext is static
+ * 1711092    2006-05-02  lupusalex    Some fixes/additions of log&trace messages
+ * 1815707    2007-10-18  ebak         TLS support
+ * 1815707    2007-10-30  ebak         rework: TLS support
+ * 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)
+ * 3001345    2010-05-18  blaschke-oss File handle leaks in HttpSocketFactory and LogAndTraceBroker
+ * 3027618    2010-07-14  blaschke-oss Close files/readers in finally blocks
+ * 3111718    2010-11-18  blaschke-oss org.sblim.cimclient SSL Code is using the wrong SSL Property
+ * 3536399    2012-08-25  hellerda     Add client/listener peer authentication properties
+ *    2647    2013-07-01  blaschke-oss Add two ssl protocol properties for http server and client
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.Socket;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.Security;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.logging.Level;
+
+import javax.net.ServerSocketFactory;
+import javax.net.SocketFactory;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+
+/**
+ * Class HttpSocketFactory manages socket factories
+ * 
+ */
+public class HttpSocketFactory {
+
+	private static HttpSocketFactory cInstance = new HttpSocketFactory();
+
+	private HttpSocketFactory() {
+	// empty
+	}
+
+	/**
+	 * Returns the singleton instance
+	 * 
+	 * @return The instance
+	 */
+	public static HttpSocketFactory getInstance() {
+		return cInstance;
+	}
+
+	/**
+	 * Returns a server socket factory
+	 * 
+	 * @param pContext
+	 *            The corresponding SSL context or null for
+	 *            insecure connections
+	 * 
+	 * @return The factory
+	 */
+	public ServerSocketFactory getServerSocketFactory(SSLContext pContext) {
+		return pContext != null ? pContext.getServerSocketFactory() : ServerSocketFactory
+				.getDefault();
+	}
+
+	/**
+	 * Returns a client socket factory
+	 * 
+	 * @param pContext
+	 *            The SSL context or null for insecure connections
+	 * @return The factory
+	 */
+	public SocketFactory getClientSocketFactory(SSLContext pContext) {
+		return pContext != null ? pContext.getSocketFactory() : SocketFactory.getDefault();
+	}
+
+	/**
+	 * Returns a SSLContext for client sockets corresponding to a given set of
+	 * configuration properties
+	 * 
+	 * @param pProperties
+	 *            The configuration to apply
+	 * @return The SSL context
+	 */
+	public SSLContext getClientSSLContext(final WBEMConfiguration pProperties) {
+		return getSSLContext(pProperties, false);
+	}
+
+	/**
+	 * Returns a SSLContext for server sockets corresponding to a given set of
+	 * configuration properties
+	 * 
+	 * @param pProperties
+	 *            The configuration to apply
+	 * @return The SSL context
+	 */
+	public SSLContext getServerSSLContext(final WBEMConfiguration pProperties) {
+		return getSSLContext(pProperties, true);
+	}
+
+	/**
+	 * Returns a SSLContext corresponding to a given set of configuration
+	 * properties
+	 * 
+	 * @param pProperties
+	 *            The configuration to apply
+	 * @param pIsServer
+	 *            true if a server socket context is requested,
+	 *            false otherwise
+	 * @return The SSL context
+	 */
+	private SSLContext getSSLContext(final WBEMConfiguration pProperties, boolean pIsServer) {
+
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		final String provider = pIsServer ? pProperties.getSslServerSocketProvider() : pProperties
+				.getSslSocketProvider();
+		logger.trace(Level.FINER, "Loading JSSE provider:" + provider);
+
+		final Provider securityProvider;
+
+		try {
+			Class providerClass = Class.forName(provider);
+			securityProvider = (java.security.Provider) providerClass.newInstance();
+			if (Security.getProvider(securityProvider.getName()) == null) {
+				Security.addProvider(securityProvider);
+			}
+		} catch (Exception e) {
+			logger.trace(Level.FINER, "Exception while loading JSSE provider", e);
+			logger.message(Messages.SSL_JSSE_PROVIDER_LOAD_FAILED, provider);
+			logger.exit();
+			throw new RuntimeException(e);
+		}
+
+		try {
+			KeyManager[] keyManager = loadKeystore(pProperties, securityProvider, pIsServer);
+
+			TrustManager[] trustManager = loadTruststore(pProperties, securityProvider, pIsServer);
+
+			String sslProtocol = pIsServer ? pProperties.getSslListenerProtocol() : pProperties
+					.getSslClientProtocol();
+
+			SSLContext sslContext = SSLContext.getInstance(sslProtocol != null ? sslProtocol
+					: pProperties.getSslProtocol(), securityProvider);
+
+			sslContext.init(keyManager, trustManager, null);
+
+			logger.exit();
+
+			return sslContext;
+
+		} catch (Exception e) {
+			logger.trace(Level.FINER, "Exception while initializing SSL context (provider:"
+					+ provider + ")", e);
+			logger.message(Messages.SSL_CONTEXT_INIT_FAILED);
+			logger.exit();
+			return null;
+		}
+	}
+
+	private TrustManager[] loadTruststore(final WBEMConfiguration pProperties,
+			final Provider pSecurityProvider, boolean pIsServer) {
+
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		final TrustManager[] trustAll = new X509TrustManager[] { new AllTrustManager() };
+		final TrustManager[] trustNone = new X509TrustManager[] { new NoTrustManager() };
+		TrustManager[] trustManager = trustNone;
+
+		final String truststorePath = pProperties.getSslTrustStorePath();
+		final char[] truststorePassword = pProperties.getSslTrustStorePassword().toCharArray();
+		final String truststoreType = pProperties.getSslTrustStoreType();
+		final String trustManagerAlgorithm = pProperties.getSslTrustManagerAlgorithm();
+		final boolean clientPeerVerification = pProperties.getSslClientPeerVerification();
+		final String listenerPeerVerification = pProperties.getSslListenerPeerVerification();
+
+		logger.trace(Level.FINER, "Using SSL truststore \"" + truststorePath + "\" ("
+				+ truststoreType + "/" + trustManagerAlgorithm + ")");
+
+		if (pIsServer && listenerPeerVerification.equalsIgnoreCase("ignore")
+				|| (!pIsServer && !clientPeerVerification)) {
+			trustManager = trustAll;
+			if (truststorePath == null || truststorePath.trim().length() == 0) {
+				logger.trace(Level.FINER, "Peer verification disabled for "
+						+ (pIsServer ? "Listener" : "Client"));
+			} else {
+				logger.message(Messages.SSL_TRUSTSTORE_INACTIVE);
+			}
+		} else {
+			if (truststorePath == null || truststorePath.trim().length() == 0) {
+				logger.trace(Level.FINER, "Peer verification enabled for "
+						+ (pIsServer ? "Listener" : "Client") + " but no truststore specified!");
+				logger.message(Messages.SSL_TRUSTSTORE_NULL);
+			} else {
+				logger.trace(Level.FINER, "Peer verification enabled for "
+						+ (pIsServer ? "Listener" : "Client"));
+				FileInputStream fis = null;
+				try {
+					final KeyStore trustStore = KeyStore.getInstance(truststoreType);
+					fis = new FileInputStream(truststorePath);
+					trustStore.load(fis, truststorePassword);
+					final TrustManagerFactory trustManagerFactory = TrustManagerFactory
+							.getInstance(trustManagerAlgorithm, pSecurityProvider);
+					trustManagerFactory.init(trustStore);
+					trustManager = trustManagerFactory.getTrustManagers();
+					logger.trace(Level.FINER, "Truststore successfully loaded for "
+							+ (pIsServer ? "Listener" : "Client"));
+				} catch (FileNotFoundException e) {
+					logger.trace(Level.FINER, "Exception while loading truststore", e);
+					logger.message(Messages.SSL_TRUSTSTORE_NOT_FOUND, truststorePath);
+				} catch (IOException e) {
+					logger.trace(Level.FINER, "Exception while loading truststore", e);
+					logger.message(Messages.SSL_TRUSTSTORE_NOT_READABLE, truststorePath);
+				} catch (NoSuchAlgorithmException e) {
+					logger.trace(Level.FINER, "Exception while loading truststore", e);
+					logger
+							.message(Messages.SSL_TRUSTSTORE_INVALID_ALGORITHM,
+									trustManagerAlgorithm);
+				} catch (CertificateException e) {
+					logger.trace(Level.FINER, "Exception while loading truststore", e);
+					logger.message(Messages.SSL_TRUSTSTORE_INVALID_CERT, truststorePath);
+				} catch (KeyStoreException e) {
+					logger.trace(Level.FINER, "Exception while loading truststore", e);
+					logger.message(Messages.SSL_TRUSTSTORE_INVALID, truststoreType);
+				} catch (Exception e) {
+					logger.trace(Level.FINER, "Exception while loading truststore", e);
+					logger.message(Messages.SSL_TRUSTSTORE_OTHER, truststorePath);
+				} finally {
+					if (fis != null) {
+						try {
+							fis.close();
+						} catch (IOException e) {
+							logger.trace(Level.FINER, "Exception while closing truststore", e);
+						}
+					}
+				}
+			}
+		}
+
+		if (trustManager == trustAll) {
+			logger.message(Messages.SSL_TRUSTSTORE_FALLBACK);
+		} else if (trustManager == trustNone) {
+			logger.message(Messages.SSL_TRUSTSTORE_FALLBACK_NOTRUST);
+		} else {
+			logger.message(Messages.SSL_TRUSTSTORE_ACTIVE);
+		}
+
+		logger.exit();
+		return trustManager;
+	}
+
+	private KeyManager[] loadKeystore(final WBEMConfiguration pProperties,
+			final Provider pSecurityProvider, boolean pIsServer) {
+
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		final KeyManager[] noKeys = new KeyManager[] { new EmptyKeyManager() };
+		KeyManager[] keyManager = noKeys;
+
+		final String keystorePath = pProperties.getSslKeyStorePath();
+		final char[] keystorePassword = pProperties.getSslKeyStorePassword().toCharArray();
+		final String keystoreType = pProperties.getSslKeyStoreType();
+		final String keyManagerAlgorithm = pProperties.getSslKeyManagerAlgorithm();
+
+		logger.trace(Level.FINER, "Using SSL keystore \"" + keystorePath + "\" (" + keystoreType
+				+ "/" + keyManagerAlgorithm + ")");
+
+		if (keystorePath == null || keystorePath.trim().length() == 0) {
+			logger.trace(Level.FINER, "Keystore not specified for "
+					+ (pIsServer ? "Listener" : "Client"));
+			logger.message(Messages.SSL_KEYSTORE_NULL);
+		} else {
+			logger.trace(Level.FINER, "Keystore specified and activated for "
+					+ (pIsServer ? "Listener" : "Client"));
+			FileInputStream fis = null;
+			try {
+				final KeyStore keystore = KeyStore.getInstance(keystoreType);
+				fis = new FileInputStream(keystorePath);
+				keystore.load(fis, keystorePassword);
+
+				final KeyManagerFactory keymanagerfactory = KeyManagerFactory.getInstance(
+						keyManagerAlgorithm, pSecurityProvider);
+				keymanagerfactory.init(keystore, keystorePassword);
+				keyManager = keymanagerfactory.getKeyManagers();
+				logger.trace(Level.FINER, "Keystore successfully loaded for "
+						+ (pIsServer ? "Listener" : "Client"));
+			} catch (FileNotFoundException e) {
+				logger.trace(Level.FINER, "Exception while loading keystore", e);
+				logger.message(Messages.SSL_KEYSTORE_NOT_FOUND, keystorePath);
+			} catch (IOException e) {
+				logger.trace(Level.FINER, "Exception while loading keystore", e);
+				logger.message(Messages.SSL_KEYSTORE_NOT_READABLE, keystorePath);
+			} catch (NoSuchAlgorithmException e) {
+				logger.trace(Level.FINER, "Exception while loading keystore", e);
+				logger.message(Messages.SSL_KEYSTORE_INVALID_ALGORITHM, keyManagerAlgorithm);
+			} catch (CertificateException e) {
+				logger.trace(Level.FINER, "Exception while loading keystore", e);
+				logger.message(Messages.SSL_KEYSTORE_INVALID_CERT, keystorePath);
+			} catch (UnrecoverableKeyException e) {
+				logger.trace(Level.FINER, "Exception while loading keystore", e);
+				logger.message(Messages.SSL_KEYSTORE_UNRECOVERABLE_KEY, keystorePath);
+			} catch (KeyStoreException e) {
+				logger.trace(Level.FINER, "Exception while loading keystore", e);
+				logger.message(Messages.SSL_KEYSTORE_INVALID, keystoreType);
+			} catch (Exception e) {
+				logger.trace(Level.FINER, "Exception while loading keystore", e);
+				logger.message(Messages.SSL_KEYSTORE_OTHER, keystorePath);
+			} finally {
+				if (fis != null) {
+					try {
+						fis.close();
+					} catch (IOException e) {
+						logger.trace(Level.FINER, "Exception while closing keystore", e);
+					}
+				}
+			}
+		}
+
+		if (keyManager == noKeys) {
+			logger.message(Messages.SSL_KEYSTORE_FALLBACK);
+		}
+
+		logger.exit();
+		return keyManager;
+	}
+
+}
+
+class AllTrustManager implements X509TrustManager {
+
+	/**
+	 * @param arg0
+	 * @param arg1
+	 */
+	public void checkClientTrusted(X509Certificate[] arg0, String arg1) {
+		return;
+	}
+
+	/**
+	 * @param arg0
+	 * @param arg1
+	 */
+	public void checkServerTrusted(X509Certificate[] arg0, String arg1) {
+		return;
+	}
+
+	public X509Certificate[] getAcceptedIssuers() {
+		return null;
+	}
+}
+
+class NoTrustManager implements X509TrustManager {
+
+	/**
+	 * @param arg0
+	 * @param arg1
+	 * @throws CertificateException
+	 */
+	public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+		throw new CertificateException();
+	}
+
+	/**
+	 * @param arg0
+	 * @param arg1
+	 * @throws CertificateException
+	 */
+	public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException {
+		throw new CertificateException();
+	}
+
+	public X509Certificate[] getAcceptedIssuers() {
+		return null;
+	}
+}
+
+class EmptyKeyManager implements X509KeyManager {
+
+	/**
+	 * @param keyType
+	 * @param issuers
+	 * @param socket
+	 * @return String chooseClientAlias
+	 */
+	public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) {
+		return null;
+	}
+
+	/**
+	 * @param keyType
+	 * @param issuers
+	 * @param socket
+	 * @return String chooseServerAlias
+	 */
+	public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
+		return null;
+	}
+
+	/**
+	 * @param alias
+	 * @return X509Certificate[]
+	 */
+	public X509Certificate[] getCertificateChain(String alias) {
+		return null;
+	}
+
+	/**
+	 * @param keyType
+	 * @param issuers
+	 * @return String[]
+	 */
+	public String[] getClientAliases(String keyType, Principal[] issuers) {
+		return null;
+	}
+
+	/**
+	 * @param alias
+	 * @return PrivateKey
+	 */
+	public PrivateKey getPrivateKey(String alias) {
+		return null;
+	}
+
+	/**
+	 * @param keyType
+	 * @param issuers
+	 * @return String[]
+	 */
+	public String[] getServerAliases(String keyType, Principal[] issuers) {
+		return null;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java
similarity index 85%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java
index 54cbcc9..b18b6e2 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java
@@ -1,271 +1,269 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag     Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1353168  2005-11-24  fiuczy       Possible NullPointerExcection in HttpClient.streamFinished()
- * 1488924  2006-05-15  lupusalex    Intermittent connection loss
- * 1535756  2006-08-07  lupusalex    Make code warning free
- * 1565892  2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 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)
- * 3026360  2010-07-07  blaschke-oss Handle unwritten fields
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.SocketPermission;
-import java.net.URI;
-import java.security.Permission;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-
-/**
- * Class HttpUrlConnection encapsulates a http connection
- * 
- */
-public class HttpUrlConnection extends HttpURLConnection {
-
-	private boolean iConnected;
-
-	private HttpClient iHttpClient;
-
-	protected URI iUrl;
-
-	private HttpClientPool iHttpClientPool;
-
-	AuthorizationHandler iAuthHandler;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pUri
-	 *            The host URI
-	 * @param pHttpClientPool
-	 *            The client pool
-	 * @param pAuthHandler
-	 *            The authentication handler
-	 */
-	public HttpUrlConnection(URI pUri, HttpClientPool pHttpClientPool,
-			AuthorizationHandler pAuthHandler) {
-		super(null);
-		this.iUrl = pUri;
-		this.iHttpClientPool = pHttpClientPool;
-		this.iAuthHandler = pAuthHandler;
-		// iLogger = GlobalProperties.getLogger();
-	}
-
-	@Override
-	public String toString() {
-		return "HttpUrlConnection=[url=" + this.iUrl + ",PoolSize="
-				+ this.iHttpClientPool.getNumberOfAvailableConnections() + "," + this.iAuthHandler
-				+ "]";
-	}
-
-	@Override
-	public Permission getPermission() {
-		int port = this.iUrl.getPort();
-		port = port < 0 ? 80 : port;
-		String host = this.iUrl.getHost() + ":" + port;
-		Permission permission = new SocketPermission(host, "connect");
-		return permission;
-	}
-
-	@Override
-	public synchronized void connect() throws IOException {
-		if (!this.iConnected) getClient();
-		this.iHttpClient.connect();
-	}
-
-	private synchronized void getClient() {
-		if (this.iConnected) return;
-
-		this.iHttpClient = HttpClient.getClient(this.iUrl, this.iHttpClientPool, this.iAuthHandler);
-		this.iHttpClient.reset();
-		this.iConnected = true;
-	}
-
-	@Override
-	public synchronized void setRequestMethod(String pMethod) {
-		if (!this.iConnected) getClient();
-		this.iHttpClient.setRequestMethod(pMethod);
-		this.method = pMethod;
-	}
-
-	@Override
-	public synchronized void setRequestProperty(String key, String value) {
-		if (!this.iConnected) getClient();
-		this.iHttpClient.setRequestProperty(key, value);
-	}
-
-	@Override
-	public synchronized void disconnect() {
-		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		if (this.iConnected) {
-			this.iConnected = false;
-			this.iHttpClient.disconnect();
-			if (this.iHttpClientPool != null) {
-				this.iHttpClientPool.removeConnectionFromPool(this.iHttpClient);
-				this.iHttpClient = null;
-			}
-		}
-		logger.exit();
-	}
-
-	/**
-	 * Closes the client pool
-	 */
-	public synchronized void close() {
-		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		if (this.iHttpClientPool != null) {
-			synchronized (this.iHttpClientPool) {
-				this.iHttpClientPool.closePool();
-				this.iHttpClientPool = null;
-			}
-		}
-		logger.exit();
-	}
-
-	@Override
-	public synchronized InputStream getInputStream() throws IOException {
-		if (!this.iConnected) getClient();
-		try {
-			return this.iHttpClient.getInputStream();
-		} catch (RuntimeException e) {
-			disconnect();
-			throw e;
-		} catch (IOException e) {
-			disconnect();
-			throw e;
-		}
-	}
-
-	@Override
-	public synchronized OutputStream getOutputStream() throws RuntimeException {
-		if (!this.iConnected) getClient();
-		try {
-			return this.iHttpClient.getOutputStream();
-		} catch (RuntimeException e) {
-			disconnect();
-			throw e;
-		}
-	}
-
-	@Override
-	public boolean usingProxy() {
-		return false;
-	}
-
-	/**
-	 * Returns the http client
-	 * 
-	 * @return The http client
-	 */
-	public synchronized HttpClient getHttpClient() {
-		if (!this.iConnected) getClient();
-		return this.iHttpClient;
-	}
-
-	@Override
-	public synchronized String getHeaderField(String name) {
-		if (!this.iConnected) getClient();
-		return this.iHttpClient.getHeaderField(name);
-	}
-
-	@Override
-	public synchronized String getHeaderFieldKey(int index) {
-		if (!this.iConnected) getClient();
-		return this.iHttpClient.getHeaderFieldName(index);
-	}
-
-	@Override
-	public synchronized String getHeaderField(int index) {
-		if (!this.iConnected) getClient();
-		return this.iHttpClient.getHeaderFieldValue(index);
-	}
-
-	@Override
-	public synchronized String getRequestProperty(String key) {
-		if (!this.iConnected) getClient();
-		return this.iHttpClient.getRequestProperty(key);
-	}
-
-	@Override
-	public synchronized String getRequestMethod() {
-		if (!this.iConnected) getClient();
-		return this.iHttpClient.getRequestMethod();
-	}
-
-	/**
-	 * Resets the http client
-	 */
-	public synchronized void reset() {
-		if (!this.iConnected) getClient();
-		this.iHttpClient.reset();
-	}
-
-	@Override
-	public synchronized int getResponseCode() throws IOException {
-		if (!this.iConnected) getClient();
-		return this.iHttpClient.getResponseCode();
-	}
-
-	@Override
-	public synchronized String getResponseMessage() {
-		if (!this.iConnected) getClient();
-		return this.iHttpClient.getResponseMessage();
-	}
-
-	/**
-	 * Enables/Disables the use of http 1.1
-	 * 
-	 * @param pUse11
-	 *            If true http 1.1 is enabled.
-	 */
-	public synchronized void useHttp11(boolean pUse11) {
-		if (!this.iConnected) getClient();
-		this.iHttpClient.useHttp11(pUse11);
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag     Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1353168  2005-11-24  fiuczy       Possible NullPointerExcection in HttpClient.streamFinished()
+ * 1488924  2006-05-15  lupusalex    Intermittent connection loss
+ * 1535756  2006-08-07  lupusalex    Make code warning free
+ * 1565892  2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 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)
+ * 3026360  2010-07-07  blaschke-oss Handle unwritten fields
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.SocketPermission;
+import java.net.URI;
+import java.security.Permission;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+
+/**
+ * Class HttpUrlConnection encapsulates a http connection
+ * 
+ */
+public class HttpUrlConnection extends HttpURLConnection {
+
+	private boolean iConnected;
+
+	private HttpClient iHttpClient;
+
+	protected URI iUrl;
+
+	private HttpClientPool iHttpClientPool;
+
+	AuthorizationHandler iAuthHandler;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pUri
+	 *            The host URI
+	 * @param pHttpClientPool
+	 *            The client pool
+	 * @param pAuthHandler
+	 *            The authentication handler
+	 */
+	public HttpUrlConnection(URI pUri, HttpClientPool pHttpClientPool,
+			AuthorizationHandler pAuthHandler) {
+		super(null);
+		this.iUrl = pUri;
+		this.iHttpClientPool = pHttpClientPool;
+		this.iAuthHandler = pAuthHandler;
+		// iLogger = GlobalProperties.getLogger();
+	}
+
+	@Override
+	public String toString() {
+		return "HttpUrlConnection=[url=" + this.iUrl + ",PoolSize="
+				+ this.iHttpClientPool.getNumberOfAvailableConnections() + "," + this.iAuthHandler
+				+ "]";
+	}
+
+	@Override
+	public Permission getPermission() {
+		int port = this.iUrl.getPort();
+		port = port < 0 ? 80 : port;
+		String host = this.iUrl.getHost() + ":" + port;
+		Permission permission = new SocketPermission(host, "connect");
+		return permission;
+	}
+
+	@Override
+	public synchronized void connect() throws IOException {
+		if (!this.iConnected) getClient();
+		this.iHttpClient.connect();
+	}
+
+	private synchronized void getClient() {
+		if (this.iConnected) return;
+
+		this.iHttpClient = HttpClient.getClient(this.iUrl, this.iHttpClientPool, this.iAuthHandler);
+		this.iHttpClient.reset();
+		this.iConnected = true;
+	}
+
+	@Override
+	public synchronized void setRequestMethod(String pMethod) {
+		if (!this.iConnected) getClient();
+		this.iHttpClient.setRequestMethod(pMethod);
+		this.method = pMethod;
+	}
+
+	@Override
+	public synchronized void setRequestProperty(String key, String value) {
+		if (!this.iConnected) getClient();
+		this.iHttpClient.setRequestProperty(key, value);
+	}
+
+	@Override
+	public synchronized void disconnect() {
+		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		if (this.iConnected) {
+			this.iConnected = false;
+			this.iHttpClient.disconnect();
+			if (this.iHttpClientPool != null) {
+				this.iHttpClientPool.removeConnectionFromPool(this.iHttpClient);
+				this.iHttpClient = null;
+			}
+		}
+		logger.exit();
+	}
+
+	/**
+	 * Closes the client pool
+	 */
+	public synchronized void close() {
+		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		if (this.iHttpClientPool != null) {
+			synchronized (this.iHttpClientPool) {
+				this.iHttpClientPool.closePool();
+				this.iHttpClientPool = null;
+			}
+		}
+		logger.exit();
+	}
+
+	@Override
+	public synchronized InputStream getInputStream() throws IOException {
+		if (!this.iConnected) getClient();
+		try {
+			return this.iHttpClient.getInputStream();
+		} catch (RuntimeException e) {
+			disconnect();
+			throw e;
+		} catch (IOException e) {
+			disconnect();
+			throw e;
+		}
+	}
+
+	@Override
+	public synchronized OutputStream getOutputStream() throws RuntimeException {
+		if (!this.iConnected) getClient();
+		try {
+			return this.iHttpClient.getOutputStream();
+		} catch (RuntimeException e) {
+			disconnect();
+			throw e;
+		}
+	}
+
+	@Override
+	public boolean usingProxy() {
+		return false;
+	}
+
+	/**
+	 * Returns the http client
+	 * 
+	 * @return The http client
+	 */
+	public synchronized HttpClient getHttpClient() {
+		if (!this.iConnected) getClient();
+		return this.iHttpClient;
+	}
+
+	@Override
+	public synchronized String getHeaderField(String name) {
+		if (!this.iConnected) getClient();
+		return this.iHttpClient.getHeaderField(name);
+	}
+
+	@Override
+	public synchronized String getHeaderFieldKey(int index) {
+		if (!this.iConnected) getClient();
+		return this.iHttpClient.getHeaderFieldName(index);
+	}
+
+	@Override
+	public synchronized String getHeaderField(int index) {
+		if (!this.iConnected) getClient();
+		return this.iHttpClient.getHeaderFieldValue(index);
+	}
+
+	@Override
+	public synchronized String getRequestProperty(String key) {
+		if (!this.iConnected) getClient();
+		return this.iHttpClient.getRequestProperty(key);
+	}
+
+	@Override
+	public synchronized String getRequestMethod() {
+		if (!this.iConnected) getClient();
+		return this.iHttpClient.getRequestMethod();
+	}
+
+	/**
+	 * Resets the http client
+	 */
+	public synchronized void reset() {
+		if (!this.iConnected) getClient();
+		this.iHttpClient.reset();
+	}
+
+	@Override
+	public synchronized int getResponseCode() throws IOException {
+		if (!this.iConnected) getClient();
+		return this.iHttpClient.getResponseCode();
+	}
+
+	@Override
+	public synchronized String getResponseMessage() {
+		if (!this.iConnected) getClient();
+		return this.iHttpClient.getResponseMessage();
+	}
+
+	/**
+	 * Enables/Disables the use of http 1.1
+	 * 
+	 * @param pUse11
+	 *            If true http 1.1 is enabled.
+	 */
+	public synchronized void useHttp11(boolean pUse11) {
+		if (!this.iConnected) getClient();
+		this.iHttpClient.useHttp11(pUse11);
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/MessageReader.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageReader.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/MessageReader.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageReader.java
index 85414d8..170e606 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/MessageReader.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageReader.java
@@ -1,202 +1,200 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag     Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3027479    2010-07-09  blaschke-oss Dead store to local variable
- * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
- *    2621    2013-02-23  blaschke-oss Not all chunked input has trailers
- *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
- *    2655    2013-08-14  blaschke-oss Content-length must be ignored when Transfer-encoding present
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.BoundedInputStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.ChunkedInputStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.PersistentInputStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-
-/**
- * Class MessageReader is responsible for reading http messages
- * 
- */
-public class MessageReader {
-
-	HttpHeader iHeader;
-
-	HttpServerMethod iMethod;
-
-	private boolean iChunked = false;
-
-	private String iEncoding = "UTF-8";
-
-	InputStream iContent;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The input stream
-	 * @param pTimeout
-	 *            The timeout for reading in entire header
-	 * @throws IOException
-	 * @throws HttpException
-	 */
-	public MessageReader(InputStream pStream, int pTimeout) throws IOException, HttpException {
-		this.iMethod = new HttpServerMethod(pStream);
-		this.iHeader = new HttpHeader(pStream, pTimeout);
-
-		String encoding = this.iHeader.getField("Transfer-Encoding");
-		if ((encoding != null) && (encoding.toLowerCase().endsWith("chunked"))) {
-			this.iChunked = true;
-		}
-		String length = this.iHeader.getField("Content-Length");
-		int contentLength = -1;
-		if (length != null && length.length() > 0) {
-			try {
-				contentLength = Integer.parseInt(length);
-			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINER,
-						"Exception while parsing http content-length", e);
-			}
-		}
-		String contentType = this.iHeader.getField("Content-Type");
-		if (contentType != null) {
-			try {
-				HttpHeaderParser contentTypeHeader = new HttpHeaderParser(contentType);
-				encoding = contentTypeHeader.getValue("charset");
-			} catch (Exception e) {
-				encoding = "UTF-8"; // TODO is this the default character
-				// encoding?
-				LogAndTraceBroker.getBroker().trace(Level.FINER,
-						"Exception while parsing http content-type", e);
-			}
-			this.iEncoding = encoding;
-		}
-
-		this.iContent = new PersistentInputStream(pStream, isPersistentConnectionSupported());
-		if (this.iChunked) {
-			this.iContent = new ChunkedInputStream(this.iContent, this.iHeader.getField("Trailer"),
-					"Indication Request");
-		} else if (contentLength >= 0) {
-			this.iContent = new BoundedInputStream(this.iContent, contentLength);
-		}
-	}
-
-	/**
-	 * Returns the character encoding
-	 * 
-	 * @return The character encoding
-	 */
-	public String getCharacterEncoding() {
-		return this.iEncoding;
-	}
-
-	/**
-	 * Returns the http header
-	 * 
-	 * @return The http header
-	 */
-	public HttpHeader getHeader() {
-		return this.iHeader;
-	}
-
-	/**
-	 * Returns the http server method
-	 * 
-	 * @return The http server method
-	 */
-	public HttpServerMethod getMethod() {
-		return this.iMethod;
-	}
-
-	/**
-	 * Returns the input stream
-	 * 
-	 * @return The input stream
-	 */
-	public InputStream getInputStream() {
-		return this.iContent;
-	}
-
-	/**
-	 * Returns the persistent connection support state
-	 * 
-	 * @return true if persistent connection is supported
-	 */
-	public boolean isPersistentConnectionSupported() {
-		String conn = this.iHeader.getField("Connection");
-		if (conn != null) {
-			if (conn.equalsIgnoreCase("close")) return false;
-			if (conn.equalsIgnoreCase("Keep-Alive")) return true;
-		}
-
-		return ((this.iMethod.getMajorVersion() >= 1) && (this.iMethod.getMinorVersion() >= 1));
-	}
-
-	/**
-	 * Returns the chunking support state
-	 * 
-	 * @return true if chunking is supported
-	 */
-	public boolean isChunkSupported() {
-		// TODO: make sure this is the correct way to test for chunk support
-		if ((this.iMethod.getMajorVersion() >= 1) && (this.iMethod.getMinorVersion() >= 1)) {
-			String TE;
-			if ((TE = this.iHeader.getField("TE")) != null && (TE.equalsIgnoreCase("trailers"))) { return true; }
-		}
-		return false;
-	}
-
-	/**
-	 * Closes the stream
-	 * 
-	 * @throws IOException
-	 */
-	public void close() throws IOException {
-		this.iContent.close();
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag     Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3027479    2010-07-09  blaschke-oss Dead store to local variable
+ * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
+ *    2621    2013-02-23  blaschke-oss Not all chunked input has trailers
+ *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
+ *    2655    2013-08-14  blaschke-oss Content-length must be ignored when Transfer-encoding present
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.BoundedInputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.ChunkedInputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.PersistentInputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+
+/**
+ * Class MessageReader is responsible for reading http messages
+ * 
+ */
+public class MessageReader {
+
+	HttpHeader iHeader;
+
+	HttpServerMethod iMethod;
+
+	private boolean iChunked = false;
+
+	private String iEncoding = "UTF-8";
+
+	InputStream iContent;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The input stream
+	 * @param pTimeout
+	 *            The timeout for reading in entire header
+	 * @throws IOException
+	 * @throws HttpException
+	 */
+	public MessageReader(InputStream pStream, int pTimeout) throws IOException, HttpException {
+		this.iMethod = new HttpServerMethod(pStream);
+		this.iHeader = new HttpHeader(pStream, pTimeout);
+
+		String encoding = this.iHeader.getField("Transfer-Encoding");
+		if ((encoding != null) && (encoding.toLowerCase().endsWith("chunked"))) {
+			this.iChunked = true;
+		}
+		String length = this.iHeader.getField("Content-Length");
+		int contentLength = -1;
+		if (length != null && length.length() > 0) {
+			try {
+				contentLength = Integer.parseInt(length);
+			} catch (Exception e) {
+				LogAndTraceBroker.getBroker().trace(Level.FINER,
+						"Exception while parsing http content-length", e);
+			}
+		}
+		String contentType = this.iHeader.getField("Content-Type");
+		if (contentType != null) {
+			try {
+				HttpHeaderParser contentTypeHeader = new HttpHeaderParser(contentType);
+				encoding = contentTypeHeader.getValue("charset");
+			} catch (Exception e) {
+				encoding = "UTF-8"; // TODO is this the default character
+				// encoding?
+				LogAndTraceBroker.getBroker().trace(Level.FINER,
+						"Exception while parsing http content-type", e);
+			}
+			this.iEncoding = encoding;
+		}
+
+		this.iContent = new PersistentInputStream(pStream, isPersistentConnectionSupported());
+		if (this.iChunked) {
+			this.iContent = new ChunkedInputStream(this.iContent, this.iHeader.getField("Trailer"),
+					"Indication Request");
+		} else if (contentLength >= 0) {
+			this.iContent = new BoundedInputStream(this.iContent, contentLength);
+		}
+	}
+
+	/**
+	 * Returns the character encoding
+	 * 
+	 * @return The character encoding
+	 */
+	public String getCharacterEncoding() {
+		return this.iEncoding;
+	}
+
+	/**
+	 * Returns the http header
+	 * 
+	 * @return The http header
+	 */
+	public HttpHeader getHeader() {
+		return this.iHeader;
+	}
+
+	/**
+	 * Returns the http server method
+	 * 
+	 * @return The http server method
+	 */
+	public HttpServerMethod getMethod() {
+		return this.iMethod;
+	}
+
+	/**
+	 * Returns the input stream
+	 * 
+	 * @return The input stream
+	 */
+	public InputStream getInputStream() {
+		return this.iContent;
+	}
+
+	/**
+	 * Returns the persistent connection support state
+	 * 
+	 * @return true if persistent connection is supported
+	 */
+	public boolean isPersistentConnectionSupported() {
+		String conn = this.iHeader.getField("Connection");
+		if (conn != null) {
+			if (conn.equalsIgnoreCase("close")) return false;
+			if (conn.equalsIgnoreCase("Keep-Alive")) return true;
+		}
+
+		return ((this.iMethod.getMajorVersion() >= 1) && (this.iMethod.getMinorVersion() >= 1));
+	}
+
+	/**
+	 * Returns the chunking support state
+	 * 
+	 * @return true if chunking is supported
+	 */
+	public boolean isChunkSupported() {
+		// TODO: make sure this is the correct way to test for chunk support
+		if ((this.iMethod.getMajorVersion() >= 1) && (this.iMethod.getMinorVersion() >= 1)) {
+			String TE;
+			if ((TE = this.iHeader.getField("TE")) != null && (TE.equalsIgnoreCase("trailers"))) { return true; }
+		}
+		return false;
+	}
+
+	/**
+	 * Closes the stream
+	 * 
+	 * @throws IOException
+	 */
+	public void close() throws IOException {
+		this.iContent.close();
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/MessageWriter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageWriter.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/MessageWriter.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageWriter.java
index 134847c..f9c344a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/MessageWriter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageWriter.java
@@ -1,201 +1,199 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 17620      2005-06-29  thschaef     eliminate ASCIIPrintStream1 in import statement       
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3304058    2011-05-20  blaschke-oss Use same date format in change history
- * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
- *    2620    2013-02-23  blaschke-oss Chunked output broken
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.ChunkedOutputStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.PersistentOutputStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-
-/**
- * Class MessageWriter is responsible for creating http messages
- * 
- */
-public class MessageWriter {
-
-	HttpHeader iHeader = null;
-
-	HttpServerMethod iMethod = null;
-
-	HttpHeader iTrailer = null;
-
-	boolean iChunked = false;
-
-	boolean iPersistent = false;
-
-	ASCIIPrintStream iRealOS;
-
-	ASCIIPrintStream iClientOS;
-
-	ByteArrayOutputStream iBufferedOS;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 * @param pPersistent
-	 * @param pChunked
-	 */
-	public MessageWriter(OutputStream pStream, boolean pPersistent, boolean pChunked) {
-		this.iRealOS = new ASCIIPrintStream(pStream);
-		this.iChunked = pChunked;
-		this.iPersistent = pPersistent;
-		this.iBufferedOS = new ByteArrayOutputStream();
-		if (pChunked) {
-			this.iClientOS = new ASCIIPrintStream(new ChunkedOutputStream(
-					new PersistentOutputStream(this.iBufferedOS, pPersistent), 512));
-		} else {
-			this.iClientOS = new ASCIIPrintStream(new PersistentOutputStream(this.iBufferedOS,
-					pPersistent));
-		}
-		this.iHeader = new HttpHeader();
-		this.iMethod = new HttpServerMethod(HttpConnectionHandler.MAJOR_VERSION,
-				HttpConnectionHandler.MINOR_VERSION, 200, "OK");
-	}
-
-	/**
-	 * Resets the stream
-	 */
-	public void reset() {
-		this.iBufferedOS.reset();
-	}
-
-	/**
-	 * Sets the http header
-	 * 
-	 * @param header
-	 *            The new value
-	 */
-	public void setHeader(HttpHeader header) {
-		this.iHeader = header;
-	}
-
-	/**
-	 * Sets the http server method
-	 * 
-	 * @param method
-	 *            The new value
-	 */
-	public void setMethod(HttpServerMethod method) {
-		this.iMethod = method;
-	}
-
-	/**
-	 * Returns the http header
-	 * 
-	 * @return The http header
-	 */
-	public HttpHeader getHeader() {
-		return this.iHeader;
-	}
-
-	/**
-	 * Returns the http server method
-	 * 
-	 * @return The http server method
-	 */
-	public HttpServerMethod getMethod() {
-		return this.iMethod;
-	}
-
-	/**
-	 * Returns the output stream
-	 * 
-	 * @return The output stream
-	 */
-	public ASCIIPrintStream getOutputStream() {
-		return this.iClientOS;
-	}
-
-	/**
-	 * Write the message and flushes the streams
-	 * 
-	 * @throws IOException
-	 */
-	public void close() throws IOException {
-		this.iMethod.write(this.iRealOS);
-		this.iRealOS.flush();
-		if (!this.iChunked) this.iHeader.removeField("Transfer-Encoding");
-		else this.iHeader.addField("Transfer-Encoding", "chunked");
-		if (this.iPersistent) this.iHeader.addField("Connection", "Keep-iAlive");
-		else this.iHeader.addField("Connection", "close");
-
-		this.iHeader.addField("Content-Type", "application/xml;charset=\"utf-8\"");
-		if (!this.iChunked) this.iHeader.addField("Content-length", Integer
-				.toString(this.iBufferedOS.size()));
-		LogAndTraceBroker.getBroker().trace(Level.FINER,
-				"Indication Response HTTP Headers= " + this.iHeader.toString());
-		this.iHeader.write(this.iRealOS);
-		this.iRealOS.flush();
-		if (this.iChunked) this.iClientOS.close();
-		this.iBufferedOS.writeTo(this.iRealOS);
-		if (this.iChunked && (this.iTrailer != null)) {
-			LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"Indication Response HTTP Trailer Headers= " + this.iTrailer.toString());
-			this.iTrailer.write(this.iRealOS);
-		}
-		this.iRealOS.flush();
-	}
-
-	/**
-	 * Sets the trailer
-	 * 
-	 * @param pTrailer
-	 *            The new value
-	 */
-	public void setTrailer(HttpHeader pTrailer) {
-		this.iTrailer = pTrailer;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 17620      2005-06-29  thschaef     eliminate ASCIIPrintStream1 in import statement       
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3304058    2011-05-20  blaschke-oss Use same date format in change history
+ * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
+ *    2620    2013-02-23  blaschke-oss Chunked output broken
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.ChunkedOutputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.PersistentOutputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+
+/**
+ * Class MessageWriter is responsible for creating http messages
+ * 
+ */
+public class MessageWriter {
+
+	HttpHeader iHeader = null;
+
+	HttpServerMethod iMethod = null;
+
+	HttpHeader iTrailer = null;
+
+	boolean iChunked = false;
+
+	boolean iPersistent = false;
+
+	ASCIIPrintStream iRealOS;
+
+	ASCIIPrintStream iClientOS;
+
+	ByteArrayOutputStream iBufferedOS;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 * @param pPersistent
+	 * @param pChunked
+	 */
+	public MessageWriter(OutputStream pStream, boolean pPersistent, boolean pChunked) {
+		this.iRealOS = new ASCIIPrintStream(pStream);
+		this.iChunked = pChunked;
+		this.iPersistent = pPersistent;
+		this.iBufferedOS = new ByteArrayOutputStream();
+		if (pChunked) {
+			this.iClientOS = new ASCIIPrintStream(new ChunkedOutputStream(
+					new PersistentOutputStream(this.iBufferedOS, pPersistent), 512));
+		} else {
+			this.iClientOS = new ASCIIPrintStream(new PersistentOutputStream(this.iBufferedOS,
+					pPersistent));
+		}
+		this.iHeader = new HttpHeader();
+		this.iMethod = new HttpServerMethod(HttpConnectionHandler.MAJOR_VERSION,
+				HttpConnectionHandler.MINOR_VERSION, 200, "OK");
+	}
+
+	/**
+	 * Resets the stream
+	 */
+	public void reset() {
+		this.iBufferedOS.reset();
+	}
+
+	/**
+	 * Sets the http header
+	 * 
+	 * @param header
+	 *            The new value
+	 */
+	public void setHeader(HttpHeader header) {
+		this.iHeader = header;
+	}
+
+	/**
+	 * Sets the http server method
+	 * 
+	 * @param method
+	 *            The new value
+	 */
+	public void setMethod(HttpServerMethod method) {
+		this.iMethod = method;
+	}
+
+	/**
+	 * Returns the http header
+	 * 
+	 * @return The http header
+	 */
+	public HttpHeader getHeader() {
+		return this.iHeader;
+	}
+
+	/**
+	 * Returns the http server method
+	 * 
+	 * @return The http server method
+	 */
+	public HttpServerMethod getMethod() {
+		return this.iMethod;
+	}
+
+	/**
+	 * Returns the output stream
+	 * 
+	 * @return The output stream
+	 */
+	public ASCIIPrintStream getOutputStream() {
+		return this.iClientOS;
+	}
+
+	/**
+	 * Write the message and flushes the streams
+	 * 
+	 * @throws IOException
+	 */
+	public void close() throws IOException {
+		this.iMethod.write(this.iRealOS);
+		this.iRealOS.flush();
+		if (!this.iChunked) this.iHeader.removeField("Transfer-Encoding");
+		else this.iHeader.addField("Transfer-Encoding", "chunked");
+		if (this.iPersistent) this.iHeader.addField("Connection", "Keep-iAlive");
+		else this.iHeader.addField("Connection", "close");
+
+		this.iHeader.addField("Content-Type", "application/xml;charset=\"utf-8\"");
+		if (!this.iChunked) this.iHeader.addField("Content-length", Integer
+				.toString(this.iBufferedOS.size()));
+		LogAndTraceBroker.getBroker().trace(Level.FINER,
+				"Indication Response HTTP Headers= " + this.iHeader.toString());
+		this.iHeader.write(this.iRealOS);
+		this.iRealOS.flush();
+		if (this.iChunked) this.iClientOS.close();
+		this.iBufferedOS.writeTo(this.iRealOS);
+		if (this.iChunked && (this.iTrailer != null)) {
+			LogAndTraceBroker.getBroker().trace(Level.FINER,
+					"Indication Response HTTP Trailer Headers= " + this.iTrailer.toString());
+			this.iTrailer.write(this.iRealOS);
+		}
+		this.iRealOS.flush();
+	}
+
+	/**
+	 * Sets the trailer
+	 * 
+	 * @param pTrailer
+	 *            The new value
+	 */
+	public void setTrailer(HttpHeader pTrailer) {
+		this.iTrailer = pTrailer;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java
index 0d4e040..408539a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java
@@ -1,182 +1,180 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- * ------------------------------------------------------------------------------- 
- * 1516242    2006-07-05  lupusalex    Support of OpenPegasus local authentication
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 1710066    2007-04-30  lupsualex    LocalAuth fails for z/OS Pegasus
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 3027618    2010-07-14  blaschke-oss Close files/readers in finally blocks
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URI;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.Messages;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConstants;
-
-/**
- * Implements OpenPegasus local authentication
- */
-public class PegasusLocalAuthInfo extends AuthorizationInfo {
-
-	private boolean iChallenged = false;
-
-	/**
-	 * Default ctor.
-	 */
-	public PegasusLocalAuthInfo() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.sblim.cimclient.internal.http.AuthorizationInfo#updateAuthenticationInfo
-	 * (org.sblim.cimclient.internal.http.Challenge, java.net.URI,
-	 * java.lang.String)
-	 */
-	/**
-	 * @param challenge
-	 * @param authenticate
-	 * @param url
-	 * @param requestMethod
-	 */
-	@Override
-	public void updateAuthenticationInfo(Challenge challenge, String authenticate, URI url,
-			String requestMethod) {
-		this.iChallenged = true;
-		this.iResponse = authenticate;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-
-		if (this.iChallenged && this.iResponse != null && this.iResponse.startsWith("Local ")) {
-
-			String fileName = "";
-			BufferedReader in = null;
-
-			try {
-
-				fileName = this.iResponse.substring(7, this.iResponse.length() - 1);
-
-				if (fileName.length() == 0) throw new IOException(
-						"No local authorization file specified");
-
-				File authorizationFile = new File(fileName);
-
-				if (!authorizationFile.canRead()) throw new IOException(
-						"Local authorization file not accessible");
-
-				in = WBEMConstants.Z_OS.equals(System.getProperty(WBEMConstants.OS_NAME)) ? new BufferedReader(
-						new InputStreamReader(new FileInputStream(authorizationFile),
-								WBEMConstants.ISO_8859_1))
-						: new BufferedReader(new FileReader(authorizationFile));
-
-				StringBuffer buffer = new StringBuffer();
-				String line;
-
-				while (true) {
-					line = in.readLine();
-					if (line == null) break;
-					buffer.append(line);
-				}
-
-				StringBuffer header = new StringBuffer();
-				header.append("Local \"");
-				header.append(getCredentials().getUserName());
-				header.append(':');
-				header.append(fileName);
-				header.append(':');
-				header.append(buffer);
-				header.append('"');
-
-				return header.toString();
-
-			} catch (IOException e) {
-				LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-				logger.trace(Level.FINER,
-						"Exception while reading OpenPegasus local authorization file", e);
-				logger.message(Messages.HTTP_PEGASUS_LOCAL_AUTH_READ, fileName);
-			} finally {
-				if (in != null) {
-					try {
-						in.close();
-					} catch (IOException e) {
-						LogAndTraceBroker.getBroker().trace(Level.FINER,
-								"Exception while closing OpenPegasus local authorization file", e);
-					}
-				}
-			}
-		}
-
-		return "Local \"" + getCredentials().getUserName() + "\"";
-	}
-
-	@Override
-	public String getHeaderFieldName() {
-		return "PegasusAuthorization";
-	}
-
-	@Override
-	public boolean isSentOnFirstRequest() {
-		return true;
-	}
-
-	@Override
-	public boolean isKeptAlive() {
-		return true;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ * ------------------------------------------------------------------------------- 
+ * 1516242    2006-07-05  lupusalex    Support of OpenPegasus local authentication
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 1710066    2007-04-30  lupsualex    LocalAuth fails for z/OS Pegasus
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 3027618    2010-07-14  blaschke-oss Close files/readers in finally blocks
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URI;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
+
+/**
+ * Implements OpenPegasus local authentication
+ */
+public class PegasusLocalAuthInfo extends AuthorizationInfo {
+
+	private boolean iChallenged = false;
+
+	/**
+	 * Default ctor.
+	 */
+	public PegasusLocalAuthInfo() {
+		super();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.sblim.cimclient.internal.http.AuthorizationInfo#updateAuthenticationInfo
+	 * (org.sblim.cimclient.internal.http.Challenge, java.net.URI,
+	 * java.lang.String)
+	 */
+	/**
+	 * @param challenge
+	 * @param authenticate
+	 * @param url
+	 * @param requestMethod
+	 */
+	@Override
+	public void updateAuthenticationInfo(Challenge challenge, String authenticate, URI url,
+			String requestMethod) {
+		this.iChallenged = true;
+		this.iResponse = authenticate;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+
+		if (this.iChallenged && this.iResponse != null && this.iResponse.startsWith("Local ")) {
+
+			String fileName = "";
+			BufferedReader in = null;
+
+			try {
+
+				fileName = this.iResponse.substring(7, this.iResponse.length() - 1);
+
+				if (fileName.length() == 0) throw new IOException(
+						"No local authorization file specified");
+
+				File authorizationFile = new File(fileName);
+
+				if (!authorizationFile.canRead()) throw new IOException(
+						"Local authorization file not accessible");
+
+				in = WBEMConstants.Z_OS.equals(System.getProperty(WBEMConstants.OS_NAME)) ? new BufferedReader(
+						new InputStreamReader(new FileInputStream(authorizationFile),
+								WBEMConstants.ISO_8859_1))
+						: new BufferedReader(new FileReader(authorizationFile));
+
+				StringBuffer buffer = new StringBuffer();
+				String line;
+
+				while (true) {
+					line = in.readLine();
+					if (line == null) break;
+					buffer.append(line);
+				}
+
+				StringBuffer header = new StringBuffer();
+				header.append("Local \"");
+				header.append(getCredentials().getUserName());
+				header.append(':');
+				header.append(fileName);
+				header.append(':');
+				header.append(buffer);
+				header.append('"');
+
+				return header.toString();
+
+			} catch (IOException e) {
+				LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+				logger.trace(Level.FINER,
+						"Exception while reading OpenPegasus local authorization file", e);
+				logger.message(Messages.HTTP_PEGASUS_LOCAL_AUTH_READ, fileName);
+			} finally {
+				if (in != null) {
+					try {
+						in.close();
+					} catch (IOException e) {
+						LogAndTraceBroker.getBroker().trace(Level.FINER,
+								"Exception while closing OpenPegasus local authorization file", e);
+					}
+				}
+			}
+		}
+
+		return "Local \"" + getCredentials().getUserName() + "\"";
+	}
+
+	@Override
+	public String getHeaderFieldName() {
+		return "PegasusAuthorization";
+	}
+
+	@Override
+	public boolean isSentOnFirstRequest() {
+		return true;
+	}
+
+	@Override
+	public boolean isKeptAlive() {
+		return true;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java
similarity index 90%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java
index c0eabdc..b9dd392 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java
@@ -1,361 +1,359 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1536711    2006-08-15  lupusalex    NullPointerException causes client call to never return 
- * 1516242    2006-11-27  lupusalex    Support of OpenPegasus local authentication
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 1627832    2007-01-08  lupuslaex    Incorrect retry behaviour on HTTP 401
- * 1892046    2008-02-13  blaschke-oss Basic/digest authentication problem for Japanese users
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.UnsupportedEncodingException;
-import java.net.PasswordAuthentication;
-import java.net.URI;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Vector;
-
-/**
- * Implements HTTP basic and digest authentication
- */
-public class WwwAuthInfo extends AuthorizationInfo {
-
-	/**
-	 * Default ctor.
-	 */
-	public WwwAuthInfo() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		StringBuffer result = new StringBuffer();
-
-		String _nc = Long.toHexString(this.iNc);
-
-		if (this.iScheme.equalsIgnoreCase("Digest")) {
-
-			if (this.iRealm == null) { // support for some ICAT CIMOMs buggy
-				// Digest authentication
-				try {
-					MessageDigest messageDigest = null;
-					messageDigest = MessageDigest.getInstance("MD5");
-
-					messageDigest.update(getBytes((this.iCredentials != null && this.iCredentials
-							.getUserName() != null) ? String.valueOf(this.iCredentials
-							.getPassword()) : "null", "UTF-8"));
-					String pass = HttpClient.convertToHexString(messageDigest.digest());
-					return "Digest username="
-							+ ((this.iCredentials != null && this.iCredentials.getUserName() != null) ? this.iCredentials
-									.getUserName()
-									: "null") + ", response=" + pass;
-				} catch (NoSuchAlgorithmException e) {
-					// TODO log
-					e.printStackTrace();
-				}
-			}
-
-			result.append(this.iScheme);
-			result.append(" username=\"");
-			result
-					.append((this.iCredentials != null && this.iCredentials.getUserName() != null) ? this.iCredentials
-							.getUserName()
-							: "null");
-			result.append("\"");
-			if (this.iRealm != null) {
-				result.append(", realm=\"");
-				result.append(this.iRealm);
-				result.append("\"");
-			}
-			if (this.iNonce != null) {
-				result.append(", nonce=\"");
-				result.append(this.iNonce);
-				result.append("\"");
-			}
-			result.append(", uri=\"");
-			result.append(this.iUri);
-			result.append("\", response=\"");
-			result.append(this.iResponse);
-			result.append("\"");
-			// if (algorithm != null) {
-			// result.append(", algorithm=");
-			// result.append(algorithm);
-			// }
-			if (this.iCnonce != null) {
-				result.append(", cnonce=\"");
-				result.append(this.iCnonce);
-				result.append("\"");
-			}
-			if (this.iOpaque != null) {
-				result.append(", opaque=\"");
-				result.append(this.iOpaque);
-				result.append("\"");
-			}
-			if (this.iQop != null) {
-				result.append(", qop=");
-				result.append(this.iQop);
-			}
-			if (this.iNc > -1) {
-				result.append(", nc=");
-				result.append("00000000".substring(_nc.length()));
-				result.append(_nc);
-			}
-		} else if (this.iScheme.equalsIgnoreCase("Basic")) {
-
-			result.append("Basic ");
-
-			StringBuffer tmp = new StringBuffer();
-			tmp
-					.append((this.iCredentials != null && this.iCredentials.getUserName() != null) ? this.iCredentials
-							.getUserName()
-							: "null");
-			tmp.append(':');
-			tmp
-					.append((this.iCredentials != null && this.iCredentials.getPassword() != null) ? String
-							.valueOf(this.iCredentials.getPassword())
-							: "null");
-
-			result.append(BASE64Encoder.encode(getBytes(tmp.toString(), "UTF-8")));
-		}
-		return result.toString();
-	}
-
-	/**
-	 * Splits a comma-separated string into multiple substrings
-	 * 
-	 * @param pLine
-	 *            The comma-separated string
-	 * @return The array of substrings (excluding commas)
-	 */
-	public static String[] split(String pLine) {
-		Vector elem = new Vector();
-		int start = 0;
-		int end;
-		while ((end = pLine.indexOf(',')) > -1) {
-			elem.add(pLine.substring(start, end));
-			start = end + 1;
-		}
-		if (end < pLine.length()) elem.add(pLine.substring(start));
-		String[] result = new String[elem.size()];
-		elem.toArray(result);
-		return result;
-	}
-
-	private static byte[] getBytes(String str, String encoding) {
-		byte[] bytes;
-		try {
-			bytes = str.getBytes(encoding);
-		} catch (UnsupportedEncodingException e) {
-			bytes = str.getBytes();
-		}
-		return bytes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.sblim.cimclient.internal.http.AuthorizationInfo#updateAuthenticationInfo
-	 * (org.sblim.cimclient.internal.http.Challenge, java.net.URI,
-	 * java.lang.String)
-	 */
-	/**
-	 * @param authenticate
-	 */
-	@Override
-	public void updateAuthenticationInfo(Challenge challenge, String authenticate, URI url,
-			String requestMethod) throws NoSuchAlgorithmException {
-
-		setURI(url.getPath());
-		HttpHeader params = challenge.getParams();
-
-		this.iScheme = challenge.getScheme();
-
-		if (!this.iScheme.equalsIgnoreCase("Digest")) { return; }
-
-		this.iRealm = params.getField("realm");
-
-		String algorithm = params.getField("algorithm");
-		String opaque = params.getField("opaque");
-		String nonce = params.getField("nonce");
-		String qop = params.getField("qop");
-
-		this.iAlgorithm = (algorithm != null) ? algorithm : this.iAlgorithm;
-		this.iOpaque = (opaque != null) ? opaque : this.iOpaque;
-		this.iNonce = (nonce != null) ? nonce : this.iNonce;
-		this.iQop = (qop != null) ? qop : this.iQop;
-
-		MessageDigest messageDigest = null;
-
-		messageDigest = MessageDigest.getInstance("MD5");
-
-		if (qop != null || ("md5-sess".equalsIgnoreCase(algorithm))) {
-			long time = System.currentTimeMillis();
-			byte[] b = new byte[8];
-
-			b[0] = (byte) ((time >> 0) & 0xFF);
-			b[1] = (byte) ((time >> 8) & 0xFF);
-			b[2] = (byte) ((time >> 16) & 0xFF);
-			b[3] = (byte) ((time >> 24) & 0xFF);
-			b[4] = (byte) ((time >> 32) & 0xFF);
-			b[5] = (byte) ((time >> 40) & 0xFF);
-			b[6] = (byte) ((time >> 48) & 0xFF);
-			b[7] = (byte) ((time >> 56) & 0xFF);
-
-			messageDigest.reset();
-			messageDigest.update(b);
-
-			this.iCnonce = HttpClient.convertToHexString(messageDigest.digest());
-		}
-		if (qop != null) {
-			String[] list_qop = split(qop);
-			for (int i = 0; i < list_qop.length; i++) {
-				if (list_qop[i].equalsIgnoreCase("auth-int")) {
-					qop = "auth-int"; // this one has higher priority
-					break;
-				}
-				if ((list_qop[i].equalsIgnoreCase("auth"))) qop = "auth";
-			}
-			setQop(qop);
-		}
-		String nc1 = params.getField("nc");
-		long challengeNc = 1;
-		if (nc1 != null) {
-			try {
-				challengeNc = Long.parseLong(nc1, 16);
-			} catch (Exception e) {
-				// Logger logger = SessionProperties.getGlobalProperties()
-				// .getLogger();
-				// if (logger.isLoggable(Level.WARNING)) {
-				// logger.log(Level.WARNING,
-				// "exception while parsing challenge NC", e);
-				// }
-			}
-			if (getNc() == challengeNc) {
-				setNc(++challengeNc);
-			}
-		} else {
-			setNc(challengeNc = 1);
-		}
-
-		messageDigest.reset();
-		PasswordAuthentication credentials1 = getCredentials();
-		this.iA1 = credentials1.getUserName() + ":" + getRealm() + ":"
-				+ String.valueOf(credentials1.getPassword());
-		// System.out.println("Base:"+A1);
-		messageDigest.update(getBytes(this.iA1, "UTF-8"));
-
-		if ("md5-sess".equalsIgnoreCase(algorithm)) {
-			messageDigest.update(getBytes((":" + getNonce() + ":" + getCnonce()), "UTF-8"));
-
-		}
-
-		byte[] digest1 = messageDigest.digest();
-		String sessionKey = HttpClient.convertToHexString(digest1);
-
-		// System.out.println("A1:"+sessionKey);
-		String method = requestMethod;
-
-		// if (con instanceof HttpURLConnection)
-		// method = ((HttpURLConnection) con).getRequestMethod();
-
-		String A2 = method + ":" + getURI();
-
-		if ("auth-int".equalsIgnoreCase(qop)) {
-			messageDigest.reset();
-			// messageDigest.update(readFully(con)); //TODO
-			messageDigest.update(new byte[] {}); // TODO this must be the
-			// entity body, not the
-			// message body
-			A2 = A2 + ":" + HttpClient.convertToHexString(messageDigest.digest());
-		}
-		messageDigest.reset();
-		messageDigest.update(getBytes(A2, "UTF-8"));
-		A2 = HttpClient.convertToHexString(messageDigest.digest());
-
-		messageDigest.reset();
-		if (qop == null) {
-			messageDigest.update(getBytes((sessionKey + ":" + nonce + ":" + A2), "UTF-8"));
-		} else {
-			String _nc = Long.toHexString(challengeNc);
-			messageDigest.update(getBytes((sessionKey + ":" + nonce + ":"
-					+ "00000000".substring(_nc.length()) + _nc + ":" + getCnonce() + ":" + qop
-					+ ":" + A2), "UTF-8"));
-		}
-		this.iResponse = HttpClient.convertToHexString(messageDigest.digest());
-
-		// TODO handle digest-required header
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.sblim.cimclient.internal.http.AuthorizationInfo#getHeaderFieldName()
-	 */
-	@Override
-	public String getHeaderFieldName() {
-		return "Authorization";
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.sblim.cimclient.internal.http.AuthorizationInfo#isSentOnFirstRequest
-	 * ()
-	 */
-	@Override
-	public boolean isSentOnFirstRequest() {
-		return false;
-	}
-
-	@Override
-	public boolean isKeptAlive() {
-		return true;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1536711    2006-08-15  lupusalex    NullPointerException causes client call to never return 
+ * 1516242    2006-11-27  lupusalex    Support of OpenPegasus local authentication
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 1627832    2007-01-08  lupuslaex    Incorrect retry behaviour on HTTP 401
+ * 1892046    2008-02-13  blaschke-oss Basic/digest authentication problem for Japanese users
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.UnsupportedEncodingException;
+import java.net.PasswordAuthentication;
+import java.net.URI;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Vector;
+
+/**
+ * Implements HTTP basic and digest authentication
+ */
+public class WwwAuthInfo extends AuthorizationInfo {
+
+	/**
+	 * Default ctor.
+	 */
+	public WwwAuthInfo() {
+		super();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		StringBuffer result = new StringBuffer();
+
+		String _nc = Long.toHexString(this.iNc);
+
+		if (this.iScheme.equalsIgnoreCase("Digest")) {
+
+			if (this.iRealm == null) { // support for some ICAT CIMOMs buggy
+				// Digest authentication
+				try {
+					MessageDigest messageDigest = null;
+					messageDigest = MessageDigest.getInstance("MD5");
+
+					messageDigest.update(getBytes((this.iCredentials != null && this.iCredentials
+							.getUserName() != null) ? String.valueOf(this.iCredentials
+							.getPassword()) : "null", "UTF-8"));
+					String pass = HttpClient.convertToHexString(messageDigest.digest());
+					return "Digest username="
+							+ ((this.iCredentials != null && this.iCredentials.getUserName() != null) ? this.iCredentials
+									.getUserName()
+									: "null") + ", response=" + pass;
+				} catch (NoSuchAlgorithmException e) {
+					// TODO log
+					e.printStackTrace();
+				}
+			}
+
+			result.append(this.iScheme);
+			result.append(" username=\"");
+			result
+					.append((this.iCredentials != null && this.iCredentials.getUserName() != null) ? this.iCredentials
+							.getUserName()
+							: "null");
+			result.append("\"");
+			if (this.iRealm != null) {
+				result.append(", realm=\"");
+				result.append(this.iRealm);
+				result.append("\"");
+			}
+			if (this.iNonce != null) {
+				result.append(", nonce=\"");
+				result.append(this.iNonce);
+				result.append("\"");
+			}
+			result.append(", uri=\"");
+			result.append(this.iUri);
+			result.append("\", response=\"");
+			result.append(this.iResponse);
+			result.append("\"");
+			// if (algorithm != null) {
+			// result.append(", algorithm=");
+			// result.append(algorithm);
+			// }
+			if (this.iCnonce != null) {
+				result.append(", cnonce=\"");
+				result.append(this.iCnonce);
+				result.append("\"");
+			}
+			if (this.iOpaque != null) {
+				result.append(", opaque=\"");
+				result.append(this.iOpaque);
+				result.append("\"");
+			}
+			if (this.iQop != null) {
+				result.append(", qop=");
+				result.append(this.iQop);
+			}
+			if (this.iNc > -1) {
+				result.append(", nc=");
+				result.append("00000000".substring(_nc.length()));
+				result.append(_nc);
+			}
+		} else if (this.iScheme.equalsIgnoreCase("Basic")) {
+
+			result.append("Basic ");
+
+			StringBuffer tmp = new StringBuffer();
+			tmp
+					.append((this.iCredentials != null && this.iCredentials.getUserName() != null) ? this.iCredentials
+							.getUserName()
+							: "null");
+			tmp.append(':');
+			tmp
+					.append((this.iCredentials != null && this.iCredentials.getPassword() != null) ? String
+							.valueOf(this.iCredentials.getPassword())
+							: "null");
+
+			result.append(BASE64Encoder.encode(getBytes(tmp.toString(), "UTF-8")));
+		}
+		return result.toString();
+	}
+
+	/**
+	 * Splits a comma-separated string into multiple substrings
+	 * 
+	 * @param pLine
+	 *            The comma-separated string
+	 * @return The array of substrings (excluding commas)
+	 */
+	public static String[] split(String pLine) {
+		Vector elem = new Vector();
+		int start = 0;
+		int end;
+		while ((end = pLine.indexOf(',')) > -1) {
+			elem.add(pLine.substring(start, end));
+			start = end + 1;
+		}
+		if (end < pLine.length()) elem.add(pLine.substring(start));
+		String[] result = new String[elem.size()];
+		elem.toArray(result);
+		return result;
+	}
+
+	private static byte[] getBytes(String str, String encoding) {
+		byte[] bytes;
+		try {
+			bytes = str.getBytes(encoding);
+		} catch (UnsupportedEncodingException e) {
+			bytes = str.getBytes();
+		}
+		return bytes;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.sblim.cimclient.internal.http.AuthorizationInfo#updateAuthenticationInfo
+	 * (org.sblim.cimclient.internal.http.Challenge, java.net.URI,
+	 * java.lang.String)
+	 */
+	/**
+	 * @param authenticate
+	 */
+	@Override
+	public void updateAuthenticationInfo(Challenge challenge, String authenticate, URI url,
+			String requestMethod) throws NoSuchAlgorithmException {
+
+		setURI(url.getPath());
+		HttpHeader params = challenge.getParams();
+
+		this.iScheme = challenge.getScheme();
+
+		if (!this.iScheme.equalsIgnoreCase("Digest")) { return; }
+
+		this.iRealm = params.getField("realm");
+
+		String algorithm = params.getField("algorithm");
+		String opaque = params.getField("opaque");
+		String nonce = params.getField("nonce");
+		String qop = params.getField("qop");
+
+		this.iAlgorithm = (algorithm != null) ? algorithm : this.iAlgorithm;
+		this.iOpaque = (opaque != null) ? opaque : this.iOpaque;
+		this.iNonce = (nonce != null) ? nonce : this.iNonce;
+		this.iQop = (qop != null) ? qop : this.iQop;
+
+		MessageDigest messageDigest = null;
+
+		messageDigest = MessageDigest.getInstance("MD5");
+
+		if (qop != null || ("md5-sess".equalsIgnoreCase(algorithm))) {
+			long time = System.currentTimeMillis();
+			byte[] b = new byte[8];
+
+			b[0] = (byte) ((time >> 0) & 0xFF);
+			b[1] = (byte) ((time >> 8) & 0xFF);
+			b[2] = (byte) ((time >> 16) & 0xFF);
+			b[3] = (byte) ((time >> 24) & 0xFF);
+			b[4] = (byte) ((time >> 32) & 0xFF);
+			b[5] = (byte) ((time >> 40) & 0xFF);
+			b[6] = (byte) ((time >> 48) & 0xFF);
+			b[7] = (byte) ((time >> 56) & 0xFF);
+
+			messageDigest.reset();
+			messageDigest.update(b);
+
+			this.iCnonce = HttpClient.convertToHexString(messageDigest.digest());
+		}
+		if (qop != null) {
+			String[] list_qop = split(qop);
+			for (int i = 0; i < list_qop.length; i++) {
+				if (list_qop[i].equalsIgnoreCase("auth-int")) {
+					qop = "auth-int"; // this one has higher priority
+					break;
+				}
+				if ((list_qop[i].equalsIgnoreCase("auth"))) qop = "auth";
+			}
+			setQop(qop);
+		}
+		String nc1 = params.getField("nc");
+		long challengeNc = 1;
+		if (nc1 != null) {
+			try {
+				challengeNc = Long.parseLong(nc1, 16);
+			} catch (Exception e) {
+				// Logger logger = SessionProperties.getGlobalProperties()
+				// .getLogger();
+				// if (logger.isLoggable(Level.WARNING)) {
+				// logger.log(Level.WARNING,
+				// "exception while parsing challenge NC", e);
+				// }
+			}
+			if (getNc() == challengeNc) {
+				setNc(++challengeNc);
+			}
+		} else {
+			setNc(challengeNc = 1);
+		}
+
+		messageDigest.reset();
+		PasswordAuthentication credentials1 = getCredentials();
+		this.iA1 = credentials1.getUserName() + ":" + getRealm() + ":"
+				+ String.valueOf(credentials1.getPassword());
+		// System.out.println("Base:"+A1);
+		messageDigest.update(getBytes(this.iA1, "UTF-8"));
+
+		if ("md5-sess".equalsIgnoreCase(algorithm)) {
+			messageDigest.update(getBytes((":" + getNonce() + ":" + getCnonce()), "UTF-8"));
+
+		}
+
+		byte[] digest1 = messageDigest.digest();
+		String sessionKey = HttpClient.convertToHexString(digest1);
+
+		// System.out.println("A1:"+sessionKey);
+		String method = requestMethod;
+
+		// if (con instanceof HttpURLConnection)
+		// method = ((HttpURLConnection) con).getRequestMethod();
+
+		String A2 = method + ":" + getURI();
+
+		if ("auth-int".equalsIgnoreCase(qop)) {
+			messageDigest.reset();
+			// messageDigest.update(readFully(con)); //TODO
+			messageDigest.update(new byte[] {}); // TODO this must be the
+			// entity body, not the
+			// message body
+			A2 = A2 + ":" + HttpClient.convertToHexString(messageDigest.digest());
+		}
+		messageDigest.reset();
+		messageDigest.update(getBytes(A2, "UTF-8"));
+		A2 = HttpClient.convertToHexString(messageDigest.digest());
+
+		messageDigest.reset();
+		if (qop == null) {
+			messageDigest.update(getBytes((sessionKey + ":" + nonce + ":" + A2), "UTF-8"));
+		} else {
+			String _nc = Long.toHexString(challengeNc);
+			messageDigest.update(getBytes((sessionKey + ":" + nonce + ":"
+					+ "00000000".substring(_nc.length()) + _nc + ":" + getCnonce() + ":" + qop
+					+ ":" + A2), "UTF-8"));
+		}
+		this.iResponse = HttpClient.convertToHexString(messageDigest.digest());
+
+		// TODO handle digest-required header
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.sblim.cimclient.internal.http.AuthorizationInfo#getHeaderFieldName()
+	 */
+	@Override
+	public String getHeaderFieldName() {
+		return "Authorization";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.sblim.cimclient.internal.http.AuthorizationInfo#isSentOnFirstRequest
+	 * ()
+	 */
+	@Override
+	public boolean isSentOnFirstRequest() {
+		return false;
+	}
+
+	@Override
+	public boolean isKeptAlive() {
+		return true;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java
similarity index 86%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java
index 0558eb0..b384ecd 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java
@@ -1,429 +1,427 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 18045      2005-08-10  pineiro5     Some code clean up in multiple points
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http.io;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.BufferedWriter;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-
-/**
- * Class ASCIIPrintStream implement a stream with ASCII charset
- * 
- */
-public class ASCIIPrintStream extends FilterOutputStream {
-
-	private boolean iAutoFlush = false;
-
-	private Exception iTrouble = null;
-
-	private BufferedWriter iTextOut;
-
-	private ASCIIPrintStream(boolean autoFlush, OutputStream pOut) {
-		super(pOut);
-		if (pOut == null) throw new NullPointerException("Null output stream");
-		this.iAutoFlush = autoFlush;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The underlying stream
-	 */
-	public ASCIIPrintStream(OutputStream pStream) {
-		this(pStream, false);
-		init(new OutputStreamWriter(this));
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The underlying stream
-	 * @param pAutoFlush
-	 *            If true the stream is automatically flushed after
-	 *            write.
-	 */
-	public ASCIIPrintStream(OutputStream pStream, boolean pAutoFlush) {
-		this(pAutoFlush, pStream);
-		init(new OutputStreamWriter(this.out));
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The underlying stream
-	 * @param pAutoFlush
-	 *            If true the stream is automatically flushed after
-	 *            write.
-	 * @param pEncoding
-	 *            Ignored
-	 */
-	public ASCIIPrintStream(OutputStream pStream, boolean pAutoFlush, String pEncoding) {
-		this(pStream, pAutoFlush);
-	}
-
-	private void init(OutputStreamWriter osw) {
-		this.iTextOut = new BufferedWriter(osw);
-	}
-
-	private void write(String str) {
-		int stringLength = str.length();
-		char charArray[] = new char[stringLength];
-		byte asciiArray[] = new byte[stringLength];
-		str.getChars(0, stringLength, charArray, 0);
-		for (int i = 0; i < stringLength; i++)
-			asciiArray[i] = charArray[i] >= '\u0100' ? 63 : (byte) charArray[i];
-
-		write(asciiArray, 0, stringLength);
-	}
-
-	/**
-	 * Prints a boolean value
-	 * 
-	 * @param pValue
-	 *            The value
-	 */
-	public void print(boolean pValue) {
-		write(pValue ? "true" : "false");
-	}
-
-	/**
-	 * Prints a single character
-	 * 
-	 * @param c
-	 *            The character
-	 */
-	public void print(char c) {
-		write(String.valueOf(c));
-	}
-
-	/**
-	 * Prints an integer value
-	 * 
-	 * @param i
-	 *            The value
-	 */
-	public void print(int i) {
-		write(String.valueOf(i));
-	}
-
-	/**
-	 * Prints a long value
-	 * 
-	 * @param l
-	 *            The value
-	 */
-	public void print(long l) {
-		write(String.valueOf(l));
-	}
-
-	/**
-	 * Prints a float value
-	 * 
-	 * @param f
-	 *            The value
-	 */
-	public void print(float f) {
-		write(String.valueOf(f));
-	}
-
-	/**
-	 * Prints a double value
-	 * 
-	 * @param d
-	 *            The value
-	 */
-	public void print(double d) {
-		write(String.valueOf(d));
-	}
-
-	/**
-	 * Prints a character array
-	 * 
-	 * @param pArray
-	 *            The array
-	 */
-	public void print(char pArray[]) {
-		write(String.valueOf(pArray));
-	}
-
-	/**
-	 * Prints a string
-	 * 
-	 * @param s
-	 *            The string
-	 */
-	public void print(String s) {
-		write(s == null ? "null" : s);
-	}
-
-	/**
-	 * Prints an object
-	 * 
-	 * @param pObj
-	 *            The object
-	 */
-	public void print(Object pObj) {
-		write(String.valueOf(pObj));
-	}
-
-	/**
-	 * Prints a newline
-	 */
-	public void println() {
-		newLine();
-	}
-
-	/**
-	 * println
-	 * 
-	 * @param flag
-	 */
-	public void println(boolean flag) {
-		synchronized (this) {
-			print(flag);
-			newLine();
-		}
-	}
-
-	/**
-	 * println
-	 * 
-	 * @param c
-	 */
-	public void println(char c) {
-		synchronized (this) {
-			print(c);
-			newLine();
-		}
-	}
-
-	/**
-	 * println
-	 * 
-	 * @param i
-	 */
-	public void println(int i) {
-		synchronized (this) {
-			print(i);
-			newLine();
-		}
-	}
-
-	/**
-	 * println
-	 * 
-	 * @param l
-	 */
-	public void println(long l) {
-		synchronized (this) {
-			print(l);
-			newLine();
-		}
-	}
-
-	/**
-	 * println
-	 * 
-	 * @param f
-	 */
-	public void println(float f) {
-		synchronized (this) {
-			print(f);
-			newLine();
-		}
-	}
-
-	/**
-	 * println
-	 * 
-	 * @param d
-	 */
-	public void println(double d) {
-		synchronized (this) {
-			print(d);
-			newLine();
-		}
-	}
-
-	/**
-	 * println
-	 * 
-	 * @param ac
-	 */
-	public void println(char ac[]) {
-		synchronized (this) {
-			print(ac);
-			newLine();
-		}
-	}
-
-	/**
-	 * println
-	 * 
-	 * @param s
-	 */
-	public void println(String s) {
-		synchronized (this) {
-			print(s);
-			newLine();
-		}
-	}
-
-	/**
-	 * println
-	 * 
-	 * @param obj
-	 */
-	public void println(Object obj) {
-		synchronized (this) {
-			print(obj);
-			newLine();
-		}
-	}
-
-	private void newLine() {
-		try {
-			synchronized (this) {
-				ensureOpen();
-				this.iTextOut.newLine();
-				if (this.iAutoFlush) this.out.flush();
-			}
-		} catch (InterruptedIOException x) {
-			Thread.currentThread().interrupt();
-		} catch (IOException x) {
-			this.iTrouble = x;
-		}
-	}
-
-	@Override
-	public void write(byte buf[], int off, int len) {
-		try {
-			synchronized (this) {
-				ensureOpen();
-				this.out.write(buf, off, len);
-				// i ++;
-				if (this.iAutoFlush) this.out.flush();
-			}
-			// System.out.println("TOTAL:"+i);
-		} catch (InterruptedIOException x) {
-			Thread.currentThread().interrupt();
-		} catch (IOException x) {
-			this.iTrouble = x;
-		}
-	}
-
-	@Override
-	public void write(int b) {
-		try {
-			synchronized (this) {
-				ensureOpen();
-				this.out.write(b);
-				if ((b == '\n') && this.iAutoFlush) this.out.flush();
-			}
-		} catch (InterruptedIOException x) {
-			Thread.currentThread().interrupt();
-		} catch (IOException x) {
-			this.iTrouble = x;
-		}
-	}
-
-	protected void setError() {
-	// trouble = x;
-	}
-
-	/**
-	 * Returns the last exception caught
-	 * 
-	 * @return The exception
-	 */
-	public Exception checkError() {
-		if (this.out != null) flush();
-		return this.iTrouble;
-	}
-
-	@Override
-	public void close() {
-		synchronized (this) {
-			if (!this.closing) {
-				this.closing = true;
-				try {
-					this.iTextOut.close();
-					this.out.close();
-				} catch (IOException x) {
-					this.iTrouble = x;
-				}
-				this.iTextOut = null;
-				// iCharOut = null;
-				this.out = null;
-			}
-		}
-	}
-
-	@Override
-	public void flush() {
-		synchronized (this) {
-			try {
-				ensureOpen();
-				this.out.flush();
-			} catch (IOException x) {
-				this.iTrouble = x;
-			}
-		}
-	}
-
-	private boolean closing = false;
-
-	private void ensureOpen() throws IOException {
-		if (this.out == null) throw new IOException("Stream closed");
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 18045      2005-08-10  pineiro5     Some code clean up in multiple points
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http.io;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.BufferedWriter;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+/**
+ * Class ASCIIPrintStream implement a stream with ASCII charset
+ * 
+ */
+public class ASCIIPrintStream extends FilterOutputStream {
+
+	private boolean iAutoFlush = false;
+
+	private Exception iTrouble = null;
+
+	private BufferedWriter iTextOut;
+
+	private ASCIIPrintStream(boolean autoFlush, OutputStream pOut) {
+		super(pOut);
+		if (pOut == null) throw new NullPointerException("Null output stream");
+		this.iAutoFlush = autoFlush;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The underlying stream
+	 */
+	public ASCIIPrintStream(OutputStream pStream) {
+		this(pStream, false);
+		init(new OutputStreamWriter(this));
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The underlying stream
+	 * @param pAutoFlush
+	 *            If true the stream is automatically flushed after
+	 *            write.
+	 */
+	public ASCIIPrintStream(OutputStream pStream, boolean pAutoFlush) {
+		this(pAutoFlush, pStream);
+		init(new OutputStreamWriter(this.out));
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The underlying stream
+	 * @param pAutoFlush
+	 *            If true the stream is automatically flushed after
+	 *            write.
+	 * @param pEncoding
+	 *            Ignored
+	 */
+	public ASCIIPrintStream(OutputStream pStream, boolean pAutoFlush, String pEncoding) {
+		this(pStream, pAutoFlush);
+	}
+
+	private void init(OutputStreamWriter osw) {
+		this.iTextOut = new BufferedWriter(osw);
+	}
+
+	private void write(String str) {
+		int stringLength = str.length();
+		char charArray[] = new char[stringLength];
+		byte asciiArray[] = new byte[stringLength];
+		str.getChars(0, stringLength, charArray, 0);
+		for (int i = 0; i < stringLength; i++)
+			asciiArray[i] = charArray[i] >= '\u0100' ? 63 : (byte) charArray[i];
+
+		write(asciiArray, 0, stringLength);
+	}
+
+	/**
+	 * Prints a boolean value
+	 * 
+	 * @param pValue
+	 *            The value
+	 */
+	public void print(boolean pValue) {
+		write(pValue ? "true" : "false");
+	}
+
+	/**
+	 * Prints a single character
+	 * 
+	 * @param c
+	 *            The character
+	 */
+	public void print(char c) {
+		write(String.valueOf(c));
+	}
+
+	/**
+	 * Prints an integer value
+	 * 
+	 * @param i
+	 *            The value
+	 */
+	public void print(int i) {
+		write(String.valueOf(i));
+	}
+
+	/**
+	 * Prints a long value
+	 * 
+	 * @param l
+	 *            The value
+	 */
+	public void print(long l) {
+		write(String.valueOf(l));
+	}
+
+	/**
+	 * Prints a float value
+	 * 
+	 * @param f
+	 *            The value
+	 */
+	public void print(float f) {
+		write(String.valueOf(f));
+	}
+
+	/**
+	 * Prints a double value
+	 * 
+	 * @param d
+	 *            The value
+	 */
+	public void print(double d) {
+		write(String.valueOf(d));
+	}
+
+	/**
+	 * Prints a character array
+	 * 
+	 * @param pArray
+	 *            The array
+	 */
+	public void print(char pArray[]) {
+		write(String.valueOf(pArray));
+	}
+
+	/**
+	 * Prints a string
+	 * 
+	 * @param s
+	 *            The string
+	 */
+	public void print(String s) {
+		write(s == null ? "null" : s);
+	}
+
+	/**
+	 * Prints an object
+	 * 
+	 * @param pObj
+	 *            The object
+	 */
+	public void print(Object pObj) {
+		write(String.valueOf(pObj));
+	}
+
+	/**
+	 * Prints a newline
+	 */
+	public void println() {
+		newLine();
+	}
+
+	/**
+	 * println
+	 * 
+	 * @param flag
+	 */
+	public void println(boolean flag) {
+		synchronized (this) {
+			print(flag);
+			newLine();
+		}
+	}
+
+	/**
+	 * println
+	 * 
+	 * @param c
+	 */
+	public void println(char c) {
+		synchronized (this) {
+			print(c);
+			newLine();
+		}
+	}
+
+	/**
+	 * println
+	 * 
+	 * @param i
+	 */
+	public void println(int i) {
+		synchronized (this) {
+			print(i);
+			newLine();
+		}
+	}
+
+	/**
+	 * println
+	 * 
+	 * @param l
+	 */
+	public void println(long l) {
+		synchronized (this) {
+			print(l);
+			newLine();
+		}
+	}
+
+	/**
+	 * println
+	 * 
+	 * @param f
+	 */
+	public void println(float f) {
+		synchronized (this) {
+			print(f);
+			newLine();
+		}
+	}
+
+	/**
+	 * println
+	 * 
+	 * @param d
+	 */
+	public void println(double d) {
+		synchronized (this) {
+			print(d);
+			newLine();
+		}
+	}
+
+	/**
+	 * println
+	 * 
+	 * @param ac
+	 */
+	public void println(char ac[]) {
+		synchronized (this) {
+			print(ac);
+			newLine();
+		}
+	}
+
+	/**
+	 * println
+	 * 
+	 * @param s
+	 */
+	public void println(String s) {
+		synchronized (this) {
+			print(s);
+			newLine();
+		}
+	}
+
+	/**
+	 * println
+	 * 
+	 * @param obj
+	 */
+	public void println(Object obj) {
+		synchronized (this) {
+			print(obj);
+			newLine();
+		}
+	}
+
+	private void newLine() {
+		try {
+			synchronized (this) {
+				ensureOpen();
+				this.iTextOut.newLine();
+				if (this.iAutoFlush) this.out.flush();
+			}
+		} catch (InterruptedIOException x) {
+			Thread.currentThread().interrupt();
+		} catch (IOException x) {
+			this.iTrouble = x;
+		}
+	}
+
+	@Override
+	public void write(byte buf[], int off, int len) {
+		try {
+			synchronized (this) {
+				ensureOpen();
+				this.out.write(buf, off, len);
+				// i ++;
+				if (this.iAutoFlush) this.out.flush();
+			}
+			// System.out.println("TOTAL:"+i);
+		} catch (InterruptedIOException x) {
+			Thread.currentThread().interrupt();
+		} catch (IOException x) {
+			this.iTrouble = x;
+		}
+	}
+
+	@Override
+	public void write(int b) {
+		try {
+			synchronized (this) {
+				ensureOpen();
+				this.out.write(b);
+				if ((b == '\n') && this.iAutoFlush) this.out.flush();
+			}
+		} catch (InterruptedIOException x) {
+			Thread.currentThread().interrupt();
+		} catch (IOException x) {
+			this.iTrouble = x;
+		}
+	}
+
+	protected void setError() {
+	// trouble = x;
+	}
+
+	/**
+	 * Returns the last exception caught
+	 * 
+	 * @return The exception
+	 */
+	public Exception checkError() {
+		if (this.out != null) flush();
+		return this.iTrouble;
+	}
+
+	@Override
+	public void close() {
+		synchronized (this) {
+			if (!this.closing) {
+				this.closing = true;
+				try {
+					this.iTextOut.close();
+					this.out.close();
+				} catch (IOException x) {
+					this.iTrouble = x;
+				}
+				this.iTextOut = null;
+				// iCharOut = null;
+				this.out = null;
+			}
+		}
+	}
+
+	@Override
+	public void flush() {
+		synchronized (this) {
+			try {
+				ensureOpen();
+				this.out.flush();
+			} catch (IOException x) {
+				this.iTrouble = x;
+			}
+		}
+	}
+
+	private boolean closing = false;
+
+	private void ensureOpen() throws IOException {
+		if (this.out == null) throw new IOException("Stream closed");
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java
index 5d2ac61..e066d22 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java
@@ -1,156 +1,154 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http.io;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.*;
-
-/**
- * Class BoundedInputStream implements an input stream with a maximum byte
- * count.
- * 
- */
-public class BoundedInputStream extends FilterInputStream {
-
-	private long maxLen, used;
-
-	private boolean closed = false;
-
-	/**
-	 * Ctor. Creates the stream with unlimited length.
-	 * 
-	 * @param pStream
-	 *            The stream this one is build upon
-	 */
-	public BoundedInputStream(InputStream pStream) {
-		this(pStream, -1);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The stream this one is build upon
-	 * @param pMaximumLength
-	 *            The maximum number of bytes that can be read from this stream.
-	 *            A value of -1 represents unlimited mode.
-	 */
-	public BoundedInputStream(InputStream pStream, long pMaximumLength) {
-		super(pStream);
-		this.maxLen = pMaximumLength;
-		this.used = 0;
-		this.in = pStream;
-	}
-
-	@Override
-	public int read() throws IOException {
-		if (this.maxLen > -1) {
-			if (this.used >= this.maxLen) return -1;
-
-			int value = this.in.read();
-			if (value > -1) this.used++;
-			return value;
-		}
-		return this.in.read();
-	}
-
-	@Override
-	public int read(byte buf[]) throws IOException {
-		return read(buf, 0, buf.length);
-	}
-
-	@Override
-	public int read(byte buf[], int off, int len) throws IOException {
-		if (this.closed) throw new IOException("I/O error - the stream is closed");
-
-		if (this.maxLen > -1) {
-			if (this.used >= this.maxLen) return -1;
-
-			long min = ((this.used + len) > this.maxLen) ? this.maxLen - this.used : len;
-			int total = this.in.read(buf, off, (int) min);
-			if (total > -1) this.used += total;
-			return total;
-		}
-		return this.in.read(buf, off, len);
-	}
-
-	@Override
-	public long skip(long len) throws IOException {
-		if (this.maxLen > -1) {
-			if (len >= 0) {
-				long min = ((this.used + len) > this.maxLen) ? this.maxLen - this.used : len;
-				long total = this.in.skip(min);
-				if (total > -1) {
-					this.used += total;
-				}
-				return total;
-			}
-			return -1;
-		}
-		return this.in.skip(len);
-	}
-
-	@Override
-	public int available() throws IOException {
-		if (this.maxLen > -1) { return (int) (this.maxLen - this.used); }
-		return this.in.available();
-	}
-
-	@Override
-	public synchronized void close() throws IOException {
-		if (this.maxLen > -1) {
-			if (!this.closed) {
-				byte[] buf = new byte[512];
-				while (read(buf, 0, buf.length) > -1) {
-					// empty
-				}
-				this.closed = true;
-			}
-			// else
-			// throw new IOException();
-		} else {
-			this.in.close();
-		}
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http.io;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.*;
+
+/**
+ * Class BoundedInputStream implements an input stream with a maximum byte
+ * count.
+ * 
+ */
+public class BoundedInputStream extends FilterInputStream {
+
+	private long maxLen, used;
+
+	private boolean closed = false;
+
+	/**
+	 * Ctor. Creates the stream with unlimited length.
+	 * 
+	 * @param pStream
+	 *            The stream this one is build upon
+	 */
+	public BoundedInputStream(InputStream pStream) {
+		this(pStream, -1);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The stream this one is build upon
+	 * @param pMaximumLength
+	 *            The maximum number of bytes that can be read from this stream.
+	 *            A value of -1 represents unlimited mode.
+	 */
+	public BoundedInputStream(InputStream pStream, long pMaximumLength) {
+		super(pStream);
+		this.maxLen = pMaximumLength;
+		this.used = 0;
+		this.in = pStream;
+	}
+
+	@Override
+	public int read() throws IOException {
+		if (this.maxLen > -1) {
+			if (this.used >= this.maxLen) return -1;
+
+			int value = this.in.read();
+			if (value > -1) this.used++;
+			return value;
+		}
+		return this.in.read();
+	}
+
+	@Override
+	public int read(byte buf[]) throws IOException {
+		return read(buf, 0, buf.length);
+	}
+
+	@Override
+	public int read(byte buf[], int off, int len) throws IOException {
+		if (this.closed) throw new IOException("I/O error - the stream is closed");
+
+		if (this.maxLen > -1) {
+			if (this.used >= this.maxLen) return -1;
+
+			long min = ((this.used + len) > this.maxLen) ? this.maxLen - this.used : len;
+			int total = this.in.read(buf, off, (int) min);
+			if (total > -1) this.used += total;
+			return total;
+		}
+		return this.in.read(buf, off, len);
+	}
+
+	@Override
+	public long skip(long len) throws IOException {
+		if (this.maxLen > -1) {
+			if (len >= 0) {
+				long min = ((this.used + len) > this.maxLen) ? this.maxLen - this.used : len;
+				long total = this.in.skip(min);
+				if (total > -1) {
+					this.used += total;
+				}
+				return total;
+			}
+			return -1;
+		}
+		return this.in.skip(len);
+	}
+
+	@Override
+	public int available() throws IOException {
+		if (this.maxLen > -1) { return (int) (this.maxLen - this.used); }
+		return this.in.available();
+	}
+
+	@Override
+	public synchronized void close() throws IOException {
+		if (this.maxLen > -1) {
+			if (!this.closed) {
+				byte[] buf = new byte[512];
+				while (read(buf, 0, buf.length) > -1) {
+					// empty
+				}
+				this.closed = true;
+			}
+			// else
+			// throw new IOException();
+		} else {
+			this.in.close();
+		}
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java
index ae4bc6c..87b36c4 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java
@@ -1,217 +1,215 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- *  
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 13799      2004-12-07  thschaef     Fixes on chunking
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 1660575    2007-02-15  lupusalex    Chunking broken on SUN JRE
- * 1688273    2007-04-16  ebak         Full support of HTTP trailers
- * 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)
- * 3304058    2011-05-20  blaschke-oss Use same date format in change history
- * 3557283    2012-11-05  blaschke-oss Print full response when get EOF from CIMOM
- * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
- *    2621    2013-02-23  blaschke-oss Not all chunked input has trailers
- *    2709    2013-11-13  blaschke-oss Lower the level of the EOF message to FINE
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http.io;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpHeader;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpMethod;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-
-/**
- * Class ChunkedInputStream implements an input stream for chunked messages
- * 
- */
-public class ChunkedInputStream extends InputStream {
-
-	private InputStream iIn;
-
-	private String iTrailerFields;
-
-	private String iOrigin;
-
-	private long iChunkSize = 0;
-
-	private boolean iEof = false;
-
-	private HttpHeader iTrailers = new HttpHeader();
-
-	private boolean iClosed = false;
-
-	private byte[] iTmp = new byte[1];
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The stream to create this one upon
-	 * @param pTrailerFields
-	 *            The names of trailer fields
-	 */
-	public ChunkedInputStream(InputStream pStream, String pTrailerFields) {
-		this(pStream, pTrailerFields, null);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The stream to create this one upon
-	 * @param pTrailerFields
-	 *            The names of trailer fields
-	 * @param pOrigin
-	 *            The origin of the stream (response, indication request, etc.)
-	 */
-	public ChunkedInputStream(InputStream pStream, String pTrailerFields, String pOrigin) {
-		this.iIn = pStream;
-		this.iTrailerFields = pTrailerFields;
-		this.iOrigin = pOrigin == null ? "Unknown" : pOrigin;
-	}
-
-	@Override
-	public synchronized int read() throws IOException {
-		return (read(this.iTmp, 0, 1) > 0) ? (this.iTmp[0] & 0xFF) : -1;
-	}
-
-	@Override
-	public synchronized int read(byte[] buf, int off, int len) throws IOException {
-		int total = 0;
-		if (this.iEof || this.iClosed) return -1; // 13799 (return -1 if closed,
-		// not if !closed)
-
-		if (this.iChunkSize == 0) {
-			String line = HttpMethod.readLine(this.iIn); // TODO read line using
-			// valid character encoding
-
-			if ("".equals(line)) {
-				// 13799 The chunked data is ending with
-				// CRLF, so the first line read after it
-				// results ""
-				line = HttpMethod.readLine(this.iIn);
-				// 13799 Except first chunk, the
-				// above only read the CRLF !
-			}
-			// TODO - get rid of ";*" suffix
-			try {
-				this.iChunkSize = Long.parseLong(line, 16);
-			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINER,
-						"Invalid chunk size on HTTP stream", e);
-				this.iEof = true;
-				throw new IOException("Invalid chunk size");
-			}
-		}
-		if (this.iChunkSize > 0) {
-			total = this.iIn.read(buf, off, (this.iChunkSize < len) ? (int) this.iChunkSize
-					: (int) len);
-			if (total > 0) {
-				this.iChunkSize -= total;
-			}
-			if (total == -1) {
-				LogAndTraceBroker.getBroker().trace(
-						Level.FINE,
-						"Unexpected EOF trying to read "
-								+ (this.iChunkSize < len ? this.iChunkSize : len)
-								+ " bytes from HTTP chunk with remaining length of "
-								+ this.iChunkSize);
-				throw new EOFException("Unexpected EOF reading chunk");
-			}
-		} else {
-			// read trailer
-			this.iEof = true;
-			if (this.iTrailerFields != null && this.iTrailerFields.trim().length() > 0) {
-				try {
-					this.iTrailers = new HttpHeader(this.iIn);
-					// ebak: http trailers
-					this.iTrailers.examineTrailer(this.iOrigin);
-				} catch (IOException e) {
-					LogAndTraceBroker.getBroker().trace(
-							Level.FINE,
-							"Unexpected EOF reading trailer, expected fields were "
-									+ this.iTrailerFields);
-					throw new EOFException("Unexpected EOF reading trailer");
-				}
-			}
-		}
-		return total > 0 ? total : -1;
-	}
-
-	/**
-	 * Return the http header trailers
-	 * 
-	 * @return The trailers
-	 */
-	public synchronized HttpHeader getTrailers() {
-		return this.iTrailers;
-	}
-
-	@Override
-	public synchronized long skip(long total) throws IOException {
-		byte[] tmp = new byte[(int) total];
-		return read(tmp, 0, (int) total);
-	}
-
-	/**
-	 * @return int
-	 * 
-	 */
-	@Override
-	public synchronized int available() {
-		return (this.iEof ? 0 : (this.iChunkSize > 0 ? (int) this.iChunkSize : 1));
-	}
-
-	@Override
-	public void close() throws IOException {
-		if (!this.iClosed) {
-			this.iClosed = true;
-			byte[] buf = new byte[512];
-			while (read(buf, 0, buf.length) > -1) {
-				// empty
-			}
-			this.iIn.close();
-		} else throw new IOException("Error while closing stream");
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ *  
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 13799      2004-12-07  thschaef     Fixes on chunking
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 1660575    2007-02-15  lupusalex    Chunking broken on SUN JRE
+ * 1688273    2007-04-16  ebak         Full support of HTTP trailers
+ * 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)
+ * 3304058    2011-05-20  blaschke-oss Use same date format in change history
+ * 3557283    2012-11-05  blaschke-oss Print full response when get EOF from CIMOM
+ * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
+ *    2621    2013-02-23  blaschke-oss Not all chunked input has trailers
+ *    2709    2013-11-13  blaschke-oss Lower the level of the EOF message to FINE
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http.io;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpMethod;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+
+/**
+ * Class ChunkedInputStream implements an input stream for chunked messages
+ * 
+ */
+public class ChunkedInputStream extends InputStream {
+
+	private InputStream iIn;
+
+	private String iTrailerFields;
+
+	private String iOrigin;
+
+	private long iChunkSize = 0;
+
+	private boolean iEof = false;
+
+	private HttpHeader iTrailers = new HttpHeader();
+
+	private boolean iClosed = false;
+
+	private byte[] iTmp = new byte[1];
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The stream to create this one upon
+	 * @param pTrailerFields
+	 *            The names of trailer fields
+	 */
+	public ChunkedInputStream(InputStream pStream, String pTrailerFields) {
+		this(pStream, pTrailerFields, null);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The stream to create this one upon
+	 * @param pTrailerFields
+	 *            The names of trailer fields
+	 * @param pOrigin
+	 *            The origin of the stream (response, indication request, etc.)
+	 */
+	public ChunkedInputStream(InputStream pStream, String pTrailerFields, String pOrigin) {
+		this.iIn = pStream;
+		this.iTrailerFields = pTrailerFields;
+		this.iOrigin = pOrigin == null ? "Unknown" : pOrigin;
+	}
+
+	@Override
+	public synchronized int read() throws IOException {
+		return (read(this.iTmp, 0, 1) > 0) ? (this.iTmp[0] & 0xFF) : -1;
+	}
+
+	@Override
+	public synchronized int read(byte[] buf, int off, int len) throws IOException {
+		int total = 0;
+		if (this.iEof || this.iClosed) return -1; // 13799 (return -1 if closed,
+		// not if !closed)
+
+		if (this.iChunkSize == 0) {
+			String line = HttpMethod.readLine(this.iIn); // TODO read line using
+			// valid character encoding
+
+			if ("".equals(line)) {
+				// 13799 The chunked data is ending with
+				// CRLF, so the first line read after it
+				// results ""
+				line = HttpMethod.readLine(this.iIn);
+				// 13799 Except first chunk, the
+				// above only read the CRLF !
+			}
+			// TODO - get rid of ";*" suffix
+			try {
+				this.iChunkSize = Long.parseLong(line, 16);
+			} catch (Exception e) {
+				LogAndTraceBroker.getBroker().trace(Level.FINER,
+						"Invalid chunk size on HTTP stream", e);
+				this.iEof = true;
+				throw new IOException("Invalid chunk size");
+			}
+		}
+		if (this.iChunkSize > 0) {
+			total = this.iIn.read(buf, off, (this.iChunkSize < len) ? (int) this.iChunkSize
+					: (int) len);
+			if (total > 0) {
+				this.iChunkSize -= total;
+			}
+			if (total == -1) {
+				LogAndTraceBroker.getBroker().trace(
+						Level.FINE,
+						"Unexpected EOF trying to read "
+								+ (this.iChunkSize < len ? this.iChunkSize : len)
+								+ " bytes from HTTP chunk with remaining length of "
+								+ this.iChunkSize);
+				throw new EOFException("Unexpected EOF reading chunk");
+			}
+		} else {
+			// read trailer
+			this.iEof = true;
+			if (this.iTrailerFields != null && this.iTrailerFields.trim().length() > 0) {
+				try {
+					this.iTrailers = new HttpHeader(this.iIn);
+					// ebak: http trailers
+					this.iTrailers.examineTrailer(this.iOrigin);
+				} catch (IOException e) {
+					LogAndTraceBroker.getBroker().trace(
+							Level.FINE,
+							"Unexpected EOF reading trailer, expected fields were "
+									+ this.iTrailerFields);
+					throw new EOFException("Unexpected EOF reading trailer");
+				}
+			}
+		}
+		return total > 0 ? total : -1;
+	}
+
+	/**
+	 * Return the http header trailers
+	 * 
+	 * @return The trailers
+	 */
+	public synchronized HttpHeader getTrailers() {
+		return this.iTrailers;
+	}
+
+	@Override
+	public synchronized long skip(long total) throws IOException {
+		byte[] tmp = new byte[(int) total];
+		return read(tmp, 0, (int) total);
+	}
+
+	/**
+	 * @return int
+	 * 
+	 */
+	@Override
+	public synchronized int available() {
+		return (this.iEof ? 0 : (this.iChunkSize > 0 ? (int) this.iChunkSize : 1));
+	}
+
+	@Override
+	public void close() throws IOException {
+		if (!this.iClosed) {
+			this.iClosed = true;
+			byte[] buf = new byte[512];
+			while (read(buf, 0, buf.length) > -1) {
+				// empty
+			}
+			this.iIn.close();
+		} else throw new IOException("Error while closing stream");
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java
index 1926020..76fba9c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java
@@ -1,123 +1,121 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- *    2620    2013-02-23  blaschke-oss Chunked output broken
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http.io;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Class ChunkedOutputStream implements an output stream for chunked messages
- * 
- */
-public class ChunkedOutputStream extends OutputStream {
-
-	DataOutputStream iOs;
-
-	byte[] iBuffer;
-
-	int iUsed;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The stream to create this one upon
-	 * @param pBufferLength
-	 *            The buffer length. When this value is exceeded a new chunk
-	 *            will be started.
-	 */
-	public ChunkedOutputStream(OutputStream pStream, int pBufferLength) {
-		this.iOs = new DataOutputStream(pStream);
-		this.iBuffer = new byte[pBufferLength];
-		this.iUsed = 0;
-	}
-
-	@Override
-	public void close() throws IOException {
-		flush();
-		this.iOs.writeBytes(Integer.toHexString(0) + "\r\n");
-		this.iOs.flush();
-	}
-
-	@Override
-	public void flush() throws IOException {
-		if (this.iUsed > 0) {
-			this.iOs.writeBytes(Integer.toHexString(this.iUsed) + "\r\n");
-			this.iOs.write(this.iBuffer, 0, this.iUsed);
-			this.iOs.writeBytes("\r\n");
-			this.iOs.flush();
-		}
-		this.iUsed = 0;
-	}
-
-	/**
-	 * @param offset
-	 */
-	@Override
-	public void write(byte source[], int offset, int len) throws IOException {
-		int copied = 0;
-		while (len > 0) {
-			int total = (this.iBuffer.length - this.iUsed < len) ? (this.iBuffer.length - this.iUsed)
-					: len;
-			if (total > 0) {
-				System.arraycopy(source, copied, this.iBuffer, this.iUsed, total);
-				len -= total;
-				this.iUsed += total;
-				copied += total;
-			}
-			if (this.iUsed == this.iBuffer.length) flush();
-		}
-	}
-
-	@Override
-	public void write(int i) throws IOException {
-		if (this.iBuffer.length == this.iUsed) flush();
-		this.iBuffer[this.iUsed++] = (byte) (0xFF & i);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ *    2620    2013-02-23  blaschke-oss Chunked output broken
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http.io;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Class ChunkedOutputStream implements an output stream for chunked messages
+ * 
+ */
+public class ChunkedOutputStream extends OutputStream {
+
+	DataOutputStream iOs;
+
+	byte[] iBuffer;
+
+	int iUsed;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The stream to create this one upon
+	 * @param pBufferLength
+	 *            The buffer length. When this value is exceeded a new chunk
+	 *            will be started.
+	 */
+	public ChunkedOutputStream(OutputStream pStream, int pBufferLength) {
+		this.iOs = new DataOutputStream(pStream);
+		this.iBuffer = new byte[pBufferLength];
+		this.iUsed = 0;
+	}
+
+	@Override
+	public void close() throws IOException {
+		flush();
+		this.iOs.writeBytes(Integer.toHexString(0) + "\r\n");
+		this.iOs.flush();
+	}
+
+	@Override
+	public void flush() throws IOException {
+		if (this.iUsed > 0) {
+			this.iOs.writeBytes(Integer.toHexString(this.iUsed) + "\r\n");
+			this.iOs.write(this.iBuffer, 0, this.iUsed);
+			this.iOs.writeBytes("\r\n");
+			this.iOs.flush();
+		}
+		this.iUsed = 0;
+	}
+
+	/**
+	 * @param offset
+	 */
+	@Override
+	public void write(byte source[], int offset, int len) throws IOException {
+		int copied = 0;
+		while (len > 0) {
+			int total = (this.iBuffer.length - this.iUsed < len) ? (this.iBuffer.length - this.iUsed)
+					: len;
+			if (total > 0) {
+				System.arraycopy(source, copied, this.iBuffer, this.iUsed, total);
+				len -= total;
+				this.iUsed += total;
+				copied += total;
+			}
+			if (this.iUsed == this.iBuffer.length) flush();
+		}
+	}
+
+	@Override
+	public void write(int i) throws IOException {
+		if (this.iBuffer.length == this.iUsed) flush();
+		this.iBuffer[this.iUsed++] = (byte) (0xFF & i);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java
index c78818a..bbc3dec 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java
@@ -1,172 +1,170 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3062747    2010-09-21  blaschke-oss SblimCIMClient does not log all CIM-XML responces.
- * 3185833    2011-02-18  blaschke-oss missing newline when logging request/response
- * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
- * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http.io;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.TimeStamp;
-
-/**
- * Class DebugInputStream is for debugging purposes
- * 
- */
-public class DebugInputStream extends FilterInputStream {
-
-	private byte[] iBuf;
-
-	private boolean iBuffered;
-
-	private int iCur = 0;
-
-	private int iMaxLen = 0;
-
-	private OutputStream iStream;
-
-	private String iOrigin;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param is
-	 * @param os
-	 */
-	public DebugInputStream(InputStream is, OutputStream os) {
-		this(is, os, null);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param is
-	 * @param os
-	 * @param pOrigin
-	 */
-	public DebugInputStream(InputStream is, OutputStream os, String pOrigin) {
-		super(is);
-		this.iBuf = new byte[512];
-		this.iBuffered = false;
-		this.iStream = os;
-		this.iOrigin = pOrigin == null ? "unknown" : pOrigin;
-	}
-
-	private void buffer() throws IOException {
-		this.iBuffered = true;
-		int total;
-		try {
-			while ((total = this.in.read(this.iBuf, this.iMaxLen, this.iBuf.length - this.iMaxLen)) > -1) {
-				this.iMaxLen += total;
-				if (this.iMaxLen == this.iBuf.length) {
-					byte b[] = new byte[this.iBuf.length << 1];
-					System.arraycopy(this.iBuf, 0, b, 0, this.iBuf.length);
-					this.iBuf = b;
-				}
-			}
-		} catch (TrailerException e) {
-			// TrailerException indicates complete response BUT error in trailer
-			writeBuffer(this.iOrigin + " begin (TrailerException occurred)");
-			throw e;
-		}
-		writeBuffer(this.iOrigin + " begin");
-	}
-
-	private void writeBuffer(String header) throws IOException {
-		StringBuilder outStr = new StringBuilder("<--- ");
-		outStr.append(header);
-		outStr.append(' ');
-		outStr.append(TimeStamp.formatWithMillis(System.currentTimeMillis()));
-		outStr.append(" ----\n");
-		outStr.append(new String(this.iBuf, 0, this.iMaxLen));
-		if (this.iMaxLen > 0 && this.iBuf[this.iMaxLen - 1] != '\n') outStr.append('\n');
-		outStr.append("---- ");
-		outStr.append(this.iOrigin);
-		outStr.append(" end ----->\n");
-		if (this.iStream != null) this.iStream.write(outStr.toString().getBytes());
-		if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) LogAndTraceBroker
-				.getBroker().traceCIMXML(Level.FINEST, outStr.toString(), false);
-	}
-
-	@Override
-	public synchronized int read() throws IOException {
-		if (!this.iBuffered) buffer();
-
-		if (this.iCur >= this.iMaxLen) return -1;
-		return this.iBuf[this.iCur++];
-	}
-
-	@Override
-	public synchronized int read(byte b[], int off, int len) throws IOException {
-		if (b == null) {
-			throw new NullPointerException();
-		} else if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length)
-				|| ((off + len) < 0)) {
-			throw new IndexOutOfBoundsException();
-		} else if (len == 0) { return 0; }
-
-		int c = read();
-		if (c == -1) { return -1; }
-		b[off] = (byte) c;
-
-		int i = 1;
-		for (; i < len; i++) {
-			c = read();
-			if (c == -1) {
-				break;
-			}
-			if (b != null) {
-				b[off + i] = (byte) c;
-			}
-		}
-		return i;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3062747    2010-09-21  blaschke-oss SblimCIMClient does not log all CIM-XML responces.
+ * 3185833    2011-02-18  blaschke-oss missing newline when logging request/response
+ * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
+ * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http.io;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.TimeStamp;
+
+/**
+ * Class DebugInputStream is for debugging purposes
+ * 
+ */
+public class DebugInputStream extends FilterInputStream {
+
+	private byte[] iBuf;
+
+	private boolean iBuffered;
+
+	private int iCur = 0;
+
+	private int iMaxLen = 0;
+
+	private OutputStream iStream;
+
+	private String iOrigin;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param is
+	 * @param os
+	 */
+	public DebugInputStream(InputStream is, OutputStream os) {
+		this(is, os, null);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param is
+	 * @param os
+	 * @param pOrigin
+	 */
+	public DebugInputStream(InputStream is, OutputStream os, String pOrigin) {
+		super(is);
+		this.iBuf = new byte[512];
+		this.iBuffered = false;
+		this.iStream = os;
+		this.iOrigin = pOrigin == null ? "unknown" : pOrigin;
+	}
+
+	private void buffer() throws IOException {
+		this.iBuffered = true;
+		int total;
+		try {
+			while ((total = this.in.read(this.iBuf, this.iMaxLen, this.iBuf.length - this.iMaxLen)) > -1) {
+				this.iMaxLen += total;
+				if (this.iMaxLen == this.iBuf.length) {
+					byte b[] = new byte[this.iBuf.length << 1];
+					System.arraycopy(this.iBuf, 0, b, 0, this.iBuf.length);
+					this.iBuf = b;
+				}
+			}
+		} catch (TrailerException e) {
+			// TrailerException indicates complete response BUT error in trailer
+			writeBuffer(this.iOrigin + " begin (TrailerException occurred)");
+			throw e;
+		}
+		writeBuffer(this.iOrigin + " begin");
+	}
+
+	private void writeBuffer(String header) throws IOException {
+		StringBuilder outStr = new StringBuilder("<--- ");
+		outStr.append(header);
+		outStr.append(' ');
+		outStr.append(TimeStamp.formatWithMillis(System.currentTimeMillis()));
+		outStr.append(" ----\n");
+		outStr.append(new String(this.iBuf, 0, this.iMaxLen));
+		if (this.iMaxLen > 0 && this.iBuf[this.iMaxLen - 1] != '\n') outStr.append('\n');
+		outStr.append("---- ");
+		outStr.append(this.iOrigin);
+		outStr.append(" end ----->\n");
+		if (this.iStream != null) this.iStream.write(outStr.toString().getBytes());
+		if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) LogAndTraceBroker
+				.getBroker().traceCIMXML(Level.FINEST, outStr.toString(), false);
+	}
+
+	@Override
+	public synchronized int read() throws IOException {
+		if (!this.iBuffered) buffer();
+
+		if (this.iCur >= this.iMaxLen) return -1;
+		return this.iBuf[this.iCur++];
+	}
+
+	@Override
+	public synchronized int read(byte b[], int off, int len) throws IOException {
+		if (b == null) {
+			throw new NullPointerException();
+		} else if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length)
+				|| ((off + len) < 0)) {
+			throw new IndexOutOfBoundsException();
+		} else if (len == 0) { return 0; }
+
+		int c = read();
+		if (c == -1) { return -1; }
+		b[off] = (byte) c;
+
+		int i = 1;
+		for (; i < len; i++) {
+			c = read();
+			if (c == -1) {
+				break;
+			}
+			if (b != null) {
+				b[off + i] = (byte) c;
+			}
+		}
+		return i;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java
index 429df74..ff7ff91 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java
@@ -1,119 +1,117 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http.io;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpClient;
-
-/**
- * Class KeepAliveInputStream implements an input stream for connections that
- * keep iAlive after a request is completed
- * 
- */
-public class KeepAliveInputStream extends FilterInputStream {
-
-	private HttpClient iClient;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The underlying stream
-	 * @param pClient
-	 *            The associated client.
-	 */
-	public KeepAliveInputStream(InputStream pStream, HttpClient pClient) {
-		super(pStream);
-		this.iClient = pClient;
-	}
-
-	@Override
-	public int read() throws IOException {
-		int i = super.read();
-		if (i == -1 && this.iClient != null) {
-			this.iClient.streamFinished();
-			this.iClient = null;
-		}
-		return i;
-	}
-
-	@Override
-	public int read(byte buf[]) throws IOException {
-		return read(buf, 0, buf.length);
-	}
-
-	@Override
-	public int read(byte buf[], int off, int len) throws IOException {
-		int i = super.read(buf, off, len);
-		if (i == -1 && this.iClient != null) {
-			this.iClient.streamFinished();
-			this.iClient = null;
-		}
-		return i;
-	}
-
-	@Override
-	public long skip(long len) throws IOException {
-		long i = super.skip(len);
-
-		if (i == -1 && this.iClient != null) {
-			this.iClient.streamFinished();
-			this.iClient = null;
-		}
-		return i;
-	}
-
-	@Override
-	public void close() throws IOException {
-		super.close();
-		if (this.iClient != null) {
-			this.iClient.streamFinished();
-			this.iClient = null;
-		}
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http.io;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpClient;
+
+/**
+ * Class KeepAliveInputStream implements an input stream for connections that
+ * keep iAlive after a request is completed
+ * 
+ */
+public class KeepAliveInputStream extends FilterInputStream {
+
+	private HttpClient iClient;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The underlying stream
+	 * @param pClient
+	 *            The associated client.
+	 */
+	public KeepAliveInputStream(InputStream pStream, HttpClient pClient) {
+		super(pStream);
+		this.iClient = pClient;
+	}
+
+	@Override
+	public int read() throws IOException {
+		int i = super.read();
+		if (i == -1 && this.iClient != null) {
+			this.iClient.streamFinished();
+			this.iClient = null;
+		}
+		return i;
+	}
+
+	@Override
+	public int read(byte buf[]) throws IOException {
+		return read(buf, 0, buf.length);
+	}
+
+	@Override
+	public int read(byte buf[], int off, int len) throws IOException {
+		int i = super.read(buf, off, len);
+		if (i == -1 && this.iClient != null) {
+			this.iClient.streamFinished();
+			this.iClient = null;
+		}
+		return i;
+	}
+
+	@Override
+	public long skip(long len) throws IOException {
+		long i = super.skip(len);
+
+		if (i == -1 && this.iClient != null) {
+			this.iClient.streamFinished();
+			this.iClient = null;
+		}
+		return i;
+	}
+
+	@Override
+	public void close() throws IOException {
+		super.close();
+		if (this.iClient != null) {
+			this.iClient.streamFinished();
+			this.iClient = null;
+		}
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java
similarity index 72%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java
index cc269ae..ebff1d6 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java
@@ -1,93 +1,91 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http.io;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Class PersistentInputStream implements an input stream for which close() can
- * be disabled.
- * 
- */
-public class PersistentInputStream extends FilterInputStream {
-
-	boolean iClosable = false;
-
-	boolean iClosed = false;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The underlying stream
-	 */
-	public PersistentInputStream(InputStream pStream) {
-		this(pStream, false);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The underlying stream
-	 * @param pClosable
-	 *            If false this stream will ignore calls to the
-	 *            close() method.
-	 */
-	public PersistentInputStream(InputStream pStream, boolean pClosable) {
-		super(pStream);
-		this.iClosable = pClosable;
-	}
-
-	@Override
-	public synchronized void close() throws IOException {
-		if (!this.iClosed) {
-			this.iClosed = true;
-			if (this.iClosable) this.in.close();
-		} else throw new IOException("Error while closing the input stream. It was already closed");
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http.io;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Class PersistentInputStream implements an input stream for which close() can
+ * be disabled.
+ * 
+ */
+public class PersistentInputStream extends FilterInputStream {
+
+	boolean iClosable = false;
+
+	boolean iClosed = false;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The underlying stream
+	 */
+	public PersistentInputStream(InputStream pStream) {
+		this(pStream, false);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The underlying stream
+	 * @param pClosable
+	 *            If false this stream will ignore calls to the
+	 *            close() method.
+	 */
+	public PersistentInputStream(InputStream pStream, boolean pClosable) {
+		super(pStream);
+		this.iClosable = pClosable;
+	}
+
+	@Override
+	public synchronized void close() throws IOException {
+		if (!this.iClosed) {
+			this.iClosed = true;
+			if (this.iClosable) this.in.close();
+		} else throw new IOException("Error while closing the input stream. It was already closed");
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java
similarity index 72%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java
index 6a9209c..16fe80b 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java
@@ -1,92 +1,90 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http.io;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Class PersistentOutputStream implements an output stream for which close()
- * can be disabled.
- */
-public class PersistentOutputStream extends FilterOutputStream {
-
-	boolean iClosable = false;
-
-	boolean iClosed = false;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The underlying stream
-	 */
-	public PersistentOutputStream(OutputStream pStream) {
-		this(pStream, false);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStream
-	 *            The underlying stream
-	 * @param pClosable
-	 *            If false this stream will ignore calls to the
-	 *            close() method.
-	 */
-	public PersistentOutputStream(OutputStream pStream, boolean pClosable) {
-		super(pStream);
-		this.iClosable = pClosable;
-	}
-
-	@Override
-	public synchronized void close() throws IOException {
-		if (!this.iClosed) {
-			this.iClosed = true;
-			if (this.iClosable) this.out.close();
-		} else throw new IOException("Error while closing the Output stream. It was already closed");
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-28  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.http.io;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Class PersistentOutputStream implements an output stream for which close()
+ * can be disabled.
+ */
+public class PersistentOutputStream extends FilterOutputStream {
+
+	boolean iClosable = false;
+
+	boolean iClosed = false;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The underlying stream
+	 */
+	public PersistentOutputStream(OutputStream pStream) {
+		this(pStream, false);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStream
+	 *            The underlying stream
+	 * @param pClosable
+	 *            If false this stream will ignore calls to the
+	 *            close() method.
+	 */
+	public PersistentOutputStream(OutputStream pStream, boolean pClosable) {
+		super(pStream);
+		this.iClosable = pClosable;
+	}
+
+	@Override
+	public synchronized void close() throws IOException {
+		if (!this.iClosed) {
+			this.iClosed = true;
+			if (this.iClosable) this.out.close();
+		} else throw new IOException("Error while closing the Output stream. It was already closed");
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/TrailerException.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/TrailerException.java
similarity index 66%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/TrailerException.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/TrailerException.java
index 02ef4cf..8c606f3 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/TrailerException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/TrailerException.java
@@ -1,81 +1,78 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, ebak@de.ibm.com
- * 
- * Flag       Date        Prog         Description
- * -------------------------------------------------------------------------------
- * 1688273    2007-04-16  ebak         Full support of HTTP trailers
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.http.io;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConstants;
-
-/**
- * TrailerException is thrown by ChunkedInputStream when it receives a http
- * trailer which contains the following entries: CIMStatusCode,
- * CIMStatusCodeDescription. These http trailer entries are known to be used by
- * Pegasus CIMOM.
- */
-public class TrailerException extends RuntimeException {
-
-	private static final long serialVersionUID = 4355341648542585509L;
-
-	private WBEMException iWBEMException;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pException
-	 *            The contained WBEMException
-	 */
-	public TrailerException(WBEMException pException) {
-		super(WBEMConstants.HTTP_TRAILER_STATUS_CODE + ":" + pException.getID() + " "
-				+ WBEMConstants.HTTP_TRAILER_STATUS_DESCRIPTION + ":" + pException.getMessage());
-		this.iWBEMException = pException;
-	}
-
-	/**
-	 * getWBEMException
-	 * 
-	 * @return WBEMException
-	 */
-	public WBEMException getWBEMException() {
-		return this.iWBEMException;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, ebak@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1688273    2007-04-16  ebak         Full support of HTTP trailers
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.http.io;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
+
+/**
+ * TrailerException is thrown by ChunkedInputStream when it receives a http
+ * trailer which contains the following entries: CIMStatusCode,
+ * CIMStatusCodeDescription. These http trailer entries are known to be used by
+ * Pegasus CIMOM.
+ */
+public class TrailerException extends RuntimeException {
+
+	private static final long serialVersionUID = 4355341648542585509L;
+
+	private WBEMException iWBEMException;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pException
+	 *            The contained WBEMException
+	 */
+	public TrailerException(WBEMException pException) {
+		super(WBEMConstants.HTTP_TRAILER_STATUS_CODE + ":" + pException.getID() + " "
+				+ WBEMConstants.HTTP_TRAILER_STATUS_DESCRIPTION + ":" + pException.getMessage());
+		this.iWBEMException = pException;
+	}
+
+	/**
+	 * getWBEMException
+	 * 
+	 * @return WBEMException
+	 */
+	public WBEMException getWBEMException() {
+		return this.iWBEMException;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/io/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/http/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java
similarity index 93%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java
index ee5664f..470b218 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java
@@ -1,957 +1,955 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-14  lupusalex    Make SBLIM client JSR48 compliant
- * 1711092    2006-05-02  lupusalex    Some fixes/additions of log&trace messages
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 3001345    2010-05-18  blaschke-oss File handle leaks in HttpSocketFactory and LogAndTraceBroker
- * 3027618    2010-07-14  blaschke-oss Close files/readers in finally blocks
- * 3154232    2011-01-13  blaschke-oss EmbeddedObject misspelled in javadoc
- * 3252669    2011-03-28  blaschke-oss setXmlTraceStream blindly closes previous stream
- * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
- * 3469018    2012-01-03  blaschke-oss Properties not passed to CIMIndicationHandler
- * 3484014    2012-02-03  blaschke-oss Add LogAndTraceBroker.isLoggable for message/trace
- * 3489638    2012-02-28  blaschke-oss PERF: Bottleneck in LogAndTraceBroker.java - getCaller()
- * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
- * 3576396    2012-10-11  blaschke-oss Improve logging of config file name
- * 3596303    2013-01-04  blaschke-oss windows http response WWW-Authenticate: Negotiate fails
- *    2652    2013-07-26  blaschke-oss LogAndTraceBroker.setXmlTraceStream should not close previous stream
- *    2651    2013-07-31  blaschke-oss IOException when tracing the cimxml
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.logging;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.FileHandler;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
-import org.sentrysoftware.wbem.sblim.cimclient.CIMXMLTraceListener;
-import org.sentrysoftware.wbem.sblim.cimclient.LogAndTraceManager;
-import org.sentrysoftware.wbem.sblim.cimclient.LogListener;
-import org.sentrysoftware.wbem.sblim.cimclient.TraceListener;
-import org.sentrysoftware.wbem.sblim.cimclient.WBEMConfigurationProperties;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConstants;
-
-/**
- * Class LogAndTraceBroker is the central class that implements the logging and
- * tracing of the CIM Client. It manages the collections of the internal log and
- * trace listeners. It sets up the application independent logging. It provides
- * the API to send log and trace messages and forwards them to the appropriate
- * listeners.
- * 
- */
-public class LogAndTraceBroker {
-
-	private static final String TRACE_LOGGER = "org.sentrysoftware.wbem.sblim.cimclient.trace";
-
-	private static final String FILE_LOGGER = "org.sentrysoftware.wbem.sblim.cimclient.file";
-
-	private static final String CONSOLE_LOGGER = "org.sentrysoftware.wbem.sblim.cimclient.console";
-
-	private static LogAndTraceBroker cBroker = new LogAndTraceBroker();
-
-	/**
-	 * Returns the singleton instance of the broker
-	 * 
-	 * @return The broker instance
-	 */
-	public static LogAndTraceBroker getBroker() {
-		return cBroker;
-	}
-
-	/**
-	 * Returns if the logging framework has been initialized. This method is
-	 * used by the WBEMConfiguration class to determine if the
-	 * logging is already up. The WBEMConfiguration is initialized
-	 * before the logging, so methods in this class cannot assume the logging to
-	 * be up and running.
-	 * 
-	 * @return true if the logging is up, false
-	 *         otherwise
-	 */
-	public static boolean isLoggingStarted() {
-		return cBroker != null;
-	}
-
-	private volatile ArrayList iLogListeners;
-
-	private volatile ArrayList iTraceListeners;
-
-	private volatile ArrayList iCIMXMLTraceListeners;
-
-	private String iProductName = "SBLIM CIM Client for Java";
-
-	private String iCopyright = "COPYRIGHT (C) 2006, 2013 IBM Corp.";
-
-	private String iVersion = "?";
-
-	private String iBuildDate = "?";
-
-	private String iBuildTime = "?";
-
-	private OutputStream iXmlTraceStream = null;
-
-	private OutputStream iXmlTraceFile = null;
-
-	private final String iTHIS_CLASS = this.getClass().getName();
-
-	private final String iTHROWABLE = Throwable.class.getName();
-
-	private int iInternalLevelConsole = Level.OFF.intValue();
-
-	private int iInternalLevelLogFile = Level.OFF.intValue();
-
-	private int iInternalLevelTraceFile = Level.OFF.intValue();
-
-	private LogListener iInternalListenerLogConsole = null;
-
-	private LogListener iInternalListenerLogFile = null;
-
-	private TraceListener iInternalListenerTraceConsole = null;
-
-	private TraceListener iInternalListenerTraceFile = null;
-
-	private int iNumInternalLogListeners = 0;
-
-	private int iNumExternalLogListeners = 0;
-
-	private int iNumInternalTraceListeners = 0;
-
-	private int iNumExternalTraceListeners = 0;
-
-	private LogAndTraceBroker() {
-		this.iLogListeners = new ArrayList();
-		this.iTraceListeners = new ArrayList();
-		this.iCIMXMLTraceListeners = new ArrayList();
-		loadVersionTxt();
-		registerInternalListeners();
-		initXmlTraceFile();
-	}
-
-	@Override
-	protected void finalize() throws Throwable {
-		try {
-			if (this.iXmlTraceFile != null && (!this.iXmlTraceFile.equals(System.out))
-					&& (!this.iXmlTraceFile.equals(System.err))) this.iXmlTraceFile.close();
-		} catch (IOException e) {
-			// bad luck
-		} finally {
-			this.iXmlTraceFile = null;
-			super.finalize();
-		}
-	}
-
-	/**
-	 * Registers the listeners for our internal loggers
-	 */
-	public void registerInternalListeners() {
-		try {
-			Level level = WBEMConfiguration.getGlobalConfiguration().getLogConsoleLevel();
-			String type = WBEMConfiguration.getGlobalConfiguration().getLogConsoleType();
-			if (level.intValue() < Level.OFF.intValue() && WBEMConstants.MESSAGE.equals(type)) {
-				final Logger logger = Logger.getLogger(CONSOLE_LOGGER);
-				final Handler handler = new ConsoleHandler();
-				handler.setFormatter(new LogFormatter());
-				handler.setLevel(level);
-				logger.addHandler(handler);
-				logger.setLevel(level);
-				logger.setUseParentHandlers(false);
-				this.iInternalLevelConsole = level.intValue();
-				if (this.iInternalListenerLogConsole != null) removeLogListener(this.iInternalListenerLogConsole);
-				this.iInternalListenerLogConsole = new LogListener() {
-
-					public void log(Level pLevel, String pMessageKey, String pMessage,
-							Object[] pParameters) {
-						LogRecord record = new LogRecord(pLevel, pMessageKey + " " + pMessage);
-						record.setParameters(pParameters);
-						logger.log(record);
-					}
-				};
-				addLogListener(this.iInternalListenerLogConsole);
-			}
-		} catch (Exception e) {
-			// Don't crash for logging
-		}
-		try {
-			Level level = WBEMConfiguration.getGlobalConfiguration().getLogFileLevel();
-			String location = WBEMConfiguration.getGlobalConfiguration().getLogFileLocation();
-			int size = WBEMConfiguration.getGlobalConfiguration().getLogFileSizeLimit();
-			int count = WBEMConfiguration.getGlobalConfiguration().getLogFileCount();
-			if (level.intValue() < Level.OFF.intValue()) {
-				final Logger logger = Logger.getLogger(FILE_LOGGER);
-				final Handler handler = new FileHandler(location, size, count);
-				handler.setFormatter(new LogFormatter());
-				handler.setLevel(level);
-				logger.addHandler(handler);
-				logger.setLevel(level);
-				logger.setUseParentHandlers(false);
-				this.iInternalLevelLogFile = level.intValue();
-				if (this.iInternalListenerLogFile != null) removeLogListener(this.iInternalListenerLogFile);
-				this.iInternalListenerLogFile = new LogListener() {
-
-					public void log(Level pLevel, String pMessageKey, String pMessage,
-							Object[] pParameters) {
-						LogRecord record = new LogRecord(pLevel, pMessageKey + " " + pMessage);
-						record.setParameters(pParameters);
-						logger.log(record);
-					}
-				};
-				addLogListener(this.iInternalListenerLogFile);
-			}
-		} catch (Exception e) {
-			// Don't crash for logging
-		}
-		try {
-			Level level = WBEMConfiguration.getGlobalConfiguration().getLogConsoleLevel();
-			String type = WBEMConfiguration.getGlobalConfiguration().getLogConsoleType();
-			if (level.intValue() < Level.OFF.intValue() && WBEMConstants.TRACE.equals(type)) {
-				final Logger logger = Logger.getLogger(CONSOLE_LOGGER);
-				final Handler handler = new ConsoleHandler();
-				handler.setFormatter(new TraceFormatter());
-				handler.setLevel(level);
-				logger.addHandler(handler);
-				logger.setLevel(level);
-				logger.setUseParentHandlers(false);
-				this.iInternalLevelConsole = level.intValue();
-				if (this.iInternalListenerTraceConsole != null) removeTraceListener(this.iInternalListenerTraceConsole);
-				this.iInternalListenerTraceConsole = new TraceListener() {
-
-					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage) {
-						LogRecord record = new LogRecord(pLevel, pMessage);
-						record.setSourceMethodName(String.valueOf(pOrigin));
-						logger.log(record);
-					}
-
-					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage,
-							Throwable pThrown) {
-						LogRecord record = new LogRecord(pLevel, pMessage);
-						record.setSourceMethodName(String.valueOf(pOrigin));
-						record.setThrown(pThrown);
-						logger.log(record);
-					}
-				};
-				addTraceListener(this.iInternalListenerTraceConsole);
-			}
-		} catch (Exception e) {
-			// Don't crash for logging
-		}
-		try {
-			Level level = WBEMConfiguration.getGlobalConfiguration().getTraceFileLevel();
-			String location = WBEMConfiguration.getGlobalConfiguration().getTraceFileLocation();
-			int size = WBEMConfiguration.getGlobalConfiguration().getTraceFileSizeLimit();
-			int count = WBEMConfiguration.getGlobalConfiguration().getTraceFileCount();
-			if (level.intValue() < Level.OFF.intValue()) {
-				final Logger logger = Logger.getLogger(TRACE_LOGGER);
-				final Handler handler = new FileHandler(location, size, count);
-				handler.setFormatter(new TraceFormatter());
-				handler.setLevel(level);
-				logger.addHandler(handler);
-				logger.setLevel(level);
-				logger.setUseParentHandlers(false);
-				this.iInternalLevelTraceFile = level.intValue();
-				if (this.iInternalListenerTraceFile != null) removeTraceListener(this.iInternalListenerTraceFile);
-				this.iInternalListenerTraceFile = new TraceListener() {
-
-					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage) {
-						LogRecord record = new LogRecord(pLevel, pMessage);
-						record.setSourceMethodName(String.valueOf(pOrigin));
-						logger.log(record);
-					}
-
-					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage,
-							Throwable pThrown) {
-						LogRecord record = new LogRecord(pLevel, pMessage);
-						record.setSourceMethodName(String.valueOf(pOrigin));
-						record.setThrown(pThrown);
-						logger.log(record);
-					}
-				};
-				addTraceListener(this.iInternalListenerTraceFile);
-			}
-		} catch (Exception e) {
-			// Don't crash for logging
-		}
-	}
-
-	/**
-	 * Adds a listener for log messages. The listener will be notified of any
-	 * log event. Uses copy on write to ensure concurrent read access.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public synchronized void addLogListener(LogListener pListener) {
-		if (pListener == null) return;
-		sendGreetings(pListener);
-		ArrayList newListeners = new ArrayList(this.iLogListeners);
-		newListeners.add(pListener);
-		this.iLogListeners = newListeners;
-
-		if ((this.iInternalListenerLogFile != null && this.iInternalListenerLogFile
-				.equals(pListener))
-				|| (this.iInternalListenerLogConsole != null && this.iInternalListenerLogConsole
-						.equals(pListener))) {
-			this.iNumInternalLogListeners++;
-		} else {
-			this.iNumExternalLogListeners++;
-		}
-	}
-
-	private void loadVersionTxt() {
-		InputStream is = null;
-		try {
-			Properties version = new Properties();
-			is = LogAndTraceManager.class.getResourceAsStream("version.txt");
-			version.load(is);
-			this.iProductName = version.getProperty("PRODUCTNAME");
-			this.iCopyright = version.getProperty("COPYRIGHT");
-			this.iVersion = version.getProperty("VERSION");
-			this.iBuildDate = version.getProperty("BUILDDATE");
-			this.iBuildTime = version.getProperty("BUILDTIME");
-		} catch (Exception e) {
-			// nothing to do
-		} finally {
-			if (is != null) {
-				try {
-					is.close();
-				} catch (IOException e) {
-					// nothing ro do
-				}
-			}
-		}
-	}
-
-	private void sendGreetings(LogListener pListener) {
-
-		pListener.log(MessageLoader.getLevel(Messages.GREETING), Messages.GREETING, MessageLoader
-				.getLocalizedMessage(Messages.GREETING), new Object[] { this.iProductName,
-				this.iCopyright });
-		pListener.log(MessageLoader.getLevel(Messages.RELEASE), Messages.RELEASE, MessageLoader
-				.getLocalizedMessage(Messages.RELEASE), new Object[] { this.iVersion,
-				this.iBuildDate, this.iBuildTime });
-		pListener.log(MessageLoader.getLevel(Messages.OS), Messages.OS, MessageLoader
-				.getLocalizedMessage(Messages.OS), new Object[] { System.getProperty("os.name"),
-				System.getProperty("os.version"), System.getProperty("os.arch") });
-		pListener.log(MessageLoader.getLevel(Messages.JRE), Messages.JRE, MessageLoader
-				.getLocalizedMessage(Messages.JRE), new Object[] {
-				System.getProperty("java.version"), System.getProperty("java.vendor") });
-		pListener.log(MessageLoader.getLevel(Messages.JVM), Messages.JVM, MessageLoader
-				.getLocalizedMessage(Messages.JVM), new Object[] {
-				System.getProperty("java.vm.name"), System.getProperty("java.vm.version"),
-				System.getProperty("java.vm.vendor") });
-		pListener.log(MessageLoader.getLevel(Messages.CONFIGURATION_URL),
-				Messages.CONFIGURATION_URL, MessageLoader
-						.getLocalizedMessage(Messages.CONFIGURATION_URL),
-				new Object[] { WBEMConfiguration.getActiveConfigFullURL() });
-		if (!WBEMConfiguration.isConfigurationLoadSuccessful()) {
-			pListener.log(MessageLoader.getLevel(Messages.CONFIGURATION_LOAD_FAILED),
-					Messages.CONFIGURATION_LOAD_FAILED, MessageLoader
-							.getLocalizedMessage(Messages.CONFIGURATION_LOAD_FAILED),
-					(Object[]) null);
-			if (WBEMConfiguration.getConfigurationLoadException() != null) {
-				pListener.log(MessageLoader.getLevel(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
-						Messages.EXCEPTION_DURING_CONFIGURATION_LOAD, MessageLoader
-								.getLocalizedMessage(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
-						new Object[] { WBEMConfiguration.getConfigurationLoadException()
-								.getMessage() });
-			}
-		}
-	}
-
-	private void sendGreetings(TraceListener pListener) {
-		StackTraceElement origin = new Throwable().getStackTrace()[0];
-		pListener.trace(MessageLoader.getLevel(Messages.GREETING), origin, MessageFormat.format(
-				MessageLoader.getMessage(Messages.GREETING), new Object[] { this.iProductName,
-						this.iCopyright }));
-		pListener.trace(MessageLoader.getLevel(Messages.RELEASE), origin, MessageFormat.format(
-				MessageLoader.getMessage(Messages.RELEASE), new Object[] { this.iVersion,
-						this.iBuildDate, this.iBuildTime }));
-		pListener.trace(MessageLoader.getLevel(Messages.OS), origin, MessageFormat.format(
-				MessageLoader.getMessage(Messages.OS), new Object[] {
-						System.getProperty("os.name"), System.getProperty("os.version"),
-						System.getProperty("os.arch") }));
-		pListener.trace(MessageLoader.getLevel(Messages.JRE), origin, MessageFormat.format(
-				MessageLoader.getMessage(Messages.JRE), new Object[] {
-						System.getProperty("java.version"), System.getProperty("java.vendor") }));
-		pListener.trace(MessageLoader.getLevel(Messages.JVM), origin, MessageFormat.format(
-				MessageLoader.getMessage(Messages.JVM), new Object[] {
-						System.getProperty("java.vm.name"), System.getProperty("java.vm.version"),
-						System.getProperty("java.vm.vendor") }));
-		pListener.trace(MessageLoader.getLevel(Messages.CONFIGURATION_URL), origin, MessageFormat
-				.format(MessageLoader.getMessage(Messages.CONFIGURATION_URL),
-						new Object[] { WBEMConfiguration.getActiveConfigURL() }));
-		if (!WBEMConfiguration.isConfigurationLoadSuccessful()) {
-			pListener.trace(MessageLoader.getLevel(Messages.CONFIGURATION_LOAD_FAILED), origin,
-					MessageLoader.getMessage(Messages.CONFIGURATION_LOAD_FAILED));
-			if (WBEMConfiguration.getConfigurationLoadException() != null) {
-				pListener.trace(MessageLoader
-						.getLevel(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD), origin,
-						MessageLoader.getMessage(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
-						WBEMConfiguration.getConfigurationLoadException());
-			}
-		}
-	}
-
-	/**
-	 * Remove a listener. This listener will not be notified of log events
-	 * anymore.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public synchronized void removeLogListener(LogListener pListener) {
-		ArrayList newListeners = new ArrayList(this.iLogListeners);
-		if (!newListeners.remove(pListener)) return;
-		this.iLogListeners = newListeners;
-
-		if (this.iInternalListenerLogFile != null
-				&& this.iInternalListenerLogFile.equals(pListener)) {
-			// Removing internal log listener for file
-			this.iInternalListenerLogFile = null;
-			this.iNumInternalLogListeners--;
-		} else if (this.iInternalListenerLogConsole != null
-				&& this.iInternalListenerLogConsole.equals(pListener)) {
-			// Removing internal log listener for console
-			this.iInternalListenerLogConsole = null;
-			this.iNumInternalLogListeners--;
-		} else {
-			// Removing user log listener
-			this.iNumExternalLogListeners--;
-		}
-	}
-
-	/**
-	 * Removes all listeners. Caution this will also remove the internal console
-	 * and file loggers.
-	 */
-	public synchronized void clearLogListeners() {
-		this.iLogListeners = new ArrayList();
-		removeHandlers(Logger.getLogger(CONSOLE_LOGGER));
-		removeHandlers(Logger.getLogger(FILE_LOGGER));
-
-		this.iInternalListenerLogFile = null;
-		this.iInternalListenerLogConsole = null;
-		this.iNumInternalLogListeners = 0;
-		this.iNumExternalLogListeners = 0;
-	}
-
-	/**
-	 * Gets the registered log listeners including the internal console and file
-	 * loggers.
-	 * 
-	 * @return The list of listeners
-	 */
-	public List getLogListeners() {
-		return this.iLogListeners;
-	}
-
-	/**
-	 * Adds a listener for log messages. The listener will be notified of any
-	 * trace event.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public synchronized void addTraceListener(TraceListener pListener) {
-		if (pListener == null) return;
-		sendGreetings(pListener);
-		ArrayList newListeners = new ArrayList(this.iTraceListeners);
-		newListeners.add(pListener);
-		this.iTraceListeners = newListeners;
-
-		if ((this.iInternalListenerTraceFile != null && this.iInternalListenerTraceFile
-				.equals(pListener))
-				|| (this.iInternalListenerTraceConsole != null && this.iInternalListenerTraceConsole
-						.equals(pListener))) {
-			this.iNumInternalTraceListeners++;
-		} else {
-			this.iNumExternalTraceListeners++;
-		}
-	}
-
-	/**
-	 * Removes a listener. This listener will not be notified of trace events
-	 * anymore.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public synchronized void removeTraceListener(TraceListener pListener) {
-		ArrayList newListeners = new ArrayList(this.iTraceListeners);
-		if (!newListeners.remove(pListener)) return;
-		this.iTraceListeners = newListeners;
-
-		if (this.iInternalListenerTraceFile != null
-				&& this.iInternalListenerTraceFile.equals(pListener)) {
-			// Removing internal tracelistener for file
-			this.iInternalListenerTraceFile = null;
-			this.iNumInternalTraceListeners--;
-		} else if (this.iInternalListenerTraceConsole != null
-				&& this.iInternalListenerTraceConsole.equals(pListener)) {
-			// Removing internal trace listener for console
-			this.iInternalListenerTraceConsole = null;
-			this.iNumInternalTraceListeners--;
-		} else {
-			// Removing user trace listener
-			this.iNumExternalTraceListeners--;
-		}
-	}
-
-	/**
-	 * Removes all listeners. Caution this will also remove the internal trace
-	 * file listener.
-	 */
-	public synchronized void clearTraceListeners() {
-		this.iTraceListeners = new ArrayList();
-		removeHandlers(Logger.getLogger(TRACE_LOGGER));
-
-		this.iInternalListenerTraceFile = null;
-		this.iInternalListenerTraceConsole = null;
-		this.iNumInternalTraceListeners = 0;
-		this.iNumExternalTraceListeners = 0;
-	}
-
-	/**
-	 * Gets the registered trace listeners including the internal console and
-	 * file loggers.
-	 * 
-	 * @return A list of listeners
-	 */
-	public List getTraceListeners() {
-		return this.iTraceListeners;
-	}
-
-	/**
-	 * Adds a listener for CIM-XML trace messages. The listener will be notified
-	 * of any CIM-XML trace event.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public synchronized void addCIMXMLTraceListener(CIMXMLTraceListener pListener) {
-		if (pListener == null) return;
-		ArrayList newListeners = new ArrayList(
-				this.iCIMXMLTraceListeners);
-		newListeners.add(pListener);
-		this.iCIMXMLTraceListeners = newListeners;
-	}
-
-	/**
-	 * Removes a CIM-XML trace listener. This listener will not be notified of
-	 * CIM-XML trace events anymore.
-	 * 
-	 * @param pListener
-	 *            The listener
-	 */
-	public synchronized void removeCIMXMLTraceListener(CIMXMLTraceListener pListener) {
-		ArrayList newListeners = new ArrayList(
-				this.iCIMXMLTraceListeners);
-		if (!newListeners.remove(pListener)) return;
-		this.iCIMXMLTraceListeners = newListeners;
-	}
-
-	/**
-	 * Removes all CIM-XML trace listeners.
-	 */
-	public synchronized void clearCIMXMLTraceListeners() {
-		if (this.iCIMXMLTraceListeners.size() > 0) this.iCIMXMLTraceListeners = new ArrayList();
-	}
-
-	/**
-	 * Gets the registered CIM-XML trace listeners.
-	 * 
-	 * @return A list of listeners
-	 */
-	public List getCIMXMLTraceListeners() {
-		return this.iCIMXMLTraceListeners;
-	}
-
-	/**
-	 * Forwards a log/trace message to the registered log&trace listeners.
-	 * 
-	 * @param pKey
-	 *            The message identifier.
-	 */
-	public void message(String pKey) {
-		message(pKey, (Object[]) null);
-	}
-
-	/**
-	 * Forwards a log/trace message to the registered log&trace listeners.
-	 * 
-	 * @param pKey
-	 *            The message identifier.
-	 * @param pParameter
-	 *            The parameter for the message
-	 */
-	public void message(String pKey, Object pParameter) {
-		message(pKey, new Object[] { pParameter });
-	}
-
-	/**
-	 * Forwards a log/trace message to the registered log&trace listeners.
-	 * 
-	 * @param pKey
-	 *            The message identifier.
-	 * @param pParameters
-	 *            The parameters for the message
-	 */
-	public void message(String pKey, Object[] pParameters) {
-		try {
-			final String message = MessageLoader.getMessage(pKey);
-			final String localMessage = MessageLoader.getLocalizedMessage(pKey);
-			final Level level = MessageLoader.getLevel(pKey);
-			if (isLoggableTrace(level)) {
-				final List traceListeners = getTraceListeners();
-				StackTraceElement caller = getCaller();
-				for (int i = 0; i < traceListeners.size(); ++i) {
-					traceListeners.get(i).trace(level, caller,
-							pKey + " " + MessageFormat.format(message, pParameters));
-				}
-			}
-			final List logListeners = getLogListeners();
-			for (int i = 0; i < logListeners.size(); ++i) {
-				logListeners.get(i).log(level, pKey, localMessage, pParameters);
-			}
-		} catch (Exception e) {
-			// don't crash for logging
-		}
-	}
-
-	/**
-	 * Forwards a trace message to the registered trace listeners.
-	 * 
-	 * @param pLevel
-	 *            One of the three message level identifiers FINE, FINER and
-	 *            FINEST
-	 * @param pMessage
-	 *            The message text
-	 */
-	public void trace(Level pLevel, String pMessage) {
-		try {
-			if (isLoggableTrace(pLevel)) {
-				final List traceListeners = getTraceListeners();
-				StackTraceElement caller = getCaller();
-				for (int i = 0; i < traceListeners.size(); ++i) {
-					traceListeners.get(i).trace(pLevel, caller, pMessage);
-				}
-			}
-		} catch (Exception e) {
-			// don't crash for logging
-		}
-	}
-
-	/**
-	 * Forwards a trace message to the registered trace listeners.
-	 * 
-	 * @param pLevel
-	 *            One of the three message level identifiers FINE, FINER and
-	 *            FINEST
-	 * @param pMessage
-	 *            The message text
-	 * @param pThrown
-	 *            The throwable associated with the message
-	 */
-	public void trace(Level pLevel, String pMessage, Throwable pThrown) {
-		try {
-			if (isLoggableTrace(pLevel)) {
-				final List traceListeners = getTraceListeners();
-				StackTraceElement caller = getCaller();
-				for (int i = 0; i < traceListeners.size(); ++i) {
-					traceListeners.get(i).trace(pLevel, caller, pMessage, pThrown);
-				}
-			}
-		} catch (Exception e) {
-			// don't crash for logging
-		}
-	}
-
-	/**
-	 * Forwards a CIM-XML trace message to the registered CIM-XML trace
-	 * listeners.
-	 * 
-	 * @param pLevel
-	 *            One of the message level identifiers, e.g. FINE
-	 * @param pMessage
-	 *            The CIM-XML message text
-	 * @param pOutgoing
-	 *            true if CIM-XML is outgoing (being sent from
-	 *            client to server), false if CIM-XML is incoming
-	 *            (being sent from server to client)
-	 */
-	public void traceCIMXML(Level pLevel, String pMessage, boolean pOutgoing) {
-		try {
-			if (this.iCIMXMLTraceListeners.size() > 0) {
-				final List traceListeners = getCIMXMLTraceListeners();
-				for (int i = 0; i < traceListeners.size(); ++i) {
-					traceListeners.get(i).traceCIMXML(pLevel, pMessage, pOutgoing);
-				}
-			}
-		} catch (Exception e) {
-			// don't crash for logging
-		}
-	}
-
-	/**
-	 * Forwards a method entry message to the registered trace listeners.
-	 */
-	public void entry() {
-		trace(Level.FINEST, "Entering method");
-	}
-
-	/**
-	 * Forwards a method exit message to the registered trace listeners.
-	 */
-	public void exit() {
-		trace(Level.FINEST, "Exiting method");
-	}
-
-	/**
-	 * Returns the output stream to which all CIM-XML traffic (outgoing &
-	 * incoming) will be copied for debugging purposes.
-	 * 
-	 * @return The output stream. A null value means that CIM-XML
-	 *         debugging is disabled
-	 */
-	public OutputStream getXmlTraceStream() {
-		return this.iXmlTraceStream;
-	}
-
-	/**
-	 * Sets an output stream to which all CIM-XML traffic (outgoing &
-	 * incoming) will be copied for debugging purposes.
-	 * 
-	 * @param pStream
-	 *            The output stream. A null value means that
-	 *            CIM-XML debugging is disabled.
-	 */
-	public void setXmlTraceStream(OutputStream pStream) {
-		this.iXmlTraceStream = pStream;
-	}
-
-	/*
-	 * Initializes the CIM-XML trace file (sblim.wbem.cimxmlTraceStream) during
-	 * initialization of LogAndTraceBroker - the trace file is used if CIM-XML
-	 * tracing is enabled (sblim.wbem.cimxmlTracing=true) but there is no
-	 * CIM-XML trace stream set via setXmlTraceStream()
-	 */
-	private void initXmlTraceFile() {
-		try {
-			if (WBEMConfiguration.getGlobalConfiguration().isCimXmlTracingEnabled()) {
-				String filename = WBEMConfiguration.getGlobalConfiguration().getCimXmlTraceStream();
-				if (filename != null && filename.length() > 0 && this.iXmlTraceFile == null
-						&& getXmlTraceStream() == null) {
-					if (filename.equalsIgnoreCase("System.out")) {
-						this.iXmlTraceFile = System.out;
-					} else if (filename.equalsIgnoreCase("System.err")) {
-						this.iXmlTraceFile = System.err;
-					} else {
-						try {
-							this.iXmlTraceFile = new FileOutputStream(filename);
-						} catch (IOException e) {
-							trace(Level.FINE, "Unable to open "
-									+ WBEMConfigurationProperties.CIMXML_TRACE_STREAM + "="
-									+ filename, e);
-						}
-					}
-					setXmlTraceStream(this.iXmlTraceFile);
-				}
-			}
-		} catch (Exception e) {
-			// Don't crash for logging
-		}
-	}
-
-	/**
-	 * Analyzes the stack trace and determines from where the
-	 * LogAndTraceBroker was called.
-	 * 
-	 * @return First StackTraceElement outside the
-	 *         LogAndTraceBroker
-	 */
-	private StackTraceElement getCaller() {
-		StackTraceElement[] stack = (new Throwable()).getStackTrace();
-		for (int i = 0; i < stack.length; ++i) {
-			StackTraceElement frame = stack[i];
-			String cname = frame.getClassName();
-			if (!this.iTHIS_CLASS.equals(cname) && !this.iTHROWABLE.equals(cname)) { return frame; }
-		}
-		return null;
-	}
-
-	/**
-	 * Removes all handlers from a logger
-	 * 
-	 * @param pLogger
-	 *            The logger
-	 */
-	private void removeHandlers(Logger pLogger) {
-		Handler[] handlers = pLogger.getHandlers();
-		for (int i = 0; i < handlers.length; ++i) {
-			pLogger.removeHandler(handlers[i]);
-			handlers[i].close();
-		}
-	}
-
-	/**
-	 * Checks whether there are trace listeners installed that will log a trace
-	 * message with the specified level. Use this method to determine if a
-	 * trace() method call could result in logging before preparing the
-	 * information to be logged. For example:
-	 * 
-	 * 
      -	 *     if (logger.isLoggableTrace(Level.WARNING) {
-	 *         // Prepare info for logging
-	 *         logger.trace(Level.WARNING, ...
-	 * 
      
-	 * 
-	 * @param pLevel
-	 *            The Level of the trace message.
-	 * @return true if trace message could be logged,
-	 *         false otherwise.
-	 */
-	public boolean isLoggableTrace(Level pLevel) {
-		// If there are no trace listeners or specified level is OFF, message
-		// will not be logged
-		if (this.iTraceListeners.size() == 0 || pLevel.intValue() == Level.OFF.intValue()) return false;
-
-		// If there are external trace listeners, message could be logged (user
-		// can alter level at will, so we do not know what it is)
-		if (this.iNumExternalTraceListeners > 0) return true;
-
-		// If there are internal trace listeners, determine if message will be
-		// logged
-		if (this.iNumInternalTraceListeners > 0) {
-			int level = Level.OFF.intValue();
-			if (this.iInternalListenerTraceFile != null) {
-				level = this.iInternalLevelTraceFile;
-			}
-			if (this.iInternalListenerTraceConsole != null && level > this.iInternalLevelConsole) {
-				level = this.iInternalLevelConsole;
-			}
-			return level <= pLevel.intValue();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Checks whether there are log listeners installed that will log a message
-	 * with the specified level. Use this method to determine if a message()
-	 * method call could result in logging before preparing the information to
-	 * be logged. For example:
-	 * 
-	 * 
      -	 *     if (logger.isLoggableMessage(Level.WARNING) {
-	 *         // Prepare info for logging
-	 *         logger.message(Level.WARNING, ...
-	 * 
      
-	 * 
-	 * @param pLevel
-	 *            The Level of the message.
-	 * @return true if message could be logged, false
-	 *         otherwise.
-	 */
-	public boolean isLoggableMessage(Level pLevel) {
-		// If message is traceable, message could be logged
-		if (isLoggableTrace(pLevel)) return true;
-
-		// If there are no log listeners or specified level is OFF, message
-		// will not be logged
-		if (this.iLogListeners.size() == 0 || pLevel.intValue() == Level.OFF.intValue()) return false;
-
-		// If there are external log listeners, message could be logged (user
-		// can alter level at will, so we do not know what it is)
-		if (this.iNumExternalLogListeners > 0) return true;
-
-		// If there are internal log listeners, determine if message will be
-		// logged
-		if (this.iNumInternalLogListeners > 0) {
-			int level = Level.OFF.intValue();
-			if (this.iInternalListenerLogFile != null) {
-				level = this.iInternalLevelLogFile;
-			}
-			if (this.iInternalListenerLogConsole != null && level > this.iInternalLevelConsole) {
-				level = this.iInternalLevelConsole;
-			}
-			return level <= pLevel.intValue();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Checks whether there are CIM-XML trace listeners installed that will log
-	 * a CIM-XML trace message. Use this method to determine if a trace() method
-	 * call could result in logging before preparing the information to be
-	 * logged. For example:
-	 * 
-	 * 
      -	 *     if (logger.isLoggableCIMXMLTrace(Level.FINEST) {
-	 *         // Prepare info for logging
-	 *         logger.traceCIMXML(Level.FINEST, ...
-	 * 
      
-	 * 
-	 * @param pLevel
-	 *            The Level of the trace message.
-	 * @return true if CIM-XML trace message could be logged,
-	 *         false otherwise.
-	 */
-	public boolean isLoggableCIMXMLTrace(Level pLevel) {
-		// If there are no CIM-XML trace listeners or specified level is OFF,
-		// message will not be logged
-		if (this.iCIMXMLTraceListeners.size() == 0 || pLevel.intValue() == Level.OFF.intValue()) return false;
-
-		return true;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-14  lupusalex    Make SBLIM client JSR48 compliant
+ * 1711092    2006-05-02  lupusalex    Some fixes/additions of log&trace messages
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 3001345    2010-05-18  blaschke-oss File handle leaks in HttpSocketFactory and LogAndTraceBroker
+ * 3027618    2010-07-14  blaschke-oss Close files/readers in finally blocks
+ * 3154232    2011-01-13  blaschke-oss EmbeddedObject misspelled in javadoc
+ * 3252669    2011-03-28  blaschke-oss setXmlTraceStream blindly closes previous stream
+ * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
+ * 3469018    2012-01-03  blaschke-oss Properties not passed to CIMIndicationHandler
+ * 3484014    2012-02-03  blaschke-oss Add LogAndTraceBroker.isLoggable for message/trace
+ * 3489638    2012-02-28  blaschke-oss PERF: Bottleneck in LogAndTraceBroker.java - getCaller()
+ * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
+ * 3576396    2012-10-11  blaschke-oss Improve logging of config file name
+ * 3596303    2013-01-04  blaschke-oss windows http response WWW-Authenticate: Negotiate fails
+ *    2652    2013-07-26  blaschke-oss LogAndTraceBroker.setXmlTraceStream should not close previous stream
+ *    2651    2013-07-31  blaschke-oss IOException when tracing the cimxml
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.logging;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.FileHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+import org.metricshub.wbem.sblim.cimclient.LogAndTraceManager;
+import org.metricshub.wbem.sblim.cimclient.WBEMConfigurationProperties;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
+import org.metricshub.wbem.sblim.cimclient.CIMXMLTraceListener;
+import org.metricshub.wbem.sblim.cimclient.LogListener;
+import org.metricshub.wbem.sblim.cimclient.TraceListener;
+
+/**
+ * Class LogAndTraceBroker is the central class that implements the logging and
+ * tracing of the CIM Client. It manages the collections of the internal log and
+ * trace listeners. It sets up the application independent logging. It provides
+ * the API to send log and trace messages and forwards them to the appropriate
+ * listeners.
+ * 
+ */
+public class LogAndTraceBroker {
+
+	private static final String TRACE_LOGGER = "org.metricshub.wbem.sblim.cimclient.trace";
+
+	private static final String FILE_LOGGER = "org.metricshub.wbem.sblim.cimclient.file";
+
+	private static final String CONSOLE_LOGGER = "org.metricshub.wbem.sblim.cimclient.console";
+
+	private static LogAndTraceBroker cBroker = new LogAndTraceBroker();
+
+	/**
+	 * Returns the singleton instance of the broker
+	 * 
+	 * @return The broker instance
+	 */
+	public static LogAndTraceBroker getBroker() {
+		return cBroker;
+	}
+
+	/**
+	 * Returns if the logging framework has been initialized. This method is
+	 * used by the WBEMConfiguration class to determine if the
+	 * logging is already up. The WBEMConfiguration is initialized
+	 * before the logging, so methods in this class cannot assume the logging to
+	 * be up and running.
+	 * 
+	 * @return true if the logging is up, false
+	 *         otherwise
+	 */
+	public static boolean isLoggingStarted() {
+		return cBroker != null;
+	}
+
+	private volatile ArrayList iLogListeners;
+
+	private volatile ArrayList iTraceListeners;
+
+	private volatile ArrayList iCIMXMLTraceListeners;
+
+	private String iProductName = "SBLIM CIM Client for Java";
+
+	private String iCopyright = "COPYRIGHT (C) 2006, 2013 IBM Corp.";
+
+	private String iVersion = "?";
+
+	private String iBuildDate = "?";
+
+	private String iBuildTime = "?";
+
+	private OutputStream iXmlTraceStream = null;
+
+	private OutputStream iXmlTraceFile = null;
+
+	private final String iTHIS_CLASS = this.getClass().getName();
+
+	private final String iTHROWABLE = Throwable.class.getName();
+
+	private int iInternalLevelConsole = Level.OFF.intValue();
+
+	private int iInternalLevelLogFile = Level.OFF.intValue();
+
+	private int iInternalLevelTraceFile = Level.OFF.intValue();
+
+	private LogListener iInternalListenerLogConsole = null;
+
+	private LogListener iInternalListenerLogFile = null;
+
+	private TraceListener iInternalListenerTraceConsole = null;
+
+	private TraceListener iInternalListenerTraceFile = null;
+
+	private int iNumInternalLogListeners = 0;
+
+	private int iNumExternalLogListeners = 0;
+
+	private int iNumInternalTraceListeners = 0;
+
+	private int iNumExternalTraceListeners = 0;
+
+	private LogAndTraceBroker() {
+		this.iLogListeners = new ArrayList();
+		this.iTraceListeners = new ArrayList();
+		this.iCIMXMLTraceListeners = new ArrayList();
+		loadVersionTxt();
+		registerInternalListeners();
+		initXmlTraceFile();
+	}
+
+	@Override
+	protected void finalize() throws Throwable {
+		try {
+			if (this.iXmlTraceFile != null && (!this.iXmlTraceFile.equals(System.out))
+					&& (!this.iXmlTraceFile.equals(System.err))) this.iXmlTraceFile.close();
+		} catch (IOException e) {
+			// bad luck
+		} finally {
+			this.iXmlTraceFile = null;
+			super.finalize();
+		}
+	}
+
+	/**
+	 * Registers the listeners for our internal loggers
+	 */
+	public void registerInternalListeners() {
+		try {
+			Level level = WBEMConfiguration.getGlobalConfiguration().getLogConsoleLevel();
+			String type = WBEMConfiguration.getGlobalConfiguration().getLogConsoleType();
+			if (level.intValue() < Level.OFF.intValue() && WBEMConstants.MESSAGE.equals(type)) {
+				final Logger logger = Logger.getLogger(CONSOLE_LOGGER);
+				final Handler handler = new ConsoleHandler();
+				handler.setFormatter(new LogFormatter());
+				handler.setLevel(level);
+				logger.addHandler(handler);
+				logger.setLevel(level);
+				logger.setUseParentHandlers(false);
+				this.iInternalLevelConsole = level.intValue();
+				if (this.iInternalListenerLogConsole != null) removeLogListener(this.iInternalListenerLogConsole);
+				this.iInternalListenerLogConsole = new LogListener() {
+
+					public void log(Level pLevel, String pMessageKey, String pMessage,
+							Object[] pParameters) {
+						LogRecord record = new LogRecord(pLevel, pMessageKey + " " + pMessage);
+						record.setParameters(pParameters);
+						logger.log(record);
+					}
+				};
+				addLogListener(this.iInternalListenerLogConsole);
+			}
+		} catch (Exception e) {
+			// Don't crash for logging
+		}
+		try {
+			Level level = WBEMConfiguration.getGlobalConfiguration().getLogFileLevel();
+			String location = WBEMConfiguration.getGlobalConfiguration().getLogFileLocation();
+			int size = WBEMConfiguration.getGlobalConfiguration().getLogFileSizeLimit();
+			int count = WBEMConfiguration.getGlobalConfiguration().getLogFileCount();
+			if (level.intValue() < Level.OFF.intValue()) {
+				final Logger logger = Logger.getLogger(FILE_LOGGER);
+				final Handler handler = new FileHandler(location, size, count);
+				handler.setFormatter(new LogFormatter());
+				handler.setLevel(level);
+				logger.addHandler(handler);
+				logger.setLevel(level);
+				logger.setUseParentHandlers(false);
+				this.iInternalLevelLogFile = level.intValue();
+				if (this.iInternalListenerLogFile != null) removeLogListener(this.iInternalListenerLogFile);
+				this.iInternalListenerLogFile = new LogListener() {
+
+					public void log(Level pLevel, String pMessageKey, String pMessage,
+							Object[] pParameters) {
+						LogRecord record = new LogRecord(pLevel, pMessageKey + " " + pMessage);
+						record.setParameters(pParameters);
+						logger.log(record);
+					}
+				};
+				addLogListener(this.iInternalListenerLogFile);
+			}
+		} catch (Exception e) {
+			// Don't crash for logging
+		}
+		try {
+			Level level = WBEMConfiguration.getGlobalConfiguration().getLogConsoleLevel();
+			String type = WBEMConfiguration.getGlobalConfiguration().getLogConsoleType();
+			if (level.intValue() < Level.OFF.intValue() && WBEMConstants.TRACE.equals(type)) {
+				final Logger logger = Logger.getLogger(CONSOLE_LOGGER);
+				final Handler handler = new ConsoleHandler();
+				handler.setFormatter(new TraceFormatter());
+				handler.setLevel(level);
+				logger.addHandler(handler);
+				logger.setLevel(level);
+				logger.setUseParentHandlers(false);
+				this.iInternalLevelConsole = level.intValue();
+				if (this.iInternalListenerTraceConsole != null) removeTraceListener(this.iInternalListenerTraceConsole);
+				this.iInternalListenerTraceConsole = new TraceListener() {
+
+					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage) {
+						LogRecord record = new LogRecord(pLevel, pMessage);
+						record.setSourceMethodName(String.valueOf(pOrigin));
+						logger.log(record);
+					}
+
+					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage,
+							Throwable pThrown) {
+						LogRecord record = new LogRecord(pLevel, pMessage);
+						record.setSourceMethodName(String.valueOf(pOrigin));
+						record.setThrown(pThrown);
+						logger.log(record);
+					}
+				};
+				addTraceListener(this.iInternalListenerTraceConsole);
+			}
+		} catch (Exception e) {
+			// Don't crash for logging
+		}
+		try {
+			Level level = WBEMConfiguration.getGlobalConfiguration().getTraceFileLevel();
+			String location = WBEMConfiguration.getGlobalConfiguration().getTraceFileLocation();
+			int size = WBEMConfiguration.getGlobalConfiguration().getTraceFileSizeLimit();
+			int count = WBEMConfiguration.getGlobalConfiguration().getTraceFileCount();
+			if (level.intValue() < Level.OFF.intValue()) {
+				final Logger logger = Logger.getLogger(TRACE_LOGGER);
+				final Handler handler = new FileHandler(location, size, count);
+				handler.setFormatter(new TraceFormatter());
+				handler.setLevel(level);
+				logger.addHandler(handler);
+				logger.setLevel(level);
+				logger.setUseParentHandlers(false);
+				this.iInternalLevelTraceFile = level.intValue();
+				if (this.iInternalListenerTraceFile != null) removeTraceListener(this.iInternalListenerTraceFile);
+				this.iInternalListenerTraceFile = new TraceListener() {
+
+					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage) {
+						LogRecord record = new LogRecord(pLevel, pMessage);
+						record.setSourceMethodName(String.valueOf(pOrigin));
+						logger.log(record);
+					}
+
+					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage,
+							Throwable pThrown) {
+						LogRecord record = new LogRecord(pLevel, pMessage);
+						record.setSourceMethodName(String.valueOf(pOrigin));
+						record.setThrown(pThrown);
+						logger.log(record);
+					}
+				};
+				addTraceListener(this.iInternalListenerTraceFile);
+			}
+		} catch (Exception e) {
+			// Don't crash for logging
+		}
+	}
+
+	/**
+	 * Adds a listener for log messages. The listener will be notified of any
+	 * log event. Uses copy on write to ensure concurrent read access.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public synchronized void addLogListener(LogListener pListener) {
+		if (pListener == null) return;
+		sendGreetings(pListener);
+		ArrayList newListeners = new ArrayList(this.iLogListeners);
+		newListeners.add(pListener);
+		this.iLogListeners = newListeners;
+
+		if ((this.iInternalListenerLogFile != null && this.iInternalListenerLogFile
+				.equals(pListener))
+				|| (this.iInternalListenerLogConsole != null && this.iInternalListenerLogConsole
+						.equals(pListener))) {
+			this.iNumInternalLogListeners++;
+		} else {
+			this.iNumExternalLogListeners++;
+		}
+	}
+
+	private void loadVersionTxt() {
+		InputStream is = null;
+		try {
+			Properties version = new Properties();
+			is = LogAndTraceManager.class.getResourceAsStream("version.txt");
+			version.load(is);
+			this.iProductName = version.getProperty("PRODUCTNAME");
+			this.iCopyright = version.getProperty("COPYRIGHT");
+			this.iVersion = version.getProperty("VERSION");
+			this.iBuildDate = version.getProperty("BUILDDATE");
+			this.iBuildTime = version.getProperty("BUILDTIME");
+		} catch (Exception e) {
+			// nothing to do
+		} finally {
+			if (is != null) {
+				try {
+					is.close();
+				} catch (IOException e) {
+					// nothing ro do
+				}
+			}
+		}
+	}
+
+	private void sendGreetings(LogListener pListener) {
+
+		pListener.log(MessageLoader.getLevel(Messages.GREETING), Messages.GREETING, MessageLoader
+				.getLocalizedMessage(Messages.GREETING), new Object[] { this.iProductName,
+				this.iCopyright });
+		pListener.log(MessageLoader.getLevel(Messages.RELEASE), Messages.RELEASE, MessageLoader
+				.getLocalizedMessage(Messages.RELEASE), new Object[] { this.iVersion,
+				this.iBuildDate, this.iBuildTime });
+		pListener.log(MessageLoader.getLevel(Messages.OS), Messages.OS, MessageLoader
+				.getLocalizedMessage(Messages.OS), new Object[] { System.getProperty("os.name"),
+				System.getProperty("os.version"), System.getProperty("os.arch") });
+		pListener.log(MessageLoader.getLevel(Messages.JRE), Messages.JRE, MessageLoader
+				.getLocalizedMessage(Messages.JRE), new Object[] {
+				System.getProperty("java.version"), System.getProperty("java.vendor") });
+		pListener.log(MessageLoader.getLevel(Messages.JVM), Messages.JVM, MessageLoader
+				.getLocalizedMessage(Messages.JVM), new Object[] {
+				System.getProperty("java.vm.name"), System.getProperty("java.vm.version"),
+				System.getProperty("java.vm.vendor") });
+		pListener.log(MessageLoader.getLevel(Messages.CONFIGURATION_URL),
+				Messages.CONFIGURATION_URL, MessageLoader
+						.getLocalizedMessage(Messages.CONFIGURATION_URL),
+				new Object[] { WBEMConfiguration.getActiveConfigFullURL() });
+		if (!WBEMConfiguration.isConfigurationLoadSuccessful()) {
+			pListener.log(MessageLoader.getLevel(Messages.CONFIGURATION_LOAD_FAILED),
+					Messages.CONFIGURATION_LOAD_FAILED, MessageLoader
+							.getLocalizedMessage(Messages.CONFIGURATION_LOAD_FAILED),
+					(Object[]) null);
+			if (WBEMConfiguration.getConfigurationLoadException() != null) {
+				pListener.log(MessageLoader.getLevel(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
+						Messages.EXCEPTION_DURING_CONFIGURATION_LOAD, MessageLoader
+								.getLocalizedMessage(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
+						new Object[] { WBEMConfiguration.getConfigurationLoadException()
+								.getMessage() });
+			}
+		}
+	}
+
+	private void sendGreetings(TraceListener pListener) {
+		StackTraceElement origin = new Throwable().getStackTrace()[0];
+		pListener.trace(MessageLoader.getLevel(Messages.GREETING), origin, MessageFormat.format(
+				MessageLoader.getMessage(Messages.GREETING), new Object[] { this.iProductName,
+						this.iCopyright }));
+		pListener.trace(MessageLoader.getLevel(Messages.RELEASE), origin, MessageFormat.format(
+				MessageLoader.getMessage(Messages.RELEASE), new Object[] { this.iVersion,
+						this.iBuildDate, this.iBuildTime }));
+		pListener.trace(MessageLoader.getLevel(Messages.OS), origin, MessageFormat.format(
+				MessageLoader.getMessage(Messages.OS), new Object[] {
+						System.getProperty("os.name"), System.getProperty("os.version"),
+						System.getProperty("os.arch") }));
+		pListener.trace(MessageLoader.getLevel(Messages.JRE), origin, MessageFormat.format(
+				MessageLoader.getMessage(Messages.JRE), new Object[] {
+						System.getProperty("java.version"), System.getProperty("java.vendor") }));
+		pListener.trace(MessageLoader.getLevel(Messages.JVM), origin, MessageFormat.format(
+				MessageLoader.getMessage(Messages.JVM), new Object[] {
+						System.getProperty("java.vm.name"), System.getProperty("java.vm.version"),
+						System.getProperty("java.vm.vendor") }));
+		pListener.trace(MessageLoader.getLevel(Messages.CONFIGURATION_URL), origin, MessageFormat
+				.format(MessageLoader.getMessage(Messages.CONFIGURATION_URL),
+						new Object[] { WBEMConfiguration.getActiveConfigURL() }));
+		if (!WBEMConfiguration.isConfigurationLoadSuccessful()) {
+			pListener.trace(MessageLoader.getLevel(Messages.CONFIGURATION_LOAD_FAILED), origin,
+					MessageLoader.getMessage(Messages.CONFIGURATION_LOAD_FAILED));
+			if (WBEMConfiguration.getConfigurationLoadException() != null) {
+				pListener.trace(MessageLoader
+						.getLevel(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD), origin,
+						MessageLoader.getMessage(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
+						WBEMConfiguration.getConfigurationLoadException());
+			}
+		}
+	}
+
+	/**
+	 * Remove a listener. This listener will not be notified of log events
+	 * anymore.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public synchronized void removeLogListener(LogListener pListener) {
+		ArrayList newListeners = new ArrayList(this.iLogListeners);
+		if (!newListeners.remove(pListener)) return;
+		this.iLogListeners = newListeners;
+
+		if (this.iInternalListenerLogFile != null
+				&& this.iInternalListenerLogFile.equals(pListener)) {
+			// Removing internal log listener for file
+			this.iInternalListenerLogFile = null;
+			this.iNumInternalLogListeners--;
+		} else if (this.iInternalListenerLogConsole != null
+				&& this.iInternalListenerLogConsole.equals(pListener)) {
+			// Removing internal log listener for console
+			this.iInternalListenerLogConsole = null;
+			this.iNumInternalLogListeners--;
+		} else {
+			// Removing user log listener
+			this.iNumExternalLogListeners--;
+		}
+	}
+
+	/**
+	 * Removes all listeners. Caution this will also remove the internal console
+	 * and file loggers.
+	 */
+	public synchronized void clearLogListeners() {
+		this.iLogListeners = new ArrayList();
+		removeHandlers(Logger.getLogger(CONSOLE_LOGGER));
+		removeHandlers(Logger.getLogger(FILE_LOGGER));
+
+		this.iInternalListenerLogFile = null;
+		this.iInternalListenerLogConsole = null;
+		this.iNumInternalLogListeners = 0;
+		this.iNumExternalLogListeners = 0;
+	}
+
+	/**
+	 * Gets the registered log listeners including the internal console and file
+	 * loggers.
+	 * 
+	 * @return The list of listeners
+	 */
+	public List getLogListeners() {
+		return this.iLogListeners;
+	}
+
+	/**
+	 * Adds a listener for log messages. The listener will be notified of any
+	 * trace event.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public synchronized void addTraceListener(TraceListener pListener) {
+		if (pListener == null) return;
+		sendGreetings(pListener);
+		ArrayList newListeners = new ArrayList(this.iTraceListeners);
+		newListeners.add(pListener);
+		this.iTraceListeners = newListeners;
+
+		if ((this.iInternalListenerTraceFile != null && this.iInternalListenerTraceFile
+				.equals(pListener))
+				|| (this.iInternalListenerTraceConsole != null && this.iInternalListenerTraceConsole
+						.equals(pListener))) {
+			this.iNumInternalTraceListeners++;
+		} else {
+			this.iNumExternalTraceListeners++;
+		}
+	}
+
+	/**
+	 * Removes a listener. This listener will not be notified of trace events
+	 * anymore.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public synchronized void removeTraceListener(TraceListener pListener) {
+		ArrayList newListeners = new ArrayList(this.iTraceListeners);
+		if (!newListeners.remove(pListener)) return;
+		this.iTraceListeners = newListeners;
+
+		if (this.iInternalListenerTraceFile != null
+				&& this.iInternalListenerTraceFile.equals(pListener)) {
+			// Removing internal tracelistener for file
+			this.iInternalListenerTraceFile = null;
+			this.iNumInternalTraceListeners--;
+		} else if (this.iInternalListenerTraceConsole != null
+				&& this.iInternalListenerTraceConsole.equals(pListener)) {
+			// Removing internal trace listener for console
+			this.iInternalListenerTraceConsole = null;
+			this.iNumInternalTraceListeners--;
+		} else {
+			// Removing user trace listener
+			this.iNumExternalTraceListeners--;
+		}
+	}
+
+	/**
+	 * Removes all listeners. Caution this will also remove the internal trace
+	 * file listener.
+	 */
+	public synchronized void clearTraceListeners() {
+		this.iTraceListeners = new ArrayList();
+		removeHandlers(Logger.getLogger(TRACE_LOGGER));
+
+		this.iInternalListenerTraceFile = null;
+		this.iInternalListenerTraceConsole = null;
+		this.iNumInternalTraceListeners = 0;
+		this.iNumExternalTraceListeners = 0;
+	}
+
+	/**
+	 * Gets the registered trace listeners including the internal console and
+	 * file loggers.
+	 * 
+	 * @return A list of listeners
+	 */
+	public List getTraceListeners() {
+		return this.iTraceListeners;
+	}
+
+	/**
+	 * Adds a listener for CIM-XML trace messages. The listener will be notified
+	 * of any CIM-XML trace event.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public synchronized void addCIMXMLTraceListener(CIMXMLTraceListener pListener) {
+		if (pListener == null) return;
+		ArrayList newListeners = new ArrayList(
+				this.iCIMXMLTraceListeners);
+		newListeners.add(pListener);
+		this.iCIMXMLTraceListeners = newListeners;
+	}
+
+	/**
+	 * Removes a CIM-XML trace listener. This listener will not be notified of
+	 * CIM-XML trace events anymore.
+	 * 
+	 * @param pListener
+	 *            The listener
+	 */
+	public synchronized void removeCIMXMLTraceListener(CIMXMLTraceListener pListener) {
+		ArrayList newListeners = new ArrayList(
+				this.iCIMXMLTraceListeners);
+		if (!newListeners.remove(pListener)) return;
+		this.iCIMXMLTraceListeners = newListeners;
+	}
+
+	/**
+	 * Removes all CIM-XML trace listeners.
+	 */
+	public synchronized void clearCIMXMLTraceListeners() {
+		if (this.iCIMXMLTraceListeners.size() > 0) this.iCIMXMLTraceListeners = new ArrayList();
+	}
+
+	/**
+	 * Gets the registered CIM-XML trace listeners.
+	 * 
+	 * @return A list of listeners
+	 */
+	public List getCIMXMLTraceListeners() {
+		return this.iCIMXMLTraceListeners;
+	}
+
+	/**
+	 * Forwards a log/trace message to the registered log&trace listeners.
+	 * 
+	 * @param pKey
+	 *            The message identifier.
+	 */
+	public void message(String pKey) {
+		message(pKey, (Object[]) null);
+	}
+
+	/**
+	 * Forwards a log/trace message to the registered log&trace listeners.
+	 * 
+	 * @param pKey
+	 *            The message identifier.
+	 * @param pParameter
+	 *            The parameter for the message
+	 */
+	public void message(String pKey, Object pParameter) {
+		message(pKey, new Object[] { pParameter });
+	}
+
+	/**
+	 * Forwards a log/trace message to the registered log&trace listeners.
+	 * 
+	 * @param pKey
+	 *            The message identifier.
+	 * @param pParameters
+	 *            The parameters for the message
+	 */
+	public void message(String pKey, Object[] pParameters) {
+		try {
+			final String message = MessageLoader.getMessage(pKey);
+			final String localMessage = MessageLoader.getLocalizedMessage(pKey);
+			final Level level = MessageLoader.getLevel(pKey);
+			if (isLoggableTrace(level)) {
+				final List traceListeners = getTraceListeners();
+				StackTraceElement caller = getCaller();
+				for (int i = 0; i < traceListeners.size(); ++i) {
+					traceListeners.get(i).trace(level, caller,
+							pKey + " " + MessageFormat.format(message, pParameters));
+				}
+			}
+			final List logListeners = getLogListeners();
+			for (int i = 0; i < logListeners.size(); ++i) {
+				logListeners.get(i).log(level, pKey, localMessage, pParameters);
+			}
+		} catch (Exception e) {
+			// don't crash for logging
+		}
+	}
+
+	/**
+	 * Forwards a trace message to the registered trace listeners.
+	 * 
+	 * @param pLevel
+	 *            One of the three message level identifiers FINE, FINER and
+	 *            FINEST
+	 * @param pMessage
+	 *            The message text
+	 */
+	public void trace(Level pLevel, String pMessage) {
+		try {
+			if (isLoggableTrace(pLevel)) {
+				final List traceListeners = getTraceListeners();
+				StackTraceElement caller = getCaller();
+				for (int i = 0; i < traceListeners.size(); ++i) {
+					traceListeners.get(i).trace(pLevel, caller, pMessage);
+				}
+			}
+		} catch (Exception e) {
+			// don't crash for logging
+		}
+	}
+
+	/**
+	 * Forwards a trace message to the registered trace listeners.
+	 * 
+	 * @param pLevel
+	 *            One of the three message level identifiers FINE, FINER and
+	 *            FINEST
+	 * @param pMessage
+	 *            The message text
+	 * @param pThrown
+	 *            The throwable associated with the message
+	 */
+	public void trace(Level pLevel, String pMessage, Throwable pThrown) {
+		try {
+			if (isLoggableTrace(pLevel)) {
+				final List traceListeners = getTraceListeners();
+				StackTraceElement caller = getCaller();
+				for (int i = 0; i < traceListeners.size(); ++i) {
+					traceListeners.get(i).trace(pLevel, caller, pMessage, pThrown);
+				}
+			}
+		} catch (Exception e) {
+			// don't crash for logging
+		}
+	}
+
+	/**
+	 * Forwards a CIM-XML trace message to the registered CIM-XML trace
+	 * listeners.
+	 * 
+	 * @param pLevel
+	 *            One of the message level identifiers, e.g. FINE
+	 * @param pMessage
+	 *            The CIM-XML message text
+	 * @param pOutgoing
+	 *            true if CIM-XML is outgoing (being sent from
+	 *            client to server), false if CIM-XML is incoming
+	 *            (being sent from server to client)
+	 */
+	public void traceCIMXML(Level pLevel, String pMessage, boolean pOutgoing) {
+		try {
+			if (this.iCIMXMLTraceListeners.size() > 0) {
+				final List traceListeners = getCIMXMLTraceListeners();
+				for (int i = 0; i < traceListeners.size(); ++i) {
+					traceListeners.get(i).traceCIMXML(pLevel, pMessage, pOutgoing);
+				}
+			}
+		} catch (Exception e) {
+			// don't crash for logging
+		}
+	}
+
+	/**
+	 * Forwards a method entry message to the registered trace listeners.
+	 */
+	public void entry() {
+		trace(Level.FINEST, "Entering method");
+	}
+
+	/**
+	 * Forwards a method exit message to the registered trace listeners.
+	 */
+	public void exit() {
+		trace(Level.FINEST, "Exiting method");
+	}
+
+	/**
+	 * Returns the output stream to which all CIM-XML traffic (outgoing &
+	 * incoming) will be copied for debugging purposes.
+	 * 
+	 * @return The output stream. A null value means that CIM-XML
+	 *         debugging is disabled
+	 */
+	public OutputStream getXmlTraceStream() {
+		return this.iXmlTraceStream;
+	}
+
+	/**
+	 * Sets an output stream to which all CIM-XML traffic (outgoing &
+	 * incoming) will be copied for debugging purposes.
+	 * 
+	 * @param pStream
+	 *            The output stream. A null value means that
+	 *            CIM-XML debugging is disabled.
+	 */
+	public void setXmlTraceStream(OutputStream pStream) {
+		this.iXmlTraceStream = pStream;
+	}
+
+	/*
+	 * Initializes the CIM-XML trace file (sblim.wbem.cimxmlTraceStream) during
+	 * initialization of LogAndTraceBroker - the trace file is used if CIM-XML
+	 * tracing is enabled (sblim.wbem.cimxmlTracing=true) but there is no
+	 * CIM-XML trace stream set via setXmlTraceStream()
+	 */
+	private void initXmlTraceFile() {
+		try {
+			if (WBEMConfiguration.getGlobalConfiguration().isCimXmlTracingEnabled()) {
+				String filename = WBEMConfiguration.getGlobalConfiguration().getCimXmlTraceStream();
+				if (filename != null && filename.length() > 0 && this.iXmlTraceFile == null
+						&& getXmlTraceStream() == null) {
+					if (filename.equalsIgnoreCase("System.out")) {
+						this.iXmlTraceFile = System.out;
+					} else if (filename.equalsIgnoreCase("System.err")) {
+						this.iXmlTraceFile = System.err;
+					} else {
+						try {
+							this.iXmlTraceFile = new FileOutputStream(filename);
+						} catch (IOException e) {
+							trace(Level.FINE, "Unable to open "
+									+ WBEMConfigurationProperties.CIMXML_TRACE_STREAM + "="
+									+ filename, e);
+						}
+					}
+					setXmlTraceStream(this.iXmlTraceFile);
+				}
+			}
+		} catch (Exception e) {
+			// Don't crash for logging
+		}
+	}
+
+	/**
+	 * Analyzes the stack trace and determines from where the
+	 * LogAndTraceBroker was called.
+	 * 
+	 * @return First StackTraceElement outside the
+	 *         LogAndTraceBroker
+	 */
+	private StackTraceElement getCaller() {
+		StackTraceElement[] stack = (new Throwable()).getStackTrace();
+		for (int i = 0; i < stack.length; ++i) {
+			StackTraceElement frame = stack[i];
+			String cname = frame.getClassName();
+			if (!this.iTHIS_CLASS.equals(cname) && !this.iTHROWABLE.equals(cname)) { return frame; }
+		}
+		return null;
+	}
+
+	/**
+	 * Removes all handlers from a logger
+	 * 
+	 * @param pLogger
+	 *            The logger
+	 */
+	private void removeHandlers(Logger pLogger) {
+		Handler[] handlers = pLogger.getHandlers();
+		for (int i = 0; i < handlers.length; ++i) {
+			pLogger.removeHandler(handlers[i]);
+			handlers[i].close();
+		}
+	}
+
+	/**
+	 * Checks whether there are trace listeners installed that will log a trace
+	 * message with the specified level. Use this method to determine if a
+	 * trace() method call could result in logging before preparing the
+	 * information to be logged. For example:
+	 * 
+	 * 
      +	 *     if (logger.isLoggableTrace(Level.WARNING) {
+	 *         // Prepare info for logging
+	 *         logger.trace(Level.WARNING, ...
+	 * 
      
+	 * 
+	 * @param pLevel
+	 *            The Level of the trace message.
+	 * @return true if trace message could be logged,
+	 *         false otherwise.
+	 */
+	public boolean isLoggableTrace(Level pLevel) {
+		// If there are no trace listeners or specified level is OFF, message
+		// will not be logged
+		if (this.iTraceListeners.size() == 0 || pLevel.intValue() == Level.OFF.intValue()) return false;
+
+		// If there are external trace listeners, message could be logged (user
+		// can alter level at will, so we do not know what it is)
+		if (this.iNumExternalTraceListeners > 0) return true;
+
+		// If there are internal trace listeners, determine if message will be
+		// logged
+		if (this.iNumInternalTraceListeners > 0) {
+			int level = Level.OFF.intValue();
+			if (this.iInternalListenerTraceFile != null) {
+				level = this.iInternalLevelTraceFile;
+			}
+			if (this.iInternalListenerTraceConsole != null && level > this.iInternalLevelConsole) {
+				level = this.iInternalLevelConsole;
+			}
+			return level <= pLevel.intValue();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Checks whether there are log listeners installed that will log a message
+	 * with the specified level. Use this method to determine if a message()
+	 * method call could result in logging before preparing the information to
+	 * be logged. For example:
+	 * 
+	 * 
      +	 *     if (logger.isLoggableMessage(Level.WARNING) {
+	 *         // Prepare info for logging
+	 *         logger.message(Level.WARNING, ...
+	 * 
      
+	 * 
+	 * @param pLevel
+	 *            The Level of the message.
+	 * @return true if message could be logged, false
+	 *         otherwise.
+	 */
+	public boolean isLoggableMessage(Level pLevel) {
+		// If message is traceable, message could be logged
+		if (isLoggableTrace(pLevel)) return true;
+
+		// If there are no log listeners or specified level is OFF, message
+		// will not be logged
+		if (this.iLogListeners.size() == 0 || pLevel.intValue() == Level.OFF.intValue()) return false;
+
+		// If there are external log listeners, message could be logged (user
+		// can alter level at will, so we do not know what it is)
+		if (this.iNumExternalLogListeners > 0) return true;
+
+		// If there are internal log listeners, determine if message will be
+		// logged
+		if (this.iNumInternalLogListeners > 0) {
+			int level = Level.OFF.intValue();
+			if (this.iInternalListenerLogFile != null) {
+				level = this.iInternalLevelLogFile;
+			}
+			if (this.iInternalListenerLogConsole != null && level > this.iInternalLevelConsole) {
+				level = this.iInternalLevelConsole;
+			}
+			return level <= pLevel.intValue();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Checks whether there are CIM-XML trace listeners installed that will log
+	 * a CIM-XML trace message. Use this method to determine if a trace() method
+	 * call could result in logging before preparing the information to be
+	 * logged. For example:
+	 * 
+	 * 
      +	 *     if (logger.isLoggableCIMXMLTrace(Level.FINEST) {
+	 *         // Prepare info for logging
+	 *         logger.traceCIMXML(Level.FINEST, ...
+	 * 
      
+	 * 
+	 * @param pLevel
+	 *            The Level of the trace message.
+	 * @return true if CIM-XML trace message could be logged,
+	 *         false otherwise.
+	 */
+	public boolean isLoggableCIMXMLTrace(Level pLevel) {
+		// If there are no CIM-XML trace listeners or specified level is OFF,
+		// message will not be logged
+		if (this.iCIMXMLTraceListeners.size() == 0 || pLevel.intValue() == Level.OFF.intValue()) return false;
+
+		return true;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/LogFormatter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogFormatter.java
similarity index 71%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/LogFormatter.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogFormatter.java
index 5933868..b088ed4 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/LogFormatter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogFormatter.java
@@ -1,84 +1,82 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-15  lupusalex    Make SBLIM client JSR48 compliant
- * 1745282    2007-06-29  ebak         Uniform time stamps for log files
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.logging;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.text.MessageFormat;
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-
-/**
- * Class LogFormatter implements the formatting algorithm for our console log.
- * 
- */
-public class LogFormatter extends Formatter {
-
-	private final String iLineSeparator = System.getProperty("line.separator");
-
-	/**
-	 * Ctor.
-	 */
-	public LogFormatter() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.logging.Formatter#format(java.util.logging.LogRecord)
-	 */
-	@Override
-	public String format(LogRecord pRecord) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(TimeStamp.format(pRecord.getMillis()));
-		buffer.append(" >");
-		buffer.append(String.valueOf(pRecord.getThreadID()));
-		buffer.append("< ");
-		// buffer.append(iLineSeparator);
-		buffer.append(pRecord.getLevel().getName());
-		buffer.append(": ");
-		buffer.append(MessageFormat.format(pRecord.getMessage(), pRecord.getParameters()));
-		buffer.append(this.iLineSeparator);
-		return buffer.toString();
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-15  lupusalex    Make SBLIM client JSR48 compliant
+ * 1745282    2007-06-29  ebak         Uniform time stamps for log files
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.logging;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.text.MessageFormat;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
+
+/**
+ * Class LogFormatter implements the formatting algorithm for our console log.
+ * 
+ */
+public class LogFormatter extends Formatter {
+
+	private final String iLineSeparator = System.getProperty("line.separator");
+
+	/**
+	 * Ctor.
+	 */
+	public LogFormatter() {
+		super();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.util.logging.Formatter#format(java.util.logging.LogRecord)
+	 */
+	@Override
+	public String format(LogRecord pRecord) {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(TimeStamp.format(pRecord.getMillis()));
+		buffer.append(" >");
+		buffer.append(String.valueOf(pRecord.getThreadID()));
+		buffer.append("< ");
+		// buffer.append(iLineSeparator);
+		buffer.append(pRecord.getLevel().getName());
+		buffer.append(": ");
+		buffer.append(MessageFormat.format(pRecord.getMessage(), pRecord.getParameters()));
+		buffer.append(this.iLineSeparator);
+		return buffer.toString();
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/MessageLoader.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/MessageLoader.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/MessageLoader.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/MessageLoader.java
index 0af851c..51eb83a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/MessageLoader.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/MessageLoader.java
@@ -1,140 +1,138 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-14  lupusalex    Make SBLIM client JSR48 compliant
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2787464    2009-05-05  blaschke-oss lang exception in Chinese env with Java client 2.0.7
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.logging;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.logging.Level;
-
-/**
- * Class MessageLoader encapsulates the access to the resource file containing
- * log messages.
- * 
- */
-public final class MessageLoader {
-
-	private static final String BUNDLE_NAME = "org.sblim.cimclient.internal.logging.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE_LOCAL
-	/* = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault()) */;
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME,
-			Locale.ENGLISH);
-
-	/*
-	 * Use English if default locale not supported (doing it here handles
-	 * exception, assigning above does not)
-	 */
-	static {
-		ResourceBundle bundleLocal;
-		try {
-			bundleLocal = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault());
-		} catch (MissingResourceException e) {
-			bundleLocal = RESOURCE_BUNDLE;
-		}
-		RESOURCE_BUNDLE_LOCAL = bundleLocal;
-	}
-
-	private MessageLoader() {
-	// prevent instantiation
-	}
-
-	/**
-	 * Returns the English message for a given key.
-	 * 
-	 * @param pKey
-	 *            The key
-	 * @return The message
-	 */
-	public static String getMessage(String pKey) {
-		try {
-			return RESOURCE_BUNDLE.getString(pKey);
-		} catch (MissingResourceException e) {
-			return '!' + pKey + '!';
-		}
-	}
-
-	/**
-	 * Returns the localized message for a given key.
-	 * 
-	 * @param pKey
-	 *            The key
-	 * @return The message
-	 */
-	public static String getLocalizedMessage(String pKey) {
-		try {
-			return RESOURCE_BUNDLE_LOCAL.getString(pKey);
-		} catch (MissingResourceException e) {
-			return '!' + pKey + '!';
-		}
-	}
-
-	/**
-	 * Returns the level of a given message id based on the naming convention.
-	 * The convention is:
-	 * CIM<unique 4 digit id><level token>, e.g.
-	 * CIM1234S. Valid level tokens are S, W, I and
-	 * C for SEVERE, WARNING, INFO and
-	 * CONFIG respectively.
-	 * 
-	 * @param pKey
-	 *            The message id
-	 * @return The level
-	 */
-	public static Level getLevel(String pKey) {
-		char level = pKey.charAt(pKey.length() - 1);
-		switch (level) {
-			case 'S':
-				return Level.SEVERE;
-			case 'W':
-				return Level.WARNING;
-			case 'I':
-				return Level.INFO;
-			case 'C':
-				return Level.CONFIG;
-			default:
-				return null;
-		}
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-14  lupusalex    Make SBLIM client JSR48 compliant
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2787464    2009-05-05  blaschke-oss lang exception in Chinese env with Java client 2.0.7
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.logging;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+
+/**
+ * Class MessageLoader encapsulates the access to the resource file containing
+ * log messages.
+ * 
+ */
+public final class MessageLoader {
+
+	private static final String BUNDLE_NAME = "org.sblim.cimclient.internal.logging.messages"; //$NON-NLS-1$
+
+	private static final ResourceBundle RESOURCE_BUNDLE_LOCAL
+	/* = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault()) */;
+
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME,
+			Locale.ENGLISH);
+
+	/*
+	 * Use English if default locale not supported (doing it here handles
+	 * exception, assigning above does not)
+	 */
+	static {
+		ResourceBundle bundleLocal;
+		try {
+			bundleLocal = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault());
+		} catch (MissingResourceException e) {
+			bundleLocal = RESOURCE_BUNDLE;
+		}
+		RESOURCE_BUNDLE_LOCAL = bundleLocal;
+	}
+
+	private MessageLoader() {
+	// prevent instantiation
+	}
+
+	/**
+	 * Returns the English message for a given key.
+	 * 
+	 * @param pKey
+	 *            The key
+	 * @return The message
+	 */
+	public static String getMessage(String pKey) {
+		try {
+			return RESOURCE_BUNDLE.getString(pKey);
+		} catch (MissingResourceException e) {
+			return '!' + pKey + '!';
+		}
+	}
+
+	/**
+	 * Returns the localized message for a given key.
+	 * 
+	 * @param pKey
+	 *            The key
+	 * @return The message
+	 */
+	public static String getLocalizedMessage(String pKey) {
+		try {
+			return RESOURCE_BUNDLE_LOCAL.getString(pKey);
+		} catch (MissingResourceException e) {
+			return '!' + pKey + '!';
+		}
+	}
+
+	/**
+	 * Returns the level of a given message id based on the naming convention.
+	 * The convention is:
+	 * CIM<unique 4 digit id><level token>, e.g.
+	 * CIM1234S. Valid level tokens are S, W, I and
+	 * C for SEVERE, WARNING, INFO and
+	 * CONFIG respectively.
+	 * 
+	 * @param pKey
+	 *            The message id
+	 * @return The level
+	 */
+	public static Level getLevel(String pKey) {
+		char level = pKey.charAt(pKey.length() - 1);
+		switch (level) {
+			case 'S':
+				return Level.SEVERE;
+			case 'W':
+				return Level.WARNING;
+			case 'I':
+				return Level.INFO;
+			case 'C':
+				return Level.CONFIG;
+			default:
+				return null;
+		}
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/Messages.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/Messages.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/Messages.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/Messages.java
index 3efa689..203e35f 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/Messages.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/Messages.java
@@ -1,252 +1,250 @@
-/*
-  (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
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-16  lupusalex    Make SBLIM client JSR48 compliant
- * 1711092    2006-05-02  lupusalex    Some fixes/additions of log&trace messages
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3536399    2012-08-25  hellerda     Add client/listener peer authentication properties
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.logging;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Interface Messages holds the constants for the message keys.
- * 
- */
-public interface Messages {
-
-	/**
-	 * GREETING
-	 */
-	public String GREETING = "CIM0001I";
-
-	/**
-	 * RELEASE
-	 */
-	public String RELEASE = "CIM0002I";
-
-	/**
-	 * OS
-	 */
-	public String OS = "CIM0003I";
-
-	/**
-	 * JRE
-	 */
-	public String JRE = "CIM0004I";
-
-	/**
-	 * JVM
-	 */
-	public String JVM = "CIM0005I";
-
-	/**
-	 * CONFIGURATION_URL
-	 */
-	public String CONFIGURATION_URL = "CIM1001C";
-
-	/**
-	 * CONFIGURATION_LOAD_FAILED
-	 */
-	public String CONFIGURATION_LOAD_FAILED = "CIM1002C";
-
-	/**
-	 * EXCEPTION_DURING_CONFIGURATION_LOAD
-	 */
-	public String EXCEPTION_DURING_CONFIGURATION_LOAD = "CIM1003S";
-
-	/**
-	 * INVALID_KEY_IN_CONFIG_FILE
-	 */
-	public String INVALID_KEY_IN_CONFIG_FILE = "CIM1004W";
-
-	/**
-	 * HTTP_PROXY_AUTH_UNSUPPORTED
-	 */
-	public String HTTP_PROXY_AUTH_UNSUPPORTED = "CIM2001S";
-
-	/**
-	 * HTTP_CONNECTION_FAILED
-	 */
-	public String HTTP_CONNECTION_FAILED = "CIM2002W";
-
-	/**
-	 * HTTP_NO_SOCKET_FACTORY
-	 */
-	public String HTTP_NO_SOCKET_FACTORY = "CIM2003S";
-
-	/**
-	 * HTTP_AUTH_MODULE_INVALID
-	 */
-	public String HTTP_AUTH_MODULE_INVALID = "CIM2004S";
-
-	/**
-	 * HTTP_INVALID_HEADER
-	 */
-	public String HTTP_INVALID_HEADER = "CIM2005W";
-
-	/**
-	 * HTTP_HANDLE_CONNECTION_FAILED
-	 */
-	public String HTTP_HANDLE_CONNECTION_FAILED = "CIM2006S";
-
-	/**
-	 * HTTP_PEGASUS_LOCAL_AUTH_READ
-	 */
-	public String HTTP_PEGASUS_LOCAL_AUTH_READ = "CIM2007S";
-
-	/**
-	 * SSL_JSSE_PROVIDER_LOAD_FAILED
-	 */
-	public String SSL_JSSE_PROVIDER_LOAD_FAILED = "CIM2100S";
-
-	/**
-	 * SSL_KEYSTORE_NOT_FOUND
-	 */
-	public String SSL_KEYSTORE_NOT_FOUND = "CIM2101C";
-
-	/**
-	 * SSL_KEYSTORE_NOT_READABLE
-	 */
-	public String SSL_KEYSTORE_NOT_READABLE = "CIM2102W";
-
-	/**
-	 * SSL_KEYSTORE_INVALID_CERT
-	 */
-	public String SSL_KEYSTORE_INVALID_CERT = "CIM2103W";
-
-	/**
-	 * SSL_KEYSTORE_UNRECOVERABLE_KEY
-	 */
-	public String SSL_KEYSTORE_UNRECOVERABLE_KEY = "CIM2104W";
-
-	/**
-	 * SSL_KEYSTORE_INVALID
-	 */
-	public String SSL_KEYSTORE_INVALID = "CIM2105W";
-
-	/**
-	 * SSL_KEYSTORE_OTHER
-	 */
-	public String SSL_KEYSTORE_OTHER = "CIM2106W";
-
-	/**
-	 * SSL_KEYSTORE_FALLBACK
-	 */
-	public String SSL_KEYSTORE_FALLBACK = "CIM2107C";
-
-	/**
-	 * SSL_CONTEXT_INIT_FAILED
-	 */
-	public String SSL_CONTEXT_INIT_FAILED = "CIM2301S";
-
-	/**
-	 * SSL_KEYSTORE_INVALID_ALGORITHM
-	 */
-	public String SSL_KEYSTORE_INVALID_ALGORITHM = "CIM2108W";
-
-	/**
-	 * SSL_KEYSTORE_NULL
-	 */
-	public String SSL_KEYSTORE_NULL = "CIM2110C";
-
-	/**
-	 * SSL_TRUSTSTORE_NOT_FOUND
-	 */
-	public String SSL_TRUSTSTORE_NOT_FOUND = "CIM2201C";
-
-	/**
-	 * SSL_TRUSTSTORE_NOT_READABLE
-	 */
-	public String SSL_TRUSTSTORE_NOT_READABLE = "CIM2202W";
-
-	/**
-	 * SSL_TRUSTSTORE_INVALID_CERT
-	 */
-	public String SSL_TRUSTSTORE_INVALID_CERT = "CIM2203W";
-
-	/**
-	 * SSL_TRUSTSTORE_INVALID
-	 */
-	public String SSL_TRUSTSTORE_INVALID = "CIM2205W";
-
-	/**
-	 * SSL_TRUSTSTORE_OTHER
-	 */
-	public String SSL_TRUSTSTORE_OTHER = "CIM2206W";
-
-	/**
-	 * SSL_TRUSTSTORE_FALLBACK
-	 */
-	public String SSL_TRUSTSTORE_FALLBACK = "CIM2207C";
-
-	/**
-	 * SSL_TRUSTSTORE_INVALID_ALGORITHM
-	 */
-	public String SSL_TRUSTSTORE_INVALID_ALGORITHM = "CIM2208W";
-
-	/**
-	 * SSL_TRUSTSTORE_ACTIVE
-	 */
-	public String SSL_TRUSTSTORE_ACTIVE = "CIM2209C";
-
-	/**
-	 * SSL_TRUSTSTORE_NULL
-	 */
-	public String SSL_TRUSTSTORE_NULL = "CIM2210C";
-
-	/**
-	 * SSL_TRUSTSTORE_INACTIVE
-	 */
-	public String SSL_TRUSTSTORE_INACTIVE = "CIM2211W";
-
-	/**
-	 * SSL_TRUSTSTORE_FALLBACK_NOTRUST
-	 */
-	public String SSL_TRUSTSTORE_FALLBACK_NOTRUST = "CIM2212W";
-
-	/**
-	 * CIM_XMLHELPER_FAILED
-	 */
-	public String CIM_XMLHELPER_FAILED = "CIM3000S";
-
-	/**
-	 * TEST_MESSAGE
-	 */
-	public String TEST_MESSAGE = "CIM9999S";
-}
+/*
+  (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
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-16  lupusalex    Make SBLIM client JSR48 compliant
+ * 1711092    2006-05-02  lupusalex    Some fixes/additions of log&trace messages
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3536399    2012-08-25  hellerda     Add client/listener peer authentication properties
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.logging;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Interface Messages holds the constants for the message keys.
+ * 
+ */
+public interface Messages {
+
+	/**
+	 * GREETING
+	 */
+	public String GREETING = "CIM0001I";
+
+	/**
+	 * RELEASE
+	 */
+	public String RELEASE = "CIM0002I";
+
+	/**
+	 * OS
+	 */
+	public String OS = "CIM0003I";
+
+	/**
+	 * JRE
+	 */
+	public String JRE = "CIM0004I";
+
+	/**
+	 * JVM
+	 */
+	public String JVM = "CIM0005I";
+
+	/**
+	 * CONFIGURATION_URL
+	 */
+	public String CONFIGURATION_URL = "CIM1001C";
+
+	/**
+	 * CONFIGURATION_LOAD_FAILED
+	 */
+	public String CONFIGURATION_LOAD_FAILED = "CIM1002C";
+
+	/**
+	 * EXCEPTION_DURING_CONFIGURATION_LOAD
+	 */
+	public String EXCEPTION_DURING_CONFIGURATION_LOAD = "CIM1003S";
+
+	/**
+	 * INVALID_KEY_IN_CONFIG_FILE
+	 */
+	public String INVALID_KEY_IN_CONFIG_FILE = "CIM1004W";
+
+	/**
+	 * HTTP_PROXY_AUTH_UNSUPPORTED
+	 */
+	public String HTTP_PROXY_AUTH_UNSUPPORTED = "CIM2001S";
+
+	/**
+	 * HTTP_CONNECTION_FAILED
+	 */
+	public String HTTP_CONNECTION_FAILED = "CIM2002W";
+
+	/**
+	 * HTTP_NO_SOCKET_FACTORY
+	 */
+	public String HTTP_NO_SOCKET_FACTORY = "CIM2003S";
+
+	/**
+	 * HTTP_AUTH_MODULE_INVALID
+	 */
+	public String HTTP_AUTH_MODULE_INVALID = "CIM2004S";
+
+	/**
+	 * HTTP_INVALID_HEADER
+	 */
+	public String HTTP_INVALID_HEADER = "CIM2005W";
+
+	/**
+	 * HTTP_HANDLE_CONNECTION_FAILED
+	 */
+	public String HTTP_HANDLE_CONNECTION_FAILED = "CIM2006S";
+
+	/**
+	 * HTTP_PEGASUS_LOCAL_AUTH_READ
+	 */
+	public String HTTP_PEGASUS_LOCAL_AUTH_READ = "CIM2007S";
+
+	/**
+	 * SSL_JSSE_PROVIDER_LOAD_FAILED
+	 */
+	public String SSL_JSSE_PROVIDER_LOAD_FAILED = "CIM2100S";
+
+	/**
+	 * SSL_KEYSTORE_NOT_FOUND
+	 */
+	public String SSL_KEYSTORE_NOT_FOUND = "CIM2101C";
+
+	/**
+	 * SSL_KEYSTORE_NOT_READABLE
+	 */
+	public String SSL_KEYSTORE_NOT_READABLE = "CIM2102W";
+
+	/**
+	 * SSL_KEYSTORE_INVALID_CERT
+	 */
+	public String SSL_KEYSTORE_INVALID_CERT = "CIM2103W";
+
+	/**
+	 * SSL_KEYSTORE_UNRECOVERABLE_KEY
+	 */
+	public String SSL_KEYSTORE_UNRECOVERABLE_KEY = "CIM2104W";
+
+	/**
+	 * SSL_KEYSTORE_INVALID
+	 */
+	public String SSL_KEYSTORE_INVALID = "CIM2105W";
+
+	/**
+	 * SSL_KEYSTORE_OTHER
+	 */
+	public String SSL_KEYSTORE_OTHER = "CIM2106W";
+
+	/**
+	 * SSL_KEYSTORE_FALLBACK
+	 */
+	public String SSL_KEYSTORE_FALLBACK = "CIM2107C";
+
+	/**
+	 * SSL_CONTEXT_INIT_FAILED
+	 */
+	public String SSL_CONTEXT_INIT_FAILED = "CIM2301S";
+
+	/**
+	 * SSL_KEYSTORE_INVALID_ALGORITHM
+	 */
+	public String SSL_KEYSTORE_INVALID_ALGORITHM = "CIM2108W";
+
+	/**
+	 * SSL_KEYSTORE_NULL
+	 */
+	public String SSL_KEYSTORE_NULL = "CIM2110C";
+
+	/**
+	 * SSL_TRUSTSTORE_NOT_FOUND
+	 */
+	public String SSL_TRUSTSTORE_NOT_FOUND = "CIM2201C";
+
+	/**
+	 * SSL_TRUSTSTORE_NOT_READABLE
+	 */
+	public String SSL_TRUSTSTORE_NOT_READABLE = "CIM2202W";
+
+	/**
+	 * SSL_TRUSTSTORE_INVALID_CERT
+	 */
+	public String SSL_TRUSTSTORE_INVALID_CERT = "CIM2203W";
+
+	/**
+	 * SSL_TRUSTSTORE_INVALID
+	 */
+	public String SSL_TRUSTSTORE_INVALID = "CIM2205W";
+
+	/**
+	 * SSL_TRUSTSTORE_OTHER
+	 */
+	public String SSL_TRUSTSTORE_OTHER = "CIM2206W";
+
+	/**
+	 * SSL_TRUSTSTORE_FALLBACK
+	 */
+	public String SSL_TRUSTSTORE_FALLBACK = "CIM2207C";
+
+	/**
+	 * SSL_TRUSTSTORE_INVALID_ALGORITHM
+	 */
+	public String SSL_TRUSTSTORE_INVALID_ALGORITHM = "CIM2208W";
+
+	/**
+	 * SSL_TRUSTSTORE_ACTIVE
+	 */
+	public String SSL_TRUSTSTORE_ACTIVE = "CIM2209C";
+
+	/**
+	 * SSL_TRUSTSTORE_NULL
+	 */
+	public String SSL_TRUSTSTORE_NULL = "CIM2210C";
+
+	/**
+	 * SSL_TRUSTSTORE_INACTIVE
+	 */
+	public String SSL_TRUSTSTORE_INACTIVE = "CIM2211W";
+
+	/**
+	 * SSL_TRUSTSTORE_FALLBACK_NOTRUST
+	 */
+	public String SSL_TRUSTSTORE_FALLBACK_NOTRUST = "CIM2212W";
+
+	/**
+	 * CIM_XMLHELPER_FAILED
+	 */
+	public String CIM_XMLHELPER_FAILED = "CIM3000S";
+
+	/**
+	 * TEST_MESSAGE
+	 */
+	public String TEST_MESSAGE = "CIM9999S";
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/TimeStamp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TimeStamp.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/TimeStamp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TimeStamp.java
index 9f1303b..1ff1b6e 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/TimeStamp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TimeStamp.java
@@ -1,120 +1,118 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1745282    2007-06-29  ebak         Uniform time stamps for log files
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3062747    2010-09-21  blaschke-oss SblimCIMClient does not log all CIM-XML responces.
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.logging;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Calendar;
-
-/**
- * Class TimeStamp is responsible for building uniform date/time strings for
- * logging and tracing.
- * 
- */
-public class TimeStamp {
-
-	private static String pad(int pDigits, int pNum) {
-		String str = Integer.toString(pNum);
-		int len = Math.max(pDigits, str.length());
-		char[] cA = new char[len];
-		int paddingDigits = pDigits - str.length();
-		int dIdx = 0;
-		while (dIdx < paddingDigits)
-			cA[dIdx++] = '0';
-		int sIdx = 0;
-		while (dIdx < len)
-			cA[dIdx++] = str.charAt(sIdx++);
-		return new String(cA);
-	}
-
-	/**
-	 * formatWorker
-	 * 
-	 * @param pMillis
-	 *            - total milliseconds
-	 * @param pIncludeMillis
-	 *            - include milliseconds in String
-	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS[.sss] )
-	 */
-	private static String formatWorker(long pMillis, boolean pIncludeMillis) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(pMillis);
-		StringBuilder sb = new StringBuilder(Integer.toString(cal.get(Calendar.YEAR)));
-		sb.append('.');
-		sb.append(pad(2, cal.get(Calendar.MONTH) + 1));
-		sb.append('.');
-		sb.append(pad(2, cal.get(Calendar.DAY_OF_MONTH)));
-		sb.append(' ');
-		sb.append(pad(2, cal.get(Calendar.HOUR_OF_DAY)));
-		sb.append(':');
-		sb.append(pad(2, cal.get(Calendar.MINUTE)));
-		sb.append(':');
-		sb.append(pad(2, cal.get(Calendar.SECOND)));
-		if (pIncludeMillis) {
-			sb.append('.');
-			sb.append(pad(3, cal.get(Calendar.MILLISECOND)));
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * format
-	 * 
-	 * @param pMillis
-	 *            - total milliseconds
-	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS )
-	 */
-	public static String format(long pMillis) {
-		return formatWorker(pMillis, false);
-	}
-
-	/**
-	 * formatWithMillis
-	 * 
-	 * @param pMillis
-	 *            - total milliseconds
-	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS.sss )
-	 */
-	public static String formatWithMillis(long pMillis) {
-		return formatWorker(pMillis, true);
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1745282    2007-06-29  ebak         Uniform time stamps for log files
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3062747    2010-09-21  blaschke-oss SblimCIMClient does not log all CIM-XML responces.
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.logging;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Calendar;
+
+/**
+ * Class TimeStamp is responsible for building uniform date/time strings for
+ * logging and tracing.
+ * 
+ */
+public class TimeStamp {
+
+	private static String pad(int pDigits, int pNum) {
+		String str = Integer.toString(pNum);
+		int len = Math.max(pDigits, str.length());
+		char[] cA = new char[len];
+		int paddingDigits = pDigits - str.length();
+		int dIdx = 0;
+		while (dIdx < paddingDigits)
+			cA[dIdx++] = '0';
+		int sIdx = 0;
+		while (dIdx < len)
+			cA[dIdx++] = str.charAt(sIdx++);
+		return new String(cA);
+	}
+
+	/**
+	 * formatWorker
+	 * 
+	 * @param pMillis
+	 *            - total milliseconds
+	 * @param pIncludeMillis
+	 *            - include milliseconds in String
+	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS[.sss] )
+	 */
+	private static String formatWorker(long pMillis, boolean pIncludeMillis) {
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(pMillis);
+		StringBuilder sb = new StringBuilder(Integer.toString(cal.get(Calendar.YEAR)));
+		sb.append('.');
+		sb.append(pad(2, cal.get(Calendar.MONTH) + 1));
+		sb.append('.');
+		sb.append(pad(2, cal.get(Calendar.DAY_OF_MONTH)));
+		sb.append(' ');
+		sb.append(pad(2, cal.get(Calendar.HOUR_OF_DAY)));
+		sb.append(':');
+		sb.append(pad(2, cal.get(Calendar.MINUTE)));
+		sb.append(':');
+		sb.append(pad(2, cal.get(Calendar.SECOND)));
+		if (pIncludeMillis) {
+			sb.append('.');
+			sb.append(pad(3, cal.get(Calendar.MILLISECOND)));
+		}
+		return sb.toString();
+	}
+
+	/**
+	 * format
+	 * 
+	 * @param pMillis
+	 *            - total milliseconds
+	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS )
+	 */
+	public static String format(long pMillis) {
+		return formatWorker(pMillis, false);
+	}
+
+	/**
+	 * formatWithMillis
+	 * 
+	 * @param pMillis
+	 *            - total milliseconds
+	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS.sss )
+	 */
+	public static String formatWithMillis(long pMillis) {
+		return formatWorker(pMillis, true);
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/TraceFormatter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TraceFormatter.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/TraceFormatter.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TraceFormatter.java
index 5a7b49d..04ca2fa 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/TraceFormatter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TraceFormatter.java
@@ -1,95 +1,93 @@
-/*
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1565892    2006-11-15  lupusalex    Make SBLIM client JSR48 compliant
- * 1745282    2007-06-29  ebak         Uniform time stamps for log files
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.logging;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-
-/**
- * Class TraceFormatter implements the formatting algorithm for our console log.
- * 
- */
-public class TraceFormatter extends Formatter {
-
-	private final String iLineSeparator = System.getProperty("line.separator");
-
-	/**
-	 * Ctor.
-	 */
-	public TraceFormatter() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.util.logging.Formatter#format(java.util.logging.LogRecord)
-	 */
-	@Override
-	public String format(LogRecord pRecord) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(TimeStamp.format(pRecord.getMillis()));
-		buffer.append(" >");
-		buffer.append(String.valueOf(pRecord.getThreadID()));
-		buffer.append("< ");
-		buffer.append(pRecord.getSourceMethodName());
-		buffer.append(this.iLineSeparator);
-		buffer.append(pRecord.getLevel().getName());
-		buffer.append(": ");
-		buffer.append(pRecord.getMessage());
-		buffer.append(this.iLineSeparator);
-		if (pRecord.getThrown() != null) {
-			buffer.append("---> ");
-			StringWriter stringWriter = new StringWriter();
-			PrintWriter printWriter = new PrintWriter(stringWriter);
-			pRecord.getThrown().printStackTrace(printWriter);
-			printWriter.close();
-			buffer.append(stringWriter.toString());
-			buffer.append(this.iLineSeparator);
-		}
-		return buffer.toString();
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1565892    2006-11-15  lupusalex    Make SBLIM client JSR48 compliant
+ * 1745282    2007-06-29  ebak         Uniform time stamps for log files
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.logging;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
+
+/**
+ * Class TraceFormatter implements the formatting algorithm for our console log.
+ * 
+ */
+public class TraceFormatter extends Formatter {
+
+	private final String iLineSeparator = System.getProperty("line.separator");
+
+	/**
+	 * Ctor.
+	 */
+	public TraceFormatter() {
+		super();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.util.logging.Formatter#format(java.util.logging.LogRecord)
+	 */
+	@Override
+	public String format(LogRecord pRecord) {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append(TimeStamp.format(pRecord.getMillis()));
+		buffer.append(" >");
+		buffer.append(String.valueOf(pRecord.getThreadID()));
+		buffer.append("< ");
+		buffer.append(pRecord.getSourceMethodName());
+		buffer.append(this.iLineSeparator);
+		buffer.append(pRecord.getLevel().getName());
+		buffer.append(": ");
+		buffer.append(pRecord.getMessage());
+		buffer.append(this.iLineSeparator);
+		if (pRecord.getThrown() != null) {
+			buffer.append("---> ");
+			StringWriter stringWriter = new StringWriter();
+			PrintWriter printWriter = new PrintWriter(stringWriter);
+			pRecord.getThrown().printStackTrace(printWriter);
+			printWriter.close();
+			buffer.append(stringWriter.toString());
+			buffer.append(this.iLineSeparator);
+		}
+		return buffer.toString();
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/logging/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java
similarity index 93%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java
index 2bc3239..c1a810c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java
@@ -1,1272 +1,1270 @@
-/*
-  XMLPullParser.java
-
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 18274      2005-09-12  fiuczy       String values get corrupted by CIM client
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1663270    2007-02-19  ebak         Minor performance problems
- * 1708584    2007-04-27  ebak         CloseableIterator might not clean up streams
- * 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)
- * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- * 3001359    2010-05-18  blaschke-oss XMLPullParser.CharString equals() method broken
- * 3019252    2010-06-21  blaschke-oss Methods concatenate strings using + in a loop
- * 3026316    2010-07-07  blaschke-oss XMLPullParser unused fields
- * 3026417    2010-07-07  blaschke-oss XMLAttributeValue does not use iHash field
- * 3028518    2010-07-14  blaschke-oss Additional StringBuilder use
- * 3048749    2010-08-20  blaschke-oss Hex digit parsing logic error in XMLPullParser
- * 3304058    2011-05-20  blaschke-oss Use same date format in change history
- *    2639    2013-05-11  blaschke-oss CDATA parsing broken in PULL parser
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.pullparser;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.sax.XMLDefaultHandlerImpl;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.xml.sax.Attributes;
-
-/**
- * Class XMLPullParser is responsible for XML parsing.
- * 
- */
-public class XMLPullParser {
-
-	/**
-	 * Class XMLAttributes is an Attributes implementation.
-	 */
-	class XMLAttributes implements Attributes {
-
-		public int getIndex(String qName) {
-			/*
-			 * ebak: this is not good, since this Vector contains
-			 * XMLAttributeValues return iAttributeNames.indexOf(qName);
-			 */
-			for (int i = 0; i < XMLPullParser.this.iAttributeNames.size(); i++) {
-				XMLAttributeValue xmlAttrValue = XMLPullParser.this.iAttributeNames.get(i);
-				if (qName.equals(xmlAttrValue.toString())) return i;
-			}
-			return -1;
-		}
-
-		/**
-		 * @param uri
-		 * @param localName
-		 * @return int getIndex
-		 */
-		public int getIndex(String uri, String localName) {
-			return 0;
-		}
-
-		public int getLength() {
-			return XMLPullParser.this.iTotalAttributes;
-		}
-
-		/**
-		 * @param index
-		 * @return String getLocalName
-		 */
-		public String getLocalName(int index) {
-			return EMPTY;
-		}
-
-		public String getQName(int index) {
-			return XMLPullParser.this.iAttributeNames.get(index).getText();
-		}
-
-		/**
-		 * @param index
-		 * @return String getType
-		 */
-		public String getType(int index) {
-			return EMPTY;
-		}
-
-		/**
-		 * @param qName
-		 * @return String getType
-		 */
-		public String getType(String qName) {
-			return EMPTY;
-		}
-
-		/**
-		 * @param uri
-		 * @param localName
-		 * @return String getType
-		 */
-		public String getType(String uri, String localName) {
-			return EMPTY;
-		}
-
-		/**
-		 * @param index
-		 * @return String getURI
-		 */
-		public String getURI(int index) {
-			return EMPTY;
-		}
-
-		public String getValue(int index) {
-			return XMLPullParser.this.iAttributeValues.get(index).getText();
-		}
-
-		public String getValue(String qName) {
-			/*
-			 * ebak: the implementation have to return null if the attribute not
-			 * found ebak: indexOf not good here, because iAttributeNames
-			 * doesn't contain Strings
-			 */
-			int idx = getIndex(qName);
-			if (idx < 0) return null;
-			return getValue(idx);
-		}
-
-		/**
-		 * @param uri
-		 * @param localName
-		 * @return String getType
-		 */
-		public String getValue(String uri, String localName) {
-			return EMPTY;
-		}
-	}
-
-	class XMLAttributeValue {
-
-		int iCurrentPos;
-
-		int iBegin, iLen;
-
-		String iText;
-
-		private boolean iTranslate;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param begin
-		 * @param len
-		 * @param translate
-		 */
-		public XMLAttributeValue(int begin, int len, boolean translate) {
-			this.iBegin = begin;
-			this.iLen = len;
-			this.iTranslate = translate;
-		}
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param begin
-		 * @param len
-		 */
-		public XMLAttributeValue(int begin, int len) {
-			this.iBegin = begin;
-			this.iLen = len;
-			this.iTranslate = true;
-		}
-
-		/**
-		 * getText
-		 * 
-		 * @return String
-		 */
-		public String getText() {
-			if (this.iText == null) {
-				if (this.iTranslate) {
-					try {
-						// Integer hashKey = new Integer(hash);
-						// text = (String)stringTable.get(hashKey);
-						// text = null;
-						// if (text == null) {
-						this.iText = _getChars();
-						// stringTable.put(hashKey, text);
-						// } else {
-						// // System.out.println("Found:"+text);
-						// cnt++;
-						// }
-					} catch (Exception e) {
-						LogAndTraceBroker.getBroker().trace(Level.WARNING,
-								"exception while decoding CHARACTERS XML", e);
-						this.iText = new String(XMLPullParser.this.iBufferChar, this.iBegin,
-								this.iLen);
-					}
-				} else {
-					// Integer hashKey = new Integer(hash);
-					// text = (String)stringTable.get(hashKey);
-					// text = null;
-					// if (text == null) {
-					this.iText = new String(XMLPullParser.this.iBufferChar, this.iBegin, this.iLen);
-					// stringTable.put(hashKey, text);
-					// } else {
-					// // System.out.println("Found:"+text);
-					// cnt++;
-					// }
-				}
-			}
-			return this.iText;
-		}
-
-		// public void setTranslate(boolean translate) {
-		// this.translate = translate;
-		// }
-
-		/**
-		 * init
-		 * 
-		 * @param begin
-		 * @param len
-		 */
-		public void init(int begin, int len) {
-			this.iBegin = begin;
-			this.iLen = len;
-			this.iText = null;
-		}
-
-		/**
-		 * setTranslate
-		 * 
-		 * @param translate
-		 */
-		public void setTranslate(boolean translate) {
-			this.iTranslate = translate;
-		}
-
-		@Override
-		public String toString() {
-			return getText();
-		}
-
-		protected String _getChars() throws XMLPullParserException {
-			StringBuffer attributeValue = new StringBuffer();
-			int last = this.iBegin + this.iLen;
-			char ch;
-			// char prevCh = '\0'; //18274
-			for (this.iCurrentPos = this.iBegin; this.iCurrentPos < last; this.iCurrentPos++) {
-				ch = XMLPullParser.this.iBufferChar[this.iCurrentPos];
-				if (ch == '&') {
-					// try {
-					// System.out.println(_currentPos);
-					int ref = parseReference();
-
-					if (ref > -1) attributeValue.append((char) ref);
-					// }
-					// catch (Exception e) {
-					// e.printStackTrace();
-					// }
-					// } else if (ch == '\t'
-					// || ch == '\r'
-					// || ch == '\n') {
-					//
-					// if (ch != '\n' || prevCh != '\r'){
-					// attributeValue.append(' ');
-					// }
-				} else {
-					attributeValue.append(ch);
-				}
-				// prevCh = ch; //18274
-			}
-			return attributeValue.toString();
-		}
-
-		protected int parseReference() throws XMLPullParserException {
-			this.iCurrentPos++;
-			char ch1 = XMLPullParser.this.iBufferChar[this.iCurrentPos++];
-			if (ch1 == '#') {
-				ch1 = XMLPullParser.this.iBufferChar[this.iCurrentPos++];
-				if (ch1 == 'x') {
-					int value = 0;
-					do {
-						ch1 = XMLPullParser.this.iBufferChar[this.iCurrentPos++];
-						if (ch1 >= '0' && ch1 <= '9') value = value * 16 + (ch1 - '0');
-						else if (ch1 >= 'A' && ch1 <= 'F' || ch1 >= 'a' && ch1 <= 'f') value = value
-								* 16 + (Character.toUpperCase(ch1) - 'A' + 10);
-						else if (ch1 == ';') break;
-						else throw new XMLPullParserException(
-								"invalid character while parsing hex encoded number " + escape(ch1));
-					} while (true);
-					this.iCurrentPos--; // 18274
-					return (char) value;
-				}
-				int value = 0;
-				if (ch1 >= '0' && ch1 <= '9') {
-					do {
-						if (ch1 >= '0' && ch1 <= '9') {
-							value = value * 10 + (ch1 - '0');
-							ch1 = XMLPullParser.this.iBufferChar[this.iCurrentPos++];
-						} else if (ch1 == ';') break;
-						else throw new XMLPullParserException(
-								"invalid character while parsing decimal encoded number: "
-										+ escape(ch1));
-					} while (true);
-					this.iCurrentPos--; // 18274
-					return (char) value;
-				}
-				throw new XMLPullParserException("invalid number format");
-			}
-			int startPos = this.iCurrentPos - 1;
-			if (isValidStartElementNameChar(ch1)) {
-				do {
-					ch1 = XMLPullParser.this.iBufferChar[this.iCurrentPos++];
-					if (ch1 == ';') break;
-					if (!isValidElementNameChar(ch1)) throw new XMLPullParserException(
-							"invalid reference character " + escape(ch1));
-				} while (true);
-			} else {
-				throw new XMLPullParserException(
-						"expected valid name start character for value reference");
-			}
-			this.iCurrentPos--;
-			ch1 = XMLPullParser.this.iBufferChar[startPos];
-			char ch2 = XMLPullParser.this.iBufferChar[startPos + 1];
-			char ch3 = XMLPullParser.this.iBufferChar[startPos + 2];
-
-			if (ch1 == 'l' && ch2 == 't' && ch3 == ';') {
-				return '<';
-			} else if (ch1 == 'g' && ch2 == 't' && ch3 == ';') {
-				return '>';
-			} else {
-				char ch4 = XMLPullParser.this.iBufferChar[startPos + 3];
-				if (ch1 == 'a' && ch2 == 'm' && ch3 == 'p' && ch4 == ';') { return '&'; }
-				char ch5 = XMLPullParser.this.iBufferChar[startPos + 4];
-				if (ch1 == 'a' && ch2 == 'p' && ch3 == 'o' && ch4 == 's' && ch5 == ';') {
-					return '\'';
-				} else if (ch1 == 'q' && ch2 == 'u' && ch3 == 'o' && ch4 == 't' && ch5 == ';') {
-					return '\"';
-				} else {
-					// TODO return reference
-				}
-			}
-			return -1;
-		}
-	}
-
-	/**
-	 * ATTRIBUTE
-	 */
-	public static final int ATTRIBUTE = 10;
-
-	/**
-	 * CDATA
-	 */
-	public static final int CDATA = 12;
-
-	/**
-	 * CHARACTERS
-	 */
-	public static final int CHARACTERS = 4;
-
-	/**
-	 * COMMENT
-	 */
-	public static final int COMMENT = 5;
-
-	/**
-	 * DTD
-	 */
-	public static final int DTD = 11;
-
-	/**
-	 * EMPTY
-	 */
-	public static final String EMPTY = "";
-
-	/**
-	 * END_DOCUMENT
-	 */
-	public static final int END_DOCUMENT = 8;
-
-	/**
-	 * END_ELEMENT
-	 */
-	public static final int END_ELEMENT = 2;
-
-	/**
-	 * ENTITY_DECLARATION
-	 */
-	public static final int ENTITY_DECLARATION = 15;
-
-	/**
-	 * ENTITY_REFERENCE
-	 */
-	public static final int ENTITY_REFERENCE = 9;
-
-	/**
-	 * NAMESPACE
-	 */
-	public static final int NAMESPACE = 13;
-
-	/**
-	 * NOTATION_DECLARATION
-	 */
-	public static final int NOTATION_DECLARATION = 14;
-
-	/**
-	 * PROCESSING_INSTRUCTION
-	 */
-	public static final int PROCESSING_INSTRUCTION = 3;
-
-	/**
-	 * SPACE
-	 */
-	public static final int SPACE = 6;
-
-	/**
-	 * START_DOCUMENT
-	 */
-	public static final int START_DOCUMENT = 7;
-
-	/**
-	 * START_ELEMENT
-	 */
-	public static final int START_ELEMENT = 1;
-
-	/**
-	 * main
-	 * 
-	 * @param args
-	 */
-	public static void main(String[] args) {
-	// this did testing
-	}
-
-	// TODO: ebak: this function seems to be wrong, because "synchronizes" to
-	// IRETURNVALUE
-	/**
-	 * next
-	 * 
-	 * @param reader
-	 * @param parserHdlr
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public static boolean next(XMLPullParser reader, XMLDefaultHandlerImpl parserHdlr)
-			throws Exception {
-		while (reader.hasNext()) {
-			int event = reader.next();
-			switch (event) {
-				case START_ELEMENT:
-					parserHdlr.startElement(EMPTY, EMPTY, reader.getElementName(), reader
-							.getAttributes());
-					break;
-				case END_ELEMENT:
-					parserHdlr.endElement(EMPTY, EMPTY, reader.getElementName());
-
-					String lastElementName = null;
-					if (reader.getElementNames().size() > 0) {
-						ArrayList elementNames = reader.getElementNames();
-						lastElementName = elementNames.get(elementNames.size() - 1);
-					}
-
-					if (lastElementName != null && lastElementName.equalsIgnoreCase("IRETURNVALUE")) { return true; }
-					break;
-				case CHARACTERS:
-					char[] buf = reader.getText().toCharArray();
-					parserHdlr.characters(buf, 0, buf.length);
-					break;
-				case END_DOCUMENT:
-					return false;
-			}
-		}
-		return false;
-	}
-
-	ArrayList iAttributeNames = new ArrayList();
-
-	Attributes iAttributes;
-
-	ArrayList iAttributeValues = new ArrayList();
-
-	char[] iBufferChar = null;
-
-	XMLAttributeValue iCharacters;
-
-	boolean iClosingElementNamePending;
-
-	int iColNumber = 1;
-
-	int iCurrentPosition = 0;
-
-	int iCurrentState = 0;
-
-	String iElementName;
-
-	ArrayList iElementNames = new ArrayList();
-
-	int iEndCharacters;
-
-	int iFinishChar = 0;
-
-	Reader iInstream;
-
-	/*
-	 * ebak: implement close
-	 */
-	boolean iClosed;
-
-	int iLineNumber = 1;
-
-	boolean iSeenEpilog;
-
-	boolean iSeenProlog;
-
-	int iStartCharacters;
-
-	int iTotalAttributes;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param in
-	 */
-	public XMLPullParser(Reader in) {
-		this.iInstream = in;
-		reset();
-	}
-
-	/**
-	 * close
-	 * 
-	 * @throws IOException
-	 */
-	public void close() throws IOException {
-		if (this.iClosed) return;
-		this.iClosed = true;
-		this.iInstream.close();
-	}
-
-	/**
-	 * getAttributes
-	 * 
-	 * @return Attributes
-	 */
-	public Attributes getAttributes() {
-		if (this.iCurrentState != START_ELEMENT) return null;
-
-		if (this.iAttributes == null) {
-			this.iAttributes = new XMLAttributes();
-		}
-		return this.iAttributes;
-	}
-
-	/**
-	 * getElementName
-	 * 
-	 * @return String
-	 */
-	public String getElementName() {
-		return this.iElementName;
-	}
-
-	/**
-	 * getElementNames
-	 * 
-	 * @return Vector
-	 */
-	public ArrayList getElementNames() {
-		return this.iElementNames;
-	}
-
-	/**
-	 * getLevel
-	 * 
-	 * @return int
-	 */
-	public int getLevel() {
-		return this.iElementNames.size();
-	}
-
-	/**
-	 * getText
-	 * 
-	 * @return String
-	 */
-	public String getText() {
-		String result = null;
-		if (this.iCurrentState == CHARACTERS && this.iCharacters != null) { return this.iCharacters
-				.getText(); }
-		return result;
-	}
-
-	/**
-	 * hasNext
-	 * 
-	 * @return boolean
-	 */
-	public boolean hasNext() {
-		return !this.iClosed && this.iCurrentState != END_DOCUMENT;
-	}
-
-	/**
-	 * next
-	 * 
-	 * @return int
-	 * @throws IOException
-	 */
-	public int next() throws IOException {
-		char ch;
-		resetAttributes();
-		ensureCapacity();
-		if (this.iClosingElementNamePending) {
-			this.iClosingElementNamePending = false;
-			this.iElementNames.remove(this.iElementNames.size() - 1);
-			this.iCurrentState = END_ELEMENT;
-			return this.iCurrentState;
-		}
-		do {
-			ch = (char) getNextCharCheckingEOF();
-			if (ch == '<') {
-				ch = (char) getNextChar();
-				if (ch == '?') {
-					if (this.iSeenProlog) { throw new XMLPullParserException(
-							"The processing instruction target matching \"[xX][mM][lL]\" is not allowed."); }
-					this.iSeenProlog = true;
-					parsePI();
-					ch = (char) getNextChar();
-					ch = skipOptionalSpaces(ch);
-					if (ch != '<') throw new XMLPullParserException(this,
-							"Content is not allowed in prolog.");
-					goBack();
-
-					this.iCurrentState = START_DOCUMENT;
-					return this.iCurrentState;
-				} else if (ch == '!') {
-					ch = (char) getNextChar();
-					if (ch == '-') {
-						parseComment();
-
-						this.iCurrentState = COMMENT;
-						return this.iCurrentState;
-					} else if (ch == '[') {
-						parseCDATA();
-						this.iCurrentState = CHARACTERS;
-						return this.iCurrentState;
-					} else throw new XMLPullParserException(this, "unexpected char " + escape(ch));
-				} else if (ch == '/') {
-					parseEndElement();
-					this.iCurrentState = END_ELEMENT;
-					return this.iCurrentState;
-				} else if (ch == '&') {
-					parseUnknown();
-				} else if (isValidStartElementNameChar(ch)) {
-					if (!this.iSeenProlog) {
-						this.iSeenProlog = true;
-						this.iCurrentState = START_DOCUMENT;
-						goBack();
-						goBack();
-						return this.iCurrentState;
-					}
-					parseStartElement(ch);
-					this.iCurrentState = START_ELEMENT;
-					return this.iCurrentState;
-				} else {
-					throw new XMLPullParserException(this, "unexpected char " + escape(ch));
-				}
-			} else {
-				this.iStartCharacters = this.iCurrentPosition - 1;
-				boolean amp = false;
-				// int hash = 0;
-				// int n = 0;
-				do {
-					// n = (n+1)&15;
-					// hash = hash*primes[n]+ch;
-
-					ch = (char) getNextCharCheckingEOF();
-					if (ch == (char) -1) {
-						if (this.iElementNames.size() != 0) throw new XMLPullParserException(this,
-								"unexpected EOF ");
-
-						this.iCurrentState = END_DOCUMENT;
-						return this.iCurrentState;
-					} else if (ch == '\r' || ch == '\n') { /* :) */} else {
-						if (!isSpace(ch) && ch != '<' && this.iElementNames.size() == 0) {
-							if (!this.iSeenProlog) throw new XMLPullParserException(this,
-									"Content is not allowed in trailing section.");
-							throw new XMLPullParserException(this,
-									"Content is not allowed in trailing section.");
-						}
-					}
-					amp = false;
-					if (ch == '&') {
-						amp = true;
-						int i = parseReference();
-						ch = (char) (i & 0xFFFF);
-					}
-				} while (ch != '<' || amp);
-				this.iEndCharacters = this.iCurrentPosition;
-				goBack();
-				if (this.iElementNames.size() > 0) {
-					if (this.iCharacters == null) this.iCharacters = new XMLAttributeValue(
-							this.iStartCharacters, this.iEndCharacters - this.iStartCharacters - 1);
-					else {
-						this.iCharacters.init(this.iStartCharacters, this.iEndCharacters
-								- this.iStartCharacters - 1);
-						this.iCharacters.setTranslate(true);
-					}
-
-					this.iCurrentState = CHARACTERS;
-					return this.iCurrentState;
-				}
-			}
-		} while (true);
-	}
-
-	/**
-	 * reset
-	 */
-	public void reset() {
-		this.iSeenProlog = true;
-		this.iCurrentState = 0;
-		this.iClosingElementNamePending = false;
-		this.iColNumber = 1;
-		this.iLineNumber = 1;
-		this.iElementName = null;
-		this.iElementNames.clear();
-		this.iAttributeNames.clear();
-		this.iAttributeValues.clear();
-		this.iAttributes = null;
-
-		this.iStartCharacters = 0;
-		this.iEndCharacters = 0;
-
-		this.iTotalAttributes = 0;
-		this.iSeenProlog = false;
-		this.iSeenEpilog = false;
-	}
-
-	@Override
-	public String toString() {
-		switch (this.iCurrentState) {
-			case START_ELEMENT: {
-				StringBuilder sb = new StringBuilder("START ELEM: <");
-				sb.append(this.iElementName);
-				if (this.iAttributeNames.size() > 0) {
-					sb.append(" ");
-					for (int i = 0; i < this.iAttributeNames.size(); i++) {
-						sb.append(this.iAttributeNames.get(i));
-						sb.append("=\"");
-						sb.append(this.iAttributeValues.get(i));
-						sb.append("\" ");
-					}
-				}
-				sb.append(">");
-				return sb.toString();
-			}
-			case END_ELEMENT: {
-				String s = "END ELEM: ";
-				return s;
-			}
-			case CHARACTERS: {
-				return "CHARACTERS: \"" + getText(); // .replaceAll("\n",
-				// "\\\\n").replaceAll("\r",
-				// "\\\\r").replaceAll("\t",
-				// "\\\\t")+"\"";
-			}
-		}
-		return "UNKOWN";
-	}
-
-	protected char _getNextChar() {
-		return (char) -1;
-	}
-
-	protected void addAttribute(int begName, int lenName, int begValue, int lenValue) {
-		if (this.iAttributeNames.size() > this.iTotalAttributes) {
-			XMLAttributeValue attribute = this.iAttributeValues.get(this.iTotalAttributes);
-			XMLAttributeValue name = this.iAttributeNames.get(this.iTotalAttributes);
-			this.iTotalAttributes++;
-			attribute.init(begValue, lenValue);
-			attribute.setTranslate(true);
-			name.init(begName, lenName);
-			name.setTranslate(false);
-		} else {
-			XMLAttributeValue attribute = new XMLAttributeValue(begValue, lenValue);
-			XMLAttributeValue name = new XMLAttributeValue(begName, lenName, false);
-			this.iTotalAttributes++;
-			this.iAttributeNames.add(name);
-			this.iAttributeValues.add(attribute);
-		}
-	}
-
-	protected void ensureCapacity() {
-		if (this.iBufferChar == null) this.iBufferChar = new char[1024];
-
-		if (this.iCurrentPosition >= (8 * this.iBufferChar.length) / 10) {
-			System.arraycopy(this.iBufferChar, this.iCurrentPosition, this.iBufferChar, 0,
-					this.iFinishChar - this.iCurrentPosition);
-			this.iFinishChar -= this.iCurrentPosition;
-			this.iCurrentPosition = 0;
-		}
-	}
-
-	protected String escape(char ch) {
-		String result;
-		if (ch == '\n') result = "\'\\n\'";
-		if (ch == '\r') result = "\'\\r\'";
-		if (ch == '\t') result = "\'\\t\'";
-		if (ch == '\'') result = "\'\\'\'";
-		if (ch > '\177' || ch < ' ') result = "\'\\u" + Integer.toHexString(ch) + "\'";
-		else result = "\'" + ch + "\'";
-		return result;
-	}
-
-	protected int getChar() throws IOException {
-		if (this.iFinishChar <= this.iCurrentPosition) {
-			if (this.iBufferChar == null) {
-				this.iBufferChar = new char[1024];
-			} else if (this.iFinishChar >= this.iBufferChar.length) {
-				char[] tmp = this.iBufferChar;
-				this.iBufferChar = new char[this.iBufferChar.length << 1];
-				System.arraycopy(tmp, 0, this.iBufferChar, 0, tmp.length);
-			}
-
-			int total = this.iInstream.read(this.iBufferChar, this.iFinishChar,
-					this.iBufferChar.length - this.iFinishChar);
-
-			if (total <= 0) { return -1; }
-			this.iFinishChar += total;
-		}
-		return this.iBufferChar[this.iCurrentPosition++];
-	}
-
-	protected int getNextChar() throws IOException {
-		int ch;
-
-		if (this.iFinishChar <= this.iCurrentPosition) {
-			ch = getChar();
-		} else ch = this.iBufferChar[this.iCurrentPosition++];
-
-		if (ch == -1) throw new XMLPullParserException(this, "unexpected end of document");
-		if (ch == '\n') {
-			this.iLineNumber++;
-			this.iColNumber = 1;
-		} else this.iColNumber++;
-
-		return (char) ch;
-	}
-
-	protected int getNextCharCheckingEOF() throws IOException {
-		int ch;
-
-		if (this.iFinishChar <= this.iCurrentPosition) {
-			ch = getChar();
-		} else ch = this.iBufferChar[this.iCurrentPosition++];
-
-		if (ch == '\n') {
-			this.iLineNumber++;
-			this.iColNumber = 1;
-		} else this.iColNumber++;
-
-		return (char) ch;
-	}
-
-	protected void goBack() {
-		this.iCurrentPosition--;
-		if (this.iColNumber > 1) {
-			this.iColNumber--;
-		}
-	}
-
-	protected boolean isSpace(char ch) {
-		return ch == ' ' || ch == '\n' || ch == '\r' || ch == '\t';
-	}
-
-	protected boolean isValidElementNameChar(char ch) {
-		return (ch < 256 && (ch >= 'A' && ch <= 'Z' || ch >= 'a' && ch <= 'z' || ch == '_'
-				|| ch == ':' || ch == '-' || ch == '.' || ch >= '0' && ch <= '9' || ch == '\267'))
-				|| ch >= '\300'
-				&& ch <= '\u02FF'
-				|| ch >= '\u0370'
-				&& ch <= '\u037D'
-				|| ch >= '\u0300'
-				&& ch <= '\u036F'
-				|| ch >= '\u037F'
-				&& ch <= '\u2027'
-				|| ch >= '\u202A' && ch <= '\u218F' || ch >= '\u2800' && ch <= '\uFFEF';
-		// return isValidStartElementNameChar(ch)
-		// || (ch < 256 && (ch == '-'
-		// || ch == '.'
-		// || ch >= '0' && ch <= '9'
-		// || ch == '\267'))
-		// || ch >= '\u0300' && ch <= '\u036F'
-		// || ch >= '\u0400' && ch <= '\u2027'
-		// || ch >= '\u202A' && ch <= '\u218F'
-		// || ch >= '\u2800' && ch <= '\uFFEF';
-	}
-
-	protected boolean isValidStartElementNameChar(char ch) {
-		return (ch < 256 && (ch >= 'A' && ch <= 'Z' || ch >= 'a' && ch <= 'z' || ch == '_' || ch == ':'))
-				|| (ch >= '\300' && ch <= '\u02FF' || ch >= '\u0370' && ch <= '\u037D'
-						|| ch >= '\u037F' && ch <= '\u0400' || ch >= '\u0400' && ch <= '\u2027'
-						|| ch >= '\u202A' && ch <= '\u218F' || ch >= '\u2800' && ch <= '\uFFEF');
-	}
-
-	protected void parseAttribute(char ch) throws IOException {
-		int startAttributeName = this.iCurrentPosition - 1;
-		int endAttributeName;
-		// int hash = 0;
-		// int n = 0;
-		do {
-			// n = (n+1)&15;
-			// hash = hash*primes[n]+ch;
-
-			ch = (char) getNextChar();
-		} while (isValidElementNameChar(ch));
-		endAttributeName = this.iCurrentPosition;
-		// String attributeName = new String(bufferChar, startAttributeName,
-		// endAttributeName - startAttributeName-1);
-		// attributeNames.add(attributeName);
-
-		ch = skipOptionalSpaces(ch);
-
-		if (ch != '=') throw new XMLPullParserException(this, "missing character \'=\'instead "
-				+ escape(ch) + " was found ");
-
-		ch = (char) getNextChar();
-		ch = skipOptionalSpaces(ch);
-
-		char delimiter;
-		if (ch != '\"' && ch != '\'') throw new XMLPullParserException(this,
-				"missing character \'\"\' or \'\'\' instead " + escape(ch) + " was found ");
-		delimiter = ch;
-
-		// StringBuffer attributeValue = new StringBuffer();
-		int startAttributeValue = this.iCurrentPosition;
-		char prevCh = '\0';
-		// int hashvalue = 0;
-		// n = 0;
-		do {
-			// n = (n+1)&15;
-			// hashvalue = hashvalue *primes[n] +ch;
-
-			ch = (char) getNextChar();
-			if (ch == delimiter) break;
-			else if (ch == '<' || ch == '>') throw new XMLPullParserException(this,
-					"illegal character " + escape(ch));
-			else if (ch == '&') {
-				int ref = parseReference();
-				ch = (char) (ref & 0xffff);
-				// attributeValue.append((char)ref);
-			} else if (ch == '\t' || ch == '\r' || ch == '\n') {
-
-				if (ch != '\n' || prevCh != '\r') {
-					// attributeValue.append(' ');
-				}
-			} else {
-				// attributeValue.append(ch);
-			}
-			prevCh = ch;
-		} while (true);
-		int endAttributeValue = this.iCurrentPosition;
-		// attributeValues.add(attributeValue.toString());
-		addAttribute(startAttributeName, endAttributeName - startAttributeName - 1,
-				startAttributeValue, endAttributeValue - startAttributeValue - 1);
-
-		return;
-	}
-
-	protected int parseCDATA() throws IOException {
-		char ch;
-
-		if ((char) getNextChar() != 'C' || (char) getNextChar() != 'D'
-				|| (char) getNextChar() != 'A' || (char) getNextChar() != 'T'
-				|| (char) getNextChar() != 'A' || (char) getNextChar() != '[') throw new XMLPullParserException(
-				"CDATA must start with \"' && doubleBraket) {
-				break;
-			} else {
-				braketFound = false;
-				doubleBraket = false;
-			}
-			if (ch == (char) -1) throw new XMLPullParserException(
-					"XML document structures must start and end within the same entity.");
-		} while (true);
-
-		int endCharacter = this.iCurrentPosition - 3;
-
-		this.iCharacters.setTranslate(false);
-		this.iCharacters.init(startCharacter, endCharacter - startCharacter);
-
-		return -1;
-	}
-
-	protected int parseComment() throws IOException {
-		char ch;
-		ch = (char) getNextChar();
-		if (ch != '-') throw new XMLPullParserException("Comment must start with \"\n");
-					if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream
-							.write(resultStr.toString().getBytes());
-					if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger
-							.traceCIMXML(Level.FINEST, resultStr.toString(), false);
-				}
-			}
-		} while (retries-- > 0);
-
-		// Benchmark.stopTransportTimer();
-
-		// Look for CIM error and description, include in exception if exists
-		String errorCIM = connection.getHeaderField("CIMError");
-		String errorDescriptionCIM = null;
-		if (errorCIM != null) {
-			logger.trace(Level.FINER, "Found CIMError field with value \"" + errorCIM + "\"");
-
-			errorDescriptionCIM = connection.getHeaderField("CIMErrorDescription");
-			if (errorDescriptionCIM != null) {
-				try {
-					errorDescriptionCIM = URLDecoder.decode(errorDescriptionCIM, "UTF-8");
-				} catch (Exception e) {
-					errorDescriptionCIM = null;
-				}
-				logger.trace(Level.FINER, "Found CIMErrorDescription field with value \""
-						+ errorDescriptionCIM + "\"");
-			}
-		}
-
-		// Look for OpenPegasus error details, decode and include in exception
-		// if it exists
-		String errorOP = connection.getHeaderField("PGErrorDetail");
-		if (errorOP != null) {
-			try {
-				errorOP = URLDecoder.decode(errorOP, "UTF-8");
-			} catch (Exception e) {
-				errorOP = null;
-			}
-			logger.trace(Level.FINER, "Found PGErrorDetail field with value \"" + errorOP + "\"");
-		}
-
-		// Look for SFCB error details, decode and include in exception
-		// if it exists
-		String errorSFCB = connection.getHeaderField("SFCBErrorDetail");
-		if (errorSFCB != null) {
-			try {
-				errorSFCB = URLDecoder.decode(errorSFCB, "UTF-8");
-			} catch (Exception e) {
-				errorSFCB = null;
-			}
-			logger.trace(Level.FINER, "Found SFCBErrorDetail field with value \"" + errorSFCB
-					+ "\"");
-		}
-
-		// If CIMErrorDescription present, format of WBEMException is:
-		//
-		// HTTP StatusCode - ReasonPhrase (CIMError: "ErrorString",
-		// CIMErrorDescription: "ErrorString")
-		//
-		// Otherwise, format of WBEMException message is:
-		//
-		// HTTP StatusCode - ReasonPhrase (CIMError: "ErrorString", OpenPegasus
-		// Error: "ErrorString", SFCB Error: "ErrorString")
-		// 
-		// For example:
-		// HTTP 503 - Service Unavailable (SFCB Error:
-		// "Max Session Limit Exceeded")
-		StringBuffer errorMsg = new StringBuffer("HTTP ");
-		errorMsg.append(connection.getResponseCode());
-		errorMsg.append(" - ");
-		errorMsg.append(connection.getResponseMessage());
-		if (errorCIM != null && errorDescriptionCIM != null) {
-			errorMsg.append(" (CIMError: \"");
-			errorMsg.append(errorCIM);
-			errorMsg.append("\", CIMErrorDescription: \"");
-			errorMsg.append(errorDescriptionCIM);
-			errorMsg.append("\")");
-		} else if (errorCIM != null || errorOP != null || errorSFCB != null) {
-			errorMsg.append(" (");
-			if (errorCIM != null) {
-				errorMsg.append("CIMError: \"");
-				errorMsg.append(errorCIM);
-				errorMsg.append('"');
-			}
-			if (errorOP != null) {
-				if (errorCIM != null) errorMsg.append(", ");
-				errorMsg.append("OpenPegasus Error: \"");
-				errorMsg.append(errorOP);
-				errorMsg.append('"');
-			}
-			if (errorSFCB != null) {
-				if (errorCIM != null || errorOP != null) errorMsg.append(", ");
-				errorMsg.append("SFCB Error: \"");
-				errorMsg.append(errorSFCB);
-				errorMsg.append('"');
-			}
-			errorMsg.append(')');
-		}
-
-		connection.disconnect();
-
-		throw new WBEMException(exceptionNum, errorMsg.toString());
-	}
-
-	private HttpUrlConnection newConnection(boolean pIsIndication, URI pRecipient,
-			HttpClientPool pClientPool, String pCimMethod, HttpHeader pHeader, boolean pUseMPost) {
-
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		HttpUrlConnection connection = new HttpUrlConnection(pRecipient, pClientPool,
-				this.iAuthorizationHandler);
-		if (pUseMPost) {
-			connection.setRequestMethod(WBEMConstants.HTTP_MPOST);
-		} else connection.setRequestMethod(WBEMConstants.HTTP_POST);
-		connection.useHttp11("1.1".equals(this.iConfiguration.getHttpVersion()));
-
-		String firstLocaleStr = this.iLocales[0].getLanguage();
-		if (this.iLocales[0].getCountry().length() > 0) firstLocaleStr = firstLocaleStr + '-'
-				+ this.iLocales[0].getCountry();
-		StringBuilder restLocaleStrBld = new StringBuilder("");
-		for (int i = 1; i < this.iLocales.length; i++) {
-			if (this.iLocales[i] != null && this.iLocales[i].getLanguage().length() > 0) {
-				restLocaleStrBld.append(", ");
-				restLocaleStrBld.append(this.iLocales[i].getLanguage());
-				if (this.iLocales[i].getCountry().length() > 0) {
-					restLocaleStrBld.append('-');
-					restLocaleStrBld.append(this.iLocales[i].getCountry());
-				}
-			}
-		}
-
-		connection.setDoOutput(true);
-		connection.setDoInput(true);
-		connection.setRequestProperty("Content-type", "application/xml; charset=\"utf-8\"");
-		connection.setRequestProperty("Accept", "text/html, text/xml, application/xml");
-		connection.setRequestProperty("Cache-Control", "no-cache");
-		connection.setRequestProperty("Content-Language", firstLocaleStr);
-		connection.setRequestProperty("Accept-Language", firstLocaleStr
-				+ restLocaleStrBld.toString() + ", *");
-		if (this.iAuthorization != null) connection.setRequestProperty("Authorization",
-				this.iAuthorization);
-
-		String prefix = "";
-		if (connection.getRequestMethod().equalsIgnoreCase(WBEMConstants.HTTP_MPOST)) {
-			String ns = getNextNs();
-			connection.setRequestProperty("Man", "http://www.dmtf.org/cim/mapping/http/v1.0;ns="
-					+ ns);
-			prefix = ns + "-";
-		}
-		connection.setRequestProperty(prefix + "CIMProtocolVersion", "1.0");
-
-		if (pIsIndication) {
-			try {
-				connection.setRequestProperty("CIMExport", HttpHeader.encode("MethodRequest",
-						"UTF-8", "US-ASCII"));
-				connection.setRequestProperty("CIMExportMethod", HttpHeader.encode(
-						"ExportIndication", "UTF-8", "US-ASCII"));
-			} catch (UnsupportedEncodingException e) {
-				logger.trace(Level.FINE, "Exception while encoding http header", e);
-				connection.setRequestProperty("CIMExport", "MethodRequest");
-				connection.setRequestProperty("CIMExportMethod", "ExportIndication");
-			}
-		} else {
-			connection.setRequestProperty(prefix + "CIMOperation", "MethodCall");
-			try {
-				connection.setRequestProperty(prefix + "CIMMethod", HttpHeader.encode(pCimMethod,
-						"UTF-8", "US-ASCII"));
-			} catch (UnsupportedEncodingException e) {
-				logger.trace(Level.FINE, "Exception while encoding http header", e);
-				connection.setRequestProperty(prefix + "CIMMethod", pCimMethod);
-			}
-		}
-		Iterator> iter = pHeader.iterator();
-		while (iter.hasNext()) {
-			Entry entry = iter.next();
-			connection.setRequestProperty(prefix + entry.getKey().toString(), entry.getValue()
-					.toString());
-		}
-
-		logger.exit();
-		return connection;
-	}
-
-	private String getNextNs() {
-		this.iNsCounter = (this.iNsCounter < 99) ? ++this.iNsCounter : 10;
-		return String.valueOf(this.iNsCounter);
-	}
-
-	private HttpHeader parseHeaders(URLConnection pConnection) {
-		String man = pConnection.getHeaderField("Man");
-		String opt = pConnection.getHeaderField("Opt");
-		HttpHeader headers = new HttpHeader();
-		int i;
-		String ns = null;
-
-		HttpHeaderParser manOptHeader = null;
-		if (man != null && man.length() > 0) manOptHeader = new HttpHeaderParser(man);
-		else if (opt != null && opt.length() > 0) manOptHeader = new HttpHeaderParser(opt);
-		if (manOptHeader != null) ns = manOptHeader.getValue("ns");
-
-		if (ns != null) {
-			i = 0;
-			String key;
-			while ((key = pConnection.getHeaderFieldKey(++i)) != null) {
-				if (key.startsWith(ns + "-")) headers.addParsedField(key.substring(3), pConnection
-						.getHeaderField(i));
-				else headers.addParsedField(key, pConnection.getHeaderField(i));
-			}
-		} else {
-			i = 0;
-			String key;
-			while ((key = pConnection.getHeaderFieldKey(++i)) != null) {
-				headers.addParsedField(key, pConnection.getHeaderField(i));
-			}
-		}
-
-		return headers;
-	}
-
-	private String getCharacterSet(HttpHeader pHeader) {
-		String contentType = pHeader.getField("Content-type");
-		String charset = "UTF-8";
-		if (contentType != null && contentType.length() > 0) {
-			HttpHeaderParser contentTypeHeader = new HttpHeaderParser(contentType);
-			charset = contentTypeHeader.getValue("charset", charset);
-		}
-		return charset;
-	}
-
-	/**
-	 * getIterator : get generic CloseableIterator
-	 * 
-	 * @param 
-	 *            : Type Parameter
-	 * @param pStream
-	 *            : Input Stream Reader
-	 * @param pPath
-	 *            : CIMObjectPath
-	 * @return generic CloseableIterator
-	 * @throws IOException
-	 * @throws SAXException
-	 * @throws ParserConfigurationException
-	 * @throws WBEMException
-	 */
-
-	// :TODO : try to find solution of "unchecked" warning
-	@SuppressWarnings("unchecked")
-	private  CloseableIterator getIterator(InputStreamReader pStream, CIMObjectPath pPath)
-			throws IOException, SAXException, ParserConfigurationException, WBEMException {
-
-		String parser = this.iConfiguration.getCimXmlParser();
-
-		CloseableIterator iter = null;
-
-		if (WBEMConstants.SAX.equals(parser)) {
-			iter = new CloseableIteratorSAX(pStream, pPath);
-		} else if (WBEMConstants.PULL.equals(parser)) {
-			iter = new CloseableIteratorPULL(pStream, pPath);
-		} else if (WBEMConstants.DOM.equals(parser)) {
-			iter = new CloseableIteratorDOM(pStream, pPath);
-		} else {
-			throw new IllegalArgumentException("Invalid CIM-XML parser configured (\"" + parser
-					+ "\") ");
-		}
-		try {
-			// check for CIMExceptions
-			iter.hasNext();
-			return (CloseableIterator) iter;
-		} catch (RuntimeException e) {
-			iter.close();
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) { throw (WBEMException) e
-					.getCause(); }
-			throw e;
-		}
-	}
-
-	private  EnumerateResponse getEnumerateResponse(InputStreamReader pStream,
-			CIMObjectPath pPath) throws IOException, SAXException, ParserConfigurationException,
-			WBEMException {
-
-		String parser = this.iConfiguration.getCimXmlParser();
-
-		if (WBEMConstants.SAX.equals(parser)) return new EnumerateResponseSAX(pStream, pPath)
-				.getEnumResponse();
-		else if (WBEMConstants.PULL.equals(parser)) return new EnumerateResponsePULL(pStream,
-				pPath).getEnumResponse();
-		else if (WBEMConstants.DOM.equals(parser)) return new EnumerateResponseDOM(pStream,
-				pPath).getEnumResponse();
-
-		throw new IllegalArgumentException("Invalid CIM-XML parser configured (\"" + parser
-				+ "\") ");
-	}
-
-	private CIMResponse getSingleResponse(InputStreamReader pStream, CIMObjectPath pLocalPath)
-			throws WBEMException {
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-		Document dom;
-		try {
-			// Using factory get an instance of document builder
-			DocumentBuilder db = dbf.newDocumentBuilder();
-			// parse using builder to get DOM representation of the XML file
-			dom = db.parse(new InputSource(pStream));
-		} catch (TrailerException e) {
-			throw e.getWBEMException();
-		} catch (Exception e) {
-			String msg = "Exception occurred during DOM parsing!";
-			logger.trace(Level.SEVERE, msg, e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, msg, null, e);
-		}
-		CIMXMLParserImpl.setLocalObjectPath(pLocalPath);
-		CIMMessage cimMsg;
-		try {
-			cimMsg = CIMXMLParserImpl.parseCIM(dom.getDocumentElement());
-		} catch (CIMXMLParseException e) {
-			String msg = "Exception occurred during parseCIM!";
-			logger.trace(Level.SEVERE, msg, e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, msg, null, e);
-		}
-		if (!(cimMsg instanceof CIMResponse)) {
-			String msg = "CIM message must be response!";
-			logger.trace(Level.SEVERE, msg);
-			throw new WBEMException(msg);
-		}
-		return (CIMResponse) cimMsg;
-	}
-
-	public Properties getLocalProperties() {
-		return this.iConfiguration.getLocalProperties();
-	}
-
-	public void setLocalProperties(Properties pProperties) {
-		this.iConfiguration.setLocalProperties(pProperties);
-	}
-
-	public void setLocalProperty(String pKey, String pValue) {
-		this.iConfiguration.setLocalProperty(pKey, pValue);
-	}
-
-	private synchronized void checkState() throws IllegalStateException {
-		if (this.iInitialized && !this.iClosed) return;
-		String state = this.iClosed ? "closed." : "not initialized.";
-		LogAndTraceBroker.getBroker().trace(Level.FINE, "Illegal state for operation: " + state);
-		throw new IllegalStateException("WBEMClient is " + state);
-	}
-
-	public EnumerateResponse associatorPaths(CIMObjectPath pObjectName,
-			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
-		final String operation = "OpenAssociatorInstancePaths";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
-					.OpenAssociatorInstancePaths_request(doc, pObjectName, pAssociationClass,
-							pResultClass, pRole, pResultRole, pFilterQueryLanguage, pFilterQuery,
-							pTimeout, pContinueOnError, pMaxObjects));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-
-			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
-			return enumResp;
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	public EnumerateResponse associators(CIMObjectPath pObjectName,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeClassOrigin, String[] pPropertyList, String pFilterQueryLanguage,
-			String pFilterQuery, UnsignedInteger32 pTimeout, boolean pContinueOnError,
-			UnsignedInteger32 pMaxObjects) throws WBEMException {
-
-		final String operation = "OpenAssociatorInstances";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenAssociatorInstances_request(
-					doc, pObjectName, pAssocClass, pResultClass, pRole, pResultRole,
-					pIncludeClassOrigin, pPropertyList, pFilterQueryLanguage, pFilterQuery,
-					pTimeout, pContinueOnError, pMaxObjects));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-
-			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
-			return enumResp;
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	public void closeEnumeration(CIMObjectPath pObjectName, String pEnumerationContext)
-			throws WBEMException {
-
-		final String operation = "CloseEnumeration";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.CloseEnumeration_request(doc,
-					pObjectName, pEnumerationContext));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-
-			CloseableIterator iter = getIterator(is, pObjectName);
-
-			// Check for exceptions
-			try {
-				iter.hasNext();
-			} finally {
-				iter.close();
-			}
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-
-	}
-
-	public EnumerateResponse enumerateInstancePaths(CIMObjectPath pObjectName,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
-		final String operation = "OpenEnumerateInstancePaths";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
-					.OpenEnumerateInstancePaths_request(doc, pObjectName, pFilterQueryLanguage,
-							pFilterQuery, pTimeout, pContinueOnError, pMaxObjects));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-
-			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
-			return enumResp;
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	public EnumerateResponse enumerateInstances(CIMObjectPath pObjectName,
-			boolean pDeepInheritance, boolean pIncludeClassOrigin, String[] pPropertyList,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
-		final String operation = "OpenEnumerateInstances";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenEnumerateInstances_request(
-					doc, pObjectName, pDeepInheritance, pIncludeClassOrigin, pPropertyList,
-					pFilterQueryLanguage, pFilterQuery, pTimeout, pContinueOnError, pMaxObjects));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
-			return enumResp;
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	// not supported yet
-	public UnsignedInteger64 enumerationCount(CIMObjectPath pObjectName, String pEnumerationContext)
-			throws WBEMException {
-		final String operation = "EnumerationCount";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.EnumerationCount_request(doc,
-					pObjectName, pEnumerationContext));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-			// Currently this is not supported by server. Server returns
-			// error : "CIM_ERR_NOT_SUPPORTED"
-			// This error is caught by parser and exception is thrown
-
-			getEnumerateResponse(is, pObjectName);
-			// Error mentioned above will go away if server starts to support
-			// EnumerationCount, we need to update code i.e. remove exception
-			// and return UnsignedInteger64
-
-			// this exception will be thrown only if server starts to support
-			// enumerationCount
-			throw new WBEMException(operation + " is currently not supported by client");
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	public EnumerateResponse execQueryInstances(CIMObjectPath pObjectName,
-			String pFilterQuery, String pFilterQueryLanguage, boolean pReturnQueryResultClass,
-			UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects,
-			CIMClass pQueryResultClass) throws WBEMException {
-
-		final String operation = "OpenQueryInstances";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenQueryInstances_request(doc,
-					pObjectName, pFilterQuery, pFilterQueryLanguage, pReturnQueryResultClass,
-					pTimeout, pContinueOnError, pMaxObjects, pQueryResultClass));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
-			return enumResp;
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	public EnumerateResponse getInstancePaths(CIMObjectPath pObjectName,
-			String pContext, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
-		final String operation = "PullInstancePaths";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.PullInstancePaths_request(doc,
-					pObjectName, pContext, pMaxObjects));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
-			return enumResp;
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	public EnumerateResponse getInstances(CIMObjectPath pObjectName, String pContext,
-			UnsignedInteger32 pMaxObjects) throws WBEMException {
-
-		final String operation = "PullInstances";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.PullInstances_request(doc,
-					pObjectName, pContext, pMaxObjects));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
-			return enumResp;
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	public EnumerateResponse getInstancesWithPath(CIMObjectPath pObjectName,
-			String pContext, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
-		final String operation = "PullInstancesWithPath";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.PullInstancesWithPath_request(
-					doc, pObjectName, pContext, pMaxObjects));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
-			return enumResp;
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	public EnumerateResponse referencePaths(CIMObjectPath pObjectName,
-			String pResultClass, String pRole, String pFilterQueryLanguage, String pFilterQuery,
-			UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects)
-			throws WBEMException {
-
-		final String operation = "OpenReferenceInstancePaths";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
-					.OpenReferenceInstancePaths_request(doc, pObjectName, pResultClass, pRole,
-							pFilterQueryLanguage, pFilterQuery, pTimeout, pContinueOnError,
-							pMaxObjects));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
-			return enumResp;
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	public EnumerateResponse references(CIMObjectPath pObjectName,
-			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
-		final String operation = "OpenReferenceInstances";
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
-
-			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenReferenceInstances_request(
-					doc, pObjectName, pResultClass, pRole, pIncludeClassOrigin, pPropertyList,
-					pFilterQueryLanguage, pFilterQuery, pTimeout, pContinueOnError, pMaxObjects));
-
-			InputStreamReader is = transmitRequest(operation, hh, doc);
-			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
-			return enumResp;
-
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, operation + " request failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-
-	private InputStreamReader transmitIndicationRequest(URI pRecipient, HttpClientPool pClientPool,
-			HttpHeader pHeader, Document pDocument) throws IOException, ProtocolException,
-			WBEMException {
-		return transmitRequestWorker(true, pRecipient, pClientPool, null, pHeader, pDocument);
-	}
-
-	public boolean sendIndication(URI pRecipient, CIMInstance pIndication) throws WBEMException {
-		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-		logger.entry();
-
-		checkState();
-
-		try {
-			if (pRecipient == null || pRecipient.getScheme() == null
-					|| pRecipient.getHost() == null || pRecipient.getPort() <= 0) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER,
-					"Invalid recipient URI, must contain valid scheme://host:port"); }
-
-			if (!pRecipient.getScheme().equalsIgnoreCase(WBEMConstants.HTTP)
-					&& !pRecipient.getScheme().equalsIgnoreCase(WBEMConstants.HTTPS)) throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid scheme "
-							+ pRecipient.getScheme() + ", must be http or https");
-
-			if (pIndication == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid indication, must not be null"); }
-
-			logger.trace(Level.FINER, "Attempting to send following indication to "
-					+ pRecipient.toString() + ":\n" + pIndication.toString());
-
-			HttpHeader hh = new HttpHeader();
-
-			Document doc = this.iXmlHelper.newDocument();
-
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.sendIndication_request(doc,
-					pIndication));
-
-			HttpClientPool indPool = new HttpClientPool(this.iConfiguration);
-
-			InputStreamReader is = transmitIndicationRequest(pRecipient, indPool, hh, doc);
-
-			boolean success = false;
-			if (is != null) {
-				CIMResponse response = getSingleResponse(is, null);
-				success = response != null && response.isSuccessful();
-			}
-
-			indPool.closePool();
-
-			return success;
-		} catch (WBEMException e) {
-			logger.trace(Level.FINE, "Sending indication resulted in CIM Error", e);
-			throw e;
-		} catch (Exception e) {
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger.trace(Level.FINE, "Sending indication resulted in CIM Error", e.getCause());
-				throw (WBEMException) e.getCause();
-			}
-			logger.trace(Level.FINE, "Sending indication failed", e);
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
-		} finally {
-			logger.exit();
-		}
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2006, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, a.wolf-reber@de.ibm.com
+ * 
+ * Flag       Date        Prog         Description
+ * -------------------------------------------------------------------------------
+ * 1565892    2006-11-08  lupusalex    Make SBLIM client JSR48 compliant
+ * 1688273    2007-04-16  ebak         Full support of HTTP trailers
+ * 1702832    2007-04-18  lupusalex    WBEMClientCIMXL.setCustomSocketFactory() not implemented
+ * 1686000    2007-04-19  ebak         modifyInstance() missing from WBEMClient
+ * 1714184    2007-05-07  lupusalex    FVT: NPE on WBEMClientCIMXML.init()
+ * 1715053    2007-05-08  lupusalex    FVT: No forced retry on HTTP 501/510
+ * 1714853    2007-05-08  lupusalex    Inexplicit error when operation is invoked on closed client
+ * 1714902    2007-05-08  lupusalex    Threading related weak spots
+ * 1715482    2007-05-10  lupusalex    CIM_ERR_FAILED thrown when access denied
+ * 1736318    2007-06-13  lupusalex    Wrong object path in HTTP header
+ * 1737141    2007-06-18  ebak         Sync up with JSR48 evolution
+ * 1741654    2007-08-22  ebak         Header mismatch error on ModifyInstance
+ * 1949000    2008-04-24  blaschke-oss setLocales() is empty
+ * 1963762    2008-05-14  blaschke-oss connection leak in WBEMClientCIMXML
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2002599    2008-07-05  raman_arora  M-POST not supported in java-client
+ * 2034342    2008-07-31  blaschke-oss HttpClient not closed on cimclient close
+ * 2087975    2008-09-03  blaschke-oss can't set the pPropagated in WBEMClient.enumerateClasses()
+ * 2382763    2008-12-03  blaschke-oss HTTP header field Accept-Language does not include *
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics 
+ * 2845211    2009-08-27  raman_arora  Pull Enumeration Feature (SAX Parser)
+ * 2860081    2009-09-17  raman_arora  Pull Enumeration Feature (DOM Parser)
+ * 2846231    2009-09-23  rgummada     connection failure on CIMOM w/o user/pw
+ * 2865222    2009-09-29  raman_arora  enumerateQualifierTypes shouldn't require a class name
+ * 2858933    2009-10-12  raman_arora  JSR48 new APIs: associatorClasses & associatorInstances
+ * 2884718    2009-10-23  blaschke-oss Merge JSR48 and SBLIM client properties
+ * 2878054    2009-10-25  raman_arora  Pull Enumeration Feature (PULL Parser)
+ * 2888774    2009-10-29  raman_arora  support POST retry on HTTP error 505
+ * 2886829    2009-11-18  raman_arora  JSR48 new APIs: referenceClasses & referenceInstances
+ * 2909941    2010-01-06  blaschke-oss RequestStateChange gives wrong exception/error id
+ * 2930341    2010-01-12  blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0
+ * 2913938    2010-02-17  blaschke-oss Duplicate CIM requests with identical message ID
+ * 2961592    2010-03-01  blaschke-oss Remove WBEMClient.setLocales() UnsupportedOperationException
+ * 2964463    2010-03-08  blaschke-oss WBEMClient.initialize() throws wrong exception
+ * 2942520    2010-03-08  blaschke-oss IPv6 link local address with scope_id including a dot not supported
+ * 3019252    2010-06-21  blaschke-oss Methods concatenate strings using + in a loop
+ * 3028518    2010-07-14  blaschke-oss Additional StringBuilder use
+ * 3185833    2011-02-18  blaschke-oss missing newline when logging request/response
+ * 3197423    2011-03-02  blaschke-oss Server authentication with PegasusLocalAuthInfo failing
+ * 3277928    2011-04-06  blaschke-oss CIM-XML tracing cannot be enabled in the field
+ * 3423064    2011-10-13  blaschke-oss Add UpdateExpiredPassword Header for Reqs from Java Client
+ * 3496355    2012-03-02  blaschke-oss JSR48 1.0.0: add new WBEMClientConstants
+ * 3514537    2012-04-03  blaschke-oss TCK: execQueryInstances requires boolean, not Boolean
+ * 3514685    2012-04-03  blaschke-oss TCK: getProperty must return default values
+ * 3515180    2012-04-05  blaschke-oss JSR48 log dir/file should handle UNIX/Win separators
+ * 3516848    2012-04-11  blaschke-oss enumerateNamespaces() method to WBEMClient
+ * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3521328    2012-04-25  blaschke-oss JSR48 1.0.0: remove WBEMClient associators and references
+ * 3522904    2012-05-02  blaschke-oss Add new API WBEMClientSBLIM.isActive()
+ * 3521157    2012-05-10  blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
+ * 3525914    2012-05-11  blaschke-oss TCK: SetPropertyTest.testSetProperty failing
+ * 3545797    2012-07-19  blaschke-oss Support new error code of SFCB
+ * 3553858    2012-08-06  blaschke-oss Append duplicate HTTP header fields instead of replace
+ * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
+ * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
+ *    2614    2013-02-21  blaschke-oss Remove redundant code in transmitRequest
+ *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
+ *    2651    2013-07-31  blaschke-oss IOException when tracing the cimxml
+ *    2662    2013-09-10  blaschke-oss Need the specific SSLHandshakeException during the cim call
+ *    2594    2013-11-30  blaschke-oss CR28: Support CIMErrorDescription HTTP field
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.wbem;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.PasswordAuthentication;
+import java.net.ProtocolException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URLConnection;
+import java.net.URLDecoder;
+import java.net.UnknownHostException;
+import java.security.Principal;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMQualifierType;
+import org.metricshub.wbem.javax.wbem.CloseableIterator;
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.javax.wbem.client.EnumerateResponse;
+import org.metricshub.wbem.javax.wbem.client.PasswordCredential;
+import org.metricshub.wbem.javax.wbem.client.RoleCredential;
+import org.metricshub.wbem.javax.wbem.client.WBEMClient;
+import org.metricshub.wbem.sblim.cimclient.WBEMClientSBLIM;
+import org.metricshub.wbem.sblim.cimclient.WBEMConfigurationProperties;
+import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMClientXML_HelperImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMResponse;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLParserImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.http.AuthorizationInfo;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpClientPool;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeaderParser;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpUrlConnection;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader.HeaderEntry;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.DebugInputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.TrailerException;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.TimeStamp;
+import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfigurationDefaults;
+import org.metricshub.wbem.javax.cim.UnsignedInteger32;
+import org.metricshub.wbem.javax.cim.UnsignedInteger64;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLHandshakeException;
+import javax.security.auth.Subject;
+
+import org.metricshub.wbem.javax.wbem.client.WBEMClientConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMMessage;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLParseException;
+import org.metricshub.wbem.sblim.cimclient.internal.http.AuthorizationHandler;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * The WBEMClientCIMXML is a implementation of the
+ * javax.wbem.client.WBEMClient interface for the CIM-XML protocol
+ * including the extensions of the
+ * org.metricshub.wbem.sblim.cimclient.WBEMClientSBLIM interface.
+ * 
+ * @see WBEMClient
+ * @see WBEMClientSBLIM
+ */
+public class WBEMClientCIMXML implements WBEMClientSBLIM {
+
+	private final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties());
+
+	private Locale[] iLocales; // final
+
+	private HttpClientPool iHttpClientPool; // final
+
+	private URI iUri; // final
+
+	private AuthorizationHandler iAuthorizationHandler; // final
+
+	private CIMClientXML_HelperImpl iXmlHelper; // final
+
+	private volatile String iAuthorization;
+
+	private volatile int iNsCounter = 10;
+
+	private volatile boolean iMPostFailed = false;
+
+	private volatile long iMPostFailTime = 0;
+
+	private volatile long iCurrentTime = 0;
+
+	private volatile boolean iInitialized = false;
+
+	private volatile boolean iClosed = false;
+
+	private String iInteropNamespace = null;
+
+	/**
+	 * Ctor.
+	 */
+	public WBEMClientCIMXML() {
+		super();
+	}
+
+	private synchronized void initializeClient(URI pUri, Subject pSubject, Locale[] pLocales)
+			throws IllegalArgumentException {
+
+		if (this.iInitialized) throw new IllegalStateException("WBEMClient is already initialized");
+
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		try {
+			this.iHttpClientPool = new HttpClientPool(this.iConfiguration);
+			this.iLocales = (pLocales != null && pLocales.length > 0) ? pLocales
+					: WBEMConstants.DEFAULT_LOCALES;
+			this.iUri = pUri;
+
+			AuthorizationInfo authInfo = AuthorizationInfo.createAuthorizationInfo(
+					this.iConfiguration.getHttpAuthenticationModule(), Boolean.FALSE, this.iUri
+							.getHost(), this.iUri.getPort(), null, null, null);
+
+			Principal principal = (pSubject != null && pSubject.getPrincipals() != null && !pSubject
+					.getPrincipals().isEmpty()) ? (Principal) pSubject.getPrincipals().iterator()
+					.next() : null;
+			Object credential = (pSubject != null && pSubject.getPrivateCredentials() != null
+					&& !pSubject.getPrivateCredentials().isEmpty() ? pSubject
+					.getPrivateCredentials().iterator().next() : null);
+
+			boolean defaultAuthEnabled = WBEMConfiguration.getGlobalConfiguration()
+					.isDefaultAuthorizationEnabled();
+
+			String user = (principal != null) ? principal.getName() : "";
+			String password = (credential != null && credential instanceof PasswordCredential) ? new String(
+					((PasswordCredential) credential).getUserPassword())
+					: ((credential != null && credential instanceof RoleCredential) ? new String(
+							((RoleCredential) credential).getCredential()) : "");
+
+			if (defaultAuthEnabled && (user == null || user.length() == 0)
+					&& password.length() == 0) {
+				logger.trace(Level.FINER,
+						"Principal and Credential not set - using default authorization!");
+
+				user = WBEMConfiguration.getGlobalConfiguration().getDefaultPrincipal();
+				password = WBEMConfiguration.getGlobalConfiguration().getDefaultCredentials();
+			}
+
+			authInfo.setCredentials(new PasswordAuthentication(user, password.toCharArray()));
+			this.iAuthorizationHandler = new AuthorizationHandler();
+			this.iAuthorizationHandler.addAuthorizationInfo(authInfo);
+
+			try {
+				this.iXmlHelper = new CIMClientXML_HelperImpl();
+			} catch (ParserConfigurationException e) {
+				logger
+						.trace(Level.FINE, "Exception while instantiating CIMClientXML_HelperImpl",
+								e);
+				logger.message(Messages.CIM_XMLHELPER_FAILED);
+				throw new RuntimeException(e);
+			}
+
+			this.iInitialized = true;
+
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public void initialize(CIMObjectPath pName, Subject pSubject, Locale[] pLocales)
+			throws IllegalArgumentException, WBEMException {
+
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		try {
+			final URI uri;
+
+			if (pName == null || pName.getHost() == null || pName.getHost().length() == 0) { throw new IllegalArgumentException(
+					"Empty host path"); }
+			if (pName.getScheme() == null || pName.getScheme().length() == 0) { throw new IllegalArgumentException(
+					"Empty scheme"); }
+			if (!pName.getScheme().equalsIgnoreCase(WBEMConstants.HTTP)
+					&& !pName.getScheme().equalsIgnoreCase(WBEMConstants.HTTPS)) { throw new IllegalArgumentException(
+					"Protocol not supported"); }
+
+			try {
+				uri = CIMHelper.createCimomUri(pName);
+			} catch (URISyntaxException e) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Malformed URI");
+			}
+
+			initializeClient(uri, pSubject, pLocales);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
+			throws IllegalArgumentException, WBEMException {
+
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		try {
+			final URI uri;
+
+			if (pUri == null || pUri.getHost() == null || pUri.getHost().length() == 0) { throw new IllegalArgumentException(
+					"Empty host path"); }
+			if (pUri.getScheme() == null || pUri.getScheme().length() == 0) { throw new IllegalArgumentException(
+					"Empty scheme"); }
+			if (!pUri.getScheme().equalsIgnoreCase(WBEMConstants.HTTP)
+					&& !pUri.getScheme().equalsIgnoreCase(WBEMConstants.HTTPS)) { throw new IllegalArgumentException(
+					"Protocol not supported"); }
+
+			try {
+				uri = CIMHelper.createCimomUri(pUri);
+			} catch (URISyntaxException e) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Malformed URI");
+			}
+
+			initializeClient(uri, pSubject, pLocales);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public Properties getProperties() {
+		return this.iConfiguration.getDomainProperties();
+	}
+
+	private int getLastSeparator(String path) {
+		if (path == null) return -1;
+
+		int last = -1;
+		int sepUnix = path.lastIndexOf('/');
+		int sepWin = path.lastIndexOf('\\');
+
+		if (sepUnix != -1 && sepWin != -1) {
+			last = sepUnix > sepWin ? sepUnix : sepWin;
+		} else if (sepUnix != -1) {
+			last = sepUnix;
+		} else if (sepWin != -1) {
+			last = sepWin;
+		}
+		return last;
+	}
+
+	public String getProperty(String pKey) {
+		if (pKey.startsWith("javax.wbem.")) {
+			// Process JSR48 properties
+			if (pKey.equals(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING)) {
+				return this.iConfiguration.getLogConsoleLevel().getName();
+			} else if (pKey.equals(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING)) {
+				return this.iConfiguration.getLogFileLevel().getName();
+			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_BYTE_LIMIT)) {
+				return Integer.toString(this.iConfiguration.getLogFileSizeLimit());
+			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_DIR)) {
+				String SblimKey = this.iConfiguration.getLogFileLocation();
+				if (SblimKey == null) return null;
+				int lastSep = getLastSeparator(SblimKey);
+				return lastSep == -1 ? null : SblimKey.substring(0, lastSep);
+			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_FILENAME)) {
+				String SblimKey = this.iConfiguration.getLogFileLocation();
+				if (SblimKey == null) return null;
+				int lastSep = getLastSeparator(SblimKey);
+				return lastSep == -1 ? SblimKey : SblimKey.substring(lastSep + 1);
+			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_NUM_FILES)) {
+				return Integer.toString(this.iConfiguration.getLogFileCount());
+			} else if (pKey.equals(WBEMClientConstants.PROP_TIMEOUT)) {
+				return Integer.toString(this.iConfiguration.getHttpTimeout());
+			} else if (pKey.equals(WBEMClientConstants.PROPERTY_WBEM_CHUNKING)) {
+				return this.iConfiguration.isHttpChunked() ? "1" : "0";
+			} else if (pKey.equals(WBEMClientConstants.PROP_CLIENT_KEYSTORE)) {
+				return this.iConfiguration.getSslKeyStorePath();
+			} else if (pKey.equals(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD)) {
+				return this.iConfiguration.getSslKeyStorePassword();
+			} else if (pKey.equals(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE)) {
+				return this.iConfiguration.getSslTrustStorePath();
+			} else {
+				return null;
+			}
+		}
+		return this.iConfiguration.getDomainProperty(pKey);
+
+	}
+
+	public void setProperties(Properties pProperties) {
+		this.iConfiguration.setDomainProperties(pProperties);
+	}
+
+	public void setProperty(String pKey, String pValue) {
+		if (pKey.startsWith("javax.wbem.")) {
+			// Process JSR48 properties
+			if (pKey.equals(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING)) {
+				this.iConfiguration.setDomainProperty(
+						WBEMConfigurationProperties.LOG_CONSOLE_LEVEL, pValue);
+			} else if (pKey.equals(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING)) {
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL,
+						pValue);
+			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_BYTE_LIMIT)) {
+				this.iConfiguration.setDomainProperty(
+						WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT, pValue);
+			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_DIR)) {
+				StringBuffer NewSblimLog = new StringBuffer(pValue != null ? pValue : "");
+				if (NewSblimLog.length() > 0
+						&& NewSblimLog.charAt(NewSblimLog.length() - 1) != File.separatorChar) {
+					NewSblimLog.append(File.separator);
+				}
+
+				String CurSblimLog = this.iConfiguration
+						.getDomainProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION);
+				if (CurSblimLog == null) {
+					CurSblimLog = WBEMConfigurationDefaults.LOG_FILE_LOCATION;
+				}
+
+				int i = getLastSeparator(CurSblimLog);
+				if (i == -1) {
+					NewSblimLog.append(CurSblimLog);
+				} else {
+					NewSblimLog.append(CurSblimLog.substring(i + 1));
+				}
+
+				this.iConfiguration.setDomainProperty(
+						WBEMConfigurationProperties.LOG_FILE_LOCATION, NewSblimLog.toString());
+			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_FILENAME)) {
+				StringBuffer NewSblimLog = new StringBuffer(pValue != null ? pValue : "");
+
+				String CurSblimLog = this.iConfiguration
+						.getDomainProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION);
+				if (CurSblimLog != null) {
+					int i = getLastSeparator(CurSblimLog);
+					if (i != -1) {
+						NewSblimLog.insert(0, CurSblimLog.substring(0, i + 1));
+					}
+				}
+
+				this.iConfiguration.setDomainProperty(
+						WBEMConfigurationProperties.LOG_FILE_LOCATION, NewSblimLog.toString());
+			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_NUM_FILES)) {
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_FILE_COUNT,
+						pValue);
+			} else if (pKey.equals(WBEMClientConstants.PROP_TIMEOUT)) {
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.HTTP_TIMEOUT,
+						pValue);
+			} else if (pKey.equals(WBEMClientConstants.PROPERTY_WBEM_CHUNKING)) {
+				this.iConfiguration.setDomainProperty(
+						WBEMConfigurationProperties.HTTP_USE_CHUNKING, pValue.equals("0") ? "false"
+								: "true");
+			} else if (pKey.equals(WBEMClientConstants.PROP_CLIENT_KEYSTORE)) {
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
+						pValue);
+			} else if (pKey.equals(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD)) {
+				this.iConfiguration.setDomainProperty(
+						WBEMConfigurationProperties.KEYSTORE_PASSWORD, pValue);
+			} else if (pKey.equals(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE)) {
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
+						pValue);
+			} else {
+				throw new IllegalArgumentException(pKey);
+			}
+		} else {
+			this.iConfiguration.setDomainProperty(pKey, pValue);
+		}
+	}
+
+	public CloseableIterator associatorNames(CIMObjectPath pObjectName,
+			String pAssociationClass, String pResultClass, String pRole, String pResultRole)
+			throws WBEMException {
+
+		final String operation = "AssociatorNames";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.associatorNames_request(doc,
+					pObjectName, pAssociationClass, pResultClass, pRole, pResultRole));
+
+			InputStreamReader is = transmitRequest("AssociatorNames", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pObjectName);
+			return iter;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CloseableIterator associatorClasses(CIMObjectPath pObjectName,
+			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
+			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
+			throws WBEMException {
+		final String operation = "AssociatorClasses";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.associatorClasses_request(doc,
+					pObjectName, pAssociationClass, pResultClass, pRole, pResultRole,
+					pIncludeQualifiers, pIncludeClassOrigin, pPropertyList));
+
+			InputStreamReader is = transmitRequest("Associators", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pObjectName);
+
+			return iter;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CloseableIterator associatorInstances(CIMObjectPath pObjectName,
+			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
+			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
+		final String operation = "AssociatorInstances";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.associatorInstances_request(doc,
+					pObjectName, pAssociationClass, pResultClass, pRole, pResultRole,
+					pIncludeClassOrigin, pPropertyList));
+
+			InputStreamReader is = transmitRequest("Associators", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pObjectName);
+			return iter;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public synchronized void close() {
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+		try {
+			checkState();
+			if (this.iHttpClientPool != null) {
+				this.iHttpClientPool.closePool();
+			}
+		} finally {
+			this.iClosed = true;
+			logger.exit();
+		}
+	}
+
+	public void createClass(CIMClass pClass) throws WBEMException {
+
+		final String operation = "CreateClass";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+
+			if (pClass == null || pClass.getObjectPath() == null
+					|| pClass.getObjectPath().getNamespace() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pClass.getObjectPath().getNamespace(),
+					"UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.createClass_request(doc, pClass
+					.getObjectPath(), pClass));
+
+			InputStreamReader is = transmitRequest("CreateClass", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pClass.getObjectPath());
+			try {
+				iter.hasNext();
+			} finally {
+				iter.close();
+			}
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CIMObjectPath createInstance(CIMInstance pInstance) throws WBEMException {
+
+		final String operation = "CreateInstance";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pInstance == null || pInstance.getObjectPath() == null
+					|| pInstance.getObjectPath().getNamespace() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pInstance.getObjectPath().getNamespace(),
+					"UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.createInstance_request(doc,
+					pInstance.getObjectPath(), pInstance));
+
+			InputStreamReader is = transmitRequest("CreateInstance", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pInstance.getObjectPath());
+			try {
+				if (iter.hasNext()) { return (CIMObjectPath) iter.next(); }
+			} finally {
+				iter.close();
+			}
+
+			return null;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public void deleteClass(CIMObjectPath pPath) throws WBEMException {
+
+		final String operation = "DeleteClass";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.deleteClass_request(doc, pPath));
+
+			InputStreamReader is = transmitRequest("DeleteClass", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pPath);
+			try {
+				iter.hasNext();
+			} finally {
+				iter.close();
+			}
+
+			return;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public void deleteInstance(CIMObjectPath pPath) throws WBEMException {
+
+		final String operation = "DeleteInstance";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
+					.deleteInstance_request(doc, pPath));
+
+			InputStreamReader is = transmitRequest("DeleteInstance", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pPath);
+			try {
+				iter.hasNext();
+			} finally {
+				iter.close();
+			}
+
+			return;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public void deleteQualifierType(CIMObjectPath pPath) throws WBEMException {
+
+		final String operation = "DeleteQualifierType";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.deleteQualifierType_request(doc,
+					pPath));
+
+			InputStreamReader is = transmitRequest("DeleteQualifierType", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pPath);
+			try {
+				iter.hasNext();
+			} finally {
+				iter.close();
+			}
+
+			return;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CloseableIterator enumerateClassNames(CIMObjectPath pPath, boolean pDeep)
+			throws WBEMException {
+
+		final String operation = "EnumerateClassNames";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pPath == null || pPath.getNamespace() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumerateClassNames_request(doc,
+					pPath, pDeep));
+
+			InputStreamReader is = transmitRequest("EnumerateClassNames", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pPath);
+			return iter;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CloseableIterator enumerateClasses(CIMObjectPath pPath, boolean pDeep,
+			boolean pPropagated, boolean pIncludeQualifiers, boolean pIncludeClassOrigin)
+			throws WBEMException {
+
+		final String operation = "EnumerateClasses";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pPath == null || pPath.getNamespace() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumerateClasses_request(doc,
+					pPath, pDeep, pPropagated, pIncludeQualifiers, pIncludeClassOrigin));
+
+			InputStreamReader is = transmitRequest("EnumerateClasses", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pPath);
+			return iter;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CloseableIterator enumerateInstanceNames(CIMObjectPath pPath)
+			throws WBEMException {
+
+		final String operation = "EnumerateInstanceNames";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumerateInstanceNames_request(
+					doc, pPath));
+
+			InputStreamReader is = transmitRequest("EnumerateInstanceNames", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pPath);
+			return iter;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CloseableIterator enumerateInstances(CIMObjectPath pPath, boolean pDeep,
+			boolean pPropagated, boolean pIncludeClassOrigin, String[] pPropertyList)
+			throws WBEMException {
+
+		final String operation = "EnumerateInstances";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumerateInstances_request(doc,
+					pPath, pDeep, pPropagated, false, pIncludeClassOrigin, pPropertyList));
+
+			InputStreamReader is = transmitRequest("EnumerateInstances", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pPath);
+			return iter;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	// DSP1033 states that CIMOMs shall include an Interop Namespace and that
+	// the name of this Interop Namespace shall be either "interop" (preferred)
+	// or "root/interop" while OpenPegasus 2.11 and earlier implemented
+	// "root/PG_InterOp" prior to adopting DSP1033.
+	private static final String[] InteropNamespaces = { "interop", "root/interop",
+			"root/PG_InterOp" };
+
+	private CloseableIterator enumerateNamespace(String pNamespace) {
+		if (pNamespace != null && pNamespace.trim().length() > 0) {
+			try {
+				CloseableIterator result = enumerateInstanceNames(new CIMObjectPath(
+						null, null, null, pNamespace, "CIM_Namespace", null));
+				if (result != null) return result;
+			} catch (Exception e) {
+				// namespace may not exist
+			}
+		}
+		return null;
+	}
+
+	public CloseableIterator enumerateNamespaces(String pNamespace)
+			throws WBEMException {
+		CloseableIterator result;
+
+		// First, try the user's specified namespace (if any)
+		if (pNamespace != null && pNamespace.trim().length() > 0) {
+			result = enumerateNamespace(pNamespace);
+			if (result != null) return result;
+		}
+
+		// Second, try the saved interop namespace (if any)
+		if (this.iInteropNamespace != null) {
+			result = enumerateNamespace(this.iInteropNamespace);
+			if (result != null) return result;
+			this.iInteropNamespace = null;
+		}
+
+		// Finally, try the default interop namespace names
+		for (int i = 0; i < InteropNamespaces.length; i++) {
+			result = enumerateNamespace(InteropNamespaces[i]);
+			if (result != null) {
+				if (this.iInteropNamespace == null) this.iInteropNamespace = InteropNamespaces[i];
+				return result;
+			}
+		}
+
+		throw new WBEMException(WBEMException.CIM_ERR_FAILED,
+				"Interop namespaces do not exist, CIMOM may not support DSP1033");
+	}
+
+	public CloseableIterator> enumerateQualifierTypes(CIMObjectPath pPath)
+			throws WBEMException {
+
+		final String operation = "EnumerateQualifiers";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			// enumerateQualifierTypes does not need class name, as it lists all
+			// qualifiers in namespace
+			if (pPath == null || pPath.getNamespace() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumQualifierTypes_request(doc,
+					pPath));
+
+			InputStreamReader is = transmitRequest("EnumerateQualifiers", hh, doc);
+
+			CloseableIterator> iter = getIterator(is, pPath);
+			return iter;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CloseableIterator execQuery(CIMObjectPath pPath, String pQuery,
+			String pQueryLanguage) throws WBEMException {
+
+		final String operation = "ExecQuery";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pPath == null || pPath.getNamespace() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.execQuery_request(doc, pPath,
+					pQuery, pQueryLanguage));
+
+			InputStreamReader is = transmitRequest("ExecQuery", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pPath);
+			return iter;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CIMClass getClass(CIMObjectPath pName, boolean pPropagated, boolean pIncludeQualifiers,
+			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
+
+		final String operation = "GetClass";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pName.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.getClass_request(doc, pName,
+					pPropagated, pIncludeQualifiers, pIncludeClassOrigin, pPropertyList));
+
+			InputStreamReader is = transmitRequest("GetClass", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pName);
+			try {
+				if (iter.hasNext()) { return (CIMClass) iter.next(); }
+			} finally {
+				iter.close();
+			}
+
+			return null;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CIMInstance getInstance(CIMObjectPath pName, boolean pPropagated,
+			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
+
+		final String operation = "GetInstance";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pName.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.getInstance_request(doc, pName,
+					pPropagated, false, pIncludeClassOrigin, pPropertyList));
+
+			InputStreamReader is = transmitRequest("GetInstance", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pName);
+			try {
+				if (iter.hasNext()) {
+					CIMInstance result = (CIMInstance) iter.next();
+					return new CIMInstance(pName, result.getProperties());
+				}
+			} finally {
+				iter.close();
+			}
+
+			return null;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CIMQualifierType getQualifierType(CIMObjectPath pName) throws WBEMException {
+
+		final String operation = "GetQualifier";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pName.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.getQualifier_request(doc, pName,
+					pName.getObjectName()));
+
+			InputStreamReader is = transmitRequest("GetQualifier", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pName);
+			try {
+				if (iter.hasNext()) { return (CIMQualifierType) iter.next(); }
+			} finally {
+				iter.close();
+			}
+
+			return null;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public Object invokeMethod(CIMObjectPath pName, String pMethodName,
+			CIMArgument[] pInputArguments, CIMArgument[] pOutputArguments)
+			throws WBEMException {
+
+		final String operation = "InvokeMethod";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(MOF.objectHandle(pName, false, true),
+					"UTF-8", "US-ASCII"));
+
+			// sfcb needs pragma set for UpdateExpiredPassword call
+			if (pMethodName != null && pMethodName.equalsIgnoreCase("UpdateExpiredPassword")) hh
+					.addField("Pragma", "UpdateExpiredPassword");
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.invokeMethod_request(doc, pName,
+					pMethodName, pInputArguments));
+
+			InputStreamReader is = transmitRequest(pMethodName, hh, doc);
+
+			CIMResponse response = null;
+			String parser = this.iConfiguration.getCimXmlParser();
+			// TODO: set the local namespace for parsers
+			if (WBEMConstants.SAX.equals(parser) || WBEMConstants.PULL.equals(parser)) { return SAXHelper
+					.parseInvokeMethodResponse(is, pOutputArguments, null); }
+			// DOM parser
+			response = getSingleResponse(is, null);
+			response.checkError();
+			List resultSet = response.getFirstReturnValue();
+
+			Object rc = resultSet.size() > 0 ? resultSet.get(0) : null;
+
+			List outParamValues = response.getParamValues();
+			if (pOutputArguments != null && outParamValues != null) {
+				Iterator itr = outParamValues.iterator();
+				for (int i = 0; i < pOutputArguments.length; i++)
+					if (itr.hasNext()) {
+						pOutputArguments[i] = (CIMArgument) itr.next();
+					} else {
+						break;
+					}
+			}
+			return rc;
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public boolean isActive() {
+		return this.iInitialized && !this.iClosed;
+	}
+
+	public void modifyClass(CIMClass pClass) throws WBEMException {
+
+		final String operation = "ModifyClass";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pClass == null || pClass.getObjectPath() == null
+					|| pClass.getObjectPath().getNamespace() == null
+					|| pClass.getObjectPath().getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pClass.getObjectPath().getNamespace(),
+					"UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.setClass_request(doc, pClass
+					.getObjectPath(), pClass));
+
+			InputStreamReader is = transmitRequest("ModifyClass", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pClass.getObjectPath());
+			try {
+				iter.hasNext();
+			} finally {
+				iter.close();
+			}
+
+			return;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public void modifyInstance(CIMInstance pInst, String[] pPropertyList) throws WBEMException {
+		final String operation = "ModifyInstance";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+		checkState();
+		if (pInst == null || pInst.getObjectPath() == null
+				|| pInst.getObjectPath().getNamespace() == null
+				|| pInst.getObjectPath().getObjectName() == null) { throw new WBEMException(
+				WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+		final CIMObjectPath path = pInst.getObjectPath();
+		try {
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(path.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.setInstance_request(doc, path,
+					pInst, true, pPropertyList));
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+
+			CloseableIterator iter = getIterator(is, path);
+			try {
+				iter.hasNext();
+			} finally {
+				iter.close();
+			}
+			return;
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CloseableIterator referenceClasses(CIMObjectPath pObjectName,
+			String pResultClass, String pRole, boolean pIncludeQualifiers,
+			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
+
+		final String operation = "ReferenceClasses";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.referenceClasses_request(doc,
+					pObjectName, pResultClass, pRole, pIncludeQualifiers, pIncludeClassOrigin,
+					pPropertyList));
+
+			InputStreamReader is = transmitRequest("References", hh, doc);
+
+			return getIterator(is, pObjectName);
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CloseableIterator referenceInstances(CIMObjectPath pObjectName,
+			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList)
+			throws WBEMException {
+
+		final String operation = "ReferenceInstances";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.referenceInstances_request(doc,
+					pObjectName, pResultClass, pRole, pIncludeClassOrigin, pPropertyList));
+
+			InputStreamReader is = transmitRequest("References", hh, doc);
+
+			return getIterator(is, pObjectName);
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public CloseableIterator referenceNames(CIMObjectPath pObjectName,
+			String pResultClass, String pRole) throws WBEMException {
+
+		final String operation = "ReferenceNames";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.referenceNames_request(doc,
+					pObjectName, pResultClass, pRole));
+
+			InputStreamReader is = transmitRequest("ReferenceNames", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pObjectName);
+			return iter;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public void setLocales(Locale[] pLocales) {
+		this.iLocales = (pLocales != null && pLocales.length > 0) ? pLocales
+				: WBEMConstants.DEFAULT_LOCALES;
+	}
+
+	public void setQualifierType(CIMQualifierType pQualifierType) throws WBEMException {
+
+		final String operation = "SetQualifierType";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pQualifierType == null || pQualifierType.getObjectPath() == null
+					|| pQualifierType.getObjectPath().getNamespace() == null
+					|| pQualifierType.getObjectPath().getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pQualifierType.getObjectPath()
+					.getNamespace(), "UTF-8", "US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.setQualifierType_request(doc,
+					pQualifierType.getObjectPath(), pQualifierType));
+
+			InputStreamReader is = transmitRequest("SetQualifierType", hh, doc);
+
+			CloseableIterator iter = getIterator(is, pQualifierType.getObjectPath());
+			try {
+				iter.hasNext();
+			} finally {
+				iter.close();
+			}
+
+			return;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public SocketFactory getCustomSocketFactory() {
+		return this.iConfiguration.getCustomSocketFactory();
+	}
+
+	public void setCustomSocketFactory(SocketFactory pFactory) throws UnsupportedOperationException {
+		this.iConfiguration.setCustomSocketFactory(pFactory);
+	}
+
+	private String getHttpErrorString(int pStatusCode) {
+		switch (pStatusCode) {
+			case 400:
+				return "400 - BAD REQUEST";
+			case 401:
+				return "401 - UNAUTHORIZED";
+			case 403:
+				return "403 - FORBIDDEN";
+			case 405:
+				return "405 - METHOD NOT ALLOWED";
+			case 407:
+				return "407 - PROXY AUTHENTICATION REQUIRED";
+		}
+		return null;
+	}
+
+	private InputStreamReader transmitRequest(String pCimMethod, HttpHeader pHeader,
+			Document pDocument) throws IOException, ProtocolException, WBEMException {
+		return transmitRequestWorker(false, this.iUri, this.iHttpClientPool, pCimMethod, pHeader,
+				pDocument);
+	}
+
+	/*
+	 * Worker for both transmitRequest() (pIsIndication == false) and
+	 * transmitIndicationRequest() (pIsIndication == true).
+	 */
+	private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pRecipient,
+			HttpClientPool pClientPool, String pCimMethod, HttpHeader pHeader, Document pDocument)
+			throws IOException, ProtocolException, WBEMException {
+
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		HttpUrlConnection connection = null;
+		int exceptionNum = WBEMException.CIM_ERR_FAILED;
+
+		// retry HTTP MPOST only if failure is more than 24 hours old
+		if (this.iMPostFailed && !pIsIndication) {
+			this.iCurrentTime = System.currentTimeMillis();
+			if ((this.iCurrentTime - this.iMPostFailTime) > 24 * 60 * 60 * 1000) this.iMPostFailed = false;
+		}
+		boolean useMPost = this.iMPostFailed || pIsIndication ? false : this.iConfiguration
+				.isHttpMPost();
+		int retries = this.iConfiguration.getHttpConnectRetriesCount();
+		do {
+			logger.trace(Level.FINE, "Attempting to connect.. number of attempts left:" + retries);
+
+			// Disconnect existing connection to prevent object leak
+			if (connection != null) {
+				connection.disconnect();
+			}
+			connection = newConnection(pIsIndication, pRecipient, pClientPool, pCimMethod, pHeader,
+					useMPost);
+			try {
+				logger.trace(Level.FINE, "Connecting...");
+				connection.connect();
+			} catch (UnknownHostException e) {
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Unknown host", null, e);
+			} catch (SocketException e) {
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Unable to connect", null, e);
+			} catch (SSLHandshakeException e) {
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "SSL handshake exception",
+						null, e);
+			}
+
+			OutputStream os = connection.getOutputStream();
+
+			if (this.iConfiguration.isCimXmlTracingEnabled()
+					|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
+				OutputStream pos = new ByteArrayOutputStream();
+				CIMClientXML_HelperImpl.dumpDocument(pos, pDocument,
+						pIsIndication ? "indication request" : "request");
+				OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
+				if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream
+						.write(pos.toString().getBytes());
+				if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger
+						.traceCIMXML(Level.FINEST, pos.toString(), true);
+			}
+			CIMClientXML_HelperImpl.serialize(os, pDocument);
+			os.flush();
+			os.close();
+
+			int resultCode = 200;
+			try {
+				resultCode = connection.getResponseCode();
+			} catch (SocketException e) {
+				connection.disconnect();
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Unable to connect", null, e);
+			} catch (SocketTimeoutException e) {
+				connection.disconnect();
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Connection timed out", null,
+						e);
+			} catch (SSLHandshakeException e) {
+				connection.disconnect();
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "SSL handshake exception",
+						null, e);
+			}
+
+			HttpHeader headers = parseHeaders(connection);
+			String auth = connection.getRequestProperty("Authorization");
+			if (auth != null) {
+				this.iAuthorization = auth;
+			}
+
+			exceptionNum = WBEMException.CIM_ERR_FAILED;
+
+			switch (resultCode) {
+				case HttpURLConnection.HTTP_OK: // 200
+
+					if (this.iConfiguration.isHttpContentLengthRetryEnabled()) {
+						String contentLengthField = headers.getField("Content-length");
+						if (contentLengthField != null && contentLengthField.trim().length() > 0) {
+							int contentLength = Integer.parseInt(contentLengthField);
+							int lengthToCheck = this.iConfiguration.getHttpContentLengthThreshold();
+
+							if (contentLength < lengthToCheck) {
+								logger.trace(Level.FINE, "Content Length below " + lengthToCheck
+										+ ", retrying");
+								break;
+							}
+						}
+					}
+
+					String charset = getCharacterSet(headers);
+
+					InputStream is = connection.getInputStream();
+					OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
+					if ((this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null)
+							|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
+						is = new DebugInputStream(is, debugStream,
+								pIsIndication ? "indication response" : "response");
+					}
+
+					return new InputStreamReader(is, charset);
+
+				case HttpURLConnection.HTTP_NOT_IMPLEMENTED: // 501
+					// TODO if there is an error with the default xml
+					// encoder/decoder, load the correct version
+					// The problem is that the CIMOM does not return the DTD
+					// version, CIM version or Protocol Version
+					// that is expecting
+					String cimProtocolVersion = headers.getField("CIMProtocolVersion");
+					if (cimProtocolVersion == null && headers.getField("CIMError") == null
+							&& useMPost) {
+						logger
+								.trace(Level.FINER,
+										"Received HTTP Error 501 - NOT IMPLEMENTED with M-POST, falling back to POST");
+						this.iMPostFailTime = System.currentTimeMillis();
+						useMPost = false;
+						this.iMPostFailed = true;
+						++retries;
+						break;
+					}
+
+					logger.trace(Level.FINER,
+							"Received HTTP Error 501 - NOT IMPLEMENTED, skipping retries");
+					retries = 0;
+					break;
+
+				case HttpURLConnection.HTTP_BAD_REQUEST: // 400
+				case HttpURLConnection.HTTP_FORBIDDEN: // 403
+				case HttpURLConnection.HTTP_BAD_METHOD: // 405
+					logger.trace(Level.FINER, "Received HTTP Error "
+							+ getHttpErrorString(resultCode) + ", skipping retries");
+					retries = 0;
+					break;
+
+				case HttpURLConnection.HTTP_UNAUTHORIZED: // 401
+				case HttpURLConnection.HTTP_PROXY_AUTH: // 407
+					logger.trace(Level.FINER, "Received HTTP Error "
+							+ getHttpErrorString(resultCode) + ", skipping retries");
+					exceptionNum = WBEMException.CIM_ERR_ACCESS_DENIED;
+					retries = 0;
+					break;
+
+				default:
+					if (useMPost) {
+						logger.trace(Level.FINER, "Received HTTP Error " + resultCode
+								+ " with M-POST, falling back to POST");
+						this.iMPostFailTime = System.currentTimeMillis();
+						useMPost = false;
+						this.iMPostFailed = true;
+						++retries;
+					} else {
+						logger.trace(Level.FINER, "Received HTTP Error " + resultCode
+								+ ", retrying");
+					}
+			}
+
+			// Log HTTP error in XML trace if we are going to retry request
+			// (this means there is no response and no exception to indicate
+			// result of current request, which makes it look like the client is
+			// sending multiple requests without any response)
+			if (retries > 0) {
+				OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
+				if ((this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null)
+						|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
+					StringBuilder resultStr = new StringBuilder("<--- error response begin ");
+					resultStr.append(TimeStamp.formatWithMillis(System.currentTimeMillis()));
+					resultStr.append(" ----\nHTTP ");
+					resultStr.append(resultCode);
+					resultStr.append(' ');
+					resultStr.append(connection.getResponseMessage());
+					resultStr.append(" (retrying request)\n---- error response end ----->\n");
+					if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream
+							.write(resultStr.toString().getBytes());
+					if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger
+							.traceCIMXML(Level.FINEST, resultStr.toString(), false);
+				}
+			}
+		} while (retries-- > 0);
+
+		// Benchmark.stopTransportTimer();
+
+		// Look for CIM error and description, include in exception if exists
+		String errorCIM = connection.getHeaderField("CIMError");
+		String errorDescriptionCIM = null;
+		if (errorCIM != null) {
+			logger.trace(Level.FINER, "Found CIMError field with value \"" + errorCIM + "\"");
+
+			errorDescriptionCIM = connection.getHeaderField("CIMErrorDescription");
+			if (errorDescriptionCIM != null) {
+				try {
+					errorDescriptionCIM = URLDecoder.decode(errorDescriptionCIM, "UTF-8");
+				} catch (Exception e) {
+					errorDescriptionCIM = null;
+				}
+				logger.trace(Level.FINER, "Found CIMErrorDescription field with value \""
+						+ errorDescriptionCIM + "\"");
+			}
+		}
+
+		// Look for OpenPegasus error details, decode and include in exception
+		// if it exists
+		String errorOP = connection.getHeaderField("PGErrorDetail");
+		if (errorOP != null) {
+			try {
+				errorOP = URLDecoder.decode(errorOP, "UTF-8");
+			} catch (Exception e) {
+				errorOP = null;
+			}
+			logger.trace(Level.FINER, "Found PGErrorDetail field with value \"" + errorOP + "\"");
+		}
+
+		// Look for SFCB error details, decode and include in exception
+		// if it exists
+		String errorSFCB = connection.getHeaderField("SFCBErrorDetail");
+		if (errorSFCB != null) {
+			try {
+				errorSFCB = URLDecoder.decode(errorSFCB, "UTF-8");
+			} catch (Exception e) {
+				errorSFCB = null;
+			}
+			logger.trace(Level.FINER, "Found SFCBErrorDetail field with value \"" + errorSFCB
+					+ "\"");
+		}
+
+		// If CIMErrorDescription present, format of WBEMException is:
+		//
+		// HTTP StatusCode - ReasonPhrase (CIMError: "ErrorString",
+		// CIMErrorDescription: "ErrorString")
+		//
+		// Otherwise, format of WBEMException message is:
+		//
+		// HTTP StatusCode - ReasonPhrase (CIMError: "ErrorString", OpenPegasus
+		// Error: "ErrorString", SFCB Error: "ErrorString")
+		// 
+		// For example:
+		// HTTP 503 - Service Unavailable (SFCB Error:
+		// "Max Session Limit Exceeded")
+		StringBuffer errorMsg = new StringBuffer("HTTP ");
+		errorMsg.append(connection.getResponseCode());
+		errorMsg.append(" - ");
+		errorMsg.append(connection.getResponseMessage());
+		if (errorCIM != null && errorDescriptionCIM != null) {
+			errorMsg.append(" (CIMError: \"");
+			errorMsg.append(errorCIM);
+			errorMsg.append("\", CIMErrorDescription: \"");
+			errorMsg.append(errorDescriptionCIM);
+			errorMsg.append("\")");
+		} else if (errorCIM != null || errorOP != null || errorSFCB != null) {
+			errorMsg.append(" (");
+			if (errorCIM != null) {
+				errorMsg.append("CIMError: \"");
+				errorMsg.append(errorCIM);
+				errorMsg.append('"');
+			}
+			if (errorOP != null) {
+				if (errorCIM != null) errorMsg.append(", ");
+				errorMsg.append("OpenPegasus Error: \"");
+				errorMsg.append(errorOP);
+				errorMsg.append('"');
+			}
+			if (errorSFCB != null) {
+				if (errorCIM != null || errorOP != null) errorMsg.append(", ");
+				errorMsg.append("SFCB Error: \"");
+				errorMsg.append(errorSFCB);
+				errorMsg.append('"');
+			}
+			errorMsg.append(')');
+		}
+
+		connection.disconnect();
+
+		throw new WBEMException(exceptionNum, errorMsg.toString());
+	}
+
+	private HttpUrlConnection newConnection(boolean pIsIndication, URI pRecipient,
+			HttpClientPool pClientPool, String pCimMethod, HttpHeader pHeader, boolean pUseMPost) {
+
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		HttpUrlConnection connection = new HttpUrlConnection(pRecipient, pClientPool,
+				this.iAuthorizationHandler);
+		if (pUseMPost) {
+			connection.setRequestMethod(WBEMConstants.HTTP_MPOST);
+		} else connection.setRequestMethod(WBEMConstants.HTTP_POST);
+		connection.useHttp11("1.1".equals(this.iConfiguration.getHttpVersion()));
+
+		String firstLocaleStr = this.iLocales[0].getLanguage();
+		if (this.iLocales[0].getCountry().length() > 0) firstLocaleStr = firstLocaleStr + '-'
+				+ this.iLocales[0].getCountry();
+		StringBuilder restLocaleStrBld = new StringBuilder("");
+		for (int i = 1; i < this.iLocales.length; i++) {
+			if (this.iLocales[i] != null && this.iLocales[i].getLanguage().length() > 0) {
+				restLocaleStrBld.append(", ");
+				restLocaleStrBld.append(this.iLocales[i].getLanguage());
+				if (this.iLocales[i].getCountry().length() > 0) {
+					restLocaleStrBld.append('-');
+					restLocaleStrBld.append(this.iLocales[i].getCountry());
+				}
+			}
+		}
+
+		connection.setDoOutput(true);
+		connection.setDoInput(true);
+		connection.setRequestProperty("Content-type", "application/xml; charset=\"utf-8\"");
+		connection.setRequestProperty("Accept", "text/html, text/xml, application/xml");
+		connection.setRequestProperty("Cache-Control", "no-cache");
+		connection.setRequestProperty("Content-Language", firstLocaleStr);
+		connection.setRequestProperty("Accept-Language", firstLocaleStr
+				+ restLocaleStrBld.toString() + ", *");
+		if (this.iAuthorization != null) connection.setRequestProperty("Authorization",
+				this.iAuthorization);
+
+		String prefix = "";
+		if (connection.getRequestMethod().equalsIgnoreCase(WBEMConstants.HTTP_MPOST)) {
+			String ns = getNextNs();
+			connection.setRequestProperty("Man", "http://www.dmtf.org/cim/mapping/http/v1.0;ns="
+					+ ns);
+			prefix = ns + "-";
+		}
+		connection.setRequestProperty(prefix + "CIMProtocolVersion", "1.0");
+
+		if (pIsIndication) {
+			try {
+				connection.setRequestProperty("CIMExport", HttpHeader.encode("MethodRequest",
+						"UTF-8", "US-ASCII"));
+				connection.setRequestProperty("CIMExportMethod", HttpHeader.encode(
+						"ExportIndication", "UTF-8", "US-ASCII"));
+			} catch (UnsupportedEncodingException e) {
+				logger.trace(Level.FINE, "Exception while encoding http header", e);
+				connection.setRequestProperty("CIMExport", "MethodRequest");
+				connection.setRequestProperty("CIMExportMethod", "ExportIndication");
+			}
+		} else {
+			connection.setRequestProperty(prefix + "CIMOperation", "MethodCall");
+			try {
+				connection.setRequestProperty(prefix + "CIMMethod", HttpHeader.encode(pCimMethod,
+						"UTF-8", "US-ASCII"));
+			} catch (UnsupportedEncodingException e) {
+				logger.trace(Level.FINE, "Exception while encoding http header", e);
+				connection.setRequestProperty(prefix + "CIMMethod", pCimMethod);
+			}
+		}
+		Iterator> iter = pHeader.iterator();
+		while (iter.hasNext()) {
+			Entry entry = iter.next();
+			connection.setRequestProperty(prefix + entry.getKey().toString(), entry.getValue()
+					.toString());
+		}
+
+		logger.exit();
+		return connection;
+	}
+
+	private String getNextNs() {
+		this.iNsCounter = (this.iNsCounter < 99) ? ++this.iNsCounter : 10;
+		return String.valueOf(this.iNsCounter);
+	}
+
+	private HttpHeader parseHeaders(URLConnection pConnection) {
+		String man = pConnection.getHeaderField("Man");
+		String opt = pConnection.getHeaderField("Opt");
+		HttpHeader headers = new HttpHeader();
+		int i;
+		String ns = null;
+
+		HttpHeaderParser manOptHeader = null;
+		if (man != null && man.length() > 0) manOptHeader = new HttpHeaderParser(man);
+		else if (opt != null && opt.length() > 0) manOptHeader = new HttpHeaderParser(opt);
+		if (manOptHeader != null) ns = manOptHeader.getValue("ns");
+
+		if (ns != null) {
+			i = 0;
+			String key;
+			while ((key = pConnection.getHeaderFieldKey(++i)) != null) {
+				if (key.startsWith(ns + "-")) headers.addParsedField(key.substring(3), pConnection
+						.getHeaderField(i));
+				else headers.addParsedField(key, pConnection.getHeaderField(i));
+			}
+		} else {
+			i = 0;
+			String key;
+			while ((key = pConnection.getHeaderFieldKey(++i)) != null) {
+				headers.addParsedField(key, pConnection.getHeaderField(i));
+			}
+		}
+
+		return headers;
+	}
+
+	private String getCharacterSet(HttpHeader pHeader) {
+		String contentType = pHeader.getField("Content-type");
+		String charset = "UTF-8";
+		if (contentType != null && contentType.length() > 0) {
+			HttpHeaderParser contentTypeHeader = new HttpHeaderParser(contentType);
+			charset = contentTypeHeader.getValue("charset", charset);
+		}
+		return charset;
+	}
+
+	/**
+	 * getIterator : get generic CloseableIterator
+	 * 
+	 * @param 
+	 *            : Type Parameter
+	 * @param pStream
+	 *            : Input Stream Reader
+	 * @param pPath
+	 *            : CIMObjectPath
+	 * @return generic CloseableIterator
+	 * @throws IOException
+	 * @throws SAXException
+	 * @throws ParserConfigurationException
+	 * @throws WBEMException
+	 */
+
+	// :TODO : try to find solution of "unchecked" warning
+	@SuppressWarnings("unchecked")
+	private  CloseableIterator getIterator(InputStreamReader pStream, CIMObjectPath pPath)
+			throws IOException, SAXException, ParserConfigurationException, WBEMException {
+
+		String parser = this.iConfiguration.getCimXmlParser();
+
+		CloseableIterator iter = null;
+
+		if (WBEMConstants.SAX.equals(parser)) {
+			iter = new CloseableIteratorSAX(pStream, pPath);
+		} else if (WBEMConstants.PULL.equals(parser)) {
+			iter = new CloseableIteratorPULL(pStream, pPath);
+		} else if (WBEMConstants.DOM.equals(parser)) {
+			iter = new CloseableIteratorDOM(pStream, pPath);
+		} else {
+			throw new IllegalArgumentException("Invalid CIM-XML parser configured (\"" + parser
+					+ "\") ");
+		}
+		try {
+			// check for CIMExceptions
+			iter.hasNext();
+			return (CloseableIterator) iter;
+		} catch (RuntimeException e) {
+			iter.close();
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) { throw (WBEMException) e
+					.getCause(); }
+			throw e;
+		}
+	}
+
+	private  EnumerateResponse getEnumerateResponse(InputStreamReader pStream,
+			CIMObjectPath pPath) throws IOException, SAXException, ParserConfigurationException,
+			WBEMException {
+
+		String parser = this.iConfiguration.getCimXmlParser();
+
+		if (WBEMConstants.SAX.equals(parser)) return new EnumerateResponseSAX(pStream, pPath)
+				.getEnumResponse();
+		else if (WBEMConstants.PULL.equals(parser)) return new EnumerateResponsePULL(pStream,
+				pPath).getEnumResponse();
+		else if (WBEMConstants.DOM.equals(parser)) return new EnumerateResponseDOM(pStream,
+				pPath).getEnumResponse();
+
+		throw new IllegalArgumentException("Invalid CIM-XML parser configured (\"" + parser
+				+ "\") ");
+	}
+
+	private CIMResponse getSingleResponse(InputStreamReader pStream, CIMObjectPath pLocalPath)
+			throws WBEMException {
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		Document dom;
+		try {
+			// Using factory get an instance of document builder
+			DocumentBuilder db = dbf.newDocumentBuilder();
+			// parse using builder to get DOM representation of the XML file
+			dom = db.parse(new InputSource(pStream));
+		} catch (TrailerException e) {
+			throw e.getWBEMException();
+		} catch (Exception e) {
+			String msg = "Exception occurred during DOM parsing!";
+			logger.trace(Level.SEVERE, msg, e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, msg, null, e);
+		}
+		CIMXMLParserImpl.setLocalObjectPath(pLocalPath);
+		CIMMessage cimMsg;
+		try {
+			cimMsg = CIMXMLParserImpl.parseCIM(dom.getDocumentElement());
+		} catch (CIMXMLParseException e) {
+			String msg = "Exception occurred during parseCIM!";
+			logger.trace(Level.SEVERE, msg, e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, msg, null, e);
+		}
+		if (!(cimMsg instanceof CIMResponse)) {
+			String msg = "CIM message must be response!";
+			logger.trace(Level.SEVERE, msg);
+			throw new WBEMException(msg);
+		}
+		return (CIMResponse) cimMsg;
+	}
+
+	public Properties getLocalProperties() {
+		return this.iConfiguration.getLocalProperties();
+	}
+
+	public void setLocalProperties(Properties pProperties) {
+		this.iConfiguration.setLocalProperties(pProperties);
+	}
+
+	public void setLocalProperty(String pKey, String pValue) {
+		this.iConfiguration.setLocalProperty(pKey, pValue);
+	}
+
+	private synchronized void checkState() throws IllegalStateException {
+		if (this.iInitialized && !this.iClosed) return;
+		String state = this.iClosed ? "closed." : "not initialized.";
+		LogAndTraceBroker.getBroker().trace(Level.FINE, "Illegal state for operation: " + state);
+		throw new IllegalStateException("WBEMClient is " + state);
+	}
+
+	public EnumerateResponse associatorPaths(CIMObjectPath pObjectName,
+			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
+			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
+			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
+
+		final String operation = "OpenAssociatorInstancePaths";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
+					.OpenAssociatorInstancePaths_request(doc, pObjectName, pAssociationClass,
+							pResultClass, pRole, pResultRole, pFilterQueryLanguage, pFilterQuery,
+							pTimeout, pContinueOnError, pMaxObjects));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+
+			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
+			return enumResp;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public EnumerateResponse associators(CIMObjectPath pObjectName,
+			String pAssocClass, String pResultClass, String pRole, String pResultRole,
+			boolean pIncludeClassOrigin, String[] pPropertyList, String pFilterQueryLanguage,
+			String pFilterQuery, UnsignedInteger32 pTimeout, boolean pContinueOnError,
+			UnsignedInteger32 pMaxObjects) throws WBEMException {
+
+		final String operation = "OpenAssociatorInstances";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenAssociatorInstances_request(
+					doc, pObjectName, pAssocClass, pResultClass, pRole, pResultRole,
+					pIncludeClassOrigin, pPropertyList, pFilterQueryLanguage, pFilterQuery,
+					pTimeout, pContinueOnError, pMaxObjects));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+
+			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
+			return enumResp;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public void closeEnumeration(CIMObjectPath pObjectName, String pEnumerationContext)
+			throws WBEMException {
+
+		final String operation = "CloseEnumeration";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.CloseEnumeration_request(doc,
+					pObjectName, pEnumerationContext));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+
+			CloseableIterator iter = getIterator(is, pObjectName);
+
+			// Check for exceptions
+			try {
+				iter.hasNext();
+			} finally {
+				iter.close();
+			}
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+
+	}
+
+	public EnumerateResponse enumerateInstancePaths(CIMObjectPath pObjectName,
+			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
+			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
+
+		final String operation = "OpenEnumerateInstancePaths";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
+					.OpenEnumerateInstancePaths_request(doc, pObjectName, pFilterQueryLanguage,
+							pFilterQuery, pTimeout, pContinueOnError, pMaxObjects));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+
+			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
+			return enumResp;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public EnumerateResponse enumerateInstances(CIMObjectPath pObjectName,
+			boolean pDeepInheritance, boolean pIncludeClassOrigin, String[] pPropertyList,
+			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
+			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
+
+		final String operation = "OpenEnumerateInstances";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenEnumerateInstances_request(
+					doc, pObjectName, pDeepInheritance, pIncludeClassOrigin, pPropertyList,
+					pFilterQueryLanguage, pFilterQuery, pTimeout, pContinueOnError, pMaxObjects));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
+			return enumResp;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	// not supported yet
+	public UnsignedInteger64 enumerationCount(CIMObjectPath pObjectName, String pEnumerationContext)
+			throws WBEMException {
+		final String operation = "EnumerationCount";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.EnumerationCount_request(doc,
+					pObjectName, pEnumerationContext));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+			// Currently this is not supported by server. Server returns
+			// error : "CIM_ERR_NOT_SUPPORTED"
+			// This error is caught by parser and exception is thrown
+
+			getEnumerateResponse(is, pObjectName);
+			// Error mentioned above will go away if server starts to support
+			// EnumerationCount, we need to update code i.e. remove exception
+			// and return UnsignedInteger64
+
+			// this exception will be thrown only if server starts to support
+			// enumerationCount
+			throw new WBEMException(operation + " is currently not supported by client");
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public EnumerateResponse execQueryInstances(CIMObjectPath pObjectName,
+			String pFilterQuery, String pFilterQueryLanguage, boolean pReturnQueryResultClass,
+			UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects,
+			CIMClass pQueryResultClass) throws WBEMException {
+
+		final String operation = "OpenQueryInstances";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenQueryInstances_request(doc,
+					pObjectName, pFilterQuery, pFilterQueryLanguage, pReturnQueryResultClass,
+					pTimeout, pContinueOnError, pMaxObjects, pQueryResultClass));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
+			return enumResp;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public EnumerateResponse getInstancePaths(CIMObjectPath pObjectName,
+			String pContext, UnsignedInteger32 pMaxObjects) throws WBEMException {
+
+		final String operation = "PullInstancePaths";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.PullInstancePaths_request(doc,
+					pObjectName, pContext, pMaxObjects));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
+			return enumResp;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public EnumerateResponse getInstances(CIMObjectPath pObjectName, String pContext,
+			UnsignedInteger32 pMaxObjects) throws WBEMException {
+
+		final String operation = "PullInstances";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.PullInstances_request(doc,
+					pObjectName, pContext, pMaxObjects));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
+			return enumResp;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public EnumerateResponse getInstancesWithPath(CIMObjectPath pObjectName,
+			String pContext, UnsignedInteger32 pMaxObjects) throws WBEMException {
+
+		final String operation = "PullInstancesWithPath";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.PullInstancesWithPath_request(
+					doc, pObjectName, pContext, pMaxObjects));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
+			return enumResp;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public EnumerateResponse referencePaths(CIMObjectPath pObjectName,
+			String pResultClass, String pRole, String pFilterQueryLanguage, String pFilterQuery,
+			UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects)
+			throws WBEMException {
+
+		final String operation = "OpenReferenceInstancePaths";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
+					.OpenReferenceInstancePaths_request(doc, pObjectName, pResultClass, pRole,
+							pFilterQueryLanguage, pFilterQuery, pTimeout, pContinueOnError,
+							pMaxObjects));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
+			return enumResp;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	public EnumerateResponse references(CIMObjectPath pObjectName,
+			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList,
+			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
+			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
+
+		final String operation = "OpenReferenceInstances";
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+
+			if (pObjectName == null || pObjectName.getNamespace() == null
+					|| pObjectName.getObjectName() == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+
+			HttpHeader hh = new HttpHeader();
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
+					"US-ASCII"));
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenReferenceInstances_request(
+					doc, pObjectName, pResultClass, pRole, pIncludeClassOrigin, pPropertyList,
+					pFilterQueryLanguage, pFilterQuery, pTimeout, pContinueOnError, pMaxObjects));
+
+			InputStreamReader is = transmitRequest(operation, hh, doc);
+			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
+			return enumResp;
+
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger
+						.trace(Level.FINE, operation + " request resulted in CIM Error", e
+								.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, operation + " request failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+
+	private InputStreamReader transmitIndicationRequest(URI pRecipient, HttpClientPool pClientPool,
+			HttpHeader pHeader, Document pDocument) throws IOException, ProtocolException,
+			WBEMException {
+		return transmitRequestWorker(true, pRecipient, pClientPool, null, pHeader, pDocument);
+	}
+
+	public boolean sendIndication(URI pRecipient, CIMInstance pIndication) throws WBEMException {
+		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
+		logger.entry();
+
+		checkState();
+
+		try {
+			if (pRecipient == null || pRecipient.getScheme() == null
+					|| pRecipient.getHost() == null || pRecipient.getPort() <= 0) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER,
+					"Invalid recipient URI, must contain valid scheme://host:port"); }
+
+			if (!pRecipient.getScheme().equalsIgnoreCase(WBEMConstants.HTTP)
+					&& !pRecipient.getScheme().equalsIgnoreCase(WBEMConstants.HTTPS)) throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid scheme "
+							+ pRecipient.getScheme() + ", must be http or https");
+
+			if (pIndication == null) { throw new WBEMException(
+					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid indication, must not be null"); }
+
+			logger.trace(Level.FINER, "Attempting to send following indication to "
+					+ pRecipient.toString() + ":\n" + pIndication.toString());
+
+			HttpHeader hh = new HttpHeader();
+
+			Document doc = this.iXmlHelper.newDocument();
+
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.sendIndication_request(doc,
+					pIndication));
+
+			HttpClientPool indPool = new HttpClientPool(this.iConfiguration);
+
+			InputStreamReader is = transmitIndicationRequest(pRecipient, indPool, hh, doc);
+
+			boolean success = false;
+			if (is != null) {
+				CIMResponse response = getSingleResponse(is, null);
+				success = response != null && response.isSuccessful();
+			}
+
+			indPool.closePool();
+
+			return success;
+		} catch (WBEMException e) {
+			logger.trace(Level.FINE, "Sending indication resulted in CIM Error", e);
+			throw e;
+		} catch (Exception e) {
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				logger.trace(Level.FINE, "Sending indication resulted in CIM Error", e.getCause());
+				throw (WBEMException) e.getCause();
+			}
+			logger.trace(Level.FINE, "Sending indication failed", e);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e);
+		} finally {
+			logger.exit();
+		}
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java
similarity index 75%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java
index 5b5fce7..4b3845a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java
@@ -1,133 +1,131 @@
-/*
-  CIMEvent.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------
- * 17931      2005-07-28  thschaef     Add InetAddress field 
- *                                     + constructor and getter
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.indications;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.InetAddress;
-
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-
-/**
- * Class CIMEvent is required for indication handling.
- * 
- */
-public class CIMEvent {
-
-	protected CIMInstance iIndication;
-
-	protected String iID;
-
-	protected InetAddress iInetAddress = null;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pIndication
-	 */
-	public CIMEvent(CIMInstance pIndication) {
-		this(pIndication, null);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pIndication
-	 * @param id
-	 */
-	public CIMEvent(CIMInstance pIndication, String id) {
-		this.iIndication = pIndication;
-		this.iID = id;
-	}
-
-	/**
-	 * Constructor that takes the CIMInstance of the indication, the id as well
-	 * as the InetAddress of the remote machine.
-	 * 
-	 * @param pIndication
-	 *            The indication instance
-	 * @param pId
-	 *            The id
-	 * @param pInetAddress
-	 *            The address
-	 */
-	public CIMEvent(CIMInstance pIndication, String pId, InetAddress pInetAddress) {
-		this.iIndication = pIndication;
-		this.iID = pId;
-		this.iInetAddress = pInetAddress;
-	}
-
-	/**
-	 * This method returns the InetAddress of the machine that hosts the CIM
-	 * Agent that sent the indication. Be aware the remote machine could have
-	 * multiple network adapters - thus the result can be ambiguous.
-	 * 
-	 * @return The InetAddress of the remote machine
-	 */
-	public InetAddress getInetAddress() {
-		return this.iInetAddress;
-	}
-
-	/**
-	 * getIndication
-	 * 
-	 * @return CIMInstance
-	 */
-	public CIMInstance getIndication() {
-		return this.iIndication;
-	}
-
-	/**
-	 * getID
-	 * 
-	 * @return String
-	 */
-	public String getID() {
-		return this.iID;
-	}
-}
+/*
+  CIMEvent.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------
+ * 17931      2005-07-28  thschaef     Add InetAddress field 
+ *                                     + constructor and getter
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.indications;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.InetAddress;
+
+import org.metricshub.wbem.javax.cim.CIMInstance;
+
+/**
+ * Class CIMEvent is required for indication handling.
+ * 
+ */
+public class CIMEvent {
+
+	protected CIMInstance iIndication;
+
+	protected String iID;
+
+	protected InetAddress iInetAddress = null;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pIndication
+	 */
+	public CIMEvent(CIMInstance pIndication) {
+		this(pIndication, null);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pIndication
+	 * @param id
+	 */
+	public CIMEvent(CIMInstance pIndication, String id) {
+		this.iIndication = pIndication;
+		this.iID = id;
+	}
+
+	/**
+	 * Constructor that takes the CIMInstance of the indication, the id as well
+	 * as the InetAddress of the remote machine.
+	 * 
+	 * @param pIndication
+	 *            The indication instance
+	 * @param pId
+	 *            The id
+	 * @param pInetAddress
+	 *            The address
+	 */
+	public CIMEvent(CIMInstance pIndication, String pId, InetAddress pInetAddress) {
+		this.iIndication = pIndication;
+		this.iID = pId;
+		this.iInetAddress = pInetAddress;
+	}
+
+	/**
+	 * This method returns the InetAddress of the machine that hosts the CIM
+	 * Agent that sent the indication. Be aware the remote machine could have
+	 * multiple network adapters - thus the result can be ambiguous.
+	 * 
+	 * @return The InetAddress of the remote machine
+	 */
+	public InetAddress getInetAddress() {
+		return this.iInetAddress;
+	}
+
+	/**
+	 * getIndication
+	 * 
+	 * @return CIMInstance
+	 */
+	public CIMInstance getIndication() {
+		return this.iIndication;
+	}
+
+	/**
+	 * getID
+	 * 
+	 * @return String
+	 */
+	public String getID() {
+		return this.iID;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java
index 811e56d..c6ff246 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java
@@ -1,209 +1,206 @@
-/*
-  CIMEventDispatcher.java
-
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1498927    2006-06-01  lupusalex    Fill gaps in logging coverage
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 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)
- * 3477087    2012-01-23  blaschke-oss Need Access to an Indication Sender's IP Address
- *    2628    2013-03-26  blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched
- */
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.indications;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.EventListener;
-import java.util.LinkedList;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.javax.wbem.listener.IndicationListener;
-
-import org.sentrysoftware.wbem.sblim.cimclient.IndicationListenerSBLIM;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-
-/**
- * Class CIMEventDispatcher is required for indication handling.
- * 
- */
-public class CIMEventDispatcher extends Thread {
-
-	protected LinkedList iEventQueue = new LinkedList();
-
-	protected EventListener iListener = null;
-
-	private boolean iAlive = true;
-
-	private int iMaxEvents = 0;
-
-	private LogAndTraceBroker iLogger = LogAndTraceBroker.getBroker();
-
-	/**
-	 * Construct a CIMEventDispatcher object which distributes CIMEvents to the
-	 * appropriate CIMListener. The EventListener must be an instance of
-	 * IndicationListener or IndicationListenerSBLIM.
-	 * 
-	 * @param pListener
-	 *            The CIMListener (IndicationListener or
-	 *            IndicationListenerSBLIM) which receives the CIMEvents to be
-	 *            dispatched.
-	 */
-	public CIMEventDispatcher(EventListener pListener) {
-		this(pListener, 0);
-	}
-
-	/**
-	 * Construct a CIMEventDispatcher object which distributes CIMEvents to the
-	 * appropriate CIMListener. The EventListener must be an instance of
-	 * IndicationListener or IndicationListenerSBLIM.
-	 * 
-	 * @param pListener
-	 *            The CIMListener (IndicationListener or
-	 *            IndicationListenerSBLIM) which receives the CIMEvents to be
-	 *            dispatched.
-	 * @param pMaxEvents
-	 *            The maximum number of CIMEvents waiting to be dispatched.
-	 */
-	public CIMEventDispatcher(EventListener pListener, int pMaxEvents) {
-		if (!(pListener instanceof IndicationListener)
-				&& !(pListener instanceof IndicationListenerSBLIM)) throw new IllegalArgumentException(
-				"Listener must be instance of IndicationListener or IndicationListenerSBLIM");
-		this.iListener = pListener;
-		this.iMaxEvents = pMaxEvents;
-		setDaemon(true);
-		setName("CIMEventDispatcher");
-		start();
-	}
-
-	/**
-	 * Propagates the CIMEvent to the event consumers.
-	 * 
-	 * @param pEvent
-	 *            The CIMEvent to be dispatched.
-	 */
-	public synchronized void dispatchEvent(CIMEvent pEvent) {
-
-		if (pEvent != null) {
-			if (this.iMaxEvents > 0) {
-				int size = this.iEventQueue.size();
-				if (size >= this.iMaxEvents) {
-					for (int i = size - this.iMaxEvents + 1; i > 0; i--) {
-						CIMEvent event = this.iEventQueue.remove(0);
-						this.iLogger.trace(Level.FINE, "Deleted CIMEvent (id=" + event.getID()
-								+ ") from the queue (maximum size of " + this.iMaxEvents
-								+ " reached)");
-					}
-				}
-			}
-			this.iEventQueue.add(pEvent);
-			this.iLogger.trace(Level.FINE, "Added CIMEvent (id=" + pEvent.getID()
-					+ ") to the queue (" + this.iEventQueue.size() + " elements total)");
-			notify();
-		} else {
-			this.iLogger.trace(Level.WARNING, "CIMEvent to dispatch was null");
-		}
-	}
-
-	/**
-	 * Starts the dispatching engine of the CIMEventDispatcher.
-	 * 
-	 */
-	public synchronized void startup() {
-		this.iAlive = true;
-		start();
-	}
-
-	/**
-	 * Stops the dispatching of events.
-	 */
-	public synchronized void kill() {
-		this.iAlive = false;
-		notify();
-	}
-
-	/**
-	 * close
-	 */
-	public synchronized void close() {
-		kill();
-	}
-
-	private synchronized CIMEvent getEvent() {
-		CIMEvent event = null;
-		while (event == null) {
-			try {
-				if (this.iEventQueue.size() == 0) wait();
-			} catch (InterruptedException e) { /**/}
-			if (!this.iAlive) break;
-			if (this.iEventQueue.size() > 0) {
-				event = this.iEventQueue.remove(0);
-				this.iLogger.trace(Level.FINER, "Removed CIMEvent (id=" + event.getID()
-						+ ") from the queue (" + this.iEventQueue.size() + " elements left)");
-			}
-		}
-		return event;
-	}
-
-	@Override
-	public void run() {
-		while (this.iAlive) {
-			try {
-				CIMEvent event = getEvent();
-				if (event != null) {
-					this.iLogger.trace(Level.FINER, "Processing CIMEvent (id=" + event.getID()
-							+ ")");
-					try {
-						if (this.iListener instanceof IndicationListener) ((IndicationListener) this.iListener)
-								.indicationOccured(event.getID(), event.getIndication());
-						else // if instanceof IndicationListenerSBLIM)
-						((IndicationListenerSBLIM) this.iListener).indicationOccured(event.getID(),
-								event.getIndication(), event.getInetAddress());
-					} catch (Throwable t) {
-						this.iLogger.trace(Level.FINE, "Exception caught in listener ("
-								+ this.iListener.getClass().getName()
-								+ ") while processing CIMEvent", t);
-					}
-				}
-			} catch (Throwable t) {
-				this.iLogger.trace(Level.FINE, "Exception in event dispatcher loop", t);
-			}
-		}
-	}
-}
+/*
+  CIMEventDispatcher.java
+
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1498927    2006-06-01  lupusalex    Fill gaps in logging coverage
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 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)
+ * 3477087    2012-01-23  blaschke-oss Need Access to an Indication Sender's IP Address
+ *    2628    2013-03-26  blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched
+ */
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.indications;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.EventListener;
+import java.util.LinkedList;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.javax.wbem.listener.IndicationListener;
+import org.metricshub.wbem.sblim.cimclient.IndicationListenerSBLIM;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+
+/**
+ * Class CIMEventDispatcher is required for indication handling.
+ * 
+ */
+public class CIMEventDispatcher extends Thread {
+
+	protected LinkedList iEventQueue = new LinkedList();
+
+	protected EventListener iListener = null;
+
+	private boolean iAlive = true;
+
+	private int iMaxEvents = 0;
+
+	private LogAndTraceBroker iLogger = LogAndTraceBroker.getBroker();
+
+	/**
+	 * Construct a CIMEventDispatcher object which distributes CIMEvents to the
+	 * appropriate CIMListener. The EventListener must be an instance of
+	 * IndicationListener or IndicationListenerSBLIM.
+	 * 
+	 * @param pListener
+	 *            The CIMListener (IndicationListener or
+	 *            IndicationListenerSBLIM) which receives the CIMEvents to be
+	 *            dispatched.
+	 */
+	public CIMEventDispatcher(EventListener pListener) {
+		this(pListener, 0);
+	}
+
+	/**
+	 * Construct a CIMEventDispatcher object which distributes CIMEvents to the
+	 * appropriate CIMListener. The EventListener must be an instance of
+	 * IndicationListener or IndicationListenerSBLIM.
+	 * 
+	 * @param pListener
+	 *            The CIMListener (IndicationListener or
+	 *            IndicationListenerSBLIM) which receives the CIMEvents to be
+	 *            dispatched.
+	 * @param pMaxEvents
+	 *            The maximum number of CIMEvents waiting to be dispatched.
+	 */
+	public CIMEventDispatcher(EventListener pListener, int pMaxEvents) {
+		if (!(pListener instanceof IndicationListener)
+				&& !(pListener instanceof IndicationListenerSBLIM)) throw new IllegalArgumentException(
+				"Listener must be instance of IndicationListener or IndicationListenerSBLIM");
+		this.iListener = pListener;
+		this.iMaxEvents = pMaxEvents;
+		setDaemon(true);
+		setName("CIMEventDispatcher");
+		start();
+	}
+
+	/**
+	 * Propagates the CIMEvent to the event consumers.
+	 * 
+	 * @param pEvent
+	 *            The CIMEvent to be dispatched.
+	 */
+	public synchronized void dispatchEvent(CIMEvent pEvent) {
+
+		if (pEvent != null) {
+			if (this.iMaxEvents > 0) {
+				int size = this.iEventQueue.size();
+				if (size >= this.iMaxEvents) {
+					for (int i = size - this.iMaxEvents + 1; i > 0; i--) {
+						CIMEvent event = this.iEventQueue.remove(0);
+						this.iLogger.trace(Level.FINE, "Deleted CIMEvent (id=" + event.getID()
+								+ ") from the queue (maximum size of " + this.iMaxEvents
+								+ " reached)");
+					}
+				}
+			}
+			this.iEventQueue.add(pEvent);
+			this.iLogger.trace(Level.FINE, "Added CIMEvent (id=" + pEvent.getID()
+					+ ") to the queue (" + this.iEventQueue.size() + " elements total)");
+			notify();
+		} else {
+			this.iLogger.trace(Level.WARNING, "CIMEvent to dispatch was null");
+		}
+	}
+
+	/**
+	 * Starts the dispatching engine of the CIMEventDispatcher.
+	 * 
+	 */
+	public synchronized void startup() {
+		this.iAlive = true;
+		start();
+	}
+
+	/**
+	 * Stops the dispatching of events.
+	 */
+	public synchronized void kill() {
+		this.iAlive = false;
+		notify();
+	}
+
+	/**
+	 * close
+	 */
+	public synchronized void close() {
+		kill();
+	}
+
+	private synchronized CIMEvent getEvent() {
+		CIMEvent event = null;
+		while (event == null) {
+			try {
+				if (this.iEventQueue.size() == 0) wait();
+			} catch (InterruptedException e) { /**/}
+			if (!this.iAlive) break;
+			if (this.iEventQueue.size() > 0) {
+				event = this.iEventQueue.remove(0);
+				this.iLogger.trace(Level.FINER, "Removed CIMEvent (id=" + event.getID()
+						+ ") from the queue (" + this.iEventQueue.size() + " elements left)");
+			}
+		}
+		return event;
+	}
+
+	@Override
+	public void run() {
+		while (this.iAlive) {
+			try {
+				CIMEvent event = getEvent();
+				if (event != null) {
+					this.iLogger.trace(Level.FINER, "Processing CIMEvent (id=" + event.getID()
+							+ ")");
+					try {
+						if (this.iListener instanceof IndicationListener) ((IndicationListener) this.iListener)
+								.indicationOccured(event.getID(), event.getIndication());
+						else // if instanceof IndicationListenerSBLIM)
+						((IndicationListenerSBLIM) this.iListener).indicationOccured(event.getID(),
+								event.getIndication(), event.getInetAddress());
+					} catch (Throwable t) {
+						this.iLogger.trace(Level.FINE, "Exception caught in listener ("
+								+ this.iListener.getClass().getName()
+								+ ") while processing CIMEvent", t);
+					}
+				}
+			} catch (Throwable t) {
+				this.iLogger.trace(Level.FINE, "Exception in event dispatcher loop", t);
+			}
+		}
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java
similarity index 89%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java
index bb955c2..f8a507f 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java
@@ -1,830 +1,829 @@
-/*
-  (C) Copyright IBM Corp. 2005, 2013
- 
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
- 
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
- 
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com  
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 17931      2005-07-28  thschaef     Add InetAddress to CIM Event
- * 1438152    2006-05-15  lupusalex    Wrong message ID in ExportResponseMessage
- * 1498938    2006-06-01  lupusalex    Multiple events in single cim-xml request are not handled
- * 1498130    2006-05-31  lupusalex    Selection of xml parser on a per connection basis
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 1565892    2006-11-16  lupusalex    Make SBLIM client JSR48 compliant
- * 1656285    2007-02-12  ebak         IndicationHandler does not accept non-Integer message ID
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
- * 2901216    2009-12-01  blaschke-oss lost IndicationURL for IndcationListener.indicationOccured
- * 3185818    2011-02-18  blaschke-oss indicationOccured URL incorrect
- * 3186176    2011-02-18  blaschke-oss XML response for indication not traced
- * 3185763    2011-02-25  blaschke-oss Reliable indication support - Phase 1
- * 3288721    2011-05-20  blaschke-oss Need the function of indication reordering
- * 3304058    2011-05-20  blaschke-oss Use same date format in change history
- * 3304953    2011-05-20  blaschke-oss Indication URL mapped to lower case
- * 3374206    2011-07-22  blaschke-oss NullPointerException caused by Indication
- * 3376657    2011-07-24  blaschke-oss Get reliable indication properties once
- * 3390724    2011-08-12  blaschke-oss Problem with Reliable Indication support in the Listener
- * 3459036    2011-12-13  blaschke-oss Linked list for RI queue not efficient for many LDs
- * 3485074    2012-02-06  blaschke-oss An Indication trace request
- * 3484022    2012-02-08  blaschke-oss Turn reliable indication mode on and off based on SC/SN
- * 3492214    2012-02-23  blaschke-oss Add a SenderIPAddress property indications
- * 3513228    2012-04-23  blaschke-oss Reliable Indications support can create lots of threads
- * 3553858    2012-08-06  blaschke-oss Append duplicate HTTP header fields instead of replace
- * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
- * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.indications;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.CIMClientXML_HelperImpl;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.CIMRequest;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.CIMXMLBuilderImpl;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.cimxml.CIMXMLParserImpl;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpContentHandler;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpException;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpHeader;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpHeaderParser;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.MessageReader;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.MessageWriter;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.HttpHeader.HeaderEntry;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.http.io.DebugInputStream;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.util.WBEMConfigurationDefaults;
-import org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-/**
- * Handles the HTTP connections, providing the necessary interfaces for
- * CIMListener server.
- */
-public class CIMIndicationHandler extends HttpContentHandler {
-
-	/**
-	 * DataManager is responsible for background processing of the
-	 * reliable indication queue and cache.
-	 */
-	private class DataManager extends Thread {
-
-		private boolean iAlive = true;
-
-		private LinkedList iLinkedList;
-
-		private Hashtable iHashTable;
-
-		public DataManager(LinkedList pServerList) {
-			this.iLinkedList = pServerList;
-			this.iHashTable = null;
-			setDaemon(true);
-		}
-
-		public DataManager(Hashtable pServerTable) {
-			this.iLinkedList = null;
-			this.iHashTable = pServerTable;
-			setDaemon(true);
-		}
-
-		@Override
-		public void run() {
-			while (this.iAlive) {
-				try {
-					if (this.iLinkedList != null) {
-						ServerListEntry entry;
-						Iterator iterator;
-
-						iterator = this.iLinkedList.iterator();
-						while (iterator.hasNext()) {
-							entry = iterator.next();
-							IndicationServer server = entry.getIndicationServer();
-							if (server != null) {
-								ReliableIndicationHandler handler = server.getRIHandler();
-								if (handler != null) {
-									handler.processAll();
-								}
-							}
-						}
-					} else if (this.iHashTable != null) {
-						Map.Entry entry;
-						Iterator> iterator;
-
-						Set> set = this.iHashTable
-								.entrySet();
-						if (set != null) {
-							iterator = set.iterator();
-							while (iterator.hasNext()) {
-								entry = iterator.next();
-								IndicationServer server = entry.getValue();
-								if (server != null) {
-									ReliableIndicationHandler handler = server.getRIHandler();
-									if (handler != null) {
-										handler.processAll();
-									}
-								}
-							}
-						}
-					}
-					sleep(1000);
-				} catch (Throwable t) {
-					// Expected, ignore and try again
-				}
-			}
-		}
-
-		public void stopRun() {
-			this.iAlive = false;
-		}
-	}
-
-	/**
-	 * IndicationServer represents an entry in the linked list or
-	 * hash table of servers handled by this CIMIndicationHandler
-	 * instance. Each entry in the list/table will have a unique
-	 * serverIP/destinationURL pair along with its own
-	 * ReliableIndicationHandler. This is done to handle multiple
-	 * contexts from the same server.
-	 * 
-	 * NOTE: Multiple contexts from the same server will not be handled
-	 * correctly if the user creates multiple
-	 * CIM_ListenerDestination instances with the same
-	 * Destination property. While this is poor programming
-	 * practice (two different instances with same pertinent information), the
-	 * real issue is that there is no way for the Client to differentiate
-	 * between a context switch and two different contexts if the
-	 * serverIP/destinationURL are the same. This issue it is not covered by
-	 * DSP1054 1.2.
-	 */
-	private class IndicationServer {
-
-		private boolean iRIInitialized = false;
-
-		private ReliableIndicationHandler iRIHandler;
-
-		public IndicationServer() {
-		// initialize() does the work
-		}
-
-		public void initialize(ReliableIndicationHandler pRIHandler) {
-			this.iRIInitialized = true;
-			this.iRIHandler = pRIHandler;
-		}
-
-		public boolean isInitialized() {
-			return this.iRIInitialized;
-		}
-
-		public ReliableIndicationHandler getRIHandler() {
-			return this.iRIHandler;
-		}
-	}
-
-	/**
-	 * ServerListEntry represents a physical entry within the
-	 * linked list. An IndicationServer instance is extracted from
-	 * the linked list by proceeding through each entry in the linked list
-	 * looking for the corresponding server IP and destination URL.
-	 */
-	private class ServerListEntry {
-
-		private InetAddress iInetAddress;
-
-		private String iDestinationUrl;
-
-		private IndicationServer iIndicationServer;
-
-		public ServerListEntry(InetAddress pInetAddress, String pDestinationUrl) {
-			this.iInetAddress = pInetAddress;
-			this.iDestinationUrl = pDestinationUrl;
-			this.iIndicationServer = new IndicationServer();
-		}
-
-		public InetAddress getInetAddress() {
-			return this.iInetAddress;
-		}
-
-		public String getDestinationUrl() {
-			return this.iDestinationUrl;
-		}
-
-		public IndicationServer getIndicationServer() {
-			return this.iIndicationServer;
-		}
-	}
-
-	/**
-	 * ServerTableEntry represents a physical key within the hash
-	 * table while the corresponding IndicationServer is the value
-	 * associated with the key. The hash table key is comprised of a server IP
-	 * and destination URL.
-	 */
-	private class ServerTableEntry {
-
-		private InetAddress iInetAddress;
-
-		private String iDestinationUrl;
-
-		public ServerTableEntry(InetAddress pInetAddress, String pDestinationUrl) {
-			this.iInetAddress = pInetAddress;
-			this.iDestinationUrl = pDestinationUrl;
-		}
-
-		public InetAddress getInetAddress() {
-			return this.iInetAddress;
-		}
-
-		public String getDestinationUrl() {
-			return this.iDestinationUrl;
-		}
-
-		@Override
-		public boolean equals(Object pObj) {
-			if (!(pObj instanceof ServerTableEntry)) return false;
-			ServerTableEntry that = (ServerTableEntry) pObj;
-			if (this.iInetAddress.equals(that.getInetAddress())
-					&& this.iDestinationUrl.equalsIgnoreCase(that.getDestinationUrl())) return true;
-			return false;
-		}
-
-		@Override
-		public int hashCode() {
-			return (this.iInetAddress.hashCode()) ^ (this.iDestinationUrl.hashCode());
-		}
-	}
-
-	private CIMEventDispatcher iDispatcher = null;
-
-	private int iMessageId = 0;
-
-	private LogAndTraceBroker iLogger = LogAndTraceBroker.getBroker();
-
-	private WBEMConfiguration iSessionProperties;
-
-	private boolean iReliableIndicationsDisabled = true;
-
-	private int iHashtableCapacity = 0; // 0 -> linked list, >0 -> hash table
-
-	private LinkedList iServerList;
-
-	private Hashtable iServerTable;
-
-	private String iIndicationTraceClass;
-
-	private String iIndicationTraceProperties[];
-
-	private boolean iAddSenderIPAddress;
-
-	private DataManager iDataManagerThread;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pDispatcher
-	 */
-	public CIMIndicationHandler(CIMEventDispatcher pDispatcher) {
-		this(pDispatcher, null);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pDispatcher
-	 * @param pProperties
-	 */
-	public CIMIndicationHandler(CIMEventDispatcher pDispatcher, WBEMConfiguration pProperties) {
-		this.iDispatcher = pDispatcher;
-		this.iSessionProperties = (pProperties != null) ? pProperties : WBEMConfiguration
-				.getGlobalConfiguration();
-		this.iReliableIndicationsDisabled = !this.iSessionProperties.isReliableIndicationEnabled();
-
-		// Initialize reliable indication support
-		if (!this.iReliableIndicationsDisabled) {
-			this.iHashtableCapacity = this.iSessionProperties
-					.getReliableIndicationHashtableCapacity();
-
-			// Validate ReliableIndicationHashtableCapacity property
-			if (this.iHashtableCapacity < 0 || this.iHashtableCapacity > 25000) {
-				this.iLogger.trace(Level.FINE, "ReliableIndicationHashtableCapacity of "
-						+ this.iHashtableCapacity + " outside range, using default value");
-
-				this.iHashtableCapacity = Integer.valueOf(
-						WBEMConfigurationDefaults.LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY)
-						.intValue();
-			}
-
-			if (this.iHashtableCapacity == 0) {
-				this.iServerList = new LinkedList();
-				this.iDataManagerThread = new DataManager(this.iServerList);
-			} else {
-				this.iServerTable = new Hashtable(
-						this.iHashtableCapacity);
-				this.iDataManagerThread = new DataManager(this.iServerTable);
-			}
-
-			this.iDataManagerThread.start();
-		}
-
-		// Initialize indication trace, if any
-		String filter = this.iSessionProperties.getListenerIndicationTraceFilter();
-		if (filter != null && filter.trim().length() > 0) {
-			// Format: [class:]property[,property]*
-			String properties;
-
-			int colon = filter.indexOf(':');
-			if (colon == -1) {
-				this.iIndicationTraceClass = null;
-				properties = filter;
-			} else {
-				this.iIndicationTraceClass = filter.substring(0, colon).trim().toLowerCase();
-				properties = filter.substring(colon + 1).trim();
-			}
-
-			String[] props = properties.split(",");
-			if (props != null && props.length > 0) {
-				ArrayList a = new ArrayList();
-
-				for (int i = 0; i < props.length; i++) {
-					String prop = props[i].trim().toLowerCase();
-					if (prop != null && prop.length() > 0) {
-						a.add(prop);
-					}
-				}
-
-				if (a.size() > 0) {
-					this.iIndicationTraceProperties = a.toArray(new String[0]);
-
-					if (this.iLogger.isLoggableTrace(Level.INFO)) {
-						StringBuilder msg = new StringBuilder(
-								"Indication trace enabled: class filter=");
-
-						if (this.iIndicationTraceClass != null) {
-							msg.append("\"");
-							msg.append(this.iIndicationTraceClass);
-							msg.append("\"");
-						} else {
-							msg.append("");
-						}
-						msg.append(", properties=");
-						for (int i = 0; i < this.iIndicationTraceProperties.length; i++) {
-							if (i > 0) msg.append(",");
-							msg.append("\"");
-							msg.append(this.iIndicationTraceProperties[i]);
-							msg.append("\"");
-						}
-						this.iLogger.trace(Level.INFO, msg.toString());
-					}
-				} else {
-					this.iIndicationTraceProperties = null;
-				}
-			}
-		}
-
-		this.iAddSenderIPAddress = this.iSessionProperties.getListenerAddSenderIPAddress();
-	}
-
-	@Override
-	protected void finalize() throws Throwable {
-		try {
-			close();
-		} finally {
-			super.finalize();
-		}
-	}
-
-	@Override
-	public void close() {
-		if (this.iDataManagerThread != null) {
-			this.iDataManagerThread.stopRun();
-			this.iDataManagerThread = null;
-		}
-		if (this.iDispatcher != null) {
-			this.iDispatcher.close();
-			this.iDispatcher = null;
-		}
-	}
-
-	/**
-	 * getMsgID
-	 * 
-	 * @return int
-	 */
-	public synchronized int getMsgID() {
-		this.iMessageId++;
-		if (this.iMessageId > 1000000) this.iMessageId = 0;
-		return this.iMessageId;
-	}
-
-	private static HttpHeader processHeader(HttpHeader pHeader, MessageWriter pWriter)
-			throws HttpException {
-
-		HttpHeader header = processHttpExtensions(pHeader);
-		String cimExport = header.getField("CIMExport");
-		String cimOperation = header.getField("CIMOperation");
-
-		if (cimOperation != null && !"METHODCALL".equalsIgnoreCase(cimOperation)) {
-			pWriter.getHeader().addField("CIMError", "unsupported-operation");
-			throw new HttpException(400, "Bad Request");
-		}
-		if (cimExport != null && !"METHODREQUEST".equalsIgnoreCase(cimExport)
-				&& !"EXPORTMETHODCALL".equalsIgnoreCase(cimExport)) {
-			pWriter.getHeader().addField("CIMError", "unsupported-operation");
-			throw new HttpException(400, "Bad Request");
-		}
-		if (cimOperation == null && cimExport == null) {
-			// TODO: verify the status returned by the server for this
-			// situation, is not defined on the spec
-			pWriter.getHeader().addField("CIMError", "unsupported-operation");
-			throw new HttpException(400, "Bad Request");
-		}
-
-		return header;
-	}
-
-	@Override
-	public void handleContent(MessageReader pReader, MessageWriter pWriter,
-			InetAddress pInetAddress, String pLocalAddress) throws HttpException, IOException {
-
-		CIMError error = null;
-
-		// TODO validate CIMHeaders!
-		HttpHeader inputHeader = pReader.getHeader();
-		inputHeader = processHeader(inputHeader, pWriter);
-		LogAndTraceBroker.getBroker().trace(Level.FINER,
-				"Indication Request HTTP Headers= " + inputHeader.toString());
-		String cimMethod = inputHeader.getField("CIMMethod");
-		String cimExport = inputHeader.getField("CIMExport");
-
-		CIMRequest request = null;
-		CIMClientXML_HelperImpl xmlHelper = null;
-
-		try {
-			xmlHelper = new CIMClientXML_HelperImpl();
-		} catch (ParserConfigurationException e1) {
-			IOException e = new IOException("ParserConfigurationException");
-			e.initCause(e1);
-			throw e;
-		}
-
-		InputStream inputstream = null;
-		if ((this.iSessionProperties.isCimXmlTracingEnabled() && LogAndTraceBroker.getBroker()
-				.getXmlTraceStream() != null)
-				|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
-			inputstream = new DebugInputStream(pReader.getInputStream(), LogAndTraceBroker
-					.getBroker().getXmlTraceStream(), "indication request");
-		} else {
-			inputstream = pReader.getInputStream();
-		}
-
-		request = parseDocument(xmlHelper, pReader, inputstream);
-
-		if (request == null) throw new HttpException(400, "Bad Request");
-
-		if ((cimExport == null && !cimMethod.equalsIgnoreCase("Indication"))
-				|| !request.isCIMExport()) { throw new HttpException(400, "Bad Request"); }
-
-		error = dispatchIndications(pReader, pInetAddress, pLocalAddress, request);
-
-		buildResponse(xmlHelper, pWriter, request, error);
-	}
-
-	private CIMRequest parseDocument(CIMClientXML_HelperImpl xmlHelper, MessageReader pReader,
-			InputStream inputstream) throws HttpException {
-
-		// TODO: integrate SAX parser and DOM parser
-
-		Document doc = null;
-		try {
-
-			doc = xmlHelper.parse(new InputSource(new InputStreamReader(inputstream, pReader
-					.getCharacterEncoding())));
-			Element rootE = doc.getDocumentElement();
-			return (CIMRequest) CIMXMLParserImpl.parseCIM(rootE);
-		} catch (Exception e) {
-			this.iLogger.trace(Level.WARNING, "exception while parsing the XML with DOM parser", e);
-			throw new HttpException(400, "Bad Request");
-		}
-	}
-
-	/**
-	 * Returns the corresponding indication server if the server is already
-	 * present in the linked list, otherwise appends the server to the linked
-	 * list and returns the new entry.
-	 * 
-	 * @param pInetAddress
-	 *            Address of indication server.
-	 * @param pDestinationUrl
-	 *            Destination URL of indication.
-	 * @return IndicationServer with given address.
-	 */
-	private IndicationServer getIndicationServerFromList(InetAddress pInetAddress,
-			String pDestinationUrl) {
-		ServerListEntry entry;
-		Iterator iterator = this.iServerList.iterator();
-		while (iterator.hasNext()) {
-			entry = iterator.next();
-			if (entry.getInetAddress().equals(pInetAddress)
-					&& entry.getDestinationUrl().equalsIgnoreCase(pDestinationUrl)) return entry
-					.getIndicationServer();
-		}
-		entry = new ServerListEntry(pInetAddress, pDestinationUrl);
-		this.iServerList.add(entry);
-		this.iLogger.trace(Level.FINE, "Creating reliable indication handler for server IP "
-				+ entry.getInetAddress().toString() + ", destination URL "
-				+ entry.getDestinationUrl() + " in linked list");
-
-		return entry.getIndicationServer();
-	}
-
-	/**
-	 * Returns the corresponding indication server if the server is already
-	 * present in the hash table, otherwise adds the server to the hash table
-	 * and returns the new entry.
-	 * 
-	 * @param pInetAddress
-	 *            Address of indication server.
-	 * @param pDestinationUrl
-	 *            Destination URL of indication.
-	 * @return IndicationServer with given address.
-	 */
-	private IndicationServer getIndicationServerFromTable(InetAddress pInetAddress,
-			String pDestinationUrl) {
-		ServerTableEntry key;
-		IndicationServer server;
-
-		key = new ServerTableEntry(pInetAddress, pDestinationUrl);
-		server = this.iServerTable.get(key);
-		if (server == null) {
-			server = new IndicationServer();
-			this.iServerTable.put(key, server);
-			this.iLogger.trace(Level.FINE, "Creating reliable indication handler for server IP "
-					+ key.getInetAddress().toString() + ", destination URL "
-					+ key.getDestinationUrl() + " in hash table");
-		}
-		return server;
-	}
-
-	/**
-	 * deliverIndication handles reliable indications and returns a boolean
-	 * indicating whether the indication should be delivered or not
-	 * 
-	 * @param pIndication
-	 *            Indication.
-	 * @param pId
-	 *            Indication destination URL.
-	 * @param pInetAddress
-	 *            Indication server IP.
-	 * @return true if indication should be delivered,
-	 *         false if ReliableIndicationHandler will
-	 *         deliver indication
-	 */
-	private synchronized boolean deliverIndication(CIMInstance pIndication, String pId,
-			InetAddress pInetAddress) {
-		IndicationServer server;
-
-		// Each serverIP/destinationURL pair needs its own
-		// ReliableIndicationHandler in order to handle multiple contexts
-		if (this.iHashtableCapacity == 0) {
-			server = getIndicationServerFromList(pInetAddress, pId);
-		} else {
-			server = getIndicationServerFromTable(pInetAddress, pId);
-		}
-
-		// Initialize if not yet done so
-		if (!server.isInitialized()) {
-			// Validate DeliveryRetryAttempts property
-			long attempts = this.iSessionProperties.getListenerDeliveryRetryAttempts();
-			if (attempts <= 0 || attempts > 1000) {
-				this.iLogger.trace(Level.FINE, "DeliveryRetryAttempts of " + attempts
-						+ " outside range, using default value");
-
-				attempts = Long.valueOf(WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_ATTEMPTS)
-						.longValue();
-			}
-
-			// Validate DeliveryRetryInterval property
-			long interval = this.iSessionProperties.getListenerDeliveryRetryInterval();
-			if (interval <= 0 || interval > 86400) {
-				this.iLogger.trace(Level.FINE, "DeliveryRetryInterval of " + interval
-						+ " outside range, using default value");
-
-				interval = Long.valueOf(WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_INTERVAL)
-						.longValue();
-			}
-
-			// Create new ReliableIndicationHandler for this
-			// CIMIndicationHandler
-			server.initialize(new ReliableIndicationHandler(this.iDispatcher, attempts * interval
-					* 10 * 1000));
-
-			this.iLogger
-					.trace(Level.FINE, "Reliable indication support enabled for IP "
-							+ pInetAddress.getHostAddress() + " and URL " + pId
-							+ ", DeliveryRetryAttempts=" + attempts + ", DeliveryRetryInterval="
-							+ interval);
-		}
-
-		// Let ReliableIndicationHandler deliver it
-		server.getRIHandler().handleIndication(pIndication, pId, pInetAddress);
-		return false;
-	}
-
-	private CIMError dispatchIndications(MessageReader pReader, InetAddress pInetAddress,
-			String pLocalAddress, CIMRequest request) {
-		try {
-			Vector paramValue = request.getParamValue();
-			Iterator iter = paramValue.iterator();
-			while (iter.hasNext()) {
-				Object cimEvent = iter.next();
-				if (cimEvent instanceof CIMInstance) {
-					CIMInstance indicationInst = (CIMInstance) cimEvent;
-
-					String path = pReader.getMethod().getFile();
-					String id;
-
-					if (path == null) {
-						id = pLocalAddress + "/";
-					} else if (path.equalsIgnoreCase("/cimom")) {
-						id = path;
-					} else if (path.length() < 4 || !path.regionMatches(true, 0, "http", 0, 4)) {
-						if (path.startsWith("/")) {
-							id = pLocalAddress + path;
-						} else {
-							id = pLocalAddress + "/" + path;
-						}
-					} else /* path.startsWith("http") */{
-						id = path;
-					}
-
-					// Add SenderIPAddress property if enabled
-					if (this.iAddSenderIPAddress) {
-						int size = indicationInst.getPropertyCount();
-						CIMProperty props[] = new CIMProperty[size + 1];
-						for (int i = 0; i < size; i++)
-							props[i] = indicationInst.getProperty(i);
-						props[size] = new CIMProperty("SBLIMJCC_SenderIPAddress",
-								CIMDataType.STRING_T, pInetAddress.getHostAddress());
-						indicationInst = new CIMInstance(indicationInst.getObjectPath(), props);
-					}
-
-					// Do any user-requested indication tracing here
-					if (this.iIndicationTraceProperties != null
-							&& this.iLogger.isLoggableTrace(Level.FINE)
-							&& (this.iIndicationTraceClass == null || indicationInst.getClassName()
-									.toLowerCase().indexOf(this.iIndicationTraceClass) != -1)) {
-						StringBuilder msg = new StringBuilder("Received indication ");
-						msg.append(indicationInst.getClassName());
-						msg.append(" from IP=");
-						String inet = pInetAddress.getHostAddress();
-						msg.append(inet != null ? inet : "");
-						msg.append(" to URL=");
-						msg.append(id);
-						msg.append(" with properties:");
-						for (int i = 0; i < this.iIndicationTraceProperties.length; i++) {
-							msg.append(" ");
-							CIMProperty prop = indicationInst
-									.getProperty(this.iIndicationTraceProperties[i]);
-							if (prop == null) {
-								msg.append(this.iIndicationTraceProperties[i]);
-								msg.append(" not a property;");
-							} else {
-								Object value = prop.getValue();
-								if (value == null) {
-									msg.append(prop.getName());
-									msg.append(" = ;");
-								} else {
-									msg.append(prop.toString().trim());
-								}
-							}
-						}
-						this.iLogger.trace(Level.FINE, msg.toString());
-					}
-
-					if (this.iReliableIndicationsDisabled
-							|| deliverIndication(indicationInst, id, pInetAddress)) {
-						this.iDispatcher.dispatchEvent(new CIMEvent(indicationInst, id,
-								pInetAddress));
-					}
-				}
-			}
-			return null;
-		} catch (Exception e) {
-			return new CIMError(new WBEMException(WBEMException.CIM_ERR_FAILED, "CIM_ERR_FAILED",
-					null, e));
-		}
-	}
-
-	private void buildResponse(CIMClientXML_HelperImpl xmlHelper, MessageWriter pWriter,
-			CIMRequest request, CIMError error) throws HttpException, IOException {
-		Document responseDoc = null;
-		try {
-			DocumentBuilder docBuilder = xmlHelper.getDocumentBuilder();
-			responseDoc = docBuilder.newDocument();
-			CIMXMLBuilderImpl.createIndication_response(responseDoc, request.getId(), error);
-
-		} catch (Exception e) {
-			// TODO: check this error code, may not be appropriate
-			throw new HttpException(400, "Bad Request");
-		}
-		if (this.iSessionProperties.isCimXmlTracingEnabled()
-				|| this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) {
-			OutputStream pos = new ByteArrayOutputStream();
-			CIMClientXML_HelperImpl.dumpDocument(pos, responseDoc, "indication response");
-			OutputStream debugStream = this.iLogger.getXmlTraceStream();
-			if (this.iSessionProperties.isCimXmlTracingEnabled() && debugStream != null) debugStream
-					.write(pos.toString().getBytes());
-			if (this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) this.iLogger.traceCIMXML(
-					Level.FINEST, pos.toString(), true);
-		}
-		CIMClientXML_HelperImpl.serialize(pWriter.getOutputStream(), responseDoc);
-		pWriter.getHeader().addField("CIMExport", "MethodResponse");
-	}
-
-	private static HttpHeader processHttpExtensions(HttpHeader pOriginalHeader) {
-		String man = pOriginalHeader.getField("Man");
-		String opt = pOriginalHeader.getField("Opt");
-		HttpHeader headers = new HttpHeader();
-		String ns = null;
-
-		HttpHeaderParser manOptHeader = null;
-		if (man != null && man.length() > 0) manOptHeader = new HttpHeaderParser(man);
-		else if (opt != null && opt.length() > 0) manOptHeader = new HttpHeaderParser(opt);
-		if (manOptHeader != null) ns = manOptHeader.getValue("ns");
-
-		if (ns != null) {
-
-			Iterator> iter = pOriginalHeader.iterator();
-			String key;
-			while (iter.hasNext()) {
-				Entry entry = iter.next();
-				if (entry != null) {
-					key = entry.getKey().toString();
-					if (key.startsWith(ns + "-")) headers.addParsedField(key.substring(3), entry
-							.getValue().toString());
-					else headers.addParsedField(key, entry.getValue().toString());
-				}
-			}
-		} else {
-			headers = pOriginalHeader;
-		}
-
-		return headers;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2005, 2013
+ 
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+ 
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+ 
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com  
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 17931      2005-07-28  thschaef     Add InetAddress to CIM Event
+ * 1438152    2006-05-15  lupusalex    Wrong message ID in ExportResponseMessage
+ * 1498938    2006-06-01  lupusalex    Multiple events in single cim-xml request are not handled
+ * 1498130    2006-05-31  lupusalex    Selection of xml parser on a per connection basis
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 1565892    2006-11-16  lupusalex    Make SBLIM client JSR48 compliant
+ * 1656285    2007-02-12  ebak         IndicationHandler does not accept non-Integer message ID
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2714989    2009-03-26  blaschke-oss Code cleanup from redundant null check et al
+ * 2901216    2009-12-01  blaschke-oss lost IndicationURL for IndcationListener.indicationOccured
+ * 3185818    2011-02-18  blaschke-oss indicationOccured URL incorrect
+ * 3186176    2011-02-18  blaschke-oss XML response for indication not traced
+ * 3185763    2011-02-25  blaschke-oss Reliable indication support - Phase 1
+ * 3288721    2011-05-20  blaschke-oss Need the function of indication reordering
+ * 3304058    2011-05-20  blaschke-oss Use same date format in change history
+ * 3304953    2011-05-20  blaschke-oss Indication URL mapped to lower case
+ * 3374206    2011-07-22  blaschke-oss NullPointerException caused by Indication
+ * 3376657    2011-07-24  blaschke-oss Get reliable indication properties once
+ * 3390724    2011-08-12  blaschke-oss Problem with Reliable Indication support in the Listener
+ * 3459036    2011-12-13  blaschke-oss Linked list for RI queue not efficient for many LDs
+ * 3485074    2012-02-06  blaschke-oss An Indication trace request
+ * 3484022    2012-02-08  blaschke-oss Turn reliable indication mode on and off based on SC/SN
+ * 3492214    2012-02-23  blaschke-oss Add a SenderIPAddress property indications
+ * 3513228    2012-04-23  blaschke-oss Reliable Indications support can create lots of threads
+ * 3553858    2012-08-06  blaschke-oss Append duplicate HTTP header fields instead of replace
+ * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
+ * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.indications;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMClientXML_HelperImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMRequest;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLBuilderImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLParserImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeaderParser;
+import org.metricshub.wbem.sblim.cimclient.internal.http.MessageReader;
+import org.metricshub.wbem.sblim.cimclient.internal.http.MessageWriter;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader.HeaderEntry;
+import org.metricshub.wbem.sblim.cimclient.internal.http.io.DebugInputStream;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfigurationDefaults;
+import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpContentHandler;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+
+/**
+ * Handles the HTTP connections, providing the necessary interfaces for
+ * CIMListener server.
+ */
+public class CIMIndicationHandler extends HttpContentHandler {
+
+	/**
+	 * DataManager is responsible for background processing of the
+	 * reliable indication queue and cache.
+	 */
+	private class DataManager extends Thread {
+
+		private boolean iAlive = true;
+
+		private LinkedList iLinkedList;
+
+		private Hashtable iHashTable;
+
+		public DataManager(LinkedList pServerList) {
+			this.iLinkedList = pServerList;
+			this.iHashTable = null;
+			setDaemon(true);
+		}
+
+		public DataManager(Hashtable pServerTable) {
+			this.iLinkedList = null;
+			this.iHashTable = pServerTable;
+			setDaemon(true);
+		}
+
+		@Override
+		public void run() {
+			while (this.iAlive) {
+				try {
+					if (this.iLinkedList != null) {
+						ServerListEntry entry;
+						Iterator iterator;
+
+						iterator = this.iLinkedList.iterator();
+						while (iterator.hasNext()) {
+							entry = iterator.next();
+							IndicationServer server = entry.getIndicationServer();
+							if (server != null) {
+								ReliableIndicationHandler handler = server.getRIHandler();
+								if (handler != null) {
+									handler.processAll();
+								}
+							}
+						}
+					} else if (this.iHashTable != null) {
+						Map.Entry entry;
+						Iterator> iterator;
+
+						Set> set = this.iHashTable
+								.entrySet();
+						if (set != null) {
+							iterator = set.iterator();
+							while (iterator.hasNext()) {
+								entry = iterator.next();
+								IndicationServer server = entry.getValue();
+								if (server != null) {
+									ReliableIndicationHandler handler = server.getRIHandler();
+									if (handler != null) {
+										handler.processAll();
+									}
+								}
+							}
+						}
+					}
+					sleep(1000);
+				} catch (Throwable t) {
+					// Expected, ignore and try again
+				}
+			}
+		}
+
+		public void stopRun() {
+			this.iAlive = false;
+		}
+	}
+
+	/**
+	 * IndicationServer represents an entry in the linked list or
+	 * hash table of servers handled by this CIMIndicationHandler
+	 * instance. Each entry in the list/table will have a unique
+	 * serverIP/destinationURL pair along with its own
+	 * ReliableIndicationHandler. This is done to handle multiple
+	 * contexts from the same server.
+	 * 
+	 * NOTE: Multiple contexts from the same server will not be handled
+	 * correctly if the user creates multiple
+	 * CIM_ListenerDestination instances with the same
+	 * Destination property. While this is poor programming
+	 * practice (two different instances with same pertinent information), the
+	 * real issue is that there is no way for the Client to differentiate
+	 * between a context switch and two different contexts if the
+	 * serverIP/destinationURL are the same. This issue it is not covered by
+	 * DSP1054 1.2.
+	 */
+	private class IndicationServer {
+
+		private boolean iRIInitialized = false;
+
+		private ReliableIndicationHandler iRIHandler;
+
+		public IndicationServer() {
+		// initialize() does the work
+		}
+
+		public void initialize(ReliableIndicationHandler pRIHandler) {
+			this.iRIInitialized = true;
+			this.iRIHandler = pRIHandler;
+		}
+
+		public boolean isInitialized() {
+			return this.iRIInitialized;
+		}
+
+		public ReliableIndicationHandler getRIHandler() {
+			return this.iRIHandler;
+		}
+	}
+
+	/**
+	 * ServerListEntry represents a physical entry within the
+	 * linked list. An IndicationServer instance is extracted from
+	 * the linked list by proceeding through each entry in the linked list
+	 * looking for the corresponding server IP and destination URL.
+	 */
+	private class ServerListEntry {
+
+		private InetAddress iInetAddress;
+
+		private String iDestinationUrl;
+
+		private IndicationServer iIndicationServer;
+
+		public ServerListEntry(InetAddress pInetAddress, String pDestinationUrl) {
+			this.iInetAddress = pInetAddress;
+			this.iDestinationUrl = pDestinationUrl;
+			this.iIndicationServer = new IndicationServer();
+		}
+
+		public InetAddress getInetAddress() {
+			return this.iInetAddress;
+		}
+
+		public String getDestinationUrl() {
+			return this.iDestinationUrl;
+		}
+
+		public IndicationServer getIndicationServer() {
+			return this.iIndicationServer;
+		}
+	}
+
+	/**
+	 * ServerTableEntry represents a physical key within the hash
+	 * table while the corresponding IndicationServer is the value
+	 * associated with the key. The hash table key is comprised of a server IP
+	 * and destination URL.
+	 */
+	private class ServerTableEntry {
+
+		private InetAddress iInetAddress;
+
+		private String iDestinationUrl;
+
+		public ServerTableEntry(InetAddress pInetAddress, String pDestinationUrl) {
+			this.iInetAddress = pInetAddress;
+			this.iDestinationUrl = pDestinationUrl;
+		}
+
+		public InetAddress getInetAddress() {
+			return this.iInetAddress;
+		}
+
+		public String getDestinationUrl() {
+			return this.iDestinationUrl;
+		}
+
+		@Override
+		public boolean equals(Object pObj) {
+			if (!(pObj instanceof ServerTableEntry)) return false;
+			ServerTableEntry that = (ServerTableEntry) pObj;
+			if (this.iInetAddress.equals(that.getInetAddress())
+					&& this.iDestinationUrl.equalsIgnoreCase(that.getDestinationUrl())) return true;
+			return false;
+		}
+
+		@Override
+		public int hashCode() {
+			return (this.iInetAddress.hashCode()) ^ (this.iDestinationUrl.hashCode());
+		}
+	}
+
+	private CIMEventDispatcher iDispatcher = null;
+
+	private int iMessageId = 0;
+
+	private LogAndTraceBroker iLogger = LogAndTraceBroker.getBroker();
+
+	private WBEMConfiguration iSessionProperties;
+
+	private boolean iReliableIndicationsDisabled = true;
+
+	private int iHashtableCapacity = 0; // 0 -> linked list, >0 -> hash table
+
+	private LinkedList iServerList;
+
+	private Hashtable iServerTable;
+
+	private String iIndicationTraceClass;
+
+	private String iIndicationTraceProperties[];
+
+	private boolean iAddSenderIPAddress;
+
+	private DataManager iDataManagerThread;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pDispatcher
+	 */
+	public CIMIndicationHandler(CIMEventDispatcher pDispatcher) {
+		this(pDispatcher, null);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pDispatcher
+	 * @param pProperties
+	 */
+	public CIMIndicationHandler(CIMEventDispatcher pDispatcher, WBEMConfiguration pProperties) {
+		this.iDispatcher = pDispatcher;
+		this.iSessionProperties = (pProperties != null) ? pProperties : WBEMConfiguration
+				.getGlobalConfiguration();
+		this.iReliableIndicationsDisabled = !this.iSessionProperties.isReliableIndicationEnabled();
+
+		// Initialize reliable indication support
+		if (!this.iReliableIndicationsDisabled) {
+			this.iHashtableCapacity = this.iSessionProperties
+					.getReliableIndicationHashtableCapacity();
+
+			// Validate ReliableIndicationHashtableCapacity property
+			if (this.iHashtableCapacity < 0 || this.iHashtableCapacity > 25000) {
+				this.iLogger.trace(Level.FINE, "ReliableIndicationHashtableCapacity of "
+						+ this.iHashtableCapacity + " outside range, using default value");
+
+				this.iHashtableCapacity = Integer.valueOf(
+						WBEMConfigurationDefaults.LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY)
+						.intValue();
+			}
+
+			if (this.iHashtableCapacity == 0) {
+				this.iServerList = new LinkedList();
+				this.iDataManagerThread = new DataManager(this.iServerList);
+			} else {
+				this.iServerTable = new Hashtable(
+						this.iHashtableCapacity);
+				this.iDataManagerThread = new DataManager(this.iServerTable);
+			}
+
+			this.iDataManagerThread.start();
+		}
+
+		// Initialize indication trace, if any
+		String filter = this.iSessionProperties.getListenerIndicationTraceFilter();
+		if (filter != null && filter.trim().length() > 0) {
+			// Format: [class:]property[,property]*
+			String properties;
+
+			int colon = filter.indexOf(':');
+			if (colon == -1) {
+				this.iIndicationTraceClass = null;
+				properties = filter;
+			} else {
+				this.iIndicationTraceClass = filter.substring(0, colon).trim().toLowerCase();
+				properties = filter.substring(colon + 1).trim();
+			}
+
+			String[] props = properties.split(",");
+			if (props != null && props.length > 0) {
+				ArrayList a = new ArrayList();
+
+				for (int i = 0; i < props.length; i++) {
+					String prop = props[i].trim().toLowerCase();
+					if (prop != null && prop.length() > 0) {
+						a.add(prop);
+					}
+				}
+
+				if (a.size() > 0) {
+					this.iIndicationTraceProperties = a.toArray(new String[0]);
+
+					if (this.iLogger.isLoggableTrace(Level.INFO)) {
+						StringBuilder msg = new StringBuilder(
+								"Indication trace enabled: class filter=");
+
+						if (this.iIndicationTraceClass != null) {
+							msg.append("\"");
+							msg.append(this.iIndicationTraceClass);
+							msg.append("\"");
+						} else {
+							msg.append("");
+						}
+						msg.append(", properties=");
+						for (int i = 0; i < this.iIndicationTraceProperties.length; i++) {
+							if (i > 0) msg.append(",");
+							msg.append("\"");
+							msg.append(this.iIndicationTraceProperties[i]);
+							msg.append("\"");
+						}
+						this.iLogger.trace(Level.INFO, msg.toString());
+					}
+				} else {
+					this.iIndicationTraceProperties = null;
+				}
+			}
+		}
+
+		this.iAddSenderIPAddress = this.iSessionProperties.getListenerAddSenderIPAddress();
+	}
+
+	@Override
+	protected void finalize() throws Throwable {
+		try {
+			close();
+		} finally {
+			super.finalize();
+		}
+	}
+
+	@Override
+	public void close() {
+		if (this.iDataManagerThread != null) {
+			this.iDataManagerThread.stopRun();
+			this.iDataManagerThread = null;
+		}
+		if (this.iDispatcher != null) {
+			this.iDispatcher.close();
+			this.iDispatcher = null;
+		}
+	}
+
+	/**
+	 * getMsgID
+	 * 
+	 * @return int
+	 */
+	public synchronized int getMsgID() {
+		this.iMessageId++;
+		if (this.iMessageId > 1000000) this.iMessageId = 0;
+		return this.iMessageId;
+	}
+
+	private static HttpHeader processHeader(HttpHeader pHeader, MessageWriter pWriter)
+			throws HttpException {
+
+		HttpHeader header = processHttpExtensions(pHeader);
+		String cimExport = header.getField("CIMExport");
+		String cimOperation = header.getField("CIMOperation");
+
+		if (cimOperation != null && !"METHODCALL".equalsIgnoreCase(cimOperation)) {
+			pWriter.getHeader().addField("CIMError", "unsupported-operation");
+			throw new HttpException(400, "Bad Request");
+		}
+		if (cimExport != null && !"METHODREQUEST".equalsIgnoreCase(cimExport)
+				&& !"EXPORTMETHODCALL".equalsIgnoreCase(cimExport)) {
+			pWriter.getHeader().addField("CIMError", "unsupported-operation");
+			throw new HttpException(400, "Bad Request");
+		}
+		if (cimOperation == null && cimExport == null) {
+			// TODO: verify the status returned by the server for this
+			// situation, is not defined on the spec
+			pWriter.getHeader().addField("CIMError", "unsupported-operation");
+			throw new HttpException(400, "Bad Request");
+		}
+
+		return header;
+	}
+
+	@Override
+	public void handleContent(MessageReader pReader, MessageWriter pWriter,
+			InetAddress pInetAddress, String pLocalAddress) throws HttpException, IOException {
+
+		CIMError error = null;
+
+		// TODO validate CIMHeaders!
+		HttpHeader inputHeader = pReader.getHeader();
+		inputHeader = processHeader(inputHeader, pWriter);
+		LogAndTraceBroker.getBroker().trace(Level.FINER,
+				"Indication Request HTTP Headers= " + inputHeader.toString());
+		String cimMethod = inputHeader.getField("CIMMethod");
+		String cimExport = inputHeader.getField("CIMExport");
+
+		CIMRequest request = null;
+		CIMClientXML_HelperImpl xmlHelper = null;
+
+		try {
+			xmlHelper = new CIMClientXML_HelperImpl();
+		} catch (ParserConfigurationException e1) {
+			IOException e = new IOException("ParserConfigurationException");
+			e.initCause(e1);
+			throw e;
+		}
+
+		InputStream inputstream = null;
+		if ((this.iSessionProperties.isCimXmlTracingEnabled() && LogAndTraceBroker.getBroker()
+				.getXmlTraceStream() != null)
+				|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
+			inputstream = new DebugInputStream(pReader.getInputStream(), LogAndTraceBroker
+					.getBroker().getXmlTraceStream(), "indication request");
+		} else {
+			inputstream = pReader.getInputStream();
+		}
+
+		request = parseDocument(xmlHelper, pReader, inputstream);
+
+		if (request == null) throw new HttpException(400, "Bad Request");
+
+		if ((cimExport == null && !cimMethod.equalsIgnoreCase("Indication"))
+				|| !request.isCIMExport()) { throw new HttpException(400, "Bad Request"); }
+
+		error = dispatchIndications(pReader, pInetAddress, pLocalAddress, request);
+
+		buildResponse(xmlHelper, pWriter, request, error);
+	}
+
+	private CIMRequest parseDocument(CIMClientXML_HelperImpl xmlHelper, MessageReader pReader,
+			InputStream inputstream) throws HttpException {
+
+		// TODO: integrate SAX parser and DOM parser
+
+		Document doc = null;
+		try {
+
+			doc = xmlHelper.parse(new InputSource(new InputStreamReader(inputstream, pReader
+					.getCharacterEncoding())));
+			Element rootE = doc.getDocumentElement();
+			return (CIMRequest) CIMXMLParserImpl.parseCIM(rootE);
+		} catch (Exception e) {
+			this.iLogger.trace(Level.WARNING, "exception while parsing the XML with DOM parser", e);
+			throw new HttpException(400, "Bad Request");
+		}
+	}
+
+	/**
+	 * Returns the corresponding indication server if the server is already
+	 * present in the linked list, otherwise appends the server to the linked
+	 * list and returns the new entry.
+	 * 
+	 * @param pInetAddress
+	 *            Address of indication server.
+	 * @param pDestinationUrl
+	 *            Destination URL of indication.
+	 * @return IndicationServer with given address.
+	 */
+	private IndicationServer getIndicationServerFromList(InetAddress pInetAddress,
+			String pDestinationUrl) {
+		ServerListEntry entry;
+		Iterator iterator = this.iServerList.iterator();
+		while (iterator.hasNext()) {
+			entry = iterator.next();
+			if (entry.getInetAddress().equals(pInetAddress)
+					&& entry.getDestinationUrl().equalsIgnoreCase(pDestinationUrl)) return entry
+					.getIndicationServer();
+		}
+		entry = new ServerListEntry(pInetAddress, pDestinationUrl);
+		this.iServerList.add(entry);
+		this.iLogger.trace(Level.FINE, "Creating reliable indication handler for server IP "
+				+ entry.getInetAddress().toString() + ", destination URL "
+				+ entry.getDestinationUrl() + " in linked list");
+
+		return entry.getIndicationServer();
+	}
+
+	/**
+	 * Returns the corresponding indication server if the server is already
+	 * present in the hash table, otherwise adds the server to the hash table
+	 * and returns the new entry.
+	 * 
+	 * @param pInetAddress
+	 *            Address of indication server.
+	 * @param pDestinationUrl
+	 *            Destination URL of indication.
+	 * @return IndicationServer with given address.
+	 */
+	private IndicationServer getIndicationServerFromTable(InetAddress pInetAddress,
+			String pDestinationUrl) {
+		ServerTableEntry key;
+		IndicationServer server;
+
+		key = new ServerTableEntry(pInetAddress, pDestinationUrl);
+		server = this.iServerTable.get(key);
+		if (server == null) {
+			server = new IndicationServer();
+			this.iServerTable.put(key, server);
+			this.iLogger.trace(Level.FINE, "Creating reliable indication handler for server IP "
+					+ key.getInetAddress().toString() + ", destination URL "
+					+ key.getDestinationUrl() + " in hash table");
+		}
+		return server;
+	}
+
+	/**
+	 * deliverIndication handles reliable indications and returns a boolean
+	 * indicating whether the indication should be delivered or not
+	 * 
+	 * @param pIndication
+	 *            Indication.
+	 * @param pId
+	 *            Indication destination URL.
+	 * @param pInetAddress
+	 *            Indication server IP.
+	 * @return true if indication should be delivered,
+	 *         false if ReliableIndicationHandler will
+	 *         deliver indication
+	 */
+	private synchronized boolean deliverIndication(CIMInstance pIndication, String pId,
+			InetAddress pInetAddress) {
+		IndicationServer server;
+
+		// Each serverIP/destinationURL pair needs its own
+		// ReliableIndicationHandler in order to handle multiple contexts
+		if (this.iHashtableCapacity == 0) {
+			server = getIndicationServerFromList(pInetAddress, pId);
+		} else {
+			server = getIndicationServerFromTable(pInetAddress, pId);
+		}
+
+		// Initialize if not yet done so
+		if (!server.isInitialized()) {
+			// Validate DeliveryRetryAttempts property
+			long attempts = this.iSessionProperties.getListenerDeliveryRetryAttempts();
+			if (attempts <= 0 || attempts > 1000) {
+				this.iLogger.trace(Level.FINE, "DeliveryRetryAttempts of " + attempts
+						+ " outside range, using default value");
+
+				attempts = Long.valueOf(WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_ATTEMPTS)
+						.longValue();
+			}
+
+			// Validate DeliveryRetryInterval property
+			long interval = this.iSessionProperties.getListenerDeliveryRetryInterval();
+			if (interval <= 0 || interval > 86400) {
+				this.iLogger.trace(Level.FINE, "DeliveryRetryInterval of " + interval
+						+ " outside range, using default value");
+
+				interval = Long.valueOf(WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_INTERVAL)
+						.longValue();
+			}
+
+			// Create new ReliableIndicationHandler for this
+			// CIMIndicationHandler
+			server.initialize(new ReliableIndicationHandler(this.iDispatcher, attempts * interval
+					* 10 * 1000));
+
+			this.iLogger
+					.trace(Level.FINE, "Reliable indication support enabled for IP "
+							+ pInetAddress.getHostAddress() + " and URL " + pId
+							+ ", DeliveryRetryAttempts=" + attempts + ", DeliveryRetryInterval="
+							+ interval);
+		}
+
+		// Let ReliableIndicationHandler deliver it
+		server.getRIHandler().handleIndication(pIndication, pId, pInetAddress);
+		return false;
+	}
+
+	private CIMError dispatchIndications(MessageReader pReader, InetAddress pInetAddress,
+			String pLocalAddress, CIMRequest request) {
+		try {
+			Vector paramValue = request.getParamValue();
+			Iterator iter = paramValue.iterator();
+			while (iter.hasNext()) {
+				Object cimEvent = iter.next();
+				if (cimEvent instanceof CIMInstance) {
+					CIMInstance indicationInst = (CIMInstance) cimEvent;
+
+					String path = pReader.getMethod().getFile();
+					String id;
+
+					if (path == null) {
+						id = pLocalAddress + "/";
+					} else if (path.equalsIgnoreCase("/cimom")) {
+						id = path;
+					} else if (path.length() < 4 || !path.regionMatches(true, 0, "http", 0, 4)) {
+						if (path.startsWith("/")) {
+							id = pLocalAddress + path;
+						} else {
+							id = pLocalAddress + "/" + path;
+						}
+					} else /* path.startsWith("http") */{
+						id = path;
+					}
+
+					// Add SenderIPAddress property if enabled
+					if (this.iAddSenderIPAddress) {
+						int size = indicationInst.getPropertyCount();
+						CIMProperty props[] = new CIMProperty[size + 1];
+						for (int i = 0; i < size; i++)
+							props[i] = indicationInst.getProperty(i);
+						props[size] = new CIMProperty("SBLIMJCC_SenderIPAddress",
+								CIMDataType.STRING_T, pInetAddress.getHostAddress());
+						indicationInst = new CIMInstance(indicationInst.getObjectPath(), props);
+					}
+
+					// Do any user-requested indication tracing here
+					if (this.iIndicationTraceProperties != null
+							&& this.iLogger.isLoggableTrace(Level.FINE)
+							&& (this.iIndicationTraceClass == null || indicationInst.getClassName()
+									.toLowerCase().indexOf(this.iIndicationTraceClass) != -1)) {
+						StringBuilder msg = new StringBuilder("Received indication ");
+						msg.append(indicationInst.getClassName());
+						msg.append(" from IP=");
+						String inet = pInetAddress.getHostAddress();
+						msg.append(inet != null ? inet : "");
+						msg.append(" to URL=");
+						msg.append(id);
+						msg.append(" with properties:");
+						for (int i = 0; i < this.iIndicationTraceProperties.length; i++) {
+							msg.append(" ");
+							CIMProperty prop = indicationInst
+									.getProperty(this.iIndicationTraceProperties[i]);
+							if (prop == null) {
+								msg.append(this.iIndicationTraceProperties[i]);
+								msg.append(" not a property;");
+							} else {
+								Object value = prop.getValue();
+								if (value == null) {
+									msg.append(prop.getName());
+									msg.append(" = ;");
+								} else {
+									msg.append(prop.toString().trim());
+								}
+							}
+						}
+						this.iLogger.trace(Level.FINE, msg.toString());
+					}
+
+					if (this.iReliableIndicationsDisabled
+							|| deliverIndication(indicationInst, id, pInetAddress)) {
+						this.iDispatcher.dispatchEvent(new CIMEvent(indicationInst, id,
+								pInetAddress));
+					}
+				}
+			}
+			return null;
+		} catch (Exception e) {
+			return new CIMError(new WBEMException(WBEMException.CIM_ERR_FAILED, "CIM_ERR_FAILED",
+					null, e));
+		}
+	}
+
+	private void buildResponse(CIMClientXML_HelperImpl xmlHelper, MessageWriter pWriter,
+			CIMRequest request, CIMError error) throws HttpException, IOException {
+		Document responseDoc = null;
+		try {
+			DocumentBuilder docBuilder = xmlHelper.getDocumentBuilder();
+			responseDoc = docBuilder.newDocument();
+			CIMXMLBuilderImpl.createIndication_response(responseDoc, request.getId(), error);
+
+		} catch (Exception e) {
+			// TODO: check this error code, may not be appropriate
+			throw new HttpException(400, "Bad Request");
+		}
+		if (this.iSessionProperties.isCimXmlTracingEnabled()
+				|| this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) {
+			OutputStream pos = new ByteArrayOutputStream();
+			CIMClientXML_HelperImpl.dumpDocument(pos, responseDoc, "indication response");
+			OutputStream debugStream = this.iLogger.getXmlTraceStream();
+			if (this.iSessionProperties.isCimXmlTracingEnabled() && debugStream != null) debugStream
+					.write(pos.toString().getBytes());
+			if (this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) this.iLogger.traceCIMXML(
+					Level.FINEST, pos.toString(), true);
+		}
+		CIMClientXML_HelperImpl.serialize(pWriter.getOutputStream(), responseDoc);
+		pWriter.getHeader().addField("CIMExport", "MethodResponse");
+	}
+
+	private static HttpHeader processHttpExtensions(HttpHeader pOriginalHeader) {
+		String man = pOriginalHeader.getField("Man");
+		String opt = pOriginalHeader.getField("Opt");
+		HttpHeader headers = new HttpHeader();
+		String ns = null;
+
+		HttpHeaderParser manOptHeader = null;
+		if (man != null && man.length() > 0) manOptHeader = new HttpHeaderParser(man);
+		else if (opt != null && opt.length() > 0) manOptHeader = new HttpHeaderParser(opt);
+		if (manOptHeader != null) ns = manOptHeader.getValue("ns");
+
+		if (ns != null) {
+
+			Iterator> iter = pOriginalHeader.iterator();
+			String key;
+			while (iter.hasNext()) {
+				Entry entry = iter.next();
+				if (entry != null) {
+					key = entry.getKey().toString();
+					if (key.startsWith(ns + "-")) headers.addParsedField(key.substring(3), entry
+							.getValue().toString());
+					else headers.addParsedField(key, entry.getValue().toString());
+				}
+			}
+		} else {
+			headers = pOriginalHeader;
+		}
+
+		return headers;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/RIHandlerTest.txt b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/RIHandlerTest.txt
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/RIHandlerTest.txt
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/RIHandlerTest.txt
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java
similarity index 92%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java
index 2c8ec62..25522eb 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java
@@ -1,661 +1,658 @@
-/*
-  (C) Copyright IBM Corp. 2011, 2012
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Dave Blaschke, IBM, blaschke@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 3288721    2011-05-20  blaschke-oss Need the function of indication reordering
- * 3376657    2011-07-24  blaschke-oss Get reliable indication properties once
- * 3484022    2012-02-08  blaschke-oss Turn reliable indication mode on and off based on SC/SN
- * 3513228    2012-04-23  blaschke-oss Reliable Indications support can create lots of threads
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.indications;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.InetAddress;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-
-/**
- * ReliableIndicationHandler is responsible for determining when to
- * dispatch reliable indications, which includes queuing unexpected indications,
- * caching all indications for the duration of their sequence identifier
- * lifetime, and logging missing, duplicate and out-of-order indications. This
- * functionality is based on the changes first introduced by DSP1054 v1.1.
- * 
- * The handleIndication, areAllEmpty and
- * processAll methods need to be synchronized because they are the
- * entry points into ReliableIndicationHandler - the first is the
- * public entry point that needs to be passed each and every reliable
- * indication, the other two are only called by the DataManager thread and hence
- * protected. All of the private methods are only called from one of the three
- * synchronized methods.
- * 
- * NOTE: ReliableIndicationHandler does NOT contain any logic for
- * handling sequence number wrapping. It was deemed unnecessary because of the
- * performance impact to each and every indication for a VERY rare occurrence:
- * sequence numbers are longs (signed 64-bit integers) that are are supposed to
- * start at 0, so even if the listener handled 1,000,00 indications per second,
- * it would take over 292,471 years for the sequence number to wrap.
- */
-public class ReliableIndicationHandler {
-
-	/**
-	 * ReliableIndication represents an entry in the indication
-	 * delivery queue, and contains all the information required to manage and
-	 * dispatch the indication. Entries in the queue are stored in order of
-	 * increasing sequence number and are dispatched when the missing
-	 * indication(s) arrive or their sequence identifier lifetime expires. Only
-	 * one sequence context can be in the queue at any one time.
-	 */
-	private class ReliableIndication {
-
-		private long iDiscardTime;
-
-		private String iId;
-
-		private CIMInstance iIndication;
-
-		private InetAddress iInetAddress;
-
-		private long iSequenceNumber;
-
-		public ReliableIndication(CIMInstance pIndication, long pSequenceNumber, long pDiscardTime,
-				String pId, InetAddress pInetAddress) {
-			this.iIndication = pIndication;
-			this.iSequenceNumber = pSequenceNumber;
-			this.iDiscardTime = pDiscardTime;
-			this.iId = pId;
-			this.iInetAddress = pInetAddress;
-		}
-
-		public long getDiscardTime() {
-			return this.iDiscardTime;
-		}
-
-		public String getId() {
-			return this.iId;
-		}
-
-		public CIMInstance getIndication() {
-			return this.iIndication;
-		}
-
-		public InetAddress getInetAddress() {
-			return this.iInetAddress;
-		}
-
-		public long getSequenceNumber() {
-			return this.iSequenceNumber;
-		}
-	}
-
-	/**
-	 * CacheEntry represents an entry in the sequence identifier
-	 * cache. The sequence identifier is comprised of the sequence context and
-	 * sequence number, and must be cached for the duration of the sequence
-	 * identifier lifetime. Entries in the cache are stored in order of
-	 * increasing discard time.
-	 */
-	private class CacheEntry {
-
-		private String iSeqContext;
-
-		private long iSeqNumber;
-
-		private long iDiscardTime;
-
-		public CacheEntry(String pSequenceContext, long pSequenceNumber, long pDiscardTime) {
-			this.iSeqContext = pSequenceContext;
-			this.iSeqNumber = pSequenceNumber;
-			this.iDiscardTime = pDiscardTime;
-		}
-
-		public long getDiscardTime() {
-			return this.iDiscardTime;
-		}
-
-		public String getSequenceContext() {
-			return this.iSeqContext;
-		}
-
-		public long getSequenceNumber() {
-			return this.iSeqNumber;
-		}
-	}
-
-	private LinkedList iQueue = new LinkedList();
-
-	private LinkedList iCache = new LinkedList();
-
-	private CIMEventDispatcher iDispatcher;
-
-	private LogAndTraceBroker iLogger = LogAndTraceBroker.getBroker();
-
-	private long iIndentifierLifetime;
-
-	// private long iLastArrivalTime;
-
-	private String iLastSequenceContext;
-
-	private Long iLastSequenceNumber;
-
-	private long iExpectedSequenceNumber = 0;
-
-	private boolean iIsFirstIndication = true;
-
-	/**
-	 * Constructs a ReliableIndicationHandler instance that uses
-	 * the specified event dispatcher and sequence identifier lifetime to handle
-	 * reliable indications.
-	 * 
-	 * @param pDispatcher
-	 *            CIMEventDispatcher that does the actual
-	 *            indication dispatching.
-	 * @param pIdentiferLifetime
-	 *            Sequence identifier lifetime.
-	 */
-	public ReliableIndicationHandler(CIMEventDispatcher pDispatcher, long pIdentiferLifetime) {
-		this.iDispatcher = pDispatcher;
-		this.iIndentifierLifetime = pIdentiferLifetime;
-	}
-
-	/**
-	 * Adds a reliable indication to the indication delivery queue.
-	 * 
-	 * @param pIndication
-	 *            Reliable indication to be queued for delivery.
-	 */
-	private void addToQueue(ReliableIndication pIndication) {
-		int size = this.iQueue.size();
-
-		if ((size == 0)
-				|| (this.iQueue.getLast().getSequenceNumber()) < pIndication.getSequenceNumber()) {
-			this.iQueue.addLast(pIndication);
-		} else {
-			int i;
-			for (i = size - 1; i >= 0; i--) {
-				ReliableIndication indication = this.iQueue.get(i);
-				if (indication.getSequenceNumber() < pIndication.getSequenceNumber()) {
-					this.iQueue.add(i + 1, pIndication);
-					// printQueue();
-					processQueue();
-					return;
-				}
-			}
-			this.iQueue.addFirst(pIndication);
-		}
-
-		// printQueue();
-		// Process queue if there are two or more entries
-		if (size > 0) processQueue();
-	}
-
-	/**
-	 * Delivers all reliable indications in the indication delivery queue.
-	 */
-	private void flushQueue() {
-		if (this.iQueue.isEmpty()) return;
-		for (int i = this.iQueue.size() - 1; i >= 0; i--) {
-			ReliableIndication indication = this.iQueue.removeFirst();
-			logMissingQueueEntries(indication.getSequenceNumber());
-
-			this.iDispatcher.dispatchEvent(new CIMEvent(indication.getIndication(), indication
-					.getId(), indication.getInetAddress()));
-
-			this.iExpectedSequenceNumber = indication.getSequenceNumber() + 1;
-		}
-	}
-
-	/**
-	 * Determines if the indication delivery queue is empty.
-	 * 
-	 * @return true if indication delivery queue is empty,
-	 *         false otherwise.
-	 */
-	private boolean isQueueEmpty() {
-		return this.iQueue.isEmpty();
-	}
-
-	/**
-	 * Logs any missing reliable indications at the front of the indication
-	 * delivery queue.
-	 * 
-	 * @param pSequenceNumber
-	 *            Sequence number of first indication present in delivery queue.
-	 */
-	private void logMissingQueueEntries(long pSequenceNumber) {
-		if (pSequenceNumber > this.iExpectedSequenceNumber) {
-			for (long l = this.iExpectedSequenceNumber; l < pSequenceNumber; l++) {
-				this.iLogger.trace(Level.FINE, "Missing indication #" + l + " detected");
-			}
-		}
-	}
-
-	/**
-	 * Prints all reliable indications in the indication delivery queue.
-	 */
-	// private void printQueue() {
-	// System.out.println("ReliableInidcation queue >");
-	// for (int i = 0; i < this.iQueue.size(); i++) {
-	// ReliableIndication indication = this.iQueue.get(i);
-	// System.out.println("  Q[" + i + "]: " + indication.getSequenceNumber() +
-	// "@"
-	// + indication.getDiscardTime());
-	// }
-	// }
-	/* */
-
-	/**
-	 * Processes the indication delivery queue and dispatches all reliable
-	 * indications whose sequence identifier lifetime has expired or whose
-	 * sequence numbers are in the expected order.
-	 */
-	private void processQueue() {
-		if (this.iQueue.isEmpty()) return;
-		long currentTime = System.currentTimeMillis();
-
-		ReliableIndication indication = this.iQueue.getFirst();
-
-		// First dispatch all indications whose lifetimes have expired
-		while (indication.getDiscardTime() <= currentTime) {
-			indication = this.iQueue.removeFirst();
-			logMissingQueueEntries(indication.getSequenceNumber());
-
-			this.iDispatcher.dispatchEvent(new CIMEvent(indication.getIndication(), indication
-					.getId(), indication.getInetAddress()));
-
-			this.iExpectedSequenceNumber = indication.getSequenceNumber() + 1;
-
-			if (this.iQueue.isEmpty()) return;
-			indication = this.iQueue.getFirst();
-		}
-
-		// Second dispatch all indications that are in the expected order
-		while (indication.getSequenceNumber() == this.iExpectedSequenceNumber) {
-			indication = this.iQueue.removeFirst();
-
-			this.iDispatcher.dispatchEvent(new CIMEvent(indication.getIndication(), indication
-					.getId(), indication.getInetAddress()));
-
-			this.iExpectedSequenceNumber++;
-
-			if (this.iQueue.isEmpty()) return;
-			indication = this.iQueue.getFirst();
-		}
-	}
-
-	/**
-	 * Adds a reliable indication to the sequence identifier cache.
-	 * 
-	 * @param pSequenceContext
-	 *            Sequence context of reliable indication to be cached.
-	 * @param pSequenceNumber
-	 *            Sequence number of reliable indication to be cached.
-	 * @param pDiscardTime
-	 *            Sequence identifier lifetime expiration time.
-	 */
-	private void addToCache(String pSequenceContext, long pSequenceNumber, long pDiscardTime) {
-		CacheEntry newEntry = new CacheEntry(pSequenceContext, pSequenceNumber, pDiscardTime);
-		int size = this.iCache.size();
-
-		if ((size == 0) || (this.iCache.getLast().getDiscardTime() <= pDiscardTime)) {
-			this.iCache.addLast(newEntry);
-		} else {
-			int i;
-			for (i = size - 1; i >= 0; i--) {
-				CacheEntry entry = this.iCache.get(i);
-				if (entry.getDiscardTime() <= pDiscardTime) {
-					this.iCache.add(i + 1, newEntry);
-					// printCache();
-					return;
-				}
-			}
-			this.iCache.addFirst(newEntry);
-		}
-
-		// printCache();
-	}
-
-	/**
-	 * Removes all entries in the sequence identifier cache.
-	 */
-	// private void flushCache() {
-	// this.iCache.clear();
-	// }
-	/* */
-
-	/**
-	 * Determines if the sequence identifier cache is empty.
-	 * 
-	 * @return true if sequence identifier cache is empty,
-	 *         false otherwise.
-	 */
-	private boolean isCacheEmpty() {
-		return this.iCache.isEmpty();
-	}
-
-	/**
-	 * Determines if the sequence context is in the sequence identifier cache.
-	 * 
-	 * @param pSequenceContext
-	 *            Sequence context to look for.
-	 * @return true if sequence context is in sequence identifier
-	 *         cache, false otherwise.
-	 */
-	private boolean isInCache(String pSequenceContext) {
-		if (this.iCache.isEmpty()) return false;
-		Iterator iterator = this.iCache.iterator();
-		while (iterator.hasNext()) {
-			if (iterator.next().getSequenceContext().compareTo(pSequenceContext) == 0) return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Determines if the sequence identifier (context and number) is in the
-	 * sequence identifier cache.
-	 * 
-	 * @param pSequenceContext
-	 *            Sequence context to look for.
-	 * @param pSequenceNumber
-	 *            Sequence number to look for.
-	 * @return true if sequence identifier is in sequence
-	 *         identifier cache, false otherwise.
-	 */
-	private boolean isInCache(String pSequenceContext, long pSequenceNumber) {
-		if (this.iCache.isEmpty()) return false;
-		Iterator iterator = this.iCache.iterator();
-		while (iterator.hasNext()) {
-			CacheEntry entry = iterator.next();
-			if ((entry.getSequenceContext().compareTo(pSequenceContext) == 0)
-					&& (entry.getSequenceNumber() == pSequenceNumber)) return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Prints all entries in the sequence identifier cache.
-	 */
-	// private void printCache() {
-	// System.out.println("ReliableIndication cache >");
-	// for (int i = 0; i < this.iCache.size(); i++) {
-	// CacheEntry entry = this.iCache.get(i);
-	// System.out.println("  C[" + i + "]: " + entry.getSequenceContext() + ","
-	// + entry.getSequenceNumber() + "@" + entry.getDiscardTime());
-	// }
-	// }
-	/* */
-
-	/**
-	 * Processes the sequence identifier cache and removes all entries whose
-	 * sequence identifier lifetime has expired.
-	 */
-	private void processCache() {
-		if (this.iCache.isEmpty()) return;
-		long currentTime = System.currentTimeMillis();
-
-		for (int i = this.iCache.size() - 1; i >= 0; i--) {
-			if (this.iCache.getFirst().getDiscardTime() > currentTime) break;
-			this.iCache.removeFirst();
-		}
-	}
-
-	/**
-	 * Determines if both the indication delivery queue and sequence identifier
-	 * cache are empty.
-	 * 
-	 * @return true if both the indication delivery queue and
-	 *         sequence identifier cache are empty, false
-	 *         otherwise.
-	 */
-	protected synchronized boolean areAllEmpty() {
-		return isCacheEmpty() && isQueueEmpty();
-	}
-
-	/**
-	 * Flushes both the indication delivery queue and sequence identifier cache.
-	 */
-	// private void flushAll() {
-	// flushQueue();
-	// flushCache();
-	// }
-	/* */
-
-	/**
-	 * Processes both the indication delivery queue and sequence identifier
-	 * cache.
-	 */
-	protected synchronized void processAll() {
-		processQueue();
-		processCache();
-	}
-
-	/**
-	 * Main worker routine for ReliableIndicationHandler. The
-	 * indication is either sent directly to the CIMEventDispatcher
-	 * or placed in the indication delivery queue to be dispatched later. All
-	 * reliable indications are placed in the sequence identifier cache.
-	 * 
-	 * @param pIndication
-	 *            Indication.
-	 * @param pId
-	 *            Indication destination URL.
-	 * @param pInetAddress
-	 *            Indication server IP.
-	 */
-	public synchronized void handleIndication(CIMInstance pIndication, String pId,
-			InetAddress pInetAddress) {
-		// Get current time
-		long arrivalTime = System.currentTimeMillis();
-
-		// Get reliable indication properties from indication
-		CIMProperty seqCtxProp = pIndication.getProperty("SequenceContext");
-		CIMProperty seqNumProp = pIndication.getProperty("SequenceNumber");
-
-		// At this point indication is reliable or not reliable
-
-		// Indication is not reliable, handle appropriately and deliver
-		if (seqCtxProp == null || seqNumProp == null || seqCtxProp.getValue() == null
-				|| seqNumProp.getValue() == null) {
-			// Handle switch from reliable to not reliable
-			if (this.iLastSequenceContext != null) {
-				// Deliver all enqueued indications from previous context
-				flushQueue();
-
-				this.iLastSequenceContext = null;
-				this.iLastSequenceNumber = null;
-			}
-
-			// Deliver indication
-			this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId, pInetAddress));
-			this.iIsFirstIndication = false;
-			return;
-		}
-
-		// At this point indication is reliable
-
-		// Initial indication arrived, save knowledge about sequence identifier
-		// and deliver
-		if (this.iIsFirstIndication) {
-			// Remember sequence context/number and arrival time
-			this.iLastSequenceContext = (String) seqCtxProp.getValue();
-			this.iLastSequenceNumber = (Long) seqNumProp.getValue();
-			this.iExpectedSequenceNumber = this.iLastSequenceNumber.longValue() + 1;
-			// this.iLastArrivalTime = arrivalTime;
-
-			// Cache sequence identifier
-			addToCache(this.iLastSequenceContext, this.iLastSequenceNumber.longValue(), arrivalTime
-					+ this.iIndentifierLifetime);
-
-			// Deliver indication
-			this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId, pInetAddress));
-			this.iIsFirstIndication = false;
-			return;
-		}
-
-		// At this point indication is reliable and previous indication was
-		// reliable
-
-		String seqCtx = (String) seqCtxProp.getValue();
-		Long seqNum = (Long) seqNumProp.getValue();
-		long seqNumVal = seqNum.longValue();
-
-		// Indication arrived after sequence identifier lifetime of previous
-		// indication expired, discard knowledge about previous sequence
-		// identifier and deliver
-		// if (arrivalTime > (this.iLastArrivalTime +
-		// this.iIndentifierLifetime)) {
-		// this.iLogger.trace(Level.FINE,
-		// "Discarding knowledge of previous sequence identifier because lifetime expired");
-
-		// Nothing should be cached or enqueued at this point
-		// flushAll();
-
-		// Remember sequence context/number and arrival time
-		// this.iLastSequenceContext = seqCtx;
-		// this.iLastSequenceNumber = seqNum;
-		// this.iExpectedSequenceNumber = seqNumVal + 1;
-		// this.iLastArrivalTime = arrivalTime;
-
-		// Cache sequence identifier
-		// addToCache(seqCtx, seqNumVal, arrivalTime +
-		// this.iIndentifierLifetime);
-
-		// Deliver indication
-		// this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId,
-		// pInetAddress));
-		// return;
-		// }
-
-		// Indication arrived with different sequence context than expected
-		if (this.iLastSequenceContext == null || seqCtx.compareTo(this.iLastSequenceContext) != 0) {
-			// Cached sequence context indicates this indication arrived
-			// out-of-order from previous context, log and ignore
-			if (isInCache(seqCtx)) {
-				this.iLogger.trace(Level.FINE, "Out-of-order indication #" + seqNumVal
-						+ " received from previous context; indication ignored, logged: "
-						+ pIndication.toString());
-
-				return;
-			}
-
-			this.iLogger.trace(Level.FINE,
-					"Discarding knowledge of previous sequence identifier because context changed");
-
-			// Deliver all enqueued indications from previous context
-			flushQueue();
-
-			// Remember sequence context and arrival time, sequence number
-			// should be zero
-			this.iLastSequenceContext = seqCtx;
-			this.iLastSequenceNumber = Long.valueOf(0);
-			this.iExpectedSequenceNumber = 1;
-			// this.iLastArrivalTime = arrivalTime;
-
-			// Cache sequence identifier
-			addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
-
-			// Expected sequence number, go ahead and deliver
-			if (seqNumVal == 0) {
-				this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId, pInetAddress));
-				return;
-			}
-
-			// Unexpected (non-zero) sequence number, enqueue
-			this.iLastSequenceNumber = Long.valueOf(-1);
-			this.iExpectedSequenceNumber = 0;
-			addToQueue(new ReliableIndication(pIndication, seqNumVal, arrivalTime
-					+ this.iIndentifierLifetime, pId, pInetAddress));
-
-			return;
-		}
-
-		// Indication arrived with expected sequence number, go ahead and
-		// deliver
-		if (seqNumVal == this.iExpectedSequenceNumber) {
-			// Remember sequence context/number and arrival time
-			this.iLastSequenceNumber = seqNum;
-			this.iExpectedSequenceNumber = seqNumVal + 1;
-			// this.iLastArrivalTime = arrivalTime;
-
-			// Cache sequence identifier
-			addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
-
-			// Deliver indication
-			this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId, pInetAddress));
-
-			return;
-		}
-
-		// Duplicate indication arrived, log and ignore
-		if (isInCache(seqCtx, seqNumVal)) {
-			this.iLogger.trace(Level.FINE, "Duplicate indication #" + seqNumVal
-					+ " received; indication ignored");
-
-			// Cache sequence identifier (duplicate entries okay and much easier
-			// than deleting/adding or moving)
-			addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
-
-			return;
-		}
-
-		// Out-of-order indication arrived, log and ignore
-		if (seqNumVal < this.iExpectedSequenceNumber) {
-			this.iLogger.trace(Level.FINE, "Out-of-order indication #" + seqNumVal + " received (#"
-					+ this.iExpectedSequenceNumber + " expected); indication ignored, logged: "
-					+ pIndication.toString());
-
-			// Cache sequence identifier
-			addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
-
-			return;
-		}
-
-		// Indication with higher sequence number than expected received, cache
-		// and enqueue it
-		addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
-		addToQueue(new ReliableIndication(pIndication, seqNumVal, arrivalTime
-				+ this.iIndentifierLifetime, pId, pInetAddress));
-
-		return;
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2011, 2012
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Dave Blaschke, IBM, blaschke@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 3288721    2011-05-20  blaschke-oss Need the function of indication reordering
+ * 3376657    2011-07-24  blaschke-oss Get reliable indication properties once
+ * 3484022    2012-02-08  blaschke-oss Turn reliable indication mode on and off based on SC/SN
+ * 3513228    2012-04-23  blaschke-oss Reliable Indications support can create lots of threads
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.indications;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.InetAddress;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+
+/**
+ * ReliableIndicationHandler is responsible for determining when to
+ * dispatch reliable indications, which includes queuing unexpected indications,
+ * caching all indications for the duration of their sequence identifier
+ * lifetime, and logging missing, duplicate and out-of-order indications. This
+ * functionality is based on the changes first introduced by DSP1054 v1.1.
+ * 
+ * The handleIndication, areAllEmpty and
+ * processAll methods need to be synchronized because they are the
+ * entry points into ReliableIndicationHandler - the first is the
+ * public entry point that needs to be passed each and every reliable
+ * indication, the other two are only called by the DataManager thread and hence
+ * protected. All of the private methods are only called from one of the three
+ * synchronized methods.
+ * 
+ * NOTE: ReliableIndicationHandler does NOT contain any logic for
+ * handling sequence number wrapping. It was deemed unnecessary because of the
+ * performance impact to each and every indication for a VERY rare occurrence:
+ * sequence numbers are longs (signed 64-bit integers) that are are supposed to
+ * start at 0, so even if the listener handled 1,000,00 indications per second,
+ * it would take over 292,471 years for the sequence number to wrap.
+ */
+public class ReliableIndicationHandler {
+
+	/**
+	 * ReliableIndication represents an entry in the indication
+	 * delivery queue, and contains all the information required to manage and
+	 * dispatch the indication. Entries in the queue are stored in order of
+	 * increasing sequence number and are dispatched when the missing
+	 * indication(s) arrive or their sequence identifier lifetime expires. Only
+	 * one sequence context can be in the queue at any one time.
+	 */
+	private class ReliableIndication {
+
+		private long iDiscardTime;
+
+		private String iId;
+
+		private CIMInstance iIndication;
+
+		private InetAddress iInetAddress;
+
+		private long iSequenceNumber;
+
+		public ReliableIndication(CIMInstance pIndication, long pSequenceNumber, long pDiscardTime,
+				String pId, InetAddress pInetAddress) {
+			this.iIndication = pIndication;
+			this.iSequenceNumber = pSequenceNumber;
+			this.iDiscardTime = pDiscardTime;
+			this.iId = pId;
+			this.iInetAddress = pInetAddress;
+		}
+
+		public long getDiscardTime() {
+			return this.iDiscardTime;
+		}
+
+		public String getId() {
+			return this.iId;
+		}
+
+		public CIMInstance getIndication() {
+			return this.iIndication;
+		}
+
+		public InetAddress getInetAddress() {
+			return this.iInetAddress;
+		}
+
+		public long getSequenceNumber() {
+			return this.iSequenceNumber;
+		}
+	}
+
+	/**
+	 * CacheEntry represents an entry in the sequence identifier
+	 * cache. The sequence identifier is comprised of the sequence context and
+	 * sequence number, and must be cached for the duration of the sequence
+	 * identifier lifetime. Entries in the cache are stored in order of
+	 * increasing discard time.
+	 */
+	private class CacheEntry {
+
+		private String iSeqContext;
+
+		private long iSeqNumber;
+
+		private long iDiscardTime;
+
+		public CacheEntry(String pSequenceContext, long pSequenceNumber, long pDiscardTime) {
+			this.iSeqContext = pSequenceContext;
+			this.iSeqNumber = pSequenceNumber;
+			this.iDiscardTime = pDiscardTime;
+		}
+
+		public long getDiscardTime() {
+			return this.iDiscardTime;
+		}
+
+		public String getSequenceContext() {
+			return this.iSeqContext;
+		}
+
+		public long getSequenceNumber() {
+			return this.iSeqNumber;
+		}
+	}
+
+	private LinkedList iQueue = new LinkedList();
+
+	private LinkedList iCache = new LinkedList();
+
+	private CIMEventDispatcher iDispatcher;
+
+	private LogAndTraceBroker iLogger = LogAndTraceBroker.getBroker();
+
+	private long iIndentifierLifetime;
+
+	// private long iLastArrivalTime;
+
+	private String iLastSequenceContext;
+
+	private Long iLastSequenceNumber;
+
+	private long iExpectedSequenceNumber = 0;
+
+	private boolean iIsFirstIndication = true;
+
+	/**
+	 * Constructs a ReliableIndicationHandler instance that uses
+	 * the specified event dispatcher and sequence identifier lifetime to handle
+	 * reliable indications.
+	 * 
+	 * @param pDispatcher
+	 *            CIMEventDispatcher that does the actual
+	 *            indication dispatching.
+	 * @param pIdentiferLifetime
+	 *            Sequence identifier lifetime.
+	 */
+	public ReliableIndicationHandler(CIMEventDispatcher pDispatcher, long pIdentiferLifetime) {
+		this.iDispatcher = pDispatcher;
+		this.iIndentifierLifetime = pIdentiferLifetime;
+	}
+
+	/**
+	 * Adds a reliable indication to the indication delivery queue.
+	 * 
+	 * @param pIndication
+	 *            Reliable indication to be queued for delivery.
+	 */
+	private void addToQueue(ReliableIndication pIndication) {
+		int size = this.iQueue.size();
+
+		if ((size == 0)
+				|| (this.iQueue.getLast().getSequenceNumber()) < pIndication.getSequenceNumber()) {
+			this.iQueue.addLast(pIndication);
+		} else {
+			int i;
+			for (i = size - 1; i >= 0; i--) {
+				ReliableIndication indication = this.iQueue.get(i);
+				if (indication.getSequenceNumber() < pIndication.getSequenceNumber()) {
+					this.iQueue.add(i + 1, pIndication);
+					// printQueue();
+					processQueue();
+					return;
+				}
+			}
+			this.iQueue.addFirst(pIndication);
+		}
+
+		// printQueue();
+		// Process queue if there are two or more entries
+		if (size > 0) processQueue();
+	}
+
+	/**
+	 * Delivers all reliable indications in the indication delivery queue.
+	 */
+	private void flushQueue() {
+		if (this.iQueue.isEmpty()) return;
+		for (int i = this.iQueue.size() - 1; i >= 0; i--) {
+			ReliableIndication indication = this.iQueue.removeFirst();
+			logMissingQueueEntries(indication.getSequenceNumber());
+
+			this.iDispatcher.dispatchEvent(new CIMEvent(indication.getIndication(), indication
+					.getId(), indication.getInetAddress()));
+
+			this.iExpectedSequenceNumber = indication.getSequenceNumber() + 1;
+		}
+	}
+
+	/**
+	 * Determines if the indication delivery queue is empty.
+	 * 
+	 * @return true if indication delivery queue is empty,
+	 *         false otherwise.
+	 */
+	private boolean isQueueEmpty() {
+		return this.iQueue.isEmpty();
+	}
+
+	/**
+	 * Logs any missing reliable indications at the front of the indication
+	 * delivery queue.
+	 * 
+	 * @param pSequenceNumber
+	 *            Sequence number of first indication present in delivery queue.
+	 */
+	private void logMissingQueueEntries(long pSequenceNumber) {
+		if (pSequenceNumber > this.iExpectedSequenceNumber) {
+			for (long l = this.iExpectedSequenceNumber; l < pSequenceNumber; l++) {
+				this.iLogger.trace(Level.FINE, "Missing indication #" + l + " detected");
+			}
+		}
+	}
+
+	/**
+	 * Prints all reliable indications in the indication delivery queue.
+	 */
+	// private void printQueue() {
+	// System.out.println("ReliableInidcation queue >");
+	// for (int i = 0; i < this.iQueue.size(); i++) {
+	// ReliableIndication indication = this.iQueue.get(i);
+	// System.out.println("  Q[" + i + "]: " + indication.getSequenceNumber() +
+	// "@"
+	// + indication.getDiscardTime());
+	// }
+	// }
+	/* */
+
+	/**
+	 * Processes the indication delivery queue and dispatches all reliable
+	 * indications whose sequence identifier lifetime has expired or whose
+	 * sequence numbers are in the expected order.
+	 */
+	private void processQueue() {
+		if (this.iQueue.isEmpty()) return;
+		long currentTime = System.currentTimeMillis();
+
+		ReliableIndication indication = this.iQueue.getFirst();
+
+		// First dispatch all indications whose lifetimes have expired
+		while (indication.getDiscardTime() <= currentTime) {
+			indication = this.iQueue.removeFirst();
+			logMissingQueueEntries(indication.getSequenceNumber());
+
+			this.iDispatcher.dispatchEvent(new CIMEvent(indication.getIndication(), indication
+					.getId(), indication.getInetAddress()));
+
+			this.iExpectedSequenceNumber = indication.getSequenceNumber() + 1;
+
+			if (this.iQueue.isEmpty()) return;
+			indication = this.iQueue.getFirst();
+		}
+
+		// Second dispatch all indications that are in the expected order
+		while (indication.getSequenceNumber() == this.iExpectedSequenceNumber) {
+			indication = this.iQueue.removeFirst();
+
+			this.iDispatcher.dispatchEvent(new CIMEvent(indication.getIndication(), indication
+					.getId(), indication.getInetAddress()));
+
+			this.iExpectedSequenceNumber++;
+
+			if (this.iQueue.isEmpty()) return;
+			indication = this.iQueue.getFirst();
+		}
+	}
+
+	/**
+	 * Adds a reliable indication to the sequence identifier cache.
+	 * 
+	 * @param pSequenceContext
+	 *            Sequence context of reliable indication to be cached.
+	 * @param pSequenceNumber
+	 *            Sequence number of reliable indication to be cached.
+	 * @param pDiscardTime
+	 *            Sequence identifier lifetime expiration time.
+	 */
+	private void addToCache(String pSequenceContext, long pSequenceNumber, long pDiscardTime) {
+		CacheEntry newEntry = new CacheEntry(pSequenceContext, pSequenceNumber, pDiscardTime);
+		int size = this.iCache.size();
+
+		if ((size == 0) || (this.iCache.getLast().getDiscardTime() <= pDiscardTime)) {
+			this.iCache.addLast(newEntry);
+		} else {
+			int i;
+			for (i = size - 1; i >= 0; i--) {
+				CacheEntry entry = this.iCache.get(i);
+				if (entry.getDiscardTime() <= pDiscardTime) {
+					this.iCache.add(i + 1, newEntry);
+					// printCache();
+					return;
+				}
+			}
+			this.iCache.addFirst(newEntry);
+		}
+
+		// printCache();
+	}
+
+	/**
+	 * Removes all entries in the sequence identifier cache.
+	 */
+	// private void flushCache() {
+	// this.iCache.clear();
+	// }
+	/* */
+
+	/**
+	 * Determines if the sequence identifier cache is empty.
+	 * 
+	 * @return true if sequence identifier cache is empty,
+	 *         false otherwise.
+	 */
+	private boolean isCacheEmpty() {
+		return this.iCache.isEmpty();
+	}
+
+	/**
+	 * Determines if the sequence context is in the sequence identifier cache.
+	 * 
+	 * @param pSequenceContext
+	 *            Sequence context to look for.
+	 * @return true if sequence context is in sequence identifier
+	 *         cache, false otherwise.
+	 */
+	private boolean isInCache(String pSequenceContext) {
+		if (this.iCache.isEmpty()) return false;
+		Iterator iterator = this.iCache.iterator();
+		while (iterator.hasNext()) {
+			if (iterator.next().getSequenceContext().compareTo(pSequenceContext) == 0) return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Determines if the sequence identifier (context and number) is in the
+	 * sequence identifier cache.
+	 * 
+	 * @param pSequenceContext
+	 *            Sequence context to look for.
+	 * @param pSequenceNumber
+	 *            Sequence number to look for.
+	 * @return true if sequence identifier is in sequence
+	 *         identifier cache, false otherwise.
+	 */
+	private boolean isInCache(String pSequenceContext, long pSequenceNumber) {
+		if (this.iCache.isEmpty()) return false;
+		Iterator iterator = this.iCache.iterator();
+		while (iterator.hasNext()) {
+			CacheEntry entry = iterator.next();
+			if ((entry.getSequenceContext().compareTo(pSequenceContext) == 0)
+					&& (entry.getSequenceNumber() == pSequenceNumber)) return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Prints all entries in the sequence identifier cache.
+	 */
+	// private void printCache() {
+	// System.out.println("ReliableIndication cache >");
+	// for (int i = 0; i < this.iCache.size(); i++) {
+	// CacheEntry entry = this.iCache.get(i);
+	// System.out.println("  C[" + i + "]: " + entry.getSequenceContext() + ","
+	// + entry.getSequenceNumber() + "@" + entry.getDiscardTime());
+	// }
+	// }
+	/* */
+
+	/**
+	 * Processes the sequence identifier cache and removes all entries whose
+	 * sequence identifier lifetime has expired.
+	 */
+	private void processCache() {
+		if (this.iCache.isEmpty()) return;
+		long currentTime = System.currentTimeMillis();
+
+		for (int i = this.iCache.size() - 1; i >= 0; i--) {
+			if (this.iCache.getFirst().getDiscardTime() > currentTime) break;
+			this.iCache.removeFirst();
+		}
+	}
+
+	/**
+	 * Determines if both the indication delivery queue and sequence identifier
+	 * cache are empty.
+	 * 
+	 * @return true if both the indication delivery queue and
+	 *         sequence identifier cache are empty, false
+	 *         otherwise.
+	 */
+	protected synchronized boolean areAllEmpty() {
+		return isCacheEmpty() && isQueueEmpty();
+	}
+
+	/**
+	 * Flushes both the indication delivery queue and sequence identifier cache.
+	 */
+	// private void flushAll() {
+	// flushQueue();
+	// flushCache();
+	// }
+	/* */
+
+	/**
+	 * Processes both the indication delivery queue and sequence identifier
+	 * cache.
+	 */
+	protected synchronized void processAll() {
+		processQueue();
+		processCache();
+	}
+
+	/**
+	 * Main worker routine for ReliableIndicationHandler. The
+	 * indication is either sent directly to the CIMEventDispatcher
+	 * or placed in the indication delivery queue to be dispatched later. All
+	 * reliable indications are placed in the sequence identifier cache.
+	 * 
+	 * @param pIndication
+	 *            Indication.
+	 * @param pId
+	 *            Indication destination URL.
+	 * @param pInetAddress
+	 *            Indication server IP.
+	 */
+	public synchronized void handleIndication(CIMInstance pIndication, String pId,
+			InetAddress pInetAddress) {
+		// Get current time
+		long arrivalTime = System.currentTimeMillis();
+
+		// Get reliable indication properties from indication
+		CIMProperty seqCtxProp = pIndication.getProperty("SequenceContext");
+		CIMProperty seqNumProp = pIndication.getProperty("SequenceNumber");
+
+		// At this point indication is reliable or not reliable
+
+		// Indication is not reliable, handle appropriately and deliver
+		if (seqCtxProp == null || seqNumProp == null || seqCtxProp.getValue() == null
+				|| seqNumProp.getValue() == null) {
+			// Handle switch from reliable to not reliable
+			if (this.iLastSequenceContext != null) {
+				// Deliver all enqueued indications from previous context
+				flushQueue();
+
+				this.iLastSequenceContext = null;
+				this.iLastSequenceNumber = null;
+			}
+
+			// Deliver indication
+			this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId, pInetAddress));
+			this.iIsFirstIndication = false;
+			return;
+		}
+
+		// At this point indication is reliable
+
+		// Initial indication arrived, save knowledge about sequence identifier
+		// and deliver
+		if (this.iIsFirstIndication) {
+			// Remember sequence context/number and arrival time
+			this.iLastSequenceContext = (String) seqCtxProp.getValue();
+			this.iLastSequenceNumber = (Long) seqNumProp.getValue();
+			this.iExpectedSequenceNumber = this.iLastSequenceNumber.longValue() + 1;
+			// this.iLastArrivalTime = arrivalTime;
+
+			// Cache sequence identifier
+			addToCache(this.iLastSequenceContext, this.iLastSequenceNumber.longValue(), arrivalTime
+					+ this.iIndentifierLifetime);
+
+			// Deliver indication
+			this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId, pInetAddress));
+			this.iIsFirstIndication = false;
+			return;
+		}
+
+		// At this point indication is reliable and previous indication was
+		// reliable
+
+		String seqCtx = (String) seqCtxProp.getValue();
+		Long seqNum = (Long) seqNumProp.getValue();
+		long seqNumVal = seqNum.longValue();
+
+		// Indication arrived after sequence identifier lifetime of previous
+		// indication expired, discard knowledge about previous sequence
+		// identifier and deliver
+		// if (arrivalTime > (this.iLastArrivalTime +
+		// this.iIndentifierLifetime)) {
+		// this.iLogger.trace(Level.FINE,
+		// "Discarding knowledge of previous sequence identifier because lifetime expired");
+
+		// Nothing should be cached or enqueued at this point
+		// flushAll();
+
+		// Remember sequence context/number and arrival time
+		// this.iLastSequenceContext = seqCtx;
+		// this.iLastSequenceNumber = seqNum;
+		// this.iExpectedSequenceNumber = seqNumVal + 1;
+		// this.iLastArrivalTime = arrivalTime;
+
+		// Cache sequence identifier
+		// addToCache(seqCtx, seqNumVal, arrivalTime +
+		// this.iIndentifierLifetime);
+
+		// Deliver indication
+		// this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId,
+		// pInetAddress));
+		// return;
+		// }
+
+		// Indication arrived with different sequence context than expected
+		if (this.iLastSequenceContext == null || seqCtx.compareTo(this.iLastSequenceContext) != 0) {
+			// Cached sequence context indicates this indication arrived
+			// out-of-order from previous context, log and ignore
+			if (isInCache(seqCtx)) {
+				this.iLogger.trace(Level.FINE, "Out-of-order indication #" + seqNumVal
+						+ " received from previous context; indication ignored, logged: "
+						+ pIndication.toString());
+
+				return;
+			}
+
+			this.iLogger.trace(Level.FINE,
+					"Discarding knowledge of previous sequence identifier because context changed");
+
+			// Deliver all enqueued indications from previous context
+			flushQueue();
+
+			// Remember sequence context and arrival time, sequence number
+			// should be zero
+			this.iLastSequenceContext = seqCtx;
+			this.iLastSequenceNumber = Long.valueOf(0);
+			this.iExpectedSequenceNumber = 1;
+			// this.iLastArrivalTime = arrivalTime;
+
+			// Cache sequence identifier
+			addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
+
+			// Expected sequence number, go ahead and deliver
+			if (seqNumVal == 0) {
+				this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId, pInetAddress));
+				return;
+			}
+
+			// Unexpected (non-zero) sequence number, enqueue
+			this.iLastSequenceNumber = Long.valueOf(-1);
+			this.iExpectedSequenceNumber = 0;
+			addToQueue(new ReliableIndication(pIndication, seqNumVal, arrivalTime
+					+ this.iIndentifierLifetime, pId, pInetAddress));
+
+			return;
+		}
+
+		// Indication arrived with expected sequence number, go ahead and
+		// deliver
+		if (seqNumVal == this.iExpectedSequenceNumber) {
+			// Remember sequence context/number and arrival time
+			this.iLastSequenceNumber = seqNum;
+			this.iExpectedSequenceNumber = seqNumVal + 1;
+			// this.iLastArrivalTime = arrivalTime;
+
+			// Cache sequence identifier
+			addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
+
+			// Deliver indication
+			this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId, pInetAddress));
+
+			return;
+		}
+
+		// Duplicate indication arrived, log and ignore
+		if (isInCache(seqCtx, seqNumVal)) {
+			this.iLogger.trace(Level.FINE, "Duplicate indication #" + seqNumVal
+					+ " received; indication ignored");
+
+			// Cache sequence identifier (duplicate entries okay and much easier
+			// than deleting/adding or moving)
+			addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
+
+			return;
+		}
+
+		// Out-of-order indication arrived, log and ignore
+		if (seqNumVal < this.iExpectedSequenceNumber) {
+			this.iLogger.trace(Level.FINE, "Out-of-order indication #" + seqNumVal + " received (#"
+					+ this.iExpectedSequenceNumber + " expected); indication ignored, logged: "
+					+ pIndication.toString());
+
+			// Cache sequence identifier
+			addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
+
+			return;
+		}
+
+		// Indication with higher sequence number than expected received, cache
+		// and enqueue it
+		addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
+		addToQueue(new ReliableIndication(pIndication, seqNumVal, arrivalTime
+				+ this.iIndentifierLifetime, pId, pInetAddress));
+
+		return;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/indications/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java
similarity index 72%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java
index e844142..9ce5a38 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java
@@ -1,122 +1,120 @@
-/*
-  CIMAssociatorNamesOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * @author Roberto
- * 
- *         To change the template for this generated type comment go to
- *         Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class CIMAssociatorNamesOp extends CIMOperation {
-
-	protected String iAssociationClass;
-
-	protected String iResultClass;
-
-	protected String iRole;
-
-	protected String iResultRole;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pAssociationClass
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pResultRole
-	 */
-	public CIMAssociatorNamesOp(CIMObjectPath pObjectName, String pAssociationClass,
-			String pResultClass, String pRole, String pResultRole) {
-
-		this.iMethodCall = "AssociatorNames";
-		this.iObjectName = pObjectName;
-		this.iAssociationClass = pAssociationClass;
-		this.iResultClass = pResultClass;
-		this.iRole = pRole;
-	}
-
-	/**
-	 * Returns the association class name
-	 * 
-	 * @return The association class name
-	 */
-	public String getAssocClass() {
-		return this.iAssociationClass;
-	}
-
-	/**
-	 * Returns the result class name
-	 * 
-	 * @return The result class name
-	 */
-	public String getResultClass() {
-		return this.iResultClass;
-	}
-
-	/**
-	 * Returns the result role
-	 * 
-	 * @return The result role
-	 */
-	public String getResultRole() {
-		return this.iResultRole;
-	}
-
-	/**
-	 * Returns the role
-	 * 
-	 * @return The role
-	 */
-	public String getRole() {
-		return this.iRole;
-	}
-
-}
+/*
+  CIMAssociatorNamesOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * @author Roberto
+ * 
+ *         To change the template for this generated type comment go to
+ *         Window>Preferences>Java>Code Generation>Code and Comments
+ */
+public class CIMAssociatorNamesOp extends CIMOperation {
+
+	protected String iAssociationClass;
+
+	protected String iResultClass;
+
+	protected String iRole;
+
+	protected String iResultRole;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pAssociationClass
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pResultRole
+	 */
+	public CIMAssociatorNamesOp(CIMObjectPath pObjectName, String pAssociationClass,
+			String pResultClass, String pRole, String pResultRole) {
+
+		this.iMethodCall = "AssociatorNames";
+		this.iObjectName = pObjectName;
+		this.iAssociationClass = pAssociationClass;
+		this.iResultClass = pResultClass;
+		this.iRole = pRole;
+	}
+
+	/**
+	 * Returns the association class name
+	 * 
+	 * @return The association class name
+	 */
+	public String getAssocClass() {
+		return this.iAssociationClass;
+	}
+
+	/**
+	 * Returns the result class name
+	 * 
+	 * @return The result class name
+	 */
+	public String getResultClass() {
+		return this.iResultClass;
+	}
+
+	/**
+	 * Returns the result role
+	 * 
+	 * @return The result role
+	 */
+	public String getResultRole() {
+		return this.iResultRole;
+	}
+
+	/**
+	 * Returns the role
+	 * 
+	 * @return The role
+	 */
+	public String getRole() {
+		return this.iRole;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java
index 5fe4e4d..7620e9d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java
@@ -1,160 +1,158 @@
-/*
-  CIMAssociatorsOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * Class CIMAssociatorsOp
- * 
- */
-public class CIMAssociatorsOp extends CIMOperation {
-
-	protected String iAssociationClass;
-
-	protected String iResultClass;
-
-	protected String iRole;
-
-	protected String iResultRole;
-
-	protected boolean iIncludeQualifiers;
-
-	protected boolean iIncludeClassOrigin;
-
-	protected String[] iPropertyList;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pAssociationClass
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pResultRole
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 */
-	public CIMAssociatorsOp(CIMObjectPath pObjectName, String pAssociationClass,
-			String pResultClass, String pRole, String pResultRole, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) {
-
-		this.iMethodCall = "Associators";
-		this.iObjectName = pObjectName;
-		this.iAssociationClass = pAssociationClass;
-		this.iResultClass = pResultClass;
-		this.iRole = pRole;
-		this.iIncludeClassOrigin = pIncludeClassOrigin;
-		this.iIncludeQualifiers = pIncludeQualifiers;
-		this.iPropertyList = pPropertyList;
-	}
-
-	/**
-	 * Returns the association class
-	 * 
-	 * @return The association class
-	 */
-	public String getAssocClass() {
-		return this.iAssociationClass;
-	}
-
-	/**
-	 * Returns if includeQualifiers is set
-	 * 
-	 * @return The value of includeClassOrigin
-	 */
-	public boolean isIncludeClassOrigin() {
-		return this.iIncludeClassOrigin;
-	}
-
-	/**
-	 * Returns if includeQualifiers is set
-	 * 
-	 * @return The value of includeClassOrigin
-	 */
-	public boolean isIncludeQualifiers() {
-		return this.iIncludeQualifiers;
-	}
-
-	/**
-	 * Returns the property list
-	 * 
-	 * @return The property list
-	 */
-	public String[] getPropertyList() {
-		return this.iPropertyList;
-	}
-
-	/**
-	 * Returns the result class
-	 * 
-	 * @return The result class
-	 */
-	public String getResultClass() {
-		return this.iResultClass;
-	}
-
-	/**
-	 * Returns the result role
-	 * 
-	 * @return The result role
-	 */
-	public String getResultRole() {
-		return this.iResultRole;
-	}
-
-	/**
-	 * Returns the role
-	 * 
-	 * @return The role
-	 */
-	public String getRole() {
-		return this.iRole;
-	}
-
-}
+/*
+  CIMAssociatorsOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * Class CIMAssociatorsOp
+ * 
+ */
+public class CIMAssociatorsOp extends CIMOperation {
+
+	protected String iAssociationClass;
+
+	protected String iResultClass;
+
+	protected String iRole;
+
+	protected String iResultRole;
+
+	protected boolean iIncludeQualifiers;
+
+	protected boolean iIncludeClassOrigin;
+
+	protected String[] iPropertyList;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pAssociationClass
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pResultRole
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 */
+	public CIMAssociatorsOp(CIMObjectPath pObjectName, String pAssociationClass,
+			String pResultClass, String pRole, String pResultRole, boolean pIncludeQualifiers,
+			boolean pIncludeClassOrigin, String[] pPropertyList) {
+
+		this.iMethodCall = "Associators";
+		this.iObjectName = pObjectName;
+		this.iAssociationClass = pAssociationClass;
+		this.iResultClass = pResultClass;
+		this.iRole = pRole;
+		this.iIncludeClassOrigin = pIncludeClassOrigin;
+		this.iIncludeQualifiers = pIncludeQualifiers;
+		this.iPropertyList = pPropertyList;
+	}
+
+	/**
+	 * Returns the association class
+	 * 
+	 * @return The association class
+	 */
+	public String getAssocClass() {
+		return this.iAssociationClass;
+	}
+
+	/**
+	 * Returns if includeQualifiers is set
+	 * 
+	 * @return The value of includeClassOrigin
+	 */
+	public boolean isIncludeClassOrigin() {
+		return this.iIncludeClassOrigin;
+	}
+
+	/**
+	 * Returns if includeQualifiers is set
+	 * 
+	 * @return The value of includeClassOrigin
+	 */
+	public boolean isIncludeQualifiers() {
+		return this.iIncludeQualifiers;
+	}
+
+	/**
+	 * Returns the property list
+	 * 
+	 * @return The property list
+	 */
+	public String[] getPropertyList() {
+		return this.iPropertyList;
+	}
+
+	/**
+	 * Returns the result class
+	 * 
+	 * @return The result class
+	 */
+	public String getResultClass() {
+		return this.iResultClass;
+	}
+
+	/**
+	 * Returns the result role
+	 * 
+	 * @return The result role
+	 */
+	public String getResultRole() {
+		return this.iResultRole;
+	}
+
+	/**
+	 * Returns the role
+	 * 
+	 * @return The role
+	 */
+	public String getRole() {
+		return this.iRole;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java
similarity index 63%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java
index 0838f1b..626b73e 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java
@@ -1,80 +1,78 @@
-/*
-  CIMCreateClassOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMCreateClassOp
- * 
- */
-public class CIMCreateClassOp extends CIMOperation {
-
-	protected CIMClass iCimClass;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pCimClass
-	 */
-	public CIMCreateClassOp(CIMObjectPath pObjectName, CIMClass pCimClass) {
-		this.iMethodCall = "CreateClass";
-		this.iObjectName = pObjectName;
-		this.iCimClass = pCimClass;
-	}
-
-	/**
-	 * Returns the CIM class
-	 * 
-	 * @return The CIM class
-	 */
-	public CIMClass getCimClass() {
-		return this.iCimClass;
-	}
-}
+/*
+  CIMCreateClassOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMCreateClassOp
+ * 
+ */
+public class CIMCreateClassOp extends CIMOperation {
+
+	protected CIMClass iCimClass;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pCimClass
+	 */
+	public CIMCreateClassOp(CIMObjectPath pObjectName, CIMClass pCimClass) {
+		this.iMethodCall = "CreateClass";
+		this.iObjectName = pObjectName;
+		this.iCimClass = pCimClass;
+	}
+
+	/**
+	 * Returns the CIM class
+	 * 
+	 * @return The CIM class
+	 */
+	public CIMClass getCimClass() {
+		return this.iCimClass;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java
similarity index 63%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java
index 664a50b..d58ac30 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java
@@ -1,81 +1,79 @@
-/*
-  CIMCreateInstanceOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMCreateInstanceOp
- * 
- */
-public class CIMCreateInstanceOp extends CIMOperation {
-
-	protected CIMInstance iInstance;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pInstance
-	 */
-	public CIMCreateInstanceOp(CIMObjectPath pObjectName, CIMInstance pInstance) {
-		this.iMethodCall = "CreateInstance";
-		this.iObjectName = pObjectName;
-		this.iInstance = pInstance;
-	}
-
-	/**
-	 * Returns the instance
-	 * 
-	 * @return The instance
-	 */
-	public CIMInstance getInstance() {
-		return this.iInstance;
-	}
-
-}
+/*
+  CIMCreateInstanceOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMCreateInstanceOp
+ * 
+ */
+public class CIMCreateInstanceOp extends CIMOperation {
+
+	protected CIMInstance iInstance;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pInstance
+	 */
+	public CIMCreateInstanceOp(CIMObjectPath pObjectName, CIMInstance pInstance) {
+		this.iMethodCall = "CreateInstance";
+		this.iObjectName = pObjectName;
+		this.iInstance = pInstance;
+	}
+
+	/**
+	 * Returns the instance
+	 * 
+	 * @return The instance
+	 */
+	public CIMInstance getInstance() {
+		return this.iInstance;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java
similarity index 63%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java
index 86e6e25..11c5c41 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java
@@ -1,64 +1,62 @@
-/*
-  CIMCreateNameSpaceOp.java
-
-  (C) Copyright IBM Corp. 2005, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3001357    2010-05-18  blaschke-oss CIMDeleteNameSpaceOp name clash
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * CIMCreateNameSpaceOp
- * 
- */
-public class CIMCreateNameSpaceOp extends CIMOperation {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNamespace
-	 */
-	public CIMCreateNameSpaceOp(String pNamespace) {
-		this.iNameSpace = pNamespace;
-	}
-}
+/*
+  CIMCreateNameSpaceOp.java
+
+  (C) Copyright IBM Corp. 2005, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3001357    2010-05-18  blaschke-oss CIMDeleteNameSpaceOp name clash
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * CIMCreateNameSpaceOp
+ * 
+ */
+public class CIMCreateNameSpaceOp extends CIMOperation {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNamespace
+	 */
+	public CIMCreateNameSpaceOp(String pNamespace) {
+		this.iNameSpace = pNamespace;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java
similarity index 65%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java
index 8283c2c..dd501a1 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java
@@ -1,82 +1,80 @@
-/*
-  CIMCreateQualifierTypeOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifierType;
-
-/**
- * CIMCreateQualifierTypeOp
- * 
- */
-public class CIMCreateQualifierTypeOp extends CIMOperation {
-
-	protected CIMQualifierType iQualifierType;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pQualifierType
-	 */
-	public CIMCreateQualifierTypeOp(CIMObjectPath pObjectName, CIMQualifierType pQualifierType) {
-		this.iMethodCall = "CreateQualifier";
-		this.iObjectName = pObjectName;
-		this.iQualifierType = pQualifierType;
-	}
-
-	/**
-	 * Returns the qualifier type
-	 * 
-	 * @return The qualifier type
-	 */
-	public CIMQualifierType getQualifierType() {
-		return this.iQualifierType;
-	}
-
-}
+/*
+  CIMCreateQualifierTypeOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMQualifierType;
+
+/**
+ * CIMCreateQualifierTypeOp
+ * 
+ */
+public class CIMCreateQualifierTypeOp extends CIMOperation {
+
+	protected CIMQualifierType iQualifierType;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pQualifierType
+	 */
+	public CIMCreateQualifierTypeOp(CIMObjectPath pObjectName, CIMQualifierType pQualifierType) {
+		this.iMethodCall = "CreateQualifier";
+		this.iObjectName = pObjectName;
+		this.iQualifierType = pQualifierType;
+	}
+
+	/**
+	 * Returns the qualifier type
+	 * 
+	 * @return The qualifier type
+	 */
+	public CIMQualifierType getQualifierType() {
+		return this.iQualifierType;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java
similarity index 61%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java
index 583e7ee..3a8ce82 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java
@@ -1,66 +1,64 @@
-/*
-  CIMDeleteClassOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMDeleteClassOp
- * 
- */
-public class CIMDeleteClassOp extends CIMOperation {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 */
-	public CIMDeleteClassOp(CIMObjectPath pObjectName) {
-		this.iMethodCall = "DeleteClass";
-		this.iObjectName = pObjectName;
-	}
-}
+/*
+  CIMDeleteClassOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMDeleteClassOp
+ * 
+ */
+public class CIMDeleteClassOp extends CIMOperation {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 */
+	public CIMDeleteClassOp(CIMObjectPath pObjectName) {
+		this.iMethodCall = "DeleteClass";
+		this.iObjectName = pObjectName;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java
similarity index 61%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java
index 94d5e86..f6fb378 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java
@@ -1,66 +1,64 @@
-/*
-  CIMDeleteInstanceOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMDeleteInstanceOp
- * 
- */
-public class CIMDeleteInstanceOp extends CIMOperation {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 */
-	public CIMDeleteInstanceOp(CIMObjectPath pObjectName) {
-		this.iMethodCall = "DeleteInstance";
-		this.iObjectName = pObjectName;
-	}
-}
+/*
+  CIMDeleteInstanceOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMDeleteInstanceOp
+ * 
+ */
+public class CIMDeleteInstanceOp extends CIMOperation {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 */
+	public CIMDeleteInstanceOp(CIMObjectPath pObjectName) {
+		this.iMethodCall = "DeleteInstance";
+		this.iObjectName = pObjectName;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java
similarity index 64%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java
index 48f8daa..083f619 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java
@@ -1,66 +1,64 @@
-/*
-  CIMDeleteNameSpaceOp.java
-
-  (C) Copyright IBM Corp. 2005, 2012
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3001357    2010-05-18  blaschke-oss CIMDeleteNameSpaceOp name clash
- * 3525145    2012-05-09  blaschke-oss Remove CIMDeleteNameSpaceOp.getNamespace
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * CIMDeleteNameSpaceOp
- * 
- */
-public class CIMDeleteNameSpaceOp extends CIMOperation {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNamespace
-	 */
-	public CIMDeleteNameSpaceOp(String pNamespace) {
-		this.iNameSpace = pNamespace;
-	}
-
-}
+/*
+  CIMDeleteNameSpaceOp.java
+
+  (C) Copyright IBM Corp. 2005, 2012
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3001357    2010-05-18  blaschke-oss CIMDeleteNameSpaceOp name clash
+ * 3525145    2012-05-09  blaschke-oss Remove CIMDeleteNameSpaceOp.getNamespace
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * CIMDeleteNameSpaceOp
+ * 
+ */
+public class CIMDeleteNameSpaceOp extends CIMOperation {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNamespace
+	 */
+	public CIMDeleteNameSpaceOp(String pNamespace) {
+		this.iNameSpace = pNamespace;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java
similarity index 62%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java
index 80261fe..936bd83 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java
@@ -1,66 +1,64 @@
-/*
-  CIMDeleteQualifierTypeOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMDeleteQualifierTypeOp
- * 
- */
-public class CIMDeleteQualifierTypeOp extends CIMOperation {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 */
-	public CIMDeleteQualifierTypeOp(CIMObjectPath pObjectName) {
-		this.iMethodCall = "DeleteQualifier";
-		this.iObjectName = pObjectName;
-	}
-}
+/*
+  CIMDeleteQualifierTypeOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMDeleteQualifierTypeOp
+ * 
+ */
+public class CIMDeleteQualifierTypeOp extends CIMOperation {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 */
+	public CIMDeleteQualifierTypeOp(CIMObjectPath pObjectName) {
+		this.iMethodCall = "DeleteQualifier";
+		this.iObjectName = pObjectName;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java
similarity index 64%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java
index 1da8049..bd666a9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java
@@ -1,80 +1,78 @@
-/*
-  CIMEnumClassNamesOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMEnumClassNamesOp
- * 
- */
-public class CIMEnumClassNamesOp extends CIMOperation {
-
-	protected boolean iDeep;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param objectName
-	 * @param deep
-	 */
-	public CIMEnumClassNamesOp(CIMObjectPath objectName, boolean deep) {
-		this.iMethodCall = "EnumerateClassNames";
-		this.iObjectName = objectName;
-		this.iDeep = deep;
-	}
-
-	/**
-	 * Returns deep
-	 * 
-	 * @return The value of deep
-	 */
-	public boolean isDeep() {
-		return this.iDeep;
-	}
-
-}
+/*
+  CIMEnumClassNamesOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMEnumClassNamesOp
+ * 
+ */
+public class CIMEnumClassNamesOp extends CIMOperation {
+
+	protected boolean iDeep;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param objectName
+	 * @param deep
+	 */
+	public CIMEnumClassNamesOp(CIMObjectPath objectName, boolean deep) {
+		this.iMethodCall = "EnumerateClassNames";
+		this.iObjectName = objectName;
+		this.iDeep = deep;
+	}
+
+	/**
+	 * Returns deep
+	 * 
+	 * @return The value of deep
+	 */
+	public boolean isDeep() {
+		return this.iDeep;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java
similarity index 72%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java
index 92c2210..1f4a83f 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java
@@ -1,120 +1,118 @@
-/*
-  CIMEnumClassesOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMEnumClassesOp
- * 
- */
-public class CIMEnumClassesOp extends CIMOperation {
-
-	protected boolean iDeep;
-
-	protected boolean iLocalOnly;
-
-	protected boolean iIncludeQualifiers;
-
-	protected boolean iIncludeClassOrigin;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pDeep
-	 * @param pLocalOnly
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 */
-	public CIMEnumClassesOp(CIMObjectPath pObjectName, boolean pDeep, boolean pLocalOnly,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin) {
-		this.iMethodCall = "EnumerateClasses";
-		this.iObjectName = pObjectName;
-		this.iDeep = pDeep;
-		this.iLocalOnly = pLocalOnly;
-		this.iIncludeClassOrigin = pIncludeClassOrigin;
-		this.iIncludeQualifiers = pIncludeQualifiers;
-	}
-
-	/**
-	 * Returns if deep is set
-	 * 
-	 * @return The value of deep
-	 */
-	public boolean isDeep() {
-		return this.iDeep;
-	}
-
-	/**
-	 * Returns if includeClassOrigin is set
-	 * 
-	 * @return The value of includeClassOrigin
-	 */
-	public boolean isIncludeClassOrigin() {
-		return this.iIncludeClassOrigin;
-	}
-
-	/**
-	 * Returns if includeQualifiers is set
-	 * 
-	 * @return The value of includeQualifiers
-	 */
-	public boolean isIncludeQualifiers() {
-		return this.iIncludeQualifiers;
-	}
-
-	/**
-	 * Returns if localOnly is set
-	 * 
-	 * @return The value of localOnly
-	 */
-	public boolean isLocalOnly() {
-		return this.iLocalOnly;
-	}
-
-}
+/*
+  CIMEnumClassesOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMEnumClassesOp
+ * 
+ */
+public class CIMEnumClassesOp extends CIMOperation {
+
+	protected boolean iDeep;
+
+	protected boolean iLocalOnly;
+
+	protected boolean iIncludeQualifiers;
+
+	protected boolean iIncludeClassOrigin;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pDeep
+	 * @param pLocalOnly
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 */
+	public CIMEnumClassesOp(CIMObjectPath pObjectName, boolean pDeep, boolean pLocalOnly,
+			boolean pIncludeQualifiers, boolean pIncludeClassOrigin) {
+		this.iMethodCall = "EnumerateClasses";
+		this.iObjectName = pObjectName;
+		this.iDeep = pDeep;
+		this.iLocalOnly = pLocalOnly;
+		this.iIncludeClassOrigin = pIncludeClassOrigin;
+		this.iIncludeQualifiers = pIncludeQualifiers;
+	}
+
+	/**
+	 * Returns if deep is set
+	 * 
+	 * @return The value of deep
+	 */
+	public boolean isDeep() {
+		return this.iDeep;
+	}
+
+	/**
+	 * Returns if includeClassOrigin is set
+	 * 
+	 * @return The value of includeClassOrigin
+	 */
+	public boolean isIncludeClassOrigin() {
+		return this.iIncludeClassOrigin;
+	}
+
+	/**
+	 * Returns if includeQualifiers is set
+	 * 
+	 * @return The value of includeQualifiers
+	 */
+	public boolean isIncludeQualifiers() {
+		return this.iIncludeQualifiers;
+	}
+
+	/**
+	 * Returns if localOnly is set
+	 * 
+	 * @return The value of localOnly
+	 */
+	public boolean isLocalOnly() {
+		return this.iLocalOnly;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java
similarity index 62%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java
index 3df329f..272ca83 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java
@@ -1,66 +1,64 @@
-/*
-  CIMEnumInstanceNamesOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMEnumInstanceNamesOp
- * 
- */
-public class CIMEnumInstanceNamesOp extends CIMOperation {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param objectName
-	 */
-	public CIMEnumInstanceNamesOp(CIMObjectPath objectName) {
-		this.iMethodCall = "EnumerateInstanceNames";
-		this.iObjectName = objectName;
-	}
-}
+/*
+  CIMEnumInstanceNamesOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMEnumInstanceNamesOp
+ * 
+ */
+public class CIMEnumInstanceNamesOp extends CIMOperation {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param objectName
+	 */
+	public CIMEnumInstanceNamesOp(CIMObjectPath objectName) {
+		this.iMethodCall = "EnumerateInstanceNames";
+		this.iObjectName = objectName;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java
index 14c5bd6..883015a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java
@@ -1,133 +1,131 @@
-/*
-  CIMEnumInstancesOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMEnumInstancesOp
- * 
- */
-public class CIMEnumInstancesOp extends CIMOperation {
-
-	protected boolean iDeep;
-
-	protected boolean iLocalOnly;
-
-	protected boolean iIncludeQualifiers;
-
-	protected boolean iIncludeClassOrigin;
-
-	protected String[] iPropertyList;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param objectName
-	 * @param deep
-	 * @param localOnly
-	 * @param includeQualifiers
-	 * @param includeClassOrigin
-	 * @param propertyList
-	 */
-	public CIMEnumInstancesOp(CIMObjectPath objectName, boolean deep, boolean localOnly,
-			boolean includeQualifiers, boolean includeClassOrigin, String[] propertyList) {
-		this.iMethodCall = "EnumerateInstances";
-		this.iObjectName = objectName;
-		this.iDeep = deep;
-		this.iLocalOnly = localOnly;
-		this.iIncludeClassOrigin = includeClassOrigin;
-		this.iIncludeQualifiers = includeQualifiers;
-		this.iPropertyList = propertyList;
-	}
-
-	/**
-	 * Returns deep
-	 * 
-	 * @return The value of deep.
-	 */
-	public boolean isDeep() {
-		return this.iDeep;
-	}
-
-	/**
-	 * Returns includeClassOrigin
-	 * 
-	 * @return The value of includeClassOrigin.
-	 */
-	public boolean isIncludeClassOrigin() {
-		return this.iIncludeClassOrigin;
-	}
-
-	/**
-	 * Returns includeQualifiers
-	 * 
-	 * @return The value of includeQualifiers.
-	 */
-	public boolean isIncludeQualifiers() {
-		return this.iIncludeQualifiers;
-	}
-
-	/**
-	 * Returns localOnly
-	 * 
-	 * @return The value of localOnly.
-	 */
-	public boolean isLocalOnly() {
-		return this.iLocalOnly;
-	}
-
-	/**
-	 * Returns propertyList
-	 * 
-	 * @return The value of propertyList.
-	 */
-	public String[] getPropertyList() {
-		return this.iPropertyList;
-	}
-
-}
+/*
+  CIMEnumInstancesOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMEnumInstancesOp
+ * 
+ */
+public class CIMEnumInstancesOp extends CIMOperation {
+
+	protected boolean iDeep;
+
+	protected boolean iLocalOnly;
+
+	protected boolean iIncludeQualifiers;
+
+	protected boolean iIncludeClassOrigin;
+
+	protected String[] iPropertyList;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param objectName
+	 * @param deep
+	 * @param localOnly
+	 * @param includeQualifiers
+	 * @param includeClassOrigin
+	 * @param propertyList
+	 */
+	public CIMEnumInstancesOp(CIMObjectPath objectName, boolean deep, boolean localOnly,
+			boolean includeQualifiers, boolean includeClassOrigin, String[] propertyList) {
+		this.iMethodCall = "EnumerateInstances";
+		this.iObjectName = objectName;
+		this.iDeep = deep;
+		this.iLocalOnly = localOnly;
+		this.iIncludeClassOrigin = includeClassOrigin;
+		this.iIncludeQualifiers = includeQualifiers;
+		this.iPropertyList = propertyList;
+	}
+
+	/**
+	 * Returns deep
+	 * 
+	 * @return The value of deep.
+	 */
+	public boolean isDeep() {
+		return this.iDeep;
+	}
+
+	/**
+	 * Returns includeClassOrigin
+	 * 
+	 * @return The value of includeClassOrigin.
+	 */
+	public boolean isIncludeClassOrigin() {
+		return this.iIncludeClassOrigin;
+	}
+
+	/**
+	 * Returns includeQualifiers
+	 * 
+	 * @return The value of includeQualifiers.
+	 */
+	public boolean isIncludeQualifiers() {
+		return this.iIncludeQualifiers;
+	}
+
+	/**
+	 * Returns localOnly
+	 * 
+	 * @return The value of localOnly.
+	 */
+	public boolean isLocalOnly() {
+		return this.iLocalOnly;
+	}
+
+	/**
+	 * Returns propertyList
+	 * 
+	 * @return The value of propertyList.
+	 */
+	public String[] getPropertyList() {
+		return this.iPropertyList;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java
similarity index 64%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java
index a940053..aec5631 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java
@@ -1,65 +1,63 @@
-/*
-  CIMEnumNameSpaceOp.java
-
-  (C) Copyright IBM Corp. 2005, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3001357    2010-05-18  blaschke-oss CIMDeleteNameSpaceOp name clash
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * CIMEnumNameSpaceOp
- * 
- */
-public class CIMEnumNameSpaceOp extends CIMOperation {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pNamespace
-	 */
-	public CIMEnumNameSpaceOp(String pNamespace) {
-		this.iMethodCall = "EnumNameSpace";
-		this.iNameSpace = pNamespace;
-	}
-}
+/*
+  CIMEnumNameSpaceOp.java
+
+  (C) Copyright IBM Corp. 2005, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3001357    2010-05-18  blaschke-oss CIMDeleteNameSpaceOp name clash
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * CIMEnumNameSpaceOp
+ * 
+ */
+public class CIMEnumNameSpaceOp extends CIMOperation {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pNamespace
+	 */
+	public CIMEnumNameSpaceOp(String pNamespace) {
+		this.iMethodCall = "EnumNameSpace";
+		this.iNameSpace = pNamespace;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java
similarity index 62%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java
index 9b1554b..adadda4 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java
@@ -1,66 +1,64 @@
-/*
-  CIMEnumQualifierTypesOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMEnumQualifierTypesOp
- * 
- */
-public class CIMEnumQualifierTypesOp extends CIMOperation {
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 */
-	public CIMEnumQualifierTypesOp(CIMObjectPath pObjectName) {
-		this.iMethodCall = "EnumerateQualifiers";
-		this.iObjectName = pObjectName;
-	}
-}
+/*
+  CIMEnumQualifierTypesOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMEnumQualifierTypesOp
+ * 
+ */
+public class CIMEnumQualifierTypesOp extends CIMOperation {
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 */
+	public CIMEnumQualifierTypesOp(CIMObjectPath pObjectName) {
+		this.iMethodCall = "EnumerateQualifiers";
+		this.iObjectName = pObjectName;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java
similarity index 67%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java
index bf05624..126446d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java
@@ -1,93 +1,91 @@
-/*
-  CIMExecQueryOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMExecQueryOp
- * 
- */
-public class CIMExecQueryOp extends CIMOperation {
-
-	protected String iQuery;
-
-	protected String iQueryLanguage;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param objectName
-	 * @param query
-	 * @param queryLanguage
-	 */
-	public CIMExecQueryOp(CIMObjectPath objectName, String query, String queryLanguage) {
-		this.iMethodCall = "ExecQuery";
-		this.iObjectName = objectName;
-		this.iQuery = query;
-		this.iQueryLanguage = queryLanguage;
-	}
-
-	/**
-	 * Returns query
-	 * 
-	 * @return The value of query.
-	 */
-	public String getQuery() {
-		return this.iQuery;
-	}
-
-	/**
-	 * Returns queryLanguage
-	 * 
-	 * @return The value of queryLanguage.
-	 */
-	public String getQueryLanguage() {
-		return this.iQueryLanguage;
-	}
-
-}
+/*
+  CIMExecQueryOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMExecQueryOp
+ * 
+ */
+public class CIMExecQueryOp extends CIMOperation {
+
+	protected String iQuery;
+
+	protected String iQueryLanguage;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param objectName
+	 * @param query
+	 * @param queryLanguage
+	 */
+	public CIMExecQueryOp(CIMObjectPath objectName, String query, String queryLanguage) {
+		this.iMethodCall = "ExecQuery";
+		this.iObjectName = objectName;
+		this.iQuery = query;
+		this.iQueryLanguage = queryLanguage;
+	}
+
+	/**
+	 * Returns query
+	 * 
+	 * @return The value of query.
+	 */
+	public String getQuery() {
+		return this.iQuery;
+	}
+
+	/**
+	 * Returns queryLanguage
+	 * 
+	 * @return The value of queryLanguage.
+	 */
+	public String getQueryLanguage() {
+		return this.iQueryLanguage;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java
index 3cf683b..bcd3dcf 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java
@@ -1,121 +1,119 @@
-/*
-  CIMGetClassOp.java
-
-  (C) Copyright IBM Corp. 2005, 2012
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3525150    2012-05-09  blaschke-oss Remove CIMGetClassOp.getPropertyLis
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMGetClassOp
- * 
- */
-public class CIMGetClassOp extends CIMSingleResultOperation {
-
-	protected boolean iLocalOnly;
-
-	protected boolean iIncludeQualifiers;
-
-	protected boolean iIncludeClassOrigin;
-
-	protected String[] iPropertyList;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pLocalOnly
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 */
-	public CIMGetClassOp(CIMObjectPath pObjectName, boolean pLocalOnly, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) {
-
-		this.iMethodCall = "GetClass";
-		this.iObjectName = pObjectName;
-		this.iLocalOnly = pLocalOnly;
-		this.iIncludeClassOrigin = pIncludeClassOrigin;
-		this.iIncludeQualifiers = pIncludeQualifiers;
-	}
-
-	/**
-	 * Returns includeClassOrigin
-	 * 
-	 * @return The value of includeClassOrigin.
-	 */
-	public boolean isIncludeClassOrigin() {
-		return this.iIncludeClassOrigin;
-	}
-
-	/**
-	 * Returns includeQualifiers
-	 * 
-	 * @return The value of includeQualifiers.
-	 */
-	public boolean isIncludeQualifiers() {
-		return this.iIncludeQualifiers;
-	}
-
-	/**
-	 * Returns localOnly
-	 * 
-	 * @return The value of localOnly.
-	 */
-	public boolean isLocalOnly() {
-		return this.iLocalOnly;
-	}
-
-	/**
-	 * Returns propertyList
-	 * 
-	 * @return The value of propertyList.
-	 */
-	public String[] getPropertyList() {
-		return this.iPropertyList;
-	}
-
-}
+/*
+  CIMGetClassOp.java
+
+  (C) Copyright IBM Corp. 2005, 2012
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3525150    2012-05-09  blaschke-oss Remove CIMGetClassOp.getPropertyLis
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMGetClassOp
+ * 
+ */
+public class CIMGetClassOp extends CIMSingleResultOperation {
+
+	protected boolean iLocalOnly;
+
+	protected boolean iIncludeQualifiers;
+
+	protected boolean iIncludeClassOrigin;
+
+	protected String[] iPropertyList;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pLocalOnly
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 */
+	public CIMGetClassOp(CIMObjectPath pObjectName, boolean pLocalOnly, boolean pIncludeQualifiers,
+			boolean pIncludeClassOrigin, String[] pPropertyList) {
+
+		this.iMethodCall = "GetClass";
+		this.iObjectName = pObjectName;
+		this.iLocalOnly = pLocalOnly;
+		this.iIncludeClassOrigin = pIncludeClassOrigin;
+		this.iIncludeQualifiers = pIncludeQualifiers;
+	}
+
+	/**
+	 * Returns includeClassOrigin
+	 * 
+	 * @return The value of includeClassOrigin.
+	 */
+	public boolean isIncludeClassOrigin() {
+		return this.iIncludeClassOrigin;
+	}
+
+	/**
+	 * Returns includeQualifiers
+	 * 
+	 * @return The value of includeQualifiers.
+	 */
+	public boolean isIncludeQualifiers() {
+		return this.iIncludeQualifiers;
+	}
+
+	/**
+	 * Returns localOnly
+	 * 
+	 * @return The value of localOnly.
+	 */
+	public boolean isLocalOnly() {
+		return this.iLocalOnly;
+	}
+
+	/**
+	 * Returns propertyList
+	 * 
+	 * @return The value of propertyList.
+	 */
+	public String[] getPropertyList() {
+		return this.iPropertyList;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java
index c35ba7e..f65275f 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java
@@ -1,120 +1,118 @@
-/*
-  CIMGetInstanceOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMGetInstanceOp
- * 
- */
-public class CIMGetInstanceOp extends CIMSingleResultOperation {
-
-	protected boolean iLocalOnly;
-
-	protected boolean iIncludeQualifiers;
-
-	protected boolean iIncludeClassOrigin;
-
-	protected String[] iPropertyList;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pLocalOnly
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 */
-	public CIMGetInstanceOp(CIMObjectPath pObjectName, boolean pLocalOnly,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList) {
-
-		this.iMethodCall = "GetInstance";
-		this.iObjectName = pObjectName;
-		this.iLocalOnly = pLocalOnly;
-		this.iIncludeClassOrigin = pIncludeClassOrigin;
-		this.iIncludeQualifiers = pIncludeQualifiers;
-		this.iPropertyList = pPropertyList;
-	}
-
-	/**
-	 * Returns includeClassOrigin
-	 * 
-	 * @return The value of includeClassOrigin.
-	 */
-	public boolean isIncludeClassOrigin() {
-		return this.iIncludeClassOrigin;
-	}
-
-	/**
-	 * Returns includeQualifiers
-	 * 
-	 * @return The value of includeQualifiers.
-	 */
-	public boolean isIncludeQualifiers() {
-		return this.iIncludeQualifiers;
-	}
-
-	/**
-	 * Returns localOnly
-	 * 
-	 * @return The value of localOnly.
-	 */
-	public boolean isLocalOnly() {
-		return this.iLocalOnly;
-	}
-
-	/**
-	 * Returns propertyList
-	 * 
-	 * @return The value of propertyList.
-	 */
-	public String[] getPropertyList() {
-		return this.iPropertyList;
-	}
-}
+/*
+  CIMGetInstanceOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMGetInstanceOp
+ * 
+ */
+public class CIMGetInstanceOp extends CIMSingleResultOperation {
+
+	protected boolean iLocalOnly;
+
+	protected boolean iIncludeQualifiers;
+
+	protected boolean iIncludeClassOrigin;
+
+	protected String[] iPropertyList;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pLocalOnly
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 */
+	public CIMGetInstanceOp(CIMObjectPath pObjectName, boolean pLocalOnly,
+			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList) {
+
+		this.iMethodCall = "GetInstance";
+		this.iObjectName = pObjectName;
+		this.iLocalOnly = pLocalOnly;
+		this.iIncludeClassOrigin = pIncludeClassOrigin;
+		this.iIncludeQualifiers = pIncludeQualifiers;
+		this.iPropertyList = pPropertyList;
+	}
+
+	/**
+	 * Returns includeClassOrigin
+	 * 
+	 * @return The value of includeClassOrigin.
+	 */
+	public boolean isIncludeClassOrigin() {
+		return this.iIncludeClassOrigin;
+	}
+
+	/**
+	 * Returns includeQualifiers
+	 * 
+	 * @return The value of includeQualifiers.
+	 */
+	public boolean isIncludeQualifiers() {
+		return this.iIncludeQualifiers;
+	}
+
+	/**
+	 * Returns localOnly
+	 * 
+	 * @return The value of localOnly.
+	 */
+	public boolean isLocalOnly() {
+		return this.iLocalOnly;
+	}
+
+	/**
+	 * Returns propertyList
+	 * 
+	 * @return The value of propertyList.
+	 */
+	public String[] getPropertyList() {
+		return this.iPropertyList;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java
similarity index 65%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java
index 94a7696..929594f 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java
@@ -1,80 +1,78 @@
-/*
-  CIMGetPropertyOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMGetPropertyOp
- * 
- */
-public class CIMGetPropertyOp extends CIMSingleResultOperation {
-
-	protected String iPropertyName;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pPropertyName
-	 */
-	public CIMGetPropertyOp(CIMObjectPath pObjectName, String pPropertyName) {
-		this.iMethodCall = "GetProperty";
-		this.iObjectName = pObjectName;
-		this.iPropertyName = pPropertyName;
-	}
-
-	/**
-	 * Returns propertyName
-	 * 
-	 * @return The value of propertyName.
-	 */
-	public String getPropertyName() {
-		return this.iPropertyName;
-	}
-
-}
+/*
+  CIMGetPropertyOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMGetPropertyOp
+ * 
+ */
+public class CIMGetPropertyOp extends CIMSingleResultOperation {
+
+	protected String iPropertyName;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pPropertyName
+	 */
+	public CIMGetPropertyOp(CIMObjectPath pObjectName, String pPropertyName) {
+		this.iMethodCall = "GetProperty";
+		this.iObjectName = pObjectName;
+		this.iPropertyName = pPropertyName;
+	}
+
+	/**
+	 * Returns propertyName
+	 * 
+	 * @return The value of propertyName.
+	 */
+	public String getPropertyName() {
+		return this.iPropertyName;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java
similarity index 65%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java
index 1730fe5..b4176d9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java
@@ -1,80 +1,78 @@
-/*
-  CIMGetQualifierTypeOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMGetQualifierTypeOp
- * 
- */
-public class CIMGetQualifierTypeOp extends CIMSingleResultOperation {
-
-	protected String iQualifierType;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pQualifierType
-	 */
-	public CIMGetQualifierTypeOp(CIMObjectPath pObjectName, String pQualifierType) {
-		this.iMethodCall = "GetQualifierType";
-		this.iObjectName = pObjectName;
-		this.iQualifierType = pQualifierType;
-	}
-
-	/**
-	 * Returns qualifierType
-	 * 
-	 * @return The value of qualifierType.
-	 */
-	public String getQualifierType() {
-		return this.iQualifierType;
-	}
-
-}
+/*
+  CIMGetQualifierTypeOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMGetQualifierTypeOp
+ * 
+ */
+public class CIMGetQualifierTypeOp extends CIMSingleResultOperation {
+
+	protected String iQualifierType;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pQualifierType
+	 */
+	public CIMGetQualifierTypeOp(CIMObjectPath pObjectName, String pQualifierType) {
+		this.iMethodCall = "GetQualifierType";
+		this.iObjectName = pObjectName;
+		this.iQualifierType = pQualifierType;
+	}
+
+	/**
+	 * Returns qualifierType
+	 * 
+	 * @return The value of qualifierType.
+	 */
+	public String getQualifierType() {
+		return this.iQualifierType;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java
similarity index 69%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java
index 897c171..ac5f8d0 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java
@@ -1,109 +1,107 @@
-/*
-  CIMInvokeMethodOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMArgument;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMInvokeMethodOp
- * 
- */
-public class CIMInvokeMethodOp extends CIMOperation {
-
-	protected String iMethodName;
-
-	protected CIMArgument[] iInParams;
-
-	protected CIMArgument[] iOutParams;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pMethodName
-	 * @param pInParams
-	 * @param pOutParams
-	 */
-	public CIMInvokeMethodOp(CIMObjectPath pObjectName, String pMethodName,
-			CIMArgument[] pInParams, CIMArgument[] pOutParams) {
-		this.iMethodCall = "InvokeMethod";
-		this.iObjectName = pObjectName;
-		this.iMethodName = pMethodName;
-		this.iInParams = pInParams;
-		this.iOutParams = pOutParams;
-	}
-
-	/**
-	 * Returns inParameters
-	 * 
-	 * @return The value of inParameters.
-	 */
-	public CIMArgument[] getInParams() {
-		return this.iInParams;
-	}
-
-	/**
-	 * Returns methodName
-	 * 
-	 * @return The value of methodName.
-	 */
-	public String getMethodName() {
-		return this.iMethodName;
-	}
-
-	/**
-	 * Returns outParameters
-	 * 
-	 * @return The value of outParameters.
-	 */
-	public CIMArgument[] getOutParams() {
-		return this.iOutParams;
-	}
-
-}
+/*
+  CIMInvokeMethodOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMArgument;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMInvokeMethodOp
+ * 
+ */
+public class CIMInvokeMethodOp extends CIMOperation {
+
+	protected String iMethodName;
+
+	protected CIMArgument[] iInParams;
+
+	protected CIMArgument[] iOutParams;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pMethodName
+	 * @param pInParams
+	 * @param pOutParams
+	 */
+	public CIMInvokeMethodOp(CIMObjectPath pObjectName, String pMethodName,
+			CIMArgument[] pInParams, CIMArgument[] pOutParams) {
+		this.iMethodCall = "InvokeMethod";
+		this.iObjectName = pObjectName;
+		this.iMethodName = pMethodName;
+		this.iInParams = pInParams;
+		this.iOutParams = pOutParams;
+	}
+
+	/**
+	 * Returns inParameters
+	 * 
+	 * @return The value of inParameters.
+	 */
+	public CIMArgument[] getInParams() {
+		return this.iInParams;
+	}
+
+	/**
+	 * Returns methodName
+	 * 
+	 * @return The value of methodName.
+	 */
+	public String getMethodName() {
+		return this.iMethodName;
+	}
+
+	/**
+	 * Returns outParameters
+	 * 
+	 * @return The value of outParameters.
+	 */
+	public CIMArgument[] getOutParams() {
+		return this.iOutParams;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java
similarity index 71%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java
index b1cfae4..b119a50 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java
@@ -1,133 +1,131 @@
-/*
-  CIMOperation.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-
-/**
- * CIMOperation
- * 
- */
-public abstract class CIMOperation {
-
-	protected CIMObjectPath iObjectName;
-
-	protected String iNameSpace;
-
-	protected String iMethodCall;
-
-	protected Object iResult;
-
-	/**
-	 * Returns the object name
-	 * 
-	 * @return The object name
-	 */
-	public CIMObjectPath getObjectName() {
-		return this.iObjectName;
-	}
-
-	/**
-	 * Returns the namespace
-	 * 
-	 * @return The namespace
-	 */
-	public String getNameSpace() {
-		return this.iNameSpace;
-	}
-
-	/**
-	 * Sets the namespace
-	 * 
-	 * @param pNamespace
-	 *            The namespace
-	 */
-	public void setNameSpace(String pNamespace) {
-		this.iNameSpace = pNamespace;
-	}
-
-	/**
-	 * Returns the method call
-	 * 
-	 * @return The method call
-	 */
-	public String getMethodCall() {
-		return this.iMethodCall;
-	}
-
-	/**
-	 * Returns if an (uncaught) exception occurred
-	 * 
-	 * @return true if an (uncaught) exception occurred,
-	 *         false otherwise
-	 */
-	public boolean isException() {
-		return (this.iResult instanceof Exception);
-	}
-
-	/**
-	 * Returns the result of the operation
-	 * 
-	 * @return The result
-	 * @throws WBEMException
-	 */
-	public Object getResult() throws WBEMException {
-		if (this.iResult instanceof WBEMException) throw (WBEMException) this.iResult;
-		return this.iResult;
-	}
-
-	/**
-	 * Sets the operation result
-	 * 
-	 * @param pResult
-	 *            The result
-	 */
-	public void setResult(Object pResult) {
-		this.iResult = pResult;
-	}
-}
+/*
+  CIMOperation.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.wbem.WBEMException;
+
+/**
+ * CIMOperation
+ * 
+ */
+public abstract class CIMOperation {
+
+	protected CIMObjectPath iObjectName;
+
+	protected String iNameSpace;
+
+	protected String iMethodCall;
+
+	protected Object iResult;
+
+	/**
+	 * Returns the object name
+	 * 
+	 * @return The object name
+	 */
+	public CIMObjectPath getObjectName() {
+		return this.iObjectName;
+	}
+
+	/**
+	 * Returns the namespace
+	 * 
+	 * @return The namespace
+	 */
+	public String getNameSpace() {
+		return this.iNameSpace;
+	}
+
+	/**
+	 * Sets the namespace
+	 * 
+	 * @param pNamespace
+	 *            The namespace
+	 */
+	public void setNameSpace(String pNamespace) {
+		this.iNameSpace = pNamespace;
+	}
+
+	/**
+	 * Returns the method call
+	 * 
+	 * @return The method call
+	 */
+	public String getMethodCall() {
+		return this.iMethodCall;
+	}
+
+	/**
+	 * Returns if an (uncaught) exception occurred
+	 * 
+	 * @return true if an (uncaught) exception occurred,
+	 *         false otherwise
+	 */
+	public boolean isException() {
+		return (this.iResult instanceof Exception);
+	}
+
+	/**
+	 * Returns the result of the operation
+	 * 
+	 * @return The result
+	 * @throws WBEMException
+	 */
+	public Object getResult() throws WBEMException {
+		if (this.iResult instanceof WBEMException) throw (WBEMException) this.iResult;
+		return this.iResult;
+	}
+
+	/**
+	 * Sets the operation result
+	 * 
+	 * @param pResult
+	 *            The result
+	 */
+	public void setResult(Object pResult) {
+		this.iResult = pResult;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java
similarity index 67%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java
index d7cbbac..a00bda6 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java
@@ -1,93 +1,91 @@
-/*
-  CIMReferenceNamesOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMReferenceNamesOp
- * 
- */
-public class CIMReferenceNamesOp extends CIMOperation {
-
-	protected String iResultClass;
-
-	protected String iResultRole;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pResultClass
-	 * @param pRole
-	 */
-	public CIMReferenceNamesOp(CIMObjectPath pObjectName, String pResultClass, String pRole) {
-		this.iMethodCall = "ReferenceNames";
-		this.iObjectName = pObjectName;
-		this.iResultClass = pResultClass;
-		this.iResultRole = pRole;
-	}
-
-	/**
-	 * Returns resultClass
-	 * 
-	 * @return The value of resultClass.
-	 */
-	public String getResultClass() {
-		return this.iResultClass;
-	}
-
-	/**
-	 * Returns resultRole
-	 * 
-	 * @return The value of resultRole.
-	 */
-	public String getResultRole() {
-		return this.iResultRole;
-	}
-
-}
+/*
+  CIMReferenceNamesOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMReferenceNamesOp
+ * 
+ */
+public class CIMReferenceNamesOp extends CIMOperation {
+
+	protected String iResultClass;
+
+	protected String iResultRole;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pResultClass
+	 * @param pRole
+	 */
+	public CIMReferenceNamesOp(CIMObjectPath pObjectName, String pResultClass, String pRole) {
+		this.iMethodCall = "ReferenceNames";
+		this.iObjectName = pObjectName;
+		this.iResultClass = pResultClass;
+		this.iResultRole = pRole;
+	}
+
+	/**
+	 * Returns resultClass
+	 * 
+	 * @return The value of resultClass.
+	 */
+	public String getResultClass() {
+		return this.iResultClass;
+	}
+
+	/**
+	 * Returns resultRole
+	 * 
+	 * @return The value of resultRole.
+	 */
+	public String getResultRole() {
+		return this.iResultRole;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java
index 8350e91..89f4fd5 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java
@@ -1,132 +1,130 @@
-/*
-  CIMReferencesOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMReferencesOp
- * 
- */
-public class CIMReferencesOp extends CIMOperation {
-
-	protected String iResultClass;
-
-	protected String iRole;
-
-	protected boolean iIncludeQualifiers;
-
-	protected boolean iIncludeClassOrigin;
-
-	protected String[] iPropertyList;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pObjectName
-	 * @param pResultClass
-	 * @param pRole
-	 * @param pIncludeQualifiers
-	 * @param pIncludeClassOrigin
-	 * @param pPropertyList
-	 */
-	public CIMReferencesOp(CIMObjectPath pObjectName, String pResultClass, String pRole,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList) {
-		this.iMethodCall = "References";
-		this.iObjectName = pObjectName;
-		this.iResultClass = pResultClass;
-		this.iRole = pRole;
-		this.iIncludeQualifiers = pIncludeQualifiers;
-		this.iIncludeClassOrigin = pIncludeClassOrigin;
-	}
-
-	/**
-	 * Returns includeClassOrigin
-	 * 
-	 * @return The value of includeClassOrigin.
-	 */
-	public boolean isIncludeClassOrigin() {
-		return this.iIncludeClassOrigin;
-	}
-
-	/**
-	 * Returns includeQualifiers
-	 * 
-	 * @return The value of includeQualifiers.
-	 */
-	public boolean isIncludeQualifiers() {
-		return this.iIncludeQualifiers;
-	}
-
-	/**
-	 * Returns propertyList
-	 * 
-	 * @return The value of propertyList.
-	 */
-	public String[] getPropertyList() {
-		return this.iPropertyList;
-	}
-
-	/**
-	 * Returns resultClass
-	 * 
-	 * @return The value of resultClass.
-	 */
-	public String getResultClass() {
-		return this.iResultClass;
-	}
-
-	/**
-	 * Returns role
-	 * 
-	 * @return The value of role.
-	 */
-	public String getRole() {
-		return this.iRole;
-	}
-
-}
+/*
+  CIMReferencesOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMReferencesOp
+ * 
+ */
+public class CIMReferencesOp extends CIMOperation {
+
+	protected String iResultClass;
+
+	protected String iRole;
+
+	protected boolean iIncludeQualifiers;
+
+	protected boolean iIncludeClassOrigin;
+
+	protected String[] iPropertyList;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pObjectName
+	 * @param pResultClass
+	 * @param pRole
+	 * @param pIncludeQualifiers
+	 * @param pIncludeClassOrigin
+	 * @param pPropertyList
+	 */
+	public CIMReferencesOp(CIMObjectPath pObjectName, String pResultClass, String pRole,
+			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList) {
+		this.iMethodCall = "References";
+		this.iObjectName = pObjectName;
+		this.iResultClass = pResultClass;
+		this.iRole = pRole;
+		this.iIncludeQualifiers = pIncludeQualifiers;
+		this.iIncludeClassOrigin = pIncludeClassOrigin;
+	}
+
+	/**
+	 * Returns includeClassOrigin
+	 * 
+	 * @return The value of includeClassOrigin.
+	 */
+	public boolean isIncludeClassOrigin() {
+		return this.iIncludeClassOrigin;
+	}
+
+	/**
+	 * Returns includeQualifiers
+	 * 
+	 * @return The value of includeQualifiers.
+	 */
+	public boolean isIncludeQualifiers() {
+		return this.iIncludeQualifiers;
+	}
+
+	/**
+	 * Returns propertyList
+	 * 
+	 * @return The value of propertyList.
+	 */
+	public String[] getPropertyList() {
+		return this.iPropertyList;
+	}
+
+	/**
+	 * Returns resultClass
+	 * 
+	 * @return The value of resultClass.
+	 */
+	public String getResultClass() {
+		return this.iResultClass;
+	}
+
+	/**
+	 * Returns role
+	 * 
+	 * @return The value of role.
+	 */
+	public String getRole() {
+		return this.iRole;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java
similarity index 63%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java
index ec1c93a..2f00ca6 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java
@@ -1,81 +1,79 @@
-/*
-  CIMSetClassOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMSetClassOp
- * 
- */
-public class CIMSetClassOp extends CIMOperation {
-
-	protected CIMClass iCimClass;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param objectName
-	 * @param cimClass
-	 */
-	public CIMSetClassOp(CIMObjectPath objectName, CIMClass cimClass) {
-		this.iMethodCall = "SetClass";
-		this.iObjectName = objectName;
-		this.iCimClass = cimClass;
-	}
-
-	/**
-	 * Returns cimClass
-	 * 
-	 * @return The value of cimClass.
-	 */
-	public CIMClass getCimClass() {
-		return this.iCimClass;
-	}
-
-}
+/*
+  CIMSetClassOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMSetClassOp
+ * 
+ */
+public class CIMSetClassOp extends CIMOperation {
+
+	protected CIMClass iCimClass;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param objectName
+	 * @param cimClass
+	 */
+	public CIMSetClassOp(CIMObjectPath objectName, CIMClass cimClass) {
+		this.iMethodCall = "SetClass";
+		this.iObjectName = objectName;
+		this.iCimClass = cimClass;
+	}
+
+	/**
+	 * Returns cimClass
+	 * 
+	 * @return The value of cimClass.
+	 */
+	public CIMClass getCimClass() {
+		return this.iCimClass;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java
similarity index 69%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java
index 25925b2..8e6adf5 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java
@@ -1,108 +1,106 @@
-/*
-  CIMSetInstanceOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMSetInstanceOp
- * 
- */
-public class CIMSetInstanceOp extends CIMOperation {
-
-	protected CIMInstance iInstance;
-
-	protected boolean iIncludeQualifiers;
-
-	protected String[] iPropertyList;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param objectName
-	 * @param instance
-	 * @param includeQualifiers
-	 * @param propertyList
-	 */
-	public CIMSetInstanceOp(CIMObjectPath objectName, CIMInstance instance,
-			boolean includeQualifiers, String[] propertyList) {
-		this.iMethodCall = "SetInstance";
-		this.iObjectName = objectName;
-		this.iInstance = instance;
-		this.iIncludeQualifiers = includeQualifiers;
-		this.iPropertyList = propertyList;
-	}
-
-	/**
-	 * Returns includeQualifiers
-	 * 
-	 * @return The value of includeQualifiers.
-	 */
-	public boolean isIncludeQualifiers() {
-		return this.iIncludeQualifiers;
-	}
-
-	/**
-	 * Returns instance
-	 * 
-	 * @return The value of instance.
-	 */
-	public CIMInstance getInstance() {
-		return this.iInstance;
-	}
-
-	/**
-	 * Returns propertyList
-	 * 
-	 * @return The value of propertyList.
-	 */
-	public String[] getPropertyList() {
-		return this.iPropertyList;
-	}
-
-}
+/*
+  CIMSetInstanceOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMSetInstanceOp
+ * 
+ */
+public class CIMSetInstanceOp extends CIMOperation {
+
+	protected CIMInstance iInstance;
+
+	protected boolean iIncludeQualifiers;
+
+	protected String[] iPropertyList;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param objectName
+	 * @param instance
+	 * @param includeQualifiers
+	 * @param propertyList
+	 */
+	public CIMSetInstanceOp(CIMObjectPath objectName, CIMInstance instance,
+			boolean includeQualifiers, String[] propertyList) {
+		this.iMethodCall = "SetInstance";
+		this.iObjectName = objectName;
+		this.iInstance = instance;
+		this.iIncludeQualifiers = includeQualifiers;
+		this.iPropertyList = propertyList;
+	}
+
+	/**
+	 * Returns includeQualifiers
+	 * 
+	 * @return The value of includeQualifiers.
+	 */
+	public boolean isIncludeQualifiers() {
+		return this.iIncludeQualifiers;
+	}
+
+	/**
+	 * Returns instance
+	 * 
+	 * @return The value of instance.
+	 */
+	public CIMInstance getInstance() {
+		return this.iInstance;
+	}
+
+	/**
+	 * Returns propertyList
+	 * 
+	 * @return The value of propertyList.
+	 */
+	public String[] getPropertyList() {
+		return this.iPropertyList;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java
similarity index 67%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java
index 34318a6..0d329dd 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java
@@ -1,93 +1,91 @@
-/*
-  CIMSetPropertyOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-
-/**
- * CIMSetPropertyOp
- * 
- */
-public class CIMSetPropertyOp extends CIMOperation {
-
-	protected String iPropertyName;
-
-	protected Object iCimValue;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param objectName
-	 * @param propertyName
-	 * @param cimValue
-	 */
-	public CIMSetPropertyOp(CIMObjectPath objectName, String propertyName, Object cimValue) {
-		this.iMethodCall = "SetProperty";
-		this.iObjectName = objectName;
-		this.iCimValue = cimValue;
-		this.iPropertyName = propertyName;
-	}
-
-	/**
-	 * Returns cimValue
-	 * 
-	 * @return The value of cimValue.
-	 */
-	public Object getCimValue() {
-		return this.iCimValue;
-	}
-
-	/**
-	 * Returns propertyName
-	 * 
-	 * @return The value of propertyName.
-	 */
-	public String getPropertyName() {
-		return this.iPropertyName;
-	}
-
-}
+/*
+  CIMSetPropertyOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+
+/**
+ * CIMSetPropertyOp
+ * 
+ */
+public class CIMSetPropertyOp extends CIMOperation {
+
+	protected String iPropertyName;
+
+	protected Object iCimValue;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param objectName
+	 * @param propertyName
+	 * @param cimValue
+	 */
+	public CIMSetPropertyOp(CIMObjectPath objectName, String propertyName, Object cimValue) {
+		this.iMethodCall = "SetProperty";
+		this.iObjectName = objectName;
+		this.iCimValue = cimValue;
+		this.iPropertyName = propertyName;
+	}
+
+	/**
+	 * Returns cimValue
+	 * 
+	 * @return The value of cimValue.
+	 */
+	public Object getCimValue() {
+		return this.iCimValue;
+	}
+
+	/**
+	 * Returns propertyName
+	 * 
+	 * @return The value of propertyName.
+	 */
+	public String getPropertyName() {
+		return this.iPropertyName;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java
similarity index 65%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java
index 7b7ca7f..9bbb945 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java
@@ -1,82 +1,80 @@
-/*
-  CIMSetQualifierTypeOp.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMQualifierType;
-
-/**
- * CIMSetQualifierTypeOp
- * 
- */
-public class CIMSetQualifierTypeOp extends CIMOperation {
-
-	protected CIMQualifierType iQualifierType;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param objectName
-	 * @param qualifierType
-	 */
-	public CIMSetQualifierTypeOp(CIMObjectPath objectName, CIMQualifierType qualifierType) {
-		this.iMethodCall = "SetQualifierTypeOp";
-		this.iObjectName = objectName;
-		this.iQualifierType = qualifierType;
-	}
-
-	/**
-	 * Returns qualifierType
-	 * 
-	 * @return The value of qualifierType.
-	 */
-	public CIMQualifierType getQualifierType() {
-		return this.iQualifierType;
-	}
-
-}
+/*
+  CIMSetQualifierTypeOp.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMQualifierType;
+
+/**
+ * CIMSetQualifierTypeOp
+ * 
+ */
+public class CIMSetQualifierTypeOp extends CIMOperation {
+
+	protected CIMQualifierType iQualifierType;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param objectName
+	 * @param qualifierType
+	 */
+	public CIMSetQualifierTypeOp(CIMObjectPath objectName, CIMQualifierType qualifierType) {
+		this.iMethodCall = "SetQualifierTypeOp";
+		this.iObjectName = objectName;
+		this.iQualifierType = qualifierType;
+	}
+
+	/**
+	 * Returns qualifierType
+	 * 
+	 * @return The value of qualifierType.
+	 */
+	public CIMQualifierType getQualifierType() {
+		return this.iQualifierType;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java
similarity index 66%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java
index fdc3bf3..eae45e8 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java
@@ -1,72 +1,70 @@
-/*
-  CIMSingleResultOperation.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535756    2006-08-07  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.cimclient.internal.wbem.operations;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Vector;
-
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-
-/**
- * CIMSingleResultOperation
- * 
- */
-abstract public class CIMSingleResultOperation extends CIMOperation {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.sblim.wbem.client.operations.CIMOperation#getResult()
-	 */
-	@Override
-	public Object getResult() throws WBEMException {
-		if (this.iResult instanceof Exception) throw (WBEMException) this.iResult;
-		if (this.iResult instanceof Vector && ((Vector) this.iResult).size() > 0) return ((Vector) this.iResult)
-				.elementAt(0);
-		return null;
-	}
-}
+/*
+  CIMSingleResultOperation.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535756    2006-08-07  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.cimclient.internal.wbem.operations;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Vector;
+
+import org.metricshub.wbem.javax.wbem.WBEMException;
+
+/**
+ * CIMSingleResultOperation
+ * 
+ */
+abstract public class CIMSingleResultOperation extends CIMOperation {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.sblim.wbem.client.operations.CIMOperation#getResult()
+	 */
+	@Override
+	public Object getResult() throws WBEMException {
+		if (this.iResult instanceof Exception) throw (WBEMException) this.iResult;
+		if (this.iResult instanceof Vector && ((Vector) this.iResult).size() > 0) return ((Vector) this.iResult)
+				.elementAt(0);
+		return null;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/operations/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/internal/wbem/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/cimclient/package.html b/src/main/java/org/metricshub/wbem/sblim/cimclient/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/cimclient/package.html
rename to src/main/java/org/metricshub/wbem/sblim/cimclient/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/Advertiser.java b/src/main/java/org/metricshub/wbem/sblim/slp/Advertiser.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/Advertiser.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/Advertiser.java
index 9ee106f..2ed1dd1 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/Advertiser.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/Advertiser.java
@@ -1,130 +1,128 @@
-/*
-  ServiceType.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Locale;
-import java.util.Vector;
-
-/**
- * The Advertiser is the SA interface, allowing clients to register new service
- * instances with SLP, to change the attributes of existing services, and to
- * deregister service instances. New registrations and modifications of
- * attributes are made in the language locale with which the Advertiser was
- * created, deregistrations of service instances are made for all locales.
- */
-public interface Advertiser {
-
-	/**
-	 * Return the language locale with which this object was created.
-	 * 
-	 * @return The locale
-	 */
-	public abstract Locale getLocale();
-
-	/**
-	 * Register a new service with SLP having the given attributes. The API
-	 * library is required to perform the operation in all scopes obtained
-	 * through configuration.
-	 * 
-	 * @param pURL
-	 *            The URL for the service.
-	 * @param pAttributes
-	 *            A vector of ServiceLocationAttribute objects describing the
-	 *            service.
-	 * @throws ServiceLocationException
-	 */
-	public abstract void register(ServiceURL pURL, Vector pAttributes)
-			throws ServiceLocationException;
-
-	/**
-	 * Deregister a service from the SLP framework. This has the effect of
-	 * deregistering the service from every language locale. The API library is
-	 * required to perform the operation in all scopes obtained through
-	 * configuration.
-	 * 
-	 * @param pURL
-	 *            The URL for the service.
-	 * @throws ServiceLocationException
-	 */
-	public abstract void deregister(ServiceURL pURL) throws ServiceLocationException;
-
-	/**
-	 * Update the registration by adding the given attributes. The API library
-	 * is required to perform the operation in all scopes obtained through
-	 * configuration.
-	 * 
-	 * @param pURL
-	 *            The URL for the service.
-	 * @param pAttributes
-	 *            A Vector of ServiceLocationAttribute objects to add to the
-	 *            existing registration. Use an empty vector to update the URL
-	 *            alone. May not be null.
-	 * @throws ServiceLocationException
-	 */
-	public abstract void addAttributes(ServiceURL pURL, Vector pAttributes)
-			throws ServiceLocationException;
-
-	/**
-	 * Delete the attributes from a URL for the locale with which the Advertiser
-	 * was created. The API library is required to perform the operation in all
-	 * scopes obtained through configuration.
-	 * 
-	 * @param pURL
-	 *            The URL for the service.
-	 * @param pAttributeIds
-	 *            A vector of Strings indicating the ids of the attributes to
-	 *            remove. The strings may be attribute ids or they may be
-	 *            wildcard patterns to match ids. See [7] for the syntax of
-	 *            wildcard patterns. The strings may include SLP reserved
-	 *            characters, they will be escaped by the API before
-	 *            transmission. May not be the empty vector or null.
-	 * @throws ServiceLocationException
-	 */
-	public abstract void deleteAttributes(ServiceURL pURL, Vector pAttributeIds)
-			throws ServiceLocationException;
-}
+/*
+  ServiceType.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Locale;
+import java.util.Vector;
+
+/**
+ * The Advertiser is the SA interface, allowing clients to register new service
+ * instances with SLP, to change the attributes of existing services, and to
+ * deregister service instances. New registrations and modifications of
+ * attributes are made in the language locale with which the Advertiser was
+ * created, deregistrations of service instances are made for all locales.
+ */
+public interface Advertiser {
+
+	/**
+	 * Return the language locale with which this object was created.
+	 * 
+	 * @return The locale
+	 */
+	public abstract Locale getLocale();
+
+	/**
+	 * Register a new service with SLP having the given attributes. The API
+	 * library is required to perform the operation in all scopes obtained
+	 * through configuration.
+	 * 
+	 * @param pURL
+	 *            The URL for the service.
+	 * @param pAttributes
+	 *            A vector of ServiceLocationAttribute objects describing the
+	 *            service.
+	 * @throws ServiceLocationException
+	 */
+	public abstract void register(ServiceURL pURL, Vector pAttributes)
+			throws ServiceLocationException;
+
+	/**
+	 * Deregister a service from the SLP framework. This has the effect of
+	 * deregistering the service from every language locale. The API library is
+	 * required to perform the operation in all scopes obtained through
+	 * configuration.
+	 * 
+	 * @param pURL
+	 *            The URL for the service.
+	 * @throws ServiceLocationException
+	 */
+	public abstract void deregister(ServiceURL pURL) throws ServiceLocationException;
+
+	/**
+	 * Update the registration by adding the given attributes. The API library
+	 * is required to perform the operation in all scopes obtained through
+	 * configuration.
+	 * 
+	 * @param pURL
+	 *            The URL for the service.
+	 * @param pAttributes
+	 *            A Vector of ServiceLocationAttribute objects to add to the
+	 *            existing registration. Use an empty vector to update the URL
+	 *            alone. May not be null.
+	 * @throws ServiceLocationException
+	 */
+	public abstract void addAttributes(ServiceURL pURL, Vector pAttributes)
+			throws ServiceLocationException;
+
+	/**
+	 * Delete the attributes from a URL for the locale with which the Advertiser
+	 * was created. The API library is required to perform the operation in all
+	 * scopes obtained through configuration.
+	 * 
+	 * @param pURL
+	 *            The URL for the service.
+	 * @param pAttributeIds
+	 *            A vector of Strings indicating the ids of the attributes to
+	 *            remove. The strings may be attribute ids or they may be
+	 *            wildcard patterns to match ids. See [7] for the syntax of
+	 *            wildcard patterns. The strings may include SLP reserved
+	 *            characters, they will be escaped by the API before
+	 *            transmission. May not be the empty vector or null.
+	 * @throws ServiceLocationException
+	 */
+	public abstract void deleteAttributes(ServiceURL pURL, Vector pAttributeIds)
+			throws ServiceLocationException;
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/Locator.java b/src/main/java/org/metricshub/wbem/sblim/slp/Locator.java
similarity index 91%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/Locator.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/Locator.java
index 9b4b861..3babc9a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/Locator.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/Locator.java
@@ -1,278 +1,276 @@
-/*
-  ServiceType.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.InetAddress;
-import java.util.Locale;
-import java.util.Vector;
-
-/**
- * The Locator is the UA interface, allowing clients to query the SLP framework
- * about existing service types, services instances, and about the attributes of
- * an existing service instance or service type. Queries for services and
- * attributes are made in the locale with which the Locator was created, queries
- * for service types are independent of locale.
- */
-public interface Locator {
-
-	/**
-	 * Return the language locale with which this object was created.
-	 * 
-	 * @return The locale
-	 */
-	public abstract Locale getLocale();
-
-	/**
-	 * Returns an enumeration of ServiceType objects giving known service types
-	 * for the given scopes and given naming authority. If no service types are
-	 * found, an empty enumeration is returned.
-	 * 
-	 * @param pNamingAuthority
-	 *            The naming authority. Use "" for the default naming authority
-	 *            and "*" for all naming authorities.
-	 * @param pScopes
-	 *            A Vector of scope names. The vector should be selected from
-	 *            the results of a findScopes() API invocation. Use "DEFAULT"
-	 *            for the default scope.
-	 * @return The enumeration
-	 * @throws ServiceLocationException
-	 */
-	public abstract ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
-			Vector pScopes) throws ServiceLocationException;
-
-	/**
-	 * Returns an enumeration of ServiceType objects giving known service types
-	 * for the given scopes and given naming authority. If no service types are
-	 * found, an empty enumeration is returned. 
      
-	 * 
      
-	 * This method is not part of the RFC 2614 interface definition.
-	 * 
-	 * @param pNamingAuthority
-	 *            The naming authority. Use "" for the default naming authority
-	 *            and "*" for all naming authorities.
-	 * @param pScopes
-	 *            A Vector of scope names. The vector should be selected from
-	 *            the results of a findScopes() API invocation. Use "DEFAULT"
-	 *            for the default scope.
-	 * @param pDirectoryAgent
-	 *            A vector of InetAddress that specify the directory agents to
-	 *            look for.
-	 * 
-	 * @return The enumeration
-	 * @throws ServiceLocationException
-	 */
-	public abstract ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
-			Vector pScopes, Vector pDirectoryAgent)
-			throws ServiceLocationException;
-
-	/**
-	 * Returns a vector of ServiceURL objects for services matching the query,
-	 * and having a matching type in the given scopes. If no services are found,
-	 * an empty enumeration is returned.
-	 * 
-	 * @param pType
-	 *            The SLP service type of the service.
-	 * @param pScopes
-	 *            A Vector of scope names. The vector should be selected from
-	 *            the results of a findScopes() API invocation. Use "DEFAULT"
-	 *            for the default scope.
-	 * @param pSearchFilter
-	 *            An LDAPv3 [4] string encoded query. If the filter is empty,
-	 *            i.e. "", all services of the requested type in the specified
-	 *            scopes are returned. SLP reserved characters must be escaped
-	 *            in the query. Use ServiceLocationAttribute.escapeId() and
-	 *            ServiceLocationAttribute.escapeValue() to construct the query.
-	 * 
-	 * @return The enumeration
-	 * @throws ServiceLocationException
-	 */
-	public abstract ServiceLocationEnumeration findServices(ServiceType pType,
-			Vector pScopes, String pSearchFilter) throws ServiceLocationException;
-
-	/**
-	 * Returns a vector of ServiceURL objects for services matching the query,
-	 * and having a matching type in the given scopes. If no services are found,
-	 * an empty enumeration is returned. 
      
-	 * 
      
-	 * This method is not part of the RFC 2614 interface definition.
-	 * 
-	 * @param pType
-	 *            The SLP service type of the service.
-	 * @param pScopes
-	 *            A Vector of scope names. The vector should be selected from
-	 *            the results of a findScopes() API invocation. Use "DEFAULT"
-	 *            for the default scope.
-	 * @param pSearchFilter
-	 *            An LDAPv3 [4] string encoded query. If the filter is empty,
-	 *            i.e. "", all services of the requested type in the specified
-	 *            scopes are returned. SLP reserved characters must be escaped
-	 *            in the query. Use ServiceLocationAttribute.escapeId() and
-	 *            ServiceLocationAttribute.escapeValue() to construct the query.
-	 * @param pDirectoryAgents
-	 *            A vector of InetAddress that specify the directory agents to
-	 *            look for.
-	 * 
-	 * @return The enumeration
-	 * @throws ServiceLocationException
-	 */
-	public abstract ServiceLocationEnumeration findServices(ServiceType pType,
-			Vector pScopes, String pSearchFilter, Vector pDirectoryAgents)
-			throws ServiceLocationException;
-
-	/**
-	 * For the URL and scope, return a Vector of ServiceLocationAttribute
-	 * objects whose ids match the String patterns in the attributeIds Vector.
-	 * The request is made in the language locale of the Locator. If no
-	 * attributes match, an empty enumeration is returned.
-	 * 
-	 * @param URL
-	 *            The URL for which the attributes are desired.
-	 * @param scopes
-	 *            A Vector of scope names. The vector should be selected from
-	 *            the results of a findScopes() API invocation. Use "DEFAULT"
-	 *            for the default scope.
-	 * @param attributeIds
-	 *            A Vector of String patterns identifying the desired
-	 *            attributes. An empty vector means return all attributes. As
-	 *            described in [7], the patterns may include wildcard to match
-	 *            substrings. The strings may include SLP reserved characters,
-	 *            they will be escaped by the API before transmission.
-	 * @return The enumeration
-	 * @throws ServiceLocationException
-	 */
-	public abstract ServiceLocationEnumeration findAttributes(ServiceURL URL,
-			Vector scopes, Vector attributeIds) throws ServiceLocationException;
-
-	/**
-	 * For the URL and scope, return a Vector of ServiceLocationAttribute
-	 * objects whose ids match the String patterns in the attributeIds Vector.
-	 * The request is made in the language locale of the Locator. If no
-	 * attributes match, an empty enumeration is returned. 
      
-	 * 
      
-	 * This method is not part of the RFC 2614 interface definition.
-	 * 
-	 * @param pURL
-	 *            The URL for which the attributes are desired.
-	 * @param pScopes
-	 *            A Vector of scope names. The vector should be selected from
-	 *            the results of a findScopes() API invocation. Use "DEFAULT"
-	 *            for the default scope.
-	 * @param pAttributeIds
-	 *            A Vector of String patterns identifying the desired
-	 *            attributes. An empty vector means return all attributes. As
-	 *            described in [7], the patterns may include wildcard to match
-	 *            substrings. The strings may include SLP reserved characters,
-	 *            they will be escaped by the API before transmission.
-	 * @param pDirectoryAgents
-	 *            A vector of InetAddress that specify the directory agents to
-	 *            look for.
-	 * @return The enumeration
-	 * @throws ServiceLocationException
-	 * 
-	 */
-	public abstract ServiceLocationEnumeration findAttributes(ServiceURL pURL,
-			Vector pScopes, Vector pAttributeIds,
-			Vector pDirectoryAgents) throws ServiceLocationException;
-
-	/**
-	 * For the type and scope, return a Vector of all ServiceLocationAttribute
-	 * objects whose ids match the String patterns in the attributeIds Vector
-	 * regardless of the Locator's locale. The request is made independent of
-	 * language locale. If no attributes are found, an empty vector is returned.
-	 * 
-	 * @param pType
-	 *            The service type.
-	 * @param pScopes
-	 *            A Vector of scope names. The vector should be selected from
-	 *            the results of a findScopes() API invocation. Use "DEFAULT"
-	 *            for the default scope.
-	 * @param pAttributeIds
-	 *            A Vector of String patterns identifying the desired
-	 *            attributes. An empty vector means return all attributes. As
-	 *            described in [7], the patterns may include wildcard to match
-	 *            all prefixes or suffixes. The patterns may include SLP
-	 *            reserved characters, they will be escaped by the API before
-	 *            transmission.
-	 * @return The enumeration
-	 * @throws ServiceLocationException
-	 */
-	public abstract ServiceLocationEnumeration findAttributes(ServiceType pType,
-			Vector pScopes, Vector pAttributeIds) throws ServiceLocationException;
-
-	/**
-	 * For the type and scope, return a Vector of all ServiceLocationAttribute
-	 * objects whose ids match the String patterns in the attributeIds Vector
-	 * regardless of the Locator's locale. The request is made independent of
-	 * language locale. If no attributes are found, an empty vector is returned. 
      
-	 * 
      
-	 * This method is not part of the RFC 2614 interface definition.
-	 * 
-	 * @param pType
-	 *            The service type.
-	 * @param pScopes
-	 *            A Vector of scope names. The vector should be selected from
-	 *            the results of a findScopes() API invocation. Use "DEFAULT"
-	 *            for the default scope.
-	 * @param pAttributeIds
-	 *            A Vector of String patterns identifying the desired
-	 *            attributes. An empty vector means return all attributes. As
-	 *            described in [7], the patterns may include wildcard to match
-	 *            all prefixes or suffixes. The patterns may include SLP
-	 *            reserved characters, they will be escaped by the API before
-	 *            transmission.
-	 * @param pDirectoryAgents
-	 *            A vector of InetAddress that specify the directory agents to
-	 *            look for.
-	 * @return The enumeration
-	 * @throws ServiceLocationException
-	 */
-	public abstract ServiceLocationEnumeration findAttributes(ServiceType pType,
-			Vector pScopes, Vector pAttributeIds,
-			Vector pDirectoryAgents) throws ServiceLocationException;
-
-}
+/*
+  ServiceType.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.InetAddress;
+import java.util.Locale;
+import java.util.Vector;
+
+/**
+ * The Locator is the UA interface, allowing clients to query the SLP framework
+ * about existing service types, services instances, and about the attributes of
+ * an existing service instance or service type. Queries for services and
+ * attributes are made in the locale with which the Locator was created, queries
+ * for service types are independent of locale.
+ */
+public interface Locator {
+
+	/**
+	 * Return the language locale with which this object was created.
+	 * 
+	 * @return The locale
+	 */
+	public abstract Locale getLocale();
+
+	/**
+	 * Returns an enumeration of ServiceType objects giving known service types
+	 * for the given scopes and given naming authority. If no service types are
+	 * found, an empty enumeration is returned.
+	 * 
+	 * @param pNamingAuthority
+	 *            The naming authority. Use "" for the default naming authority
+	 *            and "*" for all naming authorities.
+	 * @param pScopes
+	 *            A Vector of scope names. The vector should be selected from
+	 *            the results of a findScopes() API invocation. Use "DEFAULT"
+	 *            for the default scope.
+	 * @return The enumeration
+	 * @throws ServiceLocationException
+	 */
+	public abstract ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
+			Vector pScopes) throws ServiceLocationException;
+
+	/**
+	 * Returns an enumeration of ServiceType objects giving known service types
+	 * for the given scopes and given naming authority. If no service types are
+	 * found, an empty enumeration is returned. 
      
+	 * 
      
+	 * This method is not part of the RFC 2614 interface definition.
+	 * 
+	 * @param pNamingAuthority
+	 *            The naming authority. Use "" for the default naming authority
+	 *            and "*" for all naming authorities.
+	 * @param pScopes
+	 *            A Vector of scope names. The vector should be selected from
+	 *            the results of a findScopes() API invocation. Use "DEFAULT"
+	 *            for the default scope.
+	 * @param pDirectoryAgent
+	 *            A vector of InetAddress that specify the directory agents to
+	 *            look for.
+	 * 
+	 * @return The enumeration
+	 * @throws ServiceLocationException
+	 */
+	public abstract ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
+			Vector pScopes, Vector pDirectoryAgent)
+			throws ServiceLocationException;
+
+	/**
+	 * Returns a vector of ServiceURL objects for services matching the query,
+	 * and having a matching type in the given scopes. If no services are found,
+	 * an empty enumeration is returned.
+	 * 
+	 * @param pType
+	 *            The SLP service type of the service.
+	 * @param pScopes
+	 *            A Vector of scope names. The vector should be selected from
+	 *            the results of a findScopes() API invocation. Use "DEFAULT"
+	 *            for the default scope.
+	 * @param pSearchFilter
+	 *            An LDAPv3 [4] string encoded query. If the filter is empty,
+	 *            i.e. "", all services of the requested type in the specified
+	 *            scopes are returned. SLP reserved characters must be escaped
+	 *            in the query. Use ServiceLocationAttribute.escapeId() and
+	 *            ServiceLocationAttribute.escapeValue() to construct the query.
+	 * 
+	 * @return The enumeration
+	 * @throws ServiceLocationException
+	 */
+	public abstract ServiceLocationEnumeration findServices(ServiceType pType,
+			Vector pScopes, String pSearchFilter) throws ServiceLocationException;
+
+	/**
+	 * Returns a vector of ServiceURL objects for services matching the query,
+	 * and having a matching type in the given scopes. If no services are found,
+	 * an empty enumeration is returned. 
      
+	 * 
      
+	 * This method is not part of the RFC 2614 interface definition.
+	 * 
+	 * @param pType
+	 *            The SLP service type of the service.
+	 * @param pScopes
+	 *            A Vector of scope names. The vector should be selected from
+	 *            the results of a findScopes() API invocation. Use "DEFAULT"
+	 *            for the default scope.
+	 * @param pSearchFilter
+	 *            An LDAPv3 [4] string encoded query. If the filter is empty,
+	 *            i.e. "", all services of the requested type in the specified
+	 *            scopes are returned. SLP reserved characters must be escaped
+	 *            in the query. Use ServiceLocationAttribute.escapeId() and
+	 *            ServiceLocationAttribute.escapeValue() to construct the query.
+	 * @param pDirectoryAgents
+	 *            A vector of InetAddress that specify the directory agents to
+	 *            look for.
+	 * 
+	 * @return The enumeration
+	 * @throws ServiceLocationException
+	 */
+	public abstract ServiceLocationEnumeration findServices(ServiceType pType,
+			Vector pScopes, String pSearchFilter, Vector pDirectoryAgents)
+			throws ServiceLocationException;
+
+	/**
+	 * For the URL and scope, return a Vector of ServiceLocationAttribute
+	 * objects whose ids match the String patterns in the attributeIds Vector.
+	 * The request is made in the language locale of the Locator. If no
+	 * attributes match, an empty enumeration is returned.
+	 * 
+	 * @param URL
+	 *            The URL for which the attributes are desired.
+	 * @param scopes
+	 *            A Vector of scope names. The vector should be selected from
+	 *            the results of a findScopes() API invocation. Use "DEFAULT"
+	 *            for the default scope.
+	 * @param attributeIds
+	 *            A Vector of String patterns identifying the desired
+	 *            attributes. An empty vector means return all attributes. As
+	 *            described in [7], the patterns may include wildcard to match
+	 *            substrings. The strings may include SLP reserved characters,
+	 *            they will be escaped by the API before transmission.
+	 * @return The enumeration
+	 * @throws ServiceLocationException
+	 */
+	public abstract ServiceLocationEnumeration findAttributes(ServiceURL URL,
+			Vector scopes, Vector attributeIds) throws ServiceLocationException;
+
+	/**
+	 * For the URL and scope, return a Vector of ServiceLocationAttribute
+	 * objects whose ids match the String patterns in the attributeIds Vector.
+	 * The request is made in the language locale of the Locator. If no
+	 * attributes match, an empty enumeration is returned. 
      
+	 * 
      
+	 * This method is not part of the RFC 2614 interface definition.
+	 * 
+	 * @param pURL
+	 *            The URL for which the attributes are desired.
+	 * @param pScopes
+	 *            A Vector of scope names. The vector should be selected from
+	 *            the results of a findScopes() API invocation. Use "DEFAULT"
+	 *            for the default scope.
+	 * @param pAttributeIds
+	 *            A Vector of String patterns identifying the desired
+	 *            attributes. An empty vector means return all attributes. As
+	 *            described in [7], the patterns may include wildcard to match
+	 *            substrings. The strings may include SLP reserved characters,
+	 *            they will be escaped by the API before transmission.
+	 * @param pDirectoryAgents
+	 *            A vector of InetAddress that specify the directory agents to
+	 *            look for.
+	 * @return The enumeration
+	 * @throws ServiceLocationException
+	 * 
+	 */
+	public abstract ServiceLocationEnumeration findAttributes(ServiceURL pURL,
+			Vector pScopes, Vector pAttributeIds,
+			Vector pDirectoryAgents) throws ServiceLocationException;
+
+	/**
+	 * For the type and scope, return a Vector of all ServiceLocationAttribute
+	 * objects whose ids match the String patterns in the attributeIds Vector
+	 * regardless of the Locator's locale. The request is made independent of
+	 * language locale. If no attributes are found, an empty vector is returned.
+	 * 
+	 * @param pType
+	 *            The service type.
+	 * @param pScopes
+	 *            A Vector of scope names. The vector should be selected from
+	 *            the results of a findScopes() API invocation. Use "DEFAULT"
+	 *            for the default scope.
+	 * @param pAttributeIds
+	 *            A Vector of String patterns identifying the desired
+	 *            attributes. An empty vector means return all attributes. As
+	 *            described in [7], the patterns may include wildcard to match
+	 *            all prefixes or suffixes. The patterns may include SLP
+	 *            reserved characters, they will be escaped by the API before
+	 *            transmission.
+	 * @return The enumeration
+	 * @throws ServiceLocationException
+	 */
+	public abstract ServiceLocationEnumeration findAttributes(ServiceType pType,
+			Vector pScopes, Vector pAttributeIds) throws ServiceLocationException;
+
+	/**
+	 * For the type and scope, return a Vector of all ServiceLocationAttribute
+	 * objects whose ids match the String patterns in the attributeIds Vector
+	 * regardless of the Locator's locale. The request is made independent of
+	 * language locale. If no attributes are found, an empty vector is returned. 
      
+	 * 
      
+	 * This method is not part of the RFC 2614 interface definition.
+	 * 
+	 * @param pType
+	 *            The service type.
+	 * @param pScopes
+	 *            A Vector of scope names. The vector should be selected from
+	 *            the results of a findScopes() API invocation. Use "DEFAULT"
+	 *            for the default scope.
+	 * @param pAttributeIds
+	 *            A Vector of String patterns identifying the desired
+	 *            attributes. An empty vector means return all attributes. As
+	 *            described in [7], the patterns may include wildcard to match
+	 *            all prefixes or suffixes. The patterns may include SLP
+	 *            reserved characters, they will be escaped by the API before
+	 *            transmission.
+	 * @param pDirectoryAgents
+	 *            A vector of InetAddress that specify the directory agents to
+	 *            look for.
+	 * @return The enumeration
+	 * @throws ServiceLocationException
+	 */
+	public abstract ServiceLocationEnumeration findAttributes(ServiceType pType,
+			Vector pScopes, Vector pAttributeIds,
+			Vector pDirectoryAgents) throws ServiceLocationException;
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/SLPConfigProperties.java b/src/main/java/org/metricshub/wbem/sblim/slp/SLPConfigProperties.java
similarity index 93%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/SLPConfigProperties.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/SLPConfigProperties.java
index 5e60dab..ef7c238 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/SLPConfigProperties.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/SLPConfigProperties.java
@@ -1,461 +1,459 @@
-/*
-  SLPConfigProperties.java
-
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535793    2006-09-19  lupusalex    Fix&Integrate CIM&SLP configuration classes
- * 1911400    2008-03-10  blaschks-oss Source RPM file on SourceForge is broken
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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
- * 2907527    2009-12-02  blaschke-oss Fix SLP properties issues
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * The interface SLPConfigProperties holds string constants for the
- * configuration properties of the SLP package. To set a property call
- * System.setProperty(name, value). Note that these properties have
- * global VM scope.
- * 
- */
-public interface SLPConfigProperties {
-
-	/**
-	 * A URL string giving the location of the SLP config file. 
      
-	 * 
      
-	 * By default the SLP client looks for
-	 * 
        
-	 * 
      • file:sblim-slp-client2.properties
        • 
-	 * 
      • file:%USER_HOME%/sblim-slp-client2.properties
        • 
-	 * 
      • file:/etc/java/sblim-slp-client2.properties
        • 
-	 * 
      • file:/etc/sblim-slp-client2.properties
        • 
-	 * 
      
-	 * The first file found will be used. The default search list is not applied
-	 * if this property is set, even if the given URL does not exist.
      
-	 * 
      
-	 * SBLIM specific extension to RFC 2614
-	 */
-	public static final String NET_SLP_CONFIG_URL = "net.slp.configURL";
-
-	/**
-	 * A 16 bit positive integer giving the number of seconds the DA url
-	 * lifetime should exceed the discovery interval.
      
-	 * 
      
-	 * Default is 900 seconds (15 minutes).
      
-	 * 
      
-	 * SBLIM specific extension to RFC 2614
-	 */
-	public static final String NET_SLP_DA_ACTIVE_DISCOVERY_GRANULARITY = "net.slp.DAActiveDiscoveryGranularity";
-
-	/**
-	 * A 16 bit positive integer giving the number of seconds between DA active
-	 * discovery queries.
      
-	 * 
      
-	 * Default is 900 seconds (15 minutes).
      
-	 * 
      
-	 * If the property is set to zero, active discovery is turned off. This is
-	 * useful when the DAs available are explicitly restricted to those obtained
-	 * from DHCP or the net.slp.DAAddresses property.
-	 */
-	public static final String NET_SLP_DA_ACTIVE_DISCOVERY_INTERVAL = "net.slp.DAActiveDiscoveryInterval";
-
-	/**
-	 * A value-list of IP addresses or DNS resolvable host names giving the
-	 * SLPv2 DAs to use for statically configured UAs and SAs. Ignored by DAs
-	 * (unless the DA is also an SA server). 
      
-	 * 
      
-	 * Default is none.
      
-	 * 
      
-	 * The following grammar describes the property:
-	 * 
      
-	 * 
-	 * addr-list = addr / addr "," addr-list
      
-	 * addr = fqdn / hostnumber
      
-	 * fqdn = ALPHA / ALPHA *[ anum / "-" ] anum
      
-	 * anum = ALPHA / DIGIT
      
-	 * hostnumber = 1*3DIGIT 3("." 1*3DIGIT)
      
-	 *       
-	 * 
      
-	 * An example is:
      
-	 * 
      
-	 * 
-	 * sawah,mandi,sambal
-	 * 
-	 * 
      
-	 * IP addresses can be used instead of host names in networks where DNS is
-	 * not deployed, but network administrators are reminded that using IP
-	 * addresses will complicate machine renumbering, since the SLP
-	 * configuration property files in statically configured networks will have
-	 * to be changed. Similarly, if host names are used, implementors must be
-	 * careful that a name service is available before SLP starts, in other
-	 * words, SLP cannot be used to find the name service.
      
-	 */
-	public static final String NET_SLP_DA_ADDRESSES = "net.slp.DAAddresses";
-
-	/**
-	 * A comma-separated list of parenthesized attribute/value list pairs that
-	 * the DA must advertise in DAAdverts. The property must be in the SLP
-	 * attribute list wire format, including escapes for reserved characters.
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_DA_ATTRIBUTES = "net.slp.DAAttributes";
-
-	/**
-	 * A value-list of 32 bit integers used as timeouts, in milliseconds, to
-	 * implement the multicast convergence algorithm during active DA discovery.
-	 * Each value specifies the time to wait before sending the next request, or
-	 * until nothing new has been learned from two successive requests.
      
-	 * 
      
-	 * Default is: 200,200,200,200,300,400.
-	 */
-	public static final String NET_SLP_DA_DISCOVERY_TIMEOUTS = "net.slp.DADiscoveryTimeouts";
-
-	/**
-	 * A 32 bit integer giving the number of seconds for the DA heartbeat.
-	 * Ignored if isDA is false. 
      
-	 * 
      
-	 * Default is 10800 seconds (3 hours). 
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_DA_HEARTBEAT = "net.slp.DAHeartbeat";
-
-	/**
-	 * A value-list of 32 bit integers used as timeouts, in milliseconds, to
-	 * implement unicast datagram transmission to DAs. The nth value gives the
-	 * time to block waiting for a reply on the nth try to contact the DA.
      
-	 * 
      
-	 * Default is: 100,200,300
-	 */
-	public static final String NET_SLP_DATAGRAM_TIMEOUTS = "net.slp.datagramTimeouts";
-
-	/**
-	 * Value-list of strings giving the IP addresses of network interfaces on
-	 * which the DA or SA should listen on port 427 for multicast, unicast UDP,
-	 * and TCP messages.
      
-	 * 
      
-	 * Default is empty, i.e. use the default network interface.
      
-	 * 
      
-	 * The grammar for this property is:
-	 * 
      
-	 * 
-	 * addr-list     =  hostnumber / hostnumber "," addr-list
      
-	 * hostnumber    =  1*3DIGIT 3("." 1*3DIGIT)
-	 *       
-	 * 
      
-	 * An example is:
-	 * 
      
-	 * 195.42.42.42,195.42.142.1,195.42.120.1
-	 * 
      
-	 * The example machine has three interfaces on which the DA should listen.
-	 * Note that since this property only takes IP addresses, it will need to be
-	 * changed if the network is renumbered.
-	 */
-	public static final String NET_SLP_INTERFACES = "net.slp.interfaces";
-
-	/**
-	 * A boolean indicating if broadcast should be used instead of multicast.
      
-	 * 
      
-	 * Default is false.
-	 */
-	public static final String NET_SLP_IS_BROADCAST_ONLY = "net.slp.isBroadcastOnly";
-
-	/**
-	 * A boolean indicating if the SLP server is to act as a DA. If
-	 * false, run as a SA.
      
-	 * 
      
-	 * Default is false.
-	 */
-	public static final String NET_SLP_IS_DA = "net.slp.isDA";
-
-	/**
-	 * A RFC 1766 Language Tag for the language locale. Setting this property
-	 * causes the property value to become the default locale for SLP messages.
-	 * This property is also used for SA and DA configuration.
      
-	 * 
      
-	 * Default is en. 
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_LOCALE = "net.slp.locale";
-
-	/**
-	 * A 32 bit integer giving the maximum number of results to accumulate and
-	 * return for a synchronous request before the timeout, or the maximum
-	 * number of results to return through a callback if the request results are
-	 * reported asynchronously.
      
-	 * Positive integers and -1 are legal values. If -1, indicates that all
-	 * results should be returned. 
      
-	 * 
      
-	 * Default value is 2147483647 (2^31 - 1)
      
-	 * SBLIM specific: RFC 2614 recommendation is -1.
      
-	 * 
      
-	 * DAs and SAs always return all results that match the request. This
-	 * configuration value applies only to UAs, that filter incoming results and
-	 * only return as many values as net.slp.maxResults indicates.
-	 */
-	public static final String NET_SLP_MAX_RESULTS = "net.slp.maxResults";
-
-	/**
-	 * A 16 bit integer giving the network packet MTU, in bytes. This is the
-	 * maximum size of any datagram to send, but the implementation might
-	 * receive a larger datagram. The maximum size includes IP, and UDP or TCP
-	 * headers.
      
-	 * 
      
-	 * Default is 1400.
-	 */
-	public static final String NET_SLP_MTU = "net.slp.MTU";
-
-	/**
-	 * A 32 bit integer giving the maximum amount of time to perform multicast,
-	 * in milliseconds.
      
-	 * 
      
-	 * Default is 2000 ms.
-	 */
-	public static final String NET_SLP_MULTICAST_MAXIMUM_WAIT = "net.slp.multicastMaximumWait";
-
-	/**
-	 * A value-list of 32 bit integers used as timeouts, in milliseconds, to
-	 * implement the multicast convergence algorithm. Each value specifies the
-	 * time to wait before sending the next request, or until nothing new has
-	 * been learned from two successive requests.
      
-	 * 
      
-	 * Default is: 200, 200, 200, 200, 300, 400
      
-	 * SBLIM specific: RFC 2614 recommendation is
-	 * 3000,3000,3000,3000,3000.
      
-	 * 
      
-	 * In a fast network the aggressive values of 1000,1250,1500,2000,4000 allow
-	 * better performance.
      
-	 * 
      
-	 * Note that the net.slp.DADiscoveryTimeouts property must be used for
-	 * active DA discovery.
-	 */
-	public static final String NET_SLP_MULTICAST_TIMEOUTS = "net.slp.multicastTimeouts";
-
-	/**
-	 * A positive integer less than or equal to 255, giving the multicast TTL.
      
-	 * 
      
-	 * Default is 255.
-	 */
-	public static final String NET_SLP_MULTICAST_TTL = "net.slp.multicastTTL";
-
-	/**
-	 * A boolean indicating whether passive DA detection should be used.
      
-	 * 
      
-	 * Default is true.
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_PASSIVE_DA_DETECTION = "net.slp.passiveDADetection";
-
-	/**
-	 * A 16 bit integer giving the port used for listening.
      
-	 * 
      
-	 * Default is 427.
-	 */
-	public static final String NET_SLP_PORT = "net.slp.port";
-
-	/**
-	 * A boolean indicating whether IPv6 addresses should be used.
      
-	 * 
      
-	 * Default is true.
-	 */
-	public static final String NET_SLP_USEIPV6 = "net.slp.useipv6";
-
-	/**
-	 * A boolean indicating whether IPv4 addresses should be used.
      
-	 * 
      
-	 * Default is true.
-	 */
-	public static final String NET_SLP_USEIPV4 = "net.slp.useipv4";
-
-	/**
-	 * A 32 bit integer giving the maximum value for all random wait parameters,
-	 * in milliseconds. 
      
-	 * 
      
-	 * Default is 1000 ms. 
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_RANDOM_WAIT_BOUND = "net.slp.randomWaitBound";
-
-	/**
-	 * A comma-separated list of parenthesized attribute/value list pairs that
-	 * the SA must advertise in SAAdverts. The property must be in the SLP
-	 * attribute list wire format, including escapes for reserved characters. 
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_SA_ATTRIBUTES = "net.slp.SAAttributes";
-
-	/**
-	 * A value-list of strings indicating the scopes that are only applied to
-	 * SAs. In contradiction the "net.slp.useScopes" specifies the scope for UAs
-	 * and SAs.
      
-	 * 
      
-	 * SBLIM specific extension to RFC 2614
-	 */
-	public static final String NET_SLP_SAONLY_SCOPES = "net.slp.SAOnlyScopes";
-
-	/**
-	 * A comma-separated list of parenthesized attribute/value list pairs that
-	 * the SA must advertise in SAAdverts. The property must be in the SLP
-	 * attribute list wire format, including escapes for reserved characters.
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_SECURITY_ENABLED = "net.slp.securityEnabled";
-
-	/**
-	 * A string containing a URL pointing to a document containing serialized
-	 * registrations that should be processed when the DA or SA server starts
-	 * up.
      
-	 * 
      
-	 * Default is none.
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_SERIALIZED_REG_URL = "net.slp.serializedRegUrl";
-
-	/**
-	 * A 32 bit integer giving the server socket queue length for SAs/DAs.
      
-	 * 
      
-	 * Default is 10.
      
-	 * 
      
-	 * SBLIM specific extension to RFC 2614
-	 * 
-	 */
-	public static final String NET_SLP_SERVER_SOCKET_QUEUE_LENGTH = "net.slp.serverSocketQueueLength";
-
-	/**
-	 * A 32 bit integer giving the TCP timeout in milliseconds.
      
-	 * 
      
-	 * The default is 20000 ms. 
      
-	 * 
      
-	 * SBLIM specific extension to RFC 2614
-	 * 
-	 */
-	public static final String NET_SLP_TCPTIMEOUT = "net.slp.TCPTimeout";
-
-	/**
-	 * A boolean controlling printing of messages about traffic with DAs. 
      
-	 * 
      
-	 * Default is false.
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_TRACE_DA_TRAFFIC = "net.slp.traceDATraffic";
-
-	/**
-	 * A boolean controlling printing details when a SLP message is dropped for
-	 * any reason. 
      
-	 * 
      
-	 * Default is false.
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_TRACE_DROP = "net.slp.traceDrop";
-
-	/**
-	 * A boolean controlling printing of details on SLP messages. The fields in
-	 * all incoming messages and outgoing replies are printed. 
      
-	 * 
      
-	 * Default is false.
-	 */
-	public static final String NET_SLP_TRACE_MSG = "net.slp.traceMsg";
-
-	/**
-	 * A boolean controlling dumps of all registered services upon registration
-	 * and deregistration. If true, the contents of the DA or SA server are
-	 * dumped after a registration or deregistration occurs. 
      
-	 * 
      
-	 * Default is false.
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_TRACE_REG = "net.slp.traceReg";
-
-	/**
-	 * A value-list of service type names. In the absence of any DAs, UAs
-	 * perform SA discovery for finding scopes. These SA discovery requests may
-	 * contain a request for service types as an attribute.
      
-	 * 
      
-	 * The API implementation will use the service type names supplied by this
-	 * property to discover only those SAs (and their scopes) which support the
-	 * desired service type or types. For example, if net.slp.typeHint is set to
-	 * "service:imap,service:pop3" then SA discovery requests will include the
-	 * search filter:
      
-	 * 
      
-	 * (|(service-type=service:imap)(service-type=service:pop3))
      
-	 * 
      
-	 * 
-	 * The API library can also use unicast to contact the discovered SAs for
-	 * subsequent requests for these service types, to optimize network access.
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_TYPE_HINT = "net.slp.typeHint";
-
-	/**
-	 * A value-list of strings indicating the only scopes a UA or SA is allowed
-	 * to use when making requests or registering, or the scopes a DA must
-	 * support.
      
-	 * If not present for the DA and SA, then in the absence of scope
-	 * information from DHCP, the default scope "DEFAULT" is used. If not
-	 * present for the UA, and there is no scope information available from
-	 * DHCP, then the user scoping model is in force. 
      
-	 * Active and passive DA discovery or SA discovery are used for scope
-	 * discovery, and the scope "DEFAULT" is used if no other information is
-	 * available. 
      
-	 * If a DA or SA gets another scope in a request, a SCOPE_NOT_SUPPORTED
-	 * error should be returned, unless the request was multicast, in which case
-	 * it should be dropped. If a DA gets another scope in a registration, a
-	 * SCOPE_NOT_SUPPORTED error must be returned.
-	 */
-	public static final String NET_SLP_USE_SCOPES = "net.slp.useScopes";
-
-	/**
-	 * Trace level. Can be ALL, INFO, WARNING, ERROR, OFF
      
-	 * 
      
-	 * Not evaluated by SBLIM SLP client
-	 */
-	public static final String NET_SLP_TRC_LEVEL = "net.slp.trc.level";
-
-}
+/*
+  SLPConfigProperties.java
+
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM, a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535793    2006-09-19  lupusalex    Fix&Integrate CIM&SLP configuration classes
+ * 1911400    2008-03-10  blaschks-oss Source RPM file on SourceForge is broken
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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
+ * 2907527    2009-12-02  blaschke-oss Fix SLP properties issues
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * The interface SLPConfigProperties holds string constants for the
+ * configuration properties of the SLP package. To set a property call
+ * System.setProperty(name, value). Note that these properties have
+ * global VM scope.
+ * 
+ */
+public interface SLPConfigProperties {
+
+	/**
+	 * A URL string giving the location of the SLP config file. 
      
+	 * 
      
+	 * By default the SLP client looks for
+	 * 
        
+	 * 
      • file:sblim-slp-client2.properties
        • 
+	 * 
      • file:%USER_HOME%/sblim-slp-client2.properties
        • 
+	 * 
      • file:/etc/java/sblim-slp-client2.properties
        • 
+	 * 
      • file:/etc/sblim-slp-client2.properties
        • 
+	 * 
      
+	 * The first file found will be used. The default search list is not applied
+	 * if this property is set, even if the given URL does not exist.
      
+	 * 
      
+	 * SBLIM specific extension to RFC 2614
+	 */
+	public static final String NET_SLP_CONFIG_URL = "net.slp.configURL";
+
+	/**
+	 * A 16 bit positive integer giving the number of seconds the DA url
+	 * lifetime should exceed the discovery interval.
      
+	 * 
      
+	 * Default is 900 seconds (15 minutes).
      
+	 * 
      
+	 * SBLIM specific extension to RFC 2614
+	 */
+	public static final String NET_SLP_DA_ACTIVE_DISCOVERY_GRANULARITY = "net.slp.DAActiveDiscoveryGranularity";
+
+	/**
+	 * A 16 bit positive integer giving the number of seconds between DA active
+	 * discovery queries.
      
+	 * 
      
+	 * Default is 900 seconds (15 minutes).
      
+	 * 
      
+	 * If the property is set to zero, active discovery is turned off. This is
+	 * useful when the DAs available are explicitly restricted to those obtained
+	 * from DHCP or the net.slp.DAAddresses property.
+	 */
+	public static final String NET_SLP_DA_ACTIVE_DISCOVERY_INTERVAL = "net.slp.DAActiveDiscoveryInterval";
+
+	/**
+	 * A value-list of IP addresses or DNS resolvable host names giving the
+	 * SLPv2 DAs to use for statically configured UAs and SAs. Ignored by DAs
+	 * (unless the DA is also an SA server). 
      
+	 * 
      
+	 * Default is none.
      
+	 * 
      
+	 * The following grammar describes the property:
+	 * 
      
+	 * 
+	 * addr-list = addr / addr "," addr-list
      
+	 * addr = fqdn / hostnumber
      
+	 * fqdn = ALPHA / ALPHA *[ anum / "-" ] anum
      
+	 * anum = ALPHA / DIGIT
      
+	 * hostnumber = 1*3DIGIT 3("." 1*3DIGIT)
      
+	 *       
+	 * 
      
+	 * An example is:
      
+	 * 
      
+	 * 
+	 * sawah,mandi,sambal
+	 * 
+	 * 
      
+	 * IP addresses can be used instead of host names in networks where DNS is
+	 * not deployed, but network administrators are reminded that using IP
+	 * addresses will complicate machine renumbering, since the SLP
+	 * configuration property files in statically configured networks will have
+	 * to be changed. Similarly, if host names are used, implementors must be
+	 * careful that a name service is available before SLP starts, in other
+	 * words, SLP cannot be used to find the name service.
      
+	 */
+	public static final String NET_SLP_DA_ADDRESSES = "net.slp.DAAddresses";
+
+	/**
+	 * A comma-separated list of parenthesized attribute/value list pairs that
+	 * the DA must advertise in DAAdverts. The property must be in the SLP
+	 * attribute list wire format, including escapes for reserved characters.
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_DA_ATTRIBUTES = "net.slp.DAAttributes";
+
+	/**
+	 * A value-list of 32 bit integers used as timeouts, in milliseconds, to
+	 * implement the multicast convergence algorithm during active DA discovery.
+	 * Each value specifies the time to wait before sending the next request, or
+	 * until nothing new has been learned from two successive requests.
      
+	 * 
      
+	 * Default is: 200,200,200,200,300,400.
+	 */
+	public static final String NET_SLP_DA_DISCOVERY_TIMEOUTS = "net.slp.DADiscoveryTimeouts";
+
+	/**
+	 * A 32 bit integer giving the number of seconds for the DA heartbeat.
+	 * Ignored if isDA is false. 
      
+	 * 
      
+	 * Default is 10800 seconds (3 hours). 
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_DA_HEARTBEAT = "net.slp.DAHeartbeat";
+
+	/**
+	 * A value-list of 32 bit integers used as timeouts, in milliseconds, to
+	 * implement unicast datagram transmission to DAs. The nth value gives the
+	 * time to block waiting for a reply on the nth try to contact the DA.
      
+	 * 
      
+	 * Default is: 100,200,300
+	 */
+	public static final String NET_SLP_DATAGRAM_TIMEOUTS = "net.slp.datagramTimeouts";
+
+	/**
+	 * Value-list of strings giving the IP addresses of network interfaces on
+	 * which the DA or SA should listen on port 427 for multicast, unicast UDP,
+	 * and TCP messages.
      
+	 * 
      
+	 * Default is empty, i.e. use the default network interface.
      
+	 * 
      
+	 * The grammar for this property is:
+	 * 
      
+	 * 
+	 * addr-list     =  hostnumber / hostnumber "," addr-list
      
+	 * hostnumber    =  1*3DIGIT 3("." 1*3DIGIT)
+	 *       
+	 * 
      
+	 * An example is:
+	 * 
      
+	 * 195.42.42.42,195.42.142.1,195.42.120.1
+	 * 
      
+	 * The example machine has three interfaces on which the DA should listen.
+	 * Note that since this property only takes IP addresses, it will need to be
+	 * changed if the network is renumbered.
+	 */
+	public static final String NET_SLP_INTERFACES = "net.slp.interfaces";
+
+	/**
+	 * A boolean indicating if broadcast should be used instead of multicast.
      
+	 * 
      
+	 * Default is false.
+	 */
+	public static final String NET_SLP_IS_BROADCAST_ONLY = "net.slp.isBroadcastOnly";
+
+	/**
+	 * A boolean indicating if the SLP server is to act as a DA. If
+	 * false, run as a SA.
      
+	 * 
      
+	 * Default is false.
+	 */
+	public static final String NET_SLP_IS_DA = "net.slp.isDA";
+
+	/**
+	 * A RFC 1766 Language Tag for the language locale. Setting this property
+	 * causes the property value to become the default locale for SLP messages.
+	 * This property is also used for SA and DA configuration.
      
+	 * 
      
+	 * Default is en. 
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_LOCALE = "net.slp.locale";
+
+	/**
+	 * A 32 bit integer giving the maximum number of results to accumulate and
+	 * return for a synchronous request before the timeout, or the maximum
+	 * number of results to return through a callback if the request results are
+	 * reported asynchronously.
      
+	 * Positive integers and -1 are legal values. If -1, indicates that all
+	 * results should be returned. 
      
+	 * 
      
+	 * Default value is 2147483647 (2^31 - 1)
      
+	 * SBLIM specific: RFC 2614 recommendation is -1.
      
+	 * 
      
+	 * DAs and SAs always return all results that match the request. This
+	 * configuration value applies only to UAs, that filter incoming results and
+	 * only return as many values as net.slp.maxResults indicates.
+	 */
+	public static final String NET_SLP_MAX_RESULTS = "net.slp.maxResults";
+
+	/**
+	 * A 16 bit integer giving the network packet MTU, in bytes. This is the
+	 * maximum size of any datagram to send, but the implementation might
+	 * receive a larger datagram. The maximum size includes IP, and UDP or TCP
+	 * headers.
      
+	 * 
      
+	 * Default is 1400.
+	 */
+	public static final String NET_SLP_MTU = "net.slp.MTU";
+
+	/**
+	 * A 32 bit integer giving the maximum amount of time to perform multicast,
+	 * in milliseconds.
      
+	 * 
      
+	 * Default is 2000 ms.
+	 */
+	public static final String NET_SLP_MULTICAST_MAXIMUM_WAIT = "net.slp.multicastMaximumWait";
+
+	/**
+	 * A value-list of 32 bit integers used as timeouts, in milliseconds, to
+	 * implement the multicast convergence algorithm. Each value specifies the
+	 * time to wait before sending the next request, or until nothing new has
+	 * been learned from two successive requests.
      
+	 * 
      
+	 * Default is: 200, 200, 200, 200, 300, 400
      
+	 * SBLIM specific: RFC 2614 recommendation is
+	 * 3000,3000,3000,3000,3000.
      
+	 * 
      
+	 * In a fast network the aggressive values of 1000,1250,1500,2000,4000 allow
+	 * better performance.
      
+	 * 
      
+	 * Note that the net.slp.DADiscoveryTimeouts property must be used for
+	 * active DA discovery.
+	 */
+	public static final String NET_SLP_MULTICAST_TIMEOUTS = "net.slp.multicastTimeouts";
+
+	/**
+	 * A positive integer less than or equal to 255, giving the multicast TTL.
      
+	 * 
      
+	 * Default is 255.
+	 */
+	public static final String NET_SLP_MULTICAST_TTL = "net.slp.multicastTTL";
+
+	/**
+	 * A boolean indicating whether passive DA detection should be used.
      
+	 * 
      
+	 * Default is true.
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_PASSIVE_DA_DETECTION = "net.slp.passiveDADetection";
+
+	/**
+	 * A 16 bit integer giving the port used for listening.
      
+	 * 
      
+	 * Default is 427.
+	 */
+	public static final String NET_SLP_PORT = "net.slp.port";
+
+	/**
+	 * A boolean indicating whether IPv6 addresses should be used.
      
+	 * 
      
+	 * Default is true.
+	 */
+	public static final String NET_SLP_USEIPV6 = "net.slp.useipv6";
+
+	/**
+	 * A boolean indicating whether IPv4 addresses should be used.
      
+	 * 
      
+	 * Default is true.
+	 */
+	public static final String NET_SLP_USEIPV4 = "net.slp.useipv4";
+
+	/**
+	 * A 32 bit integer giving the maximum value for all random wait parameters,
+	 * in milliseconds. 
      
+	 * 
      
+	 * Default is 1000 ms. 
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_RANDOM_WAIT_BOUND = "net.slp.randomWaitBound";
+
+	/**
+	 * A comma-separated list of parenthesized attribute/value list pairs that
+	 * the SA must advertise in SAAdverts. The property must be in the SLP
+	 * attribute list wire format, including escapes for reserved characters. 
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_SA_ATTRIBUTES = "net.slp.SAAttributes";
+
+	/**
+	 * A value-list of strings indicating the scopes that are only applied to
+	 * SAs. In contradiction the "net.slp.useScopes" specifies the scope for UAs
+	 * and SAs.
      
+	 * 
      
+	 * SBLIM specific extension to RFC 2614
+	 */
+	public static final String NET_SLP_SAONLY_SCOPES = "net.slp.SAOnlyScopes";
+
+	/**
+	 * A comma-separated list of parenthesized attribute/value list pairs that
+	 * the SA must advertise in SAAdverts. The property must be in the SLP
+	 * attribute list wire format, including escapes for reserved characters.
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_SECURITY_ENABLED = "net.slp.securityEnabled";
+
+	/**
+	 * A string containing a URL pointing to a document containing serialized
+	 * registrations that should be processed when the DA or SA server starts
+	 * up.
      
+	 * 
      
+	 * Default is none.
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_SERIALIZED_REG_URL = "net.slp.serializedRegUrl";
+
+	/**
+	 * A 32 bit integer giving the server socket queue length for SAs/DAs.
      
+	 * 
      
+	 * Default is 10.
      
+	 * 
      
+	 * SBLIM specific extension to RFC 2614
+	 * 
+	 */
+	public static final String NET_SLP_SERVER_SOCKET_QUEUE_LENGTH = "net.slp.serverSocketQueueLength";
+
+	/**
+	 * A 32 bit integer giving the TCP timeout in milliseconds.
      
+	 * 
      
+	 * The default is 20000 ms. 
      
+	 * 
      
+	 * SBLIM specific extension to RFC 2614
+	 * 
+	 */
+	public static final String NET_SLP_TCPTIMEOUT = "net.slp.TCPTimeout";
+
+	/**
+	 * A boolean controlling printing of messages about traffic with DAs. 
      
+	 * 
      
+	 * Default is false.
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_TRACE_DA_TRAFFIC = "net.slp.traceDATraffic";
+
+	/**
+	 * A boolean controlling printing details when a SLP message is dropped for
+	 * any reason. 
      
+	 * 
      
+	 * Default is false.
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_TRACE_DROP = "net.slp.traceDrop";
+
+	/**
+	 * A boolean controlling printing of details on SLP messages. The fields in
+	 * all incoming messages and outgoing replies are printed. 
      
+	 * 
      
+	 * Default is false.
+	 */
+	public static final String NET_SLP_TRACE_MSG = "net.slp.traceMsg";
+
+	/**
+	 * A boolean controlling dumps of all registered services upon registration
+	 * and deregistration. If true, the contents of the DA or SA server are
+	 * dumped after a registration or deregistration occurs. 
      
+	 * 
      
+	 * Default is false.
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_TRACE_REG = "net.slp.traceReg";
+
+	/**
+	 * A value-list of service type names. In the absence of any DAs, UAs
+	 * perform SA discovery for finding scopes. These SA discovery requests may
+	 * contain a request for service types as an attribute.
      
+	 * 
      
+	 * The API implementation will use the service type names supplied by this
+	 * property to discover only those SAs (and their scopes) which support the
+	 * desired service type or types. For example, if net.slp.typeHint is set to
+	 * "service:imap,service:pop3" then SA discovery requests will include the
+	 * search filter:
      
+	 * 
      
+	 * (|(service-type=service:imap)(service-type=service:pop3))
      
+	 * 
      
+	 * 
+	 * The API library can also use unicast to contact the discovered SAs for
+	 * subsequent requests for these service types, to optimize network access.
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_TYPE_HINT = "net.slp.typeHint";
+
+	/**
+	 * A value-list of strings indicating the only scopes a UA or SA is allowed
+	 * to use when making requests or registering, or the scopes a DA must
+	 * support.
      
+	 * If not present for the DA and SA, then in the absence of scope
+	 * information from DHCP, the default scope "DEFAULT" is used. If not
+	 * present for the UA, and there is no scope information available from
+	 * DHCP, then the user scoping model is in force. 
      
+	 * Active and passive DA discovery or SA discovery are used for scope
+	 * discovery, and the scope "DEFAULT" is used if no other information is
+	 * available. 
      
+	 * If a DA or SA gets another scope in a request, a SCOPE_NOT_SUPPORTED
+	 * error should be returned, unless the request was multicast, in which case
+	 * it should be dropped. If a DA gets another scope in a registration, a
+	 * SCOPE_NOT_SUPPORTED error must be returned.
+	 */
+	public static final String NET_SLP_USE_SCOPES = "net.slp.useScopes";
+
+	/**
+	 * Trace level. Can be ALL, INFO, WARNING, ERROR, OFF
      
+	 * 
      
+	 * Not evaluated by SBLIM SLP client
+	 */
+	public static final String NET_SLP_TRC_LEVEL = "net.slp.trc.level";
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationAttribute.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttribute.java
similarity index 90%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationAttribute.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttribute.java
index 9bfe79a..4fcb435 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationAttribute.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttribute.java
@@ -1,406 +1,404 @@
-/*
-  ServiceLocationAttribute.java
-
-  (C) Copyright IBM Corp. 2005, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 1678915    2007-03-27  lupusalex    Integrated WBEM service discovery via SLP
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2795671    2009-05-22  raman_arora  Add Type to Comparable 
- * 2797696    2009-05-27  raman_arora  Input files use unsafe operations
- * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
- * 3022519    2010-06-30  blaschke-oss ServiceLocationAttribute.equals() compares same array
- * 3022524    2010-06-30  blaschke-oss iSortedValueEntries not serializable in Serializable class
- * 3023349    2010-07-02  blaschke-oss SLP uses # constructor instead of valueOf
- *    2650    2013-07-18  blaschke-oss SLP opaque value handling incorrect
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.cimclient.GenericExts;
-import org.sentrysoftware.wbem.sblim.slp.internal.AttributeHandler;
-import org.sentrysoftware.wbem.sblim.slp.internal.Convert;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPString;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-
-/**
- * Service location attribute
- */
-public class ServiceLocationAttribute implements Serializable {
-
-	private static final long serialVersionUID = -6753246108754657715L;
-
-	private Vector iValues;
-
-	private String iId;
-
-	/**
-	 * Construct a service location attribute. Errors in the id or values vector
-	 * result in an IllegalArgumentException.
-	 * 
-	 * @param pId
-	 *            The attribute name. The String can consist of any Unicode
-	 *            character.
-	 * @param pValues
-	 *            A Vector of one or more attribute values. Vector contents must
-	 *            be uniform in type and one of Integer, String, Boolean, or
-	 *            byte[]. If the attribute is a keyword attribute, then the
-	 *            parameter should be null. String values can consist of any
-	 *            Unicode character.
-	 */
-	public ServiceLocationAttribute(String pId, Vector pValues) {
-		this.iId = pId;
-		if (pValues != null && pValues.size() > 0) {
-			this.iValues = GenericExts.cloneVector(pValues);
-		}
-	}
-
-	/**
-	 * Construct a service location attribute from a String.
-	 * 
-	 * @param pString
-	 *            The string to parse
-	 * @throws ServiceLocationException
-	 *             When the string parsing failed
-	 */
-	public ServiceLocationAttribute(String pString) throws ServiceLocationException {
-		if (pString == null || pString.length() == 0) throw new ServiceLocationException(
-				ServiceLocationException.PARSE_ERROR,
-				"Empty or null String is not good for this constructor!");
-
-		if (pString.startsWith("(") && pString.endsWith(")")) {
-			int equalPos = pString.indexOf('=');
-			if (equalPos < 0) throw new ServiceLocationException(
-					ServiceLocationException.PARSE_ERROR, "Missing '=' from attribute string: "
-							+ pString);
-			this.iId = Convert.unescape(pString.substring(1, equalPos));
-			if (this.iId.length() == 0) throw new ServiceLocationException(
-					ServiceLocationException.PARSE_ERROR,
-					"Empty attribute ID in attribute string: " + pString);
-			String valueString = pString.substring(equalPos + 1, pString.length() - 1);
-
-			parseValueString(valueString);
-
-		} else {
-			if (pString.indexOf('(') >= 0 || pString.indexOf(')') >= 0) throw new ServiceLocationException(
-					ServiceLocationException.PARSE_ERROR);
-			this.iId = Convert.unescape(pString);
-			this.iValues = null;
-		}
-	}
-
-	/**
-	 * Returns an escaped version of the id parameter, suitable for inclusion in
-	 * a query. Any reserved characters as specified in [7] are escaped using
-	 * UTF-8 encoding. If any characters in the tag are illegal, throws
-	 * IllegalArgumentException.
-	 * 
-	 * @param pId
-	 *            The attribute id to escape. ServiceLocationException is thrown
-	 *            if any characters are illegal for an attribute tag.
-	 * @return The escaped version
-	 */
-	public static String escapeId(String pId) {
-		return Convert.escape(pId, Convert.ATTR_RESERVED);
-	}
-
-	/**
-	 * Returns a String containing the escaped value parameter as a string,
-	 * suitable for inclusion in a query. If the parameter is a string, any
-	 * reserved characters as specified in [7] are escaped using UTF-8 encoding.
-	 * If the parameter is a byte array, then the escaped string begins with the
-	 * nonUTF-8 sequence `\ff` and the rest of the string consists of the
-	 * escaped bytes, which is the encoding for opaque. If the value parameter
-	 * is a Boolean or Integer, then the returned string contains the object
-	 * converted into a string. If the value is any type other than String,
-	 * Integer, Boolean or byte[], an IllegalArgumentException is thrown.
-	 * 
-	 * @param pValue
-	 *            The attribute value to be converted into a string and escaped.
-	 * @return The escaped value
-	 */
-	public static String escapeValue(Object pValue) {
-		return AttributeHandler.escapeValue(pValue);
-	}
-
-	/**
-	 * Returns a cloned vector of attribute values, or null if the attribute is
-	 * a keyword attribute. If the attribute is single-valued, then the vector
-	 * contains only one object.
-	 * 
-	 * @return The value vector
-	 * 
-	 */
-	public Vector getValues() {
-		if (this.iValues != null) return GenericExts.cloneVector(this.iValues);
-		return this.iValues;
-	}
-
-	/**
-	 * Returns the attribute's name.
-	 * 
-	 * @return The name (id)
-	 */
-	public String getId() {
-		return this.iId;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 * 
-	 * Overrides Object.equals(). Two attributes are equal if their identifiers
-	 * are equal and their value vectors contain the same number of equal values
-	 * as determined by the Object equals() method. Values having byte[] type
-	 * are equal if the contents of all byte arrays in both attribute vectors
-	 * match. Note that the SLP string matching algorithm [7] MUST NOT be used
-	 * for comparing attribute identifiers or string values.
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == this) return true;
-		if (!(obj instanceof ServiceLocationAttribute)) return false;
-
-		ServiceLocationAttribute that = (ServiceLocationAttribute) obj;
-		if (!that.getId().equalsIgnoreCase(this.iId)) return false;
-
-		Vector thatValues = that.iValues;
-		if (this.iValues == null) return thatValues == null;
-		if (thatValues == null) return false;
-		if (this.iValues.size() != thatValues.size()) return false;
-
-		ValueEntry[] thisEntries = getSortedValueEntries();
-		ValueEntry[] thatEntries = that.getSortedValueEntries();
-
-		return Arrays.equals(thisEntries, thatEntries);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 * 
-	 * Overrides Object.toString(). The string returned contains a formatted
-	 * representation of the attribute, giving the attribute's id, values, and
-	 * the Java type of the values. The returned string is suitable for
-	 * debugging purposes, but is not in SLP wire format.
-	 */
-	@Override
-	public String toString() {
-		StringBuffer stringbuffer = new StringBuffer("(");
-		stringbuffer.append(this.iId);
-		if (this.iValues != null) {
-			stringbuffer.append("=");
-			int size = this.iValues.size();
-			for (int i = 0; i < size; i++) {
-				Object obj = this.iValues.elementAt(i);
-				if (i > 0) {
-					stringbuffer.append(",");
-				}
-				if (obj instanceof byte[]) obj = AttributeHandler.mkOpaqueStr((byte[]) obj);
-				stringbuffer.append(obj.toString());
-			}
-
-		}
-		stringbuffer.append(")");
-		return stringbuffer.toString();
-	}
-
-	private int iHashCode = 0;
-
-	private void incHashCode(int pHashCode) {
-		this.iHashCode *= 31;
-		this.iHashCode += pHashCode;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 * 
-	 * Overrides Object.hashCode(). Hashes on the attribute's identifier.
-	 */
-	@Override
-	public int hashCode() {
-		if (this.iHashCode == 0) {
-			this.iHashCode = this.iId.hashCode();
-			if (this.iValues != null) {
-				ValueEntry[] valueEntries = getSortedValueEntries();
-				for (int i = 0; i < valueEntries.length; i++)
-					incHashCode(valueEntries[i].hashCode());
-			}
-		}
-		return this.iHashCode;
-	}
-
-	private void parseValueString(String pStr) throws ServiceLocationException {
-		StringTokenizer tokenizer = new StringTokenizer(pStr, ",");
-		this.iValues = new Vector();
-		while (tokenizer.hasMoreElements()) {
-			String valueStr = tokenizer.nextToken();
-			Object value;
-			try {
-				int intVal = Integer.parseInt(valueStr);
-				value = Integer.valueOf(intVal);
-			} catch (NumberFormatException e) {
-				if ("TRUE".equalsIgnoreCase(valueStr)) {
-					value = Boolean.TRUE;
-				} else if ("FALSE".equalsIgnoreCase(valueStr)) {
-					value = Boolean.FALSE;
-				} else if (valueStr.startsWith("\\FF")) {
-					value = parseOpaqueStr(valueStr);
-				} else {
-					value = Convert.unescape(valueStr);
-				}
-			}
-			this.iValues.add(value);
-		}
-	}
-
-	private static byte[] parseOpaqueStr(String pStr) throws ServiceLocationException {
-		if (pStr.length() == 3) throw new ServiceLocationException(
-				ServiceLocationException.PARSE_ERROR,
-				"There must be at least three characters after \\FF in opaque string!" + " pStr="
-						+ pStr);
-
-		ByteArrayOutputStream oStr = new ByteArrayOutputStream();
-		int pos = 3; // skip "\\FF"
-		int left;
-		while ((left = pStr.length() - pos) > 0) {
-			if (left < 3) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-					"Number of characters must be multiple of three after \\FF in opaque string!"
-							+ " pStr=" + pStr);
-			if (pStr.charAt(pos) != '\\') throw new ServiceLocationException(
-					ServiceLocationException.PARSE_ERROR,
-					"Hex value must be preceded by \\ in opaque string!" + " pStr=" + pStr);
-			String hexStr = pStr.substring(pos + 1, pos + 3);
-			pos += 3;
-			try {
-				oStr.write(Integer.parseInt(hexStr, 16));
-			} catch (NumberFormatException e) {
-				throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-						"Failed to parse hex value: " + hexStr + " in opaque string: " + pStr
-								+ " !");
-			}
-		}
-		return oStr.toByteArray();
-	}
-
-	static class ValueEntry implements Comparable {
-
-		/**
-		 * iStr
-		 */
-		public String iStr;
-
-		/**
-		 * iValue
-		 */
-		public Object iValue;
-
-		public int compareTo(ValueEntry o) {
-			ValueEntry that = o;
-			return this.iStr.compareTo(that.iStr);
-		}
-
-		@Override
-		public boolean equals(Object pObj) {
-			if (this == pObj) return true;
-			if (!(pObj instanceof ValueEntry)) return false;
-			ValueEntry that = (ValueEntry) pObj;
-			if (this.iValue == null) return that.iValue == null;
-			if (that.iValue == null) return false;
-			if (!this.iValue.getClass().equals(that.iValue.getClass())) return false;
-			if (this.iValue instanceof byte[]) return Arrays.equals((byte[]) this.iValue,
-					(byte[]) that.iValue);
-			if (this.iValue instanceof String) return this.iStr.equals(that.iStr);
-			return this.iValue.equals(that.iValue);
-		}
-
-		@Override
-		public int hashCode() {
-			return this.iStr == null ? 1 : this.iStr.hashCode();
-		}
-
-	}
-
-	private transient ValueEntry[] iSortedValueEntries;
-
-	/**
-	 * Used for equals check and hashCode calculation.
-	 * 
-	 * @param pAttrib
-	 * @return attribute values in unified order, which is : values are sorted
-	 *         by theirs toString().
-	 */
-	private ValueEntry[] getSortedValueEntries() {
-		if (this.iValues == null) return null;
-		if (this.iSortedValueEntries != null) return this.iSortedValueEntries;
-		this.iSortedValueEntries = new ValueEntry[this.iValues.size()];
-		for (int i = 0; i < this.iValues.size(); i++) {
-			ValueEntry entry = new ValueEntry();
-			this.iSortedValueEntries[i] = entry;
-			Object value = this.iValues.get(i);
-			entry.iValue = value;
-			if (value == null) {
-				entry.iStr = "";
-			} else {
-				if (value instanceof String) {
-					entry.iStr = SLPString.unify((String) value);
-				} else if (value instanceof byte[]) {
-					entry.iStr = AttributeHandler.mkOpaqueStr((byte[]) value);
-				} else {
-					entry.iStr = value.toString();
-				}
-			}
-		}
-		Arrays.sort(this.iSortedValueEntries);
-		return this.iSortedValueEntries;
-	}
-
-}
+/*
+  ServiceLocationAttribute.java
+
+  (C) Copyright IBM Corp. 2005, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 1678915    2007-03-27  lupusalex    Integrated WBEM service discovery via SLP
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2795671    2009-05-22  raman_arora  Add Type to Comparable 
+ * 2797696    2009-05-27  raman_arora  Input files use unsafe operations
+ * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
+ * 3022519    2010-06-30  blaschke-oss ServiceLocationAttribute.equals() compares same array
+ * 3022524    2010-06-30  blaschke-oss iSortedValueEntries not serializable in Serializable class
+ * 3023349    2010-07-02  blaschke-oss SLP uses # constructor instead of valueOf
+ *    2650    2013-07-18  blaschke-oss SLP opaque value handling incorrect
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.metricshub.wbem.sblim.cimclient.GenericExts;
+import org.metricshub.wbem.sblim.slp.internal.AttributeHandler;
+import org.metricshub.wbem.sblim.slp.internal.Convert;
+import org.metricshub.wbem.sblim.slp.internal.SLPString;
+
+
+/**
+ * Service location attribute
+ */
+public class ServiceLocationAttribute implements Serializable {
+
+	private static final long serialVersionUID = -6753246108754657715L;
+
+	private Vector iValues;
+
+	private String iId;
+
+	/**
+	 * Construct a service location attribute. Errors in the id or values vector
+	 * result in an IllegalArgumentException.
+	 * 
+	 * @param pId
+	 *            The attribute name. The String can consist of any Unicode
+	 *            character.
+	 * @param pValues
+	 *            A Vector of one or more attribute values. Vector contents must
+	 *            be uniform in type and one of Integer, String, Boolean, or
+	 *            byte[]. If the attribute is a keyword attribute, then the
+	 *            parameter should be null. String values can consist of any
+	 *            Unicode character.
+	 */
+	public ServiceLocationAttribute(String pId, Vector pValues) {
+		this.iId = pId;
+		if (pValues != null && pValues.size() > 0) {
+			this.iValues = GenericExts.cloneVector(pValues);
+		}
+	}
+
+	/**
+	 * Construct a service location attribute from a String.
+	 * 
+	 * @param pString
+	 *            The string to parse
+	 * @throws ServiceLocationException
+	 *             When the string parsing failed
+	 */
+	public ServiceLocationAttribute(String pString) throws ServiceLocationException {
+		if (pString == null || pString.length() == 0) throw new ServiceLocationException(
+				ServiceLocationException.PARSE_ERROR,
+				"Empty or null String is not good for this constructor!");
+
+		if (pString.startsWith("(") && pString.endsWith(")")) {
+			int equalPos = pString.indexOf('=');
+			if (equalPos < 0) throw new ServiceLocationException(
+					ServiceLocationException.PARSE_ERROR, "Missing '=' from attribute string: "
+							+ pString);
+			this.iId = Convert.unescape(pString.substring(1, equalPos));
+			if (this.iId.length() == 0) throw new ServiceLocationException(
+					ServiceLocationException.PARSE_ERROR,
+					"Empty attribute ID in attribute string: " + pString);
+			String valueString = pString.substring(equalPos + 1, pString.length() - 1);
+
+			parseValueString(valueString);
+
+		} else {
+			if (pString.indexOf('(') >= 0 || pString.indexOf(')') >= 0) throw new ServiceLocationException(
+					ServiceLocationException.PARSE_ERROR);
+			this.iId = Convert.unescape(pString);
+			this.iValues = null;
+		}
+	}
+
+	/**
+	 * Returns an escaped version of the id parameter, suitable for inclusion in
+	 * a query. Any reserved characters as specified in [7] are escaped using
+	 * UTF-8 encoding. If any characters in the tag are illegal, throws
+	 * IllegalArgumentException.
+	 * 
+	 * @param pId
+	 *            The attribute id to escape. ServiceLocationException is thrown
+	 *            if any characters are illegal for an attribute tag.
+	 * @return The escaped version
+	 */
+	public static String escapeId(String pId) {
+		return Convert.escape(pId, Convert.ATTR_RESERVED);
+	}
+
+	/**
+	 * Returns a String containing the escaped value parameter as a string,
+	 * suitable for inclusion in a query. If the parameter is a string, any
+	 * reserved characters as specified in [7] are escaped using UTF-8 encoding.
+	 * If the parameter is a byte array, then the escaped string begins with the
+	 * nonUTF-8 sequence `\ff` and the rest of the string consists of the
+	 * escaped bytes, which is the encoding for opaque. If the value parameter
+	 * is a Boolean or Integer, then the returned string contains the object
+	 * converted into a string. If the value is any type other than String,
+	 * Integer, Boolean or byte[], an IllegalArgumentException is thrown.
+	 * 
+	 * @param pValue
+	 *            The attribute value to be converted into a string and escaped.
+	 * @return The escaped value
+	 */
+	public static String escapeValue(Object pValue) {
+		return AttributeHandler.escapeValue(pValue);
+	}
+
+	/**
+	 * Returns a cloned vector of attribute values, or null if the attribute is
+	 * a keyword attribute. If the attribute is single-valued, then the vector
+	 * contains only one object.
+	 * 
+	 * @return The value vector
+	 * 
+	 */
+	public Vector getValues() {
+		if (this.iValues != null) return GenericExts.cloneVector(this.iValues);
+		return this.iValues;
+	}
+
+	/**
+	 * Returns the attribute's name.
+	 * 
+	 * @return The name (id)
+	 */
+	public String getId() {
+		return this.iId;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 * 
+	 * Overrides Object.equals(). Two attributes are equal if their identifiers
+	 * are equal and their value vectors contain the same number of equal values
+	 * as determined by the Object equals() method. Values having byte[] type
+	 * are equal if the contents of all byte arrays in both attribute vectors
+	 * match. Note that the SLP string matching algorithm [7] MUST NOT be used
+	 * for comparing attribute identifiers or string values.
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) return true;
+		if (!(obj instanceof ServiceLocationAttribute)) return false;
+
+		ServiceLocationAttribute that = (ServiceLocationAttribute) obj;
+		if (!that.getId().equalsIgnoreCase(this.iId)) return false;
+
+		Vector thatValues = that.iValues;
+		if (this.iValues == null) return thatValues == null;
+		if (thatValues == null) return false;
+		if (this.iValues.size() != thatValues.size()) return false;
+
+		ValueEntry[] thisEntries = getSortedValueEntries();
+		ValueEntry[] thatEntries = that.getSortedValueEntries();
+
+		return Arrays.equals(thisEntries, thatEntries);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 * 
+	 * Overrides Object.toString(). The string returned contains a formatted
+	 * representation of the attribute, giving the attribute's id, values, and
+	 * the Java type of the values. The returned string is suitable for
+	 * debugging purposes, but is not in SLP wire format.
+	 */
+	@Override
+	public String toString() {
+		StringBuffer stringbuffer = new StringBuffer("(");
+		stringbuffer.append(this.iId);
+		if (this.iValues != null) {
+			stringbuffer.append("=");
+			int size = this.iValues.size();
+			for (int i = 0; i < size; i++) {
+				Object obj = this.iValues.elementAt(i);
+				if (i > 0) {
+					stringbuffer.append(",");
+				}
+				if (obj instanceof byte[]) obj = AttributeHandler.mkOpaqueStr((byte[]) obj);
+				stringbuffer.append(obj.toString());
+			}
+
+		}
+		stringbuffer.append(")");
+		return stringbuffer.toString();
+	}
+
+	private int iHashCode = 0;
+
+	private void incHashCode(int pHashCode) {
+		this.iHashCode *= 31;
+		this.iHashCode += pHashCode;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#hashCode()
+	 * 
+	 * Overrides Object.hashCode(). Hashes on the attribute's identifier.
+	 */
+	@Override
+	public int hashCode() {
+		if (this.iHashCode == 0) {
+			this.iHashCode = this.iId.hashCode();
+			if (this.iValues != null) {
+				ValueEntry[] valueEntries = getSortedValueEntries();
+				for (int i = 0; i < valueEntries.length; i++)
+					incHashCode(valueEntries[i].hashCode());
+			}
+		}
+		return this.iHashCode;
+	}
+
+	private void parseValueString(String pStr) throws ServiceLocationException {
+		StringTokenizer tokenizer = new StringTokenizer(pStr, ",");
+		this.iValues = new Vector();
+		while (tokenizer.hasMoreElements()) {
+			String valueStr = tokenizer.nextToken();
+			Object value;
+			try {
+				int intVal = Integer.parseInt(valueStr);
+				value = Integer.valueOf(intVal);
+			} catch (NumberFormatException e) {
+				if ("TRUE".equalsIgnoreCase(valueStr)) {
+					value = Boolean.TRUE;
+				} else if ("FALSE".equalsIgnoreCase(valueStr)) {
+					value = Boolean.FALSE;
+				} else if (valueStr.startsWith("\\FF")) {
+					value = parseOpaqueStr(valueStr);
+				} else {
+					value = Convert.unescape(valueStr);
+				}
+			}
+			this.iValues.add(value);
+		}
+	}
+
+	private static byte[] parseOpaqueStr(String pStr) throws ServiceLocationException {
+		if (pStr.length() == 3) throw new ServiceLocationException(
+				ServiceLocationException.PARSE_ERROR,
+				"There must be at least three characters after \\FF in opaque string!" + " pStr="
+						+ pStr);
+
+		ByteArrayOutputStream oStr = new ByteArrayOutputStream();
+		int pos = 3; // skip "\\FF"
+		int left;
+		while ((left = pStr.length() - pos) > 0) {
+			if (left < 3) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
+					"Number of characters must be multiple of three after \\FF in opaque string!"
+							+ " pStr=" + pStr);
+			if (pStr.charAt(pos) != '\\') throw new ServiceLocationException(
+					ServiceLocationException.PARSE_ERROR,
+					"Hex value must be preceded by \\ in opaque string!" + " pStr=" + pStr);
+			String hexStr = pStr.substring(pos + 1, pos + 3);
+			pos += 3;
+			try {
+				oStr.write(Integer.parseInt(hexStr, 16));
+			} catch (NumberFormatException e) {
+				throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
+						"Failed to parse hex value: " + hexStr + " in opaque string: " + pStr
+								+ " !");
+			}
+		}
+		return oStr.toByteArray();
+	}
+
+	static class ValueEntry implements Comparable {
+
+		/**
+		 * iStr
+		 */
+		public String iStr;
+
+		/**
+		 * iValue
+		 */
+		public Object iValue;
+
+		public int compareTo(ValueEntry o) {
+			ValueEntry that = o;
+			return this.iStr.compareTo(that.iStr);
+		}
+
+		@Override
+		public boolean equals(Object pObj) {
+			if (this == pObj) return true;
+			if (!(pObj instanceof ValueEntry)) return false;
+			ValueEntry that = (ValueEntry) pObj;
+			if (this.iValue == null) return that.iValue == null;
+			if (that.iValue == null) return false;
+			if (!this.iValue.getClass().equals(that.iValue.getClass())) return false;
+			if (this.iValue instanceof byte[]) return Arrays.equals((byte[]) this.iValue,
+					(byte[]) that.iValue);
+			if (this.iValue instanceof String) return this.iStr.equals(that.iStr);
+			return this.iValue.equals(that.iValue);
+		}
+
+		@Override
+		public int hashCode() {
+			return this.iStr == null ? 1 : this.iStr.hashCode();
+		}
+
+	}
+
+	private transient ValueEntry[] iSortedValueEntries;
+
+	/**
+	 * Used for equals check and hashCode calculation.
+	 * 
+	 * @param pAttrib
+	 * @return attribute values in unified order, which is : values are sorted
+	 *         by theirs toString().
+	 */
+	private ValueEntry[] getSortedValueEntries() {
+		if (this.iValues == null) return null;
+		if (this.iSortedValueEntries != null) return this.iSortedValueEntries;
+		this.iSortedValueEntries = new ValueEntry[this.iValues.size()];
+		for (int i = 0; i < this.iValues.size(); i++) {
+			ValueEntry entry = new ValueEntry();
+			this.iSortedValueEntries[i] = entry;
+			Object value = this.iValues.get(i);
+			entry.iValue = value;
+			if (value == null) {
+				entry.iStr = "";
+			} else {
+				if (value instanceof String) {
+					entry.iStr = SLPString.unify((String) value);
+				} else if (value instanceof byte[]) {
+					entry.iStr = AttributeHandler.mkOpaqueStr((byte[]) value);
+				} else {
+					entry.iStr = value.toString();
+				}
+			}
+		}
+		Arrays.sort(this.iSortedValueEntries);
+		return this.iSortedValueEntries;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java
index 4d2e5a9..b5b0029 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java
@@ -1,166 +1,164 @@
-/*
-  ServiceLocationAttributeDescriptor.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Enumeration;
-
-/**
- * The ServiceLocationAttributeDescriptor interface provides introspection on a
- * template attribute definition (see RFC 2609). Classes implementing the
- * ServiceLocationAttributeDescriptor interface return information on a
- * particular service location attribute definition from the service template.
- * This information is primarily for GUI tools. Programmatic attribute
- * verification should be done through the ServiceLocationAttributeVerifier.
- * 
- */
-public interface ServiceLocationAttributeDescriptor {
-
-	/**
-	 * Return a String containing the attribute's id.
-	 * 
-	 * @return The id
-	 */
-	public abstract String getId();
-
-	/**
-	 * Returns a String containing the fully package-qualified Java type of the
-	 * attribute. SLP types are translated into Java types as follows: 
      
-	 * 
      
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
-	 * 
      SLPJava
      STRING"java.lang.String"
      INTEGER"java.lang.Integer"
      BOOLEAN"java.lang.Boolean"
      OPAQUE"[B" (byte[])
      KEYWORD"" (empty string)
      
-	 * 
-	 * @return The Java type
-	 */
-	public abstract String getValueType();
-
-	/**
-	 * Return a String containing the attribute's help text.
-	 * 
-	 * @return The description
-	 */
-	public abstract String getDescription();
-
-	/**
-	 * Return an Enumeration of allowed values for the attribute type. For
-	 * keyword attributes returns null. For no allowed values (i.e.
-	 * unrestricted) returns an empty Enumeration.
-	 * 
-	 * @return The allowed values
-	 */
-	public abstract Enumeration getAllowedValues();
-
-	/**
-	 * Return an Enumeration of default values for the attribute type. For
-	 * keyword attributes returns null. For no allowed values (i.e.
-	 * unrestricted) returns an empty Enumeration.
-	 * 
-	 * @return The default values
-	 */
-	public abstract Enumeration getDefaultValues();
-
-	/**
-	 * Returns true if the "X" flag is set, indicating that the attribute should
-	 * be included in an any Locator.findServices() request search filter.
-	 * 
-	 * @return true if "X" is set, false otherwise
-	 */
-	public abstract boolean getRequiresExplicitMatch();
-
-	/**
-	 * Returns true if the "M" flag is set.
-	 * 
-	 * @return true if "M" is set, false otherwise
-	 */
-	public abstract boolean getIsMultivalued();
-
-	/**
-	 * Returns true if the "O"" flag is set.
-	 * 
-	 * @return true if "O" is set, false otherwise
-	 */
-	public abstract boolean getIsOptional();
-
-	/**
-	 * Returns true if the "L" flag is set.
-	 * 
-	 * @return true if "L" is set, false otherwise
-	 */
-	public abstract boolean getIsLiteral();
-
-	/**
-	 * Returns true if the attribute is a keyword attribute.
-	 * 
-	 * @return true if the attribute is a keyword,
-	 *         false otherwise
-	 */
-	public abstract boolean getIsKeyword();
-
-}
+/*
+  ServiceLocationAttributeDescriptor.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Enumeration;
+
+/**
+ * The ServiceLocationAttributeDescriptor interface provides introspection on a
+ * template attribute definition (see RFC 2609). Classes implementing the
+ * ServiceLocationAttributeDescriptor interface return information on a
+ * particular service location attribute definition from the service template.
+ * This information is primarily for GUI tools. Programmatic attribute
+ * verification should be done through the ServiceLocationAttributeVerifier.
+ * 
+ */
+public interface ServiceLocationAttributeDescriptor {
+
+	/**
+	 * Return a String containing the attribute's id.
+	 * 
+	 * @return The id
+	 */
+	public abstract String getId();
+
+	/**
+	 * Returns a String containing the fully package-qualified Java type of the
+	 * attribute. SLP types are translated into Java types as follows: 
      
+	 * 
      
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
+	 * 
      SLPJava
      STRING"java.lang.String"
      INTEGER"java.lang.Integer"
      BOOLEAN"java.lang.Boolean"
      OPAQUE"[B" (byte[])
      KEYWORD"" (empty string)
      
+	 * 
+	 * @return The Java type
+	 */
+	public abstract String getValueType();
+
+	/**
+	 * Return a String containing the attribute's help text.
+	 * 
+	 * @return The description
+	 */
+	public abstract String getDescription();
+
+	/**
+	 * Return an Enumeration of allowed values for the attribute type. For
+	 * keyword attributes returns null. For no allowed values (i.e.
+	 * unrestricted) returns an empty Enumeration.
+	 * 
+	 * @return The allowed values
+	 */
+	public abstract Enumeration getAllowedValues();
+
+	/**
+	 * Return an Enumeration of default values for the attribute type. For
+	 * keyword attributes returns null. For no allowed values (i.e.
+	 * unrestricted) returns an empty Enumeration.
+	 * 
+	 * @return The default values
+	 */
+	public abstract Enumeration getDefaultValues();
+
+	/**
+	 * Returns true if the "X" flag is set, indicating that the attribute should
+	 * be included in an any Locator.findServices() request search filter.
+	 * 
+	 * @return true if "X" is set, false otherwise
+	 */
+	public abstract boolean getRequiresExplicitMatch();
+
+	/**
+	 * Returns true if the "M" flag is set.
+	 * 
+	 * @return true if "M" is set, false otherwise
+	 */
+	public abstract boolean getIsMultivalued();
+
+	/**
+	 * Returns true if the "O"" flag is set.
+	 * 
+	 * @return true if "O" is set, false otherwise
+	 */
+	public abstract boolean getIsOptional();
+
+	/**
+	 * Returns true if the "L" flag is set.
+	 * 
+	 * @return true if "L" is set, false otherwise
+	 */
+	public abstract boolean getIsLiteral();
+
+	/**
+	 * Returns true if the attribute is a keyword attribute.
+	 * 
+	 * @return true if the attribute is a keyword,
+	 *         false otherwise
+	 */
+	public abstract boolean getIsKeyword();
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationAttributeVerifier.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeVerifier.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationAttributeVerifier.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeVerifier.java
index 34e63cf..c9431b0 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationAttributeVerifier.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeVerifier.java
@@ -1,155 +1,153 @@
-/*
-  ServiceLocationAttributeVerifier.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Vector;
-
-/**
- * The ServiceLocationAttributeVerifier provides access to service templates.
- * Classes implementing this interface parse SLP template definitions, provide
- * information on attribute definitions for service types, and verify whether a
- * ServiceLocationAttribute object matches a template for a particular service
- * type. Clients obtain ServiceLocationAttributeVerifier objects for specific
- * SLP service types through the TemplateRegistry.
- * 
- * 
- */
-public interface ServiceLocationAttributeVerifier {
-
-	/**
-	 * Returns the SLP service type for which this is the verifier.
-	 * 
-	 * @return The service type
-	 */
-	public abstract ServiceType getServiceType();
-
-	/**
-	 * Return the language locale of the template.
-	 * 
-	 * @return The locale
-	 */
-	public abstract Locale getLocale();
-
-	/**
-	 * Return the template version number identifier.
-	 * 
-	 * @return The version
-	 */
-	public abstract String getVersion();
-
-	/**
-	 * Return the URL syntax expression for the service: URL.
-	 * 
-	 * @return The url syntax
-	 */
-	public abstract String getURLSyntax();
-
-	/**
-	 * Return the descriptive help text for the template.
-	 * 
-	 * @return The description
-	 */
-	public abstract String getDescription();
-
-	/**
-	 * Return the ServiceLocationAttributeDescriptor for the attribute having
-	 * the named id. If no such attribute exists in this template, return null.
-	 * This method is primarily for GUI tools to display attribute information.
-	 * Programmatic verification of attributes should use the verifyAttribute()
-	 * method.
-	 * 
-	 * @param pAttributeId
-	 *            The attribute id
-	 * @return The descriptor
-	 */
-	public abstract ServiceLocationAttributeDescriptor getAttributeDescriptor(String pAttributeId);
-
-	/**
-	 * Returns an Enumeration allowing introspection on the attribute definition
-	 * in the service template. The Enumeration returns
-	 * ServiceLocationAttributeDescriptor objects for the attributes. This
-	 * method is primarily for GUI tools to display attribute information.
-	 * Programmatic verification of attributes should use the verifyAttribute()
-	 * method.
-	 * 
-	 * @return Enumeration of attribute descriptors
-	 */
-	public abstract Enumeration getAttributeDescriptors();
-
-	/**
-	 * Verify that the attribute matches the template definition. If the
-	 * attribute doesn't match, ServiceLocationException is thrown with the
-	 * error code as ServiceLocationException.PARSE_ERROR.
-	 * 
-	 * @param pAttribute
-	 *            The ServiceLocationAttribute object to be verified.
-	 * @throws ServiceLocationException
-	 *             if validation failed
-	 * 
-	 */
-	public abstract void verifyAttribute(ServiceLocationAttribute pAttribute)
-			throws ServiceLocationException;
-
-	/**
-	 * Verify that the Vector of ServiceLocationAttribute objects matches the
-	 * template for this service type. The vector must contain all the required
-	 * attributes, and all attributes must match their template definitions. If
-	 * the attributes don't match, ServiceLocationException is thrown with the
-	 * error code as ServiceLocationException.PARSE_ERROR
-	 * 
-	 * @param pAttributeVector
-	 *            A Vector of ServiceLocationAttribute objects for the
-	 *            registration.
-	 * @throws ServiceLocationException
-	 *             if attributes don't match
-	 */
-	public abstract void verifyRegistration(Vector pAttributeVector)
-			throws ServiceLocationException;
-
-}
+/*
+  ServiceLocationAttributeVerifier.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Vector;
+
+/**
+ * The ServiceLocationAttributeVerifier provides access to service templates.
+ * Classes implementing this interface parse SLP template definitions, provide
+ * information on attribute definitions for service types, and verify whether a
+ * ServiceLocationAttribute object matches a template for a particular service
+ * type. Clients obtain ServiceLocationAttributeVerifier objects for specific
+ * SLP service types through the TemplateRegistry.
+ * 
+ * 
+ */
+public interface ServiceLocationAttributeVerifier {
+
+	/**
+	 * Returns the SLP service type for which this is the verifier.
+	 * 
+	 * @return The service type
+	 */
+	public abstract ServiceType getServiceType();
+
+	/**
+	 * Return the language locale of the template.
+	 * 
+	 * @return The locale
+	 */
+	public abstract Locale getLocale();
+
+	/**
+	 * Return the template version number identifier.
+	 * 
+	 * @return The version
+	 */
+	public abstract String getVersion();
+
+	/**
+	 * Return the URL syntax expression for the service: URL.
+	 * 
+	 * @return The url syntax
+	 */
+	public abstract String getURLSyntax();
+
+	/**
+	 * Return the descriptive help text for the template.
+	 * 
+	 * @return The description
+	 */
+	public abstract String getDescription();
+
+	/**
+	 * Return the ServiceLocationAttributeDescriptor for the attribute having
+	 * the named id. If no such attribute exists in this template, return null.
+	 * This method is primarily for GUI tools to display attribute information.
+	 * Programmatic verification of attributes should use the verifyAttribute()
+	 * method.
+	 * 
+	 * @param pAttributeId
+	 *            The attribute id
+	 * @return The descriptor
+	 */
+	public abstract ServiceLocationAttributeDescriptor getAttributeDescriptor(String pAttributeId);
+
+	/**
+	 * Returns an Enumeration allowing introspection on the attribute definition
+	 * in the service template. The Enumeration returns
+	 * ServiceLocationAttributeDescriptor objects for the attributes. This
+	 * method is primarily for GUI tools to display attribute information.
+	 * Programmatic verification of attributes should use the verifyAttribute()
+	 * method.
+	 * 
+	 * @return Enumeration of attribute descriptors
+	 */
+	public abstract Enumeration getAttributeDescriptors();
+
+	/**
+	 * Verify that the attribute matches the template definition. If the
+	 * attribute doesn't match, ServiceLocationException is thrown with the
+	 * error code as ServiceLocationException.PARSE_ERROR.
+	 * 
+	 * @param pAttribute
+	 *            The ServiceLocationAttribute object to be verified.
+	 * @throws ServiceLocationException
+	 *             if validation failed
+	 * 
+	 */
+	public abstract void verifyAttribute(ServiceLocationAttribute pAttribute)
+			throws ServiceLocationException;
+
+	/**
+	 * Verify that the Vector of ServiceLocationAttribute objects matches the
+	 * template for this service type. The vector must contain all the required
+	 * attributes, and all attributes must match their template definitions. If
+	 * the attributes don't match, ServiceLocationException is thrown with the
+	 * error code as ServiceLocationException.PARSE_ERROR
+	 * 
+	 * @param pAttributeVector
+	 *            A Vector of ServiceLocationAttribute objects for the
+	 *            registration.
+	 * @throws ServiceLocationException
+	 *             if attributes don't match
+	 */
+	public abstract void verifyRegistration(Vector pAttributeVector)
+			throws ServiceLocationException;
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationEnumeration.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationEnumeration.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationEnumeration.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationEnumeration.java
index a42bfb6..8045954 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationEnumeration.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationEnumeration.java
@@ -1,92 +1,90 @@
-/*
-  ServiceLocationEnumeration.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-
-/**
- * The ServiceLocationEnumeration class is the return type for all Locator SLP
- * operations. The Java API library may implement this class to block until
- * results are available from the SLP operation, so that the client can achieve
- * asynchronous operation by retrieving results from the enumeration in a
- * separate thread. Clients use the superclass nextElement() method if they are
- * unconcerned with SLP exceptions (this method will never ever throw one).
- */
-public interface ServiceLocationEnumeration extends Enumeration {
-
-	/**
-	 * Return the next value or block until it becomes available.
-	 * 
-	 * @return The next value
-	 * @throws ServiceLocationException
-	 *             Thrown if the SLP operation encounters an error.
-	 * @throws NoSuchElementException
-	 *             If there are no more elements to return.
-	 */
-	public abstract Object next() throws ServiceLocationException, NoSuchElementException;
-
-	/**
-	 * @return next Object in Exception table
-	 * @throws NoSuchElementException
-	 * 
-	 *             This in internal implementation to get list of all exceptions
-	 *             thrown/caught by parser This can throw RuntimeExceptions.
-	 *             They can be ignored or used for analysis.
-	 * 
-	 *             use hasNextException to check whether there exists another
-	 *             element in Exception table
-	 */
-	public abstract Object nextException() throws NoSuchElementException;
-
-	/**
-	 * @return true if there exists another element in Exception table
-	 * 
-	 */
-	public abstract boolean hasMoreExceptions();
-}
+/*
+  ServiceLocationEnumeration.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+
+/**
+ * The ServiceLocationEnumeration class is the return type for all Locator SLP
+ * operations. The Java API library may implement this class to block until
+ * results are available from the SLP operation, so that the client can achieve
+ * asynchronous operation by retrieving results from the enumeration in a
+ * separate thread. Clients use the superclass nextElement() method if they are
+ * unconcerned with SLP exceptions (this method will never ever throw one).
+ */
+public interface ServiceLocationEnumeration extends Enumeration {
+
+	/**
+	 * Return the next value or block until it becomes available.
+	 * 
+	 * @return The next value
+	 * @throws ServiceLocationException
+	 *             Thrown if the SLP operation encounters an error.
+	 * @throws NoSuchElementException
+	 *             If there are no more elements to return.
+	 */
+	public abstract Object next() throws ServiceLocationException, NoSuchElementException;
+
+	/**
+	 * @return next Object in Exception table
+	 * @throws NoSuchElementException
+	 * 
+	 *             This in internal implementation to get list of all exceptions
+	 *             thrown/caught by parser This can throw RuntimeExceptions.
+	 *             They can be ignored or used for analysis.
+	 * 
+	 *             use hasNextException to check whether there exists another
+	 *             element in Exception table
+	 */
+	public abstract Object nextException() throws NoSuchElementException;
+
+	/**
+	 * @return true if there exists another element in Exception table
+	 * 
+	 */
+	public abstract boolean hasMoreExceptions();
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationException.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationException.java
similarity index 86%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationException.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationException.java
index 71ae593..30c126d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationException.java
@@ -1,262 +1,260 @@
-/*
-  ServiceLocationException.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * The ServiceLocationException class is thrown by all methods when exceptional
- * conditions occur in the SLP framework. The error code property determines the
- * exact nature of the condition, and an optional message may provide more
- * information.
- */
-public class ServiceLocationException extends Exception {
-
-	private static final long serialVersionUID = 6414188770647750627L;
-
-	/**
-	 * OK
-	 */
-	public static final short OK = 0;
-
-	/**
-	 * There is data for the service type in the scope in the AttrRqst or
-	 * SrvRqst, but not in the requested language.
-	 */
-	public static final short LANGUAGE_NOT_SUPPORTED = 1;
-
-	/**
-	 * The message fails to obey SLP syntax.
-	 */
-	public static final short PARSE_ERROR = 2;
-
-	/**
-	 * The SrvReg has problems -- e.g., a zero lifetime or an omitted Language
-	 * Tag.
-	 */
-	public static final short INVALID_REGISTRATION = 3;
-
-	/**
-	 * The SLP message did not include a scope in its  supported by
-	 * the SA or DA.
-	 */
-	public static final short SCOPE_NOT_SUPPORTED = 4;
-
-	/**
-	 * The DA or SA receives a request for an unsupported SLP SPI.
-	 */
-	public static final short AUTHENTICATION_UNKNOWN = 5;
-
-	/**
-	 * The DA expected URL and ATTR authentication in the SrvReg and did not
-	 * receive it.
-	 */
-	public static final short AUTHENTICATION_ABSENT = 6;
-
-	/**
-	 * The DA detected an authentication error in an Authentication block.
-	 */
-	public static final short AUTHENTICATION_FAILED = 7;
-
-	/**
-	 * Unsupported version number in message header.
-	 */
-	public static final short VERSION_NOT_SUPPORTED = 9;
-
-	/**
-	 * The DA (or SA) is too sick to respond.
-	 */
-	public static final short INTERNAL_ERROR = 10;
-
-	/**
-	 * UA or SA SHOULD retry, using exponential back off.
-	 */
-	public static final short DA_BUSY = 11;
-
-	/**
-	 * The DA (or SA) received an unknown option from the mandatory range (see
-	 * section 9.1).
-	 */
-	public static final short OPTION_NOT_SUPPORTED = 12;
-
-	/**
-	 * The DA received a SrvReg without FRESH set, for an unregistered service
-	 * or with inconsistent Service Types.
-	 */
-	public static final short INVALID_UPDATE = 13;
-
-	/**
-	 * The SA received an AttrRqst or SrvTypeRqst and does not support it.
-	 */
-	public static final short REQUEST_NOT_SUPPORTED = 14;
-
-	/**
-	 * The SA sent a SrvReg or partial SrvDereg to a DA more frequently than the
-	 * DA's min-refresh-interval.
-	 */
-	public static final short REFRESH_REJECTED = 15;
-
-	/**
-	 * NOT_IMPLEMENTED
-	 */
-	public static final short NOT_IMPLEMENTED = 16;
-
-	/**
-	 * NETWORK_INIT_FAILED
-	 */
-	public static final short NETWORK_INIT_FAILED = 17;
-
-	/**
-	 * NETWORK_TIMED_OUT
-	 */
-	public static final short NETWORK_TIMED_OUT = 18;
-
-	/**
-	 * NETWORK_ERROR
-	 */
-	public static final short NETWORK_ERROR = 19;
-
-	/**
-	 * INTERNAL_SYSTEM_ERROR
-	 */
-	public static final short INTERNAL_SYSTEM_ERROR = 20;
-
-	/**
-	 * TYPE_ERROR
-	 */
-	public static final short TYPE_ERROR = 21;
-
-	/**
-	 * BUFFER_OVERFLOW
-	 */
-	public static final short BUFFER_OVERFLOW = 22;
-
-	/**
-	 * PREVIOUS_RESPONDER_OVERFLOW
-	 */
-	public static final short PREVIOUS_RESPONDER_OVERFLOW = 100;
-
-	private static final String[] ERROR_MESSAGES = { "OK", "LANGUAGE_NOT_SUPPORTED", "PARSE_ERROR",
-			"INVALID_REGISTRATION", "SCOPE_NOT_SUPPORTED", "AUTHENTICATION_UNKNOWN",
-			"AUTHENTICATION_ABSENT", "AUTHENTICATION_FAILED", "", "VERSION_NOT_SUPPORTED",
-			"INTERNAL_ERROR", "DA_BUSY", "OPTION_NOT_SUPPORTED", "INVALID_UPDATE",
-			"REQUEST_NOT_SUPPORTED", "REFRESH_REJECTED", "NOT_IMPLEMENTED", "NETWORK_INIT_FAILED",
-			"NETWORK_TIMED_OUT", "NETWORK_ERROR", "INTERNAL_SYSTEM_ERROR", "TYPE_ERROR",
-			"BUFFER_OVERFLOW" };
-
-	private short iErrorCode;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pErrorCode
-	 *            One of the ec constants in this class
-	 */
-	public ServiceLocationException(short pErrorCode) {
-		super(ERROR_MESSAGES[pErrorCode]);
-		this.iErrorCode = pErrorCode;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pErrorCode
-	 *            One of the ec constants in this class
-	 * @param pCause
-	 *            The cause
-	 */
-	public ServiceLocationException(short pErrorCode, Throwable pCause) {
-		super(ERROR_MESSAGES[pErrorCode], pCause);
-		this.iErrorCode = pErrorCode;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pErrorCode
-	 *            One of the ec constants in this class
-	 * @param pMessage
-	 *            A more specific message
-	 * @param pCause
-	 * 
-	 */
-	public ServiceLocationException(short pErrorCode, String pMessage, Throwable pCause) {
-		super(ERROR_MESSAGES[pErrorCode] + "(" + pMessage + ")", pCause);
-		this.iErrorCode = pErrorCode;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pErrorCode
-	 *            One of the error code constants in this class
-	 * @param pMessage
-	 *            A more specific message
-	 */
-	public ServiceLocationException(short pErrorCode, String pMessage) {
-		this(pErrorCode, pMessage, null);
-	}
-
-	/**
-	 * Return the error code. The error code takes on one of the static field
-	 * values.
-	 * 
-	 * @return The error code
-	 */
-	public short getErrorCode() {
-		return this.iErrorCode;
-	}
-
-	/**
-	 * Gets the message associated to this exception.
-	 * 
-	 * @return The message
-	 */
-	@Override
-	public String getMessage() {
-		if (getCause() == null) { return super.getMessage(); }
-		return super.getMessage() + "; nested exception is: \n\t" + getCause().toString();
-	}
-
-}
+/*
+  ServiceLocationException.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * The ServiceLocationException class is thrown by all methods when exceptional
+ * conditions occur in the SLP framework. The error code property determines the
+ * exact nature of the condition, and an optional message may provide more
+ * information.
+ */
+public class ServiceLocationException extends Exception {
+
+	private static final long serialVersionUID = 6414188770647750627L;
+
+	/**
+	 * OK
+	 */
+	public static final short OK = 0;
+
+	/**
+	 * There is data for the service type in the scope in the AttrRqst or
+	 * SrvRqst, but not in the requested language.
+	 */
+	public static final short LANGUAGE_NOT_SUPPORTED = 1;
+
+	/**
+	 * The message fails to obey SLP syntax.
+	 */
+	public static final short PARSE_ERROR = 2;
+
+	/**
+	 * The SrvReg has problems -- e.g., a zero lifetime or an omitted Language
+	 * Tag.
+	 */
+	public static final short INVALID_REGISTRATION = 3;
+
+	/**
+	 * The SLP message did not include a scope in its  supported by
+	 * the SA or DA.
+	 */
+	public static final short SCOPE_NOT_SUPPORTED = 4;
+
+	/**
+	 * The DA or SA receives a request for an unsupported SLP SPI.
+	 */
+	public static final short AUTHENTICATION_UNKNOWN = 5;
+
+	/**
+	 * The DA expected URL and ATTR authentication in the SrvReg and did not
+	 * receive it.
+	 */
+	public static final short AUTHENTICATION_ABSENT = 6;
+
+	/**
+	 * The DA detected an authentication error in an Authentication block.
+	 */
+	public static final short AUTHENTICATION_FAILED = 7;
+
+	/**
+	 * Unsupported version number in message header.
+	 */
+	public static final short VERSION_NOT_SUPPORTED = 9;
+
+	/**
+	 * The DA (or SA) is too sick to respond.
+	 */
+	public static final short INTERNAL_ERROR = 10;
+
+	/**
+	 * UA or SA SHOULD retry, using exponential back off.
+	 */
+	public static final short DA_BUSY = 11;
+
+	/**
+	 * The DA (or SA) received an unknown option from the mandatory range (see
+	 * section 9.1).
+	 */
+	public static final short OPTION_NOT_SUPPORTED = 12;
+
+	/**
+	 * The DA received a SrvReg without FRESH set, for an unregistered service
+	 * or with inconsistent Service Types.
+	 */
+	public static final short INVALID_UPDATE = 13;
+
+	/**
+	 * The SA received an AttrRqst or SrvTypeRqst and does not support it.
+	 */
+	public static final short REQUEST_NOT_SUPPORTED = 14;
+
+	/**
+	 * The SA sent a SrvReg or partial SrvDereg to a DA more frequently than the
+	 * DA's min-refresh-interval.
+	 */
+	public static final short REFRESH_REJECTED = 15;
+
+	/**
+	 * NOT_IMPLEMENTED
+	 */
+	public static final short NOT_IMPLEMENTED = 16;
+
+	/**
+	 * NETWORK_INIT_FAILED
+	 */
+	public static final short NETWORK_INIT_FAILED = 17;
+
+	/**
+	 * NETWORK_TIMED_OUT
+	 */
+	public static final short NETWORK_TIMED_OUT = 18;
+
+	/**
+	 * NETWORK_ERROR
+	 */
+	public static final short NETWORK_ERROR = 19;
+
+	/**
+	 * INTERNAL_SYSTEM_ERROR
+	 */
+	public static final short INTERNAL_SYSTEM_ERROR = 20;
+
+	/**
+	 * TYPE_ERROR
+	 */
+	public static final short TYPE_ERROR = 21;
+
+	/**
+	 * BUFFER_OVERFLOW
+	 */
+	public static final short BUFFER_OVERFLOW = 22;
+
+	/**
+	 * PREVIOUS_RESPONDER_OVERFLOW
+	 */
+	public static final short PREVIOUS_RESPONDER_OVERFLOW = 100;
+
+	private static final String[] ERROR_MESSAGES = { "OK", "LANGUAGE_NOT_SUPPORTED", "PARSE_ERROR",
+			"INVALID_REGISTRATION", "SCOPE_NOT_SUPPORTED", "AUTHENTICATION_UNKNOWN",
+			"AUTHENTICATION_ABSENT", "AUTHENTICATION_FAILED", "", "VERSION_NOT_SUPPORTED",
+			"INTERNAL_ERROR", "DA_BUSY", "OPTION_NOT_SUPPORTED", "INVALID_UPDATE",
+			"REQUEST_NOT_SUPPORTED", "REFRESH_REJECTED", "NOT_IMPLEMENTED", "NETWORK_INIT_FAILED",
+			"NETWORK_TIMED_OUT", "NETWORK_ERROR", "INTERNAL_SYSTEM_ERROR", "TYPE_ERROR",
+			"BUFFER_OVERFLOW" };
+
+	private short iErrorCode;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pErrorCode
+	 *            One of the ec constants in this class
+	 */
+	public ServiceLocationException(short pErrorCode) {
+		super(ERROR_MESSAGES[pErrorCode]);
+		this.iErrorCode = pErrorCode;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pErrorCode
+	 *            One of the ec constants in this class
+	 * @param pCause
+	 *            The cause
+	 */
+	public ServiceLocationException(short pErrorCode, Throwable pCause) {
+		super(ERROR_MESSAGES[pErrorCode], pCause);
+		this.iErrorCode = pErrorCode;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pErrorCode
+	 *            One of the ec constants in this class
+	 * @param pMessage
+	 *            A more specific message
+	 * @param pCause
+	 * 
+	 */
+	public ServiceLocationException(short pErrorCode, String pMessage, Throwable pCause) {
+		super(ERROR_MESSAGES[pErrorCode] + "(" + pMessage + ")", pCause);
+		this.iErrorCode = pErrorCode;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pErrorCode
+	 *            One of the error code constants in this class
+	 * @param pMessage
+	 *            A more specific message
+	 */
+	public ServiceLocationException(short pErrorCode, String pMessage) {
+		this(pErrorCode, pMessage, null);
+	}
+
+	/**
+	 * Return the error code. The error code takes on one of the static field
+	 * values.
+	 * 
+	 * @return The error code
+	 */
+	public short getErrorCode() {
+		return this.iErrorCode;
+	}
+
+	/**
+	 * Gets the message associated to this exception.
+	 * 
+	 * @return The message
+	 */
+	@Override
+	public String getMessage() {
+		if (getCause() == null) { return super.getMessage(); }
+		return super.getMessage() + "; nested exception is: \n\t" + getCause().toString();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationManager.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationManager.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationManager.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationManager.java
index 5ab9b3d..5964a43 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceLocationManager.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationManager.java
@@ -1,122 +1,120 @@
-/*
-  ServiceLocationManager.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 1535756    2006-08-08  lupusalex    Make code warning free
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Locale;
-import java.util.Vector;
-
-import org.sentrysoftware.wbem.sblim.slp.internal.AdvertiserImpl;
-import org.sentrysoftware.wbem.sblim.slp.internal.ua.LocatorImpl;
-
-/**
- * The ServiceLocationManager manages access to the service location framework.
- * Clients obtain the Locator and Advertiser objects for UA and SA, and a Vector
- * of known scope names from the ServiceLocationManager.
- * 
- */
-public class ServiceLocationManager {
-
-	/**
-	 * Returns the maximum across all DAs of the min-refresh-interval attribute.
-	 * This value satisfies the advertised refresh interval bounds for all DAs,
-	 * and, if used by the SA, assures that no refresh registration will be
-	 * rejected. If no DA advertises a min-refresh-interval attribute, a value
-	 * of 0 is returned.
-	 * 
-	 * Not yet implemented
-	 * 
-	 * @return The minimum refresh interval
-	 * @throws ServiceLocationException
-	 */
-	public static int getRefreshInterval() throws ServiceLocationException {
-		throw new ServiceLocationException(ServiceLocationException.NOT_IMPLEMENTED);
-	}
-
-	/**
-	 * Returns an List of strings with all available scope names. The list of
-	 * scopes comes from a variety of sources, see Section 2.1 for the scope
-	 * discovery algorithm. There is always at least one string in the Vector,
-	 * the default scope, "DEFAULT".
-	 * 
-	 * Not yet implemented
-	 * 
-	 * @return A Vector containing the scopes
-	 * @throws ServiceLocationException
-	 */
-	public static Vector findScopes() throws ServiceLocationException {
-		throw new ServiceLocationException(ServiceLocationException.NOT_IMPLEMENTED);
-	}
-
-	/**
-	 * Return a Locator object for the given language locale. If the
-	 * implementation does not support UA functionality, returns null.
-	 * 
-	 * @param pLocale
-	 *            The language locale of the Locator. The default SLP locale is
-	 *            used if null.
-	 * @return The Locator
-	 */
-	public static Locator getLocator(Locale pLocale) {
-		return new LocatorImpl(pLocale);
-	}
-
-	/**
-	 * Return an Advertiser object for the given language locale. If the
-	 * implementation does not support SA functionality, returns null.
-	 * 
-	 * @param pLocale
-	 *            The language locale of the Advertiser. The default SLP locale
-	 *            is used if null.
-	 * @return The advertiser
-	 */
-	public static Advertiser getAdvertiser(Locale pLocale) {
-		return new AdvertiserImpl(pLocale);
-	}
-
-}
+/*
+  ServiceLocationManager.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 1535756    2006-08-08  lupusalex    Make code warning free
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Locale;
+import java.util.Vector;
+
+import org.metricshub.wbem.sblim.slp.internal.AdvertiserImpl;
+import org.metricshub.wbem.sblim.slp.internal.ua.LocatorImpl;
+
+/**
+ * The ServiceLocationManager manages access to the service location framework.
+ * Clients obtain the Locator and Advertiser objects for UA and SA, and a Vector
+ * of known scope names from the ServiceLocationManager.
+ * 
+ */
+public class ServiceLocationManager {
+
+	/**
+	 * Returns the maximum across all DAs of the min-refresh-interval attribute.
+	 * This value satisfies the advertised refresh interval bounds for all DAs,
+	 * and, if used by the SA, assures that no refresh registration will be
+	 * rejected. If no DA advertises a min-refresh-interval attribute, a value
+	 * of 0 is returned.
+	 * 
+	 * Not yet implemented
+	 * 
+	 * @return The minimum refresh interval
+	 * @throws ServiceLocationException
+	 */
+	public static int getRefreshInterval() throws ServiceLocationException {
+		throw new ServiceLocationException(ServiceLocationException.NOT_IMPLEMENTED);
+	}
+
+	/**
+	 * Returns an List of strings with all available scope names. The list of
+	 * scopes comes from a variety of sources, see Section 2.1 for the scope
+	 * discovery algorithm. There is always at least one string in the Vector,
+	 * the default scope, "DEFAULT".
+	 * 
+	 * Not yet implemented
+	 * 
+	 * @return A Vector containing the scopes
+	 * @throws ServiceLocationException
+	 */
+	public static Vector findScopes() throws ServiceLocationException {
+		throw new ServiceLocationException(ServiceLocationException.NOT_IMPLEMENTED);
+	}
+
+	/**
+	 * Return a Locator object for the given language locale. If the
+	 * implementation does not support UA functionality, returns null.
+	 * 
+	 * @param pLocale
+	 *            The language locale of the Locator. The default SLP locale is
+	 *            used if null.
+	 * @return The Locator
+	 */
+	public static Locator getLocator(Locale pLocale) {
+		return new LocatorImpl(pLocale);
+	}
+
+	/**
+	 * Return an Advertiser object for the given language locale. If the
+	 * implementation does not support SA functionality, returns null.
+	 * 
+	 * @param pLocale
+	 *            The language locale of the Advertiser. The default SLP locale
+	 *            is used if null.
+	 * @return The advertiser
+	 */
+	public static Advertiser getAdvertiser(Locale pLocale) {
+		return new AdvertiserImpl(pLocale);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceType.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceType.java
similarity index 88%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceType.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/ServiceType.java
index ed67ccc..1844899 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceType.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceType.java
@@ -1,271 +1,269 @@
-/*
-  ServiceType.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.Serializable;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
-
-/**
- * The ServiceType object models the SLP service type. It parses a string based
- * service type specifier into its various components, and contains property
- * accessors to return the components. URL schemes, protocol service types, and
- * abstract service types are all handled.
- */
-public class ServiceType implements Serializable {
-
-	private static final long serialVersionUID = -4850546870881037017L;
-
-	private boolean iIsServiceURL = true;
-
-	private String iPrincipleType = "";
-
-	private String iAbstractType = "";
-
-	private String iNamingAuthority = "";
-
-	/**
-	 * 
-	 * Constructs a service type object from the service type specifier. Throws
-	 * IllegalArgumentException if the type name is syntactically incorrect.
-	 * 
-	 * @param pType
-	 *            The service type name as a String. If the service type is from
-	 *            a service: URL, the "service:" prefix must be intact.
-	 */
-	public ServiceType(String pType) {
-		parse(pType);
-	}
-
-	/**
-	 * Returns true if the type name contains the "service:" prefix.
-	 * 
-	 * @return true if the type name contains the "service:" prefix
-	 */
-	public boolean isServiceURL() {
-		return this.iIsServiceURL;
-	}
-
-	/**
-	 * Returns true if the type name is for an abstract type.
-	 * 
-	 * @return true if the type name is for an abstract type
-	 */
-	public boolean isAbstractType() {
-		return this.iAbstractType.length() > 0;
-	}
-
-	/**
-	 * Returns true if the naming authority is the default, i.e. is the empty
-	 * string.
-	 * 
-	 * @return true if the naming authority is the default, i.e. is
-	 *         the empty string
-	 */
-	public boolean isNADefault() {
-		return this.iNamingAuthority.length() <= 0;
-	}
-
-	/**
-	 * Returns the concrete type name in an abstract type, or the empty string
-	 * if the service type is not abstract. For example, if the type name is
-	 * "service:printing:ipp", the method returns "ipp". If the type name is
-	 * "service:ftp", the method returns "".
-	 * 
-	 * @return true if the service type is not abstract
-	 */
-	public String getConcreteTypeName() {
-		return this.iAbstractType;
-	}
-
-	/**
-	 * Returns the abstract type name for an abstract type, the protocol name in
-	 * a protocol type, or the URL scheme for a generic URL. For example, in the
-	 * abstract type name "service:printing:ipp", the method returns "printing".
-	 * In the protocol type name "service:ftp", the method returns "ftp".
-	 * 
-	 * @return The principle type name
-	 */
-	public String getPrincipleTypeName() {
-		return this.iPrincipleType;
-	}
-
-	/**
-	 * If the type is an abstract type, returns the fully formatted abstract
-	 * type name including the "service:" and naming authority but without the
-	 * concrete type name or intervening colon. If not an abstract type, returns
-	 * the empty string. For example, in the abstract type name
-	 * "service:printing:ipp", the method returns "service:printing".
-	 * 
-	 * @return The abstract type name
-	 */
-	public String getAbstractTypeName() {
-		if (isAbstractType()) return "service:" + this.iPrincipleType
-				+ (this.iNamingAuthority.length() <= 0 ? "" : "." + this.iNamingAuthority);
-		return "";
-	}
-
-	/**
-	 * Return the naming authority name, or the empty string if the naming
-	 * authority is the default.
-	 * 
-	 * @return The naming authority
-	 */
-	public String getNamingAuthority() {
-		return this.iNamingAuthority;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 * 
-	 * Overrides Object.equals(). The two objects are equal if they are both
-	 * ServiceType objects and the components of both are equal.
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == this) return true;
-		if (!(obj instanceof ServiceType)) return false;
-
-		ServiceType servicetype = (ServiceType) obj;
-		return this.iIsServiceURL == servicetype.iIsServiceURL
-				&& this.iPrincipleType.equals(servicetype.iPrincipleType)
-				&& this.iAbstractType.equals(servicetype.iAbstractType)
-				&& this.iNamingAuthority.equals(servicetype.iNamingAuthority);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 * 
-	 * Returns the fully formatted type name, including the "service:" if the
-	 * type was originally from a service: URL.
-	 */
-	@Override
-	public String toString() {
-		// TODO: clean up this
-		return (this.iIsServiceURL ? "service:" : "") + this.iPrincipleType
-				+ (this.iNamingAuthority.length() <= 0 ? "" : "." + this.iNamingAuthority)
-				+ (this.iAbstractType.length() <= 0 ? "" : ":" + this.iAbstractType);
-	}
-
-	private int iHashCode = 0;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 * 
-	 * Overrides Object.hashCode(). Hashes on the string value of the "service"
-	 * prefix, naming authority, if any, abstract and concrete type names for
-	 * abstract types, protocol type name for protocol types, and URL scheme for
-	 * generic URLs.
-	 */
-	@Override
-	public int hashCode() {
-		if (this.iHashCode == 0) this.iHashCode = toString().hashCode();
-		return this.iHashCode;
-	}
-
-	private void parse(String pString) {
-		StringTokenizer st = new StringTokenizer(pString, ":.", true);
-		while (true) {
-			try {
-
-				String token = st.nextToken();
-				if (token.equals(":") || token.equals(".")) continue;
-
-				if (!token.equalsIgnoreCase("service")) {
-					this.iIsServiceURL = false;
-					do {
-						this.iPrincipleType = this.iPrincipleType + token.toLowerCase();
-						if (!st.hasMoreTokens()) break;
-						token = st.nextToken();
-					} while (true);
-
-					validateTypeComponent(this.iPrincipleType);
-					if (!st.hasMoreTokens()) return;
-					continue;
-				}
-				token = st.nextToken();
-				if (!token.equals(":")) continue;
-				this.iPrincipleType = st.nextToken().toLowerCase();
-				validateTypeComponent(this.iPrincipleType);
-
-				if (!st.hasMoreTokens()) return;
-				token = st.nextToken();
-				if (token.equals(".")) {
-					token = st.nextToken();
-					validateTypeComponent(token);
-					if (token.equalsIgnoreCase("iana")) continue;
-					this.iNamingAuthority = token.toLowerCase();
-					if (!st.hasMoreTokens()) return;
-					token = st.nextToken();
-				}
-				if (token.equals(":")) {
-					String abstractTypeToken = st.nextToken();
-					validateTypeComponent(abstractTypeToken);
-					this.iAbstractType = abstractTypeToken.toLowerCase();
-					if (!st.hasMoreTokens()) return;
-				}
-			} catch (NoSuchElementException e) {
-				throw new IllegalArgumentException(e.getMessage());
-			}
-		}
-	}
-
-	private static void validateTypeComponent(String str) {
-		int length = str.length();
-
-		for (int pos = 0; pos < length; pos++) {
-			char ch = str.charAt(pos);
-			if (!Character.isLetterOrDigit(ch) && ch != '+' && ch != '-') { throw new IllegalArgumentException(); }
-		}
-	}
-}
+/*
+  ServiceType.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.Serializable;
+import java.util.NoSuchElementException;
+import java.util.StringTokenizer;
+
+/**
+ * The ServiceType object models the SLP service type. It parses a string based
+ * service type specifier into its various components, and contains property
+ * accessors to return the components. URL schemes, protocol service types, and
+ * abstract service types are all handled.
+ */
+public class ServiceType implements Serializable {
+
+	private static final long serialVersionUID = -4850546870881037017L;
+
+	private boolean iIsServiceURL = true;
+
+	private String iPrincipleType = "";
+
+	private String iAbstractType = "";
+
+	private String iNamingAuthority = "";
+
+	/**
+	 * 
+	 * Constructs a service type object from the service type specifier. Throws
+	 * IllegalArgumentException if the type name is syntactically incorrect.
+	 * 
+	 * @param pType
+	 *            The service type name as a String. If the service type is from
+	 *            a service: URL, the "service:" prefix must be intact.
+	 */
+	public ServiceType(String pType) {
+		parse(pType);
+	}
+
+	/**
+	 * Returns true if the type name contains the "service:" prefix.
+	 * 
+	 * @return true if the type name contains the "service:" prefix
+	 */
+	public boolean isServiceURL() {
+		return this.iIsServiceURL;
+	}
+
+	/**
+	 * Returns true if the type name is for an abstract type.
+	 * 
+	 * @return true if the type name is for an abstract type
+	 */
+	public boolean isAbstractType() {
+		return this.iAbstractType.length() > 0;
+	}
+
+	/**
+	 * Returns true if the naming authority is the default, i.e. is the empty
+	 * string.
+	 * 
+	 * @return true if the naming authority is the default, i.e. is
+	 *         the empty string
+	 */
+	public boolean isNADefault() {
+		return this.iNamingAuthority.length() <= 0;
+	}
+
+	/**
+	 * Returns the concrete type name in an abstract type, or the empty string
+	 * if the service type is not abstract. For example, if the type name is
+	 * "service:printing:ipp", the method returns "ipp". If the type name is
+	 * "service:ftp", the method returns "".
+	 * 
+	 * @return true if the service type is not abstract
+	 */
+	public String getConcreteTypeName() {
+		return this.iAbstractType;
+	}
+
+	/**
+	 * Returns the abstract type name for an abstract type, the protocol name in
+	 * a protocol type, or the URL scheme for a generic URL. For example, in the
+	 * abstract type name "service:printing:ipp", the method returns "printing".
+	 * In the protocol type name "service:ftp", the method returns "ftp".
+	 * 
+	 * @return The principle type name
+	 */
+	public String getPrincipleTypeName() {
+		return this.iPrincipleType;
+	}
+
+	/**
+	 * If the type is an abstract type, returns the fully formatted abstract
+	 * type name including the "service:" and naming authority but without the
+	 * concrete type name or intervening colon. If not an abstract type, returns
+	 * the empty string. For example, in the abstract type name
+	 * "service:printing:ipp", the method returns "service:printing".
+	 * 
+	 * @return The abstract type name
+	 */
+	public String getAbstractTypeName() {
+		if (isAbstractType()) return "service:" + this.iPrincipleType
+				+ (this.iNamingAuthority.length() <= 0 ? "" : "." + this.iNamingAuthority);
+		return "";
+	}
+
+	/**
+	 * Return the naming authority name, or the empty string if the naming
+	 * authority is the default.
+	 * 
+	 * @return The naming authority
+	 */
+	public String getNamingAuthority() {
+		return this.iNamingAuthority;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 * 
+	 * Overrides Object.equals(). The two objects are equal if they are both
+	 * ServiceType objects and the components of both are equal.
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) return true;
+		if (!(obj instanceof ServiceType)) return false;
+
+		ServiceType servicetype = (ServiceType) obj;
+		return this.iIsServiceURL == servicetype.iIsServiceURL
+				&& this.iPrincipleType.equals(servicetype.iPrincipleType)
+				&& this.iAbstractType.equals(servicetype.iAbstractType)
+				&& this.iNamingAuthority.equals(servicetype.iNamingAuthority);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 * 
+	 * Returns the fully formatted type name, including the "service:" if the
+	 * type was originally from a service: URL.
+	 */
+	@Override
+	public String toString() {
+		// TODO: clean up this
+		return (this.iIsServiceURL ? "service:" : "") + this.iPrincipleType
+				+ (this.iNamingAuthority.length() <= 0 ? "" : "." + this.iNamingAuthority)
+				+ (this.iAbstractType.length() <= 0 ? "" : ":" + this.iAbstractType);
+	}
+
+	private int iHashCode = 0;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#hashCode()
+	 * 
+	 * Overrides Object.hashCode(). Hashes on the string value of the "service"
+	 * prefix, naming authority, if any, abstract and concrete type names for
+	 * abstract types, protocol type name for protocol types, and URL scheme for
+	 * generic URLs.
+	 */
+	@Override
+	public int hashCode() {
+		if (this.iHashCode == 0) this.iHashCode = toString().hashCode();
+		return this.iHashCode;
+	}
+
+	private void parse(String pString) {
+		StringTokenizer st = new StringTokenizer(pString, ":.", true);
+		while (true) {
+			try {
+
+				String token = st.nextToken();
+				if (token.equals(":") || token.equals(".")) continue;
+
+				if (!token.equalsIgnoreCase("service")) {
+					this.iIsServiceURL = false;
+					do {
+						this.iPrincipleType = this.iPrincipleType + token.toLowerCase();
+						if (!st.hasMoreTokens()) break;
+						token = st.nextToken();
+					} while (true);
+
+					validateTypeComponent(this.iPrincipleType);
+					if (!st.hasMoreTokens()) return;
+					continue;
+				}
+				token = st.nextToken();
+				if (!token.equals(":")) continue;
+				this.iPrincipleType = st.nextToken().toLowerCase();
+				validateTypeComponent(this.iPrincipleType);
+
+				if (!st.hasMoreTokens()) return;
+				token = st.nextToken();
+				if (token.equals(".")) {
+					token = st.nextToken();
+					validateTypeComponent(token);
+					if (token.equalsIgnoreCase("iana")) continue;
+					this.iNamingAuthority = token.toLowerCase();
+					if (!st.hasMoreTokens()) return;
+					token = st.nextToken();
+				}
+				if (token.equals(":")) {
+					String abstractTypeToken = st.nextToken();
+					validateTypeComponent(abstractTypeToken);
+					this.iAbstractType = abstractTypeToken.toLowerCase();
+					if (!st.hasMoreTokens()) return;
+				}
+			} catch (NoSuchElementException e) {
+				throw new IllegalArgumentException(e.getMessage());
+			}
+		}
+	}
+
+	private static void validateTypeComponent(String str) {
+		int length = str.length();
+
+		for (int pos = 0; pos < length; pos++) {
+			char ch = str.charAt(pos);
+			if (!Character.isLetterOrDigit(ch) && ch != '+' && ch != '-') { throw new IllegalArgumentException(); }
+		}
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceURL.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceURL.java
similarity index 89%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceURL.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/ServiceURL.java
index d9d1370..1a12cde 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/ServiceURL.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceURL.java
@@ -1,341 +1,339 @@
-/*
-  ServiceURL.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 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)
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.Serializable;
-
-/**
- * The ServiceURL object models the advertised SLP service URL. It can be either
- * a service: URL or a regular URL. These objects are returned from service
- * lookup requests, and describe the registered services. This class should be a
- * subclass of java.net.URL but can't since that class is final.
- */
-public class ServiceURL implements Serializable {
-
-	private static final long serialVersionUID = 8998115518853094365L;
-
-	/**
-	 * Indicates that no port information is required or was returned for this
-	 * URL.
-	 */
-	public static final int NO_PORT = 0;
-
-	/**
-	 * Indicates that the URL has a zero lifetime. This value is never returned
-	 * from the API, but can be used to create a ServiceURL object to
-	 * deregister, delete attributes, or find attributes.
-	 */
-	public static final int LIFETIME_NONE = 0;
-
-	/**
-	 * The default URL lifetime (3 hours) in seconds.
-	 */
-	public static final int LIFETIME_DEFAULT = 10800;
-
-	/**
-	 * The maximum URL lifetime (about 18 hours) in seconds.
-	 */
-	public static final int LIFETIME_MAXIMUM = 65535;
-
-	/**
-	 * Indicates that the API implementation should continuously re-register the
-	 * URL until the application exits.
-	 */
-	public static final int LIFETIME_PERMANENT = -1;
-
-	static final int PORT_MAXIMUM = 65535;
-
-	private ServiceType iServiceType = null;
-
-	private String iTransport = null;
-
-	private String iHost = null;
-
-	private int iPort = 0;
-
-	private String iURLPath = null;
-
-	private int iLifetime = LIFETIME_DEFAULT;
-
-	/**
-	 * Construct a service URL object having the specified lifetime.
-	 * 
-	 * @param pServiceURL
-	 *            The URL as a string. Must be either a service: URL or a valid
-	 *            generic URL according to RFC 2396 [2].
-	 * @param pLifetime
-	 *            The service advertisement lifetime in seconds. This value may
-	 *            be either between LIFETIME_NONE and LIFETIME_MAXIMUM or
-	 *            LIFETIME_PERMANENT.
-	 */
-	public ServiceURL(String pServiceURL, int pLifetime) {
-
-		if (pLifetime > LIFETIME_MAXIMUM || pLifetime < LIFETIME_PERMANENT) throw new IllegalArgumentException(
-				"lifetime:" + pLifetime);
-
-		for (int i = 0; i < pServiceURL.length(); i++) {
-			char c = pServiceURL.charAt(i);
-			if ("/:-.%_\'*()$!,+\\;@?&=[]".indexOf(c) == -1 && !Character.isLetterOrDigit(c)) { throw new IllegalArgumentException(
-					"invalid character: '" + c + "' on string \"" + pServiceURL + "\""); }
-		}
-
-		parseURL(pServiceURL);
-
-		this.iLifetime = (pLifetime == LIFETIME_PERMANENT) ? LIFETIME_MAXIMUM : pLifetime;
-	}
-
-	/**
-	 * Returns the service type object representing the service type name of the
-	 * URL.
-	 * 
-	 * @return The service type
-	 */
-	public ServiceType getServiceType() {
-		return this.iServiceType;
-	}
-
-	/**
-	 * Set the service type name to the object. Ignored if the URL is a service:
-	 * URL.
-	 * 
-	 * @param pServicetype
-	 *            The service type object.
-	 */
-	public void setServiceType(ServiceType pServicetype) {
-		if (!this.iServiceType.isServiceURL()) this.iServiceType = pServicetype;
-	}
-
-	/**
-	 * Get the network layer transport identifier. If the transport is IP, an
-	 * empty string, "", is returned.
-	 * 
-	 * @return The NLT identifier
-	 */
-	public String getTransport() {
-		// FIXME What the hell is it?
-		return "";
-	}
-
-	/**
-	 * Returns the host identifier. For IP, this will be the machine name or IP
-	 * address.
-	 * 
-	 * @return The host
-	 */
-	public String getHost() {
-		return this.iHost;
-	}
-
-	/**
-	 * Returns the port number, if any. For non-IP transports, always returns
-	 * NO_PORT.
-	 * 
-	 * @return The port
-	 */
-	public int getPort() {
-		return this.iPort;
-	}
-
-	/**
-	 * Returns the URL path description, if any.
-	 * 
-	 * @return The URL path
-	 */
-	public String getURLPath() {
-		return this.iURLPath;
-	}
-
-	/**
-	 * Returns the service advertisement lifetime. This will be a positive int
-	 * between LIFETIME_NONE and LIFETIME_MAXIMUM.
-	 * 
-	 * @return The lifetime
-	 */
-	public int getLifetime() {
-		return this.iLifetime;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 * 
-	 * Compares the object to the ServiceURL and returns true if the two are the
-	 * same. Two ServiceURL objects are equal if their current service types
-	 * match and they have the same host, port, transport, and URL path.
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == this) return true;
-		if (!(obj instanceof ServiceURL)) return false;
-
-		ServiceURL that = (ServiceURL) obj;
-
-		return equalObjs(this.iServiceType, that.iServiceType)
-				&& equalStrs(this.iTransport, that.iTransport) && equalStrs(this.iHost, that.iHost)
-				&& this.iPort == that.iPort;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 * 
-	 * Returns a formatted string with the URL. Overrides Object.toString(). The
-	 * returned URL has the original service type or URL scheme, not the current
-	 * service type.
-	 */
-	@Override
-	public String toString() {
-		StringBuffer buf = new StringBuffer();
-		if (this.iServiceType != null) buf.append(this.iServiceType);
-		if (this.iURLPath != null) {
-			if (buf.length() > 0) buf.append("://");
-			buf.append(this.iURLPath);
-		}
-		return buf.toString();
-	}
-
-	private int iHashCode = 0;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 * 
-	 * Overrides Object.hashCode(). Hashes on the current service type,
-	 * transport, host, port, and URL part. !! in this case toString() must not
-	 * contain the lifeTime
-	 */
-	@Override
-	public int hashCode() {
-		if (this.iHashCode == 0) {
-			this.iHashCode = toString().hashCode();
-		}
-		return this.iHashCode;
-	}
-
-	private static final String DELIM = "://";
-
-	/**
-	 * 
      -	 * service: URL or URL
-	 * 
-	 * "service:" srvtype "://" addrspec
-	 * "service:" abstract-type ":" concrete-type> "://" addrspecc
-	 * 
-	 * addrspesc  = ( hostName / IPv4Address / IPv6Address ) [ ":" port ]
-	 * 
      
-	 * 
-	 * @param pUrlString
-	 * @throws IllegalArgumentException
-	 */
-	private void parseURL(String pUrlStr) throws IllegalArgumentException {
-		int srvTypeEndIdx = pUrlStr.indexOf(DELIM);
-		String addrStr;
-		if (srvTypeEndIdx >= 0) {
-			this.iServiceType = new ServiceType(pUrlStr.substring(0, srvTypeEndIdx));
-			addrStr = pUrlStr.substring(srvTypeEndIdx + DELIM.length());
-		} else {
-			if (pUrlStr.startsWith("service:")) {
-				this.iServiceType = new ServiceType(pUrlStr);
-				addrStr = null;
-			} else {
-				addrStr = pUrlStr;
-			}
-		}
-		if (addrStr == null) return;
-		this.iURLPath = addrStr;
-		if (addrStr.charAt(0) == '[') {
-			parseIPv6Address(addrStr);
-		} else {
-			parseIPv4Address(addrStr);
-		}
-	}
-
-	private void parseIPv6Address(String pAddrStr) throws IllegalArgumentException {
-		int hostEndIdx = pAddrStr.indexOf(']');
-		if (hostEndIdx < 0) throw new IllegalArgumentException("']' is not found for IPv6 address");
-		int colonIdx = hostEndIdx + 1;
-		this.iHost = pAddrStr.substring(0, colonIdx);
-		if (colonIdx < pAddrStr.length()) {
-			if (pAddrStr.charAt(colonIdx) != ':') throw new IllegalArgumentException(
-					"':' expected in \"" + pAddrStr + "\" at position " + colonIdx + " !");
-			parsePort(pAddrStr.substring(colonIdx + 1), pAddrStr);
-		}
-	}
-
-	private void parseIPv4Address(String pAddrStr) {
-		int colonIdx = pAddrStr.indexOf(':');
-		if (colonIdx > 0) {
-			this.iHost = pAddrStr.substring(0, colonIdx);
-			parsePort(pAddrStr.substring(colonIdx + 1), pAddrStr);
-		} else {
-			this.iHost = pAddrStr;
-		}
-	}
-
-	private void parsePort(String pPortStr, String pAddrStr) throws IllegalArgumentException {
-		try {
-			this.iPort = Integer.parseInt(pPortStr);
-		} catch (NumberFormatException e) {
-			throw new IllegalArgumentException("Port field : " + pPortStr + " in " + pAddrStr
-					+ " is invalid!");
-		}
-	}
-
-	private static boolean equalObjs(Object pThis, Object pThat) {
-		return pThis == null ? pThat == null : pThis.equals(pThat);
-	}
-
-	private static boolean equalStrs(String pThis, String pThat) {
-		return (pThis == null || pThis.length() == 0) ? (pThat == null || pThat.length() == 0)
-				: pThis.equals(pThat);
-	}
-
-}
+/*
+  ServiceURL.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 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)
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.Serializable;
+
+/**
+ * The ServiceURL object models the advertised SLP service URL. It can be either
+ * a service: URL or a regular URL. These objects are returned from service
+ * lookup requests, and describe the registered services. This class should be a
+ * subclass of java.net.URL but can't since that class is final.
+ */
+public class ServiceURL implements Serializable {
+
+	private static final long serialVersionUID = 8998115518853094365L;
+
+	/**
+	 * Indicates that no port information is required or was returned for this
+	 * URL.
+	 */
+	public static final int NO_PORT = 0;
+
+	/**
+	 * Indicates that the URL has a zero lifetime. This value is never returned
+	 * from the API, but can be used to create a ServiceURL object to
+	 * deregister, delete attributes, or find attributes.
+	 */
+	public static final int LIFETIME_NONE = 0;
+
+	/**
+	 * The default URL lifetime (3 hours) in seconds.
+	 */
+	public static final int LIFETIME_DEFAULT = 10800;
+
+	/**
+	 * The maximum URL lifetime (about 18 hours) in seconds.
+	 */
+	public static final int LIFETIME_MAXIMUM = 65535;
+
+	/**
+	 * Indicates that the API implementation should continuously re-register the
+	 * URL until the application exits.
+	 */
+	public static final int LIFETIME_PERMANENT = -1;
+
+	static final int PORT_MAXIMUM = 65535;
+
+	private ServiceType iServiceType = null;
+
+	private String iTransport = null;
+
+	private String iHost = null;
+
+	private int iPort = 0;
+
+	private String iURLPath = null;
+
+	private int iLifetime = LIFETIME_DEFAULT;
+
+	/**
+	 * Construct a service URL object having the specified lifetime.
+	 * 
+	 * @param pServiceURL
+	 *            The URL as a string. Must be either a service: URL or a valid
+	 *            generic URL according to RFC 2396 [2].
+	 * @param pLifetime
+	 *            The service advertisement lifetime in seconds. This value may
+	 *            be either between LIFETIME_NONE and LIFETIME_MAXIMUM or
+	 *            LIFETIME_PERMANENT.
+	 */
+	public ServiceURL(String pServiceURL, int pLifetime) {
+
+		if (pLifetime > LIFETIME_MAXIMUM || pLifetime < LIFETIME_PERMANENT) throw new IllegalArgumentException(
+				"lifetime:" + pLifetime);
+
+		for (int i = 0; i < pServiceURL.length(); i++) {
+			char c = pServiceURL.charAt(i);
+			if ("/:-.%_\'*()$!,+\\;@?&=[]".indexOf(c) == -1 && !Character.isLetterOrDigit(c)) { throw new IllegalArgumentException(
+					"invalid character: '" + c + "' on string \"" + pServiceURL + "\""); }
+		}
+
+		parseURL(pServiceURL);
+
+		this.iLifetime = (pLifetime == LIFETIME_PERMANENT) ? LIFETIME_MAXIMUM : pLifetime;
+	}
+
+	/**
+	 * Returns the service type object representing the service type name of the
+	 * URL.
+	 * 
+	 * @return The service type
+	 */
+	public ServiceType getServiceType() {
+		return this.iServiceType;
+	}
+
+	/**
+	 * Set the service type name to the object. Ignored if the URL is a service:
+	 * URL.
+	 * 
+	 * @param pServicetype
+	 *            The service type object.
+	 */
+	public void setServiceType(ServiceType pServicetype) {
+		if (!this.iServiceType.isServiceURL()) this.iServiceType = pServicetype;
+	}
+
+	/**
+	 * Get the network layer transport identifier. If the transport is IP, an
+	 * empty string, "", is returned.
+	 * 
+	 * @return The NLT identifier
+	 */
+	public String getTransport() {
+		// FIXME What the hell is it?
+		return "";
+	}
+
+	/**
+	 * Returns the host identifier. For IP, this will be the machine name or IP
+	 * address.
+	 * 
+	 * @return The host
+	 */
+	public String getHost() {
+		return this.iHost;
+	}
+
+	/**
+	 * Returns the port number, if any. For non-IP transports, always returns
+	 * NO_PORT.
+	 * 
+	 * @return The port
+	 */
+	public int getPort() {
+		return this.iPort;
+	}
+
+	/**
+	 * Returns the URL path description, if any.
+	 * 
+	 * @return The URL path
+	 */
+	public String getURLPath() {
+		return this.iURLPath;
+	}
+
+	/**
+	 * Returns the service advertisement lifetime. This will be a positive int
+	 * between LIFETIME_NONE and LIFETIME_MAXIMUM.
+	 * 
+	 * @return The lifetime
+	 */
+	public int getLifetime() {
+		return this.iLifetime;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 * 
+	 * Compares the object to the ServiceURL and returns true if the two are the
+	 * same. Two ServiceURL objects are equal if their current service types
+	 * match and they have the same host, port, transport, and URL path.
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) return true;
+		if (!(obj instanceof ServiceURL)) return false;
+
+		ServiceURL that = (ServiceURL) obj;
+
+		return equalObjs(this.iServiceType, that.iServiceType)
+				&& equalStrs(this.iTransport, that.iTransport) && equalStrs(this.iHost, that.iHost)
+				&& this.iPort == that.iPort;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 * 
+	 * Returns a formatted string with the URL. Overrides Object.toString(). The
+	 * returned URL has the original service type or URL scheme, not the current
+	 * service type.
+	 */
+	@Override
+	public String toString() {
+		StringBuffer buf = new StringBuffer();
+		if (this.iServiceType != null) buf.append(this.iServiceType);
+		if (this.iURLPath != null) {
+			if (buf.length() > 0) buf.append("://");
+			buf.append(this.iURLPath);
+		}
+		return buf.toString();
+	}
+
+	private int iHashCode = 0;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#hashCode()
+	 * 
+	 * Overrides Object.hashCode(). Hashes on the current service type,
+	 * transport, host, port, and URL part. !! in this case toString() must not
+	 * contain the lifeTime
+	 */
+	@Override
+	public int hashCode() {
+		if (this.iHashCode == 0) {
+			this.iHashCode = toString().hashCode();
+		}
+		return this.iHashCode;
+	}
+
+	private static final String DELIM = "://";
+
+	/**
+	 * 
      +	 * service: URL or URL
+	 * 
+	 * "service:" srvtype "://" addrspec
+	 * "service:" abstract-type ":" concrete-type> "://" addrspecc
+	 * 
+	 * addrspesc  = ( hostName / IPv4Address / IPv6Address ) [ ":" port ]
+	 * 
      
+	 * 
+	 * @param pUrlString
+	 * @throws IllegalArgumentException
+	 */
+	private void parseURL(String pUrlStr) throws IllegalArgumentException {
+		int srvTypeEndIdx = pUrlStr.indexOf(DELIM);
+		String addrStr;
+		if (srvTypeEndIdx >= 0) {
+			this.iServiceType = new ServiceType(pUrlStr.substring(0, srvTypeEndIdx));
+			addrStr = pUrlStr.substring(srvTypeEndIdx + DELIM.length());
+		} else {
+			if (pUrlStr.startsWith("service:")) {
+				this.iServiceType = new ServiceType(pUrlStr);
+				addrStr = null;
+			} else {
+				addrStr = pUrlStr;
+			}
+		}
+		if (addrStr == null) return;
+		this.iURLPath = addrStr;
+		if (addrStr.charAt(0) == '[') {
+			parseIPv6Address(addrStr);
+		} else {
+			parseIPv4Address(addrStr);
+		}
+	}
+
+	private void parseIPv6Address(String pAddrStr) throws IllegalArgumentException {
+		int hostEndIdx = pAddrStr.indexOf(']');
+		if (hostEndIdx < 0) throw new IllegalArgumentException("']' is not found for IPv6 address");
+		int colonIdx = hostEndIdx + 1;
+		this.iHost = pAddrStr.substring(0, colonIdx);
+		if (colonIdx < pAddrStr.length()) {
+			if (pAddrStr.charAt(colonIdx) != ':') throw new IllegalArgumentException(
+					"':' expected in \"" + pAddrStr + "\" at position " + colonIdx + " !");
+			parsePort(pAddrStr.substring(colonIdx + 1), pAddrStr);
+		}
+	}
+
+	private void parseIPv4Address(String pAddrStr) {
+		int colonIdx = pAddrStr.indexOf(':');
+		if (colonIdx > 0) {
+			this.iHost = pAddrStr.substring(0, colonIdx);
+			parsePort(pAddrStr.substring(colonIdx + 1), pAddrStr);
+		} else {
+			this.iHost = pAddrStr;
+		}
+	}
+
+	private void parsePort(String pPortStr, String pAddrStr) throws IllegalArgumentException {
+		try {
+			this.iPort = Integer.parseInt(pPortStr);
+		} catch (NumberFormatException e) {
+			throw new IllegalArgumentException("Port field : " + pPortStr + " in " + pAddrStr
+					+ " is invalid!");
+		}
+	}
+
+	private static boolean equalObjs(Object pThis, Object pThat) {
+		return pThis == null ? pThat == null : pThis.equals(pThat);
+	}
+
+	private static boolean equalStrs(String pThis, String pThat) {
+		return (pThis == null || pThis.length() == 0) ? (pThat == null || pThat.length() == 0)
+				: pThis.equals(pThat);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/TemplateRegistry.java b/src/main/java/org/metricshub/wbem/sblim/slp/TemplateRegistry.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/TemplateRegistry.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/TemplateRegistry.java
index 07338e5..f31836a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/TemplateRegistry.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/TemplateRegistry.java
@@ -1,143 +1,141 @@
-/*
-  TemplateRegistry.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 1535756    2006-08-08  lupusalex    Make code warning free
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Locale;
-
-/**
- * Subclasses of the TemplateRegistry abstract class provide access to service
- * location templates [8]. Classes implementing TemplateRegistry perform a
- * variety of functions. They manage the registration and access of service type
- * template documents. They create attribute verifiers from service templates,
- * for verification of attributes and introspection on template documents. Note
- * that clients of the Advertiser are not required to verify attributes before
- * registering (though they may get a TYPE_ERROR if the implementation supports
- * type checking and there is a mismatch with the template).
- * 
- */
-public abstract class TemplateRegistry {
-
-	/**
-	 * Returns the distinguished TemplateRegistry object for performing
-	 * operations on and with service templates. Returns null if the
-	 * implementation doesn't support TemplateRegistry functionality.
-	 * 
-	 * Not yet implemented
-	 * 
-	 * @return The template registry
-	 */
-	public static TemplateRegistry getTemplateRegistry() {
-		throw new RuntimeException("not implemented");
-	}
-
-	/**
-	 * Register the service template with the template registry.
-	 * 
-	 * @param pType
-	 *            The service type.
-	 * @param pDocumentURL
-	 *            A string containing the URL of the template document. May not
-	 *            be the empty string.
-	 * @param pLocale
-	 *            A Locale object containing the language locale of the
-	 *            template.
-	 * @param pVersion
-	 *            The version number identifier of template document.
-	 * @throws ServiceLocationException
-	 */
-	public abstract void registerServiceTemplate(ServiceType pType, String pDocumentURL,
-			Locale pLocale, String pVersion) throws ServiceLocationException;
-
-	/**
-	 * Deregister the template for the service type.
-	 * 
-	 * @param pType
-	 *            The service type.
-	 * @param pLocale
-	 *            A Locale object containing the language locale of the
-	 *            template.
-	 * @param pVersion
-	 *            A String containing the version number. Use null to indicate
-	 *            the latest version.
-	 * @throws ServiceLocationException
-	 */
-	public abstract void deregisterServiceTemplate(ServiceType pType, Locale pLocale,
-			String pVersion) throws ServiceLocationException;
-
-	/**
-	 * Returns the URL for the template document.
-	 * 
-	 * @param pType
-	 *            The service type.
-	 * @param pLocale
-	 *            A Locale object containing the language locale of the
-	 *            template.
-	 * @param pVersion
-	 *            A String containing the version number. Use null to indicate
-	 *            the latest version.
-	 * @return The URL
-	 * @throws ServiceLocationException
-	 */
-	public abstract String findTemplateURL(ServiceType pType, Locale pLocale, String pVersion)
-			throws ServiceLocationException;
-
-	/**
-	 * Reads the template document URL and returns an attribute verifier for the
-	 * service type. The attribute verifier can be used for verifying that
-	 * registration attributes match the template, and for introspection on the
-	 * template definition.
-	 * 
-	 * @param pDocumentURL
-	 *            A String containing the template document's URL. May not be
-	 *            the empty string.
-	 * @return The verifier
-	 * @throws ServiceLocationException
-	 */
-	public abstract ServiceLocationAttributeVerifier attributeVerifier(String pDocumentURL)
-			throws ServiceLocationException;
-
-}
+/*
+  TemplateRegistry.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 1535756    2006-08-08  lupusalex    Make code warning free
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Locale;
+
+/**
+ * Subclasses of the TemplateRegistry abstract class provide access to service
+ * location templates [8]. Classes implementing TemplateRegistry perform a
+ * variety of functions. They manage the registration and access of service type
+ * template documents. They create attribute verifiers from service templates,
+ * for verification of attributes and introspection on template documents. Note
+ * that clients of the Advertiser are not required to verify attributes before
+ * registering (though they may get a TYPE_ERROR if the implementation supports
+ * type checking and there is a mismatch with the template).
+ * 
+ */
+public abstract class TemplateRegistry {
+
+	/**
+	 * Returns the distinguished TemplateRegistry object for performing
+	 * operations on and with service templates. Returns null if the
+	 * implementation doesn't support TemplateRegistry functionality.
+	 * 
+	 * Not yet implemented
+	 * 
+	 * @return The template registry
+	 */
+	public static TemplateRegistry getTemplateRegistry() {
+		throw new RuntimeException("not implemented");
+	}
+
+	/**
+	 * Register the service template with the template registry.
+	 * 
+	 * @param pType
+	 *            The service type.
+	 * @param pDocumentURL
+	 *            A string containing the URL of the template document. May not
+	 *            be the empty string.
+	 * @param pLocale
+	 *            A Locale object containing the language locale of the
+	 *            template.
+	 * @param pVersion
+	 *            The version number identifier of template document.
+	 * @throws ServiceLocationException
+	 */
+	public abstract void registerServiceTemplate(ServiceType pType, String pDocumentURL,
+			Locale pLocale, String pVersion) throws ServiceLocationException;
+
+	/**
+	 * Deregister the template for the service type.
+	 * 
+	 * @param pType
+	 *            The service type.
+	 * @param pLocale
+	 *            A Locale object containing the language locale of the
+	 *            template.
+	 * @param pVersion
+	 *            A String containing the version number. Use null to indicate
+	 *            the latest version.
+	 * @throws ServiceLocationException
+	 */
+	public abstract void deregisterServiceTemplate(ServiceType pType, Locale pLocale,
+			String pVersion) throws ServiceLocationException;
+
+	/**
+	 * Returns the URL for the template document.
+	 * 
+	 * @param pType
+	 *            The service type.
+	 * @param pLocale
+	 *            A Locale object containing the language locale of the
+	 *            template.
+	 * @param pVersion
+	 *            A String containing the version number. Use null to indicate
+	 *            the latest version.
+	 * @return The URL
+	 * @throws ServiceLocationException
+	 */
+	public abstract String findTemplateURL(ServiceType pType, Locale pLocale, String pVersion)
+			throws ServiceLocationException;
+
+	/**
+	 * Reads the template document URL and returns an attribute verifier for the
+	 * service type. The attribute verifier can be used for verifying that
+	 * registration attributes match the template, and for introspection on the
+	 * template definition.
+	 * 
+	 * @param pDocumentURL
+	 *            A String containing the template document's URL. May not be
+	 *            the empty string.
+	 * @return The verifier
+	 * @throws ServiceLocationException
+	 */
+	public abstract ServiceLocationAttributeVerifier attributeVerifier(String pDocumentURL)
+			throws ServiceLocationException;
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/AdvertiserImpl.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/AdvertiserImpl.java
similarity index 75%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/AdvertiserImpl.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/AdvertiserImpl.java
index 8ec0d2f..b015014 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/AdvertiserImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/AdvertiserImpl.java
@@ -1,186 +1,185 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1804402    2007-11-10  ebak         IPv6 ready SLP - revision 4
- * 1892103    2008-02-15  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.slp.Advertiser;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationAttribute;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.MsgFactory;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.SLPMessage;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceAcknowledgment;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceDeregistration;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceRegistration;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.Util;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.SocketTimeoutException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Vector;
-
-
-
-/**
- * AdvertiserImpl
- * 
- */
-public class AdvertiserImpl implements Advertiser {
-
-	private Locale iLocale;
-
-	private String iLangTag;
-
-	private List iDefScopeList;
-
-	private final int iMaxDatagramSize = SLPConfig.getGlobalCfg().getMTU();
-
-	private final byte[] iInBuf = new byte[this.iMaxDatagramSize];
-
-	private final int[] iTimeOuts = SLPConfig.getGlobalCfg().getDatagramTimeouts();
-
-	private boolean iUseV6 = Net.hasIPv6() && SLPConfig.getGlobalCfg().useIPv6();
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLocale
-	 */
-	public AdvertiserImpl(Locale pLocale) {
-		this.iLocale = pLocale;
-		this.iLangTag = Util.getLangTag(this.iLocale);
-		this.iDefScopeList = new ArrayList();
-		this.iDefScopeList.add(SLPDefaults.DEFAULT_SCOPE);
-	}
-
-	/**
-	 * @param pURL
-	 * @param pAttributes
-	 * @throws ServiceLocationException
-	 */
-	public void addAttributes(ServiceURL pURL, Vector pAttributes)
-	throws ServiceLocationException {
-		throw new ServiceLocationException(ServiceLocationException.NOT_IMPLEMENTED);
-	}
-
-	/**
-	 * @param pURL
-	 * @param pAttributeIds
-	 * @throws ServiceLocationException
-	 */
-	public void deleteAttributes(ServiceURL pURL, Vector pAttributeIds)
-			throws ServiceLocationException {
-		throw new ServiceLocationException(ServiceLocationException.NOT_IMPLEMENTED);
-	}
-
-	public void deregister(ServiceURL pURL) throws ServiceLocationException {
-		sendMessage(new ServiceDeregistration(this.iLangTag, this.iDefScopeList, pURL, null));
-	}
-
-	public Locale getLocale() {
-		return this.iLocale;
-	}
-
-	public void register(ServiceURL pURL, Vector pAttributes)
-			throws ServiceLocationException {
-		sendMessage(new ServiceRegistration(this.iLangTag, pURL, this.iDefScopeList, pAttributes,
-		                                    null));
-
-	}
-
-	private void sendMessage(SLPMessage pMsg) throws ServiceLocationException {
-		try {
-			int res = unicast(pMsg);
-			if (res != ServiceLocationException.OK) throw new ServiceLocationException((short) res);
-			TRC.debug("service registered");
-		} catch (IOException e) {
-			throw new ServiceLocationException(ServiceLocationException.NETWORK_ERROR, e);
-		}
-	}
-
-	private int unicast(SLPMessage pMsg) throws ServiceLocationException, IOException {
-		DatagramSocket dgSocket = new DatagramSocket();
-		try {
-			byte[] reqBytes = pMsg.serialize(false, true, false);
-			InetAddress loopback = this.iUseV6 ? SLPConfig.getLoopbackV6() : SLPConfig
-					.getLoopbackV4();
-			TRC.debug("loopback:" + loopback);
-
-			DatagramPacket outPacket = new DatagramPacket(reqBytes, reqBytes.length, loopback,
-					SLPConfig.getGlobalCfg().getPort());
-			DatagramPacket inPacket = new DatagramPacket(this.iInBuf, this.iInBuf.length);
-
-			int timeOutIdx = 0;
-			while (timeOutIdx < this.iTimeOuts.length) {
-				TRC.debug("sending : " + pMsg);
-				dgSocket.send(outPacket);
-				dgSocket.setSoTimeout(this.iTimeOuts[timeOutIdx++]);
-				try {
-					dgSocket.receive(inPacket);
-				} catch (SocketTimeoutException e) {
-					TRC.debug("receive time out");
-					continue;
-				}
-				SLPMessage msg = MsgFactory.parse(inPacket);
-				TRC.debug("expected: " + pMsg.getXID() + ", received : " + msg);
-				if (msg instanceof ServiceAcknowledgment) {
-					ServiceAcknowledgment ack = (ServiceAcknowledgment) msg;
-					if (ack.getXID() == pMsg.getXID()) return ack.getErrorCode();
-				}
-				TRC.debug("ignoring :" + msg);
-			}
-		} finally {
-			dgSocket.close();
-		}
-		TRC.warning("registration failed");
-		return ServiceLocationException.INVALID_REGISTRATION;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1804402    2007-11-10  ebak         IPv6 ready SLP - revision 4
+ * 1892103    2008-02-15  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.internal.msg.MsgFactory;
+import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceAcknowledgment;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceDeregistration;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRegistration;
+import org.metricshub.wbem.sblim.slp.internal.msg.Util;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.slp.Advertiser;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.SocketTimeoutException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Vector;
+
+
+
+/**
+ * AdvertiserImpl
+ * 
+ */
+public class AdvertiserImpl implements Advertiser {
+
+	private Locale iLocale;
+
+	private String iLangTag;
+
+	private List iDefScopeList;
+
+	private final int iMaxDatagramSize = SLPConfig.getGlobalCfg().getMTU();
+
+	private final byte[] iInBuf = new byte[this.iMaxDatagramSize];
+
+	private final int[] iTimeOuts = SLPConfig.getGlobalCfg().getDatagramTimeouts();
+
+	private boolean iUseV6 = Net.hasIPv6() && SLPConfig.getGlobalCfg().useIPv6();
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLocale
+	 */
+	public AdvertiserImpl(Locale pLocale) {
+		this.iLocale = pLocale;
+		this.iLangTag = Util.getLangTag(this.iLocale);
+		this.iDefScopeList = new ArrayList();
+		this.iDefScopeList.add(SLPDefaults.DEFAULT_SCOPE);
+	}
+
+	/**
+	 * @param pURL
+	 * @param pAttributes
+	 * @throws ServiceLocationException
+	 */
+	public void addAttributes(ServiceURL pURL, Vector pAttributes)
+	throws ServiceLocationException {
+		throw new ServiceLocationException(ServiceLocationException.NOT_IMPLEMENTED);
+	}
+
+	/**
+	 * @param pURL
+	 * @param pAttributeIds
+	 * @throws ServiceLocationException
+	 */
+	public void deleteAttributes(ServiceURL pURL, Vector pAttributeIds)
+			throws ServiceLocationException {
+		throw new ServiceLocationException(ServiceLocationException.NOT_IMPLEMENTED);
+	}
+
+	public void deregister(ServiceURL pURL) throws ServiceLocationException {
+		sendMessage(new ServiceDeregistration(this.iLangTag, this.iDefScopeList, pURL, null));
+	}
+
+	public Locale getLocale() {
+		return this.iLocale;
+	}
+
+	public void register(ServiceURL pURL, Vector pAttributes)
+			throws ServiceLocationException {
+		sendMessage(new ServiceRegistration(this.iLangTag, pURL, this.iDefScopeList, pAttributes,
+		                                    null));
+
+	}
+
+	private void sendMessage(SLPMessage pMsg) throws ServiceLocationException {
+		try {
+			int res = unicast(pMsg);
+			if (res != ServiceLocationException.OK) throw new ServiceLocationException((short) res);
+			TRC.debug("service registered");
+		} catch (IOException e) {
+			throw new ServiceLocationException(ServiceLocationException.NETWORK_ERROR, e);
+		}
+	}
+
+	private int unicast(SLPMessage pMsg) throws ServiceLocationException, IOException {
+		DatagramSocket dgSocket = new DatagramSocket();
+		try {
+			byte[] reqBytes = pMsg.serialize(false, true, false);
+			InetAddress loopback = this.iUseV6 ? SLPConfig.getLoopbackV6() : SLPConfig
+					.getLoopbackV4();
+			TRC.debug("loopback:" + loopback);
+
+			DatagramPacket outPacket = new DatagramPacket(reqBytes, reqBytes.length, loopback,
+					SLPConfig.getGlobalCfg().getPort());
+			DatagramPacket inPacket = new DatagramPacket(this.iInBuf, this.iInBuf.length);
+
+			int timeOutIdx = 0;
+			while (timeOutIdx < this.iTimeOuts.length) {
+				TRC.debug("sending : " + pMsg);
+				dgSocket.send(outPacket);
+				dgSocket.setSoTimeout(this.iTimeOuts[timeOutIdx++]);
+				try {
+					dgSocket.receive(inPacket);
+				} catch (SocketTimeoutException e) {
+					TRC.debug("receive time out");
+					continue;
+				}
+				SLPMessage msg = MsgFactory.parse(inPacket);
+				TRC.debug("expected: " + pMsg.getXID() + ", received : " + msg);
+				if (msg instanceof ServiceAcknowledgment) {
+					ServiceAcknowledgment ack = (ServiceAcknowledgment) msg;
+					if (ack.getXID() == pMsg.getXID()) return ack.getErrorCode();
+				}
+				TRC.debug("ignoring :" + msg);
+			}
+		} finally {
+			dgSocket.close();
+		}
+		TRC.warning("registration failed");
+		return ServiceLocationException.INVALID_REGISTRATION;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/AttributeHandler.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/AttributeHandler.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/AttributeHandler.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/AttributeHandler.java
index e8e5aba..36ff919 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/AttributeHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/AttributeHandler.java
@@ -1,129 +1,127 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- *    2650    2013-07-18  blaschke-oss SLP opaque value handling incorrect
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationAttribute;
-
-/**
- * AttributeHandler
- * 
- */
-public class AttributeHandler {
-
-	/*
-	 * attr-list = attribute / attribute `,' attr-list attribute = `(' attr-tag
-	 * `=' attr-val-list `)' / attr-tag attr-val-list = attr-val / attr-val `,'
-	 * attr-val-list attr-tag = 1*safe-tag attr-val = intval / strval / boolval
-	 * / opaque intval = [-]1*DIGIT strval = 1*safe-val boolval = "true" /
-	 * "false" opaque = "\FF" 1*escape-val safe-val = ; Any character except
-	 * reserved. safe-tag = ; Any character except reserved, star and bad-tag.
-	 * reserved = `(' / `)' / `,' / `\' / `!' / `<' / `=' / `>' / `~' / CTL
-	 * escape-val = `\' HEXDIG HEXDIG bad-tag = CR / LF / HTAB / `_' star = `*'
-	 */
-	/**
-	 * @param pAttr
-	 * @return String
-	 */
-	public static String buildString(ServiceLocationAttribute pAttr) {
-		StringBuffer buf = new StringBuffer();
-		Vector valVec = pAttr.getValues();
-		if (valVec != null && valVec.size() > 0) buf.append('(');
-		buf.append(Convert.escape(pAttr.getId(), Convert.ATTR_RESERVED));
-		if (valVec != null && valVec.size() > 0) {
-			buf.append('=');
-			Iterator itr = valVec.iterator();
-			boolean first = true;
-			while (itr.hasNext()) {
-				if (first) first = false;
-				else buf.append(',');
-				buf.append(AttributeHandler.escapeValue(itr.next()));
-			}
-			buf.append(')');
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * escapeValue
-	 * 
-	 * @param pValue
-	 * @return String
-	 */
-	public static String escapeValue(Object pValue) {
-		if (pValue instanceof String) {
-			return Convert.escape((String) pValue, Convert.ATTR_RESERVED);
-		} else if (pValue instanceof Integer) {
-			return ((Integer) pValue).toString();
-		} else if (pValue instanceof Boolean) {
-			return ((Boolean) pValue).toString();
-		} else if (pValue instanceof byte[]) {
-			return AttributeHandler.mkOpaqueStr((byte[]) pValue);
-		} else if (pValue == null) { return ""; }
-		throw new IllegalArgumentException("Type: " + pValue.getClass().getName()
-				+ " cannot be an attribute value!");
-	}
-
-	/**
-	 * mkOpaqueStr
-	 * 
-	 * @param pBytes
-	 * @return String
-	 */
-	public static String mkOpaqueStr(byte[] pBytes) {
-		StringBuilder buf = new StringBuilder("\\FF");
-		for (int i = 0; i < pBytes.length; i++) {
-			int value = pBytes[i] & 0xff;
-			String hexStr = Integer.toString(value, 16).toUpperCase();
-			buf.append('\\');
-			if (hexStr.length() == 1) buf.append('0');
-			buf.append(hexStr);
-		}
-		return buf.toString();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ *    2650    2013-07-18  blaschke-oss SLP opaque value handling incorrect
+ */
+
+package org.metricshub.wbem.sblim.slp.internal;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+
+/**
+ * AttributeHandler
+ * 
+ */
+public class AttributeHandler {
+
+	/*
+	 * attr-list = attribute / attribute `,' attr-list attribute = `(' attr-tag
+	 * `=' attr-val-list `)' / attr-tag attr-val-list = attr-val / attr-val `,'
+	 * attr-val-list attr-tag = 1*safe-tag attr-val = intval / strval / boolval
+	 * / opaque intval = [-]1*DIGIT strval = 1*safe-val boolval = "true" /
+	 * "false" opaque = "\FF" 1*escape-val safe-val = ; Any character except
+	 * reserved. safe-tag = ; Any character except reserved, star and bad-tag.
+	 * reserved = `(' / `)' / `,' / `\' / `!' / `<' / `=' / `>' / `~' / CTL
+	 * escape-val = `\' HEXDIG HEXDIG bad-tag = CR / LF / HTAB / `_' star = `*'
+	 */
+	/**
+	 * @param pAttr
+	 * @return String
+	 */
+	public static String buildString(ServiceLocationAttribute pAttr) {
+		StringBuffer buf = new StringBuffer();
+		Vector valVec = pAttr.getValues();
+		if (valVec != null && valVec.size() > 0) buf.append('(');
+		buf.append(Convert.escape(pAttr.getId(), Convert.ATTR_RESERVED));
+		if (valVec != null && valVec.size() > 0) {
+			buf.append('=');
+			Iterator itr = valVec.iterator();
+			boolean first = true;
+			while (itr.hasNext()) {
+				if (first) first = false;
+				else buf.append(',');
+				buf.append(AttributeHandler.escapeValue(itr.next()));
+			}
+			buf.append(')');
+		}
+		return buf.toString();
+	}
+
+	/**
+	 * escapeValue
+	 * 
+	 * @param pValue
+	 * @return String
+	 */
+	public static String escapeValue(Object pValue) {
+		if (pValue instanceof String) {
+			return Convert.escape((String) pValue, Convert.ATTR_RESERVED);
+		} else if (pValue instanceof Integer) {
+			return ((Integer) pValue).toString();
+		} else if (pValue instanceof Boolean) {
+			return ((Boolean) pValue).toString();
+		} else if (pValue instanceof byte[]) {
+			return AttributeHandler.mkOpaqueStr((byte[]) pValue);
+		} else if (pValue == null) { return ""; }
+		throw new IllegalArgumentException("Type: " + pValue.getClass().getName()
+				+ " cannot be an attribute value!");
+	}
+
+	/**
+	 * mkOpaqueStr
+	 * 
+	 * @param pBytes
+	 * @return String
+	 */
+	public static String mkOpaqueStr(byte[] pBytes) {
+		StringBuilder buf = new StringBuilder("\\FF");
+		for (int i = 0; i < pBytes.length; i++) {
+			int value = pBytes[i] & 0xff;
+			String hexStr = Integer.toString(value, 16).toUpperCase();
+			buf.append('\\');
+			if (hexStr.length() == 1) buf.append('0');
+			buf.append(hexStr);
+		}
+		return buf.toString();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/Convert.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/Convert.java
similarity index 81%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/Convert.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/Convert.java
index 4ba64cf..231b0f9 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/Convert.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/Convert.java
@@ -1,173 +1,171 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2013
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- *    2650    2013-07-18  blaschke-oss SLP opaque value handling incorrect
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.UnsupportedEncodingException;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-
-/**
- * Convert
- * 
- */
-public class Convert {
-
-	/**
-	 * ATTR_RESERVED
-	 */
-	public static final String ATTR_RESERVED = "(),\\!<=>~";
-
-	/**
-	 * SCOPE_RESERVED
-	 */
-	public static final String SCOPE_RESERVED = "(),\\!<=>~;*+";
-
-	/**
-	 * DEFAULT_RESERVED
-	 */
-	public static final String DEFAULT_RESERVED = ATTR_RESERVED;
-
-	private static final byte[] EMPTY_BYTES = new byte[0];
-
-	/**
-	 * getBytes
-	 * 
-	 * @param pStr
-	 * @return byte[]
-	 */
-	public static byte[] getBytes(String pStr) {
-		if (pStr == null) return EMPTY_BYTES;
-		try {
-			return pStr.getBytes(SLPDefaults.ENCODING);
-		} catch (UnsupportedEncodingException e) {
-			throw new RuntimeException("Unsupported encoding : " + SLPDefaults.ENCODING, e);
-		}
-	}
-
-	/**
-	 * escape
-	 * 
-	 * @param pStr
-	 * @return String
-	 */
-	public static String escape(String pStr) {
-		return escape(pStr, DEFAULT_RESERVED);
-	}
-
-	/**
-	 * escape
-	 * 
-	 * @param pStr
-	 * @param pReservedChars
-	 * @return String
-	 */
-	public static String escape(String pStr, String pReservedChars) {
-		if (pStr == null) return "";
-		if (pReservedChars == null) return pStr;
-		StringBuffer strBuf = null;
-		for (int i = 0; i < pStr.length(); i++) {
-			char ch = pStr.charAt(i);
-			if (ch < 32 || pReservedChars.indexOf(ch) >= 0) {
-				if (strBuf == null) {
-					strBuf = new StringBuffer();
-					if (i > 0) strBuf.append(pStr.substring(0, i));
-				}
-				strBuf.append(escapeChar(ch));
-			} else if (strBuf != null) {
-				strBuf.append(ch);
-			}
-		}
-		return strBuf == null ? pStr : strBuf.toString();
-	}
-
-	/**
-	 * unescape
-	 * 
-	 * @param pStr
-	 * @return String
-	 * @throws ServiceLocationException
-	 */
-	public static String unescape(String pStr) throws ServiceLocationException {
-		if (pStr == null) return null;
-		StringBuffer resBuf = null;
-		int pos, lastPos = 0;
-		while ((pos = pStr.indexOf('\\', lastPos)) >= 0) {
-			char ch = unescapeChar(pStr.substring(pos));
-			if (resBuf == null) resBuf = new StringBuffer();
-			resBuf.append(pStr.subSequence(lastPos, pos)).append(ch);
-			lastPos = pos + 3;
-		}
-		if (resBuf != null && lastPos < pStr.length()) resBuf.append(pStr.substring(lastPos, pStr
-				.length()));
-		return resBuf == null ? pStr : resBuf.toString();
-	}
-
-	/**
-	 * The escape character is a backslash (UTF-8 0x5c) followed by the two
-	 * hexadecimal digits of the escaped character. -> Character code is ASCII.
-	 * 
-	 * @param ch
-	 * @return String
-	 */
-	private static String escapeChar(char ch) {
-		int code = ch;
-		String hexStr = Integer.toHexString(code).toUpperCase();
-		return (hexStr.length() == 1 ? "\\0" : "\\") + hexStr;
-	}
-
-	private static char unescapeChar(String pEscSeq) throws ServiceLocationException {
-		if (pEscSeq.length() < 3) throw new ServiceLocationException(
-				ServiceLocationException.PARSE_ERROR,
-				"Escaped character must contain 2 hex digits!\n" + "pEscSeq:" + pEscSeq);
-		String hexStr = pEscSeq.substring(1, 3);
-		try {
-			int code = Integer.parseInt(hexStr, 16);
-			return (char) code;
-		} catch (NumberFormatException e) {
-			throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-					"Failed to parse hex string: " + hexStr + ", pEscSeq=" + pEscSeq + " !", e);
-		}
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2013
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ *    2650    2013-07-18  blaschke-oss SLP opaque value handling incorrect
+ */
+
+package org.metricshub.wbem.sblim.slp.internal;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.UnsupportedEncodingException;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/**
+ * Convert
+ * 
+ */
+public class Convert {
+
+	/**
+	 * ATTR_RESERVED
+	 */
+	public static final String ATTR_RESERVED = "(),\\!<=>~";
+
+	/**
+	 * SCOPE_RESERVED
+	 */
+	public static final String SCOPE_RESERVED = "(),\\!<=>~;*+";
+
+	/**
+	 * DEFAULT_RESERVED
+	 */
+	public static final String DEFAULT_RESERVED = ATTR_RESERVED;
+
+	private static final byte[] EMPTY_BYTES = new byte[0];
+
+	/**
+	 * getBytes
+	 * 
+	 * @param pStr
+	 * @return byte[]
+	 */
+	public static byte[] getBytes(String pStr) {
+		if (pStr == null) return EMPTY_BYTES;
+		try {
+			return pStr.getBytes(SLPDefaults.ENCODING);
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException("Unsupported encoding : " + SLPDefaults.ENCODING, e);
+		}
+	}
+
+	/**
+	 * escape
+	 * 
+	 * @param pStr
+	 * @return String
+	 */
+	public static String escape(String pStr) {
+		return escape(pStr, DEFAULT_RESERVED);
+	}
+
+	/**
+	 * escape
+	 * 
+	 * @param pStr
+	 * @param pReservedChars
+	 * @return String
+	 */
+	public static String escape(String pStr, String pReservedChars) {
+		if (pStr == null) return "";
+		if (pReservedChars == null) return pStr;
+		StringBuffer strBuf = null;
+		for (int i = 0; i < pStr.length(); i++) {
+			char ch = pStr.charAt(i);
+			if (ch < 32 || pReservedChars.indexOf(ch) >= 0) {
+				if (strBuf == null) {
+					strBuf = new StringBuffer();
+					if (i > 0) strBuf.append(pStr.substring(0, i));
+				}
+				strBuf.append(escapeChar(ch));
+			} else if (strBuf != null) {
+				strBuf.append(ch);
+			}
+		}
+		return strBuf == null ? pStr : strBuf.toString();
+	}
+
+	/**
+	 * unescape
+	 * 
+	 * @param pStr
+	 * @return String
+	 * @throws ServiceLocationException
+	 */
+	public static String unescape(String pStr) throws ServiceLocationException {
+		if (pStr == null) return null;
+		StringBuffer resBuf = null;
+		int pos, lastPos = 0;
+		while ((pos = pStr.indexOf('\\', lastPos)) >= 0) {
+			char ch = unescapeChar(pStr.substring(pos));
+			if (resBuf == null) resBuf = new StringBuffer();
+			resBuf.append(pStr.subSequence(lastPos, pos)).append(ch);
+			lastPos = pos + 3;
+		}
+		if (resBuf != null && lastPos < pStr.length()) resBuf.append(pStr.substring(lastPos, pStr
+				.length()));
+		return resBuf == null ? pStr : resBuf.toString();
+	}
+
+	/**
+	 * The escape character is a backslash (UTF-8 0x5c) followed by the two
+	 * hexadecimal digits of the escaped character. -> Character code is ASCII.
+	 * 
+	 * @param ch
+	 * @return String
+	 */
+	private static String escapeChar(char ch) {
+		int code = ch;
+		String hexStr = Integer.toHexString(code).toUpperCase();
+		return (hexStr.length() == 1 ? "\\0" : "\\") + hexStr;
+	}
+
+	private static char unescapeChar(String pEscSeq) throws ServiceLocationException {
+		if (pEscSeq.length() < 3) throw new ServiceLocationException(
+				ServiceLocationException.PARSE_ERROR,
+				"Escaped character must contain 2 hex digits!\n" + "pEscSeq:" + pEscSeq);
+		String hexStr = pEscSeq.substring(1, 3);
+		try {
+			int code = Integer.parseInt(hexStr, 16);
+			return (char) code;
+		} catch (NumberFormatException e) {
+			throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
+					"Failed to parse hex string: " + hexStr + ", pEscSeq=" + pEscSeq + " !", e);
+		}
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java
similarity index 77%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java
index 677b3c9..5548585 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java
@@ -1,169 +1,167 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceType;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.AttributeRequest;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.SLPMessage;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceRequest;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceTypeRequest;
-
-/**
- * 
      - * SVRLOC group-id : FF0X:0:0:0:0:0:0:116
- *  - SRVTYPERQST Service Type Request
- *  - ATTRRQST Attribute Request
- *  - UA sends too
- *  
- * SVRLOC-DA group-id : FF0X:0:0:0:0:0:0:123
- *  - SRVRQST for the "service:directory-agent" service type
- *  - UA sends too
- * 
- * 1000 - 13FF: SRVRQST : FF0X:0:0:0:0:0:1:....
- *  - the ID is the hashcode of the Service Type string used in the SrvRqst.
- *  - UA sends too
- * 
      
- */
-public class IPv6MulticastAddressFactory {
-
-	private static final byte[] SRVLOC = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-			(byte) 0x16 };
-
-	private static final byte[] SRVLOC_DA = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			1, (byte) 0x23 };
-
-	private static final byte[] SRV_RQST = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-			0 };
-
-	/**
-	 * getSrvLocAddress
-	 * 
-	 * @param pScope
-	 * @return InetAddress
-	 * @throws UnknownHostException
-	 */
-	public static InetAddress getSrvLocAddress(int pScope) throws UnknownHostException {
-		SRVLOC[1] = (byte) (pScope & 0xff);
-		return InetAddress.getByAddress(SRVLOC);
-	}
-
-	/**
-	 * get
-	 * 
-	 * @param pScope
-	 * @param pMsg
-	 * @return InetAddress
-	 * @throws UnknownHostException
-	 */
-	public static InetAddress get(int pScope, SLPMessage pMsg) throws UnknownHostException {
-		if (pMsg instanceof ServiceTypeRequest || pMsg instanceof AttributeRequest) { return getSrvLocAddress(pScope); }
-		if (pMsg instanceof ServiceRequest) {
-			ServiceRequest srvRqst = (ServiceRequest) pMsg;
-			return get(pScope, srvRqst.getServiceType());
-		}
-		throw new IllegalArgumentException("Cannot determine IPv6 multicast address for "
-				+ pMsg.getClass().getName() + " !");
-	}
-
-	/**
-	 * get
-	 * 
-	 * @param pScope
-	 * @param pSrvType
-	 * @return InetAddress
-	 * @throws UnknownHostException
-	 */
-	public static InetAddress get(int pScope, ServiceType pSrvType) throws UnknownHostException {
-		if (pSrvType.equals(SLPDefaults.DA_SERVICE_TYPE)) {
-			SRVLOC_DA[1] = (byte) (pScope & 0xff);
-			return InetAddress.getByAddress(SRVLOC_DA);
-		}
-		return get(pScope, getSrvTypeHash(pSrvType));
-	}
-
-	/**
-	 * get
-	 * 
-	 * @param pScope
-	 * @param pSrvHash
-	 * @return InetAddress
-	 * @throws UnknownHostException
-	 */
-	public static InetAddress get(int pScope, int pSrvHash) throws UnknownHostException {
-		byte scope = (byte) (pScope & 0xff);
-		SRV_RQST[1] = scope;
-		SRV_RQST[14] = (byte) ((pSrvHash >> 8) & 0xff);
-		SRV_RQST[15] = (byte) (pSrvHash & 0xff);
-		return InetAddress.getByAddress(SRV_RQST);
-	}
-
-	/**
-	 * 
      -	 *  unsigned long slp_hash(const char *pc, unsigned int len) {
-	 *    unsigned long h = 0;
-	 *    while (len-- != 0) {
-	 *        h *= 33;
-	 *        h += *pc++;
-	 *    }
-	 *    return (0x3FF & h); // round to a range of 0-1023
-	 *   }
-	 * 
      
-	 * 
-	 * @param pServiceType
-	 * @return int
-	 */
-	public static int getSrvTypeHash(ServiceType pServiceType) {
-		if (pServiceType == null) return 0x1000;
-		String typeStr = pServiceType.toString();
-		int hash = 0;
-		for (int i = 0; i < typeStr.length(); i++) {
-			hash *= 33;
-			hash += typeStr.charAt(i);
-		}
-		return (0x3ff & hash) + 0x1000;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.metricshub.wbem.sblim.slp.ServiceType;
+import org.metricshub.wbem.sblim.slp.internal.msg.AttributeRequest;
+import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRequest;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceTypeRequest;
+
+/**
+ * 
      + * SVRLOC group-id : FF0X:0:0:0:0:0:0:116
+ *  - SRVTYPERQST Service Type Request
+ *  - ATTRRQST Attribute Request
+ *  - UA sends too
+ *  
+ * SVRLOC-DA group-id : FF0X:0:0:0:0:0:0:123
+ *  - SRVRQST for the "service:directory-agent" service type
+ *  - UA sends too
+ * 
+ * 1000 - 13FF: SRVRQST : FF0X:0:0:0:0:0:1:....
+ *  - the ID is the hashcode of the Service Type string used in the SrvRqst.
+ *  - UA sends too
+ * 
      
+ */
+public class IPv6MulticastAddressFactory {
+
+	private static final byte[] SRVLOC = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+			(byte) 0x16 };
+
+	private static final byte[] SRVLOC_DA = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			1, (byte) 0x23 };
+
+	private static final byte[] SRV_RQST = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+			0 };
+
+	/**
+	 * getSrvLocAddress
+	 * 
+	 * @param pScope
+	 * @return InetAddress
+	 * @throws UnknownHostException
+	 */
+	public static InetAddress getSrvLocAddress(int pScope) throws UnknownHostException {
+		SRVLOC[1] = (byte) (pScope & 0xff);
+		return InetAddress.getByAddress(SRVLOC);
+	}
+
+	/**
+	 * get
+	 * 
+	 * @param pScope
+	 * @param pMsg
+	 * @return InetAddress
+	 * @throws UnknownHostException
+	 */
+	public static InetAddress get(int pScope, SLPMessage pMsg) throws UnknownHostException {
+		if (pMsg instanceof ServiceTypeRequest || pMsg instanceof AttributeRequest) { return getSrvLocAddress(pScope); }
+		if (pMsg instanceof ServiceRequest) {
+			ServiceRequest srvRqst = (ServiceRequest) pMsg;
+			return get(pScope, srvRqst.getServiceType());
+		}
+		throw new IllegalArgumentException("Cannot determine IPv6 multicast address for "
+				+ pMsg.getClass().getName() + " !");
+	}
+
+	/**
+	 * get
+	 * 
+	 * @param pScope
+	 * @param pSrvType
+	 * @return InetAddress
+	 * @throws UnknownHostException
+	 */
+	public static InetAddress get(int pScope, ServiceType pSrvType) throws UnknownHostException {
+		if (pSrvType.equals(SLPDefaults.DA_SERVICE_TYPE)) {
+			SRVLOC_DA[1] = (byte) (pScope & 0xff);
+			return InetAddress.getByAddress(SRVLOC_DA);
+		}
+		return get(pScope, getSrvTypeHash(pSrvType));
+	}
+
+	/**
+	 * get
+	 * 
+	 * @param pScope
+	 * @param pSrvHash
+	 * @return InetAddress
+	 * @throws UnknownHostException
+	 */
+	public static InetAddress get(int pScope, int pSrvHash) throws UnknownHostException {
+		byte scope = (byte) (pScope & 0xff);
+		SRV_RQST[1] = scope;
+		SRV_RQST[14] = (byte) ((pSrvHash >> 8) & 0xff);
+		SRV_RQST[15] = (byte) (pSrvHash & 0xff);
+		return InetAddress.getByAddress(SRV_RQST);
+	}
+
+	/**
+	 * 
      +	 *  unsigned long slp_hash(const char *pc, unsigned int len) {
+	 *    unsigned long h = 0;
+	 *    while (len-- != 0) {
+	 *        h *= 33;
+	 *        h += *pc++;
+	 *    }
+	 *    return (0x3FF & h); // round to a range of 0-1023
+	 *   }
+	 * 
      
+	 * 
+	 * @param pServiceType
+	 * @return int
+	 */
+	public static int getSrvTypeHash(ServiceType pServiceType) {
+		if (pServiceType == null) return 0x1000;
+		String typeStr = pServiceType.toString();
+		int hash = 0;
+		for (int i = 0; i < typeStr.length(); i++) {
+			hash *= 33;
+			hash += typeStr.charAt(i);
+		}
+		return (0x3ff & hash) + 0x1000;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/Net.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/Net.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/Net.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/Net.java
index fe99ac9..01f864f 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/Net.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/Net.java
@@ -1,108 +1,106 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Enumeration;
-
-/**
- * Net
- * 
- */
-public class Net {
-
-	private static boolean cHasV6, cHasV4;
-
-	/**
-	 * hasIPv6
-	 * 
-	 * @return boolean
-	 */
-	public static boolean hasIPv6() {
-		scan();
-		return cHasV6;
-	}
-
-	/**
-	 * hasIPv4
-	 * 
-	 * @return boolean
-	 */
-	public static boolean hasIPv4() {
-		scan();
-		return cHasV4;
-	}
-
-	private static boolean cScanned;
-
-	private static void scan() {
-		if (cScanned) return;
-		try {
-			cScanned = true;
-			Enumeration ifaceEnum = NetworkInterface.getNetworkInterfaces();
-			ifLoop: while (ifaceEnum.hasMoreElements()) {
-				NetworkInterface iface = ifaceEnum.nextElement();
-				Enumeration addrEnum = iface.getInetAddresses();
-				while (addrEnum.hasMoreElements()) {
-					InetAddress addr = addrEnum.nextElement();
-					if (addr instanceof Inet4Address) {
-						cHasV4 = true;
-						if (cHasV6) break ifLoop;
-					} else if (addr instanceof Inet6Address) {
-						cHasV6 = true;
-						if (cHasV4) break ifLoop;
-					}
-				}
-			}
-			TRC.info("available IP versions : IPv4:" + cHasV4 + ", IPv6:" + cHasV6);
-		} catch (SocketException e) {
-			TRC.error(e);
-		}
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Enumeration;
+
+/**
+ * Net
+ * 
+ */
+public class Net {
+
+	private static boolean cHasV6, cHasV4;
+
+	/**
+	 * hasIPv6
+	 * 
+	 * @return boolean
+	 */
+	public static boolean hasIPv6() {
+		scan();
+		return cHasV6;
+	}
+
+	/**
+	 * hasIPv4
+	 * 
+	 * @return boolean
+	 */
+	public static boolean hasIPv4() {
+		scan();
+		return cHasV4;
+	}
+
+	private static boolean cScanned;
+
+	private static void scan() {
+		if (cScanned) return;
+		try {
+			cScanned = true;
+			Enumeration ifaceEnum = NetworkInterface.getNetworkInterfaces();
+			ifLoop: while (ifaceEnum.hasMoreElements()) {
+				NetworkInterface iface = ifaceEnum.nextElement();
+				Enumeration addrEnum = iface.getInetAddresses();
+				while (addrEnum.hasMoreElements()) {
+					InetAddress addr = addrEnum.nextElement();
+					if (addr instanceof Inet4Address) {
+						cHasV4 = true;
+						if (cHasV6) break ifLoop;
+					} else if (addr instanceof Inet6Address) {
+						cHasV6 = true;
+						if (cHasV4) break ifLoop;
+					}
+				}
+			}
+			TRC.info("available IP versions : IPv4:" + cHasV4 + ", IPv6:" + cHasV6);
+		} catch (SocketException e) {
+			TRC.error(e);
+		}
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPConfig.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPConfig.java
similarity index 91%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPConfig.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPConfig.java
index 37dbc2b..68580f0 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPConfig.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPConfig.java
@@ -1,616 +1,614 @@
-/*
-  SLPConfig.java
-
-  (C) Copyright IBM Corp. 2005, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- * ------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 1535793    2006-09-14  lupusalex    Fix&Integrate CIM&SLP configuration classes
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2414503    2008-12-10  raman_arora  parseList not returning populated list
- * 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)
- * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
- * 3026311    2010-07-07  blaschke-oss Vacuous comparison of integer value
- * 3026360    2010-07-07  blaschke-oss Handle unwritten fields
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-
-import org.sentrysoftware.wbem.sblim.slp.SLPConfigProperties;
-
-/**
- * SLPConfig
- * 
- */
-public final class SLPConfig {
-
-	private static InetAddress cBroadcastAddress;
-
-	private static SLPConfig cInstance = null;
-
-	private static InetAddress cLocalHostAddress;
-
-	private static InetAddress cLoopBackV4;
-
-	private static InetAddress cLoopBackV6;
-
-	private static InetAddress cMulticastAddress;
-
-	// SRVLOC_MulticastAddress requires scope (FF0s:0:0:0:0:0:0:116)
-	private static InetAddress cSRVLOC_MulticastAddress = null;
-
-	// SRVLOC_DA_MulticastAddress requires scope (FF0s:0:0:0:0:0:0:123)
-	private static InetAddress cSRVLOC_DA_MulticastAddress = null;
-
-	private static InetAddress getByName(String pName) {
-		try {
-			return InetAddress.getByName(pName);
-		} catch (UnknownHostException e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-	static {
-		cLoopBackV4 = getByName(SLPDefaults.LOOPBACK_ADDRESS_V4);
-		cLoopBackV6 = getByName(SLPDefaults.LOOPBACK_ADDRESS_V6);
-		cMulticastAddress = getByName(SLPDefaults.MULTICAST_ADDRESS);
-		cBroadcastAddress = getByName(SLPDefaults.BROADCAST_ADDRESS);
-		try {
-			cLocalHostAddress = InetAddress.getLocalHost();
-		} catch (UnknownHostException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * getBroadcastAddress
-	 * 
-	 * @return InetAddress
-	 */
-	public static InetAddress getBroadcastAddress() {
-		return cBroadcastAddress;
-	}
-
-	/**
-	 * getGlobalCfg
-	 * 
-	 * @return SLPConfig
-	 */
-	public static synchronized SLPConfig getGlobalCfg() {
-		if (cInstance == null) {
-			cInstance = new SLPConfig();
-		}
-		return cInstance;
-	}
-
-	/**
-	 * getLoopbackV4
-	 * 
-	 * @return InetAddress
-	 */
-	public static InetAddress getLoopbackV4() {
-		return cLoopBackV4;
-	}
-
-	/**
-	 * getLoopbackV6
-	 * 
-	 * @return InetAddress
-	 */
-	public static InetAddress getLoopbackV6() {
-		return cLoopBackV6;
-	}
-
-	/**
-	 * getMulticastAddress
-	 * 
-	 * @return InetAddress
-	 */
-	public static InetAddress getMulticastAddress() {
-		return cMulticastAddress;
-	}
-
-	/**
-	 * getSRVLOC_MulticastAddress
-	 * 
-	 * @return InetAddress
-	 */
-	public static InetAddress getSRVLOC_MulticastAddress() {
-		return cSRVLOC_MulticastAddress;
-	}
-
-	/**
-	 * getSRVLOC_DA_MulticastAddress
-	 * 
-	 * @return InetAddress
-	 */
-	public static InetAddress getSRVLOC_DA_MulticastAddress() {
-		return cSRVLOC_DA_MulticastAddress;
-	}
-
-	private static int getIntProperty(String pName, int pDefaultValue, int pMinValue, int pMaxValue) {
-		int value = Integer.getInteger(pName, pDefaultValue).intValue();
-		return Math.min(pMaxValue, Math.max(pMinValue, value));
-	}
-
-	private SLPConfig() {
-
-		try {
-			// try to load config class from CIM client. This will cause load of
-			// the CIM client's config file.
-			Class.forName("org.sblim.cimclient.internal.util.WBEMConfiguration");
-		} catch (ClassNotFoundException e) {
-			// nothing to do
-		}
-
-		Properties slpProperties = new Properties(new Properties());
-		try {
-			InputStream inputstream = getConfigURLStream();
-			if (inputstream != null) {
-				slpProperties.load(inputstream);
-			}
-			for (Iterator> iterator = slpProperties.entrySet().iterator(); iterator
-					.hasNext();) {
-				Entry entry = iterator.next();
-				System
-						.setProperty(String.valueOf(entry.getKey()), String.valueOf(entry
-								.getValue()));
-			}
-		} catch (IOException e) {
-			System.out.println("Error while parsing property file");
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * getActiveDiscoveryGranularity
-	 * 
-	 * @return int
-	 */
-	public int getActiveDiscoveryGranularity() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_DA_ACTIVE_DISCOVERY_GRANULARITY,
-				SLPDefaults.ACTIVE_DISCOVERY_GRANULARITY, SLPLimits.MIN_DISCOVERY_GRANULARITY,
-				SLPLimits.MAX_DISCOVERY_GRANULARITY);
-	}
-
-	/**
-	 * getActiveDiscoveryInterval
-	 * 
-	 * @return int
-	 */
-	public int getActiveDiscoveryInterval() {
-		int interval = getIntProperty(SLPConfigProperties.NET_SLP_DA_ACTIVE_DISCOVERY_INTERVAL,
-				SLPDefaults.ACTIVE_DISCOVERY_INTERVAL, SLPLimits.MIN_DISCOVERY_INTERVAL,
-				SLPLimits.MAX_DISCOVERY_INTERVAL); // 3mins
-		if (interval > 0 && interval < 300) { return 300;
-		// prevent network flooding
-		}
-		return interval;
-	}
-
-	/**
-	 * getDADiscoveryTimeouts
-	 * 
-	 * @return int[]
-	 */
-	public int[] getDADiscoveryTimeouts() {
-		return parseTimeouts(SLPConfigProperties.NET_SLP_DA_DISCOVERY_TIMEOUTS,
-				SLPDefaults.DA_DISCOVERY_TIMEOUTS);
-	}
-
-	/**
-	 * getDatagramTimeouts
-	 * 
-	 * @return int[]
-	 */
-	public int[] getDatagramTimeouts() {
-		return parseTimeouts(SLPConfigProperties.NET_SLP_DATAGRAM_TIMEOUTS,
-				SLPDefaults.DATAGRAM_TIMEOUTS);
-	}
-
-	/**
-	 * getInterfaces
-	 * 
-	 * @return List
-	 */
-	@SuppressWarnings("null")
-	public List getInterfaces() {
-
-		String property = System.getProperty(SLPConfigProperties.NET_SLP_INTERFACES);
-
-		List addresses = parseList(property);
-
-		final int count = addresses == null ? 0 : addresses.size();
-		List interfaces = new ArrayList(count);
-
-		if (count == 0) {
-			interfaces.add(cLocalHostAddress);
-			interfaces.add(cLoopBackV4);
-			interfaces.add(cLoopBackV6);
-		} else {
-			for (int i = 0; i < count; ++i) {
-				String address = addresses.get(i);
-				try {
-					InetAddress inetAddress = InetAddress.getByName(address);
-					if (!interfaces.contains(inetAddress)) {
-						if (inetAddress.equals(cLocalHostAddress)) {
-							interfaces.add(0, inetAddress);
-						} else {
-							interfaces.add(inetAddress);
-						}
-					}
-				} catch (UnknownHostException e) {
-					// TODO log this
-					continue;
-				}
-			}
-		}
-		return interfaces;
-	}
-
-	/**
-	 * getPort
-	 * 
-	 * @return int
-	 */
-	public int getPort() {
-		return Integer.getInteger(SLPConfigProperties.NET_SLP_PORT, SLPDefaults.SLP_PORT)
-				.intValue();
-	}
-
-	/**
-	 * setPort
-	 * 
-	 * @param pPort
-	 */
-	public void setPort(int pPort) {
-		System.setProperty(SLPConfigProperties.NET_SLP_PORT, Integer.toString(pPort));
-	}
-
-	/**
-	 * getTraceLevel
-	 * 
-	 * @return String
-	 */
-	public Level getTraceLevel() {
-		String str = System.getProperty(SLPConfigProperties.NET_SLP_TRC_LEVEL);
-		if ("OFF".equalsIgnoreCase(str)) return Level.OFF;
-		if ("ERROR".equalsIgnoreCase(str)) return Level.SEVERE;
-		if ("WARNING".equalsIgnoreCase(str)) return Level.WARNING;
-		if ("INFO".equalsIgnoreCase(str)) return Level.INFO;
-		if ("ALL".equalsIgnoreCase(str)) return Level.FINEST;
-		return Level.SEVERE;
-	}
-
-	/**
-	 * setTraceLevel
-	 * 
-	 * @param pLevel
-	 */
-	public void setTraceLevel(String pLevel) {
-		System.setProperty(SLPConfigProperties.NET_SLP_TRC_LEVEL, pLevel);
-	}
-
-	/**
-	 * setUseIPv6
-	 * 
-	 * @param pValue
-	 */
-	public void setUseIPv6(boolean pValue) {
-		System.setProperty(SLPConfigProperties.NET_SLP_USEIPV6, Boolean.toString(pValue));
-	}
-
-	/**
-	 * useIPv6
-	 * 
-	 * @return boolean
-	 */
-	public boolean useIPv6() {
-		return getBoolean(SLPConfigProperties.NET_SLP_USEIPV6, SLPDefaults.USE_IPV6);
-	}
-
-	/**
-	 * setUseIPv4
-	 * 
-	 * @param pValue
-	 */
-	public void setUseIPv4(boolean pValue) {
-		System.setProperty(SLPConfigProperties.NET_SLP_USEIPV4, Boolean.valueOf(pValue).toString());
-	}
-
-	/**
-	 * useIPv4
-	 * 
-	 * @return boolean
-	 */
-	public boolean useIPv4() {
-		return getBoolean(SLPConfigProperties.NET_SLP_USEIPV4, SLPDefaults.USE_IPV4);
-	}
-
-	/**
-	 * getLocalHost
-	 * 
-	 * @return InetAddress
-	 */
-	public InetAddress getLocalHost() {
-		List interfaces = getInterfaces();
-		return interfaces.get(0);
-	}
-
-	/**
-	 * getMaximumResults
-	 * 
-	 * @return int
-	 */
-	public int getMaximumResults() {
-		int value = Integer.getInteger(SLPConfigProperties.NET_SLP_MAX_RESULTS,
-				SLPDefaults.MAXIMUM_RESULTS).intValue();
-		return (value >= 1 && value < SLPDefaults.MAXIMUM_RESULTS) ? value
-				: SLPDefaults.MAXIMUM_RESULTS;
-	}
-
-	/**
-	 * getMTU
-	 * 
-	 * @return int
-	 */
-	public int getMTU() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_MTU, SLPDefaults.MTU, SLPLimits.MIN_MTU,
-				SLPLimits.MAX_MTU);
-	}
-
-	/**
-	 * getMulticastMaximumWait
-	 * 
-	 * @return int
-	 */
-	public int getMulticastMaximumWait() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_MULTICAST_MAXIMUM_WAIT,
-				SLPDefaults.MULTICAST_MAXIMUM_WAIT, SLPLimits.MIN_MULTICAST_MAXIMUM_WAIT,
-				SLPLimits.MAX_MULTICAST_MAXIMUM_WAIT);
-	}
-
-	/**
-	 * getMulticastRadius
-	 * 
-	 * @return int
-	 */
-	public int getMulticastRadius() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_MULTICAST_TTL,
-				SLPDefaults.MULTICAST_RADIUS, SLPLimits.MIN_MULTICAST_RADIUS,
-				SLPLimits.MAX_MULTICAST_RADIUS);
-	}
-
-	/**
-	 * getMulticastTimeouts
-	 * 
-	 * @return int[]
-	 */
-	public int[] getMulticastTimeouts() {
-		return parseTimeouts(SLPConfigProperties.NET_SLP_MULTICAST_TIMEOUTS,
-				SLPDefaults.MULTICAST_TIMEOUTS);
-	}
-
-	/**
-	 * getPreconfiguredDAs
-	 * 
-	 * @return List <InetAddress>
-	 */
-	public List getPreconfiguredDAs() {
-		String addressString = System.getProperty(SLPConfigProperties.NET_SLP_DA_ADDRESSES, "");
-		List addresses = parseList(addressString);
-		if (addresses == null) return null;
-		List result = new ArrayList();
-		for (Iterator iter = addresses.iterator(); iter.hasNext();) {
-			try {
-				result.add(InetAddress.getByName(iter.next()));
-			} catch (UnknownHostException e) {
-				// TODO: log this
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * getConfiguredScopes
-	 * 
-	 * @return List<String>
-	 */
-	public List getConfiguredScopes() {
-		List scopes = parseList(SLPConfigProperties.NET_SLP_USE_SCOPES);
-		if (scopes == null) scopes = new ArrayList();
-		if (scopes.size() == 0) scopes.add(SLPDefaults.DEFAULT_SCOPE);
-		return scopes;
-	}
-
-	/**
-	 * getSAOnlyScopes
-	 * 
-	 * @return List<String>
-	 */
-	public List getSAOnlyScopes() {
-		return parseList(SLPConfigProperties.NET_SLP_SAONLY_SCOPES);
-	}
-
-	/**
-	 * getServerSocketQueueLength
-	 * 
-	 * @return int
-	 */
-	public int getServerSocketQueueLength() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_SERVER_SOCKET_QUEUE_LENGTH,
-				SLPDefaults.SERVER_SOCKET_QUEUE_LENGTH, SLPLimits.MIN_SERVER_SOCKET_QUEUE_LENGTH,
-				SLPLimits.MAX_SERVER_SOCKET_QUEUE_LENGTH);
-	}
-
-	/**
-	 * getTCPTimeout
-	 * 
-	 * @return int
-	 */
-	public int getTCPTimeout() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_TCPTIMEOUT, SLPDefaults.TCP_TIMEOUT,
-				SLPLimits.MIN_TCP_TIMEOUT, SLPLimits.MAX_TCP_TIMEOUT);
-	}
-
-	/**
-	 * getTraceMsg
-	 * 
-	 * @return boolean
-	 */
-	public boolean getTraceMsg() {
-		return Boolean.getBoolean(SLPConfigProperties.NET_SLP_TRACE_MSG);
-	}
-
-	/**
-	 * isBroadcastOnly
-	 * 
-	 * @return boolean
-	 */
-	public boolean isBroadcastOnly() {
-		return Boolean.getBoolean(SLPConfigProperties.NET_SLP_IS_BROADCAST_ONLY);
-	}
-
-	/**
-	 * isDA
-	 * 
-	 * @return boolean
-	 */
-	public boolean isDA() {
-		return Boolean.getBoolean(SLPConfigProperties.NET_SLP_IS_DA);
-	}
-
-	/**
-	 * isSA
-	 * 
-	 * @return boolean
-	 */
-	public boolean isSA() {
-		return !isDA();
-	}
-
-	private static boolean getBoolean(String pPropName, boolean pDefaultValue) {
-		if (System.getProperty(pPropName) == null) return pDefaultValue;
-		return Boolean.getBoolean(pPropName);
-	}
-
-	private InputStream getConfigURLStream() {
-
-		String configURL = System.getProperty(SLPConfigProperties.NET_SLP_CONFIG_URL);
-
-		if (configURL != null) {
-			if (configURL.trim().length() > 0) {
-				try {
-					URL url = new URL(configURL);
-					InputStream inputstream = url.openStream();
-					return inputstream;
-				} catch (MalformedURLException e) {
-					// TODO log this
-				} catch (IOException e) {
-					// TODO LOG this... config file not found
-				}
-			}
-			return null;
-		}
-		for (int i = 0; i < SLPDefaults.CONF_URLS.length; ++i) {
-			configURL = SLPDefaults.CONF_URLS[i];
-			try {
-				URL url = new URL(configURL);
-				InputStream inputstream = url.openStream();
-				return inputstream;
-			} catch (Exception e) {
-				// Nothing to do
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Parses comma separated list.
-	 * 
-	 * @param pList
-	 * @return List of Strings
-	 */
-	private static List parseList(String pListStr) {
-		if (pListStr == null || pListStr.length() == 0) return null;
-		// TODO
-		StringTokenizer tokenizer = new StringTokenizer(pListStr, ",");
-		if (tokenizer.countTokens() == 0) return null;
-		List list = new ArrayList(tokenizer.countTokens());
-		while (tokenizer.hasMoreTokens()) {
-			String str = tokenizer.nextToken().trim();
-			if (str.length() == 0) continue;
-			list.add(str);
-		}
-		return list.size() == 0 ? null : list;
-	}
-
-	private int[] parseTimeouts(String pPropertyName, int[] pDefaultTimeouts) {
-		String value = System.getProperty(pPropertyName);
-
-		List list = parseList(value);
-		if (list == null) return pDefaultTimeouts;
-
-		int timeouts[] = new int[list.size()];
-		for (int pos = 0; pos < list.size(); pos++) {
-			String timeoutElem = list.get(pos);
-			try {
-				timeouts[pos] = Integer.parseInt(timeoutElem);
-			} catch (NumberFormatException e) {
-				return pDefaultTimeouts;
-			}
-		}
-		return timeouts;
-	}
-}
+/*
+  SLPConfig.java
+
+  (C) Copyright IBM Corp. 2005, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ * ------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 1535793    2006-09-14  lupusalex    Fix&Integrate CIM&SLP configuration classes
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2414503    2008-12-10  raman_arora  parseList not returning populated list
+ * 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)
+ * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
+ * 3026311    2010-07-07  blaschke-oss Vacuous comparison of integer value
+ * 3026360    2010-07-07  blaschke-oss Handle unwritten fields
+ */
+
+package org.metricshub.wbem.sblim.slp.internal;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+
+import org.metricshub.wbem.sblim.slp.SLPConfigProperties;
+
+/**
+ * SLPConfig
+ * 
+ */
+public final class SLPConfig {
+
+	private static InetAddress cBroadcastAddress;
+
+	private static SLPConfig cInstance = null;
+
+	private static InetAddress cLocalHostAddress;
+
+	private static InetAddress cLoopBackV4;
+
+	private static InetAddress cLoopBackV6;
+
+	private static InetAddress cMulticastAddress;
+
+	// SRVLOC_MulticastAddress requires scope (FF0s:0:0:0:0:0:0:116)
+	private static InetAddress cSRVLOC_MulticastAddress = null;
+
+	// SRVLOC_DA_MulticastAddress requires scope (FF0s:0:0:0:0:0:0:123)
+	private static InetAddress cSRVLOC_DA_MulticastAddress = null;
+
+	private static InetAddress getByName(String pName) {
+		try {
+			return InetAddress.getByName(pName);
+		} catch (UnknownHostException e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	static {
+		cLoopBackV4 = getByName(SLPDefaults.LOOPBACK_ADDRESS_V4);
+		cLoopBackV6 = getByName(SLPDefaults.LOOPBACK_ADDRESS_V6);
+		cMulticastAddress = getByName(SLPDefaults.MULTICAST_ADDRESS);
+		cBroadcastAddress = getByName(SLPDefaults.BROADCAST_ADDRESS);
+		try {
+			cLocalHostAddress = InetAddress.getLocalHost();
+		} catch (UnknownHostException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * getBroadcastAddress
+	 * 
+	 * @return InetAddress
+	 */
+	public static InetAddress getBroadcastAddress() {
+		return cBroadcastAddress;
+	}
+
+	/**
+	 * getGlobalCfg
+	 * 
+	 * @return SLPConfig
+	 */
+	public static synchronized SLPConfig getGlobalCfg() {
+		if (cInstance == null) {
+			cInstance = new SLPConfig();
+		}
+		return cInstance;
+	}
+
+	/**
+	 * getLoopbackV4
+	 * 
+	 * @return InetAddress
+	 */
+	public static InetAddress getLoopbackV4() {
+		return cLoopBackV4;
+	}
+
+	/**
+	 * getLoopbackV6
+	 * 
+	 * @return InetAddress
+	 */
+	public static InetAddress getLoopbackV6() {
+		return cLoopBackV6;
+	}
+
+	/**
+	 * getMulticastAddress
+	 * 
+	 * @return InetAddress
+	 */
+	public static InetAddress getMulticastAddress() {
+		return cMulticastAddress;
+	}
+
+	/**
+	 * getSRVLOC_MulticastAddress
+	 * 
+	 * @return InetAddress
+	 */
+	public static InetAddress getSRVLOC_MulticastAddress() {
+		return cSRVLOC_MulticastAddress;
+	}
+
+	/**
+	 * getSRVLOC_DA_MulticastAddress
+	 * 
+	 * @return InetAddress
+	 */
+	public static InetAddress getSRVLOC_DA_MulticastAddress() {
+		return cSRVLOC_DA_MulticastAddress;
+	}
+
+	private static int getIntProperty(String pName, int pDefaultValue, int pMinValue, int pMaxValue) {
+		int value = Integer.getInteger(pName, pDefaultValue).intValue();
+		return Math.min(pMaxValue, Math.max(pMinValue, value));
+	}
+
+	private SLPConfig() {
+
+		try {
+			// try to load config class from CIM client. This will cause load of
+			// the CIM client's config file.
+			Class.forName("org.sblim.cimclient.internal.util.WBEMConfiguration");
+		} catch (ClassNotFoundException e) {
+			// nothing to do
+		}
+
+		Properties slpProperties = new Properties(new Properties());
+		try {
+			InputStream inputstream = getConfigURLStream();
+			if (inputstream != null) {
+				slpProperties.load(inputstream);
+			}
+			for (Iterator> iterator = slpProperties.entrySet().iterator(); iterator
+					.hasNext();) {
+				Entry entry = iterator.next();
+				System
+						.setProperty(String.valueOf(entry.getKey()), String.valueOf(entry
+								.getValue()));
+			}
+		} catch (IOException e) {
+			System.out.println("Error while parsing property file");
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * getActiveDiscoveryGranularity
+	 * 
+	 * @return int
+	 */
+	public int getActiveDiscoveryGranularity() {
+		return getIntProperty(SLPConfigProperties.NET_SLP_DA_ACTIVE_DISCOVERY_GRANULARITY,
+				SLPDefaults.ACTIVE_DISCOVERY_GRANULARITY, SLPLimits.MIN_DISCOVERY_GRANULARITY,
+				SLPLimits.MAX_DISCOVERY_GRANULARITY);
+	}
+
+	/**
+	 * getActiveDiscoveryInterval
+	 * 
+	 * @return int
+	 */
+	public int getActiveDiscoveryInterval() {
+		int interval = getIntProperty(SLPConfigProperties.NET_SLP_DA_ACTIVE_DISCOVERY_INTERVAL,
+				SLPDefaults.ACTIVE_DISCOVERY_INTERVAL, SLPLimits.MIN_DISCOVERY_INTERVAL,
+				SLPLimits.MAX_DISCOVERY_INTERVAL); // 3mins
+		if (interval > 0 && interval < 300) { return 300;
+		// prevent network flooding
+		}
+		return interval;
+	}
+
+	/**
+	 * getDADiscoveryTimeouts
+	 * 
+	 * @return int[]
+	 */
+	public int[] getDADiscoveryTimeouts() {
+		return parseTimeouts(SLPConfigProperties.NET_SLP_DA_DISCOVERY_TIMEOUTS,
+				SLPDefaults.DA_DISCOVERY_TIMEOUTS);
+	}
+
+	/**
+	 * getDatagramTimeouts
+	 * 
+	 * @return int[]
+	 */
+	public int[] getDatagramTimeouts() {
+		return parseTimeouts(SLPConfigProperties.NET_SLP_DATAGRAM_TIMEOUTS,
+				SLPDefaults.DATAGRAM_TIMEOUTS);
+	}
+
+	/**
+	 * getInterfaces
+	 * 
+	 * @return List
+	 */
+	@SuppressWarnings("null")
+	public List getInterfaces() {
+
+		String property = System.getProperty(SLPConfigProperties.NET_SLP_INTERFACES);
+
+		List addresses = parseList(property);
+
+		final int count = addresses == null ? 0 : addresses.size();
+		List interfaces = new ArrayList(count);
+
+		if (count == 0) {
+			interfaces.add(cLocalHostAddress);
+			interfaces.add(cLoopBackV4);
+			interfaces.add(cLoopBackV6);
+		} else {
+			for (int i = 0; i < count; ++i) {
+				String address = addresses.get(i);
+				try {
+					InetAddress inetAddress = InetAddress.getByName(address);
+					if (!interfaces.contains(inetAddress)) {
+						if (inetAddress.equals(cLocalHostAddress)) {
+							interfaces.add(0, inetAddress);
+						} else {
+							interfaces.add(inetAddress);
+						}
+					}
+				} catch (UnknownHostException e) {
+					// TODO log this
+					continue;
+				}
+			}
+		}
+		return interfaces;
+	}
+
+	/**
+	 * getPort
+	 * 
+	 * @return int
+	 */
+	public int getPort() {
+		return Integer.getInteger(SLPConfigProperties.NET_SLP_PORT, SLPDefaults.SLP_PORT)
+				.intValue();
+	}
+
+	/**
+	 * setPort
+	 * 
+	 * @param pPort
+	 */
+	public void setPort(int pPort) {
+		System.setProperty(SLPConfigProperties.NET_SLP_PORT, Integer.toString(pPort));
+	}
+
+	/**
+	 * getTraceLevel
+	 * 
+	 * @return String
+	 */
+	public Level getTraceLevel() {
+		String str = System.getProperty(SLPConfigProperties.NET_SLP_TRC_LEVEL);
+		if ("OFF".equalsIgnoreCase(str)) return Level.OFF;
+		if ("ERROR".equalsIgnoreCase(str)) return Level.SEVERE;
+		if ("WARNING".equalsIgnoreCase(str)) return Level.WARNING;
+		if ("INFO".equalsIgnoreCase(str)) return Level.INFO;
+		if ("ALL".equalsIgnoreCase(str)) return Level.FINEST;
+		return Level.SEVERE;
+	}
+
+	/**
+	 * setTraceLevel
+	 * 
+	 * @param pLevel
+	 */
+	public void setTraceLevel(String pLevel) {
+		System.setProperty(SLPConfigProperties.NET_SLP_TRC_LEVEL, pLevel);
+	}
+
+	/**
+	 * setUseIPv6
+	 * 
+	 * @param pValue
+	 */
+	public void setUseIPv6(boolean pValue) {
+		System.setProperty(SLPConfigProperties.NET_SLP_USEIPV6, Boolean.toString(pValue));
+	}
+
+	/**
+	 * useIPv6
+	 * 
+	 * @return boolean
+	 */
+	public boolean useIPv6() {
+		return getBoolean(SLPConfigProperties.NET_SLP_USEIPV6, SLPDefaults.USE_IPV6);
+	}
+
+	/**
+	 * setUseIPv4
+	 * 
+	 * @param pValue
+	 */
+	public void setUseIPv4(boolean pValue) {
+		System.setProperty(SLPConfigProperties.NET_SLP_USEIPV4, Boolean.valueOf(pValue).toString());
+	}
+
+	/**
+	 * useIPv4
+	 * 
+	 * @return boolean
+	 */
+	public boolean useIPv4() {
+		return getBoolean(SLPConfigProperties.NET_SLP_USEIPV4, SLPDefaults.USE_IPV4);
+	}
+
+	/**
+	 * getLocalHost
+	 * 
+	 * @return InetAddress
+	 */
+	public InetAddress getLocalHost() {
+		List interfaces = getInterfaces();
+		return interfaces.get(0);
+	}
+
+	/**
+	 * getMaximumResults
+	 * 
+	 * @return int
+	 */
+	public int getMaximumResults() {
+		int value = Integer.getInteger(SLPConfigProperties.NET_SLP_MAX_RESULTS,
+				SLPDefaults.MAXIMUM_RESULTS).intValue();
+		return (value >= 1 && value < SLPDefaults.MAXIMUM_RESULTS) ? value
+				: SLPDefaults.MAXIMUM_RESULTS;
+	}
+
+	/**
+	 * getMTU
+	 * 
+	 * @return int
+	 */
+	public int getMTU() {
+		return getIntProperty(SLPConfigProperties.NET_SLP_MTU, SLPDefaults.MTU, SLPLimits.MIN_MTU,
+				SLPLimits.MAX_MTU);
+	}
+
+	/**
+	 * getMulticastMaximumWait
+	 * 
+	 * @return int
+	 */
+	public int getMulticastMaximumWait() {
+		return getIntProperty(SLPConfigProperties.NET_SLP_MULTICAST_MAXIMUM_WAIT,
+				SLPDefaults.MULTICAST_MAXIMUM_WAIT, SLPLimits.MIN_MULTICAST_MAXIMUM_WAIT,
+				SLPLimits.MAX_MULTICAST_MAXIMUM_WAIT);
+	}
+
+	/**
+	 * getMulticastRadius
+	 * 
+	 * @return int
+	 */
+	public int getMulticastRadius() {
+		return getIntProperty(SLPConfigProperties.NET_SLP_MULTICAST_TTL,
+				SLPDefaults.MULTICAST_RADIUS, SLPLimits.MIN_MULTICAST_RADIUS,
+				SLPLimits.MAX_MULTICAST_RADIUS);
+	}
+
+	/**
+	 * getMulticastTimeouts
+	 * 
+	 * @return int[]
+	 */
+	public int[] getMulticastTimeouts() {
+		return parseTimeouts(SLPConfigProperties.NET_SLP_MULTICAST_TIMEOUTS,
+				SLPDefaults.MULTICAST_TIMEOUTS);
+	}
+
+	/**
+	 * getPreconfiguredDAs
+	 * 
+	 * @return List <InetAddress>
+	 */
+	public List getPreconfiguredDAs() {
+		String addressString = System.getProperty(SLPConfigProperties.NET_SLP_DA_ADDRESSES, "");
+		List addresses = parseList(addressString);
+		if (addresses == null) return null;
+		List result = new ArrayList();
+		for (Iterator iter = addresses.iterator(); iter.hasNext();) {
+			try {
+				result.add(InetAddress.getByName(iter.next()));
+			} catch (UnknownHostException e) {
+				// TODO: log this
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * getConfiguredScopes
+	 * 
+	 * @return List<String>
+	 */
+	public List getConfiguredScopes() {
+		List scopes = parseList(SLPConfigProperties.NET_SLP_USE_SCOPES);
+		if (scopes == null) scopes = new ArrayList();
+		if (scopes.size() == 0) scopes.add(SLPDefaults.DEFAULT_SCOPE);
+		return scopes;
+	}
+
+	/**
+	 * getSAOnlyScopes
+	 * 
+	 * @return List<String>
+	 */
+	public List getSAOnlyScopes() {
+		return parseList(SLPConfigProperties.NET_SLP_SAONLY_SCOPES);
+	}
+
+	/**
+	 * getServerSocketQueueLength
+	 * 
+	 * @return int
+	 */
+	public int getServerSocketQueueLength() {
+		return getIntProperty(SLPConfigProperties.NET_SLP_SERVER_SOCKET_QUEUE_LENGTH,
+				SLPDefaults.SERVER_SOCKET_QUEUE_LENGTH, SLPLimits.MIN_SERVER_SOCKET_QUEUE_LENGTH,
+				SLPLimits.MAX_SERVER_SOCKET_QUEUE_LENGTH);
+	}
+
+	/**
+	 * getTCPTimeout
+	 * 
+	 * @return int
+	 */
+	public int getTCPTimeout() {
+		return getIntProperty(SLPConfigProperties.NET_SLP_TCPTIMEOUT, SLPDefaults.TCP_TIMEOUT,
+				SLPLimits.MIN_TCP_TIMEOUT, SLPLimits.MAX_TCP_TIMEOUT);
+	}
+
+	/**
+	 * getTraceMsg
+	 * 
+	 * @return boolean
+	 */
+	public boolean getTraceMsg() {
+		return Boolean.getBoolean(SLPConfigProperties.NET_SLP_TRACE_MSG);
+	}
+
+	/**
+	 * isBroadcastOnly
+	 * 
+	 * @return boolean
+	 */
+	public boolean isBroadcastOnly() {
+		return Boolean.getBoolean(SLPConfigProperties.NET_SLP_IS_BROADCAST_ONLY);
+	}
+
+	/**
+	 * isDA
+	 * 
+	 * @return boolean
+	 */
+	public boolean isDA() {
+		return Boolean.getBoolean(SLPConfigProperties.NET_SLP_IS_DA);
+	}
+
+	/**
+	 * isSA
+	 * 
+	 * @return boolean
+	 */
+	public boolean isSA() {
+		return !isDA();
+	}
+
+	private static boolean getBoolean(String pPropName, boolean pDefaultValue) {
+		if (System.getProperty(pPropName) == null) return pDefaultValue;
+		return Boolean.getBoolean(pPropName);
+	}
+
+	private InputStream getConfigURLStream() {
+
+		String configURL = System.getProperty(SLPConfigProperties.NET_SLP_CONFIG_URL);
+
+		if (configURL != null) {
+			if (configURL.trim().length() > 0) {
+				try {
+					URL url = new URL(configURL);
+					InputStream inputstream = url.openStream();
+					return inputstream;
+				} catch (MalformedURLException e) {
+					// TODO log this
+				} catch (IOException e) {
+					// TODO LOG this... config file not found
+				}
+			}
+			return null;
+		}
+		for (int i = 0; i < SLPDefaults.CONF_URLS.length; ++i) {
+			configURL = SLPDefaults.CONF_URLS[i];
+			try {
+				URL url = new URL(configURL);
+				InputStream inputstream = url.openStream();
+				return inputstream;
+			} catch (Exception e) {
+				// Nothing to do
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Parses comma separated list.
+	 * 
+	 * @param pList
+	 * @return List of Strings
+	 */
+	private static List parseList(String pListStr) {
+		if (pListStr == null || pListStr.length() == 0) return null;
+		// TODO
+		StringTokenizer tokenizer = new StringTokenizer(pListStr, ",");
+		if (tokenizer.countTokens() == 0) return null;
+		List list = new ArrayList(tokenizer.countTokens());
+		while (tokenizer.hasMoreTokens()) {
+			String str = tokenizer.nextToken().trim();
+			if (str.length() == 0) continue;
+			list.add(str);
+		}
+		return list.size() == 0 ? null : list;
+	}
+
+	private int[] parseTimeouts(String pPropertyName, int[] pDefaultTimeouts) {
+		String value = System.getProperty(pPropertyName);
+
+		List list = parseList(value);
+		if (list == null) return pDefaultTimeouts;
+
+		int timeouts[] = new int[list.size()];
+		for (int pos = 0; pos < list.size(); pos++) {
+			String timeoutElem = list.get(pos);
+			try {
+				timeouts[pos] = Integer.parseInt(timeoutElem);
+			} catch (NumberFormatException e) {
+				return pDefaultTimeouts;
+			}
+		}
+		return timeouts;
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPDefaults.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPDefaults.java
similarity index 81%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPDefaults.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPDefaults.java
index ee1a589..fced292 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPDefaults.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPDefaults.java
@@ -1,219 +1,217 @@
-/*
-  SLPDefaults.java
-
-  (C) Copyright IBM Corp. 2005, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
- * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1516246    2006-07-22  lupusalex    Integrate SLP client code
- * 1535793    2006-09-14  lupusalex    Fix&Integrate CIM&SLP configuration classes
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1911400    2008-03-10  blaschks-oss Source RPM file on SourceForge is broken
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Locale;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceType;
-
-/**
- * SLPDefaults
- * 
- */
-/**
- * Class SLPDefaults is responsible for
- * 
- */
-public interface SLPDefaults {
-
-	/**
-	 * ALL_AUTHORITIES
-	 */
-	public static final String ALL_AUTHORITIES = "*";
-
-	/**
-	 * BROADCAST_ADDRESS
-	 */
-	public static final String BROADCAST_ADDRESS = "255.255.255.255";
-
-	/**
-	 * CONF_URLS
-	 */
-	public static final String[] CONF_URLS = {
-			"file:sblim-slp-client2.properties",
-			"file:" + System.getProperty("user.home") + System.getProperty("file.separator")
-					+ "sblim-slp-client2.properties",
-			"file:/etc/java/sblim-slp-client2.properties", "file:/etc/sblim-slp-client2.properties" };
-
-	/**
-	 * DA_DISCOVERY_TIMEOUTS
-	 */
-	public static final int DA_DISCOVERY_TIMEOUTS[] = { 200, 200, 200, 200, 300, 400 };
-
-	/**
-	 * DA_SERVICE_TYPE
-	 */
-	public static final ServiceType DA_SERVICE_TYPE = new ServiceType("service:directory-agent");
-
-	/**
-	 * DATAGRAM_TIMEOUTS
-	 */
-	public static final int DATAGRAM_TIMEOUTS[] = { 100, 200, 300 };
-
-	/**
-	 * DEFAULT_SCOPE
-	 */
-	public static final String DEFAULT_SCOPE = "default";
-
-	/**
-	 * ACTIVE_DISCOVERY_GRANULARITY
-	 */
-	public static final int ACTIVE_DISCOVERY_GRANULARITY = 900;
-
-	/**
-	 * ACTIVE_DISCOVERY_INTERVAL
-	 */
-	public static final int ACTIVE_DISCOVERY_INTERVAL = 900;
-
-	/**
-	 * LOCALE
-	 */
-	public static final Locale LOCALE = new Locale("en", "");
-
-	/**
-	 * LOG_FILE
-	 */
-	public static final String LOG_FILE = "slp.log";
-
-	/**
-	 * LOOPBACK_ADDRESS_V4
-	 */
-	public static final String LOOPBACK_ADDRESS_V4 = "127.0.0.1";
-
-	/**
-	 * LOOPBACK_ADDRESS_V6
-	 */
-	public static final String LOOPBACK_ADDRESS_V6 = "::1";
-
-	/**
-	 * LOOPBACK_NAME
-	 */
-	public static final String LOOPBACK_NAME = "localhost";
-
-	/**
-	 * MAXIMUM_RESULTS
-	 */
-	public static final int MAXIMUM_RESULTS = 0x7fffffff;
-
-	/**
-	 * MTU
-	 */
-	public static final int MTU = 1400;
-
-	/**
-	 * MULTICAST_ADDRESS
-	 */
-	public static final String MULTICAST_ADDRESS = "239.255.255.253";
-
-	/**
-	 * MULTICAST_MAXIMUM_WAIT
-	 */
-	public static final int MULTICAST_MAXIMUM_WAIT = 2000;
-
-	/**
-	 * MULTICAST_RADIUS
-	 */
-	public static final int MULTICAST_RADIUS = 255;
-
-	/**
-	 * MULTICAST_TIMEOUTS
-	 */
-	public static final int MULTICAST_TIMEOUTS[] = { 200, 200, 200, 200, 300, 400 };
-
-	/**
-	 * SA_SERVICE_TYPE
-	 */
-	public static final ServiceType SA_SERVICE_TYPE = new ServiceType("service:service-agent");
-
-	/**
-	 * SERVER_SOCKET_QUEUE_LENGTH
-	 */
-	public static final int SERVER_SOCKET_QUEUE_LENGTH = 10;
-
-	/**
-	 * SLP_PORT
-	 */
-	public static final int SLP_PORT = 427;
-
-	/**
-	 * USE_IPV6
-	 */
-	public static final boolean USE_IPV6 = true;
-
-	/**
-	 * USE_IPV4
-	 */
-	public static final boolean USE_IPV4 = true;
-
-	/**
-	 * SLP_VERSION
-	 */
-	public static final int SLP_VERSION = 2;
-
-	/**
-	 * TCP_TIMEOUT
-	 */
-	public static final int TCP_TIMEOUT = 20000;
-
-	/**
-	 * ENCODING
-	 */
-	public static final String ENCODING = "UTF-8";
-
-	/**
-	 * DA list is rediscovered if DACACHE_TIMEOUT (seconds) is elapsed.
-	 */
-	public static final int DACACHE_TIMEOUT = 90;
-
-	/**
-	 * IPV6_MULTICAST_SCOPE
-	 */
-	public static final int IPV6_MULTICAST_SCOPE = 5;
-
-}
+/*
+  SLPDefaults.java
+
+  (C) Copyright IBM Corp. 2005, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Roberto Pineiro, IBM, roberto.pineiro@us.ibm.com
+ * @author : Chung-hao Tan, IBM, chungtan@us.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1516246    2006-07-22  lupusalex    Integrate SLP client code
+ * 1535793    2006-09-14  lupusalex    Fix&Integrate CIM&SLP configuration classes
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1911400    2008-03-10  blaschks-oss Source RPM file on SourceForge is broken
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Locale;
+
+import org.metricshub.wbem.sblim.slp.ServiceType;
+
+/**
+ * SLPDefaults
+ * 
+ */
+/**
+ * Class SLPDefaults is responsible for
+ * 
+ */
+public interface SLPDefaults {
+
+	/**
+	 * ALL_AUTHORITIES
+	 */
+	public static final String ALL_AUTHORITIES = "*";
+
+	/**
+	 * BROADCAST_ADDRESS
+	 */
+	public static final String BROADCAST_ADDRESS = "255.255.255.255";
+
+	/**
+	 * CONF_URLS
+	 */
+	public static final String[] CONF_URLS = {
+			"file:sblim-slp-client2.properties",
+			"file:" + System.getProperty("user.home") + System.getProperty("file.separator")
+					+ "sblim-slp-client2.properties",
+			"file:/etc/java/sblim-slp-client2.properties", "file:/etc/sblim-slp-client2.properties" };
+
+	/**
+	 * DA_DISCOVERY_TIMEOUTS
+	 */
+	public static final int DA_DISCOVERY_TIMEOUTS[] = { 200, 200, 200, 200, 300, 400 };
+
+	/**
+	 * DA_SERVICE_TYPE
+	 */
+	public static final ServiceType DA_SERVICE_TYPE = new ServiceType("service:directory-agent");
+
+	/**
+	 * DATAGRAM_TIMEOUTS
+	 */
+	public static final int DATAGRAM_TIMEOUTS[] = { 100, 200, 300 };
+
+	/**
+	 * DEFAULT_SCOPE
+	 */
+	public static final String DEFAULT_SCOPE = "default";
+
+	/**
+	 * ACTIVE_DISCOVERY_GRANULARITY
+	 */
+	public static final int ACTIVE_DISCOVERY_GRANULARITY = 900;
+
+	/**
+	 * ACTIVE_DISCOVERY_INTERVAL
+	 */
+	public static final int ACTIVE_DISCOVERY_INTERVAL = 900;
+
+	/**
+	 * LOCALE
+	 */
+	public static final Locale LOCALE = new Locale("en", "");
+
+	/**
+	 * LOG_FILE
+	 */
+	public static final String LOG_FILE = "slp.log";
+
+	/**
+	 * LOOPBACK_ADDRESS_V4
+	 */
+	public static final String LOOPBACK_ADDRESS_V4 = "127.0.0.1";
+
+	/**
+	 * LOOPBACK_ADDRESS_V6
+	 */
+	public static final String LOOPBACK_ADDRESS_V6 = "::1";
+
+	/**
+	 * LOOPBACK_NAME
+	 */
+	public static final String LOOPBACK_NAME = "localhost";
+
+	/**
+	 * MAXIMUM_RESULTS
+	 */
+	public static final int MAXIMUM_RESULTS = 0x7fffffff;
+
+	/**
+	 * MTU
+	 */
+	public static final int MTU = 1400;
+
+	/**
+	 * MULTICAST_ADDRESS
+	 */
+	public static final String MULTICAST_ADDRESS = "239.255.255.253";
+
+	/**
+	 * MULTICAST_MAXIMUM_WAIT
+	 */
+	public static final int MULTICAST_MAXIMUM_WAIT = 2000;
+
+	/**
+	 * MULTICAST_RADIUS
+	 */
+	public static final int MULTICAST_RADIUS = 255;
+
+	/**
+	 * MULTICAST_TIMEOUTS
+	 */
+	public static final int MULTICAST_TIMEOUTS[] = { 200, 200, 200, 200, 300, 400 };
+
+	/**
+	 * SA_SERVICE_TYPE
+	 */
+	public static final ServiceType SA_SERVICE_TYPE = new ServiceType("service:service-agent");
+
+	/**
+	 * SERVER_SOCKET_QUEUE_LENGTH
+	 */
+	public static final int SERVER_SOCKET_QUEUE_LENGTH = 10;
+
+	/**
+	 * SLP_PORT
+	 */
+	public static final int SLP_PORT = 427;
+
+	/**
+	 * USE_IPV6
+	 */
+	public static final boolean USE_IPV6 = true;
+
+	/**
+	 * USE_IPV4
+	 */
+	public static final boolean USE_IPV4 = true;
+
+	/**
+	 * SLP_VERSION
+	 */
+	public static final int SLP_VERSION = 2;
+
+	/**
+	 * TCP_TIMEOUT
+	 */
+	public static final int TCP_TIMEOUT = 20000;
+
+	/**
+	 * ENCODING
+	 */
+	public static final String ENCODING = "UTF-8";
+
+	/**
+	 * DA list is rediscovered if DACACHE_TIMEOUT (seconds) is elapsed.
+	 */
+	public static final int DACACHE_TIMEOUT = 90;
+
+	/**
+	 * IPV6_MULTICAST_SCOPE
+	 */
+	public static final int IPV6_MULTICAST_SCOPE = 5;
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPLimits.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPLimits.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPLimits.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPLimits.java
index d915756..d0c2c58 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPLimits.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPLimits.java
@@ -1,123 +1,121 @@
-/*
-  SLPLimits.java
-
-  (C) Copyright IBM Corp. 2006, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Alexander Wolf-Reber, IBM a.wolf-reber@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1535793    2006-09-14  lupusalex    Fix&Integrate CIM&SLP configuration classes
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2907527    2009-12-02  blaschke-oss Fix SLP properties issues
- */
-package org.sentrysoftware.wbem.sblim.slp.internal;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * SLPLimits
- * 
- */
-public interface SLPLimits {
-
-	/**
-	 * MAX_DISCOVERY_GRANULARITY
-	 */
-	public static final int MAX_DISCOVERY_GRANULARITY = 10800;
-
-	/**
-	 * MAX_DISCOVERY_INTERVAL
-	 */
-	public static final int MAX_DISCOVERY_INTERVAL = 3 * 60 * 60; // 3h
-
-	/**
-	 * MAX_MTU
-	 */
-	public static final int MAX_MTU = 8192;
-
-	/**
-	 * MAX_MULTICAST_MAXIMUM_WAIT
-	 */
-	public static final int MAX_MULTICAST_MAXIMUM_WAIT = 60000;
-
-	/**
-	 * MAX_MULTICAST_RADIUS
-	 */
-	public static final int MAX_MULTICAST_RADIUS = 255;
-
-	/**
-	 * MAX_SERVER_SOCKET_QUEUE_LENGTH
-	 */
-	public static final int MAX_SERVER_SOCKET_QUEUE_LENGTH = 0x7fffffff;
-
-	/**
-	 * MAX_TCP_TIMEOUT
-	 */
-	public static final int MAX_TCP_TIMEOUT = 360000;
-
-	/**
-	 * MIN_DISCOVERY_GRANULARITY
-	 */
-	public static final int MIN_DISCOVERY_GRANULARITY = 0;
-
-	/**
-	 * MIN_DISCOVERY_INTERVAL
-	 */
-	public static final int MIN_DISCOVERY_INTERVAL = 0;
-
-	/**
-	 * MIN_MTU
-	 */
-	public static final int MIN_MTU = 128;
-
-	/**
-	 * MIN_MULTICAST_MAXIMUM_WAIT
-	 */
-	public static final int MIN_MULTICAST_MAXIMUM_WAIT = 1000;
-
-	/**
-	 * MIN_MULTICAST_RADIUS
-	 */
-	public static final int MIN_MULTICAST_RADIUS = 1;
-
-	/**
-	 * MIN_SERVER_SOCKET_QUEUE_LENGTH
-	 */
-	public static final int MIN_SERVER_SOCKET_QUEUE_LENGTH = 0;
-
-	/**
-	 * MIN_TCP_TIMEOUT
-	 */
-	public static final int MIN_TCP_TIMEOUT = 100;
-
-}
+/*
+  SLPLimits.java
+
+  (C) Copyright IBM Corp. 2006, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Alexander Wolf-Reber, IBM a.wolf-reber@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1535793    2006-09-14  lupusalex    Fix&Integrate CIM&SLP configuration classes
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 2907527    2009-12-02  blaschke-oss Fix SLP properties issues
+ */
+package org.metricshub.wbem.sblim.slp.internal;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * SLPLimits
+ * 
+ */
+public interface SLPLimits {
+
+	/**
+	 * MAX_DISCOVERY_GRANULARITY
+	 */
+	public static final int MAX_DISCOVERY_GRANULARITY = 10800;
+
+	/**
+	 * MAX_DISCOVERY_INTERVAL
+	 */
+	public static final int MAX_DISCOVERY_INTERVAL = 3 * 60 * 60; // 3h
+
+	/**
+	 * MAX_MTU
+	 */
+	public static final int MAX_MTU = 8192;
+
+	/**
+	 * MAX_MULTICAST_MAXIMUM_WAIT
+	 */
+	public static final int MAX_MULTICAST_MAXIMUM_WAIT = 60000;
+
+	/**
+	 * MAX_MULTICAST_RADIUS
+	 */
+	public static final int MAX_MULTICAST_RADIUS = 255;
+
+	/**
+	 * MAX_SERVER_SOCKET_QUEUE_LENGTH
+	 */
+	public static final int MAX_SERVER_SOCKET_QUEUE_LENGTH = 0x7fffffff;
+
+	/**
+	 * MAX_TCP_TIMEOUT
+	 */
+	public static final int MAX_TCP_TIMEOUT = 360000;
+
+	/**
+	 * MIN_DISCOVERY_GRANULARITY
+	 */
+	public static final int MIN_DISCOVERY_GRANULARITY = 0;
+
+	/**
+	 * MIN_DISCOVERY_INTERVAL
+	 */
+	public static final int MIN_DISCOVERY_INTERVAL = 0;
+
+	/**
+	 * MIN_MTU
+	 */
+	public static final int MIN_MTU = 128;
+
+	/**
+	 * MIN_MULTICAST_MAXIMUM_WAIT
+	 */
+	public static final int MIN_MULTICAST_MAXIMUM_WAIT = 1000;
+
+	/**
+	 * MIN_MULTICAST_RADIUS
+	 */
+	public static final int MIN_MULTICAST_RADIUS = 1;
+
+	/**
+	 * MIN_SERVER_SOCKET_QUEUE_LENGTH
+	 */
+	public static final int MIN_SERVER_SOCKET_QUEUE_LENGTH = 0;
+
+	/**
+	 * MIN_TCP_TIMEOUT
+	 */
+	public static final int MIN_TCP_TIMEOUT = 100;
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPString.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPString.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPString.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPString.java
index a8608c7..3ce766e 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/SLPString.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPString.java
@@ -1,121 +1,119 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * 
      - * This class provides functions for comparison of SLP message strings.
- * 
- * From RFC 2608:
- * 
- * String comparison for order and equality in SLP MUST be case
- * insensitive inside the 0x00-0x7F subrange of UTF-8 (which corresponds
- * to ASCII character encoding).  Case insensitivity SHOULD be supported
- * throughout the entire UTF-8 encoded Unicode [6] character set.
- * 
- * The case insensitivity rule applies to all string matching in SLPv2,
- * including Scope strings, SLP SPI strings, service types, attribute
- * tags and values in query handling, language tags, previous responder
- * lists.  Comparisons of URL strings, however, is case sensitive.
- * 
- * White space (SPACE, CR, LF, TAB) internal to a string value is folded
- * to a single SPACE character for the sake of string comparisons.
- * White space preceding or following a string value is ignored for the
- * purposes of string comparison.  For example, "  Some String  "
- * matches "SOME    STRING".
- * 
      
- */
-
-public class SLPString {
-
-	/**
-	 * equals
-	 * 
-	 * @param pStr0
-	 * @param pStr1
-	 * @return boolean
-	 */
-	public static boolean equals(String pStr0, String pStr1) {
-		if (pStr0 == null) return pStr1 == null;
-		if (pStr1 == null) return false;
-		return unify(pStr0).equals(unify(pStr1));
-	}
-
-	/**
-	 * compare
-	 * 
-	 * @param pStr0
-	 * @param pStr1
-	 * @return int
-	 */
-	public static int compare(String pStr0, String pStr1) {
-		return unify(pStr0).compareTo(unify(pStr1));
-	}
-
-	/**
-	 * public for testing only.
-	 * 
-	 * @param pStr
-	 * @return String
-	 */
-	public static String unify(String pStr) {
-		if (pStr == null) return null;
-		StringBuffer resBuf = new StringBuffer();
-		boolean inSpace = false;
-		for (int i = 0; i < pStr.length(); i++) {
-			char ch = pStr.charAt(i);
-			if (ch == ' ' || ch == '\t' || ch == 0xa || ch == 0xd) {
-				if (resBuf.length() == 0) continue; // skip front white spaces
-				inSpace = true;
-			} else {
-				if (inSpace) {
-					resBuf.append(' ');
-					inSpace = false;
-				}
-				resBuf.append(Character.toLowerCase(ch));
-			}
-		}
-		return resBuf.toString();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * 
      + * This class provides functions for comparison of SLP message strings.
+ * 
+ * From RFC 2608:
+ * 
+ * String comparison for order and equality in SLP MUST be case
+ * insensitive inside the 0x00-0x7F subrange of UTF-8 (which corresponds
+ * to ASCII character encoding).  Case insensitivity SHOULD be supported
+ * throughout the entire UTF-8 encoded Unicode [6] character set.
+ * 
+ * The case insensitivity rule applies to all string matching in SLPv2,
+ * including Scope strings, SLP SPI strings, service types, attribute
+ * tags and values in query handling, language tags, previous responder
+ * lists.  Comparisons of URL strings, however, is case sensitive.
+ * 
+ * White space (SPACE, CR, LF, TAB) internal to a string value is folded
+ * to a single SPACE character for the sake of string comparisons.
+ * White space preceding or following a string value is ignored for the
+ * purposes of string comparison.  For example, "  Some String  "
+ * matches "SOME    STRING".
+ * 
      
+ */
+
+public class SLPString {
+
+	/**
+	 * equals
+	 * 
+	 * @param pStr0
+	 * @param pStr1
+	 * @return boolean
+	 */
+	public static boolean equals(String pStr0, String pStr1) {
+		if (pStr0 == null) return pStr1 == null;
+		if (pStr1 == null) return false;
+		return unify(pStr0).equals(unify(pStr1));
+	}
+
+	/**
+	 * compare
+	 * 
+	 * @param pStr0
+	 * @param pStr1
+	 * @return int
+	 */
+	public static int compare(String pStr0, String pStr1) {
+		return unify(pStr0).compareTo(unify(pStr1));
+	}
+
+	/**
+	 * public for testing only.
+	 * 
+	 * @param pStr
+	 * @return String
+	 */
+	public static String unify(String pStr) {
+		if (pStr == null) return null;
+		StringBuffer resBuf = new StringBuffer();
+		boolean inSpace = false;
+		for (int i = 0; i < pStr.length(); i++) {
+			char ch = pStr.charAt(i);
+			if (ch == ' ' || ch == '\t' || ch == 0xa || ch == 0xd) {
+				if (resBuf.length() == 0) continue; // skip front white spaces
+				inSpace = true;
+			} else {
+				if (inSpace) {
+					resBuf.append(' ');
+					inSpace = false;
+				}
+				resBuf.append(Character.toLowerCase(ch));
+			}
+		}
+		return resBuf.toString();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/TRC.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/TRC.java
similarity index 85%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/TRC.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/TRC.java
index 85cafcc..e8f959c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/TRC.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/TRC.java
@@ -1,303 +1,301 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2011
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.logging.Level;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.sentrysoftware.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-
-/**
- * debug -> FINEST info -> INFO warning -> WARNING error -> SEVERE
- * 
- */
-public class TRC {
-
-	private static PrintStream cOut;
-
-	private static Level cLevel = SLPConfig.getGlobalCfg().getTraceLevel();
-
-	private static LogAndTraceBroker cLogger = LogAndTraceBroker.getBroker();
-
-	private static Pattern[] cDenyPatterns;
-
-	private static Pattern[] cAllowPatterns;
-
-	private static final String NAME = new TRC().getClass().getName();
-
-	/**
-	 * setLevel
-	 * 
-	 * @param pLevel
-	 */
-	public static void setLevel(Level pLevel) {
-		cLevel = pLevel;
-	}
-
-	/**
-	 * setConsolLog
-	 * 
-	 * @param pOutStr
-	 */
-	public static void setOutput(OutputStream pOutStr) {
-		setOutput(new PrintStream(pOutStr));
-	}
-
-	/**
-	 * setOutputStream
-	 * 
-	 * @param pOutStr
-	 */
-	public static void setOutput(PrintStream pOutStr) {
-		cOut = pOutStr;
-	}
-
-	/**
-	 * setPatterns
-	 * 
-	 * @param pDenyPatterns
-	 * @param pAllowPatterns
-	 */
-	public static void setPatterns(String[] pDenyPatterns, String[] pAllowPatterns) {
-		cDenyPatterns = compile(pDenyPatterns);
-		cAllowPatterns = compile(pAllowPatterns);
-	}
-
-	private static Pattern[] compile(String[] pStrs) {
-		if (pStrs == null) return null;
-		Pattern[] patterns = new Pattern[pStrs.length];
-		for (int i = 0; i < patterns.length; i++) {
-			patterns[i] = Pattern.compile(pStrs[i]);
-		}
-		return patterns;
-	}
-
-	/**
-	 * debug
-	 * 
-	 * @param pMsg
-	 */
-	public static void debug(String pMsg) {
-		debug(pMsg, null);
-	}
-
-	/**
-	 * debug
-	 * 
-	 * @param pMsg
-	 * @param pEx
-	 */
-	public static void debug(String pMsg, Exception pEx) {
-		if (cLevel.intValue() > Level.FINEST.intValue()) return;
-		trace(Level.FINEST, pMsg, pEx);
-	}
-
-	/**
-	 * info
-	 * 
-	 * @param pMsg
-	 */
-	public static void info(String pMsg) {
-		info(pMsg, null);
-	}
-
-	/**
-	 * info
-	 * 
-	 * @param pMsg
-	 * @param pEx
-	 */
-	public static void info(String pMsg, Exception pEx) {
-		if (cLevel.intValue() > Level.INFO.intValue()) return;
-		trace(Level.INFO, pMsg, pEx);
-	}
-
-	/**
-	 * warning
-	 * 
-	 * @param pMsg
-	 */
-	public static void warning(String pMsg) {
-		warning(pMsg, null);
-	}
-
-	/**
-	 * warning
-	 * 
-	 * @param pMsg
-	 * @param pEx
-	 */
-	public static void warning(String pMsg, Exception pEx) {
-		if (cLevel.intValue() > Level.WARNING.intValue()) return;
-		trace(Level.WARNING, pMsg, pEx);
-	}
-
-	/**
-	 * error
-	 * 
-	 * @param pMsg
-	 */
-	public static void error(String pMsg) {
-		error(pMsg, null);
-	}
-
-	/**
-	 * error
-	 * 
-	 * @param pEx
-	 */
-	public static void error(Exception pEx) {
-		error(null, pEx);
-	}
-
-	/**
-	 * error
-	 * 
-	 * @param pMsg
-	 * @param pEx
-	 */
-	public static void error(String pMsg, Exception pEx) {
-		if (cLevel.intValue() > Level.SEVERE.intValue()) return;
-		trace(Level.SEVERE, pMsg, pEx);
-	}
-
-	private static boolean hasMatch(Pattern[] pPatterns, String pStr) {
-		if (pPatterns == null) return false;
-		for (int i = 0; i < pPatterns.length; i++) {
-			Pattern pattern = pPatterns[i];
-			Matcher m = pattern.matcher(pStr);
-			if (m.matches()) return true;
-		}
-		return false;
-	}
-
-	private static boolean deny(String pFnStr) {
-		return hasMatch(cDenyPatterns, pFnStr);
-	}
-
-	private static boolean allow(String pFnStr) {
-		return hasMatch(cAllowPatterns, pFnStr);
-	}
-
-	private static void trace(Level pLevel, String pMsg, Exception pEx) {
-		StackTraceElement location = getLocation();
-		String fnStr = getFunctionStr(location);
-		if (deny(fnStr) && !allow(fnStr)) return;
-		StringBuffer buf = new StringBuffer('[' + pLevel.toString() + ' '
-				+ Thread.currentThread().getName() + ' ' + getDate() + ' '
-				+ getLocationStr(location) + "]\n");
-		if (pMsg != null) buf.append(pMsg + '\n');
-		if (pEx != null) {
-			StringWriter writer = new StringWriter();
-			pEx.printStackTrace(new PrintWriter(writer));
-			buf.append(writer.toString() + '\n');
-		}
-		synchronized (TRC.class) {
-			if (cOut != null) {
-				cOut.println(buf.toString());
-				System.out.flush();
-			} else {
-				cLogger.trace(pLevel, buf.toString());
-			}
-		}
-	}
-
-	private static StackTraceElement getLocation() {
-		Throwable thr = new Throwable();
-		StackTraceElement[] elements = thr.getStackTrace();
-		StackTraceElement e = null;
-		for (int i = 0; i < elements.length; i++) {
-			e = elements[i];
-			if (!e.getClassName().equals(NAME)) return e;
-		}
-		return null;
-	}
-
-	private static String getFunctionStr(StackTraceElement pSTE) {
-		return pSTE.getClassName() + '.' + pSTE.getMethodName();
-	}
-
-	private static String getLocationStr(StackTraceElement pSTE) {
-		return getFunctionStr(pSTE) + '(' + pSTE.getFileName() + ':' + pSTE.getLineNumber() + ')';
-	}
-
-	private static String pad(int pDigits, int pNum) {
-		String str = Integer.toString(pNum);
-		int len = Math.max(pDigits, str.length());
-		char[] cA = new char[len];
-		int paddingDigits = pDigits - str.length();
-		int dIdx = 0;
-		while (dIdx < paddingDigits)
-			cA[dIdx++] = '0';
-		int sIdx = 0;
-		while (dIdx < len)
-			cA[dIdx++] = str.charAt(sIdx++);
-		return new String(cA);
-	}
-
-	/**
-	 * getDate
-	 * 
-	 * @return String
-	 */
-	private static String getDate() {
-		long millis = new Date().getTime();
-		Calendar cal = Calendar.getInstance();
-		cal.setTimeInMillis(millis);
-		return Integer.toString(cal.get(Calendar.YEAR)) + '.' + pad(2, cal.get(Calendar.MONTH) + 1)
-				+ '.' + pad(2, cal.get(Calendar.DAY_OF_MONTH)) + ' '
-				+ pad(2, cal.get(Calendar.HOUR_OF_DAY)) + ':' + pad(2, cal.get(Calendar.MINUTE))
-				+ ':' + pad(2, cal.get(Calendar.SECOND)) + ' '
-				+ pad(3, cal.get(Calendar.MILLISECOND));
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2011
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
+ */
+
+package org.metricshub.wbem.sblim.slp.internal;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.logging.Level;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
+
+/**
+ * debug -> FINEST info -> INFO warning -> WARNING error -> SEVERE
+ * 
+ */
+public class TRC {
+
+	private static PrintStream cOut;
+
+	private static Level cLevel = SLPConfig.getGlobalCfg().getTraceLevel();
+
+	private static LogAndTraceBroker cLogger = LogAndTraceBroker.getBroker();
+
+	private static Pattern[] cDenyPatterns;
+
+	private static Pattern[] cAllowPatterns;
+
+	private static final String NAME = new TRC().getClass().getName();
+
+	/**
+	 * setLevel
+	 * 
+	 * @param pLevel
+	 */
+	public static void setLevel(Level pLevel) {
+		cLevel = pLevel;
+	}
+
+	/**
+	 * setConsolLog
+	 * 
+	 * @param pOutStr
+	 */
+	public static void setOutput(OutputStream pOutStr) {
+		setOutput(new PrintStream(pOutStr));
+	}
+
+	/**
+	 * setOutputStream
+	 * 
+	 * @param pOutStr
+	 */
+	public static void setOutput(PrintStream pOutStr) {
+		cOut = pOutStr;
+	}
+
+	/**
+	 * setPatterns
+	 * 
+	 * @param pDenyPatterns
+	 * @param pAllowPatterns
+	 */
+	public static void setPatterns(String[] pDenyPatterns, String[] pAllowPatterns) {
+		cDenyPatterns = compile(pDenyPatterns);
+		cAllowPatterns = compile(pAllowPatterns);
+	}
+
+	private static Pattern[] compile(String[] pStrs) {
+		if (pStrs == null) return null;
+		Pattern[] patterns = new Pattern[pStrs.length];
+		for (int i = 0; i < patterns.length; i++) {
+			patterns[i] = Pattern.compile(pStrs[i]);
+		}
+		return patterns;
+	}
+
+	/**
+	 * debug
+	 * 
+	 * @param pMsg
+	 */
+	public static void debug(String pMsg) {
+		debug(pMsg, null);
+	}
+
+	/**
+	 * debug
+	 * 
+	 * @param pMsg
+	 * @param pEx
+	 */
+	public static void debug(String pMsg, Exception pEx) {
+		if (cLevel.intValue() > Level.FINEST.intValue()) return;
+		trace(Level.FINEST, pMsg, pEx);
+	}
+
+	/**
+	 * info
+	 * 
+	 * @param pMsg
+	 */
+	public static void info(String pMsg) {
+		info(pMsg, null);
+	}
+
+	/**
+	 * info
+	 * 
+	 * @param pMsg
+	 * @param pEx
+	 */
+	public static void info(String pMsg, Exception pEx) {
+		if (cLevel.intValue() > Level.INFO.intValue()) return;
+		trace(Level.INFO, pMsg, pEx);
+	}
+
+	/**
+	 * warning
+	 * 
+	 * @param pMsg
+	 */
+	public static void warning(String pMsg) {
+		warning(pMsg, null);
+	}
+
+	/**
+	 * warning
+	 * 
+	 * @param pMsg
+	 * @param pEx
+	 */
+	public static void warning(String pMsg, Exception pEx) {
+		if (cLevel.intValue() > Level.WARNING.intValue()) return;
+		trace(Level.WARNING, pMsg, pEx);
+	}
+
+	/**
+	 * error
+	 * 
+	 * @param pMsg
+	 */
+	public static void error(String pMsg) {
+		error(pMsg, null);
+	}
+
+	/**
+	 * error
+	 * 
+	 * @param pEx
+	 */
+	public static void error(Exception pEx) {
+		error(null, pEx);
+	}
+
+	/**
+	 * error
+	 * 
+	 * @param pMsg
+	 * @param pEx
+	 */
+	public static void error(String pMsg, Exception pEx) {
+		if (cLevel.intValue() > Level.SEVERE.intValue()) return;
+		trace(Level.SEVERE, pMsg, pEx);
+	}
+
+	private static boolean hasMatch(Pattern[] pPatterns, String pStr) {
+		if (pPatterns == null) return false;
+		for (int i = 0; i < pPatterns.length; i++) {
+			Pattern pattern = pPatterns[i];
+			Matcher m = pattern.matcher(pStr);
+			if (m.matches()) return true;
+		}
+		return false;
+	}
+
+	private static boolean deny(String pFnStr) {
+		return hasMatch(cDenyPatterns, pFnStr);
+	}
+
+	private static boolean allow(String pFnStr) {
+		return hasMatch(cAllowPatterns, pFnStr);
+	}
+
+	private static void trace(Level pLevel, String pMsg, Exception pEx) {
+		StackTraceElement location = getLocation();
+		String fnStr = getFunctionStr(location);
+		if (deny(fnStr) && !allow(fnStr)) return;
+		StringBuffer buf = new StringBuffer('[' + pLevel.toString() + ' '
+				+ Thread.currentThread().getName() + ' ' + getDate() + ' '
+				+ getLocationStr(location) + "]\n");
+		if (pMsg != null) buf.append(pMsg + '\n');
+		if (pEx != null) {
+			StringWriter writer = new StringWriter();
+			pEx.printStackTrace(new PrintWriter(writer));
+			buf.append(writer.toString() + '\n');
+		}
+		synchronized (TRC.class) {
+			if (cOut != null) {
+				cOut.println(buf.toString());
+				System.out.flush();
+			} else {
+				cLogger.trace(pLevel, buf.toString());
+			}
+		}
+	}
+
+	private static StackTraceElement getLocation() {
+		Throwable thr = new Throwable();
+		StackTraceElement[] elements = thr.getStackTrace();
+		StackTraceElement e = null;
+		for (int i = 0; i < elements.length; i++) {
+			e = elements[i];
+			if (!e.getClassName().equals(NAME)) return e;
+		}
+		return null;
+	}
+
+	private static String getFunctionStr(StackTraceElement pSTE) {
+		return pSTE.getClassName() + '.' + pSTE.getMethodName();
+	}
+
+	private static String getLocationStr(StackTraceElement pSTE) {
+		return getFunctionStr(pSTE) + '(' + pSTE.getFileName() + ':' + pSTE.getLineNumber() + ')';
+	}
+
+	private static String pad(int pDigits, int pNum) {
+		String str = Integer.toString(pNum);
+		int len = Math.max(pDigits, str.length());
+		char[] cA = new char[len];
+		int paddingDigits = pDigits - str.length();
+		int dIdx = 0;
+		while (dIdx < paddingDigits)
+			cA[dIdx++] = '0';
+		int sIdx = 0;
+		while (dIdx < len)
+			cA[dIdx++] = str.charAt(sIdx++);
+		return new String(cA);
+	}
+
+	/**
+	 * getDate
+	 * 
+	 * @return String
+	 */
+	private static String getDate() {
+		long millis = new Date().getTime();
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(millis);
+		return Integer.toString(cal.get(Calendar.YEAR)) + '.' + pad(2, cal.get(Calendar.MONTH) + 1)
+				+ '.' + pad(2, cal.get(Calendar.DAY_OF_MONTH)) + ' '
+				+ pad(2, cal.get(Calendar.HOUR_OF_DAY)) + ':' + pad(2, cal.get(Calendar.MINUTE))
+				+ ':' + pad(2, cal.get(Calendar.SECOND)) + ' '
+				+ pad(3, cal.get(Calendar.MILLISECOND));
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/AttributeReply.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeReply.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/AttributeReply.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeReply.java
index a0604f0..4f9fc21 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/AttributeReply.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeReply.java
@@ -1,153 +1,151 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationAttribute;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-
-/*
- * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
- * Location header (function = AttrRply = 7) |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Error
- * Code | length of  |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
- *  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |# of
- * AttrAuths | Attribute Authentication Block (if present) \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * 
- */
-
-/**
- * AttributeReply message
- * 
- */
-public class AttributeReply extends ReplyMessage {
-
-	private List iAttrList;
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		AttributeReply reply = new AttributeReply(pHdr, pInStr.read16(), pInStr.readAttributeList());
-		if (pInStr.readAuthBlockList() != null) TRC.warning("Non empty auth block!");
-		return reply;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pErrorCode
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 */
-	public AttributeReply(int pErrorCode, List pAttrList) {
-		super(ATTR_RPLY, pErrorCode);
-		this.iAttrList = pAttrList;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pErrorCode
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 */
-	public AttributeReply(String pLangTag, int pErrorCode, List pAttrList) {
-		super(ATTR_RPLY, pLangTag, pErrorCode);
-		this.iAttrList = pAttrList;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pErrorCode
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 */
-	public AttributeReply(MsgHeader pHeader, int pErrorCode,
-			List pAttrList) {
-		super(pHeader, pErrorCode);
-		this.iAttrList = pAttrList;
-	}
-
-	@Override
-	public Iterator getResultIterator() {
-		return this.iAttrList == null ? null : this.iAttrList.iterator();
-	}
-
-	/**
-	 * @param pOption
-	 */
-	@Override
-	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write16(getErrorCode()) && pOutStr.writeAttributeList(this.iAttrList)
-				&& pOutStr.writeAuthBlockList(null);
-	}
-
-	@Override
-	public Iterator getExceptionIterator() {
-		// this message doesn't have exception table
-		return null;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
+ * Location header (function = AttrRply = 7) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Error
+ * Code | length of  |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
+ *  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |# of
+ * AttrAuths | Attribute Authentication Block (if present) \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * 
+ */
+
+/**
+ * AttributeReply message
+ * 
+ */
+public class AttributeReply extends ReplyMessage {
+
+	private List iAttrList;
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		AttributeReply reply = new AttributeReply(pHdr, pInStr.read16(), pInStr.readAttributeList());
+		if (pInStr.readAuthBlockList() != null) TRC.warning("Non empty auth block!");
+		return reply;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pErrorCode
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 */
+	public AttributeReply(int pErrorCode, List pAttrList) {
+		super(ATTR_RPLY, pErrorCode);
+		this.iAttrList = pAttrList;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pErrorCode
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 */
+	public AttributeReply(String pLangTag, int pErrorCode, List pAttrList) {
+		super(ATTR_RPLY, pLangTag, pErrorCode);
+		this.iAttrList = pAttrList;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pErrorCode
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 */
+	public AttributeReply(MsgHeader pHeader, int pErrorCode,
+			List pAttrList) {
+		super(pHeader, pErrorCode);
+		this.iAttrList = pAttrList;
+	}
+
+	@Override
+	public Iterator getResultIterator() {
+		return this.iAttrList == null ? null : this.iAttrList.iterator();
+	}
+
+	/**
+	 * @param pOption
+	 */
+	@Override
+	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
+		return pOutStr.write16(getErrorCode()) && pOutStr.writeAttributeList(this.iAttrList)
+				&& pOutStr.writeAuthBlockList(null);
+	}
+
+	@Override
+	public Iterator getExceptionIterator() {
+		// this message doesn't have exception table
+		return null;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/AttributeRequest.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeRequest.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/AttributeRequest.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeRequest.java
index 448bdb0..2e890ac 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/AttributeRequest.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeRequest.java
@@ -1,178 +1,176 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-15  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.List;
-import java.util.SortedSet;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-
-/*
- * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
- * Location header (function = AttrRqst = 6) |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- * PRList |  String \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- * URL | URL \ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
- * length of  |  string \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- *  string |  string \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- *  string |  string \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-/**
- * AttributeRequest message
- * 
- */
-public class AttributeRequest extends RequestMessage {
-
-	private String iURLStr;
-
-	private List iTagList;
-
-	private List iSPIList;
-
-	private static final int[] ALLOWED_RSPS = { ATTR_RPLY };
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new AttributeRequest(pHdr, pInStr.readStringSet(), pInStr.readString(), pInStr
-				.readStringList(), pInStr.readStringList(), pInStr.readStringList());
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pURLStr
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pTagList
-	 * @param pSPIList
-	 */
-	public AttributeRequest(SortedSet pPrevResponderSet, String pURLStr,
-			List pScopeList, List pTagList, List pSPIList) {
-		super(ATTR_RQST, pPrevResponderSet, pScopeList);
-		init(pURLStr, pTagList, pSPIList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pURLStr
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pTagList
-	 * @param pSPIList
-	 */
-	public AttributeRequest(String pLangTag, SortedSet pPrevResponderSet, String pURLStr,
-			List pScopeList, List pTagList, List pSPIList) {
-		super(ATTR_RQST, pLangTag, pPrevResponderSet, pScopeList);
-		init(pURLStr, pTagList, pSPIList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pURLStr
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pTagList
-	 * @param pSPIList
-	 */
-	public AttributeRequest(MsgHeader pHeader, SortedSet pPrevResponderSet, String pURLStr,
-			List pScopeList, List pTagList, List pSPIList) {
-		super(pHeader, pPrevResponderSet, pScopeList);
-		init(pURLStr, pTagList, pSPIList);
-	}
-
-	/**
-	 * getServiceURL
-	 * 
-	 * @return ServiceURL
-	 */
-	public ServiceURL getServiceURL() {
-		return new ServiceURL(this.iURLStr, 65535);
-	}
-
-	@Override
-	protected boolean serializeRequestBody(SLPOutputStream pOutStr) {
-		return pOutStr.write(this.iURLStr) && pOutStr.writeStringList(getScopeList())
-				&& pOutStr.writeStringList(this.iTagList) && pOutStr.writeStringList(this.iSPIList);
-	}
-
-	@Override
-	protected int[] getAllowedResponseIDs() {
-		return ALLOWED_RSPS;
-	}
-
-	private void init(String pURLStr, List pTagList, List pSPIList) {
-		this.iURLStr = pURLStr;
-		this.iTagList = pTagList;
-		this.iSPIList = pSPIList;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-15  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.List;
+import java.util.SortedSet;
+
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
+ * Location header (function = AttrRqst = 6) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ * PRList |  String \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ * URL | URL \ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
+ * length of  |  string \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ *  string |  string \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ *  string |  string \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+/**
+ * AttributeRequest message
+ * 
+ */
+public class AttributeRequest extends RequestMessage {
+
+	private String iURLStr;
+
+	private List iTagList;
+
+	private List iSPIList;
+
+	private static final int[] ALLOWED_RSPS = { ATTR_RPLY };
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		return new AttributeRequest(pHdr, pInStr.readStringSet(), pInStr.readString(), pInStr
+				.readStringList(), pInStr.readStringList(), pInStr.readStringList());
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pURLStr
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pTagList
+	 * @param pSPIList
+	 */
+	public AttributeRequest(SortedSet pPrevResponderSet, String pURLStr,
+			List pScopeList, List pTagList, List pSPIList) {
+		super(ATTR_RQST, pPrevResponderSet, pScopeList);
+		init(pURLStr, pTagList, pSPIList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pURLStr
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pTagList
+	 * @param pSPIList
+	 */
+	public AttributeRequest(String pLangTag, SortedSet pPrevResponderSet, String pURLStr,
+			List pScopeList, List pTagList, List pSPIList) {
+		super(ATTR_RQST, pLangTag, pPrevResponderSet, pScopeList);
+		init(pURLStr, pTagList, pSPIList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pURLStr
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pTagList
+	 * @param pSPIList
+	 */
+	public AttributeRequest(MsgHeader pHeader, SortedSet pPrevResponderSet, String pURLStr,
+			List pScopeList, List pTagList, List pSPIList) {
+		super(pHeader, pPrevResponderSet, pScopeList);
+		init(pURLStr, pTagList, pSPIList);
+	}
+
+	/**
+	 * getServiceURL
+	 * 
+	 * @return ServiceURL
+	 */
+	public ServiceURL getServiceURL() {
+		return new ServiceURL(this.iURLStr, 65535);
+	}
+
+	@Override
+	protected boolean serializeRequestBody(SLPOutputStream pOutStr) {
+		return pOutStr.write(this.iURLStr) && pOutStr.writeStringList(getScopeList())
+				&& pOutStr.writeStringList(this.iTagList) && pOutStr.writeStringList(this.iSPIList);
+	}
+
+	@Override
+	protected int[] getAllowedResponseIDs() {
+		return ALLOWED_RSPS;
+	}
+
+	private void init(String pURLStr, List pTagList, List pSPIList) {
+		this.iURLStr = pURLStr;
+		this.iTagList = pTagList;
+		this.iSPIList = pSPIList;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/DAAdvert.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DAAdvert.java
similarity index 84%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/DAAdvert.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DAAdvert.java
index 34e5cd4..122977d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/DAAdvert.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DAAdvert.java
@@ -1,203 +1,201 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.TreeSet;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationAttribute;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-
-/*
- * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
- * Location header (function = DAAdvert = 8) |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Error
- * Code | DA Stateless Boot Timestamp |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |DA
- * Stateless Boot Time,, contd.| Length of URL |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ \ URL \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
- *  |  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
- *  |  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
- *  |  String \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | # Auth
- * Blocks | Authentication block (if any) \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ FIXME: is
- * this URL an URL-entry or an URL String. Assuming URL String.
- */
-
-/**
- * DAAdvert message
- * 
- */
-public class DAAdvert extends ReplyMessage {
-
-	private long iStatelessBootTime;
-
-	private String iURLStr;
-
-	private List iScopeList;
-
-	private List iAttrList;
-
-	private List iSPIList;
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new DAAdvert(pHdr, pInStr.read16(), pInStr.read32(), pInStr.readString(), pInStr
-				.readStringList(), pInStr.readAttributeList(), pInStr.readStringList());
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pErrorCode
-	 * @param pStatelessBootTime
-	 * @param pURLStr
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 * @param pSPIList
-	 */
-	public DAAdvert(int pErrorCode, long pStatelessBootTime, String pURLStr,
-			List pScopeList, List pAttrList, List pSPIList) {
-		super(DA_ADVERT, pErrorCode);
-		init(pStatelessBootTime, pURLStr, pScopeList, pAttrList, pSPIList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pErrorCode
-	 * @param pStatelessBootTime
-	 * @param pURLStr
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 * @param pSPIList
-	 */
-	public DAAdvert(String pLangTag, int pErrorCode, long pStatelessBootTime, String pURLStr,
-			List pScopeList, List pAttrList, List pSPIList) {
-		super(DA_ADVERT, pLangTag, pErrorCode);
-		init(pStatelessBootTime, pURLStr, pScopeList, pAttrList, pSPIList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pErrorCode
-	 * @param pStatelessBootTime
-	 * @param pURLStr
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 * @param pSPIList
-	 */
-	public DAAdvert(MsgHeader pHeader, int pErrorCode, long pStatelessBootTime, String pURLStr,
-			List pScopeList, List pAttrList, List pSPIList) {
-		super(pHeader, pErrorCode);
-		init(pStatelessBootTime, pURLStr, pScopeList, pAttrList, pSPIList);
-	}
-
-	/**
-	 * @return Iterator of DADescriptors
-	 * @see ReplyMessage#getResultIterator()
-	 */
-	@Override
-	public Iterator getResultIterator() {
-		ArrayList list = new ArrayList(1);
-		list.add(new DADescriptor(this.iURLStr, new TreeSet(this.iScopeList),
-				this.iAttrList));
-		return list.iterator();
-	}
-
-	/**
-	 * @param pOption
-	 */
-	@Override
-	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write16(getErrorCode()) && pOutStr.write32(this.iStatelessBootTime)
-				&& pOutStr.write(this.iURLStr) && pOutStr.writeStringList(this.iScopeList)
-				&& pOutStr.writeAttributeList(this.iAttrList)
-				&& pOutStr.writeStringList(this.iSPIList);
-	}
-
-	private void init(long pStatelessBootTime, String pURLStr, List pScopeList,
-			List pAttrList, List pSPIList) {
-		this.iStatelessBootTime = pStatelessBootTime;
-		this.iURLStr = pURLStr;
-		this.iScopeList = pScopeList;
-		this.iAttrList = pAttrList;
-		this.iSPIList = pSPIList;
-	}
-
-	@Override
-	public Iterator getExceptionIterator() {
-		// this message doesn't have exception table
-		return null;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeSet;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
+ * Location header (function = DAAdvert = 8) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Error
+ * Code | DA Stateless Boot Timestamp |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |DA
+ * Stateless Boot Time,, contd.| Length of URL |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ \ URL \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
+ *  |  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
+ *  |  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
+ *  |  String \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | # Auth
+ * Blocks | Authentication block (if any) \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ FIXME: is
+ * this URL an URL-entry or an URL String. Assuming URL String.
+ */
+
+/**
+ * DAAdvert message
+ * 
+ */
+public class DAAdvert extends ReplyMessage {
+
+	private long iStatelessBootTime;
+
+	private String iURLStr;
+
+	private List iScopeList;
+
+	private List iAttrList;
+
+	private List iSPIList;
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		return new DAAdvert(pHdr, pInStr.read16(), pInStr.read32(), pInStr.readString(), pInStr
+				.readStringList(), pInStr.readAttributeList(), pInStr.readStringList());
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pErrorCode
+	 * @param pStatelessBootTime
+	 * @param pURLStr
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 * @param pSPIList
+	 */
+	public DAAdvert(int pErrorCode, long pStatelessBootTime, String pURLStr,
+			List pScopeList, List pAttrList, List pSPIList) {
+		super(DA_ADVERT, pErrorCode);
+		init(pStatelessBootTime, pURLStr, pScopeList, pAttrList, pSPIList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pErrorCode
+	 * @param pStatelessBootTime
+	 * @param pURLStr
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 * @param pSPIList
+	 */
+	public DAAdvert(String pLangTag, int pErrorCode, long pStatelessBootTime, String pURLStr,
+			List pScopeList, List pAttrList, List pSPIList) {
+		super(DA_ADVERT, pLangTag, pErrorCode);
+		init(pStatelessBootTime, pURLStr, pScopeList, pAttrList, pSPIList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pErrorCode
+	 * @param pStatelessBootTime
+	 * @param pURLStr
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 * @param pSPIList
+	 */
+	public DAAdvert(MsgHeader pHeader, int pErrorCode, long pStatelessBootTime, String pURLStr,
+			List pScopeList, List pAttrList, List pSPIList) {
+		super(pHeader, pErrorCode);
+		init(pStatelessBootTime, pURLStr, pScopeList, pAttrList, pSPIList);
+	}
+
+	/**
+	 * @return Iterator of DADescriptors
+	 * @see ReplyMessage#getResultIterator()
+	 */
+	@Override
+	public Iterator getResultIterator() {
+		ArrayList list = new ArrayList(1);
+		list.add(new DADescriptor(this.iURLStr, new TreeSet(this.iScopeList),
+				this.iAttrList));
+		return list.iterator();
+	}
+
+	/**
+	 * @param pOption
+	 */
+	@Override
+	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
+		return pOutStr.write16(getErrorCode()) && pOutStr.write32(this.iStatelessBootTime)
+				&& pOutStr.write(this.iURLStr) && pOutStr.writeStringList(this.iScopeList)
+				&& pOutStr.writeAttributeList(this.iAttrList)
+				&& pOutStr.writeStringList(this.iSPIList);
+	}
+
+	private void init(long pStatelessBootTime, String pURLStr, List pScopeList,
+			List pAttrList, List pSPIList) {
+		this.iStatelessBootTime = pStatelessBootTime;
+		this.iURLStr = pURLStr;
+		this.iScopeList = pScopeList;
+		this.iAttrList = pAttrList;
+		this.iSPIList = pSPIList;
+	}
+
+	@Override
+	public Iterator getExceptionIterator() {
+		// this message doesn't have exception table
+		return null;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/DADescriptor.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DADescriptor.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/DADescriptor.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DADescriptor.java
index 3b44256..5587d71 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/DADescriptor.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DADescriptor.java
@@ -1,170 +1,168 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2795671    2009-05-22  raman_arora  Add Type to Comparable 
- * 3023135    2010-07-01  blaschke-oss DADescriptor equals/compareTo issue
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.TreeSet;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationAttribute;
-
-/**
- * 
      - * This class contains the DA related information from a DAAdvert message.
- * URL
- * Scope list
- * Attribute list
- * 
      
- */
-public class DADescriptor implements Comparable {
-
-	private String iURL;
-
-	private TreeSet iScopeSet;
-
-	private List iAttributes;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pURL
-	 * @param pScopeSet
-	 *            - set of scope Strings
-	 * @param pAttributes
-	 *            - set of ServiceLocationAttributes
-	 */
-	public DADescriptor(String pURL, TreeSet pScopeSet,
-			List pAttributes) {
-		this.iURL = pURL;
-		this.iScopeSet = pScopeSet;
-		this.iAttributes = pAttributes;
-	}
-
-	/**
-	 * getURL
-	 * 
-	 * @return String
-	 */
-	public String getURL() {
-		return this.iURL;
-	}
-
-	/**
-	 * hasScope
-	 * 
-	 * @param pScope
-	 * @return boolean
-	 */
-	public boolean hasScope(String pScope) {
-		if (this.iScopeSet == null) return false;
-		return this.iScopeSet.contains(pScope);
-	}
-
-	public int compareTo(DADescriptor o) {
-		DADescriptor that = o;
-		return this.iURL.compareTo(that.iURL);
-	}
-
-	@Override
-	public boolean equals(Object pObj) {
-		if (!(pObj instanceof DADescriptor)) return false;
-		DADescriptor that = (DADescriptor) pObj;
-		return this.iURL.equals(that.iURL);
-	}
-
-	private int iHashCode = 0;
-
-	private void incHashCode(int pHashCode) {
-		this.iHashCode *= 31;
-		this.iHashCode += pHashCode;
-	}
-
-	/*
-	 * hashCode has to be independent of the order of scopes and attributes
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		if (this.iHashCode == 0) {
-			this.iHashCode = this.iURL.hashCode();
-			Iterator itr;
-			if (this.iScopeSet != null) {
-				itr = this.iScopeSet.iterator();
-				while (itr.hasNext())
-					incHashCode(itr.next().hashCode());
-			}
-			if (this.iAttributes != null) {
-				itr = this.iAttributes.iterator();
-				/*
-				 * iHasCode is simply incremented, because attribute order
-				 * mustn't be considered.
-				 */
-				while (itr.hasNext())
-					this.iHashCode += itr.next().hashCode();
-			}
-		}
-		return this.iHashCode;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer strBuf = new StringBuffer("URL : " + this.iURL + "\nScopes : ");
-		if (this.iScopeSet != null) {
-			Iterator itr = this.iScopeSet.iterator();
-			boolean more = false;
-			while (itr.hasNext()) {
-				if (more) strBuf.append(", ");
-				else more = true;
-				strBuf.append(itr.next());
-			}
-		}
-
-		return strBuf.toString();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2795671    2009-05-22  raman_arora  Add Type to Comparable 
+ * 3023135    2010-07-01  blaschke-oss DADescriptor equals/compareTo issue
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeSet;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+
+/**
+ * 
      + * This class contains the DA related information from a DAAdvert message.
+ * URL
+ * Scope list
+ * Attribute list
+ * 
      
+ */
+public class DADescriptor implements Comparable {
+
+	private String iURL;
+
+	private TreeSet iScopeSet;
+
+	private List iAttributes;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pURL
+	 * @param pScopeSet
+	 *            - set of scope Strings
+	 * @param pAttributes
+	 *            - set of ServiceLocationAttributes
+	 */
+	public DADescriptor(String pURL, TreeSet pScopeSet,
+			List pAttributes) {
+		this.iURL = pURL;
+		this.iScopeSet = pScopeSet;
+		this.iAttributes = pAttributes;
+	}
+
+	/**
+	 * getURL
+	 * 
+	 * @return String
+	 */
+	public String getURL() {
+		return this.iURL;
+	}
+
+	/**
+	 * hasScope
+	 * 
+	 * @param pScope
+	 * @return boolean
+	 */
+	public boolean hasScope(String pScope) {
+		if (this.iScopeSet == null) return false;
+		return this.iScopeSet.contains(pScope);
+	}
+
+	public int compareTo(DADescriptor o) {
+		DADescriptor that = o;
+		return this.iURL.compareTo(that.iURL);
+	}
+
+	@Override
+	public boolean equals(Object pObj) {
+		if (!(pObj instanceof DADescriptor)) return false;
+		DADescriptor that = (DADescriptor) pObj;
+		return this.iURL.equals(that.iURL);
+	}
+
+	private int iHashCode = 0;
+
+	private void incHashCode(int pHashCode) {
+		this.iHashCode *= 31;
+		this.iHashCode += pHashCode;
+	}
+
+	/*
+	 * hashCode has to be independent of the order of scopes and attributes
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		if (this.iHashCode == 0) {
+			this.iHashCode = this.iURL.hashCode();
+			Iterator itr;
+			if (this.iScopeSet != null) {
+				itr = this.iScopeSet.iterator();
+				while (itr.hasNext())
+					incHashCode(itr.next().hashCode());
+			}
+			if (this.iAttributes != null) {
+				itr = this.iAttributes.iterator();
+				/*
+				 * iHasCode is simply incremented, because attribute order
+				 * mustn't be considered.
+				 */
+				while (itr.hasNext())
+					this.iHashCode += itr.next().hashCode();
+			}
+		}
+		return this.iHashCode;
+	}
+
+	@Override
+	public String toString() {
+		StringBuffer strBuf = new StringBuffer("URL : " + this.iURL + "\nScopes : ");
+		if (this.iScopeSet != null) {
+			Iterator itr = this.iScopeSet.iterator();
+			boolean more = false;
+			while (itr.hasNext()) {
+				if (more) strBuf.append(", ");
+				else more = true;
+				strBuf.append(itr.next());
+			}
+		}
+
+		return strBuf.toString();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/FunctionIDs.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/FunctionIDs.java
similarity index 69%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/FunctionIDs.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/FunctionIDs.java
index 355a2a4..b60609a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/FunctionIDs.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/FunctionIDs.java
@@ -1,115 +1,113 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * FunctionIDs
- */
-public interface FunctionIDs {
-
-	/**
-	 * SRV_RQST
-	 */
-	public static final int SRV_RQST = 1;
-
-	/**
-	 * SRV_RPLY
-	 */
-	public static final int SRV_RPLY = 2;
-
-	/**
-	 * SRV_REG
-	 */
-	public static final int SRV_REG = 3;
-
-	/**
-	 * SRV_DEREG
-	 */
-	public static final int SRV_DEREG = 4;
-
-	/**
-	 * SRV_ACK
-	 */
-	public static final int SRV_ACK = 5;
-
-	/**
-	 * ATTR_RQST
-	 */
-	public static final int ATTR_RQST = 6;
-
-	/**
-	 * ATTR_RPLY
-	 */
-	public static final int ATTR_RPLY = 7;
-
-	/**
-	 * DA_ADVERT
-	 */
-	public static final int DA_ADVERT = 8;
-
-	/**
-	 * SRV_TYPE_RQST
-	 */
-	public static final int SRV_TYPE_RQST = 9;
-
-	/**
-	 * SRV_TYPE_RPLY
-	 */
-	public static final int SRV_TYPE_RPLY = 10;
-
-	/**
-	 * SA_ADVERT
-	 */
-	public static final int SA_ADVERT = 11;
-
-	/**
-	 * FIRST_ID
-	 */
-	public static final int FIRST_ID = SRV_RQST;
-
-	/**
-	 * LAST_ID
-	 */
-	public static final int LAST_ID = SA_ADVERT;
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * FunctionIDs
+ */
+public interface FunctionIDs {
+
+	/**
+	 * SRV_RQST
+	 */
+	public static final int SRV_RQST = 1;
+
+	/**
+	 * SRV_RPLY
+	 */
+	public static final int SRV_RPLY = 2;
+
+	/**
+	 * SRV_REG
+	 */
+	public static final int SRV_REG = 3;
+
+	/**
+	 * SRV_DEREG
+	 */
+	public static final int SRV_DEREG = 4;
+
+	/**
+	 * SRV_ACK
+	 */
+	public static final int SRV_ACK = 5;
+
+	/**
+	 * ATTR_RQST
+	 */
+	public static final int ATTR_RQST = 6;
+
+	/**
+	 * ATTR_RPLY
+	 */
+	public static final int ATTR_RPLY = 7;
+
+	/**
+	 * DA_ADVERT
+	 */
+	public static final int DA_ADVERT = 8;
+
+	/**
+	 * SRV_TYPE_RQST
+	 */
+	public static final int SRV_TYPE_RQST = 9;
+
+	/**
+	 * SRV_TYPE_RPLY
+	 */
+	public static final int SRV_TYPE_RPLY = 10;
+
+	/**
+	 * SA_ADVERT
+	 */
+	public static final int SA_ADVERT = 11;
+
+	/**
+	 * FIRST_ID
+	 */
+	public static final int FIRST_ID = SRV_RQST;
+
+	/**
+	 * LAST_ID
+	 */
+	public static final int LAST_ID = SA_ADVERT;
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/MsgFactory.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgFactory.java
similarity index 84%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/MsgFactory.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgFactory.java
index 43483a8..b8c05df 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/MsgFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgFactory.java
@@ -1,229 +1,227 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.DatagramPacket;
-import java.net.Socket;
-
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.FunctionIDs;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-
-/**
- * MsgFactory
- * 
- */
-public class MsgFactory implements FunctionIDs {
-
-	/**
-	 * FactoryEntry
-	 * 
-	 */
-	private interface FactoryEntry {
-
-		/**
-		 * parse
-		 * 
-		 * @param pHdr
-		 * @param pInStr
-		 * @return SLPMessage
-		 * @throws ServiceLocationException
-		 * @throws IOException
-		 */
-		public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-				throws ServiceLocationException, IOException;
-	}
-
-	private static FactoryEntry[] cFactoryArray;
-
-	private static void placeFactory(int pFnID, FactoryEntry pEntry) {
-		cFactoryArray[pFnID - FIRST_ID] = pEntry;
-	}
-
-	private static synchronized void createFactoryArray() {
-		if (cFactoryArray != null) return;
-		cFactoryArray = new FactoryEntry[LAST_ID - FIRST_ID + 1];
-		for (int i = 0; i < cFactoryArray.length; i++)
-			cFactoryArray[i] = null;
-		placeFactory(ATTR_RPLY, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return AttributeReply.parse(pHdr, pInStr);
-			}
-		});
-		placeFactory(ATTR_RQST, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return AttributeRequest.parse(pHdr, pInStr);
-			}
-		});
-		placeFactory(DA_ADVERT, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return DAAdvert.parse(pHdr, pInStr);
-			}
-		});
-		placeFactory(SA_ADVERT, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return SAAdvert.parse(pHdr, pInStr);
-			}
-		});
-		placeFactory(SRV_ACK, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceAcknowledgment.parse(pHdr, pInStr);
-			}
-		});
-		placeFactory(SRV_DEREG, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceDeregistration.parse(pHdr, pInStr);
-			}
-		});
-		placeFactory(SRV_REG, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceRegistration.parse(pHdr, pInStr);
-			}
-		});
-		placeFactory(SRV_RPLY, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceReply.parse(pHdr, pInStr);
-			}
-		});
-		placeFactory(SRV_RQST, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceRequest.parse(pHdr, pInStr);
-			}
-		});
-		//
-		placeFactory(SRV_TYPE_RPLY, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceTypeReply.parse(pHdr, pInStr);
-			}
-		});
-		placeFactory(SRV_TYPE_RQST, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceTypeRequest.parse(pHdr, pInStr);
-			}
-		});
-	}
-
-	private static FactoryEntry getFactory(int pFnID) {
-		createFactoryArray();
-		return cFactoryArray[pFnID - FIRST_ID];
-	}
-
-	/**
-	 * parse
-	 * 
-	 * @param pSock
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(Socket pSock) throws ServiceLocationException, IOException {
-		return parse(pSock.getInputStream());
-	}
-
-	/**
-	 * parse
-	 * 
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(InputStream pInStr) throws ServiceLocationException, IOException {
-		return parse(new SLPInputStream(pInStr));
-	}
-
-	/**
-	 * parse
-	 * 
-	 * @param pPacket
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(DatagramPacket pPacket) throws ServiceLocationException,
-			IOException {
-		return parse(new SLPInputStream(pPacket));
-	}
-
-	/**
-	 * parse
-	 * 
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(SLPInputStream pInStr) throws ServiceLocationException,
-			IOException {
-		MsgHeader hdr = MsgHeader.parse(pInStr);
-		FactoryEntry factory = getFactory(hdr.getFunctionID());
-		if (factory == null) throw new ServiceLocationException(
-				ServiceLocationException.NOT_IMPLEMENTED, "FunctionID=" + hdr.getFunctionID()
-						+ " is not implemented!");
-		return factory.parse(hdr, pInStr);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.DatagramPacket;
+import java.net.Socket;
+
+import org.metricshub.wbem.sblim.slp.internal.msg.FunctionIDs;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/**
+ * MsgFactory
+ * 
+ */
+public class MsgFactory implements FunctionIDs {
+
+	/**
+	 * FactoryEntry
+	 * 
+	 */
+	private interface FactoryEntry {
+
+		/**
+		 * parse
+		 * 
+		 * @param pHdr
+		 * @param pInStr
+		 * @return SLPMessage
+		 * @throws ServiceLocationException
+		 * @throws IOException
+		 */
+		public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+				throws ServiceLocationException, IOException;
+	}
+
+	private static FactoryEntry[] cFactoryArray;
+
+	private static void placeFactory(int pFnID, FactoryEntry pEntry) {
+		cFactoryArray[pFnID - FIRST_ID] = pEntry;
+	}
+
+	private static synchronized void createFactoryArray() {
+		if (cFactoryArray != null) return;
+		cFactoryArray = new FactoryEntry[LAST_ID - FIRST_ID + 1];
+		for (int i = 0; i < cFactoryArray.length; i++)
+			cFactoryArray[i] = null;
+		placeFactory(ATTR_RPLY, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return AttributeReply.parse(pHdr, pInStr);
+			}
+		});
+		placeFactory(ATTR_RQST, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return AttributeRequest.parse(pHdr, pInStr);
+			}
+		});
+		placeFactory(DA_ADVERT, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return DAAdvert.parse(pHdr, pInStr);
+			}
+		});
+		placeFactory(SA_ADVERT, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return SAAdvert.parse(pHdr, pInStr);
+			}
+		});
+		placeFactory(SRV_ACK, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return ServiceAcknowledgment.parse(pHdr, pInStr);
+			}
+		});
+		placeFactory(SRV_DEREG, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return ServiceDeregistration.parse(pHdr, pInStr);
+			}
+		});
+		placeFactory(SRV_REG, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return ServiceRegistration.parse(pHdr, pInStr);
+			}
+		});
+		placeFactory(SRV_RPLY, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return ServiceReply.parse(pHdr, pInStr);
+			}
+		});
+		placeFactory(SRV_RQST, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return ServiceRequest.parse(pHdr, pInStr);
+			}
+		});
+		//
+		placeFactory(SRV_TYPE_RPLY, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return ServiceTypeReply.parse(pHdr, pInStr);
+			}
+		});
+		placeFactory(SRV_TYPE_RQST, new FactoryEntry() {
+
+			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+					throws ServiceLocationException, IOException {
+				return ServiceTypeRequest.parse(pHdr, pInStr);
+			}
+		});
+	}
+
+	private static FactoryEntry getFactory(int pFnID) {
+		createFactoryArray();
+		return cFactoryArray[pFnID - FIRST_ID];
+	}
+
+	/**
+	 * parse
+	 * 
+	 * @param pSock
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(Socket pSock) throws ServiceLocationException, IOException {
+		return parse(pSock.getInputStream());
+	}
+
+	/**
+	 * parse
+	 * 
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(InputStream pInStr) throws ServiceLocationException, IOException {
+		return parse(new SLPInputStream(pInStr));
+	}
+
+	/**
+	 * parse
+	 * 
+	 * @param pPacket
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(DatagramPacket pPacket) throws ServiceLocationException,
+			IOException {
+		return parse(new SLPInputStream(pPacket));
+	}
+
+	/**
+	 * parse
+	 * 
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(SLPInputStream pInStr) throws ServiceLocationException,
+			IOException {
+		MsgHeader hdr = MsgHeader.parse(pInStr);
+		FactoryEntry factory = getFactory(hdr.getFunctionID());
+		if (factory == null) throw new ServiceLocationException(
+				ServiceLocationException.NOT_IMPLEMENTED, "FunctionID=" + hdr.getFunctionID()
+						+ " is not implemented!");
+		return factory.parse(hdr, pInStr);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/MsgHeader.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgHeader.java
similarity index 86%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/MsgHeader.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgHeader.java
index a1a858c..f853487 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/MsgHeader.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgHeader.java
@@ -1,341 +1,339 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-15  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.Random;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.internal.Convert;
-
-/*
- * SLP Header: 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8
- * 9 0 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
- * Version | Function-ID | Length |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length,
- * contd.|O|F|R| reserved |Next Ext Offset|
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Next
- * Extension Offset, contd.| XID |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Language
- * Tag Length | Language Tag \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * 
- * Message Type Abbreviation Function-ID
- * 
- * Service Request SrvRqst 1 Service Reply SrvRply 2 Service Registration SrvReg
- * 3 Service Deregister SrvDeReg 4 Service Acknowledge SrvAck 5 Attribute
- * Request AttrRqst 6 Attribute Reply AttrRply 7 DA Advertisement DAAdvert 8
- * Service Type Request SrvTypeRqst 9 Service Type Reply SrvTypeRply 10 SA
- * Advertisement SAAdvert 11
- * 
- * Length: @2 3 bytes length of the entire SLP message, header included.
- * 
- * Flags: @5 1 byte OVERFLOW (0x80): is set when a message's length exceeds what
- * can fit into a datagram. FRESH (0x40): is set on every new SrvReg. REQUEST
- * MCAST (0x20): is set when multicasting or broadcasting requests.
- * 
- * Reserved: @6 1 byte bits MUST be 0.
- * 
- * Next Extension Offset: @7 3 bytes is set to 0 unless extensions are used. The
- * first extension begins at 'offset' bytes, from the message's beginning. It is
- * placed after the SLP message data.
- * 
- * XID: @10 2 bytes is set to a unique value for each unique request. If the
- * request is retransmitted, the same XID is used. Replies set the XID to the
- * same value as the xid in the request. Only unsolicited DAAdverts are sent
- * with an XID of 0.
- * 
- * Language Tag Length: @12 2 bytes is the length in bytes of the Language Tag
- * field.
- * 
- * Language Tag: @14 The Language Tag in a reply MUST be the same as the
- * Language Tag in the request. This field must be encoded 1*8ALPHA *("-"
- * 1*8ALPHA).
- */
-
-/**
- * MsgHeader
- * 
- */
-public class MsgHeader implements FunctionIDs {
-
-	/**
-	 * VERSION
-	 */
-	public static final byte VERSION = 2;
-
-	/**
-	 * RAW_HDR_LEN
-	 */
-	public static final int RAW_HDR_LEN = 14;
-
-	/**
-	 * OVERFLOW
-	 */
-	public static final int OVERFLOW = 0x8000;
-
-	/**
-	 * FRESH
-	 */
-	public static final int FRESH = 0x4000;
-
-	/**
-	 * MCAST
-	 */
-	public static final int MCAST = 0x2000;
-
-	/**
-	 * Initialized with a random value, then it is increased by every
-	 * getNewXID().
-	 */
-	private static int cXID = -1;
-
-	private int iVersion, iFunctionID;
-
-	private String iLangTag;
-
-	private boolean iOverflow, iFresh, iMCast;
-
-	/**
-	 * XIDs SHOULD be randomly chosen to avoid duplicate XIDs in requests if UAs
-	 * restart frequently. This variable is used only for to keep the XID of a
-	 * parsed message. serialize() overwrites it.
-	 */
-	private int iXID;
-
-	/**
-	 * parse
-	 * 
-	 * @param pInStr
-	 * @return MsgHeader
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static MsgHeader parse(SLPInputStream pInStr) throws ServiceLocationException,
-			IOException {
-		int version = pInStr.read8();
-		int fnID = pInStr.read8();
-		if (fnID < FIRST_ID || fnID > LAST_ID) throw new ServiceLocationException(
-				ServiceLocationException.PARSE_ERROR, "functionID:" + fnID + " is not supported!");
-		// int len =
-		pInStr.read24(); // TODO: could be used for sanity checking
-		int flags = pInStr.read16();
-		pInStr.read24(); // skip extension
-		int XID = pInStr.read16();
-		String langTag = pInStr.readString();
-		return new MsgHeader(version, fnID, langTag, (flags & OVERFLOW) > 0, (flags & FRESH) > 0,
-				(flags & MCAST) > 0, XID);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHdr
-	 */
-	public MsgHeader(MsgHeader pHdr) {
-		this(pHdr.iVersion, pHdr.iFunctionID, pHdr.iLangTag, pHdr.iOverflow, pHdr.iFresh,
-				pHdr.iMCast, pHdr.iXID);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pVersion
-	 * @param pFunctionID
-	 * @param pLangTag
-	 * @param pOverflow
-	 * @param pFresh
-	 * @param pMCast
-	 * @param pXID
-	 */
-	public MsgHeader(int pVersion, int pFunctionID, String pLangTag, boolean pOverflow,
-			boolean pFresh, boolean pMCast, int pXID) {
-		this.iVersion = pVersion;
-		this.iFunctionID = pFunctionID;
-		this.iLangTag = pLangTag;
-		this.iOverflow = pOverflow;
-		this.iFresh = pFresh;
-		this.iMCast = pMCast;
-		this.iXID = pXID;
-	}
-
-	/**
-	 * getVersion
-	 * 
-	 * @return int
-	 */
-	public int getVersion() {
-		return this.iVersion;
-	}
-
-	/**
-	 * getFunctionID
-	 * 
-	 * @return int
-	 */
-	public int getFunctionID() {
-		return this.iFunctionID;
-	}
-
-	/**
-	 * getLangTag
-	 * 
-	 * @return int
-	 */
-	public String getLangTag() {
-		return this.iLangTag;
-	}
-
-	/**
-	 * overflows
-	 * 
-	 * @return boolean
-	 */
-	public boolean overflows() {
-		return this.iOverflow;
-	}
-
-	/**
-	 * fresh
-	 * 
-	 * @return boolean
-	 */
-	public boolean fresh() {
-		return this.iFresh;
-	}
-
-	/**
-	 * multicast
-	 * 
-	 * @return boolean
-	 */
-	public boolean multicast() {
-		return this.iMCast;
-	}
-
-	/**
-	 * @return the XID which is parsed from the message. serialize() doesn't use
-	 *         this value, that serializes a new XID into the stream at every
-	 *         call (unless pKeepXID is set).
-	 */
-	public int getXID() {
-		return this.iXID;
-	}
-
-	/**
-	 * The response have to contain the same XID of the request. So this setter
-	 * can be useful.
-	 * 
-	 * @param pXID
-	 */
-	public void setXID(int pXID) {
-		this.iXID = pXID;
-	}
-
-	/**
-	 * getSize
-	 * 
-	 * @return int
-	 */
-	public int getSize() {
-		byte[] langBytes = getLangTagBytes();
-		return RAW_HDR_LEN + langBytes.length;
-	}
-
-	/*
-	 * message body have to be serialized first in order to know length and
-	 * MCAST
-	 */
-	/**
-	 * serialize
-	 * 
-	 * @param pBodyLength
-	 * @param pOverflow
-	 * @param pSetMultiCastFlag
-	 * @param pKeepXID
-	 * @return byte[]
-	 */
-	public byte[] serialize(int pBodyLength, boolean pOverflow, boolean pSetMultiCastFlag,
-			boolean pKeepXID) {
-		SLPOutputStream outStr = new SLPOutputStream();
-		outStr.writeNoChk8(VERSION);
-		outStr.writeNoChk8(this.iFunctionID);
-		outStr.writeNoChk24(getSize() + pBodyLength);
-		int flags = 0;
-		if (pOverflow) flags |= OVERFLOW;
-		if (this.iFresh) flags |= FRESH;
-		if (pSetMultiCastFlag) flags |= MCAST;
-		outStr.writeNoChk16(flags);
-		outStr.writeNoChk24(0); // skip extension
-		if (!pKeepXID) this.iXID = getNewXID();
-		outStr.writeNoChk16(this.iXID);
-		byte[] langTagBytes = getLangTagBytes();
-		outStr.writeNoChk16(langTagBytes.length);
-		outStr.writeNoChk(langTagBytes);
-		return outStr.toByteArray();
-	}
-
-	private byte[] iLangTagBytes;
-
-	private byte[] getLangTagBytes() {
-		if (this.iLangTagBytes != null) return this.iLangTagBytes;
-		this.iLangTagBytes = Convert.getBytes(this.iLangTag);
-		return this.iLangTagBytes;
-	}
-
-	/*
-	 * XID = 0 is not allowed except for some special case
-	 */
-	private static int getNewXID() {
-		if (cXID < 0) {
-			cXID = new Random().nextInt(65536);
-			return cXID == 0 ? ++cXID : cXID;
-		}
-		++cXID;
-		cXID &= 0xffff;
-		if (cXID == 0) ++cXID;
-		return ++cXID;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-15  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.Random;
+
+import org.metricshub.wbem.sblim.slp.internal.Convert;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * SLP Header: 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8
+ * 9 0 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
+ * Version | Function-ID | Length |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length,
+ * contd.|O|F|R| reserved |Next Ext Offset|
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Next
+ * Extension Offset, contd.| XID |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Language
+ * Tag Length | Language Tag \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * 
+ * Message Type Abbreviation Function-ID
+ * 
+ * Service Request SrvRqst 1 Service Reply SrvRply 2 Service Registration SrvReg
+ * 3 Service Deregister SrvDeReg 4 Service Acknowledge SrvAck 5 Attribute
+ * Request AttrRqst 6 Attribute Reply AttrRply 7 DA Advertisement DAAdvert 8
+ * Service Type Request SrvTypeRqst 9 Service Type Reply SrvTypeRply 10 SA
+ * Advertisement SAAdvert 11
+ * 
+ * Length: @2 3 bytes length of the entire SLP message, header included.
+ * 
+ * Flags: @5 1 byte OVERFLOW (0x80): is set when a message's length exceeds what
+ * can fit into a datagram. FRESH (0x40): is set on every new SrvReg. REQUEST
+ * MCAST (0x20): is set when multicasting or broadcasting requests.
+ * 
+ * Reserved: @6 1 byte bits MUST be 0.
+ * 
+ * Next Extension Offset: @7 3 bytes is set to 0 unless extensions are used. The
+ * first extension begins at 'offset' bytes, from the message's beginning. It is
+ * placed after the SLP message data.
+ * 
+ * XID: @10 2 bytes is set to a unique value for each unique request. If the
+ * request is retransmitted, the same XID is used. Replies set the XID to the
+ * same value as the xid in the request. Only unsolicited DAAdverts are sent
+ * with an XID of 0.
+ * 
+ * Language Tag Length: @12 2 bytes is the length in bytes of the Language Tag
+ * field.
+ * 
+ * Language Tag: @14 The Language Tag in a reply MUST be the same as the
+ * Language Tag in the request. This field must be encoded 1*8ALPHA *("-"
+ * 1*8ALPHA).
+ */
+
+/**
+ * MsgHeader
+ * 
+ */
+public class MsgHeader implements FunctionIDs {
+
+	/**
+	 * VERSION
+	 */
+	public static final byte VERSION = 2;
+
+	/**
+	 * RAW_HDR_LEN
+	 */
+	public static final int RAW_HDR_LEN = 14;
+
+	/**
+	 * OVERFLOW
+	 */
+	public static final int OVERFLOW = 0x8000;
+
+	/**
+	 * FRESH
+	 */
+	public static final int FRESH = 0x4000;
+
+	/**
+	 * MCAST
+	 */
+	public static final int MCAST = 0x2000;
+
+	/**
+	 * Initialized with a random value, then it is increased by every
+	 * getNewXID().
+	 */
+	private static int cXID = -1;
+
+	private int iVersion, iFunctionID;
+
+	private String iLangTag;
+
+	private boolean iOverflow, iFresh, iMCast;
+
+	/**
+	 * XIDs SHOULD be randomly chosen to avoid duplicate XIDs in requests if UAs
+	 * restart frequently. This variable is used only for to keep the XID of a
+	 * parsed message. serialize() overwrites it.
+	 */
+	private int iXID;
+
+	/**
+	 * parse
+	 * 
+	 * @param pInStr
+	 * @return MsgHeader
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static MsgHeader parse(SLPInputStream pInStr) throws ServiceLocationException,
+			IOException {
+		int version = pInStr.read8();
+		int fnID = pInStr.read8();
+		if (fnID < FIRST_ID || fnID > LAST_ID) throw new ServiceLocationException(
+				ServiceLocationException.PARSE_ERROR, "functionID:" + fnID + " is not supported!");
+		// int len =
+		pInStr.read24(); // TODO: could be used for sanity checking
+		int flags = pInStr.read16();
+		pInStr.read24(); // skip extension
+		int XID = pInStr.read16();
+		String langTag = pInStr.readString();
+		return new MsgHeader(version, fnID, langTag, (flags & OVERFLOW) > 0, (flags & FRESH) > 0,
+				(flags & MCAST) > 0, XID);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHdr
+	 */
+	public MsgHeader(MsgHeader pHdr) {
+		this(pHdr.iVersion, pHdr.iFunctionID, pHdr.iLangTag, pHdr.iOverflow, pHdr.iFresh,
+				pHdr.iMCast, pHdr.iXID);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pVersion
+	 * @param pFunctionID
+	 * @param pLangTag
+	 * @param pOverflow
+	 * @param pFresh
+	 * @param pMCast
+	 * @param pXID
+	 */
+	public MsgHeader(int pVersion, int pFunctionID, String pLangTag, boolean pOverflow,
+			boolean pFresh, boolean pMCast, int pXID) {
+		this.iVersion = pVersion;
+		this.iFunctionID = pFunctionID;
+		this.iLangTag = pLangTag;
+		this.iOverflow = pOverflow;
+		this.iFresh = pFresh;
+		this.iMCast = pMCast;
+		this.iXID = pXID;
+	}
+
+	/**
+	 * getVersion
+	 * 
+	 * @return int
+	 */
+	public int getVersion() {
+		return this.iVersion;
+	}
+
+	/**
+	 * getFunctionID
+	 * 
+	 * @return int
+	 */
+	public int getFunctionID() {
+		return this.iFunctionID;
+	}
+
+	/**
+	 * getLangTag
+	 * 
+	 * @return int
+	 */
+	public String getLangTag() {
+		return this.iLangTag;
+	}
+
+	/**
+	 * overflows
+	 * 
+	 * @return boolean
+	 */
+	public boolean overflows() {
+		return this.iOverflow;
+	}
+
+	/**
+	 * fresh
+	 * 
+	 * @return boolean
+	 */
+	public boolean fresh() {
+		return this.iFresh;
+	}
+
+	/**
+	 * multicast
+	 * 
+	 * @return boolean
+	 */
+	public boolean multicast() {
+		return this.iMCast;
+	}
+
+	/**
+	 * @return the XID which is parsed from the message. serialize() doesn't use
+	 *         this value, that serializes a new XID into the stream at every
+	 *         call (unless pKeepXID is set).
+	 */
+	public int getXID() {
+		return this.iXID;
+	}
+
+	/**
+	 * The response have to contain the same XID of the request. So this setter
+	 * can be useful.
+	 * 
+	 * @param pXID
+	 */
+	public void setXID(int pXID) {
+		this.iXID = pXID;
+	}
+
+	/**
+	 * getSize
+	 * 
+	 * @return int
+	 */
+	public int getSize() {
+		byte[] langBytes = getLangTagBytes();
+		return RAW_HDR_LEN + langBytes.length;
+	}
+
+	/*
+	 * message body have to be serialized first in order to know length and
+	 * MCAST
+	 */
+	/**
+	 * serialize
+	 * 
+	 * @param pBodyLength
+	 * @param pOverflow
+	 * @param pSetMultiCastFlag
+	 * @param pKeepXID
+	 * @return byte[]
+	 */
+	public byte[] serialize(int pBodyLength, boolean pOverflow, boolean pSetMultiCastFlag,
+			boolean pKeepXID) {
+		SLPOutputStream outStr = new SLPOutputStream();
+		outStr.writeNoChk8(VERSION);
+		outStr.writeNoChk8(this.iFunctionID);
+		outStr.writeNoChk24(getSize() + pBodyLength);
+		int flags = 0;
+		if (pOverflow) flags |= OVERFLOW;
+		if (this.iFresh) flags |= FRESH;
+		if (pSetMultiCastFlag) flags |= MCAST;
+		outStr.writeNoChk16(flags);
+		outStr.writeNoChk24(0); // skip extension
+		if (!pKeepXID) this.iXID = getNewXID();
+		outStr.writeNoChk16(this.iXID);
+		byte[] langTagBytes = getLangTagBytes();
+		outStr.writeNoChk16(langTagBytes.length);
+		outStr.writeNoChk(langTagBytes);
+		return outStr.toByteArray();
+	}
+
+	private byte[] iLangTagBytes;
+
+	private byte[] getLangTagBytes() {
+		if (this.iLangTagBytes != null) return this.iLangTagBytes;
+		this.iLangTagBytes = Convert.getBytes(this.iLangTag);
+		return this.iLangTagBytes;
+	}
+
+	/*
+	 * XID = 0 is not allowed except for some special case
+	 */
+	private static int getNewXID() {
+		if (cXID < 0) {
+			cXID = new Random().nextInt(65536);
+			return cXID == 0 ? ++cXID : cXID;
+		}
+		++cXID;
+		cXID &= 0xffff;
+		if (cXID == 0) ++cXID;
+		return ++cXID;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ReplyMessage.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ReplyMessage.java
similarity index 72%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ReplyMessage.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ReplyMessage.java
index 6e44cd7..79a662c 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ReplyMessage.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ReplyMessage.java
@@ -1,114 +1,112 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Iterator;
-
-/**
- * ReplyMessage
- * 
- */
-public abstract class ReplyMessage extends SLPMessage {
-
-	private int iErrorCode;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pFunctionID
-	 * @param pErrorCode
-	 */
-	public ReplyMessage(int pFunctionID, int pErrorCode) {
-		super(pFunctionID);
-		this.iErrorCode = pErrorCode;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pFunctionID
-	 * @param pLangTag
-	 * @param pErrorCode
-	 */
-	public ReplyMessage(int pFunctionID, String pLangTag, int pErrorCode) {
-		super(pFunctionID, pLangTag);
-		this.iErrorCode = pErrorCode;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pErrorCode
-	 */
-	public ReplyMessage(MsgHeader pHeader, int pErrorCode) {
-		super(pHeader);
-		this.iErrorCode = pErrorCode;
-	}
-
-	/**
-	 * getErrorCode
-	 * 
-	 * @return int
-	 */
-	public int getErrorCode() {
-		return this.iErrorCode;
-	}
-
-	/**
-	 * getResultIterator
-	 * 
-	 * @return Iterator
-	 */
-	public abstract Iterator getResultIterator();
-
-	/**
-	 * getExceptionIterator
-	 * 
-	 * @return Iterator
-	 */
-	public abstract Iterator getExceptionIterator();
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Iterator;
+
+/**
+ * ReplyMessage
+ * 
+ */
+public abstract class ReplyMessage extends SLPMessage {
+
+	private int iErrorCode;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pFunctionID
+	 * @param pErrorCode
+	 */
+	public ReplyMessage(int pFunctionID, int pErrorCode) {
+		super(pFunctionID);
+		this.iErrorCode = pErrorCode;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pFunctionID
+	 * @param pLangTag
+	 * @param pErrorCode
+	 */
+	public ReplyMessage(int pFunctionID, String pLangTag, int pErrorCode) {
+		super(pFunctionID, pLangTag);
+		this.iErrorCode = pErrorCode;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pErrorCode
+	 */
+	public ReplyMessage(MsgHeader pHeader, int pErrorCode) {
+		super(pHeader);
+		this.iErrorCode = pErrorCode;
+	}
+
+	/**
+	 * getErrorCode
+	 * 
+	 * @return int
+	 */
+	public int getErrorCode() {
+		return this.iErrorCode;
+	}
+
+	/**
+	 * getResultIterator
+	 * 
+	 * @return Iterator
+	 */
+	public abstract Iterator getResultIterator();
+
+	/**
+	 * getExceptionIterator
+	 * 
+	 * @return Iterator
+	 */
+	public abstract Iterator getExceptionIterator();
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/RequestMessage.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/RequestMessage.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/RequestMessage.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/RequestMessage.java
index 39e8cef..669ddf0 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/RequestMessage.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/RequestMessage.java
@@ -1,207 +1,205 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.SLPMessage;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-
-/**
- * RequestMessage
- * 
- */
-public abstract class RequestMessage extends SLPMessage {
-
-	private SortedSet iPrevResponderSet;
-
-	private List iScopeList;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pFunctionID
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pScopeList
-	 *            - list of scope strings
-	 */
-	public RequestMessage(int pFunctionID, SortedSet pPrevResponderSet,
-			List pScopeList) {
-		super(pFunctionID);
-		init(pPrevResponderSet, pScopeList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pFunctionID
-	 * @param pLangTag
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pScopeList
-	 *            - list of scope strings
-	 */
-	public RequestMessage(int pFunctionID, String pLangTag, SortedSet pPrevResponderSet,
-			List pScopeList) {
-		super(pFunctionID, pLangTag);
-		init(pPrevResponderSet, pScopeList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pScopeList
-	 *            - list of scope strings
-	 */
-	public RequestMessage(MsgHeader pHeader, SortedSet pPrevResponderSet,
-			List pScopeList) {
-		super(pHeader);
-		init(pPrevResponderSet, pScopeList);
-	}
-
-	/**
-	 * getPrevResponderSet
-	 * 
-	 * @return SortedSet
-	 */
-	public SortedSet getPrevResponderSet() {
-		return this.iPrevResponderSet;
-	}
-
-	/**
-	 * getPrevRespondersItr
-	 * 
-	 * @return Iterator
-	 */
-	public Iterator getPrevRespondersItr() {
-		return this.iPrevResponderSet == null ? null : this.iPrevResponderSet.iterator();
-	}
-
-	/**
-	 * updatePrevResponders
-	 * 
-	 * @param pResponder
-	 * @return boolean
-	 */
-	public boolean updatePrevResponders(String pResponder) {
-		if (this.iPrevResponderSet == null) this.iPrevResponderSet = new TreeSet();
-		return this.iPrevResponderSet.add(pResponder);
-	}
-
-	/**
-	 * getScopeList
-	 * 
-	 * @return List of scope strings
-	 */
-	public List getScopeList() {
-		return this.iScopeList;
-	}
-
-	/**
-	 * isAllowedResponseType
-	 * 
-	 * @param pRspMsg
-	 * @return boolean
-	 */
-	public boolean isAllowedResponseType(SLPMessage pRspMsg) {
-		if (pRspMsg == null) return false;
-		int id = pRspMsg.getFunctionID();
-		int[] rspIDs = getAllowedResponseIDs();
-		if (rspIDs == null) return true;
-		for (int i = 0; i < rspIDs.length; i++)
-			if (id == rspIDs[i]) return true;
-		return false;
-	}
-
-	/**
-	 * serializeWithoutResponders
-	 * 
-	 * @param pSetMulticastFlag
-	 * @param pDatagramLimited
-	 * @param pKeepXID
-	 * @return byte[]
-	 * @throws ServiceLocationException
-	 */
-	public byte[] serializeWithoutResponders(boolean pSetMulticastFlag, boolean pDatagramLimited,
-			boolean pKeepXID) throws ServiceLocationException {
-
-		return serialize(pSetMulticastFlag, pDatagramLimited, pKeepXID, new SkipResponders());
-	}
-
-	@Override
-	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pSkipResponders)
-			throws ServiceLocationException {
-		if (!pOutStr.writeStringList(pSkipResponders == null ? getPrevRespondersItr() : null)) throw new ServiceLocationException(
-				ServiceLocationException.PREVIOUS_RESPONDER_OVERFLOW,
-				"Previous responder list has overflowed!");
-		return serializeRequestBody(pOutStr);
-	}
-
-	protected abstract boolean serializeRequestBody(SLPOutputStream pOutStr)
-			throws ServiceLocationException;
-
-	protected abstract int[] getAllowedResponseIDs();
-
-	private void init(SortedSet pPrevResponderSet, List pScopeList) {
-		this.iPrevResponderSet = pPrevResponderSet;
-		this.iScopeList = pScopeList;
-	}
-
-	class SkipResponders extends SerializeOption {
-		/*
-		 * non-null instance indicates that the PreviousResponderList
-		 * serialization have to be skipped
-		 */
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/**
+ * RequestMessage
+ * 
+ */
+public abstract class RequestMessage extends SLPMessage {
+
+	private SortedSet iPrevResponderSet;
+
+	private List iScopeList;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pFunctionID
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pScopeList
+	 *            - list of scope strings
+	 */
+	public RequestMessage(int pFunctionID, SortedSet pPrevResponderSet,
+			List pScopeList) {
+		super(pFunctionID);
+		init(pPrevResponderSet, pScopeList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pFunctionID
+	 * @param pLangTag
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pScopeList
+	 *            - list of scope strings
+	 */
+	public RequestMessage(int pFunctionID, String pLangTag, SortedSet pPrevResponderSet,
+			List pScopeList) {
+		super(pFunctionID, pLangTag);
+		init(pPrevResponderSet, pScopeList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pScopeList
+	 *            - list of scope strings
+	 */
+	public RequestMessage(MsgHeader pHeader, SortedSet pPrevResponderSet,
+			List pScopeList) {
+		super(pHeader);
+		init(pPrevResponderSet, pScopeList);
+	}
+
+	/**
+	 * getPrevResponderSet
+	 * 
+	 * @return SortedSet
+	 */
+	public SortedSet getPrevResponderSet() {
+		return this.iPrevResponderSet;
+	}
+
+	/**
+	 * getPrevRespondersItr
+	 * 
+	 * @return Iterator
+	 */
+	public Iterator getPrevRespondersItr() {
+		return this.iPrevResponderSet == null ? null : this.iPrevResponderSet.iterator();
+	}
+
+	/**
+	 * updatePrevResponders
+	 * 
+	 * @param pResponder
+	 * @return boolean
+	 */
+	public boolean updatePrevResponders(String pResponder) {
+		if (this.iPrevResponderSet == null) this.iPrevResponderSet = new TreeSet();
+		return this.iPrevResponderSet.add(pResponder);
+	}
+
+	/**
+	 * getScopeList
+	 * 
+	 * @return List of scope strings
+	 */
+	public List getScopeList() {
+		return this.iScopeList;
+	}
+
+	/**
+	 * isAllowedResponseType
+	 * 
+	 * @param pRspMsg
+	 * @return boolean
+	 */
+	public boolean isAllowedResponseType(SLPMessage pRspMsg) {
+		if (pRspMsg == null) return false;
+		int id = pRspMsg.getFunctionID();
+		int[] rspIDs = getAllowedResponseIDs();
+		if (rspIDs == null) return true;
+		for (int i = 0; i < rspIDs.length; i++)
+			if (id == rspIDs[i]) return true;
+		return false;
+	}
+
+	/**
+	 * serializeWithoutResponders
+	 * 
+	 * @param pSetMulticastFlag
+	 * @param pDatagramLimited
+	 * @param pKeepXID
+	 * @return byte[]
+	 * @throws ServiceLocationException
+	 */
+	public byte[] serializeWithoutResponders(boolean pSetMulticastFlag, boolean pDatagramLimited,
+			boolean pKeepXID) throws ServiceLocationException {
+
+		return serialize(pSetMulticastFlag, pDatagramLimited, pKeepXID, new SkipResponders());
+	}
+
+	@Override
+	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pSkipResponders)
+			throws ServiceLocationException {
+		if (!pOutStr.writeStringList(pSkipResponders == null ? getPrevRespondersItr() : null)) throw new ServiceLocationException(
+				ServiceLocationException.PREVIOUS_RESPONDER_OVERFLOW,
+				"Previous responder list has overflowed!");
+		return serializeRequestBody(pOutStr);
+	}
+
+	protected abstract boolean serializeRequestBody(SLPOutputStream pOutStr)
+			throws ServiceLocationException;
+
+	protected abstract int[] getAllowedResponseIDs();
+
+	private void init(SortedSet pPrevResponderSet, List pScopeList) {
+		this.iPrevResponderSet = pPrevResponderSet;
+		this.iScopeList = pScopeList;
+	}
+
+	class SkipResponders extends SerializeOption {
+		/*
+		 * non-null instance indicates that the PreviousResponderList
+		 * serialization have to be skipped
+		 */
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SAAdvert.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SAAdvert.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SAAdvert.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SAAdvert.java
index 43eefc6..b65911b 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SAAdvert.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SAAdvert.java
@@ -1,174 +1,172 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationAttribute;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-
-/*
- * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
- * Location header (function = SAAdvert = 11) |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
- * URL | URL \ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
- * Length of  |  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
- *  |  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | # auth
- * blocks | authentication block (if any) \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * 
- */
-
-/**
- * SAAdvert message
- * 
- */
-public class SAAdvert extends ReplyMessage {
-
-	private String iURLStr;
-
-	private List iScopeList;
-
-	private List iAttrList;
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new SAAdvert(pHdr, pInStr.readString(), pInStr.readStringList(), pInStr
-				.readAttributeList());
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pURLStr
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 */
-	public SAAdvert(String pURLStr, List pScopeList,
-			List pAttrList) {
-		super(SA_ADVERT, 0);
-		init(pURLStr, pScopeList, pAttrList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pURLStr
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 */
-	public SAAdvert(String pLangTag, String pURLStr, List pScopeList,
-			List pAttrList) {
-		super(SA_ADVERT, pLangTag, 0);
-		init(pURLStr, pScopeList, pAttrList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pURLStr
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 */
-	public SAAdvert(MsgHeader pHeader, String pURLStr, List pScopeList,
-			List pAttrList) {
-		super(pHeader, 0);
-		init(pURLStr, pScopeList, pAttrList);
-	}
-
-	@Override
-	public Iterator getResultIterator() {
-		ArrayList list = new ArrayList();
-		list.add(this.iURLStr);
-		return list.iterator();
-	}
-
-	/**
-	 * @param pOption
-	 */
-	@Override
-	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write(this.iURLStr) && pOutStr.writeStringList(this.iScopeList)
-				&& pOutStr.writeAttributeList(this.iAttrList);
-	}
-
-	private void init(String pURLStr, List pScopeList,
-			List pAttrList) {
-		this.iURLStr = pURLStr;
-		this.iScopeList = pScopeList;
-		this.iAttrList = pAttrList;
-	}
-
-	@Override
-	public Iterator getExceptionIterator() {
-		// this message doesn't have exception table
-		return null;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
+ * Location header (function = SAAdvert = 11) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
+ * URL | URL \ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
+ * Length of  |  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
+ *  |  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | # auth
+ * blocks | authentication block (if any) \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * 
+ */
+
+/**
+ * SAAdvert message
+ * 
+ */
+public class SAAdvert extends ReplyMessage {
+
+	private String iURLStr;
+
+	private List iScopeList;
+
+	private List iAttrList;
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		return new SAAdvert(pHdr, pInStr.readString(), pInStr.readStringList(), pInStr
+				.readAttributeList());
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pURLStr
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 */
+	public SAAdvert(String pURLStr, List pScopeList,
+			List pAttrList) {
+		super(SA_ADVERT, 0);
+		init(pURLStr, pScopeList, pAttrList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pURLStr
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 */
+	public SAAdvert(String pLangTag, String pURLStr, List pScopeList,
+			List pAttrList) {
+		super(SA_ADVERT, pLangTag, 0);
+		init(pURLStr, pScopeList, pAttrList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pURLStr
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 */
+	public SAAdvert(MsgHeader pHeader, String pURLStr, List pScopeList,
+			List pAttrList) {
+		super(pHeader, 0);
+		init(pURLStr, pScopeList, pAttrList);
+	}
+
+	@Override
+	public Iterator getResultIterator() {
+		ArrayList list = new ArrayList();
+		list.add(this.iURLStr);
+		return list.iterator();
+	}
+
+	/**
+	 * @param pOption
+	 */
+	@Override
+	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
+		return pOutStr.write(this.iURLStr) && pOutStr.writeStringList(this.iScopeList)
+				&& pOutStr.writeAttributeList(this.iAttrList);
+	}
+
+	private void init(String pURLStr, List pScopeList,
+			List pAttrList) {
+		this.iURLStr = pURLStr;
+		this.iScopeList = pScopeList;
+		this.iAttrList = pAttrList;
+	}
+
+	@Override
+	public Iterator getExceptionIterator() {
+		// this message doesn't have exception table
+		return null;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SLPInputStream.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPInputStream.java
similarity index 88%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SLPInputStream.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPInputStream.java
index 8854335..93a0d2e 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SLPInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPInputStream.java
@@ -1,504 +1,502 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 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)
- * 3023349    2010-07-02  blaschke-oss SLP uses # constructor instead of valueOf
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.DatagramPacket;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationAttribute;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceType;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-import org.sentrysoftware.wbem.sblim.slp.internal.Convert;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPDefaults;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-
-/**
- * Helps the parsing of the bytes of SLP messages.
- * 
- */
-public class SLPInputStream {
-
-	private InputStream iInStr;
-
-	private final byte[] iBBuf = new byte[4];
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pBytes
-	 */
-	public SLPInputStream(byte[] pBytes) {
-		this(pBytes, 0, pBytes.length);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pSock
-	 * @throws IOException
-	 */
-	public SLPInputStream(Socket pSock) throws IOException {
-		this(pSock.getInputStream());
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pInStr
-	 */
-	public SLPInputStream(InputStream pInStr) {
-		this.iInStr = pInStr;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pPacket
-	 */
-	public SLPInputStream(DatagramPacket pPacket) {
-		this(pPacket.getData(), pPacket.getOffset(), pPacket.getLength());
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pBytes
-	 * @param pOffset
-	 * @param pLength
-	 */
-	public SLPInputStream(byte[] pBytes, int pOffset, int pLength) {
-		this.iInStr = new ByteArrayInputStream(pBytes, pOffset, pLength);
-	}
-
-	/**
-	 * readString
-	 * 
-	 * @return String
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public String readString() throws ServiceLocationException, IOException {
-		return Convert.unescape(readRawString());
-	}
-
-	/**
-	 * readStringSet
-	 * 
-	 * @return SortedSet of Strings
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public SortedSet readStringSet() throws ServiceLocationException, IOException {
-		SortedSet set = new TreeSet();
-		readStringCollection(set);
-		return set;
-	}
-
-	/**
-	 * readStringList
-	 * 
-	 * @return List of Strings
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public List readStringList() throws ServiceLocationException, IOException {
-		ArrayList strList = new ArrayList();
-		readStringCollection(strList);
-		return strList;
-	}
-
-	/**
-	 * readAttribute
-	 * 
-	 * @return ServiceLocationAttribute
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public ServiceLocationAttribute readAttribute() throws ServiceLocationException, IOException {
-		String str = readRawString();
-		return str == null ? null : new ServiceLocationAttribute(str);
-	}
-
-	/**
-	 * readAttributeList
-	 * 
-	 * @return List of ServiceLocationAttributes
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public List readAttributeList() throws ServiceLocationException,
-			IOException {
-		String str = readRawString();
-		return str == null ? null : new AttrListParser(str).getList();
-	}
-
-	/**
-	 * # of AttrAuths |(if present) Attribute Authentication Blocks...
-	 * 
-	 * @return null
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public List readAuthBlockList() throws ServiceLocationException, IOException {
-		Integer blockCntInt = doRead8();
-		if (blockCntInt == null) return null;
-		int blockCnt = blockCntInt.intValue();
-		if (blockCnt != 0) throw new ServiceLocationException(
-				ServiceLocationException.NOT_IMPLEMENTED,
-				"Handling of authentication blocks is not implemented! blockCount = " + blockCnt);
-		return null;
-	}
-
-	/*
-	 * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
-	 * Reserved | Lifetime | URL Length |
-	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |URL
-	 * len, contd.| URL (variable length) \
-	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |# of
-	 * URL auths | Auth. blocks (if any) \
-	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	 */
-	/**
-	 * @return ServiceURL
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public ServiceURL readURL() throws ServiceLocationException, IOException {
-		if (doRead8() == null) return null; // skip reserved
-		Integer lifeTimeInt = doRead16();
-		if (lifeTimeInt == null) return null;
-		int lifeTime = lifeTimeInt.intValue();
-		String urlStr = readString();
-		if (urlStr == null) return null;
-		Integer numOfAuthsInt = doRead8();
-		if (numOfAuthsInt == null) return null;
-		int numOfAuths = numOfAuthsInt.intValue();
-		while (numOfAuths-- > 0) {
-			TRC.warning("readAuth");
-			readString();
-		}
-		return new ServiceURL(urlStr, lifeTime);
-	}
-
-	/**
-	 * readUrlList
-	 * 
-	 * @param pURLExceptions
-	 * @return List of valid ServiceURLs
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 * 
-	 *             Add URL to list only if it is valid URL i.e. no exception is
-	 *             thrown by parser
-	 * 
-	 */
-	public List readUrlList(List pURLExceptions)
-			throws ServiceLocationException, IOException {
-		Integer cntInt = doRead16();
-		if (cntInt == null) return null;
-		int cnt = cntInt.intValue();
-		ArrayList urlList = new ArrayList(cnt);
-		ServiceURL url;
-		while (cnt-- > 0) {
-			try {
-				url = readURL();
-				if (url == null) break;
-				urlList.add(url);
-			} catch (IllegalArgumentException e) {
-				pURLExceptions.add(e);
-				TRC.warning("Ignoring Invalid URL : " + e.getMessage());
-			}
-		}
-		return urlList;
-	}
-
-	/**
-	 * readServiceType
-	 * 
-	 * @return ServiceType
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public ServiceType readServiceType() throws ServiceLocationException, IOException {
-		String str = readString();
-		return str == null ? null : new ServiceType(str);
-	}
-
-	/**
-	 * readServTypeList
-	 * 
-	 * @return List of ServiceTypes
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public List readServTypeList() throws ServiceLocationException, IOException {
-		Iterator strItr = readStringList().iterator();
-		ArrayList srvTypeList = new ArrayList();
-		while (strItr.hasNext()) {
-			srvTypeList.add(new ServiceType(strItr.next()));
-		}
-		return srvTypeList;
-	}
-
-	/**
-	 * read8
-	 * 
-	 * @return int
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public int read8() throws ServiceLocationException, IOException {
-		Integer res = doRead8();
-		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-				"Failed to read byte field!");
-		return res.intValue();
-	}
-
-	/**
-	 * read16
-	 * 
-	 * @return int
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public int read16() throws ServiceLocationException, IOException {
-		Integer res = doRead16();
-		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-				"Failed to read 2-byte-long field!");
-		return res.intValue();
-	}
-
-	/**
-	 * read24
-	 * 
-	 * @return int
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public int read24() throws ServiceLocationException, IOException {
-		Integer res = doRead24();
-		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-				"Failed to read 3-byte-long field!");
-		return res.intValue();
-	}
-
-	/**
-	 * read32
-	 * 
-	 * @return long
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public long read32() throws ServiceLocationException, IOException {
-		Long res = doRead32();
-		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-				"Failed to read 4-byte-long field!");
-		return res.longValue();
-	}
-
-	private Integer doRead8() throws IOException {
-		int res = this.iInStr.read();
-		return res < 0 ? null : Integer.valueOf(res);
-	}
-
-	private Integer doRead16() throws IOException {
-		int cnt = this.iInStr.read(this.iBBuf, 0, 2);
-		if (cnt != 2) return null;
-		return Integer.valueOf((this.iBBuf[0] & 0xff) << 8 | this.iBBuf[1] & 0xff);
-	}
-
-	private Integer doRead24() throws IOException {
-		int cnt = this.iInStr.read(this.iBBuf, 0, 3);
-		if (cnt != 3) return null;
-		return Integer.valueOf((this.iBBuf[0] & 0xff) << 16 | (this.iBBuf[1] & 0xff) << 8
-				| this.iBBuf[2] & 0xff);
-	}
-
-	private Long doRead32() throws IOException {
-		int cnt = this.iInStr.read(this.iBBuf, 0, 4);
-		if (cnt != 4) return null;
-		long res = (this.iBBuf[0] & 0xff) << 8;
-		res |= (this.iBBuf[1] & 0xff) << 8;
-		res |= (this.iBBuf[2] & 0xff) << 8;
-		res |= this.iBBuf[3] & 0xff;
-		return Long.valueOf(res);
-	}
-
-	private String readRawString() throws ServiceLocationException, IOException {
-		Integer lenInt = doRead16();
-		if (lenInt == null) return null;
-		int len = lenInt.intValue();
-		if (len <= 0) return null;
-		byte[] bytes = new byte[len];
-		int read = this.iInStr.read(bytes, 0, len);
-		if (read != len) return null;
-		try {
-			return new String(bytes, SLPDefaults.ENCODING);
-		} catch (UnsupportedEncodingException e) {
-			throw new ServiceLocationException(ServiceLocationException.INTERNAL_SYSTEM_ERROR, e);
-		}
-	}
-
-	private void readStringCollection(Collection pCol) throws ServiceLocationException,
-			IOException {
-		String rawListStr = readRawString();
-		if (rawListStr == null) return;
-		StringTokenizer tokenizer = new StringTokenizer(rawListStr, ",");
-		while (tokenizer.hasMoreElements())
-			pCol.add(Convert.unescape(tokenizer.nextToken()));
-	}
-
-	private static class AttrListParser {
-
-		private int iPos = 0;
-
-		private String iAttrListStr;
-
-		private ArrayList iList = new ArrayList();
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pAttrListStr
-		 * @throws ServiceLocationException
-		 */
-		public AttrListParser(String pAttrListStr) throws ServiceLocationException {
-			debug("attrListStr=" + pAttrListStr);
-			this.iAttrListStr = pAttrListStr;
-			String attrStr;
-			while ((attrStr = readEntry()) != null) {
-				debug("attrStr=" + attrStr);
-				this.iList.add(new ServiceLocationAttribute(attrStr));
-			}
-		}
-
-		/**
-		 * getList
-		 * 
-		 * @return List of ServiceLocationAttributes
-		 */
-		public List getList() {
-			return this.iList;
-		}
-
-		/*
-		 * ( "(" attrID "=" ( value "," )* value ")" ("," / EndOfString ) ) /
-		 * attrID ("," / EndOfString )
-		 */
-		private String readEntry() throws ServiceLocationException {
-			if (this.iAttrListStr == null) return null;
-			int lastIdx = this.iAttrListStr.length() - 1;
-			if (this.iPos == lastIdx) return null;
-			boolean inBlock = false;
-			int startPos = this.iPos;
-			while (true) {
-				char ch = this.iAttrListStr.charAt(this.iPos);
-				if (ch == '(') {
-					if (inBlock || this.iPos != startPos) throw new ServiceLocationException(
-							ServiceLocationException.PARSE_ERROR, invalidChar('('));
-					inBlock = true;
-				} else if (ch == ')') {
-					if (!inBlock) throw new ServiceLocationException(
-							ServiceLocationException.PARSE_ERROR, invalidChar(')'));
-					if (this.iPos == lastIdx) return this.iAttrListStr.substring(startPos);
-					inBlock = false;
-				} else {
-					if (inBlock) {
-						if (this.iPos == lastIdx)
-						/*
-						 * throw new ServiceLocationException(
-						 * ServiceLocationException.PARSE_ERROR, "There is no
-						 * ')' for '(' !" );
-						 */
-						return this.iAttrListStr.substring(startPos);
-					} else {
-						if (ch == ',') {
-							++this.iPos;
-							return this.iAttrListStr.substring(startPos, this.iPos - 1);
-						}
-						if (this.iPos == lastIdx) { return this.iAttrListStr.substring(startPos); }
-					}
-				}
-				if (this.iPos == lastIdx) throw new ServiceLocationException(
-						ServiceLocationException.PARSE_ERROR, "Unexpected end of Attribute list:\n"
-								+ this.iAttrListStr);
-				++this.iPos;
-			}
-		}
-
-		/**
-		 * @param ch
-		 */
-		private String invalidChar(char ch) {
-			return "Invalid '(' character in Attribute list:\n" + this.iAttrListStr
-					+ "\nat position: " + this.iPos;
-		}
-
-	}
-
-	/**
-	 * @param pMsg
-	 */
-	static void debug(String pMsg) {
-	// System.out.println(pMsg);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 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)
+ * 3023349    2010-07-02  blaschke-oss SLP uses # constructor instead of valueOf
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.DatagramPacket;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+import org.metricshub.wbem.sblim.slp.ServiceType;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.internal.Convert;
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/**
+ * Helps the parsing of the bytes of SLP messages.
+ * 
+ */
+public class SLPInputStream {
+
+	private InputStream iInStr;
+
+	private final byte[] iBBuf = new byte[4];
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pBytes
+	 */
+	public SLPInputStream(byte[] pBytes) {
+		this(pBytes, 0, pBytes.length);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pSock
+	 * @throws IOException
+	 */
+	public SLPInputStream(Socket pSock) throws IOException {
+		this(pSock.getInputStream());
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pInStr
+	 */
+	public SLPInputStream(InputStream pInStr) {
+		this.iInStr = pInStr;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pPacket
+	 */
+	public SLPInputStream(DatagramPacket pPacket) {
+		this(pPacket.getData(), pPacket.getOffset(), pPacket.getLength());
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pBytes
+	 * @param pOffset
+	 * @param pLength
+	 */
+	public SLPInputStream(byte[] pBytes, int pOffset, int pLength) {
+		this.iInStr = new ByteArrayInputStream(pBytes, pOffset, pLength);
+	}
+
+	/**
+	 * readString
+	 * 
+	 * @return String
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public String readString() throws ServiceLocationException, IOException {
+		return Convert.unescape(readRawString());
+	}
+
+	/**
+	 * readStringSet
+	 * 
+	 * @return SortedSet of Strings
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public SortedSet readStringSet() throws ServiceLocationException, IOException {
+		SortedSet set = new TreeSet();
+		readStringCollection(set);
+		return set;
+	}
+
+	/**
+	 * readStringList
+	 * 
+	 * @return List of Strings
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public List readStringList() throws ServiceLocationException, IOException {
+		ArrayList strList = new ArrayList();
+		readStringCollection(strList);
+		return strList;
+	}
+
+	/**
+	 * readAttribute
+	 * 
+	 * @return ServiceLocationAttribute
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public ServiceLocationAttribute readAttribute() throws ServiceLocationException, IOException {
+		String str = readRawString();
+		return str == null ? null : new ServiceLocationAttribute(str);
+	}
+
+	/**
+	 * readAttributeList
+	 * 
+	 * @return List of ServiceLocationAttributes
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public List readAttributeList() throws ServiceLocationException,
+			IOException {
+		String str = readRawString();
+		return str == null ? null : new AttrListParser(str).getList();
+	}
+
+	/**
+	 * # of AttrAuths |(if present) Attribute Authentication Blocks...
+	 * 
+	 * @return null
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public List readAuthBlockList() throws ServiceLocationException, IOException {
+		Integer blockCntInt = doRead8();
+		if (blockCntInt == null) return null;
+		int blockCnt = blockCntInt.intValue();
+		if (blockCnt != 0) throw new ServiceLocationException(
+				ServiceLocationException.NOT_IMPLEMENTED,
+				"Handling of authentication blocks is not implemented! blockCount = " + blockCnt);
+		return null;
+	}
+
+	/*
+	 * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
+	 * Reserved | Lifetime | URL Length |
+	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |URL
+	 * len, contd.| URL (variable length) \
+	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |# of
+	 * URL auths | Auth. blocks (if any) \
+	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	 */
+	/**
+	 * @return ServiceURL
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public ServiceURL readURL() throws ServiceLocationException, IOException {
+		if (doRead8() == null) return null; // skip reserved
+		Integer lifeTimeInt = doRead16();
+		if (lifeTimeInt == null) return null;
+		int lifeTime = lifeTimeInt.intValue();
+		String urlStr = readString();
+		if (urlStr == null) return null;
+		Integer numOfAuthsInt = doRead8();
+		if (numOfAuthsInt == null) return null;
+		int numOfAuths = numOfAuthsInt.intValue();
+		while (numOfAuths-- > 0) {
+			TRC.warning("readAuth");
+			readString();
+		}
+		return new ServiceURL(urlStr, lifeTime);
+	}
+
+	/**
+	 * readUrlList
+	 * 
+	 * @param pURLExceptions
+	 * @return List of valid ServiceURLs
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 * 
+	 *             Add URL to list only if it is valid URL i.e. no exception is
+	 *             thrown by parser
+	 * 
+	 */
+	public List readUrlList(List pURLExceptions)
+			throws ServiceLocationException, IOException {
+		Integer cntInt = doRead16();
+		if (cntInt == null) return null;
+		int cnt = cntInt.intValue();
+		ArrayList urlList = new ArrayList(cnt);
+		ServiceURL url;
+		while (cnt-- > 0) {
+			try {
+				url = readURL();
+				if (url == null) break;
+				urlList.add(url);
+			} catch (IllegalArgumentException e) {
+				pURLExceptions.add(e);
+				TRC.warning("Ignoring Invalid URL : " + e.getMessage());
+			}
+		}
+		return urlList;
+	}
+
+	/**
+	 * readServiceType
+	 * 
+	 * @return ServiceType
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public ServiceType readServiceType() throws ServiceLocationException, IOException {
+		String str = readString();
+		return str == null ? null : new ServiceType(str);
+	}
+
+	/**
+	 * readServTypeList
+	 * 
+	 * @return List of ServiceTypes
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public List readServTypeList() throws ServiceLocationException, IOException {
+		Iterator strItr = readStringList().iterator();
+		ArrayList srvTypeList = new ArrayList();
+		while (strItr.hasNext()) {
+			srvTypeList.add(new ServiceType(strItr.next()));
+		}
+		return srvTypeList;
+	}
+
+	/**
+	 * read8
+	 * 
+	 * @return int
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public int read8() throws ServiceLocationException, IOException {
+		Integer res = doRead8();
+		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
+				"Failed to read byte field!");
+		return res.intValue();
+	}
+
+	/**
+	 * read16
+	 * 
+	 * @return int
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public int read16() throws ServiceLocationException, IOException {
+		Integer res = doRead16();
+		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
+				"Failed to read 2-byte-long field!");
+		return res.intValue();
+	}
+
+	/**
+	 * read24
+	 * 
+	 * @return int
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public int read24() throws ServiceLocationException, IOException {
+		Integer res = doRead24();
+		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
+				"Failed to read 3-byte-long field!");
+		return res.intValue();
+	}
+
+	/**
+	 * read32
+	 * 
+	 * @return long
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public long read32() throws ServiceLocationException, IOException {
+		Long res = doRead32();
+		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
+				"Failed to read 4-byte-long field!");
+		return res.longValue();
+	}
+
+	private Integer doRead8() throws IOException {
+		int res = this.iInStr.read();
+		return res < 0 ? null : Integer.valueOf(res);
+	}
+
+	private Integer doRead16() throws IOException {
+		int cnt = this.iInStr.read(this.iBBuf, 0, 2);
+		if (cnt != 2) return null;
+		return Integer.valueOf((this.iBBuf[0] & 0xff) << 8 | this.iBBuf[1] & 0xff);
+	}
+
+	private Integer doRead24() throws IOException {
+		int cnt = this.iInStr.read(this.iBBuf, 0, 3);
+		if (cnt != 3) return null;
+		return Integer.valueOf((this.iBBuf[0] & 0xff) << 16 | (this.iBBuf[1] & 0xff) << 8
+				| this.iBBuf[2] & 0xff);
+	}
+
+	private Long doRead32() throws IOException {
+		int cnt = this.iInStr.read(this.iBBuf, 0, 4);
+		if (cnt != 4) return null;
+		long res = (this.iBBuf[0] & 0xff) << 8;
+		res |= (this.iBBuf[1] & 0xff) << 8;
+		res |= (this.iBBuf[2] & 0xff) << 8;
+		res |= this.iBBuf[3] & 0xff;
+		return Long.valueOf(res);
+	}
+
+	private String readRawString() throws ServiceLocationException, IOException {
+		Integer lenInt = doRead16();
+		if (lenInt == null) return null;
+		int len = lenInt.intValue();
+		if (len <= 0) return null;
+		byte[] bytes = new byte[len];
+		int read = this.iInStr.read(bytes, 0, len);
+		if (read != len) return null;
+		try {
+			return new String(bytes, SLPDefaults.ENCODING);
+		} catch (UnsupportedEncodingException e) {
+			throw new ServiceLocationException(ServiceLocationException.INTERNAL_SYSTEM_ERROR, e);
+		}
+	}
+
+	private void readStringCollection(Collection pCol) throws ServiceLocationException,
+			IOException {
+		String rawListStr = readRawString();
+		if (rawListStr == null) return;
+		StringTokenizer tokenizer = new StringTokenizer(rawListStr, ",");
+		while (tokenizer.hasMoreElements())
+			pCol.add(Convert.unescape(tokenizer.nextToken()));
+	}
+
+	private static class AttrListParser {
+
+		private int iPos = 0;
+
+		private String iAttrListStr;
+
+		private ArrayList iList = new ArrayList();
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pAttrListStr
+		 * @throws ServiceLocationException
+		 */
+		public AttrListParser(String pAttrListStr) throws ServiceLocationException {
+			debug("attrListStr=" + pAttrListStr);
+			this.iAttrListStr = pAttrListStr;
+			String attrStr;
+			while ((attrStr = readEntry()) != null) {
+				debug("attrStr=" + attrStr);
+				this.iList.add(new ServiceLocationAttribute(attrStr));
+			}
+		}
+
+		/**
+		 * getList
+		 * 
+		 * @return List of ServiceLocationAttributes
+		 */
+		public List getList() {
+			return this.iList;
+		}
+
+		/*
+		 * ( "(" attrID "=" ( value "," )* value ")" ("," / EndOfString ) ) /
+		 * attrID ("," / EndOfString )
+		 */
+		private String readEntry() throws ServiceLocationException {
+			if (this.iAttrListStr == null) return null;
+			int lastIdx = this.iAttrListStr.length() - 1;
+			if (this.iPos == lastIdx) return null;
+			boolean inBlock = false;
+			int startPos = this.iPos;
+			while (true) {
+				char ch = this.iAttrListStr.charAt(this.iPos);
+				if (ch == '(') {
+					if (inBlock || this.iPos != startPos) throw new ServiceLocationException(
+							ServiceLocationException.PARSE_ERROR, invalidChar('('));
+					inBlock = true;
+				} else if (ch == ')') {
+					if (!inBlock) throw new ServiceLocationException(
+							ServiceLocationException.PARSE_ERROR, invalidChar(')'));
+					if (this.iPos == lastIdx) return this.iAttrListStr.substring(startPos);
+					inBlock = false;
+				} else {
+					if (inBlock) {
+						if (this.iPos == lastIdx)
+						/*
+						 * throw new ServiceLocationException(
+						 * ServiceLocationException.PARSE_ERROR, "There is no
+						 * ')' for '(' !" );
+						 */
+						return this.iAttrListStr.substring(startPos);
+					} else {
+						if (ch == ',') {
+							++this.iPos;
+							return this.iAttrListStr.substring(startPos, this.iPos - 1);
+						}
+						if (this.iPos == lastIdx) { return this.iAttrListStr.substring(startPos); }
+					}
+				}
+				if (this.iPos == lastIdx) throw new ServiceLocationException(
+						ServiceLocationException.PARSE_ERROR, "Unexpected end of Attribute list:\n"
+								+ this.iAttrListStr);
+				++this.iPos;
+			}
+		}
+
+		/**
+		 * @param ch
+		 */
+		private String invalidChar(char ch) {
+			return "Invalid '(' character in Attribute list:\n" + this.iAttrListStr
+					+ "\nat position: " + this.iPos;
+		}
+
+	}
+
+	/**
+	 * @param pMsg
+	 */
+	static void debug(String pMsg) {
+	// System.out.println(pMsg);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SLPMessage.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPMessage.java
similarity index 79%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SLPMessage.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPMessage.java
index 766b0fd..b09caa8 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SLPMessage.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPMessage.java
@@ -1,223 +1,222 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 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)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPConfig;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPDefaults;
-
-/**
- * SLPMessage
- * 
- */
-public abstract class SLPMessage implements FunctionIDs {
-
-	// cache it for instance lifetime, do not parse always
-	private final int iMaxDatagramSize = SLPConfig.getGlobalCfg().getMTU();
-
-	private MsgHeader iHeader;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pFunctionID
-	 */
-	public SLPMessage(int pFunctionID) {
-		this(pFunctionID, Util.getLangTag(SLPDefaults.LOCALE));
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pFunctionID
-	 * @param pLangTag
-	 */
-	public SLPMessage(int pFunctionID, String pLangTag) {
-		this(new MsgHeader(MsgHeader.VERSION, pFunctionID, pLangTag, false, pFunctionID == SRV_REG,
-				false, 0));
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 */
-	public SLPMessage(MsgHeader pHeader) {
-		this.iHeader = pHeader;
-	}
-
-	/**
-	 * getHeader
-	 * 
-	 * @return MsgHeader
-	 */
-	public MsgHeader getHeader() {
-		return this.iHeader;
-	}
-
-	/**
-	 * getVersion
-	 * 
-	 * @return int
-	 */
-	public int getVersion() {
-		return this.iHeader.getVersion();
-	}
-
-	/**
-	 * getFunctionID
-	 * 
-	 * @return int
-	 */
-	public int getFunctionID() {
-		return this.iHeader.getFunctionID();
-	}
-
-	/**
-	 * getLangTag
-	 * 
-	 * @return String
-	 */
-	public String getLangTag() {
-		return this.iHeader.getLangTag();
-	}
-
-	/**
-	 * overflows
-	 * 
-	 * @return boolean
-	 */
-	public boolean overflows() {
-		return this.iHeader.overflows();
-	}
-
-	/**
-	 * fresh
-	 * 
-	 * @return boolean
-	 */
-	public boolean fresh() {
-		return this.iHeader.fresh();
-	}
-
-	/**
-	 * multicast
-	 * 
-	 * @return boolean
-	 */
-	public boolean multicast() {
-		return this.iHeader.multicast();
-	}
-
-	/**
-	 * getXID
-	 * 
-	 * @return int
-	 */
-	public int getXID() {
-		return this.iHeader.getXID();
-	}
-
-	/**
-	 * @see MsgHeader#setXID(int)
-	 * @param pXID
-	 */
-	public void setXID(int pXID) {
-		this.iHeader.setXID(pXID);
-	}
-
-	/**
-	 * serialize
-	 * 
-	 * @param pSetMulticastFlag
-	 * @param pDatagramLimited
-	 * @param pKeepXID
-	 * @return byte[]
-	 * @throws ServiceLocationException
-	 */
-	public byte[] serialize(boolean pSetMulticastFlag, boolean pDatagramLimited, boolean pKeepXID)
-			throws ServiceLocationException {
-		return serialize(pSetMulticastFlag, pDatagramLimited, pKeepXID, null);
-	}
-
-	/**
-	 * serialize
-	 * 
-	 * @param pSetMulticastFlag
-	 * @param pDatagramLimited
-	 * @param pKeepXID
-	 * @param pOption
-	 *            - passed to the serializeBody() method of the inherited
-	 *            classes
-	 * @return byte[]
-	 * @throws ServiceLocationException
-	 */
-	public byte[] serialize(boolean pSetMulticastFlag, boolean pDatagramLimited, boolean pKeepXID,
-			SerializeOption pOption) throws ServiceLocationException {
-		SLPOutputStream bodyOutStr = new SLPOutputStream(pDatagramLimited ? this.iMaxDatagramSize
-				- this.iHeader.getSize() : -1);
-		boolean fit = serializeBody(bodyOutStr, pOption);
-		byte[] bodyBytes = bodyOutStr.toByteArray();
-		byte[] headerBytes = this.iHeader.serialize(bodyBytes.length, !fit, pSetMulticastFlag,
-				pKeepXID);
-		byte[] bytes = new byte[headerBytes.length + bodyBytes.length];
-		System.arraycopy(headerBytes, 0, bytes, 0, headerBytes.length);
-		System.arraycopy(bodyBytes, 0, bytes, headerBytes.length, bodyBytes.length);
-		return bytes;
-	}
-
-	/**
-	 * @return true if all data is written into pOStr (all data fits into size
-	 *         limit)
-	 */
-	protected abstract boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption)
-			throws ServiceLocationException;
-
-	@Override
-	public String toString() {
-		return super.toString() + " " + getXID();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 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)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/**
+ * SLPMessage
+ * 
+ */
+public abstract class SLPMessage implements FunctionIDs {
+
+	// cache it for instance lifetime, do not parse always
+	private final int iMaxDatagramSize = SLPConfig.getGlobalCfg().getMTU();
+
+	private MsgHeader iHeader;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pFunctionID
+	 */
+	public SLPMessage(int pFunctionID) {
+		this(pFunctionID, Util.getLangTag(SLPDefaults.LOCALE));
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pFunctionID
+	 * @param pLangTag
+	 */
+	public SLPMessage(int pFunctionID, String pLangTag) {
+		this(new MsgHeader(MsgHeader.VERSION, pFunctionID, pLangTag, false, pFunctionID == SRV_REG,
+				false, 0));
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 */
+	public SLPMessage(MsgHeader pHeader) {
+		this.iHeader = pHeader;
+	}
+
+	/**
+	 * getHeader
+	 * 
+	 * @return MsgHeader
+	 */
+	public MsgHeader getHeader() {
+		return this.iHeader;
+	}
+
+	/**
+	 * getVersion
+	 * 
+	 * @return int
+	 */
+	public int getVersion() {
+		return this.iHeader.getVersion();
+	}
+
+	/**
+	 * getFunctionID
+	 * 
+	 * @return int
+	 */
+	public int getFunctionID() {
+		return this.iHeader.getFunctionID();
+	}
+
+	/**
+	 * getLangTag
+	 * 
+	 * @return String
+	 */
+	public String getLangTag() {
+		return this.iHeader.getLangTag();
+	}
+
+	/**
+	 * overflows
+	 * 
+	 * @return boolean
+	 */
+	public boolean overflows() {
+		return this.iHeader.overflows();
+	}
+
+	/**
+	 * fresh
+	 * 
+	 * @return boolean
+	 */
+	public boolean fresh() {
+		return this.iHeader.fresh();
+	}
+
+	/**
+	 * multicast
+	 * 
+	 * @return boolean
+	 */
+	public boolean multicast() {
+		return this.iHeader.multicast();
+	}
+
+	/**
+	 * getXID
+	 * 
+	 * @return int
+	 */
+	public int getXID() {
+		return this.iHeader.getXID();
+	}
+
+	/**
+	 * @see MsgHeader#setXID(int)
+	 * @param pXID
+	 */
+	public void setXID(int pXID) {
+		this.iHeader.setXID(pXID);
+	}
+
+	/**
+	 * serialize
+	 * 
+	 * @param pSetMulticastFlag
+	 * @param pDatagramLimited
+	 * @param pKeepXID
+	 * @return byte[]
+	 * @throws ServiceLocationException
+	 */
+	public byte[] serialize(boolean pSetMulticastFlag, boolean pDatagramLimited, boolean pKeepXID)
+			throws ServiceLocationException {
+		return serialize(pSetMulticastFlag, pDatagramLimited, pKeepXID, null);
+	}
+
+	/**
+	 * serialize
+	 * 
+	 * @param pSetMulticastFlag
+	 * @param pDatagramLimited
+	 * @param pKeepXID
+	 * @param pOption
+	 *            - passed to the serializeBody() method of the inherited
+	 *            classes
+	 * @return byte[]
+	 * @throws ServiceLocationException
+	 */
+	public byte[] serialize(boolean pSetMulticastFlag, boolean pDatagramLimited, boolean pKeepXID,
+			SerializeOption pOption) throws ServiceLocationException {
+		SLPOutputStream bodyOutStr = new SLPOutputStream(pDatagramLimited ? this.iMaxDatagramSize
+				- this.iHeader.getSize() : -1);
+		boolean fit = serializeBody(bodyOutStr, pOption);
+		byte[] bodyBytes = bodyOutStr.toByteArray();
+		byte[] headerBytes = this.iHeader.serialize(bodyBytes.length, !fit, pSetMulticastFlag,
+				pKeepXID);
+		byte[] bytes = new byte[headerBytes.length + bodyBytes.length];
+		System.arraycopy(headerBytes, 0, bytes, 0, headerBytes.length);
+		System.arraycopy(bodyBytes, 0, bytes, headerBytes.length, bodyBytes.length);
+		return bytes;
+	}
+
+	/**
+	 * @return true if all data is written into pOStr (all data fits into size
+	 *         limit)
+	 */
+	protected abstract boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption)
+			throws ServiceLocationException;
+
+	@Override
+	public String toString() {
+		return super.toString() + " " + getXID();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SLPOutputStream.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPOutputStream.java
similarity index 86%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SLPOutputStream.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPOutputStream.java
index 56ef272..e4ba0f6 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SLPOutputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPOutputStream.java
@@ -1,442 +1,440 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2210455    2008-10-30  blaschke-oss Enhance javadoc, fix potential null pointers
- * 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) 
- * 2797696    2009-05-27  raman_arora  Input files use unsafe operations
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationAttribute;
-import org.sentrysoftware.wbem.sblim.slp.ServiceType;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-import org.sentrysoftware.wbem.sblim.slp.internal.AttributeHandler;
-import org.sentrysoftware.wbem.sblim.slp.internal.Convert;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-
-/**
- * SLPOutputStream helps the building of SLP message bytes
- * 
- */
-public class SLPOutputStream {
-
-	private static final int MAX_FIELD_SIZE = 65535;
-
-	private static final byte[] EMPTY_BYTES = new byte[0];
-
-	private ByteArrayOutputStream iOutStr = new ByteArrayOutputStream();
-
-	private int iStreamLimit;
-
-	/**
-	 * Ctor.
-	 */
-	public SLPOutputStream() {
-		this(Integer.MAX_VALUE);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pStreamLimit
-	 */
-	public SLPOutputStream(int pStreamLimit) {
-		this.iStreamLimit = pStreamLimit <= 0 ? Integer.MAX_VALUE : pStreamLimit;
-	}
-
-	/**
-	 * size
-	 * 
-	 * @return int
-	 */
-	public int size() {
-		return this.iOutStr.size();
-	}
-
-	/**
-	 * freeSpace
-	 * 
-	 * @return int
-	 */
-	public int freeSpace() {
-		return this.iStreamLimit - this.iOutStr.size();
-	}
-
-	/**
-	 * toByteArray
-	 * 
-	 * @return byte[]
-	 */
-	public byte[] toByteArray() {
-		return this.iOutStr.toByteArray();
-	}
-
-	/**
-	 * write
-	 * 
-	 * @param pBytes
-	 * @return boolean
-	 */
-	public boolean write(byte[] pBytes) {
-		if (freeSpace() < pBytes.length) return false;
-		writeNoChk(pBytes);
-		return true;
-	}
-
-	/**
-	 * write
-	 * 
-	 * @param pServType
-	 * @return boolean
-	 */
-	public boolean write(ServiceType pServType) {
-		if (pServType == null) return write((String) null);
-		return write(pServType.toString());
-	}
-
-	/**
-	 * URL_HDR_LENGTH
-	 */
-	public static final int URL_HDR_LENGTH = 6;
-
-	/*
-	 * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
-	 * Reserved | Lifetime | URL Length |
-	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |URL
-	 * len, contd.| URL (variable length) \
-	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |# of
-	 * URL auths | Auth. blocks (if any) \
-	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	 */
-	/**
-	 * @param pURL
-	 * @return boolean
-	 */
-	public boolean write(ServiceURL pURL) {
-		// URL strings in URL entries are not encoded
-		String urlStr = pURL.toString();
-		byte[] urlStrBytes = Convert.getBytes(urlStr);
-		if (freeSpace() < URL_HDR_LENGTH + urlStrBytes.length) return false;
-		writeNoChk8(0);
-		writeNoChk16(pURL.getLifetime());
-		writeNoChk16(urlStrBytes.length);
-		writeNoChk(urlStrBytes);
-		writeNoChk8(0);
-		return true;
-	}
-
-	/**
-	 * writeURLList
-	 * 
-	 * @param pURLList
-	 * @return boolean
-	 */
-	@SuppressWarnings("null")
-	public boolean writeURLList(List pURLList) {
-		int cnt = pURLList == null ? 0 : pURLList.size();
-		if (cnt == 0) return write16(cnt);
-		SLPOutputStream tmpStr = new SLPOutputStream();
-		int i;
-		for (i = 0; i < cnt; i++) {
-			tmpStr.write((ServiceURL) pURLList.get(i));
-			if (freeSpace() < tmpStr.size() + 2) break;
-		}
-		writeNoChk16(i);
-		writeNoChk(tmpStr.toByteArray());
-		return i == cnt;
-	}
-
-	/**
-	 * writeServTypeList
-	 * 
-	 * @param pServTypeList
-	 * @return boolean
-	 */
-	public boolean writeServTypeList(List pServTypeList) {
-		return writeServTypeList(pServTypeList == null ? null : pServTypeList.iterator());
-	}
-
-	/**
-	 * writeServTypeList
-	 * 
-	 * @param pServTypeItr
-	 * @return boolean
-	 */
-	public boolean writeServTypeList(Iterator pServTypeItr) {
-		if (pServTypeItr == null) return writeStringList((Iterator) null);
-		ArrayList servTypeList = new ArrayList();
-		while (pServTypeItr.hasNext())
-			servTypeList.add(((ServiceType) pServTypeItr.next()).toString());
-		return writeStringList(servTypeList);
-	}
-
-	/**
-	 * writeAttributeList
-	 * 
-	 * @param pAttrList
-	 * @return boolean
-	 */
-	public boolean writeAttributeList(List pAttrList) {
-		return writeAttributeList(pAttrList == null ? null : pAttrList.iterator());
-	}
-
-	/**
-	 * writeAttributeList
-	 * 
-	 * @param pAttrItr
-	 * @return boolean
-	 */
-	public boolean writeAttributeList(Iterator pAttrItr) {
-		if (pAttrItr == null) return writeStringList((Iterator) null);
-		ArrayList attrStrList = new ArrayList();
-		while (pAttrItr.hasNext())
-			attrStrList.add(AttributeHandler
-					.buildString((ServiceLocationAttribute) pAttrItr.next()));
-		return writeStringList(attrStrList, null);
-	}
-
-	/**
-	 * # of AttrAuths |(if present) Attribute Authentication Blocks...
-	 * 
-	 * @param pAuthBlockList
-	 * @return boolean
-	 */
-	public boolean writeAuthBlockList(List pAuthBlockList) {
-		int cnt = pAuthBlockList == null ? 0 : pAuthBlockList.size();
-		if (cnt != 0) TRC
-				.error("Handling of non empty authentication block list is not implemented!");
-		return write8(0);
-	}
-
-	/**
-	 * write
-	 * 
-	 * @param pStr
-	 * @return boolean
-	 */
-	public boolean write(String pStr) {
-		return write(pStr, Convert.DEFAULT_RESERVED);
-	}
-
-	/**
-	 * write
-	 * 
-	 * @param pStr
-	 * @param pReservedChars
-	 * @return boolean
-	 */
-	public boolean write(String pStr, String pReservedChars) {
-		byte[] bytes = pStr == null ? EMPTY_BYTES : Convert.getBytes(Convert.escape(pStr,
-				pReservedChars));
-		if (bytes.length > MAX_FIELD_SIZE) return false;
-		if (freeSpace() < bytes.length + 2) return false;
-		writeNoChk16(bytes.length);
-		writeNoChk(bytes);
-		return true;
-	}
-
-	/**
-	 * writeStringList
-	 * 
-	 * @param pStrList
-	 * @return boolean
-	 */
-	public boolean writeStringList(List pStrList) {
-		return writeStringList(pStrList == null ? null : pStrList.iterator());
-	}
-
-	/**
-	 * writeStringList
-	 * 
-	 * @param pStrListItr
-	 * @return boolean
-	 */
-	public boolean writeStringList(Iterator pStrListItr) {
-		return writeStringList(pStrListItr, Convert.DEFAULT_RESERVED);
-	}
-
-	/**
-	 * writeStringList
-	 * 
-	 * @param pStrList
-	 * @param pReservedChars
-	 * @return boolean
-	 */
-	public boolean writeStringList(List pStrList, String pReservedChars) {
-		return writeStringList(pStrList == null ? null : pStrList.iterator(), pReservedChars);
-	}
-
-	/**
-	 * writeStringList
-	 * 
-	 * @param pStrListItr
-	 * @param pReservedChars
-	 * @return true if all list items are written to the stream, otherwise false
-	 */
-	public boolean writeStringList(Iterator pStrListItr, String pReservedChars) {
-		ByteArrayOutputStream listByteStr = new ByteArrayOutputStream();
-		boolean first = true;
-		boolean allWritten = true;
-		if (pStrListItr != null) while (pStrListItr.hasNext()) {
-			StringBuffer strBuf = new StringBuffer();
-			String listItemStr = Convert.escape(pStrListItr.next(), pReservedChars);
-			if (first) {
-				first = false;
-			} else {
-				strBuf.append(',');
-			}
-			strBuf.append(listItemStr);
-			byte[] listItemBytes = Convert.getBytes(strBuf.toString());
-			int currentSize = listByteStr.size() + listItemBytes.length;
-			if (currentSize > MAX_FIELD_SIZE || currentSize + 2 > freeSpace()) {
-				allWritten = false;
-				break;
-			}
-			listByteStr.write(listItemBytes, 0, listItemBytes.length);
-		}
-		byte[] listBytes = listByteStr.toByteArray();
-		writeNoChk16(listBytes.length);
-		writeNoChk(listBytes);
-		return allWritten;
-	}
-
-	/**
-	 * write8
-	 * 
-	 * @param pValue
-	 * @return boolean
-	 */
-	public boolean write8(int pValue) {
-		if (freeSpace() < 1) return false;
-		writeNoChk8(pValue);
-		return true;
-	}
-
-	/**
-	 * write16
-	 * 
-	 * @param pValue
-	 * @return boolean
-	 */
-	public boolean write16(int pValue) {
-		if (freeSpace() < 2) return false;
-		writeNoChk16(pValue);
-		return true;
-	}
-
-	/**
-	 * write24
-	 * 
-	 * @param pValue
-	 * @return boolean
-	 */
-	public boolean write24(int pValue) {
-		if (freeSpace() < 3) return false;
-		writeNoChk24(pValue);
-		return true;
-	}
-
-	/**
-	 * write32
-	 * 
-	 * @param pValue
-	 * @return boolean
-	 */
-	public boolean write32(long pValue) {
-		if (freeSpace() < 4) return false;
-		writeNoChk32(pValue);
-		return true;
-	}
-
-	/**
-	 * writeNoChk
-	 * 
-	 * @param pBytes
-	 */
-	public void writeNoChk(byte[] pBytes) {
-		this.iOutStr.write(pBytes, 0, pBytes.length);
-	}
-
-	/**
-	 * writeNoChk8
-	 * 
-	 * @param pValue
-	 */
-	public void writeNoChk8(int pValue) {
-		this.iOutStr.write(pValue);
-	}
-
-	/**
-	 * writeNoChk16
-	 * 
-	 * @param pValue
-	 */
-	public void writeNoChk16(int pValue) {
-		this.iOutStr.write((pValue >> 8) & 0xff);
-		this.iOutStr.write((pValue & 0xff));
-	}
-
-	/**
-	 * writeNoChk24
-	 * 
-	 * @param pValue
-	 */
-	public void writeNoChk24(int pValue) {
-		this.iOutStr.write((pValue >> 16) & 0xff);
-		writeNoChk16(pValue);
-	}
-
-	/**
-	 * writeNoChk32
-	 * 
-	 * @param pValue
-	 */
-	public void writeNoChk32(long pValue) {
-		this.iOutStr.write((int) ((pValue >> 24) & 0xff));
-		writeNoChk24((int) pValue);
-	}
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2210455    2008-10-30  blaschke-oss Enhance javadoc, fix potential null pointers
+ * 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) 
+ * 2797696    2009-05-27  raman_arora  Input files use unsafe operations
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+import org.metricshub.wbem.sblim.slp.ServiceType;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.internal.AttributeHandler;
+import org.metricshub.wbem.sblim.slp.internal.Convert;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+
+/**
+ * SLPOutputStream helps the building of SLP message bytes
+ * 
+ */
+public class SLPOutputStream {
+
+	private static final int MAX_FIELD_SIZE = 65535;
+
+	private static final byte[] EMPTY_BYTES = new byte[0];
+
+	private ByteArrayOutputStream iOutStr = new ByteArrayOutputStream();
+
+	private int iStreamLimit;
+
+	/**
+	 * Ctor.
+	 */
+	public SLPOutputStream() {
+		this(Integer.MAX_VALUE);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pStreamLimit
+	 */
+	public SLPOutputStream(int pStreamLimit) {
+		this.iStreamLimit = pStreamLimit <= 0 ? Integer.MAX_VALUE : pStreamLimit;
+	}
+
+	/**
+	 * size
+	 * 
+	 * @return int
+	 */
+	public int size() {
+		return this.iOutStr.size();
+	}
+
+	/**
+	 * freeSpace
+	 * 
+	 * @return int
+	 */
+	public int freeSpace() {
+		return this.iStreamLimit - this.iOutStr.size();
+	}
+
+	/**
+	 * toByteArray
+	 * 
+	 * @return byte[]
+	 */
+	public byte[] toByteArray() {
+		return this.iOutStr.toByteArray();
+	}
+
+	/**
+	 * write
+	 * 
+	 * @param pBytes
+	 * @return boolean
+	 */
+	public boolean write(byte[] pBytes) {
+		if (freeSpace() < pBytes.length) return false;
+		writeNoChk(pBytes);
+		return true;
+	}
+
+	/**
+	 * write
+	 * 
+	 * @param pServType
+	 * @return boolean
+	 */
+	public boolean write(ServiceType pServType) {
+		if (pServType == null) return write((String) null);
+		return write(pServType.toString());
+	}
+
+	/**
+	 * URL_HDR_LENGTH
+	 */
+	public static final int URL_HDR_LENGTH = 6;
+
+	/*
+	 * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
+	 * Reserved | Lifetime | URL Length |
+	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |URL
+	 * len, contd.| URL (variable length) \
+	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |# of
+	 * URL auths | Auth. blocks (if any) \
+	 * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	 */
+	/**
+	 * @param pURL
+	 * @return boolean
+	 */
+	public boolean write(ServiceURL pURL) {
+		// URL strings in URL entries are not encoded
+		String urlStr = pURL.toString();
+		byte[] urlStrBytes = Convert.getBytes(urlStr);
+		if (freeSpace() < URL_HDR_LENGTH + urlStrBytes.length) return false;
+		writeNoChk8(0);
+		writeNoChk16(pURL.getLifetime());
+		writeNoChk16(urlStrBytes.length);
+		writeNoChk(urlStrBytes);
+		writeNoChk8(0);
+		return true;
+	}
+
+	/**
+	 * writeURLList
+	 * 
+	 * @param pURLList
+	 * @return boolean
+	 */
+	@SuppressWarnings("null")
+	public boolean writeURLList(List pURLList) {
+		int cnt = pURLList == null ? 0 : pURLList.size();
+		if (cnt == 0) return write16(cnt);
+		SLPOutputStream tmpStr = new SLPOutputStream();
+		int i;
+		for (i = 0; i < cnt; i++) {
+			tmpStr.write((ServiceURL) pURLList.get(i));
+			if (freeSpace() < tmpStr.size() + 2) break;
+		}
+		writeNoChk16(i);
+		writeNoChk(tmpStr.toByteArray());
+		return i == cnt;
+	}
+
+	/**
+	 * writeServTypeList
+	 * 
+	 * @param pServTypeList
+	 * @return boolean
+	 */
+	public boolean writeServTypeList(List pServTypeList) {
+		return writeServTypeList(pServTypeList == null ? null : pServTypeList.iterator());
+	}
+
+	/**
+	 * writeServTypeList
+	 * 
+	 * @param pServTypeItr
+	 * @return boolean
+	 */
+	public boolean writeServTypeList(Iterator pServTypeItr) {
+		if (pServTypeItr == null) return writeStringList((Iterator) null);
+		ArrayList servTypeList = new ArrayList();
+		while (pServTypeItr.hasNext())
+			servTypeList.add(((ServiceType) pServTypeItr.next()).toString());
+		return writeStringList(servTypeList);
+	}
+
+	/**
+	 * writeAttributeList
+	 * 
+	 * @param pAttrList
+	 * @return boolean
+	 */
+	public boolean writeAttributeList(List pAttrList) {
+		return writeAttributeList(pAttrList == null ? null : pAttrList.iterator());
+	}
+
+	/**
+	 * writeAttributeList
+	 * 
+	 * @param pAttrItr
+	 * @return boolean
+	 */
+	public boolean writeAttributeList(Iterator pAttrItr) {
+		if (pAttrItr == null) return writeStringList((Iterator) null);
+		ArrayList attrStrList = new ArrayList();
+		while (pAttrItr.hasNext())
+			attrStrList.add(AttributeHandler
+					.buildString((ServiceLocationAttribute) pAttrItr.next()));
+		return writeStringList(attrStrList, null);
+	}
+
+	/**
+	 * # of AttrAuths |(if present) Attribute Authentication Blocks...
+	 * 
+	 * @param pAuthBlockList
+	 * @return boolean
+	 */
+	public boolean writeAuthBlockList(List pAuthBlockList) {
+		int cnt = pAuthBlockList == null ? 0 : pAuthBlockList.size();
+		if (cnt != 0) TRC
+				.error("Handling of non empty authentication block list is not implemented!");
+		return write8(0);
+	}
+
+	/**
+	 * write
+	 * 
+	 * @param pStr
+	 * @return boolean
+	 */
+	public boolean write(String pStr) {
+		return write(pStr, Convert.DEFAULT_RESERVED);
+	}
+
+	/**
+	 * write
+	 * 
+	 * @param pStr
+	 * @param pReservedChars
+	 * @return boolean
+	 */
+	public boolean write(String pStr, String pReservedChars) {
+		byte[] bytes = pStr == null ? EMPTY_BYTES : Convert.getBytes(Convert.escape(pStr,
+				pReservedChars));
+		if (bytes.length > MAX_FIELD_SIZE) return false;
+		if (freeSpace() < bytes.length + 2) return false;
+		writeNoChk16(bytes.length);
+		writeNoChk(bytes);
+		return true;
+	}
+
+	/**
+	 * writeStringList
+	 * 
+	 * @param pStrList
+	 * @return boolean
+	 */
+	public boolean writeStringList(List pStrList) {
+		return writeStringList(pStrList == null ? null : pStrList.iterator());
+	}
+
+	/**
+	 * writeStringList
+	 * 
+	 * @param pStrListItr
+	 * @return boolean
+	 */
+	public boolean writeStringList(Iterator pStrListItr) {
+		return writeStringList(pStrListItr, Convert.DEFAULT_RESERVED);
+	}
+
+	/**
+	 * writeStringList
+	 * 
+	 * @param pStrList
+	 * @param pReservedChars
+	 * @return boolean
+	 */
+	public boolean writeStringList(List pStrList, String pReservedChars) {
+		return writeStringList(pStrList == null ? null : pStrList.iterator(), pReservedChars);
+	}
+
+	/**
+	 * writeStringList
+	 * 
+	 * @param pStrListItr
+	 * @param pReservedChars
+	 * @return true if all list items are written to the stream, otherwise false
+	 */
+	public boolean writeStringList(Iterator pStrListItr, String pReservedChars) {
+		ByteArrayOutputStream listByteStr = new ByteArrayOutputStream();
+		boolean first = true;
+		boolean allWritten = true;
+		if (pStrListItr != null) while (pStrListItr.hasNext()) {
+			StringBuffer strBuf = new StringBuffer();
+			String listItemStr = Convert.escape(pStrListItr.next(), pReservedChars);
+			if (first) {
+				first = false;
+			} else {
+				strBuf.append(',');
+			}
+			strBuf.append(listItemStr);
+			byte[] listItemBytes = Convert.getBytes(strBuf.toString());
+			int currentSize = listByteStr.size() + listItemBytes.length;
+			if (currentSize > MAX_FIELD_SIZE || currentSize + 2 > freeSpace()) {
+				allWritten = false;
+				break;
+			}
+			listByteStr.write(listItemBytes, 0, listItemBytes.length);
+		}
+		byte[] listBytes = listByteStr.toByteArray();
+		writeNoChk16(listBytes.length);
+		writeNoChk(listBytes);
+		return allWritten;
+	}
+
+	/**
+	 * write8
+	 * 
+	 * @param pValue
+	 * @return boolean
+	 */
+	public boolean write8(int pValue) {
+		if (freeSpace() < 1) return false;
+		writeNoChk8(pValue);
+		return true;
+	}
+
+	/**
+	 * write16
+	 * 
+	 * @param pValue
+	 * @return boolean
+	 */
+	public boolean write16(int pValue) {
+		if (freeSpace() < 2) return false;
+		writeNoChk16(pValue);
+		return true;
+	}
+
+	/**
+	 * write24
+	 * 
+	 * @param pValue
+	 * @return boolean
+	 */
+	public boolean write24(int pValue) {
+		if (freeSpace() < 3) return false;
+		writeNoChk24(pValue);
+		return true;
+	}
+
+	/**
+	 * write32
+	 * 
+	 * @param pValue
+	 * @return boolean
+	 */
+	public boolean write32(long pValue) {
+		if (freeSpace() < 4) return false;
+		writeNoChk32(pValue);
+		return true;
+	}
+
+	/**
+	 * writeNoChk
+	 * 
+	 * @param pBytes
+	 */
+	public void writeNoChk(byte[] pBytes) {
+		this.iOutStr.write(pBytes, 0, pBytes.length);
+	}
+
+	/**
+	 * writeNoChk8
+	 * 
+	 * @param pValue
+	 */
+	public void writeNoChk8(int pValue) {
+		this.iOutStr.write(pValue);
+	}
+
+	/**
+	 * writeNoChk16
+	 * 
+	 * @param pValue
+	 */
+	public void writeNoChk16(int pValue) {
+		this.iOutStr.write((pValue >> 8) & 0xff);
+		this.iOutStr.write((pValue & 0xff));
+	}
+
+	/**
+	 * writeNoChk24
+	 * 
+	 * @param pValue
+	 */
+	public void writeNoChk24(int pValue) {
+		this.iOutStr.write((pValue >> 16) & 0xff);
+		writeNoChk16(pValue);
+	}
+
+	/**
+	 * writeNoChk32
+	 * 
+	 * @param pValue
+	 */
+	public void writeNoChk32(long pValue) {
+		this.iOutStr.write((int) ((pValue >> 24) & 0xff));
+		writeNoChk24((int) pValue);
+	}
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SerializeOption.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SerializeOption.java
similarity index 61%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SerializeOption.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SerializeOption.java
index 1b63262..40a1627 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/SerializeOption.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SerializeOption.java
@@ -1,56 +1,54 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1892103    2008-02-12  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Inherited classes of SerializeOption provide additional serialization
- * parameters for the inherited SLPMessage classes.
- * 
- */
-public abstract class SerializeOption {
-
-	/*
-	 * Inherited classes add the methods.
-	 */
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/**
+ * Inherited classes of SerializeOption provide additional serialization
+ * parameters for the inherited SLPMessage classes.
+ * 
+ */
+public abstract class SerializeOption {
+
+	/*
+	 * Inherited classes add the methods.
+	 */
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java
similarity index 73%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java
index 2c8f445..64b1769 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java
@@ -1,122 +1,120 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-
-/**
- * ServiceAcknowledgment message
- * 
- */
-public class ServiceAcknowledgment extends ReplyMessage {
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new ServiceAcknowledgment(pHdr, pInStr.read16());
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pErrorCode
-	 */
-	public ServiceAcknowledgment(int pErrorCode) {
-		super(SRV_ACK, pErrorCode);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pErrorCode
-	 */
-	public ServiceAcknowledgment(String pLangTag, int pErrorCode) {
-		super(SRV_ACK, pLangTag, pErrorCode);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pErrorCode
-	 */
-	public ServiceAcknowledgment(MsgHeader pHeader, int pErrorCode) {
-		super(pHeader, pErrorCode);
-	}
-
-	@Override
-	public Iterator getResultIterator() {
-		// this message doesn't have iterable results
-		return null;
-	}
-
-	/**
-	 * @param pOption
-	 */
-	@Override
-	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write16(getErrorCode());
-	}
-
-	@Override
-	public Iterator getExceptionIterator() {
-		// this message doesn't have exception table
-		return null;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.Iterator;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/**
+ * ServiceAcknowledgment message
+ * 
+ */
+public class ServiceAcknowledgment extends ReplyMessage {
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		return new ServiceAcknowledgment(pHdr, pInStr.read16());
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pErrorCode
+	 */
+	public ServiceAcknowledgment(int pErrorCode) {
+		super(SRV_ACK, pErrorCode);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pErrorCode
+	 */
+	public ServiceAcknowledgment(String pLangTag, int pErrorCode) {
+		super(SRV_ACK, pLangTag, pErrorCode);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pErrorCode
+	 */
+	public ServiceAcknowledgment(MsgHeader pHeader, int pErrorCode) {
+		super(pHeader, pErrorCode);
+	}
+
+	@Override
+	public Iterator getResultIterator() {
+		// this message doesn't have iterable results
+		return null;
+	}
+
+	/**
+	 * @param pOption
+	 */
+	@Override
+	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
+		return pOutStr.write16(getErrorCode());
+	}
+
+	@Override
+	public Iterator getExceptionIterator() {
+		// this message doesn't have exception table
+		return null;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceDeregistration.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceDeregistration.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceDeregistration.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceDeregistration.java
index 7054afa..0b2b58e 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceDeregistration.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceDeregistration.java
@@ -1,167 +1,165 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-
-/*
- * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
- * Location header (function = SrvDeReg = 4) |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
- *  |  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | URL Entry \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
- *  |  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ The
- *  is a  of attribute tags to deregister as defined in
- * Section 9.4. If no  is present, the SrvDeReg deregisters the
- * service in all languages it has been registered in. If the  is
- * present, the SrvDeReg deregisters the attributes whose tags are listed in the
- * tag spec. Services registered with Authentication Blocks MUST NOT include a
- *  in a SrvDeReg message: A DA will respond with an
- * AUTHENTICATION_FAILED error in this case.
- */
-
-/**
- * ServiceDeregistration message
- * 
- */
-public class ServiceDeregistration extends SLPMessage {
-
-	private List iScopeList;
-
-	private ServiceURL iURL;
-
-	private List iTagList;
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new ServiceDeregistration(pHdr, pInStr.readStringList(), pInStr.readURL(), pInStr
-				.readStringList());
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pURL
-	 * @param pTagList
-	 */
-	public ServiceDeregistration(List pScopeList, ServiceURL pURL, List pTagList) {
-		super(SRV_DEREG);
-		init(pScopeList, pURL, pTagList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pURL
-	 * @param pTagList
-	 */
-	public ServiceDeregistration(String pLangTag, List pScopeList, ServiceURL pURL,
-			List pTagList) {
-		super(SRV_DEREG, pLangTag);
-		init(pScopeList, pURL, pTagList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pURL
-	 * @param pTagList
-	 */
-	public ServiceDeregistration(MsgHeader pHeader, List pScopeList, ServiceURL pURL,
-			List pTagList) {
-		super(pHeader);
-		init(pScopeList, pURL, pTagList);
-	}
-
-	/**
-	 * getServiceURL
-	 * 
-	 * @return ServiceURL
-	 */
-	public ServiceURL getServiceURL() {
-		return this.iURL;
-	}
-
-	/**
-	 * @param pOption
-	 */
-	@Override
-	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.writeStringList(this.iScopeList) && pOutStr.write(this.iURL)
-				&& pOutStr.writeStringList(this.iTagList);
-	}
-
-	private void init(List pScopeList, ServiceURL pURL, List pTagList) {
-		this.iScopeList = pScopeList;
-		this.iURL = pURL;
-		this.iTagList = pTagList;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
+ * Location header (function = SrvDeReg = 4) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
+ *  |  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | URL Entry \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Length of
+ *  |  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ The
+ *  is a  of attribute tags to deregister as defined in
+ * Section 9.4. If no  is present, the SrvDeReg deregisters the
+ * service in all languages it has been registered in. If the  is
+ * present, the SrvDeReg deregisters the attributes whose tags are listed in the
+ * tag spec. Services registered with Authentication Blocks MUST NOT include a
+ *  in a SrvDeReg message: A DA will respond with an
+ * AUTHENTICATION_FAILED error in this case.
+ */
+
+/**
+ * ServiceDeregistration message
+ * 
+ */
+public class ServiceDeregistration extends SLPMessage {
+
+	private List iScopeList;
+
+	private ServiceURL iURL;
+
+	private List iTagList;
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		return new ServiceDeregistration(pHdr, pInStr.readStringList(), pInStr.readURL(), pInStr
+				.readStringList());
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pURL
+	 * @param pTagList
+	 */
+	public ServiceDeregistration(List pScopeList, ServiceURL pURL, List pTagList) {
+		super(SRV_DEREG);
+		init(pScopeList, pURL, pTagList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pURL
+	 * @param pTagList
+	 */
+	public ServiceDeregistration(String pLangTag, List pScopeList, ServiceURL pURL,
+			List pTagList) {
+		super(SRV_DEREG, pLangTag);
+		init(pScopeList, pURL, pTagList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pURL
+	 * @param pTagList
+	 */
+	public ServiceDeregistration(MsgHeader pHeader, List pScopeList, ServiceURL pURL,
+			List pTagList) {
+		super(pHeader);
+		init(pScopeList, pURL, pTagList);
+	}
+
+	/**
+	 * getServiceURL
+	 * 
+	 * @return ServiceURL
+	 */
+	public ServiceURL getServiceURL() {
+		return this.iURL;
+	}
+
+	/**
+	 * @param pOption
+	 */
+	@Override
+	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
+		return pOutStr.writeStringList(this.iScopeList) && pOutStr.write(this.iURL)
+				&& pOutStr.writeStringList(this.iTagList);
+	}
+
+	private void init(List pScopeList, ServiceURL pURL, List pTagList) {
+		this.iScopeList = pScopeList;
+		this.iURL = pURL;
+		this.iTagList = pTagList;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceRegistration.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRegistration.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceRegistration.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRegistration.java
index 0a15908..db0e105 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceRegistration.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRegistration.java
@@ -1,197 +1,195 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationAttribute;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-
-/*
- * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
- * Location header (function = SrvReg = 3) |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
- *  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- * service type string |  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- *  |  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- * attr-list string |  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |# of
- * AttrAuths |(if present) Attribute Authentication Blocks...\
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-/**
- * ServiceRegistration message
- * 
- */
-public class ServiceRegistration extends SLPMessage {
-
-	private ServiceURL iServURL;
-
-	private List iScopeList;
-
-	private List iAttrList;
-
-	private List iAuthBlockList;
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		ServiceURL url = pInStr.readURL();
-		pInStr.readServiceType(); // FIXME reading dummy SrvType. Correct?
-		return new ServiceRegistration(pHdr, url, pInStr.readStringList(), pInStr
-				.readAttributeList(), pInStr.readAuthBlockList());
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pServURL
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 * @param pAuthBlockList
-	 */
-	public ServiceRegistration(ServiceURL pServURL, List pScopeList,
-			List pAttrList, List pAuthBlockList) {
-		super(SRV_REG);
-		init(pServURL, pScopeList, pAttrList, pAuthBlockList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pServURL
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 * @param pAuthBlockList
-	 */
-	public ServiceRegistration(String pLangTag, ServiceURL pServURL, List pScopeList,
-			List pAttrList, List pAuthBlockList) {
-		super(SRV_REG, pLangTag);
-		init(pServURL, pScopeList, pAttrList, pAuthBlockList);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pServURL
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pAttrList
-	 *            - list of ServiceLocationAttributes
-	 * @param pAuthBlockList
-	 */
-	public ServiceRegistration(MsgHeader pHeader, ServiceURL pServURL, List pScopeList,
-			List pAttrList, List pAuthBlockList) {
-		super(pHeader);
-		init(pServURL, pScopeList, pAttrList, pAuthBlockList);
-	}
-
-	/**
-	 * getServiceURL
-	 * 
-	 * @return ServiceURL
-	 */
-	public ServiceURL getServiceURL() {
-		return this.iServURL;
-	}
-
-	/**
-	 * getScopeList
-	 * 
-	 * @return List
-	 */
-	public List getScopeList() {
-		return this.iScopeList;
-	}
-
-	/**
-	 * getAttributeList
-	 * 
-	 * @return List
-	 */
-	public List getAttributeList() {
-		return this.iAttrList;
-	}
-
-	/**
-	 * @param pOption
-	 */
-	@Override
-	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write(this.iServURL) && pOutStr.write(this.iServURL.getServiceType())
-				&& pOutStr.writeStringList(this.iScopeList)
-				&& pOutStr.writeAttributeList(this.iAttrList)
-				&& pOutStr.writeAuthBlockList(this.iAuthBlockList);
-	}
-
-	private void init(ServiceURL pServURL, List pScopeList,
-			List pAttrList, List pAuthBlockList) {
-		this.iServURL = pServURL;
-		this.iScopeList = pScopeList;
-		this.iAttrList = pAttrList;
-		this.iAuthBlockList = pAuthBlockList;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
+ * Location header (function = SrvReg = 3) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
+ *  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ * service type string |  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ *  |  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ * attr-list string |  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |# of
+ * AttrAuths |(if present) Attribute Authentication Blocks...\
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+/**
+ * ServiceRegistration message
+ * 
+ */
+public class ServiceRegistration extends SLPMessage {
+
+	private ServiceURL iServURL;
+
+	private List iScopeList;
+
+	private List iAttrList;
+
+	private List iAuthBlockList;
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		ServiceURL url = pInStr.readURL();
+		pInStr.readServiceType(); // FIXME reading dummy SrvType. Correct?
+		return new ServiceRegistration(pHdr, url, pInStr.readStringList(), pInStr
+				.readAttributeList(), pInStr.readAuthBlockList());
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pServURL
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 * @param pAuthBlockList
+	 */
+	public ServiceRegistration(ServiceURL pServURL, List pScopeList,
+			List pAttrList, List pAuthBlockList) {
+		super(SRV_REG);
+		init(pServURL, pScopeList, pAttrList, pAuthBlockList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pServURL
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 * @param pAuthBlockList
+	 */
+	public ServiceRegistration(String pLangTag, ServiceURL pServURL, List pScopeList,
+			List pAttrList, List pAuthBlockList) {
+		super(SRV_REG, pLangTag);
+		init(pServURL, pScopeList, pAttrList, pAuthBlockList);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pServURL
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pAttrList
+	 *            - list of ServiceLocationAttributes
+	 * @param pAuthBlockList
+	 */
+	public ServiceRegistration(MsgHeader pHeader, ServiceURL pServURL, List pScopeList,
+			List pAttrList, List pAuthBlockList) {
+		super(pHeader);
+		init(pServURL, pScopeList, pAttrList, pAuthBlockList);
+	}
+
+	/**
+	 * getServiceURL
+	 * 
+	 * @return ServiceURL
+	 */
+	public ServiceURL getServiceURL() {
+		return this.iServURL;
+	}
+
+	/**
+	 * getScopeList
+	 * 
+	 * @return List
+	 */
+	public List getScopeList() {
+		return this.iScopeList;
+	}
+
+	/**
+	 * getAttributeList
+	 * 
+	 * @return List
+	 */
+	public List getAttributeList() {
+		return this.iAttrList;
+	}
+
+	/**
+	 * @param pOption
+	 */
+	@Override
+	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
+		return pOutStr.write(this.iServURL) && pOutStr.write(this.iServURL.getServiceType())
+				&& pOutStr.writeStringList(this.iScopeList)
+				&& pOutStr.writeAttributeList(this.iAttrList)
+				&& pOutStr.writeAuthBlockList(this.iAuthBlockList);
+	}
+
+	private void init(ServiceURL pServURL, List pScopeList,
+			List pAttrList, List pAuthBlockList) {
+		this.iServURL = pServURL;
+		this.iScopeList = pScopeList;
+		this.iAttrList = pAttrList;
+		this.iAuthBlockList = pAuthBlockList;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceReply.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceReply.java
similarity index 81%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceReply.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceReply.java
index 27a9903..0f1fedb 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceReply.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceReply.java
@@ -1,185 +1,183 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-
-/*
- * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
- * Location header (function = SrvRply = 2) |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Error
- * Code | URL Entry count |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |  ...  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-/**
- * ServiceReply message
- * 
- */
-public class ServiceReply extends ReplyMessage {
-
-	private List iURLEntries;
-
-	private List iURLExceptions;
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		int errorCode = pInStr.read16();
-		ArrayList urlExceptions = new ArrayList();
-		List urlEntries = pInStr.readUrlList(urlExceptions);
-		return new ServiceReply(pHdr, errorCode, urlEntries, urlExceptions);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pErrorCode
-	 * @param pURLEntries
-	 *            - list of ServiceURLs
-	 */
-	public ServiceReply(int pErrorCode, List pURLEntries) {
-		super(SRV_RPLY, pErrorCode);
-		this.iURLEntries = pURLEntries;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pErrorCode
-	 * @param pURLEntries
-	 *            - list of ServiceURLs
-	 * @param pURLExceptions
-	 *            - list of URL Exceptions
-	 */
-	public ServiceReply(String pLangTag, int pErrorCode, List pURLEntries,
-			List pURLExceptions) {
-		super(SRV_RPLY, pLangTag, pErrorCode);
-		this.iURLEntries = pURLEntries;
-		this.iURLExceptions = pURLExceptions;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pErrorCode
-	 * @param pURLEntries
-	 *            - list of ServiceURLs
-	 * @param pURLExceptions
-	 *            - list of URL Exceptions
-	 */
-	public ServiceReply(MsgHeader pHeader, int pErrorCode, List pURLEntries,
-			List pURLExceptions) {
-		super(pHeader, pErrorCode);
-		this.iURLEntries = pURLEntries;
-		this.iURLExceptions = pURLExceptions;
-	}
-
-	/**
-	 * getResultIterator
-	 * 
-	 * @return iterator of URL Exception list
-	 */
-	@Override
-	public Iterator getResultIterator() {
-		return this.iURLEntries == null ? null : this.iURLEntries.iterator();
-	}
-
-	/**
-	 * getExceptionIterator
-	 * 
-	 * @return iterator of URL Exception list
-	 */
-	@Override
-	public Iterator getExceptionIterator() {
-		return this.iURLExceptions == null ? null : this.iURLExceptions.iterator();
-	}
-
-	/**
-	 * getURLEntries
-	 * 
-	 * @return list of ServiceURLs
-	 */
-	public List getURLEntries() {
-		return this.iURLEntries;
-	}
-
-	/**
-	 * getURLExceptions
-	 * 
-	 * @return list of URL Exceptions
-	 */
-	public List getURLExceptions() {
-		return this.iURLExceptions;
-	}
-
-	/**
-	 * @param pOption
-	 */
-	@Override
-	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write16(getErrorCode()) && pOutStr.writeURLList(this.iURLEntries);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
+ * Location header (function = SrvRply = 2) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Error
+ * Code | URL Entry count |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |  ...  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+/**
+ * ServiceReply message
+ * 
+ */
+public class ServiceReply extends ReplyMessage {
+
+	private List iURLEntries;
+
+	private List iURLExceptions;
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		int errorCode = pInStr.read16();
+		ArrayList urlExceptions = new ArrayList();
+		List urlEntries = pInStr.readUrlList(urlExceptions);
+		return new ServiceReply(pHdr, errorCode, urlEntries, urlExceptions);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pErrorCode
+	 * @param pURLEntries
+	 *            - list of ServiceURLs
+	 */
+	public ServiceReply(int pErrorCode, List pURLEntries) {
+		super(SRV_RPLY, pErrorCode);
+		this.iURLEntries = pURLEntries;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pErrorCode
+	 * @param pURLEntries
+	 *            - list of ServiceURLs
+	 * @param pURLExceptions
+	 *            - list of URL Exceptions
+	 */
+	public ServiceReply(String pLangTag, int pErrorCode, List pURLEntries,
+			List pURLExceptions) {
+		super(SRV_RPLY, pLangTag, pErrorCode);
+		this.iURLEntries = pURLEntries;
+		this.iURLExceptions = pURLExceptions;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pErrorCode
+	 * @param pURLEntries
+	 *            - list of ServiceURLs
+	 * @param pURLExceptions
+	 *            - list of URL Exceptions
+	 */
+	public ServiceReply(MsgHeader pHeader, int pErrorCode, List pURLEntries,
+			List pURLExceptions) {
+		super(pHeader, pErrorCode);
+		this.iURLEntries = pURLEntries;
+		this.iURLExceptions = pURLExceptions;
+	}
+
+	/**
+	 * getResultIterator
+	 * 
+	 * @return iterator of URL Exception list
+	 */
+	@Override
+	public Iterator getResultIterator() {
+		return this.iURLEntries == null ? null : this.iURLEntries.iterator();
+	}
+
+	/**
+	 * getExceptionIterator
+	 * 
+	 * @return iterator of URL Exception list
+	 */
+	@Override
+	public Iterator getExceptionIterator() {
+		return this.iURLExceptions == null ? null : this.iURLExceptions.iterator();
+	}
+
+	/**
+	 * getURLEntries
+	 * 
+	 * @return list of ServiceURLs
+	 */
+	public List getURLEntries() {
+		return this.iURLEntries;
+	}
+
+	/**
+	 * getURLExceptions
+	 * 
+	 * @return list of URL Exceptions
+	 */
+	public List getURLExceptions() {
+		return this.iURLExceptions;
+	}
+
+	/**
+	 * @param pOption
+	 */
+	@Override
+	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
+		return pOutStr.write16(getErrorCode()) && pOutStr.writeURLList(this.iURLEntries);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceRequest.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRequest.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceRequest.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRequest.java
index 72649d1..ecae18e 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceRequest.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRequest.java
@@ -1,189 +1,187 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-15  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.List;
-import java.util.SortedSet;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceType;
-
-/*
- * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
- * Location header (function = SrvRqst = 1) |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- *  |  String \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- *  |  String \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- *  |  String \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- * predicate string | Service Request  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- *  string |  String \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-
-/*
- * The  string indicates a SLP SPI that the requester has been
- * configured with. If this string is omitted, the responder does not include
- * any Authentication Blocks in its reply. If it is included, the responder MUST
- * return a reply which has an associated authentication block with the SLP SPI
- * in the SrvRqst. If no replies may be returned because the SLP SPI is not
- * supported, the responder returns an AUTHENTICATION_UNKNOWN error.
- */
-
-/**
- * ServiceRequest message
- * 
- */
-public class ServiceRequest extends RequestMessage {
-
-	private ServiceType iServiceType;
-
-	private String iPredicate, iSlpSpi;
-
-	private static final int[] ALLOWED_RSPS = { SRV_RPLY, DA_ADVERT, SA_ADVERT };
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new ServiceRequest(pHdr, pInStr.readStringSet(), // prevResponders
-				pInStr.readServiceType(), // serviceType
-				pInStr.readStringList(), // scopeList
-				pInStr.readString(), // predicate
-				pInStr.readString() // SlpSpi
-		);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pServiceType
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pPredicate
-	 * @param pSlpSpi
-	 */
-	public ServiceRequest(String pLangTag, SortedSet pPrevResponderSet,
-			ServiceType pServiceType, List pScopeList, String pPredicate, String pSlpSpi) {
-		super(SRV_RQST, pLangTag, pPrevResponderSet, pScopeList);
-		init(pServiceType, pPredicate, pSlpSpi);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pServiceType
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pPredicate
-	 * @param pSlpSpi
-	 */
-	public ServiceRequest(SortedSet pPrevResponderSet, ServiceType pServiceType,
-			List pScopeList, String pPredicate, String pSlpSpi) {
-		super(SRV_RQST, pPrevResponderSet, pScopeList);
-		init(pServiceType, pPredicate, pSlpSpi);
-	}
-
-	/**
-	 * @param pHeader
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pServiceType
-	 * @param pScopeList
-	 *            - list of scope strings
-	 * @param pPredicate
-	 *            - LDAPv3 search filter
-	 * @param pSlpSpi
-	 */
-	public ServiceRequest(MsgHeader pHeader, SortedSet pPrevResponderSet,
-			ServiceType pServiceType, List pScopeList, String pPredicate, String pSlpSpi) {
-		super(pHeader, pPrevResponderSet, pScopeList);
-		init(pServiceType, pPredicate, pSlpSpi);
-	}
-
-	/**
-	 * getServiceType
-	 * 
-	 * @return ServiceType
-	 */
-	public ServiceType getServiceType() {
-		return this.iServiceType;
-	}
-
-	@Override
-	protected boolean serializeRequestBody(SLPOutputStream pOutStr) {
-		return pOutStr.write(this.iServiceType) && pOutStr.writeStringList(getScopeList())
-				&& pOutStr.write(this.iPredicate) && pOutStr.write(this.iSlpSpi);
-	}
-
-	@Override
-	protected int[] getAllowedResponseIDs() {
-		return ALLOWED_RSPS;
-	}
-
-	private void init(ServiceType pServiceType, String pPredicate, String pSlpSpi) {
-		this.iServiceType = pServiceType;
-		this.iPredicate = pPredicate;
-		this.iSlpSpi = pSlpSpi;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-15  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.List;
+import java.util.SortedSet;
+
+import org.metricshub.wbem.sblim.slp.ServiceType;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
+ * Location header (function = SrvRqst = 1) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ *  |  String \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ *  |  String \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ *  |  String \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ * predicate string | Service Request  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ *  string |  String \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+
+/*
+ * The  string indicates a SLP SPI that the requester has been
+ * configured with. If this string is omitted, the responder does not include
+ * any Authentication Blocks in its reply. If it is included, the responder MUST
+ * return a reply which has an associated authentication block with the SLP SPI
+ * in the SrvRqst. If no replies may be returned because the SLP SPI is not
+ * supported, the responder returns an AUTHENTICATION_UNKNOWN error.
+ */
+
+/**
+ * ServiceRequest message
+ * 
+ */
+public class ServiceRequest extends RequestMessage {
+
+	private ServiceType iServiceType;
+
+	private String iPredicate, iSlpSpi;
+
+	private static final int[] ALLOWED_RSPS = { SRV_RPLY, DA_ADVERT, SA_ADVERT };
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		return new ServiceRequest(pHdr, pInStr.readStringSet(), // prevResponders
+				pInStr.readServiceType(), // serviceType
+				pInStr.readStringList(), // scopeList
+				pInStr.readString(), // predicate
+				pInStr.readString() // SlpSpi
+		);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pServiceType
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pPredicate
+	 * @param pSlpSpi
+	 */
+	public ServiceRequest(String pLangTag, SortedSet pPrevResponderSet,
+			ServiceType pServiceType, List pScopeList, String pPredicate, String pSlpSpi) {
+		super(SRV_RQST, pLangTag, pPrevResponderSet, pScopeList);
+		init(pServiceType, pPredicate, pSlpSpi);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pServiceType
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pPredicate
+	 * @param pSlpSpi
+	 */
+	public ServiceRequest(SortedSet pPrevResponderSet, ServiceType pServiceType,
+			List pScopeList, String pPredicate, String pSlpSpi) {
+		super(SRV_RQST, pPrevResponderSet, pScopeList);
+		init(pServiceType, pPredicate, pSlpSpi);
+	}
+
+	/**
+	 * @param pHeader
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pServiceType
+	 * @param pScopeList
+	 *            - list of scope strings
+	 * @param pPredicate
+	 *            - LDAPv3 search filter
+	 * @param pSlpSpi
+	 */
+	public ServiceRequest(MsgHeader pHeader, SortedSet pPrevResponderSet,
+			ServiceType pServiceType, List pScopeList, String pPredicate, String pSlpSpi) {
+		super(pHeader, pPrevResponderSet, pScopeList);
+		init(pServiceType, pPredicate, pSlpSpi);
+	}
+
+	/**
+	 * getServiceType
+	 * 
+	 * @return ServiceType
+	 */
+	public ServiceType getServiceType() {
+		return this.iServiceType;
+	}
+
+	@Override
+	protected boolean serializeRequestBody(SLPOutputStream pOutStr) {
+		return pOutStr.write(this.iServiceType) && pOutStr.writeStringList(getScopeList())
+				&& pOutStr.write(this.iPredicate) && pOutStr.write(this.iSlpSpi);
+	}
+
+	@Override
+	protected int[] getAllowedResponseIDs() {
+		return ALLOWED_RSPS;
+	}
+
+	private void init(ServiceType pServiceType, String pPredicate, String pSlpSpi) {
+		this.iServiceType = pServiceType;
+		this.iPredicate = pPredicate;
+		this.iSlpSpi = pSlpSpi;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceTypeReply.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeReply.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceTypeReply.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeReply.java
index b46735e..7e03758 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceTypeReply.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeReply.java
@@ -1,144 +1,142 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceType;
-
-/*
- * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
- * Location header (function = SrvTypeRply = 10) |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Error
- * Code | length of  |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
- *  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-/**
- * ServiceTypeReply message
- * 
- */
-public class ServiceTypeReply extends ReplyMessage {
-
-	private List iServTypeList;
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new ServiceTypeReply(pHdr, pInStr.read16(), pInStr.readServTypeList());
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pErrorCode
-	 * @param pServTypeList
-	 *            - list of ServiceTypes
-	 */
-	public ServiceTypeReply(int pErrorCode, List pServTypeList) {
-		super(SRV_TYPE_RPLY, pErrorCode);
-		this.iServTypeList = pServTypeList;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pErrorCode
-	 * @param pServTypeList
-	 *            - list of ServiceTypes
-	 */
-	public ServiceTypeReply(String pLangTag, int pErrorCode, List pServTypeList) {
-		super(SRV_TYPE_RPLY, pLangTag, pErrorCode);
-		this.iServTypeList = pServTypeList;
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pErrorCode
-	 * @param pServTypeList
-	 *            - list of ServiceTypes
-	 */
-	public ServiceTypeReply(MsgHeader pHeader, int pErrorCode, List pServTypeList) {
-		super(pHeader, pErrorCode);
-		this.iServTypeList = pServTypeList;
-	}
-
-	@Override
-	public Iterator getResultIterator() {
-		return this.iServTypeList == null ? null : this.iServTypeList.iterator();
-	}
-
-	/**
-	 * @param pOption
-	 */
-	@Override
-	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write16(getErrorCode()) && pOutStr.writeServTypeList(getResultIterator());
-	}
-
-	@Override
-	public Iterator getExceptionIterator() {
-		// this message doesn't have exception table
-		return null;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.slp.ServiceType;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
+ * Location header (function = SrvTypeRply = 10) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Error
+ * Code | length of  |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |
+ *  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+/**
+ * ServiceTypeReply message
+ * 
+ */
+public class ServiceTypeReply extends ReplyMessage {
+
+	private List iServTypeList;
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		return new ServiceTypeReply(pHdr, pInStr.read16(), pInStr.readServTypeList());
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pErrorCode
+	 * @param pServTypeList
+	 *            - list of ServiceTypes
+	 */
+	public ServiceTypeReply(int pErrorCode, List pServTypeList) {
+		super(SRV_TYPE_RPLY, pErrorCode);
+		this.iServTypeList = pServTypeList;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pErrorCode
+	 * @param pServTypeList
+	 *            - list of ServiceTypes
+	 */
+	public ServiceTypeReply(String pLangTag, int pErrorCode, List pServTypeList) {
+		super(SRV_TYPE_RPLY, pLangTag, pErrorCode);
+		this.iServTypeList = pServTypeList;
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pErrorCode
+	 * @param pServTypeList
+	 *            - list of ServiceTypes
+	 */
+	public ServiceTypeReply(MsgHeader pHeader, int pErrorCode, List pServTypeList) {
+		super(pHeader, pErrorCode);
+		this.iServTypeList = pServTypeList;
+	}
+
+	@Override
+	public Iterator getResultIterator() {
+		return this.iServTypeList == null ? null : this.iServTypeList.iterator();
+	}
+
+	/**
+	 * @param pOption
+	 */
+	@Override
+	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
+		return pOutStr.write16(getErrorCode()) && pOutStr.writeServTypeList(getResultIterator());
+	}
+
+	@Override
+	public Iterator getExceptionIterator() {
+		// this message doesn't have exception table
+		return null;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java
index e23b01e..24bafc0 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java
@@ -1,153 +1,151 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-15  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.util.List;
-import java.util.SortedSet;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-
-/*
- * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
- * Location header (function = SrvTypeRqst = 9) |
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- * PRList |  String \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- * Naming Authority |  \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
- *  |  String \
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- */
-/**
- * ServiceTypeRequest message
- * 
- */
-public class ServiceTypeRequest extends RequestMessage {
-
-	private String iNamingAuth;
-
-	private static final int[] ALLOWED_RSPS = { SRV_TYPE_RPLY };
-
-	/**
-	 * parse
-	 * 
-	 * @param pHdr
-	 * @param pInStr
-	 * @return SLPMessage
-	 * @throws ServiceLocationException
-	 * @throws IOException
-	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new ServiceTypeRequest(pHdr, pInStr.readStringSet(), // prevResponderSet
-				pInStr.readString(), // naming authority
-				pInStr.readStringList() // scope list
-		);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pNamingAuth
-	 * @param pScopeList
-	 *            - set of scope strings
-	 */
-	public ServiceTypeRequest(SortedSet pPrevResponderSet, String pNamingAuth,
-			List pScopeList) {
-		super(SRV_TYPE_RQST, pPrevResponderSet, pScopeList);
-		init(pNamingAuth);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLangTag
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pNamingAuth
-	 * @param pScopeList
-	 *            - set of scope strings
-	 */
-	public ServiceTypeRequest(String pLangTag, SortedSet pPrevResponderSet,
-			String pNamingAuth, List pScopeList) {
-		super(SRV_TYPE_RQST, pLangTag, pPrevResponderSet, pScopeList);
-		init(pNamingAuth);
-	}
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pHeader
-	 * @param pPrevResponderSet
-	 *            - set of address strings
-	 * @param pNamingAuth
-	 * @param pScopeList
-	 *            - set of scope strings
-	 */
-	public ServiceTypeRequest(MsgHeader pHeader, SortedSet pPrevResponderSet,
-			String pNamingAuth, List pScopeList) {
-		super(pHeader, pPrevResponderSet, pScopeList);
-		init(pNamingAuth);
-	}
-
-	@Override
-	protected boolean serializeRequestBody(SLPOutputStream pOutStr) {
-		return pOutStr.write(this.iNamingAuth) && pOutStr.writeStringList(getScopeList());
-	}
-
-	@Override
-	protected int[] getAllowedResponseIDs() {
-		return ALLOWED_RSPS;
-	}
-
-	private void init(String pNamingAuth) {
-		this.iNamingAuth = pNamingAuth;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-15  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.util.List;
+import java.util.SortedSet;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/*
+ * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Service
+ * Location header (function = SrvTypeRqst = 9) |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ * PRList |  String \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ * Naming Authority |  \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | length of
+ *  |  String \
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+/**
+ * ServiceTypeRequest message
+ * 
+ */
+public class ServiceTypeRequest extends RequestMessage {
+
+	private String iNamingAuth;
+
+	private static final int[] ALLOWED_RSPS = { SRV_TYPE_RPLY };
+
+	/**
+	 * parse
+	 * 
+	 * @param pHdr
+	 * @param pInStr
+	 * @return SLPMessage
+	 * @throws ServiceLocationException
+	 * @throws IOException
+	 */
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
+			throws ServiceLocationException, IOException {
+		return new ServiceTypeRequest(pHdr, pInStr.readStringSet(), // prevResponderSet
+				pInStr.readString(), // naming authority
+				pInStr.readStringList() // scope list
+		);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pNamingAuth
+	 * @param pScopeList
+	 *            - set of scope strings
+	 */
+	public ServiceTypeRequest(SortedSet pPrevResponderSet, String pNamingAuth,
+			List pScopeList) {
+		super(SRV_TYPE_RQST, pPrevResponderSet, pScopeList);
+		init(pNamingAuth);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLangTag
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pNamingAuth
+	 * @param pScopeList
+	 *            - set of scope strings
+	 */
+	public ServiceTypeRequest(String pLangTag, SortedSet pPrevResponderSet,
+			String pNamingAuth, List pScopeList) {
+		super(SRV_TYPE_RQST, pLangTag, pPrevResponderSet, pScopeList);
+		init(pNamingAuth);
+	}
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pHeader
+	 * @param pPrevResponderSet
+	 *            - set of address strings
+	 * @param pNamingAuth
+	 * @param pScopeList
+	 *            - set of scope strings
+	 */
+	public ServiceTypeRequest(MsgHeader pHeader, SortedSet pPrevResponderSet,
+			String pNamingAuth, List pScopeList) {
+		super(pHeader, pPrevResponderSet, pScopeList);
+		init(pNamingAuth);
+	}
+
+	@Override
+	protected boolean serializeRequestBody(SLPOutputStream pOutStr) {
+		return pOutStr.write(this.iNamingAuth) && pOutStr.writeStringList(getScopeList());
+	}
+
+	@Override
+	protected int[] getAllowedResponseIDs() {
+		return ALLOWED_RSPS;
+	}
+
+	private void init(String pNamingAuth) {
+		this.iNamingAuth = pNamingAuth;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/Util.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/Util.java
similarity index 64%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/Util.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/Util.java
index 97b24cd..b2e4dd8 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/msg/Util.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/Util.java
@@ -1,66 +1,64 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.msg;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.Locale;
-
-/**
- * Common handful functions can be here.
- * 
- */
-public class Util {
-
-	/**
-	 * getLangTag
-	 * 
-	 * @param pLocale
-	 * @return String
-	 */
-	public static String getLangTag(Locale pLocale) {
-		if (pLocale == null) return null;
-		String country = pLocale.getCountry();
-		String lang = pLocale.getLanguage();
-		return (country != null && country.length() > 0) ? lang + "-" + country : lang;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.msg;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.Locale;
+
+/**
+ * Common handful functions can be here.
+ * 
+ */
+public class Util {
+
+	/**
+	 * getLangTag
+	 * 
+	 * @param pLocale
+	 * @return String
+	 */
+	public static String getLangTag(Locale pLocale) {
+		if (pLocale == null) return null;
+		String country = pLocale.getCountry();
+		String lang = pLocale.getLanguage();
+		return (country != null && country.length() > 0) ? lang + "-" + country : lang;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/package.html b/src/main/java/org/metricshub/wbem/sblim/slp/internal/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/package.html
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/DatagramThread.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/DatagramThread.java
similarity index 72%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/DatagramThread.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/DatagramThread.java
index b311dc7..991a426 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/DatagramThread.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/DatagramThread.java
@@ -1,124 +1,122 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
- 
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
- 
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
- 
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-13  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.sa;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
-import java.net.SocketTimeoutException;
-
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPConfig;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPDefaults;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-
-/**
- * DatagramThread
- * 
- */
-public class DatagramThread extends RecieverThread {
-
-	private static MulticastSocket cMCastSocket;
-
-	private DatagramPacket iPacket = new DatagramPacket(new byte[SLPDefaults.MTU], SLPDefaults.MTU);
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pSrvAgent
-	 */
-	public DatagramThread(ServiceAgent pSrvAgent) {
-		super("DatagramThread", pSrvAgent);
-	}
-
-	/**
-	 * joinGroup
-	 * 
-	 * @param pGroup
-	 * @throws IOException
-	 */
-	public synchronized void joinGroup(InetAddress pGroup) throws IOException {
-		TRC.debug("join:" + pGroup);
-		cMCastSocket.joinGroup(pGroup);
-	}
-
-	/**
-	 * leaveGroup
-	 * 
-	 * @param pGroup
-	 * @throws IOException
-	 */
-	public synchronized void leaveGroup(InetAddress pGroup) throws IOException {
-		TRC.debug("leave:" + pGroup);
-		cMCastSocket.leaveGroup(pGroup);
-	}
-
-	@Override
-	protected void init() throws IOException {
-		if (cMCastSocket == null) {
-			cMCastSocket = new MulticastSocket(SLPConfig.getGlobalCfg().getPort());
-			cMCastSocket.setReuseAddress(true);
-			cMCastSocket.setSoTimeout(100);
-		}
-	}
-
-	@Override
-	protected void mainLoop() throws IOException {
-		try {
-			cMCastSocket.receive(this.iPacket);
-			TRC.debug("Packet received");
-			this.iSrvAgent.processMessage(cMCastSocket, this.iPacket);
-		} catch (SocketTimeoutException e) {
-			// superclass will restart this function
-		}
-	}
-
-	@Override
-	protected void close() {
-		if (cMCastSocket == null) return;
-		cMCastSocket.close();
-		cMCastSocket = null;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+ 
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+ 
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+ 
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-13  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.sa;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.InetAddress;
+import java.net.MulticastSocket;
+import java.net.SocketTimeoutException;
+
+import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+
+/**
+ * DatagramThread
+ * 
+ */
+public class DatagramThread extends RecieverThread {
+
+	private static MulticastSocket cMCastSocket;
+
+	private DatagramPacket iPacket = new DatagramPacket(new byte[SLPDefaults.MTU], SLPDefaults.MTU);
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pSrvAgent
+	 */
+	public DatagramThread(ServiceAgent pSrvAgent) {
+		super("DatagramThread", pSrvAgent);
+	}
+
+	/**
+	 * joinGroup
+	 * 
+	 * @param pGroup
+	 * @throws IOException
+	 */
+	public synchronized void joinGroup(InetAddress pGroup) throws IOException {
+		TRC.debug("join:" + pGroup);
+		cMCastSocket.joinGroup(pGroup);
+	}
+
+	/**
+	 * leaveGroup
+	 * 
+	 * @param pGroup
+	 * @throws IOException
+	 */
+	public synchronized void leaveGroup(InetAddress pGroup) throws IOException {
+		TRC.debug("leave:" + pGroup);
+		cMCastSocket.leaveGroup(pGroup);
+	}
+
+	@Override
+	protected void init() throws IOException {
+		if (cMCastSocket == null) {
+			cMCastSocket = new MulticastSocket(SLPConfig.getGlobalCfg().getPort());
+			cMCastSocket.setReuseAddress(true);
+			cMCastSocket.setSoTimeout(100);
+		}
+	}
+
+	@Override
+	protected void mainLoop() throws IOException {
+		try {
+			cMCastSocket.receive(this.iPacket);
+			TRC.debug("Packet received");
+			this.iSrvAgent.processMessage(cMCastSocket, this.iPacket);
+		} catch (SocketTimeoutException e) {
+			// superclass will restart this function
+		}
+	}
+
+	@Override
+	protected void close() {
+		if (cMCastSocket == null) return;
+		cMCastSocket.close();
+		cMCastSocket = null;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/MessageTable.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/MessageTable.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/MessageTable.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/MessageTable.java
index 8e76db6..336e21a 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/MessageTable.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/MessageTable.java
@@ -1,256 +1,254 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2010
- 
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
- 
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
- 
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 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)
- * 2795671    2009-05-22  raman_arora  Add Type to Comparable 
- * 3023120    2010-07-01  blaschke-oss RequestDescriptor equals/compareTo issue
- * 3023349    2010-07-02  blaschke-oss SLP uses # constructor instead of valueOf
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.sa;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.InetAddress;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.RequestMessage;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.SLPMessage;
-
-/**
- * Keeps track of datagram messages. For requests with the same XID the same
- * responses should be returned.
- * 
- */
-public class MessageTable {
-
-	private static class RequestDescriptor implements Comparable {
-
-		private byte[] iSrcAddress;
-
-		private byte[] iRequest;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pSource
-		 * @param pRequest
-		 * @throws ServiceLocationException
-		 */
-		public RequestDescriptor(InetAddress pSource, SLPMessage pRequest)
-				throws ServiceLocationException {
-			this.iSrcAddress = pSource.getAddress();
-			this.iRequest = (pRequest instanceof RequestMessage) ? ((RequestMessage) pRequest)
-					.serializeWithoutResponders(false, true, true) : pRequest.serialize(false,
-					true, true);
-		}
-
-		public int compareTo(RequestDescriptor pObj) {
-			RequestDescriptor that = pObj;
-			int cmp = compare(this.iSrcAddress, that.iSrcAddress);
-			if (cmp != 0) return cmp;
-			return compare(this.iRequest, that.iRequest);
-		}
-
-		private static int compare(byte[] pBytes0, byte[] pBytes1) {
-			int len = Math.min(pBytes0.length, pBytes1.length);
-			for (int i = 0; i < len; i++) {
-				int cmp = pBytes0[i] & 0xff - pBytes1[i] & 0xff;
-				if (cmp != 0) return cmp;
-			}
-			return pBytes0.length - pBytes1.length;
-		}
-
-		@Override
-		public boolean equals(Object pObj) {
-			if (!(pObj instanceof RequestDescriptor)) return false;
-			RequestDescriptor that = (RequestDescriptor) pObj;
-			return compare(this.iSrcAddress, that.iSrcAddress) == 0
-					&& compare(this.iRequest, that.iRequest) == 0;
-		}
-
-		@Override
-		public int hashCode() {
-			return Arrays.hashCode(this.iSrcAddress) + Arrays.hashCode(this.iRequest);
-		}
-	}
-
-	private static class TableEntry {
-
-		private long iTime;
-
-		private RequestDescriptor iReqDesc;
-
-		private byte[] iResponse;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pTime
-		 * @param pReqKey
-		 * @param pResponse
-		 */
-		public TableEntry(long pTime, RequestDescriptor pReqKey, byte[] pResponse) {
-			this.iTime = pTime;
-			this.iReqDesc = pReqKey;
-			this.iResponse = pResponse;
-		}
-
-		/**
-		 * getTime
-		 * 
-		 * @return long
-		 */
-		public long getTime() {
-			return this.iTime;
-		}
-
-		/**
-		 * setTime
-		 * 
-		 * @param pTime
-		 */
-		public void setTime(long pTime) {
-			this.iTime = pTime;
-		}
-
-		/**
-		 * getRequestDescriptor
-		 * 
-		 * @return RequestDescriptor
-		 */
-		public RequestDescriptor getRequestDescriptor() {
-			return this.iReqDesc;
-		}
-
-		/**
-		 * getResponse
-		 * 
-		 * @return byte[]
-		 */
-		public byte[] getResponse() {
-			return this.iResponse;
-		}
-
-	}
-
-	/**
-	 * Remember messages for 30 seconds.
-	 */
-	private static final long KEEPIN = 30;
-
-	/**
-	 * Time -> TableEntry
-	 */
-	private SortedMap iTimeMap = new TreeMap();
-
-	/**
-	 * RequestKey -> TableEntry
-	 */
-	private SortedMap iReqMap = new TreeMap();
-
-	/**
-	 * getResponse
-	 * 
-	 * @param pSource
-	 * @param pRequest
-	 * @return byte[]
-	 * @throws ServiceLocationException
-	 */
-	public synchronized byte[] getResponse(InetAddress pSource, SLPMessage pRequest)
-			throws ServiceLocationException {
-		long now = getSecs();
-		RequestDescriptor reqDesc = new RequestDescriptor(pSource, pRequest);
-		TableEntry entry = this.iReqMap.get(reqDesc);
-		if (entry == null) return null;
-		clean();
-		updateTime(entry, now);
-		return entry.getResponse();
-	}
-
-	/**
-	 * addResponse
-	 * 
-	 * @param pSource
-	 * @param pRequest
-	 * @param pRespond
-	 * @throws ServiceLocationException
-	 */
-	public synchronized void addResponse(InetAddress pSource, SLPMessage pRequest, byte[] pRespond)
-			throws ServiceLocationException {
-		insert(new TableEntry(getSecs(), new RequestDescriptor(pSource, pRequest), pRespond));
-		clean();
-	}
-
-	private void clean() {
-		long now = getSecs();
-		Long timeStamp;
-		while ((timeStamp = this.iTimeMap.firstKey()) != null) {
-			if (now - timeStamp.longValue() < KEEPIN) break;
-			TableEntry entry = this.iTimeMap.get(timeStamp);
-			remove(entry);
-		}
-	}
-
-	private void insert(TableEntry pEntry) {
-		this.iTimeMap.put(Long.valueOf(pEntry.getTime()), pEntry);
-		this.iReqMap.put(pEntry.getRequestDescriptor(), pEntry);
-	}
-
-	private void remove(TableEntry pEntry) {
-		this.iTimeMap.remove(Long.valueOf(pEntry.getTime()));
-		this.iReqMap.remove(pEntry.getRequestDescriptor());
-	}
-
-	private void updateTime(TableEntry pEntry, long pTime) {
-		remove(pEntry);
-		pEntry.setTime(pTime);
-		insert(pEntry);
-	}
-
-	private static long getSecs() {
-		return new Date().getTime() / 1000;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2010
+ 
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+ 
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+ 
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 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)
+ * 2795671    2009-05-22  raman_arora  Add Type to Comparable 
+ * 3023120    2010-07-01  blaschke-oss RequestDescriptor equals/compareTo issue
+ * 3023349    2010-07-02  blaschke-oss SLP uses # constructor instead of valueOf
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.sa;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.InetAddress;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
+import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/**
+ * Keeps track of datagram messages. For requests with the same XID the same
+ * responses should be returned.
+ * 
+ */
+public class MessageTable {
+
+	private static class RequestDescriptor implements Comparable {
+
+		private byte[] iSrcAddress;
+
+		private byte[] iRequest;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pSource
+		 * @param pRequest
+		 * @throws ServiceLocationException
+		 */
+		public RequestDescriptor(InetAddress pSource, SLPMessage pRequest)
+				throws ServiceLocationException {
+			this.iSrcAddress = pSource.getAddress();
+			this.iRequest = (pRequest instanceof RequestMessage) ? ((RequestMessage) pRequest)
+					.serializeWithoutResponders(false, true, true) : pRequest.serialize(false,
+					true, true);
+		}
+
+		public int compareTo(RequestDescriptor pObj) {
+			RequestDescriptor that = pObj;
+			int cmp = compare(this.iSrcAddress, that.iSrcAddress);
+			if (cmp != 0) return cmp;
+			return compare(this.iRequest, that.iRequest);
+		}
+
+		private static int compare(byte[] pBytes0, byte[] pBytes1) {
+			int len = Math.min(pBytes0.length, pBytes1.length);
+			for (int i = 0; i < len; i++) {
+				int cmp = pBytes0[i] & 0xff - pBytes1[i] & 0xff;
+				if (cmp != 0) return cmp;
+			}
+			return pBytes0.length - pBytes1.length;
+		}
+
+		@Override
+		public boolean equals(Object pObj) {
+			if (!(pObj instanceof RequestDescriptor)) return false;
+			RequestDescriptor that = (RequestDescriptor) pObj;
+			return compare(this.iSrcAddress, that.iSrcAddress) == 0
+					&& compare(this.iRequest, that.iRequest) == 0;
+		}
+
+		@Override
+		public int hashCode() {
+			return Arrays.hashCode(this.iSrcAddress) + Arrays.hashCode(this.iRequest);
+		}
+	}
+
+	private static class TableEntry {
+
+		private long iTime;
+
+		private RequestDescriptor iReqDesc;
+
+		private byte[] iResponse;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pTime
+		 * @param pReqKey
+		 * @param pResponse
+		 */
+		public TableEntry(long pTime, RequestDescriptor pReqKey, byte[] pResponse) {
+			this.iTime = pTime;
+			this.iReqDesc = pReqKey;
+			this.iResponse = pResponse;
+		}
+
+		/**
+		 * getTime
+		 * 
+		 * @return long
+		 */
+		public long getTime() {
+			return this.iTime;
+		}
+
+		/**
+		 * setTime
+		 * 
+		 * @param pTime
+		 */
+		public void setTime(long pTime) {
+			this.iTime = pTime;
+		}
+
+		/**
+		 * getRequestDescriptor
+		 * 
+		 * @return RequestDescriptor
+		 */
+		public RequestDescriptor getRequestDescriptor() {
+			return this.iReqDesc;
+		}
+
+		/**
+		 * getResponse
+		 * 
+		 * @return byte[]
+		 */
+		public byte[] getResponse() {
+			return this.iResponse;
+		}
+
+	}
+
+	/**
+	 * Remember messages for 30 seconds.
+	 */
+	private static final long KEEPIN = 30;
+
+	/**
+	 * Time -> TableEntry
+	 */
+	private SortedMap iTimeMap = new TreeMap();
+
+	/**
+	 * RequestKey -> TableEntry
+	 */
+	private SortedMap iReqMap = new TreeMap();
+
+	/**
+	 * getResponse
+	 * 
+	 * @param pSource
+	 * @param pRequest
+	 * @return byte[]
+	 * @throws ServiceLocationException
+	 */
+	public synchronized byte[] getResponse(InetAddress pSource, SLPMessage pRequest)
+			throws ServiceLocationException {
+		long now = getSecs();
+		RequestDescriptor reqDesc = new RequestDescriptor(pSource, pRequest);
+		TableEntry entry = this.iReqMap.get(reqDesc);
+		if (entry == null) return null;
+		clean();
+		updateTime(entry, now);
+		return entry.getResponse();
+	}
+
+	/**
+	 * addResponse
+	 * 
+	 * @param pSource
+	 * @param pRequest
+	 * @param pRespond
+	 * @throws ServiceLocationException
+	 */
+	public synchronized void addResponse(InetAddress pSource, SLPMessage pRequest, byte[] pRespond)
+			throws ServiceLocationException {
+		insert(new TableEntry(getSecs(), new RequestDescriptor(pSource, pRequest), pRespond));
+		clean();
+	}
+
+	private void clean() {
+		long now = getSecs();
+		Long timeStamp;
+		while ((timeStamp = this.iTimeMap.firstKey()) != null) {
+			if (now - timeStamp.longValue() < KEEPIN) break;
+			TableEntry entry = this.iTimeMap.get(timeStamp);
+			remove(entry);
+		}
+	}
+
+	private void insert(TableEntry pEntry) {
+		this.iTimeMap.put(Long.valueOf(pEntry.getTime()), pEntry);
+		this.iReqMap.put(pEntry.getRequestDescriptor(), pEntry);
+	}
+
+	private void remove(TableEntry pEntry) {
+		this.iTimeMap.remove(Long.valueOf(pEntry.getTime()));
+		this.iReqMap.remove(pEntry.getRequestDescriptor());
+	}
+
+	private void updateTime(TableEntry pEntry, long pTime) {
+		remove(pEntry);
+		pEntry.setTime(pTime);
+		insert(pEntry);
+	}
+
+	private static long getSecs() {
+		return new Date().getTime() / 1000;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/RecieverThread.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/RecieverThread.java
similarity index 74%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/RecieverThread.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/RecieverThread.java
index 561444d..371c4f4 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/RecieverThread.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/RecieverThread.java
@@ -1,177 +1,175 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
- 
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
- 
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
- 
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.sa;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-
-/**
- * RecieverThread
- * 
- */
-public abstract class RecieverThread implements Runnable {
-
-	private Thread iThread;
-
-	private volatile boolean iStop;
-
-	private boolean iInited;
-
-	private Object iInitLock = new Object();
-
-	protected ServiceAgent iSrvAgent;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pName
-	 * @param pSrvAgent
-	 */
-	public RecieverThread(String pName, ServiceAgent pSrvAgent) {
-		this.iThread = new Thread(this, pName);
-		this.iSrvAgent = pSrvAgent;
-	}
-
-	/**
-	 * start
-	 */
-	public void start() {
-		this.iThread.start();
-	}
-
-	/**
-	 * wait4init
-	 */
-	public void wait4init() {
-		synchronized (this.iInitLock) {
-			try {
-				if (this.iInited) return;
-				this.iInitLock.wait();
-				return;
-			} catch (InterruptedException e) {
-				TRC.error(e);
-			}
-		}
-	}
-
-	/**
-	 * stop
-	 */
-	public void stop() {
-		stop(true);
-	}
-
-	/**
-	 * stop
-	 * 
-	 * @param pWait
-	 */
-	public void stop(boolean pWait) {
-		this.iStop = true;
-		if (pWait) join();
-	}
-
-	public void run() {
-		// 1st init
-		synchronized (this.iInitLock) {
-			TRC.debug("initing");
-			initialize();
-			this.iInited = true;
-			TRC.debug("inited");
-			try {
-				this.iInitLock.notifyAll();
-			} catch (IllegalMonitorStateException e) {
-				TRC.error(e);
-			}
-		}
-		while (!this.iStop) {
-			try {
-				mainLoop();
-			} catch (Exception e) {
-				TRC.error(e);
-				sleep(100);
-				initialize();
-			}
-		}
-		close();
-		this.iStop = false;
-		TRC.debug("STOPPED");
-	}
-
-	// exception of init shoud be reachable for ServiceTable
-
-	protected abstract void init() throws ServiceLocationException, IOException;
-
-	protected abstract void mainLoop() throws IOException;
-
-	protected abstract void close();
-
-	private void join() {
-		try {
-			this.iThread.join();
-		} catch (InterruptedException e) {
-			TRC.error(e);
-		}
-	}
-
-	private void initialize() {
-		try {
-			init();
-		} catch (ServiceLocationException e) {
-			TRC.error(e);
-		} catch (IOException e) {
-			TRC.error(e);
-		}
-	}
-
-	private static void sleep(int pMillis) {
-		try {
-			Thread.sleep(pMillis);
-		} catch (InterruptedException e) {
-			TRC.error(e);
-		}
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+ 
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+ 
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+ 
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.sa;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/**
+ * RecieverThread
+ * 
+ */
+public abstract class RecieverThread implements Runnable {
+
+	private Thread iThread;
+
+	private volatile boolean iStop;
+
+	private boolean iInited;
+
+	private Object iInitLock = new Object();
+
+	protected ServiceAgent iSrvAgent;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pName
+	 * @param pSrvAgent
+	 */
+	public RecieverThread(String pName, ServiceAgent pSrvAgent) {
+		this.iThread = new Thread(this, pName);
+		this.iSrvAgent = pSrvAgent;
+	}
+
+	/**
+	 * start
+	 */
+	public void start() {
+		this.iThread.start();
+	}
+
+	/**
+	 * wait4init
+	 */
+	public void wait4init() {
+		synchronized (this.iInitLock) {
+			try {
+				if (this.iInited) return;
+				this.iInitLock.wait();
+				return;
+			} catch (InterruptedException e) {
+				TRC.error(e);
+			}
+		}
+	}
+
+	/**
+	 * stop
+	 */
+	public void stop() {
+		stop(true);
+	}
+
+	/**
+	 * stop
+	 * 
+	 * @param pWait
+	 */
+	public void stop(boolean pWait) {
+		this.iStop = true;
+		if (pWait) join();
+	}
+
+	public void run() {
+		// 1st init
+		synchronized (this.iInitLock) {
+			TRC.debug("initing");
+			initialize();
+			this.iInited = true;
+			TRC.debug("inited");
+			try {
+				this.iInitLock.notifyAll();
+			} catch (IllegalMonitorStateException e) {
+				TRC.error(e);
+			}
+		}
+		while (!this.iStop) {
+			try {
+				mainLoop();
+			} catch (Exception e) {
+				TRC.error(e);
+				sleep(100);
+				initialize();
+			}
+		}
+		close();
+		this.iStop = false;
+		TRC.debug("STOPPED");
+	}
+
+	// exception of init shoud be reachable for ServiceTable
+
+	protected abstract void init() throws ServiceLocationException, IOException;
+
+	protected abstract void mainLoop() throws IOException;
+
+	protected abstract void close();
+
+	private void join() {
+		try {
+			this.iThread.join();
+		} catch (InterruptedException e) {
+			TRC.error(e);
+		}
+	}
+
+	private void initialize() {
+		try {
+			init();
+		} catch (ServiceLocationException e) {
+			TRC.error(e);
+		} catch (IOException e) {
+			TRC.error(e);
+		}
+	}
+
+	private static void sleep(int pMillis) {
+		try {
+			Thread.sleep(pMillis);
+		} catch (InterruptedException e) {
+			TRC.error(e);
+		}
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/ServiceAgent.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceAgent.java
similarity index 78%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/ServiceAgent.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceAgent.java
index bae0455..068c4b3 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/ServiceAgent.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceAgent.java
@@ -1,363 +1,361 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
- 
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
- 
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
- 
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1804402    2007-11-10  ebak         IPv6 ready SLP - revision 4
- * 1892103    2008-02-15  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.sa;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-import org.sentrysoftware.wbem.sblim.slp.internal.IPv6MulticastAddressFactory;
-import org.sentrysoftware.wbem.sblim.slp.internal.Net;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPConfig;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPDefaults;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.AttributeReply;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.AttributeRequest;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.FunctionIDs;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.MsgFactory;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ReplyMessage;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.RequestMessage;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.SLPMessage;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceAcknowledgment;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceDeregistration;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceRegistration;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceReply;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceRequest;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceTypeReply;
-
-/**
- * ServiceAgent
- * 
- */
-public class ServiceAgent implements FunctionIDs {
-
-	private boolean iUseV4 = Net.hasIPv4() && SLPConfig.getGlobalCfg().useIPv4(), iUseV6 = Net
-			.hasIPv6()
-			&& SLPConfig.getGlobalCfg().useIPv6();
-
-	boolean iStarted;
-
-	private volatile boolean iSkipFirstRequest;
-
-	private DatagramThread iDGThread = new DatagramThread(this);
-
-	private TCPThread iTCPThread = new TCPThread(this);
-
-	private ServiceTable iSrvTable = new ServiceTable(this.iDGThread);
-
-	private MessageTable iMsgTable = new MessageTable();
-
-	/**
-	 * main
-	 * 
-	 * @param pArgs
-	 * @throws IOException
-	 */
-	public static void main(String[] pArgs) throws IOException {
-		if (pArgs != null && pArgs.length >= 1) {
-			int port = Integer.parseInt(pArgs[0]);
-			SLPConfig.getGlobalCfg().setPort(port);
-		}
-		ServiceAgent srvAgent = new ServiceAgent();
-		srvAgent.start();
-		TRC.debug("starting idle loop");
-		while (true) {
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {
-				// lofasz
-			}
-		}
-	}
-
-	/**
-	 * setSkipFirstRequest
-	 * 
-	 * @param pValue
-	 */
-	public void setSkipFirstRequest(boolean pValue) {
-		this.iSkipFirstRequest = pValue;
-	}
-
-	/**
-	 * start
-	 * 
-	 * @throws IOException
-	 */
-	public void start() throws IOException {
-		if (this.iStarted) return;
-		// launch receivers
-		TRC.debug("start receivers");
-		if (this.iUseV4 || this.iUseV6) {
-			this.iTCPThread.start();
-			this.iDGThread.start();
-			TRC.debug("wait4 TCP init");
-			this.iTCPThread.wait4init();
-			TRC.debug("wait4 Datagram init");
-			this.iDGThread.wait4init();
-		}
-		this.iStarted = true;
-		TRC.debug("receivers started");
-		// join multicast groups
-		if (this.iUseV4) this.iDGThread.joinGroup(SLPConfig.getMulticastAddress());
-		if (this.iUseV6) {
-			this.iDGThread.joinGroup(IPv6MulticastAddressFactory
-					.getSrvLocAddress(SLPDefaults.IPV6_MULTICAST_SCOPE));
-		}
-	}
-
-	/**
-	 * stop
-	 */
-	public void stop() {
-		// stop the receivers
-		if (this.iUseV4 || this.iUseV6) {
-			this.iTCPThread.stop();
-			this.iDGThread.stop();
-		}
-		this.iStarted = false;
-
-	}
-
-	/**
-	 * processMessage
-	 * 
-	 * @param pDGSock
-	 * @param pPacket
-	 */
-	public void processMessage(DatagramSocket pDGSock, DatagramPacket pPacket) {
-		byte[] reply;
-		SLPMessage msg;
-		try {
-			msg = MsgFactory.parse(pPacket);
-		} catch (Exception e) {
-			// no response for unparseable messages
-			TRC.debug("Message parsing error!", e);
-			return;
-		}
-
-		try {
-			TRC.debug("processing: " + msg);
-			reply = this.iMsgTable.getResponse(pPacket.getAddress(), msg);
-			if (reply == null) {
-				SLPMessage replyMsg = makeReply(msg);
-				if (replyMsg != null) {
-					TRC.debug("response : " + replyMsg);
-					reply = replyMsg.serialize(false, true, true);
-					this.iMsgTable.addResponse(pPacket.getAddress(), msg, reply);
-					// debugging: do not reply to the first request
-					if (this.iSkipFirstRequest) {
-						TRC.debug("refusing response");
-						return;
-					}
-				}
-			} else {
-				TRC.debug("cached response");
-			}
-		} catch (ServiceLocationException e) {
-			TRC.debug(e.toString(), e);
-			reply = makeErrorReply(msg, e); // known XID
-		}
-		if (reply != null) {
-			try {
-				TRC.debug("sending response");
-				pDGSock.send(new DatagramPacket(reply, reply.length, pPacket.getAddress(), pPacket
-						.getPort()));
-			} catch (IOException e) {
-				TRC.error(e);
-			}
-		}
-	}
-
-	/**
-	 * processMessage
-	 * 
-	 * @param pStreamSock
-	 */
-	public void processMessage(Socket pStreamSock) {
-		byte[] reply;
-		SLPMessage msg;
-		try {
-			msg = MsgFactory.parse(pStreamSock.getInputStream());
-		} catch (Exception e) {
-			// no response for unparseable messages
-			TRC.debug("Message parsing error!", e);
-			return;
-		}
-		try {
-			SLPMessage replyMsg = makeReply(msg);
-			reply = replyMsg == null ? null : replyMsg.serialize(false, false, true);
-		} catch (ServiceLocationException e) {
-			reply = makeErrorReply(msg, e);
-		}
-		if (reply != null) {
-			try {
-				OutputStream os = pStreamSock.getOutputStream();
-				os.write(reply);
-				os.flush();
-			} catch (IOException e) {
-				TRC.error(e);
-			}
-		}
-		try {
-			pStreamSock.close();
-		} catch (IOException e) {
-			TRC.error(e);
-		}
-	}
-
-	/*
-	 * XID is set to a unique value for each unique request. If the request is
-	 * retransmitted, the same XID is used. Replies set the XID to the same
-	 * value as the xid in the request. Only unsolicited DAAdverts are sent with
-	 * an XID of 0.
-	 */
-	private SLPMessage makeReply(SLPMessage pRequest) throws ServiceLocationException {
-		try {
-			SLPMessage msg = pRequest instanceof RequestMessage ? makeReply4Request((RequestMessage) pRequest)
-					: makeReply4Others(pRequest);
-			if (msg != null) msg.setXID(pRequest.getXID());
-			return msg;
-		} catch (UnknownHostException e) {
-			TRC.error(e);
-			throw new ServiceLocationException(ServiceLocationException.NETWORK_ERROR);
-		} catch (IOException e) {
-			TRC.error(e);
-			throw new ServiceLocationException(ServiceLocationException.NETWORK_ERROR);
-		}
-
-	}
-
-	private ReplyMessage makeReply4Request(RequestMessage pRequest) {
-		ReplyMessage replyMsg;
-		List scopes = pRequest.getScopeList();
-		switch (pRequest.getFunctionID()) {
-			case SRV_RQST:
-				ServiceRequest srvRqst = (ServiceRequest) pRequest;
-				if (SLPDefaults.DA_SERVICE_TYPE.equals(srvRqst.getServiceType())) return null;
-				List urlList = this.iSrvTable.getServiceURLs(srvRqst.getServiceType(),
-						scopes);
-				TRC.debug("srvReply : " + urlList);
-				replyMsg = new ServiceReply(0, urlList);
-				break;
-			case ATTR_RQST:
-				AttributeRequest attrRqst = (AttributeRequest) pRequest;
-				replyMsg = new AttributeReply(0, this.iSrvTable.getAttributes(attrRqst
-						.getServiceURL(), scopes));
-				break;
-			case SRV_TYPE_RQST:
-				// ServiceTypeRequest srvTypeRqst =
-				// (ServiceTypeRequest)pRequest;
-				replyMsg = new ServiceTypeReply(0, this.iSrvTable.getServiceTypes(scopes));
-				break;
-			default:
-				return null;
-		}
-		return replyMsg;
-	}
-
-	private SLPMessage makeReply4Others(SLPMessage pRequest) throws IOException {
-		switch (pRequest.getFunctionID()) {
-			case SRV_REG:
-				ServiceRegistration srvReg = (ServiceRegistration) pRequest;
-				this.iSrvTable.add(srvReg.getServiceURL(), srvReg.getAttributeList(), srvReg
-						.getScopeList());
-				return new ServiceAcknowledgment(0);
-			case SRV_DEREG:
-				ServiceDeregistration srvDereg = (ServiceDeregistration) pRequest;
-				this.iSrvTable.remove(srvDereg.getServiceURL());
-				return new ServiceAcknowledgment(0);
-			default:
-				// FIXME maybe returning an error message is better
-				return null;
-		}
-	}
-
-	private static byte[] makeErrorReply(SLPMessage pRequest, ServiceLocationException pE) {
-		return makeErrorReply(pRequest, pE.getErrorCode());
-	}
-
-	/*
-	 * Error reply: SRV_REG, SRV_DEREG -> SRV_ACK SRV_RQST -> SRV_RSP ATTR_RQST
-	 * -> ATTR_RPLY SRV_TYPE_RQST -> SRV_TYPE_RPLY
-	 */
-
-	private static byte[] makeErrorReply(SLPMessage pRequest, int pErrorCode) {
-		ReplyMessage replyMsg;
-		switch (pRequest.getFunctionID()) {
-			case SRV_RQST:
-				replyMsg = new ServiceReply(pErrorCode, null);
-				break;
-			case ATTR_RQST:
-				replyMsg = new AttributeReply(pErrorCode, null);
-				break;
-			case SRV_TYPE_RQST:
-				replyMsg = new ServiceTypeReply(pErrorCode, null);
-				break;
-			case SRV_REG:
-			case SRV_DEREG:
-				replyMsg = new ServiceAcknowledgment(pErrorCode);
-				break;
-			default:
-				return null;
-		}
-		replyMsg.setXID(pRequest.getXID());
-		try {
-			return replyMsg.serialize(false, true, true);
-		} catch (ServiceLocationException se) {
-			TRC.error(se);
-			return null;
-		}
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+ 
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+ 
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+ 
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1804402    2007-11-10  ebak         IPv6 ready SLP - revision 4
+ * 1892103    2008-02-15  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.sa;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.internal.IPv6MulticastAddressFactory;
+import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+import org.metricshub.wbem.sblim.slp.internal.msg.AttributeReply;
+import org.metricshub.wbem.sblim.slp.internal.msg.AttributeRequest;
+import org.metricshub.wbem.sblim.slp.internal.msg.MsgFactory;
+import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
+import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceAcknowledgment;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceDeregistration;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRegistration;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceReply;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRequest;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceTypeReply;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.internal.Net;
+import org.metricshub.wbem.sblim.slp.internal.msg.FunctionIDs;
+import org.metricshub.wbem.sblim.slp.internal.msg.ReplyMessage;
+
+/**
+ * ServiceAgent
+ * 
+ */
+public class ServiceAgent implements FunctionIDs {
+
+	private boolean iUseV4 = Net.hasIPv4() && SLPConfig.getGlobalCfg().useIPv4(), iUseV6 = Net
+			.hasIPv6()
+			&& SLPConfig.getGlobalCfg().useIPv6();
+
+	boolean iStarted;
+
+	private volatile boolean iSkipFirstRequest;
+
+	private DatagramThread iDGThread = new DatagramThread(this);
+
+	private TCPThread iTCPThread = new TCPThread(this);
+
+	private ServiceTable iSrvTable = new ServiceTable(this.iDGThread);
+
+	private MessageTable iMsgTable = new MessageTable();
+
+	/**
+	 * main
+	 * 
+	 * @param pArgs
+	 * @throws IOException
+	 */
+	public static void main(String[] pArgs) throws IOException {
+		if (pArgs != null && pArgs.length >= 1) {
+			int port = Integer.parseInt(pArgs[0]);
+			SLPConfig.getGlobalCfg().setPort(port);
+		}
+		ServiceAgent srvAgent = new ServiceAgent();
+		srvAgent.start();
+		TRC.debug("starting idle loop");
+		while (true) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+				// lofasz
+			}
+		}
+	}
+
+	/**
+	 * setSkipFirstRequest
+	 * 
+	 * @param pValue
+	 */
+	public void setSkipFirstRequest(boolean pValue) {
+		this.iSkipFirstRequest = pValue;
+	}
+
+	/**
+	 * start
+	 * 
+	 * @throws IOException
+	 */
+	public void start() throws IOException {
+		if (this.iStarted) return;
+		// launch receivers
+		TRC.debug("start receivers");
+		if (this.iUseV4 || this.iUseV6) {
+			this.iTCPThread.start();
+			this.iDGThread.start();
+			TRC.debug("wait4 TCP init");
+			this.iTCPThread.wait4init();
+			TRC.debug("wait4 Datagram init");
+			this.iDGThread.wait4init();
+		}
+		this.iStarted = true;
+		TRC.debug("receivers started");
+		// join multicast groups
+		if (this.iUseV4) this.iDGThread.joinGroup(SLPConfig.getMulticastAddress());
+		if (this.iUseV6) {
+			this.iDGThread.joinGroup(IPv6MulticastAddressFactory
+					.getSrvLocAddress(SLPDefaults.IPV6_MULTICAST_SCOPE));
+		}
+	}
+
+	/**
+	 * stop
+	 */
+	public void stop() {
+		// stop the receivers
+		if (this.iUseV4 || this.iUseV6) {
+			this.iTCPThread.stop();
+			this.iDGThread.stop();
+		}
+		this.iStarted = false;
+
+	}
+
+	/**
+	 * processMessage
+	 * 
+	 * @param pDGSock
+	 * @param pPacket
+	 */
+	public void processMessage(DatagramSocket pDGSock, DatagramPacket pPacket) {
+		byte[] reply;
+		SLPMessage msg;
+		try {
+			msg = MsgFactory.parse(pPacket);
+		} catch (Exception e) {
+			// no response for unparseable messages
+			TRC.debug("Message parsing error!", e);
+			return;
+		}
+
+		try {
+			TRC.debug("processing: " + msg);
+			reply = this.iMsgTable.getResponse(pPacket.getAddress(), msg);
+			if (reply == null) {
+				SLPMessage replyMsg = makeReply(msg);
+				if (replyMsg != null) {
+					TRC.debug("response : " + replyMsg);
+					reply = replyMsg.serialize(false, true, true);
+					this.iMsgTable.addResponse(pPacket.getAddress(), msg, reply);
+					// debugging: do not reply to the first request
+					if (this.iSkipFirstRequest) {
+						TRC.debug("refusing response");
+						return;
+					}
+				}
+			} else {
+				TRC.debug("cached response");
+			}
+		} catch (ServiceLocationException e) {
+			TRC.debug(e.toString(), e);
+			reply = makeErrorReply(msg, e); // known XID
+		}
+		if (reply != null) {
+			try {
+				TRC.debug("sending response");
+				pDGSock.send(new DatagramPacket(reply, reply.length, pPacket.getAddress(), pPacket
+						.getPort()));
+			} catch (IOException e) {
+				TRC.error(e);
+			}
+		}
+	}
+
+	/**
+	 * processMessage
+	 * 
+	 * @param pStreamSock
+	 */
+	public void processMessage(Socket pStreamSock) {
+		byte[] reply;
+		SLPMessage msg;
+		try {
+			msg = MsgFactory.parse(pStreamSock.getInputStream());
+		} catch (Exception e) {
+			// no response for unparseable messages
+			TRC.debug("Message parsing error!", e);
+			return;
+		}
+		try {
+			SLPMessage replyMsg = makeReply(msg);
+			reply = replyMsg == null ? null : replyMsg.serialize(false, false, true);
+		} catch (ServiceLocationException e) {
+			reply = makeErrorReply(msg, e);
+		}
+		if (reply != null) {
+			try {
+				OutputStream os = pStreamSock.getOutputStream();
+				os.write(reply);
+				os.flush();
+			} catch (IOException e) {
+				TRC.error(e);
+			}
+		}
+		try {
+			pStreamSock.close();
+		} catch (IOException e) {
+			TRC.error(e);
+		}
+	}
+
+	/*
+	 * XID is set to a unique value for each unique request. If the request is
+	 * retransmitted, the same XID is used. Replies set the XID to the same
+	 * value as the xid in the request. Only unsolicited DAAdverts are sent with
+	 * an XID of 0.
+	 */
+	private SLPMessage makeReply(SLPMessage pRequest) throws ServiceLocationException {
+		try {
+			SLPMessage msg = pRequest instanceof RequestMessage ? makeReply4Request((RequestMessage) pRequest)
+					: makeReply4Others(pRequest);
+			if (msg != null) msg.setXID(pRequest.getXID());
+			return msg;
+		} catch (UnknownHostException e) {
+			TRC.error(e);
+			throw new ServiceLocationException(ServiceLocationException.NETWORK_ERROR);
+		} catch (IOException e) {
+			TRC.error(e);
+			throw new ServiceLocationException(ServiceLocationException.NETWORK_ERROR);
+		}
+
+	}
+
+	private ReplyMessage makeReply4Request(RequestMessage pRequest) {
+		ReplyMessage replyMsg;
+		List scopes = pRequest.getScopeList();
+		switch (pRequest.getFunctionID()) {
+			case SRV_RQST:
+				ServiceRequest srvRqst = (ServiceRequest) pRequest;
+				if (SLPDefaults.DA_SERVICE_TYPE.equals(srvRqst.getServiceType())) return null;
+				List urlList = this.iSrvTable.getServiceURLs(srvRqst.getServiceType(),
+						scopes);
+				TRC.debug("srvReply : " + urlList);
+				replyMsg = new ServiceReply(0, urlList);
+				break;
+			case ATTR_RQST:
+				AttributeRequest attrRqst = (AttributeRequest) pRequest;
+				replyMsg = new AttributeReply(0, this.iSrvTable.getAttributes(attrRqst
+						.getServiceURL(), scopes));
+				break;
+			case SRV_TYPE_RQST:
+				// ServiceTypeRequest srvTypeRqst =
+				// (ServiceTypeRequest)pRequest;
+				replyMsg = new ServiceTypeReply(0, this.iSrvTable.getServiceTypes(scopes));
+				break;
+			default:
+				return null;
+		}
+		return replyMsg;
+	}
+
+	private SLPMessage makeReply4Others(SLPMessage pRequest) throws IOException {
+		switch (pRequest.getFunctionID()) {
+			case SRV_REG:
+				ServiceRegistration srvReg = (ServiceRegistration) pRequest;
+				this.iSrvTable.add(srvReg.getServiceURL(), srvReg.getAttributeList(), srvReg
+						.getScopeList());
+				return new ServiceAcknowledgment(0);
+			case SRV_DEREG:
+				ServiceDeregistration srvDereg = (ServiceDeregistration) pRequest;
+				this.iSrvTable.remove(srvDereg.getServiceURL());
+				return new ServiceAcknowledgment(0);
+			default:
+				// FIXME maybe returning an error message is better
+				return null;
+		}
+	}
+
+	private static byte[] makeErrorReply(SLPMessage pRequest, ServiceLocationException pE) {
+		return makeErrorReply(pRequest, pE.getErrorCode());
+	}
+
+	/*
+	 * Error reply: SRV_REG, SRV_DEREG -> SRV_ACK SRV_RQST -> SRV_RSP ATTR_RQST
+	 * -> ATTR_RPLY SRV_TYPE_RQST -> SRV_TYPE_RPLY
+	 */
+
+	private static byte[] makeErrorReply(SLPMessage pRequest, int pErrorCode) {
+		ReplyMessage replyMsg;
+		switch (pRequest.getFunctionID()) {
+			case SRV_RQST:
+				replyMsg = new ServiceReply(pErrorCode, null);
+				break;
+			case ATTR_RQST:
+				replyMsg = new AttributeReply(pErrorCode, null);
+				break;
+			case SRV_TYPE_RQST:
+				replyMsg = new ServiceTypeReply(pErrorCode, null);
+				break;
+			case SRV_REG:
+			case SRV_DEREG:
+				replyMsg = new ServiceAcknowledgment(pErrorCode);
+				break;
+			default:
+				return null;
+		}
+		replyMsg.setXID(pRequest.getXID());
+		try {
+			return replyMsg.serialize(false, true, true);
+		} catch (ServiceLocationException se) {
+			TRC.error(se);
+			return null;
+		}
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/ServiceTable.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceTable.java
similarity index 85%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/ServiceTable.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceTable.java
index 4c2e9f2..dd29f23 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/ServiceTable.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceTable.java
@@ -1,421 +1,419 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2010
- 
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
- 
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
- 
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3023349    2010-07-02  blaschke-oss SLP uses # constructor instead of valueOf
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.sa;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationAttribute;
-import org.sentrysoftware.wbem.sblim.slp.ServiceType;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-import org.sentrysoftware.wbem.sblim.slp.internal.IPv6MulticastAddressFactory;
-import org.sentrysoftware.wbem.sblim.slp.internal.Net;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPConfig;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPDefaults;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-
-/**
- * ServiceTable
- * 
- */
-public class ServiceTable {
-
-	DatagramThread iDgramThread;
-
-	private boolean iUseV6 = Net.hasIPv6() && SLPConfig.getGlobalCfg().useIPv6();
-
-	class AddressHashTable {
-
-		class Counter {
-
-			/**
-			 * iValue
-			 */
-			public int iValue = 1;
-		}
-
-		/**
-		 * AddressHash -> Counter
-		 */
-		private HashMap iMap = new HashMap();
-
-		/**
-		 * register
-		 * 
-		 * @param pType
-		 * @throws UnknownHostException
-		 * @throws IOException
-		 */
-		public void register(ServiceType pType) throws UnknownHostException, IOException {
-			Integer hash = Integer.valueOf(IPv6MulticastAddressFactory.getSrvTypeHash(pType));
-			TRC.debug("srvType:" + pType + ", hash:" + hash);
-			Counter cntr = this.iMap.get(hash);
-			if (cntr == null) {
-				cntr = new Counter();
-				this.iMap.put(hash, cntr);
-				ServiceTable.this.iDgramThread.joinGroup(IPv6MulticastAddressFactory.get(
-						SLPDefaults.IPV6_MULTICAST_SCOPE, hash.intValue()));
-			} else {
-				++cntr.iValue;
-			}
-
-		}
-
-		/**
-		 * unregister
-		 * 
-		 * @param pType
-		 * @throws UnknownHostException
-		 * @throws IOException
-		 */
-		public void unregister(ServiceType pType) throws UnknownHostException, IOException {
-			Integer hash = Integer.valueOf(IPv6MulticastAddressFactory.getSrvTypeHash(pType));
-			Counter cntr = this.iMap.get(hash);
-			if (cntr == null) return;
-			if (cntr.iValue <= 1) {
-				this.iMap.remove(hash);
-				ServiceTable.this.iDgramThread.leaveGroup(IPv6MulticastAddressFactory.get(
-						SLPDefaults.IPV6_MULTICAST_SCOPE, hash.intValue()));
-			} else {
-				--cntr.iValue;
-			}
-		}
-
-	}
-
-	private static class ServiceEntry {
-
-		private ServiceURL iSrvURL;
-
-		private List iAttribs;
-
-		private List iScopes;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pSrvURL
-		 * @param pAttribs
-		 * @param pScopes
-		 */
-		public ServiceEntry(ServiceURL pSrvURL, List pAttribs,
-				List pScopes) {
-			set(pSrvURL, pAttribs, pScopes);
-		}
-
-		/**
-		 * set
-		 * 
-		 * @param pSrvURL
-		 * @param pAttribs
-		 * @param pScopes
-		 */
-		public void set(ServiceURL pSrvURL, List pAttribs,
-				List pScopes) {
-			this.iSrvURL = pSrvURL;
-			this.iAttribs = pAttribs;
-			this.iScopes = pScopes;
-		}
-
-		/**
-		 * getServiceURL
-		 * 
-		 * @return ServiceURL
-		 */
-		public ServiceURL getServiceURL() {
-			return this.iSrvURL;
-		}
-
-		/**
-		 * getServiceType
-		 * 
-		 * @return ServiceType
-		 */
-		public ServiceType getServiceType() {
-			return this.iSrvURL.getServiceType();
-		}
-
-		/**
-		 * getAttributes
-		 * 
-		 * @return List
-		 */
-		public List getAttributes() {
-			return this.iAttribs;
-		}
-
-		/**
-		 * getScopes
-		 * 
-		 * @return List
-		 */
-		public List getScopes() {
-			return this.iScopes;
-		}
-
-		/**
-		 * hasMatchingScope
-		 * 
-		 * @param pScopes
-		 * @return boolean
-		 */
-		public boolean hasMatchingScope(List pScopes) {
-			if (pScopes == null) return false;
-			Iterator itr = pScopes.iterator();
-			while (itr.hasNext())
-				if (hasScope(itr.next())) return true;
-			return false;
-		}
-
-		@Override
-		public String toString() {
-			return "url:" + this.iSrvURL + ", attribs:" + dumpList(this.iAttribs) + ", scopes:"
-					+ dumpList(this.iScopes);
-		}
-
-		private boolean hasScope(String pScope) {
-			return this.iScopes == null ? false : this.iScopes.contains(pScope);
-		}
-
-	}
-
-	static class ServiceEntryList extends ArrayList {
-
-		private static final long serialVersionUID = 1L;
-
-		/**
-		 * get
-		 * 
-		 * @param pSrvURL
-		 * @return ServiceEntry
-		 */
-		public ServiceEntry get(ServiceURL pSrvURL) {
-			for (int i = 0; i < size(); i++) {
-				ServiceEntry entry = (ServiceEntry) get(i);
-				if (pSrvURL.equals(entry.getServiceURL())) return entry;
-			}
-			return null;
-		}
-
-		/**
-		 * remove
-		 * 
-		 * @param pSrvURL
-		 */
-		public void remove(ServiceURL pSrvURL) {
-			for (int i = 0; i < size(); i++) {
-				ServiceEntry entry = (ServiceEntry) get(i);
-				if (pSrvURL.equals(entry.getServiceURL())) {
-					remove(i);
-					break;
-				}
-			}
-		}
-
-		/**
-		 * getServiceURLs
-		 * 
-		 * @param pSrvType
-		 * @param pScopes
-		 * @return List
-		 */
-		public List getServiceURLs(ServiceType pSrvType, List pScopes) {
-			if (pSrvType == null) return null;
-			List srvURLs = null;
-			for (int i = 0; i < size(); i++) {
-				ServiceEntry entry = (ServiceEntry) get(i);
-				if (!entry.hasMatchingScope(pScopes)) continue;
-				if (pSrvType.getPrincipleTypeName().equals(
-						entry.getServiceType().getPrincipleTypeName())) {
-					if (srvURLs == null) srvURLs = new ArrayList();
-					srvURLs.add(entry.getServiceURL());
-				}
-			}
-			return srvURLs;
-		}
-
-	}
-
-	private ServiceEntryList iSrvEntryTable = new ServiceEntryList();
-
-	private AddressHashTable iAddressHashTable = new AddressHashTable();
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pDgramThread
-	 */
-	public ServiceTable(DatagramThread pDgramThread) {
-		this.iDgramThread = pDgramThread;
-	}
-
-	/**
-	 * add
-	 * 
-	 * @param pSrvURL
-	 * @param pAttrList
-	 * @param pScopes
-	 * @throws UnknownHostException
-	 * @throws IOException
-	 */
-	public synchronized void add(ServiceURL pSrvURL, List pAttrList,
-			List pScopes) throws UnknownHostException, IOException {
-		if (pSrvURL == null) return;
-		TRC.debug("add URL:" + pSrvURL + ", scopes:" + dumpList(pScopes));
-		ServiceEntry srvEntry = this.iSrvEntryTable.get(pSrvURL);
-		if (srvEntry == null) {
-			this.iSrvEntryTable.add(new ServiceEntry(pSrvURL, pAttrList, pScopes));
-		} else {
-			srvEntry.set(pSrvURL, pAttrList, pScopes);
-		}
-
-		if (!this.iUseV6) return;
-		this.iAddressHashTable.register(pSrvURL.getServiceType());
-	}
-
-	/**
-	 * remove
-	 * 
-	 * @param pSrvURL
-	 * @throws UnknownHostException
-	 * @throws IOException
-	 */
-	public synchronized void remove(ServiceURL pSrvURL) throws UnknownHostException, IOException {
-		this.iSrvEntryTable.remove(pSrvURL);
-
-		if (!this.iUseV6) return;
-		this.iAddressHashTable.unregister(pSrvURL.getServiceType());
-	}
-
-	/**
-	 * getServiceURLs
-	 * 
-	 * @param pSrvType
-	 * @param pScopes
-	 * @return List ServiceURL
-	 */
-	public synchronized List getServiceURLs(ServiceType pSrvType, List pScopes) {
-		TRC.debug("getServiceURLs srvType:" + pSrvType + ", scopes:" + dumpList(pScopes));
-		List list = this.iSrvEntryTable.getServiceURLs(pSrvType, pScopes);
-		return list;
-	}
-
-	/**
-	 * getAttributes
-	 * 
-	 * @param pSrvURL
-	 * @param pScopes
-	 * @return List ServiceLocationAttribute
-	 */
-	public synchronized List getAttributes(ServiceURL pSrvURL,
-			List pScopes) {
-		if (pSrvURL == null) return null;
-		if (pSrvURL.getURLPath() == null) return getAttributes(pSrvURL.getServiceType(), pScopes);
-		ServiceEntry entry = this.iSrvEntryTable.get(pSrvURL);
-		return entry == null ? null : entry.getAttributes();
-	}
-
-	/**
-	 * getAttributes
-	 * 
-	 * @param pSrvType
-	 * @param pScopes
-	 * @return List ServiceLocationAttribute
-	 */
-	public synchronized List getAttributes(ServiceType pSrvType,
-			List pScopes) {
-		if (pSrvType == null) return null;
-		HashSet attribs = new HashSet();
-		for (int i = 0; i < this.iSrvEntryTable.size(); i++) {
-			ServiceEntry entry = (ServiceEntry) this.iSrvEntryTable.get(i);
-			ServiceType srvType = entry.getServiceType();
-			if (pSrvType.equals(srvType)) attribs.addAll(entry.getAttributes());
-		}
-		return new ArrayList(attribs);
-	}
-
-	/**
-	 * getServiceTypes
-	 * 
-	 * @param pScopes
-	 * @return List ServiceType
-	 */
-	public synchronized List getServiceTypes(List pScopes) {
-		List srvTypes = null;
-		for (int i = 0; i < this.iSrvEntryTable.size(); i++) {
-			ServiceEntry entry = (ServiceEntry) this.iSrvEntryTable.get(i);
-			if (entry.hasMatchingScope(pScopes)) {
-				ServiceType srvType = entry.getServiceType();
-				if (srvType == null) continue;
-				if (srvTypes == null) srvTypes = new ArrayList();
-				srvTypes.add(srvType);
-			}
-		}
-		return srvTypes;
-	}
-
-	static String dumpList(List pList) {
-		return dumpList(pList, ",");
-	}
-
-	private static String dumpList(List pList, String pSep) {
-		if (pList == null) return "null";
-		StringBuffer buf = new StringBuffer();
-		Iterator itr = pList.iterator();
-		boolean first = true;
-		while (itr.hasNext()) {
-			if (!first) buf.append(pSep);
-			buf.append(itr.next().toString());
-			first = false;
-		}
-		return buf.toString();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2010
+ 
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+ 
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+ 
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3023349    2010-07-02  blaschke-oss SLP uses # constructor instead of valueOf
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.sa;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+import org.metricshub.wbem.sblim.slp.ServiceType;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.internal.IPv6MulticastAddressFactory;
+import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+import org.metricshub.wbem.sblim.slp.internal.Net;
+
+/**
+ * ServiceTable
+ * 
+ */
+public class ServiceTable {
+
+	DatagramThread iDgramThread;
+
+	private boolean iUseV6 = Net.hasIPv6() && SLPConfig.getGlobalCfg().useIPv6();
+
+	class AddressHashTable {
+
+		class Counter {
+
+			/**
+			 * iValue
+			 */
+			public int iValue = 1;
+		}
+
+		/**
+		 * AddressHash -> Counter
+		 */
+		private HashMap iMap = new HashMap();
+
+		/**
+		 * register
+		 * 
+		 * @param pType
+		 * @throws UnknownHostException
+		 * @throws IOException
+		 */
+		public void register(ServiceType pType) throws UnknownHostException, IOException {
+			Integer hash = Integer.valueOf(IPv6MulticastAddressFactory.getSrvTypeHash(pType));
+			TRC.debug("srvType:" + pType + ", hash:" + hash);
+			Counter cntr = this.iMap.get(hash);
+			if (cntr == null) {
+				cntr = new Counter();
+				this.iMap.put(hash, cntr);
+				ServiceTable.this.iDgramThread.joinGroup(IPv6MulticastAddressFactory.get(
+						SLPDefaults.IPV6_MULTICAST_SCOPE, hash.intValue()));
+			} else {
+				++cntr.iValue;
+			}
+
+		}
+
+		/**
+		 * unregister
+		 * 
+		 * @param pType
+		 * @throws UnknownHostException
+		 * @throws IOException
+		 */
+		public void unregister(ServiceType pType) throws UnknownHostException, IOException {
+			Integer hash = Integer.valueOf(IPv6MulticastAddressFactory.getSrvTypeHash(pType));
+			Counter cntr = this.iMap.get(hash);
+			if (cntr == null) return;
+			if (cntr.iValue <= 1) {
+				this.iMap.remove(hash);
+				ServiceTable.this.iDgramThread.leaveGroup(IPv6MulticastAddressFactory.get(
+						SLPDefaults.IPV6_MULTICAST_SCOPE, hash.intValue()));
+			} else {
+				--cntr.iValue;
+			}
+		}
+
+	}
+
+	private static class ServiceEntry {
+
+		private ServiceURL iSrvURL;
+
+		private List iAttribs;
+
+		private List iScopes;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pSrvURL
+		 * @param pAttribs
+		 * @param pScopes
+		 */
+		public ServiceEntry(ServiceURL pSrvURL, List pAttribs,
+				List pScopes) {
+			set(pSrvURL, pAttribs, pScopes);
+		}
+
+		/**
+		 * set
+		 * 
+		 * @param pSrvURL
+		 * @param pAttribs
+		 * @param pScopes
+		 */
+		public void set(ServiceURL pSrvURL, List pAttribs,
+				List pScopes) {
+			this.iSrvURL = pSrvURL;
+			this.iAttribs = pAttribs;
+			this.iScopes = pScopes;
+		}
+
+		/**
+		 * getServiceURL
+		 * 
+		 * @return ServiceURL
+		 */
+		public ServiceURL getServiceURL() {
+			return this.iSrvURL;
+		}
+
+		/**
+		 * getServiceType
+		 * 
+		 * @return ServiceType
+		 */
+		public ServiceType getServiceType() {
+			return this.iSrvURL.getServiceType();
+		}
+
+		/**
+		 * getAttributes
+		 * 
+		 * @return List
+		 */
+		public List getAttributes() {
+			return this.iAttribs;
+		}
+
+		/**
+		 * getScopes
+		 * 
+		 * @return List
+		 */
+		public List getScopes() {
+			return this.iScopes;
+		}
+
+		/**
+		 * hasMatchingScope
+		 * 
+		 * @param pScopes
+		 * @return boolean
+		 */
+		public boolean hasMatchingScope(List pScopes) {
+			if (pScopes == null) return false;
+			Iterator itr = pScopes.iterator();
+			while (itr.hasNext())
+				if (hasScope(itr.next())) return true;
+			return false;
+		}
+
+		@Override
+		public String toString() {
+			return "url:" + this.iSrvURL + ", attribs:" + dumpList(this.iAttribs) + ", scopes:"
+					+ dumpList(this.iScopes);
+		}
+
+		private boolean hasScope(String pScope) {
+			return this.iScopes == null ? false : this.iScopes.contains(pScope);
+		}
+
+	}
+
+	static class ServiceEntryList extends ArrayList {
+
+		private static final long serialVersionUID = 1L;
+
+		/**
+		 * get
+		 * 
+		 * @param pSrvURL
+		 * @return ServiceEntry
+		 */
+		public ServiceEntry get(ServiceURL pSrvURL) {
+			for (int i = 0; i < size(); i++) {
+				ServiceEntry entry = (ServiceEntry) get(i);
+				if (pSrvURL.equals(entry.getServiceURL())) return entry;
+			}
+			return null;
+		}
+
+		/**
+		 * remove
+		 * 
+		 * @param pSrvURL
+		 */
+		public void remove(ServiceURL pSrvURL) {
+			for (int i = 0; i < size(); i++) {
+				ServiceEntry entry = (ServiceEntry) get(i);
+				if (pSrvURL.equals(entry.getServiceURL())) {
+					remove(i);
+					break;
+				}
+			}
+		}
+
+		/**
+		 * getServiceURLs
+		 * 
+		 * @param pSrvType
+		 * @param pScopes
+		 * @return List
+		 */
+		public List getServiceURLs(ServiceType pSrvType, List pScopes) {
+			if (pSrvType == null) return null;
+			List srvURLs = null;
+			for (int i = 0; i < size(); i++) {
+				ServiceEntry entry = (ServiceEntry) get(i);
+				if (!entry.hasMatchingScope(pScopes)) continue;
+				if (pSrvType.getPrincipleTypeName().equals(
+						entry.getServiceType().getPrincipleTypeName())) {
+					if (srvURLs == null) srvURLs = new ArrayList();
+					srvURLs.add(entry.getServiceURL());
+				}
+			}
+			return srvURLs;
+		}
+
+	}
+
+	private ServiceEntryList iSrvEntryTable = new ServiceEntryList();
+
+	private AddressHashTable iAddressHashTable = new AddressHashTable();
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pDgramThread
+	 */
+	public ServiceTable(DatagramThread pDgramThread) {
+		this.iDgramThread = pDgramThread;
+	}
+
+	/**
+	 * add
+	 * 
+	 * @param pSrvURL
+	 * @param pAttrList
+	 * @param pScopes
+	 * @throws UnknownHostException
+	 * @throws IOException
+	 */
+	public synchronized void add(ServiceURL pSrvURL, List pAttrList,
+			List pScopes) throws UnknownHostException, IOException {
+		if (pSrvURL == null) return;
+		TRC.debug("add URL:" + pSrvURL + ", scopes:" + dumpList(pScopes));
+		ServiceEntry srvEntry = this.iSrvEntryTable.get(pSrvURL);
+		if (srvEntry == null) {
+			this.iSrvEntryTable.add(new ServiceEntry(pSrvURL, pAttrList, pScopes));
+		} else {
+			srvEntry.set(pSrvURL, pAttrList, pScopes);
+		}
+
+		if (!this.iUseV6) return;
+		this.iAddressHashTable.register(pSrvURL.getServiceType());
+	}
+
+	/**
+	 * remove
+	 * 
+	 * @param pSrvURL
+	 * @throws UnknownHostException
+	 * @throws IOException
+	 */
+	public synchronized void remove(ServiceURL pSrvURL) throws UnknownHostException, IOException {
+		this.iSrvEntryTable.remove(pSrvURL);
+
+		if (!this.iUseV6) return;
+		this.iAddressHashTable.unregister(pSrvURL.getServiceType());
+	}
+
+	/**
+	 * getServiceURLs
+	 * 
+	 * @param pSrvType
+	 * @param pScopes
+	 * @return List ServiceURL
+	 */
+	public synchronized List getServiceURLs(ServiceType pSrvType, List pScopes) {
+		TRC.debug("getServiceURLs srvType:" + pSrvType + ", scopes:" + dumpList(pScopes));
+		List list = this.iSrvEntryTable.getServiceURLs(pSrvType, pScopes);
+		return list;
+	}
+
+	/**
+	 * getAttributes
+	 * 
+	 * @param pSrvURL
+	 * @param pScopes
+	 * @return List ServiceLocationAttribute
+	 */
+	public synchronized List getAttributes(ServiceURL pSrvURL,
+			List pScopes) {
+		if (pSrvURL == null) return null;
+		if (pSrvURL.getURLPath() == null) return getAttributes(pSrvURL.getServiceType(), pScopes);
+		ServiceEntry entry = this.iSrvEntryTable.get(pSrvURL);
+		return entry == null ? null : entry.getAttributes();
+	}
+
+	/**
+	 * getAttributes
+	 * 
+	 * @param pSrvType
+	 * @param pScopes
+	 * @return List ServiceLocationAttribute
+	 */
+	public synchronized List getAttributes(ServiceType pSrvType,
+			List pScopes) {
+		if (pSrvType == null) return null;
+		HashSet attribs = new HashSet();
+		for (int i = 0; i < this.iSrvEntryTable.size(); i++) {
+			ServiceEntry entry = (ServiceEntry) this.iSrvEntryTable.get(i);
+			ServiceType srvType = entry.getServiceType();
+			if (pSrvType.equals(srvType)) attribs.addAll(entry.getAttributes());
+		}
+		return new ArrayList(attribs);
+	}
+
+	/**
+	 * getServiceTypes
+	 * 
+	 * @param pScopes
+	 * @return List ServiceType
+	 */
+	public synchronized List getServiceTypes(List pScopes) {
+		List srvTypes = null;
+		for (int i = 0; i < this.iSrvEntryTable.size(); i++) {
+			ServiceEntry entry = (ServiceEntry) this.iSrvEntryTable.get(i);
+			if (entry.hasMatchingScope(pScopes)) {
+				ServiceType srvType = entry.getServiceType();
+				if (srvType == null) continue;
+				if (srvTypes == null) srvTypes = new ArrayList();
+				srvTypes.add(srvType);
+			}
+		}
+		return srvTypes;
+	}
+
+	static String dumpList(List pList) {
+		return dumpList(pList, ",");
+	}
+
+	private static String dumpList(List pList, String pSep) {
+		if (pList == null) return "null";
+		StringBuffer buf = new StringBuffer();
+		Iterator itr = pList.iterator();
+		boolean first = true;
+		while (itr.hasNext()) {
+			if (!first) buf.append(pSep);
+			buf.append(itr.next().toString());
+			first = false;
+		}
+		return buf.toString();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/TCPThread.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/TCPThread.java
similarity index 71%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/TCPThread.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/TCPThread.java
index 2c07417..64d7cc6 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/sa/TCPThread.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/TCPThread.java
@@ -1,117 +1,115 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
- 
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
- 
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
- 
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.sa;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPConfig;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-
-/**
- * TCPThread
- * 
- */
-public class TCPThread extends RecieverThread {
-
-	private ServerSocket iListenerSocket;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pSrvAgent
-	 */
-	public TCPThread(ServiceAgent pSrvAgent) {
-		super("TCP receiver", pSrvAgent);
-	}
-
-	@Override
-	protected void init() throws IOException {
-		this.iListenerSocket = new ServerSocket(SLPConfig.getGlobalCfg().getPort());
-		this.iListenerSocket.setReuseAddress(true);
-		this.iListenerSocket.setSoTimeout(100);
-	}
-
-	@Override
-	protected void mainLoop() throws IOException {
-		try {
-			new ConnectionThread(this.iListenerSocket.accept());
-		} catch (SocketTimeoutException e) {
-			// superclass will execute the mainLoop again
-		}
-	}
-
-	private class ConnectionThread implements Runnable {
-
-		private Socket iSock;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pSock
-		 */
-		public ConnectionThread(Socket pSock) {
-			this.iSock = pSock;
-			new Thread(this).start();
-		}
-
-		public void run() {
-			TCPThread.this.iSrvAgent.processMessage(this.iSock);
-		}
-
-	}
-
-	@Override
-	protected void close() {
-		if (this.iListenerSocket == null) return;
-		try {
-			this.iListenerSocket.close();
-		} catch (IOException e) {
-			TRC.error(e);
-		}
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+ 
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+ 
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+ 
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.sa;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+
+import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+
+/**
+ * TCPThread
+ * 
+ */
+public class TCPThread extends RecieverThread {
+
+	private ServerSocket iListenerSocket;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pSrvAgent
+	 */
+	public TCPThread(ServiceAgent pSrvAgent) {
+		super("TCP receiver", pSrvAgent);
+	}
+
+	@Override
+	protected void init() throws IOException {
+		this.iListenerSocket = new ServerSocket(SLPConfig.getGlobalCfg().getPort());
+		this.iListenerSocket.setReuseAddress(true);
+		this.iListenerSocket.setSoTimeout(100);
+	}
+
+	@Override
+	protected void mainLoop() throws IOException {
+		try {
+			new ConnectionThread(this.iListenerSocket.accept());
+		} catch (SocketTimeoutException e) {
+			// superclass will execute the mainLoop again
+		}
+	}
+
+	private class ConnectionThread implements Runnable {
+
+		private Socket iSock;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pSock
+		 */
+		public ConnectionThread(Socket pSock) {
+			this.iSock = pSock;
+			new Thread(this).start();
+		}
+
+		public void run() {
+			TCPThread.this.iSrvAgent.processMessage(this.iSock);
+		}
+
+	}
+
+	@Override
+	protected void close() {
+		if (this.iListenerSocket == null) return;
+		try {
+			this.iListenerSocket.close();
+		} catch (IOException e) {
+			TRC.error(e);
+		}
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/DACache.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DACache.java
similarity index 80%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/DACache.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DACache.java
index d4bbea2..b0fc299 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/DACache.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DACache.java
@@ -1,175 +1,173 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.ua;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPDefaults;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.DADescriptor;
-
-/**
- * DACache caches the discovered DA list in order to eliminate frequent DA
- * discovery network traffic.
- * 
- */
-public class DACache {
-
-	private static class ScopeEntry {
-
-		private long iTimeOfDiscovery;
-
-		private TreeSet iDADescriptors;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pDADescriptors
-		 */
-		public ScopeEntry(TreeSet pDADescriptors) {
-			this.iDADescriptors = pDADescriptors;
-			this.iTimeOfDiscovery = getSecs();
-		}
-
-		/**
-		 * valid
-		 * 
-		 * @return boolean
-		 */
-		public boolean valid() {
-			return getSecs() - this.iTimeOfDiscovery <= SLPDefaults.DACACHE_TIMEOUT;
-		}
-
-		/**
-		 * getDADescriptorItr
-		 * 
-		 * @return Iterator
-		 */
-		public Iterator getDADescriptorItr() {
-			return this.iDADescriptors == null ? null : this.iDADescriptors.iterator();
-		}
-
-	}
-
-	/**
-	 * key: scope value: ScopeEntry
-	 */
-	private static TreeMap cScopeMap = new TreeMap();
-
-	// TODO: handle scopes
-
-	/**
-	 * @param pScopes
-	 * @return List of discoverable scope strings
-	 */
-	public static synchronized List getDiscoverableScopeList(List pScopes) {
-		if (pScopes == null || pScopes.size() == 0) return null;
-		List scopeList = null;
-		Iterator itr = pScopes.iterator();
-		while (itr.hasNext()) {
-			String scope = itr.next();
-			ScopeEntry scopeEntry = cScopeMap.get(scope);
-			if (scopeEntry == null || !scopeEntry.valid()) {
-				if (scopeList == null) scopeList = new ArrayList();
-				scopeList.add(scope);
-			}
-		}
-		return scopeList;
-	}
-
-	/**
-	 * @param pScopes
-	 * @return List of DA URLs
-	 */
-	public static synchronized List getDAList(List pScopes) {
-		if (cScopeMap == null) return null;
-		TreeSet daSet = new TreeSet();
-		Iterator scopeItr = pScopes.iterator();
-		while (scopeItr.hasNext()) {
-			String scope = scopeItr.next();
-			ScopeEntry scopeEntry = cScopeMap.get(scope);
-			if (scopeEntry == null) continue;
-			Iterator descItr = scopeEntry.getDADescriptorItr();
-			if (descItr == null) continue;
-			while (descItr.hasNext()) {
-				daSet.add(descItr.next().getURL());
-			}
-		}
-		return new ArrayList(daSet);
-	}
-
-	/**
-	 * @param pScopes
-	 *            - list of discovered hosts
-	 * @param pDADescriptors
-	 *            - DADescriptors of the discovered DAs
-	 */
-	public static synchronized void setDAList(List pScopes,
-			List pDADescriptors) {
-		if (pScopes == null || pDADescriptors == null) return;
-		Iterator scopeItr = pScopes.iterator();
-		while (scopeItr.hasNext()) {
-			String scope = scopeItr.next();
-			TreeSet daDescsForScope = null;
-			Iterator descItr = pDADescriptors.iterator();
-			while (descItr.hasNext()) {
-				DADescriptor daDesc = descItr.next();
-				if (daDesc.hasScope(scope)) {
-					if (daDescsForScope == null) daDescsForScope = new TreeSet();
-					daDescsForScope.add(daDesc);
-				}
-			}
-			cScopeMap.put(scope, new ScopeEntry(daDescsForScope));
-		}
-	}
-
-	static long getSecs() {
-		return new Date().getTime() / 1000;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.ua;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
+import org.metricshub.wbem.sblim.slp.internal.msg.DADescriptor;
+
+/**
+ * DACache caches the discovered DA list in order to eliminate frequent DA
+ * discovery network traffic.
+ * 
+ */
+public class DACache {
+
+	private static class ScopeEntry {
+
+		private long iTimeOfDiscovery;
+
+		private TreeSet iDADescriptors;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pDADescriptors
+		 */
+		public ScopeEntry(TreeSet pDADescriptors) {
+			this.iDADescriptors = pDADescriptors;
+			this.iTimeOfDiscovery = getSecs();
+		}
+
+		/**
+		 * valid
+		 * 
+		 * @return boolean
+		 */
+		public boolean valid() {
+			return getSecs() - this.iTimeOfDiscovery <= SLPDefaults.DACACHE_TIMEOUT;
+		}
+
+		/**
+		 * getDADescriptorItr
+		 * 
+		 * @return Iterator
+		 */
+		public Iterator getDADescriptorItr() {
+			return this.iDADescriptors == null ? null : this.iDADescriptors.iterator();
+		}
+
+	}
+
+	/**
+	 * key: scope value: ScopeEntry
+	 */
+	private static TreeMap cScopeMap = new TreeMap();
+
+	// TODO: handle scopes
+
+	/**
+	 * @param pScopes
+	 * @return List of discoverable scope strings
+	 */
+	public static synchronized List getDiscoverableScopeList(List pScopes) {
+		if (pScopes == null || pScopes.size() == 0) return null;
+		List scopeList = null;
+		Iterator itr = pScopes.iterator();
+		while (itr.hasNext()) {
+			String scope = itr.next();
+			ScopeEntry scopeEntry = cScopeMap.get(scope);
+			if (scopeEntry == null || !scopeEntry.valid()) {
+				if (scopeList == null) scopeList = new ArrayList();
+				scopeList.add(scope);
+			}
+		}
+		return scopeList;
+	}
+
+	/**
+	 * @param pScopes
+	 * @return List of DA URLs
+	 */
+	public static synchronized List getDAList(List pScopes) {
+		if (cScopeMap == null) return null;
+		TreeSet daSet = new TreeSet();
+		Iterator scopeItr = pScopes.iterator();
+		while (scopeItr.hasNext()) {
+			String scope = scopeItr.next();
+			ScopeEntry scopeEntry = cScopeMap.get(scope);
+			if (scopeEntry == null) continue;
+			Iterator descItr = scopeEntry.getDADescriptorItr();
+			if (descItr == null) continue;
+			while (descItr.hasNext()) {
+				daSet.add(descItr.next().getURL());
+			}
+		}
+		return new ArrayList(daSet);
+	}
+
+	/**
+	 * @param pScopes
+	 *            - list of discovered hosts
+	 * @param pDADescriptors
+	 *            - DADescriptors of the discovered DAs
+	 */
+	public static synchronized void setDAList(List pScopes,
+			List pDADescriptors) {
+		if (pScopes == null || pDADescriptors == null) return;
+		Iterator scopeItr = pScopes.iterator();
+		while (scopeItr.hasNext()) {
+			String scope = scopeItr.next();
+			TreeSet daDescsForScope = null;
+			Iterator descItr = pDADescriptors.iterator();
+			while (descItr.hasNext()) {
+				DADescriptor daDesc = descItr.next();
+				if (daDesc.hasScope(scope)) {
+					if (daDescsForScope == null) daDescsForScope = new TreeSet();
+					daDescsForScope.add(daDesc);
+				}
+			}
+			cScopeMap.put(scope, new ScopeEntry(daDescsForScope));
+		}
+	}
+
+	static long getSecs() {
+		return new Date().getTime() / 1000;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/DatagramRequester.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DatagramRequester.java
similarity index 86%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/DatagramRequester.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DatagramRequester.java
index 47b8795..9546500 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/DatagramRequester.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DatagramRequester.java
@@ -1,419 +1,417 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1804402    2007-11-10  ebak         IPv6 ready SLP - revision 4
- * 1892103    2008-02-12  ebak         SLP improvements
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 1950819    2008-04-24  rgummada 	   SLP error: "java.io.IOException" on Linux and IPv6
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2839595    2009-09-30  rgummada     SLP discovery fails on Unix IPv6 systems
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.ua;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
-import java.net.SocketTimeoutException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.internal.IPv6MulticastAddressFactory;
-import org.sentrysoftware.wbem.sblim.slp.internal.Net;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPConfig;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPDefaults;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.MsgFactory;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ReplyMessage;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.RequestMessage;
-
-/**
- * DatagramRequester
- * 
- */
-public class DatagramRequester implements Runnable {
-
-	RequestMessage iReqMsg;
-
-	private Thread iThread;
-
-	ResultTable iResTable;
-
-	private InetAddress iDst0, iDst1;
-
-	private DatagramSocket iDGramSocket;
-
-	private int iPort = SLPConfig.getGlobalCfg().getPort();
-
-	private boolean iUseV4 = Net.hasIPv4() && SLPConfig.getGlobalCfg().useIPv4(), iUseV6 = Net
-			.hasIPv6()
-			&& SLPConfig.getGlobalCfg().useIPv6();
-
-	private List iTCPRequesters;
-
-	int iTotalTimeOut;
-
-	int[] iTimeOuts;
-
-	int iMaxResults = SLPConfig.getGlobalCfg().getMaximumResults();
-
-	/*
-	 * this size is used for the receiver instead of the configurable MTU size
-	 */
-	private static final int MAX_DATAGRAM_SIZE = 65536;
-
-	private final byte[] iInBuf = new byte[MAX_DATAGRAM_SIZE];
-
-	/**
-	 * Constructor used for unicast requests
-	 * 
-	 * @param pRqstMsg
-	 * @param pResTable
-	 * @param pDst
-	 * @throws IOException
-	 */
-	public DatagramRequester(RequestMessage pRqstMsg, ResultTable pResTable, InetAddress pDst)
-			throws IOException {
-		this.iReqMsg = pRqstMsg;
-		this.iResTable = pResTable;
-		this.iDst0 = pDst;
-		this.iTimeOuts = SLPConfig.getGlobalCfg().getDatagramTimeouts();
-		this.iDGramSocket = new DatagramSocket();
-	}
-
-	/**
-	 * Constructor used for multicast requests
-	 * 
-	 * @param pRqstMsg
-	 * @param pResTable
-	 * @throws IOException
-	 */
-	public DatagramRequester(RequestMessage pRqstMsg, ResultTable pResTable) throws IOException {
-		this.iReqMsg = pRqstMsg;
-		this.iResTable = pResTable;
-		this.iTimeOuts = SLPConfig.getGlobalCfg().getMulticastTimeouts();
-		this.iTotalTimeOut = SLPConfig.getGlobalCfg().getMulticastMaximumWait();
-		MulticastSocket mcastSocket = new MulticastSocket();
-		this.iDGramSocket = mcastSocket;
-		if (this.iUseV6) {
-			this.iDst0 = IPv6MulticastAddressFactory
-					.get(SLPDefaults.IPV6_MULTICAST_SCOPE, pRqstMsg);
-			try {
-				mcastSocket.joinGroup(this.iDst0);
-			} catch (IOException ioe) {
-				// some kernels can't handle IPv6 mcast
-				TRC.warning("IOException caught during join, disabling IPv6: " + ioe.getMessage(),
-						ioe);
-				this.iDst0 = null;
-			}
-		}
-		if (this.iUseV4) {
-			this.iDst1 = SLPConfig.getMulticastAddress();
-			mcastSocket.joinGroup(this.iDst1);
-		}
-	}
-
-	/**
-	 * start
-	 * 
-	 * @param pAsThread
-	 */
-	public void start(boolean pAsThread) {
-		this.iResTable.registerRequester(this);
-		if (pAsThread) {
-			this.iThread = new Thread(this);
-			this.iThread.start();
-		} else {
-			this.iThread = null;
-			run();
-		}
-	}
-
-	/**
-	 * For diagnostic only.
-	 * 
-	 * @return int
-	 */
-	public int getPort() {
-		return this.iDGramSocket == null ? -1 : this.iDGramSocket.getLocalPort();
-	}
-
-	/**
-	 * waitFor
-	 */
-	public void waitFor() {
-		if (this.iThread == null) return;
-		try {
-			this.iThread.join();
-		} catch (InterruptedException e) {
-			TRC.error(e);
-		}
-	}
-
-	public void run() {
-		try {
-			if (this.iDGramSocket instanceof MulticastSocket) {
-				mcastNegotiate();
-			} else {
-				ucastNegotiate();
-			}
-		} catch (Exception e) {
-			this.iResTable.addException(e);
-			TRC.error(e.getMessage(), e);
-		} finally {
-			this.iDGramSocket.close();
-			this.iResTable.unregisterRequester(this);
-		}
-	}
-
-	class MCastLoopController {
-
-		private long iStartTime = getMillis();
-
-		private int iTimeOutIdx = 0;
-
-		/**
-		 * getTimeOut
-		 * 
-		 * @return int
-		 */
-		public int getTimeOut() {
-			return DatagramRequester.this.iTimeOuts[this.iTimeOutIdx];
-		}
-
-		private boolean hasNextTimeOut() {
-			return this.iTimeOutIdx < DatagramRequester.this.iTimeOuts.length;
-		}
-
-		/**
-		 * nextTimeOut
-		 */
-		public void nextTimeOut() {
-			if (hasNextTimeOut()) ++this.iTimeOutIdx;
-		}
-
-		/**
-		 * hasNext
-		 * 
-		 * @return boolean
-		 */
-		public boolean hasNext() {
-			return DatagramRequester.this.iResTable.getTotalResponses() < DatagramRequester.this.iMaxResults
-					&& getMillis() - this.iStartTime < DatagramRequester.this.iTotalTimeOut
-					&& hasNextTimeOut();
-		}
-
-	}
-
-	private void mcastNegotiate() throws Exception {
-		byte[] reqBytes = this.iReqMsg.serialize(true, true, false);
-		DatagramPacket outPacket0 = this.iDst0 == null ? null : new DatagramPacket(reqBytes,
-				reqBytes.length, this.iDst0, this.iPort);
-		DatagramPacket outPacket1 = this.iDst1 == null ? null : new DatagramPacket(reqBytes,
-				reqBytes.length, this.iDst1, this.iPort);
-		DatagramPacket inPacket = new DatagramPacket(this.iInBuf, this.iInBuf.length);
-		MCastLoopController ctrl = new MCastLoopController();
-		boolean respondersUpdated = false;
-		ResponseCache rspCache = new ResponseCache();
-		sendLoop: while (ctrl.hasNext()) {
-			if (respondersUpdated) {
-				byte[] msg = this.iReqMsg.serialize(true, true, true);
-				if (outPacket0 != null) outPacket0.setData(msg);
-				if (outPacket1 != null) outPacket1.setData(msg);
-				respondersUpdated = false;
-			}
-			// send it relative frequently in order to avoid lost packets
-			TRC.debug("sending: " + this.iReqMsg);
-
-			try {
-				if (outPacket0 != null) this.iDGramSocket.send(outPacket0);
-			} catch (IOException ioe) {
-				// some back level kernels can't handle sending IPv6 mcast
-				TRC.warning("IOException caught during send, disabling IPv6: " + ioe.getMessage(),
-						ioe);
-				outPacket0 = null;
-				this.iDst0 = null;
-			}
-
-			if (outPacket1 != null) this.iDGramSocket.send(outPacket1);
-			while (ctrl.hasNext()) {
-				this.iDGramSocket.setSoTimeout(ctrl.getTimeOut());
-				try {
-					this.iDGramSocket.receive(inPacket);
-				} catch (SocketTimeoutException e) {
-					// set new timeout value
-					TRC.debug("receive timed out");
-					ctrl.nextTimeOut();
-					continue sendLoop;
-				}
-				InetAddress responderAddress = inPacket.getAddress();
-
-				respondersUpdated = this.iReqMsg.updatePrevResponders(responderAddress.toString());
-
-				if (rspCache.contains(inPacket)) {
-					TRC.debug("received packet is found in rspCache");
-					continue; // packet data is already processed
-				}
-				ReplyMessage replyMsg = handleResponse(inPacket);
-
-				if (replyMsg != null) {
-					if (replyMsg.overflows()) {
-						if (!isLinkLocal(responderAddress)) {
-							// TCP doesn't seem to be working on linkLocal IPv6
-							// connection
-							addTCPRequester(responderAddress);
-							rspCache.add(inPacket);
-						}
-					} else {
-						rspCache.add(inPacket);
-					}
-				}
-			}
-			break;
-		}
-		waitForTCPRequesters();
-	}
-
-	private void ucastNegotiate() throws Exception {
-		byte[] reqBytes = this.iReqMsg.serialize(false, true, false);
-		DatagramPacket outPacket = new DatagramPacket(reqBytes, reqBytes.length, this.iDst0,
-				this.iPort);
-		DatagramPacket inPacket = new DatagramPacket(this.iInBuf, this.iInBuf.length);
-		int timeOutIdx = 0;
-		int timeOut = this.iTimeOuts[timeOutIdx];
-		/*
-		 * ad-hoc solution to avoid endless loop in case of broken answers
-		 */
-		int tries = 10;
-		while (timeOutIdx < this.iTimeOuts.length && tries > 0) {
-			// send it relative frequently in order to avoid lost packets
-			TRC.debug("sending: " + this.iReqMsg);
-			this.iDGramSocket.send(outPacket);
-			this.iDGramSocket.setSoTimeout(timeOut);
-			try {
-				this.iDGramSocket.receive(inPacket);
-			} catch (SocketTimeoutException e) {
-				// set new timeout value
-				TRC.debug("receive timed out");
-				timeOut = this.iTimeOuts[timeOutIdx++];
-				continue;
-			}
-			InetAddress responderAddress = inPacket.getAddress();
-			ReplyMessage replyMsg = handleResponse(inPacket);
-			if (replyMsg == null) {
-				--tries;
-				continue;
-			}
-			if (replyMsg.overflows()) {
-				TCPRequester tcpRequester = new TCPRequester(this.iResTable, responderAddress,
-						this.iReqMsg, true);
-				tcpRequester.waitFor();
-			}
-			/*
-			 * one answer is wanted from one host
-			 */
-			break;
-		}
-	}
-
-	/**
-	 * Tries to parse the content of the packet as a ReplyMessage. If parsing is
-	 * successful ReplyMessage is placed into the ResultTable, otherwise the
-	 * Exception is placed there.
-	 * 
-	 * @param pPacket
-	 * @return the ReplyMessage or null in case of
-	 * 
-	 *         Add all invalid URL exceptions thrown by parser into exception
-	 *         table
-	 */
-	private ReplyMessage handleResponse(DatagramPacket pPacket) {
-		ReplyMessage replyMsg;
-		try {
-			replyMsg = (ReplyMessage) MsgFactory.parse(pPacket);
-			TRC.debug("expected: " + this.iReqMsg.getXID() + ", received: " + replyMsg);
-			if (this.iReqMsg.getXID() != replyMsg.getXID()
-					|| !this.iReqMsg.isAllowedResponseType(replyMsg)) {
-				TRC.debug("expected: " + this.iReqMsg.getXID() + ", ignoring: " + replyMsg);
-				return null;
-			}
-		} catch (Exception e) {
-			this.iResTable.addException(e);
-			return null;
-		}
-		TRC.debug("resTable <- " + replyMsg);
-		this.iResTable.addResults(replyMsg);
-		this.iResTable.addExceptions(replyMsg);
-		return replyMsg;
-	}
-
-	private static boolean isLinkLocal(InetAddress pAddr) {
-		if (pAddr instanceof Inet6Address) {
-			Inet6Address dest6 = (Inet6Address) pAddr;
-			// TCP on linkLocal is evil
-			return dest6.isLinkLocalAddress();
-		}
-		return false;
-	}
-
-	static long getMillis() {
-		return new Date().getTime();
-	}
-
-	private void addTCPRequester(InetAddress pDest) throws ServiceLocationException {
-		if (this.iTCPRequesters == null) this.iTCPRequesters = new ArrayList();
-		this.iTCPRequesters.add(new TCPRequester(this.iResTable, pDest, this.iReqMsg, true));
-	}
-
-	private void waitForTCPRequesters() {
-		if (this.iTCPRequesters == null) return;
-		Iterator itr = this.iTCPRequesters.iterator();
-		while (itr.hasNext())
-			itr.next().waitFor();
-		this.iTCPRequesters.clear();
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1804402    2007-11-10  ebak         IPv6 ready SLP - revision 4
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 1950819    2008-04-24  rgummada 	   SLP error: "java.io.IOException" on Linux and IPv6
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2839595    2009-09-30  rgummada     SLP discovery fails on Unix IPv6 systems
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.ua;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.MulticastSocket;
+import java.net.SocketTimeoutException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import org.metricshub.wbem.sblim.slp.internal.IPv6MulticastAddressFactory;
+import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+import org.metricshub.wbem.sblim.slp.internal.msg.MsgFactory;
+import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.internal.Net;
+import org.metricshub.wbem.sblim.slp.internal.msg.ReplyMessage;
+
+/**
+ * DatagramRequester
+ * 
+ */
+public class DatagramRequester implements Runnable {
+
+	RequestMessage iReqMsg;
+
+	private Thread iThread;
+
+	ResultTable iResTable;
+
+	private InetAddress iDst0, iDst1;
+
+	private DatagramSocket iDGramSocket;
+
+	private int iPort = SLPConfig.getGlobalCfg().getPort();
+
+	private boolean iUseV4 = Net.hasIPv4() && SLPConfig.getGlobalCfg().useIPv4(), iUseV6 = Net
+			.hasIPv6()
+			&& SLPConfig.getGlobalCfg().useIPv6();
+
+	private List iTCPRequesters;
+
+	int iTotalTimeOut;
+
+	int[] iTimeOuts;
+
+	int iMaxResults = SLPConfig.getGlobalCfg().getMaximumResults();
+
+	/*
+	 * this size is used for the receiver instead of the configurable MTU size
+	 */
+	private static final int MAX_DATAGRAM_SIZE = 65536;
+
+	private final byte[] iInBuf = new byte[MAX_DATAGRAM_SIZE];
+
+	/**
+	 * Constructor used for unicast requests
+	 * 
+	 * @param pRqstMsg
+	 * @param pResTable
+	 * @param pDst
+	 * @throws IOException
+	 */
+	public DatagramRequester(RequestMessage pRqstMsg, ResultTable pResTable, InetAddress pDst)
+			throws IOException {
+		this.iReqMsg = pRqstMsg;
+		this.iResTable = pResTable;
+		this.iDst0 = pDst;
+		this.iTimeOuts = SLPConfig.getGlobalCfg().getDatagramTimeouts();
+		this.iDGramSocket = new DatagramSocket();
+	}
+
+	/**
+	 * Constructor used for multicast requests
+	 * 
+	 * @param pRqstMsg
+	 * @param pResTable
+	 * @throws IOException
+	 */
+	public DatagramRequester(RequestMessage pRqstMsg, ResultTable pResTable) throws IOException {
+		this.iReqMsg = pRqstMsg;
+		this.iResTable = pResTable;
+		this.iTimeOuts = SLPConfig.getGlobalCfg().getMulticastTimeouts();
+		this.iTotalTimeOut = SLPConfig.getGlobalCfg().getMulticastMaximumWait();
+		MulticastSocket mcastSocket = new MulticastSocket();
+		this.iDGramSocket = mcastSocket;
+		if (this.iUseV6) {
+			this.iDst0 = IPv6MulticastAddressFactory
+					.get(SLPDefaults.IPV6_MULTICAST_SCOPE, pRqstMsg);
+			try {
+				mcastSocket.joinGroup(this.iDst0);
+			} catch (IOException ioe) {
+				// some kernels can't handle IPv6 mcast
+				TRC.warning("IOException caught during join, disabling IPv6: " + ioe.getMessage(),
+						ioe);
+				this.iDst0 = null;
+			}
+		}
+		if (this.iUseV4) {
+			this.iDst1 = SLPConfig.getMulticastAddress();
+			mcastSocket.joinGroup(this.iDst1);
+		}
+	}
+
+	/**
+	 * start
+	 * 
+	 * @param pAsThread
+	 */
+	public void start(boolean pAsThread) {
+		this.iResTable.registerRequester(this);
+		if (pAsThread) {
+			this.iThread = new Thread(this);
+			this.iThread.start();
+		} else {
+			this.iThread = null;
+			run();
+		}
+	}
+
+	/**
+	 * For diagnostic only.
+	 * 
+	 * @return int
+	 */
+	public int getPort() {
+		return this.iDGramSocket == null ? -1 : this.iDGramSocket.getLocalPort();
+	}
+
+	/**
+	 * waitFor
+	 */
+	public void waitFor() {
+		if (this.iThread == null) return;
+		try {
+			this.iThread.join();
+		} catch (InterruptedException e) {
+			TRC.error(e);
+		}
+	}
+
+	public void run() {
+		try {
+			if (this.iDGramSocket instanceof MulticastSocket) {
+				mcastNegotiate();
+			} else {
+				ucastNegotiate();
+			}
+		} catch (Exception e) {
+			this.iResTable.addException(e);
+			TRC.error(e.getMessage(), e);
+		} finally {
+			this.iDGramSocket.close();
+			this.iResTable.unregisterRequester(this);
+		}
+	}
+
+	class MCastLoopController {
+
+		private long iStartTime = getMillis();
+
+		private int iTimeOutIdx = 0;
+
+		/**
+		 * getTimeOut
+		 * 
+		 * @return int
+		 */
+		public int getTimeOut() {
+			return DatagramRequester.this.iTimeOuts[this.iTimeOutIdx];
+		}
+
+		private boolean hasNextTimeOut() {
+			return this.iTimeOutIdx < DatagramRequester.this.iTimeOuts.length;
+		}
+
+		/**
+		 * nextTimeOut
+		 */
+		public void nextTimeOut() {
+			if (hasNextTimeOut()) ++this.iTimeOutIdx;
+		}
+
+		/**
+		 * hasNext
+		 * 
+		 * @return boolean
+		 */
+		public boolean hasNext() {
+			return DatagramRequester.this.iResTable.getTotalResponses() < DatagramRequester.this.iMaxResults
+					&& getMillis() - this.iStartTime < DatagramRequester.this.iTotalTimeOut
+					&& hasNextTimeOut();
+		}
+
+	}
+
+	private void mcastNegotiate() throws Exception {
+		byte[] reqBytes = this.iReqMsg.serialize(true, true, false);
+		DatagramPacket outPacket0 = this.iDst0 == null ? null : new DatagramPacket(reqBytes,
+				reqBytes.length, this.iDst0, this.iPort);
+		DatagramPacket outPacket1 = this.iDst1 == null ? null : new DatagramPacket(reqBytes,
+				reqBytes.length, this.iDst1, this.iPort);
+		DatagramPacket inPacket = new DatagramPacket(this.iInBuf, this.iInBuf.length);
+		MCastLoopController ctrl = new MCastLoopController();
+		boolean respondersUpdated = false;
+		ResponseCache rspCache = new ResponseCache();
+		sendLoop: while (ctrl.hasNext()) {
+			if (respondersUpdated) {
+				byte[] msg = this.iReqMsg.serialize(true, true, true);
+				if (outPacket0 != null) outPacket0.setData(msg);
+				if (outPacket1 != null) outPacket1.setData(msg);
+				respondersUpdated = false;
+			}
+			// send it relative frequently in order to avoid lost packets
+			TRC.debug("sending: " + this.iReqMsg);
+
+			try {
+				if (outPacket0 != null) this.iDGramSocket.send(outPacket0);
+			} catch (IOException ioe) {
+				// some back level kernels can't handle sending IPv6 mcast
+				TRC.warning("IOException caught during send, disabling IPv6: " + ioe.getMessage(),
+						ioe);
+				outPacket0 = null;
+				this.iDst0 = null;
+			}
+
+			if (outPacket1 != null) this.iDGramSocket.send(outPacket1);
+			while (ctrl.hasNext()) {
+				this.iDGramSocket.setSoTimeout(ctrl.getTimeOut());
+				try {
+					this.iDGramSocket.receive(inPacket);
+				} catch (SocketTimeoutException e) {
+					// set new timeout value
+					TRC.debug("receive timed out");
+					ctrl.nextTimeOut();
+					continue sendLoop;
+				}
+				InetAddress responderAddress = inPacket.getAddress();
+
+				respondersUpdated = this.iReqMsg.updatePrevResponders(responderAddress.toString());
+
+				if (rspCache.contains(inPacket)) {
+					TRC.debug("received packet is found in rspCache");
+					continue; // packet data is already processed
+				}
+				ReplyMessage replyMsg = handleResponse(inPacket);
+
+				if (replyMsg != null) {
+					if (replyMsg.overflows()) {
+						if (!isLinkLocal(responderAddress)) {
+							// TCP doesn't seem to be working on linkLocal IPv6
+							// connection
+							addTCPRequester(responderAddress);
+							rspCache.add(inPacket);
+						}
+					} else {
+						rspCache.add(inPacket);
+					}
+				}
+			}
+			break;
+		}
+		waitForTCPRequesters();
+	}
+
+	private void ucastNegotiate() throws Exception {
+		byte[] reqBytes = this.iReqMsg.serialize(false, true, false);
+		DatagramPacket outPacket = new DatagramPacket(reqBytes, reqBytes.length, this.iDst0,
+				this.iPort);
+		DatagramPacket inPacket = new DatagramPacket(this.iInBuf, this.iInBuf.length);
+		int timeOutIdx = 0;
+		int timeOut = this.iTimeOuts[timeOutIdx];
+		/*
+		 * ad-hoc solution to avoid endless loop in case of broken answers
+		 */
+		int tries = 10;
+		while (timeOutIdx < this.iTimeOuts.length && tries > 0) {
+			// send it relative frequently in order to avoid lost packets
+			TRC.debug("sending: " + this.iReqMsg);
+			this.iDGramSocket.send(outPacket);
+			this.iDGramSocket.setSoTimeout(timeOut);
+			try {
+				this.iDGramSocket.receive(inPacket);
+			} catch (SocketTimeoutException e) {
+				// set new timeout value
+				TRC.debug("receive timed out");
+				timeOut = this.iTimeOuts[timeOutIdx++];
+				continue;
+			}
+			InetAddress responderAddress = inPacket.getAddress();
+			ReplyMessage replyMsg = handleResponse(inPacket);
+			if (replyMsg == null) {
+				--tries;
+				continue;
+			}
+			if (replyMsg.overflows()) {
+				TCPRequester tcpRequester = new TCPRequester(this.iResTable, responderAddress,
+						this.iReqMsg, true);
+				tcpRequester.waitFor();
+			}
+			/*
+			 * one answer is wanted from one host
+			 */
+			break;
+		}
+	}
+
+	/**
+	 * Tries to parse the content of the packet as a ReplyMessage. If parsing is
+	 * successful ReplyMessage is placed into the ResultTable, otherwise the
+	 * Exception is placed there.
+	 * 
+	 * @param pPacket
+	 * @return the ReplyMessage or null in case of
+	 * 
+	 *         Add all invalid URL exceptions thrown by parser into exception
+	 *         table
+	 */
+	private ReplyMessage handleResponse(DatagramPacket pPacket) {
+		ReplyMessage replyMsg;
+		try {
+			replyMsg = (ReplyMessage) MsgFactory.parse(pPacket);
+			TRC.debug("expected: " + this.iReqMsg.getXID() + ", received: " + replyMsg);
+			if (this.iReqMsg.getXID() != replyMsg.getXID()
+					|| !this.iReqMsg.isAllowedResponseType(replyMsg)) {
+				TRC.debug("expected: " + this.iReqMsg.getXID() + ", ignoring: " + replyMsg);
+				return null;
+			}
+		} catch (Exception e) {
+			this.iResTable.addException(e);
+			return null;
+		}
+		TRC.debug("resTable <- " + replyMsg);
+		this.iResTable.addResults(replyMsg);
+		this.iResTable.addExceptions(replyMsg);
+		return replyMsg;
+	}
+
+	private static boolean isLinkLocal(InetAddress pAddr) {
+		if (pAddr instanceof Inet6Address) {
+			Inet6Address dest6 = (Inet6Address) pAddr;
+			// TCP on linkLocal is evil
+			return dest6.isLinkLocalAddress();
+		}
+		return false;
+	}
+
+	static long getMillis() {
+		return new Date().getTime();
+	}
+
+	private void addTCPRequester(InetAddress pDest) throws ServiceLocationException {
+		if (this.iTCPRequesters == null) this.iTCPRequesters = new ArrayList();
+		this.iTCPRequesters.add(new TCPRequester(this.iResTable, pDest, this.iReqMsg, true));
+	}
+
+	private void waitForTCPRequesters() {
+		if (this.iTCPRequesters == null) return;
+		Iterator itr = this.iTCPRequesters.iterator();
+		while (itr.hasNext())
+			itr.next().waitFor();
+		this.iTCPRequesters.clear();
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/LocatorImpl.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/LocatorImpl.java
similarity index 72%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/LocatorImpl.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/LocatorImpl.java
index e099497..90851a6 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/LocatorImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/LocatorImpl.java
@@ -1,142 +1,140 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.ua;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.InetAddress;
-import java.util.Locale;
-import java.util.SortedSet;
-import java.util.Vector;
-
-import org.sentrysoftware.wbem.sblim.slp.Locator;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationEnumeration;
-import org.sentrysoftware.wbem.sblim.slp.ServiceType;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPDefaults;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.AttributeRequest;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceRequest;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceTypeRequest;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.Util;
-
-/**
- * LocatorImpl
- * 
- */
-public class LocatorImpl implements Locator {
-
-	private Locale iLocale;
-
-	private String iLangTag;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pLocale
-	 */
-	public LocatorImpl(Locale pLocale) {
-		this.iLocale = pLocale;
-		this.iLangTag = Util.getLangTag(this.iLocale);
-		TRC.debug("created, langTag=" + this.iLangTag);
-	}
-
-	public ServiceLocationEnumeration findAttributes(ServiceURL pURL, Vector pScopes,
-			Vector pAttributeIds) {
-		return findAttributes(pURL, pScopes, pAttributeIds, null);
-	}
-
-	public ServiceLocationEnumeration findAttributes(ServiceURL pURL, Vector pScopes,
-			Vector pAttributeIds, Vector pDirectoryAgents) {
-		return new SLEnumerationImpl(new AttributeRequest(this.iLangTag, (SortedSet) null,
-				pURL.toString(), getScopes(pScopes), pAttributeIds, null), pDirectoryAgents);
-	}
-
-	public ServiceLocationEnumeration findAttributes(ServiceType pType, Vector pScopes,
-			Vector pAttributeIds) {
-		return findAttributes(pType, pScopes, pAttributeIds, null);
-	}
-
-	public ServiceLocationEnumeration findAttributes(ServiceType pType, Vector pScopes,
-			Vector pAttributeIds, Vector pDirectoryAgents) {
-		return new SLEnumerationImpl(new AttributeRequest(this.iLangTag, (SortedSet) null,
-				pType.toString(), getScopes(pScopes), pAttributeIds, null), pDirectoryAgents);
-	}
-
-	public ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
-			Vector pScopes) {
-		return findServiceTypes(pNamingAuthority, pScopes, null);
-	}
-
-	public ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
-			Vector pScopes, Vector pDirectoryAgent) {
-		return new SLEnumerationImpl(new ServiceTypeRequest(this.iLangTag, null, pNamingAuthority,
-				getScopes(pScopes)), pDirectoryAgent);
-	}
-
-	public ServiceLocationEnumeration findServices(ServiceType pType, Vector pScopes,
-			String pSearchFilter) {
-		return findServices(pType, pScopes, pSearchFilter, null);
-	}
-
-	public ServiceLocationEnumeration findServices(ServiceType pType, Vector pScopes,
-			String pSearchFilter, Vector pDirectoryAgents) {
-		return new SLEnumerationImpl(new ServiceRequest(this.iLangTag, null, pType,
-				getScopes(pScopes), pSearchFilter, null), pDirectoryAgents);
-	}
-
-	public Locale getLocale() {
-		return this.iLocale;
-	}
-
-	/**
-	 * @param pScopes
-	 * @return pScopes if that is not empty or a Vector with "default" entry if
-	 *         the pScopes is null or empty
-	 */
-	private static Vector getScopes(Vector pScopes) {
-		if (pScopes == null) pScopes = new Vector();
-		if (pScopes.isEmpty()) pScopes.add(SLPDefaults.DEFAULT_SCOPE);
-		return pScopes;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.ua;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.InetAddress;
+import java.util.Locale;
+import java.util.SortedSet;
+import java.util.Vector;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationEnumeration;
+import org.metricshub.wbem.sblim.slp.ServiceType;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+import org.metricshub.wbem.sblim.slp.internal.msg.AttributeRequest;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRequest;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceTypeRequest;
+import org.metricshub.wbem.sblim.slp.Locator;
+import org.metricshub.wbem.sblim.slp.internal.msg.Util;
+
+/**
+ * LocatorImpl
+ * 
+ */
+public class LocatorImpl implements Locator {
+
+	private Locale iLocale;
+
+	private String iLangTag;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pLocale
+	 */
+	public LocatorImpl(Locale pLocale) {
+		this.iLocale = pLocale;
+		this.iLangTag = Util.getLangTag(this.iLocale);
+		TRC.debug("created, langTag=" + this.iLangTag);
+	}
+
+	public ServiceLocationEnumeration findAttributes(ServiceURL pURL, Vector pScopes,
+			Vector pAttributeIds) {
+		return findAttributes(pURL, pScopes, pAttributeIds, null);
+	}
+
+	public ServiceLocationEnumeration findAttributes(ServiceURL pURL, Vector pScopes,
+			Vector pAttributeIds, Vector pDirectoryAgents) {
+		return new SLEnumerationImpl(new AttributeRequest(this.iLangTag, (SortedSet) null,
+				pURL.toString(), getScopes(pScopes), pAttributeIds, null), pDirectoryAgents);
+	}
+
+	public ServiceLocationEnumeration findAttributes(ServiceType pType, Vector pScopes,
+			Vector pAttributeIds) {
+		return findAttributes(pType, pScopes, pAttributeIds, null);
+	}
+
+	public ServiceLocationEnumeration findAttributes(ServiceType pType, Vector pScopes,
+			Vector pAttributeIds, Vector pDirectoryAgents) {
+		return new SLEnumerationImpl(new AttributeRequest(this.iLangTag, (SortedSet) null,
+				pType.toString(), getScopes(pScopes), pAttributeIds, null), pDirectoryAgents);
+	}
+
+	public ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
+			Vector pScopes) {
+		return findServiceTypes(pNamingAuthority, pScopes, null);
+	}
+
+	public ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
+			Vector pScopes, Vector pDirectoryAgent) {
+		return new SLEnumerationImpl(new ServiceTypeRequest(this.iLangTag, null, pNamingAuthority,
+				getScopes(pScopes)), pDirectoryAgent);
+	}
+
+	public ServiceLocationEnumeration findServices(ServiceType pType, Vector pScopes,
+			String pSearchFilter) {
+		return findServices(pType, pScopes, pSearchFilter, null);
+	}
+
+	public ServiceLocationEnumeration findServices(ServiceType pType, Vector pScopes,
+			String pSearchFilter, Vector pDirectoryAgents) {
+		return new SLEnumerationImpl(new ServiceRequest(this.iLangTag, null, pType,
+				getScopes(pScopes), pSearchFilter, null), pDirectoryAgents);
+	}
+
+	public Locale getLocale() {
+		return this.iLocale;
+	}
+
+	/**
+	 * @param pScopes
+	 * @return pScopes if that is not empty or a Vector with "default" entry if
+	 *         the pScopes is null or empty
+	 */
+	private static Vector getScopes(Vector pScopes) {
+		if (pScopes == null) pScopes = new Vector();
+		if (pScopes.isEmpty()) pScopes.add(SLPDefaults.DEFAULT_SCOPE);
+		return pScopes;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/ResponseCache.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResponseCache.java
similarity index 76%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/ResponseCache.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResponseCache.java
index d471e8a..2b4dcdb 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/ResponseCache.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResponseCache.java
@@ -1,126 +1,124 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2010
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 3019214    2010-06-21  blaschke-oss SLP equals methods assume too much
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.ua;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.net.DatagramPacket;
-import java.util.Arrays;
-import java.util.HashSet;
-
-/**
- * ResponseCache intends to eliminate the processing of SLP responses with the
- * same content.
- * 
- */
-public class ResponseCache {
-
-	private static class Entry {
-
-		private byte[] iData;
-
-		private int iHashCode;
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pData
-		 * @param pOffset
-		 * @param pLength
-		 */
-		public Entry(byte[] pData, int pOffset, int pLength) {
-			this.iData = new byte[pLength];
-			System.arraycopy(pData, pOffset, this.iData, 0, pLength);
-			for (int pos = 0; pos < this.iData.length; ++pos) {
-				this.iHashCode <<= 4;
-				this.iHashCode += (this.iData[pos] & 0xff);
-			}
-		}
-
-		/**
-		 * Ctor.
-		 * 
-		 * @param pPacket
-		 */
-		public Entry(DatagramPacket pPacket) {
-			this(pPacket.getData(), pPacket.getOffset(), pPacket.getLength());
-		}
-
-		@Override
-		public int hashCode() {
-			return this.iHashCode;
-		}
-
-		@Override
-		public boolean equals(Object pObj) {
-			if (pObj == null || !(pObj instanceof Entry)) return false;
-			if (this == pObj) return true;
-			Entry that = (Entry) pObj;
-			return this.iHashCode == that.iHashCode && Arrays.equals(this.iData, that.iData);
-		}
-
-	}
-
-	private HashSet iResponseSet = new HashSet();
-
-	/**
-	 * add
-	 * 
-	 * @param pPacket
-	 */
-	public void add(DatagramPacket pPacket) {
-		this.iResponseSet.add(new Entry(pPacket));
-	}
-
-	/**
-	 * contains
-	 * 
-	 * @param pPacket
-	 * @return boolean
-	 */
-	public boolean contains(DatagramPacket pPacket) {
-		return this.iResponseSet.contains(new Entry(pPacket));
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2010
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 3019214    2010-06-21  blaschke-oss SLP equals methods assume too much
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.ua;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.net.DatagramPacket;
+import java.util.Arrays;
+import java.util.HashSet;
+
+/**
+ * ResponseCache intends to eliminate the processing of SLP responses with the
+ * same content.
+ * 
+ */
+public class ResponseCache {
+
+	private static class Entry {
+
+		private byte[] iData;
+
+		private int iHashCode;
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pData
+		 * @param pOffset
+		 * @param pLength
+		 */
+		public Entry(byte[] pData, int pOffset, int pLength) {
+			this.iData = new byte[pLength];
+			System.arraycopy(pData, pOffset, this.iData, 0, pLength);
+			for (int pos = 0; pos < this.iData.length; ++pos) {
+				this.iHashCode <<= 4;
+				this.iHashCode += (this.iData[pos] & 0xff);
+			}
+		}
+
+		/**
+		 * Ctor.
+		 * 
+		 * @param pPacket
+		 */
+		public Entry(DatagramPacket pPacket) {
+			this(pPacket.getData(), pPacket.getOffset(), pPacket.getLength());
+		}
+
+		@Override
+		public int hashCode() {
+			return this.iHashCode;
+		}
+
+		@Override
+		public boolean equals(Object pObj) {
+			if (pObj == null || !(pObj instanceof Entry)) return false;
+			if (this == pObj) return true;
+			Entry that = (Entry) pObj;
+			return this.iHashCode == that.iHashCode && Arrays.equals(this.iData, that.iData);
+		}
+
+	}
+
+	private HashSet iResponseSet = new HashSet();
+
+	/**
+	 * add
+	 * 
+	 * @param pPacket
+	 */
+	public void add(DatagramPacket pPacket) {
+		this.iResponseSet.add(new Entry(pPacket));
+	}
+
+	/**
+	 * contains
+	 * 
+	 * @param pPacket
+	 * @return boolean
+	 */
+	public boolean contains(DatagramPacket pPacket) {
+		return this.iResponseSet.contains(new Entry(pPacket));
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/ResultTable.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResultTable.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/ResultTable.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResultTable.java
index cd01bad..bee02dd 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/ResultTable.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResultTable.java
@@ -1,235 +1,233 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 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) 
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.ua;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.NoSuchElementException;
-
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ReplyMessage;
-
-/**
- * ResultTable
- * 
- */
-public class ResultTable implements Iterator {
-
-	private ArrayList iRequesters = new ArrayList();
-
-	private ArrayList iExceptions = new ArrayList();
-
-	/*
-	 * iInSet contains the results which are not read out. iOutSet contains the
-	 * results which are read out.
-	 */
-	private LinkedHashSet iInSet = new LinkedHashSet();
-
-	private LinkedHashSet iOutSet = new LinkedHashSet();
-
-	/**
-	 * ResultTable has to know which Requesters provide results. Requester have
-	 * to be registered before hasNext() is called.
-	 * 
-	 * @see #unregisterRequester(DatagramRequester)
-	 * @param pReq
-	 */
-	public synchronized void registerRequester(DatagramRequester pReq) {
-		for (int i = 0; i < this.iRequesters.size(); i++)
-			if (pReq == this.iRequesters.get(i)) return;
-		this.iRequesters.add(pReq);
-	}
-
-	/**
-	 * If the Requester's sequence is completed, Requester has to be
-	 * unregistered otherwise hasNext() will block.
-	 * 
-	 * @param pReq
-	 */
-	public synchronized void unregisterRequester(DatagramRequester pReq) {
-		for (int i = 0; i < this.iRequesters.size(); i++) {
-			if (pReq == this.iRequesters.get(i)) {
-				this.iRequesters.remove(i);
-				if (this.iRequesters.size() == 0) wakeUp();
-				return;
-			}
-		}
-	}
-
-	/**
-	 * addResults
-	 * 
-	 * @param pReplyMsg
-	 */
-	public void addResults(ReplyMessage pReplyMsg) {
-		addResults(pReplyMsg.getResultIterator());
-	}
-
-	/**
-	 * addResults
-	 * 
-	 * @param pResItr
-	 */
-	public synchronized void addResults(Iterator pResItr) {
-		if (pResItr == null) return;
-		while (pResItr.hasNext())
-			addResult(pResItr.next());
-		// waking up hasNext()
-		if (this.iInSet.size() > 0) wakeUp();
-	}
-
-	/**
-	 * addExceptions
-	 * 
-	 * @param pReplyMsg
-	 */
-	public synchronized void addExceptions(ReplyMessage pReplyMsg) {
-		addExceptions(pReplyMsg.getExceptionIterator());
-	}
-
-	/**
-	 * addExceptions
-	 * 
-	 * @param pExceptionItr
-	 */
-	public synchronized void addExceptions(Iterator pExceptionItr) {
-		if (pExceptionItr == null) return;
-		while (pExceptionItr.hasNext())
-			addException((Exception) pExceptionItr.next());
-	}
-
-	/**
-	 * addException
-	 * 
-	 * @param pE
-	 */
-	public synchronized void addException(Exception pE) {
-		this.iExceptions.add(pE);
-		if (this.iExceptions.size() > 0) wakeUp();
-	}
-
-	/**
-	 * getTotalResponses
-	 * 
-	 * @return int
-	 */
-	public synchronized int getTotalResponses() {
-		return this.iOutSet.size() + this.iInSet.size();
-	}
-
-	/**
-	 * @see java.util.Iterator#hasNext()
-	 * @return true if there are results or exceptions to read
-	 */
-	public synchronized boolean hasNext() {
-		if (hasData()) return true;
-		// no more requester, no chance for result
-		if (this.iRequesters.size() == 0) return false;
-		/*
-		 * wait wake up if iInSet is extended or all Requesters are unregistered
-		 */
-		try {
-			wait();
-		} catch (InterruptedException e) {
-			TRC.error(e);
-		}
-		return hasData();
-	}
-
-	/**
-	 * @see java.util.Iterator#next()
-	 * @return a result or an Exception
-	 */
-	public synchronized Object next() throws NoSuchElementException {
-		Iterator itr = this.iInSet.iterator();
-		Object res = itr.next();
-		this.iInSet.remove(res);
-		this.iOutSet.add(res);
-		return res;
-	}
-
-	/**
-	 * @return next element in Exception table
-	 * @throws NoSuchElementException
-	 */
-	public Object nextException() throws NoSuchElementException {
-		Iterator itr = this.iExceptions.iterator();
-		Object res = itr.next();
-		this.iExceptions.remove(res);
-		return res;
-	}
-
-	/**
-	 * @return next element in Exception table
-	 */
-	public boolean hasMoreExceptions() {
-		return this.iExceptions.size() > 0;
-	}
-
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	private void addResult(Object pResult) {
-		if (this.iOutSet.contains(pResult) || this.iInSet.contains(pResult)) return;
-		this.iInSet.add(pResult);
-	}
-
-	private void wakeUp() {
-		try {
-			notifyAll();
-		} catch (IllegalMonitorStateException e) {
-			TRC.error(e);
-		}
-	}
-
-	private boolean hasData() {
-		return this.iInSet.size() > 0;
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 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) 
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.ua;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.NoSuchElementException;
+
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+import org.metricshub.wbem.sblim.slp.internal.msg.ReplyMessage;
+
+/**
+ * ResultTable
+ * 
+ */
+public class ResultTable implements Iterator {
+
+	private ArrayList iRequesters = new ArrayList();
+
+	private ArrayList iExceptions = new ArrayList();
+
+	/*
+	 * iInSet contains the results which are not read out. iOutSet contains the
+	 * results which are read out.
+	 */
+	private LinkedHashSet iInSet = new LinkedHashSet();
+
+	private LinkedHashSet iOutSet = new LinkedHashSet();
+
+	/**
+	 * ResultTable has to know which Requesters provide results. Requester have
+	 * to be registered before hasNext() is called.
+	 * 
+	 * @see #unregisterRequester(DatagramRequester)
+	 * @param pReq
+	 */
+	public synchronized void registerRequester(DatagramRequester pReq) {
+		for (int i = 0; i < this.iRequesters.size(); i++)
+			if (pReq == this.iRequesters.get(i)) return;
+		this.iRequesters.add(pReq);
+	}
+
+	/**
+	 * If the Requester's sequence is completed, Requester has to be
+	 * unregistered otherwise hasNext() will block.
+	 * 
+	 * @param pReq
+	 */
+	public synchronized void unregisterRequester(DatagramRequester pReq) {
+		for (int i = 0; i < this.iRequesters.size(); i++) {
+			if (pReq == this.iRequesters.get(i)) {
+				this.iRequesters.remove(i);
+				if (this.iRequesters.size() == 0) wakeUp();
+				return;
+			}
+		}
+	}
+
+	/**
+	 * addResults
+	 * 
+	 * @param pReplyMsg
+	 */
+	public void addResults(ReplyMessage pReplyMsg) {
+		addResults(pReplyMsg.getResultIterator());
+	}
+
+	/**
+	 * addResults
+	 * 
+	 * @param pResItr
+	 */
+	public synchronized void addResults(Iterator pResItr) {
+		if (pResItr == null) return;
+		while (pResItr.hasNext())
+			addResult(pResItr.next());
+		// waking up hasNext()
+		if (this.iInSet.size() > 0) wakeUp();
+	}
+
+	/**
+	 * addExceptions
+	 * 
+	 * @param pReplyMsg
+	 */
+	public synchronized void addExceptions(ReplyMessage pReplyMsg) {
+		addExceptions(pReplyMsg.getExceptionIterator());
+	}
+
+	/**
+	 * addExceptions
+	 * 
+	 * @param pExceptionItr
+	 */
+	public synchronized void addExceptions(Iterator pExceptionItr) {
+		if (pExceptionItr == null) return;
+		while (pExceptionItr.hasNext())
+			addException((Exception) pExceptionItr.next());
+	}
+
+	/**
+	 * addException
+	 * 
+	 * @param pE
+	 */
+	public synchronized void addException(Exception pE) {
+		this.iExceptions.add(pE);
+		if (this.iExceptions.size() > 0) wakeUp();
+	}
+
+	/**
+	 * getTotalResponses
+	 * 
+	 * @return int
+	 */
+	public synchronized int getTotalResponses() {
+		return this.iOutSet.size() + this.iInSet.size();
+	}
+
+	/**
+	 * @see java.util.Iterator#hasNext()
+	 * @return true if there are results or exceptions to read
+	 */
+	public synchronized boolean hasNext() {
+		if (hasData()) return true;
+		// no more requester, no chance for result
+		if (this.iRequesters.size() == 0) return false;
+		/*
+		 * wait wake up if iInSet is extended or all Requesters are unregistered
+		 */
+		try {
+			wait();
+		} catch (InterruptedException e) {
+			TRC.error(e);
+		}
+		return hasData();
+	}
+
+	/**
+	 * @see java.util.Iterator#next()
+	 * @return a result or an Exception
+	 */
+	public synchronized Object next() throws NoSuchElementException {
+		Iterator itr = this.iInSet.iterator();
+		Object res = itr.next();
+		this.iInSet.remove(res);
+		this.iOutSet.add(res);
+		return res;
+	}
+
+	/**
+	 * @return next element in Exception table
+	 * @throws NoSuchElementException
+	 */
+	public Object nextException() throws NoSuchElementException {
+		Iterator itr = this.iExceptions.iterator();
+		Object res = itr.next();
+		this.iExceptions.remove(res);
+		return res;
+	}
+
+	/**
+	 * @return next element in Exception table
+	 */
+	public boolean hasMoreExceptions() {
+		return this.iExceptions.size() > 0;
+	}
+
+	public void remove() {
+		throw new UnsupportedOperationException();
+	}
+
+	private void addResult(Object pResult) {
+		if (this.iOutSet.contains(pResult) || this.iInSet.contains(pResult)) return;
+		this.iInSet.add(pResult);
+	}
+
+	private void wakeUp() {
+		try {
+			notifyAll();
+		} catch (IllegalMonitorStateException e) {
+			TRC.error(e);
+		}
+	}
+
+	private boolean hasData() {
+		return this.iInSet.size() > 0;
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java
similarity index 82%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java
index 3d3b875..83c214d 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java
@@ -1,257 +1,255 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1804402    2007-11-10  ebak         IPv6 ready SLP - revision 4
- * 1892103    2008-02-12  ebak         SLP improvements
- * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 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)
- * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.ua;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationEnumeration;
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.ServiceURL;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPDefaults;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.DADescriptor;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.RequestMessage;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ServiceRequest;
-
-/**
- * SLEnumerationImpl
- * 
- */
-public class SLEnumerationImpl implements ServiceLocationEnumeration {
-
-	private RequestMessage iReqMsg;
-
-	private ResultTable iResultTable;
-
-	private List iDAList;
-
-	private boolean iInited = false;
-
-	private boolean iIsDASrvRequest;
-
-	private DatagramRequester iMCastRequester;
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pReqMsg
-	 * @param pDAList
-	 */
-	public SLEnumerationImpl(RequestMessage pReqMsg, List pDAList) {
-		this.iReqMsg = pReqMsg;
-		this.iResultTable = new ResultTable();
-		this.iDAList = pDAList;
-		this.iIsDASrvRequest = isDASrvRequest();
-	}
-
-	/**
-	 * This implementation can throw RuntimeExceptions. They can be ignored or
-	 * used for analysis.
-	 * 
-	 * @see ServiceLocationEnumeration#next()
-	 */
-	public Object next() throws NoSuchElementException {
-		Object obj = this.iResultTable.next();
-		if (obj instanceof Exception) throw new RuntimeException((Exception) obj);
-		if (this.iIsDASrvRequest) {
-			// DADescriptor is internal -> converting to ServiceURL
-			DADescriptor daDesc = (DADescriptor) obj;
-			return new ServiceURL(daDesc.getURL(), ServiceURL.LIFETIME_MAXIMUM);
-		}
-		return obj;
-	}
-
-	/**
-	 * @return next Object in Exception table
-	 * @throws NoSuchElementException
-	 * 
-	 *             This in internal implementation to get list of all exceptions
-	 *             thrown/caught by parser This can throw RuntimeExceptions.
-	 *             They can be ignored or used for analysis.
-	 * 
-	 *             use hasNextException to check whether there exists another
-	 *             element in Exception table
-	 */
-	public Object nextException() throws NoSuchElementException {
-		return this.iResultTable.nextException();
-	}
-
-	/**
-	 * @return true if there exists another element in Exception table
-	 * 
-	 */
-	public boolean hasMoreExceptions() {
-		return this.iResultTable.hasMoreExceptions();
-	}
-
-	/*
-	 * states: - init - initiated - finished
-	 */
-	public boolean hasMoreElements() {
-		if (!this.iInited) {
-			List daList = null;
-			/*
-			 * OpenSLP DA doesn't reply to unicasted DA discovery, therefore if
-			 * the discoverable service type is service:directory-agent a
-			 * multicasting is done.
-			 */
-			if (!this.iIsDASrvRequest) {
-				try {
-					daList = getDAList(this.iReqMsg.getScopeList());
-				} catch (Exception e) {
-					throw new RuntimeException(new ServiceLocationException(
-							ServiceLocationException.INTERNAL_ERROR, e));
-				}
-			}
-			try {
-				if (daList == null || daList.size() == 0) {
-					setupMulticasting();
-				} else {
-					setupUnicasting(daList);
-				}
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-			this.iInited = true;
-		}
-		return this.iResultTable.hasNext();
-	}
-
-	public Object nextElement() throws NoSuchElementException {
-		return next();
-	}
-
-	/**
-	 * For diagnostic only!
-	 * 
-	 * @return int
-	 */
-	public int getPort() {
-		return this.iMCastRequester == null ? -1 : this.iMCastRequester.getPort();
-	}
-
-	private boolean isDASrvRequest() {
-		if (!(this.iReqMsg instanceof ServiceRequest)) return false;
-		ServiceRequest srvReq = (ServiceRequest) this.iReqMsg;
-		return SLPDefaults.DA_SERVICE_TYPE.equals(srvReq.getServiceType());
-	}
-
-	/**
-	 * @param pScopes
-	 * @return List of DA address InetAddresses
-	 * @throws UnknownHostException
-	 */
-	private List getDAList(List pScopes) throws UnknownHostException,
-			IOException {
-		if (this.iDAList != null && this.iDAList.size() > 0) return this.iDAList;
-
-		// return cached DA list from previous discovery
-		List scopes = DACache.getDiscoverableScopeList(pScopes);
-		if (scopes != null) {
-			ResultTable resultTable = new ResultTable();
-			ServiceRequest srvReq = new ServiceRequest(null, SLPDefaults.DA_SERVICE_TYPE, scopes,
-					null, null);
-			// multicast DA discovery
-			DatagramRequester requester = new DatagramRequester(srvReq, resultTable);
-			requester.start(false);
-			if (resultTable.hasNext()) {
-				List daList = new ArrayList();
-				while (resultTable.hasNext()) {
-					try {
-						daList.add((DADescriptor) resultTable.next());
-					} catch (RuntimeException e) {
-						TRC.warning(e.getMessage(), e);
-					}
-				}
-				DACache.setDAList(scopes, daList);
-			}
-		}
-		return getInetAddresses(DACache.getDAList(pScopes));
-	}
-
-	private List getInetAddresses(List pAddrStrList) {
-		if (pAddrStrList == null) return null;
-		List list = new ArrayList(pAddrStrList.size());
-		Iterator strItr = pAddrStrList.iterator();
-		while (strItr.hasNext()) {
-			String srvURLStr = strItr.next();
-			try {
-				ServiceURL srvURL = new ServiceURL(srvURLStr, ServiceURL.LIFETIME_DEFAULT);
-				list.add(InetAddress.getByName(srvURL.getURLPath()));
-			} catch (Exception e) {
-				TRC.error("Failed to get InetAddress for srvURLStr=" + srvURLStr, e);
-			}
-		}
-		TRC.info("number of discovered DAs:" + list.size());
-		return list;
-	}
-
-	private void setupUnicasting(List pDAList) throws IOException {
-		Iterator itr = pDAList.iterator();
-		while (itr.hasNext()) {
-			InetAddress address = itr.next();
-			new DatagramRequester(this.iReqMsg, this.iResultTable, address).start(true);
-		}
-	}
-
-	private void setupMulticasting() throws ServiceLocationException, IOException {
-		try {
-			this.iMCastRequester = new DatagramRequester(this.iReqMsg, this.iResultTable);
-			this.iMCastRequester.start(true);
-		} catch (UnknownHostException e) {
-			throw new ServiceLocationException(ServiceLocationException.NETWORK_ERROR, e);
-		}
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1804402    2007-11-10  ebak         IPv6 ready SLP - revision 4
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 1949918    2008-04-08  raman_arora  Malformed service URL crashes SLP discovery
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 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)
+ * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.ua;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.metricshub.wbem.sblim.slp.ServiceLocationEnumeration;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+import org.metricshub.wbem.sblim.slp.internal.msg.DADescriptor;
+import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRequest;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+
+/**
+ * SLEnumerationImpl
+ * 
+ */
+public class SLEnumerationImpl implements ServiceLocationEnumeration {
+
+	private RequestMessage iReqMsg;
+
+	private ResultTable iResultTable;
+
+	private List iDAList;
+
+	private boolean iInited = false;
+
+	private boolean iIsDASrvRequest;
+
+	private DatagramRequester iMCastRequester;
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pReqMsg
+	 * @param pDAList
+	 */
+	public SLEnumerationImpl(RequestMessage pReqMsg, List pDAList) {
+		this.iReqMsg = pReqMsg;
+		this.iResultTable = new ResultTable();
+		this.iDAList = pDAList;
+		this.iIsDASrvRequest = isDASrvRequest();
+	}
+
+	/**
+	 * This implementation can throw RuntimeExceptions. They can be ignored or
+	 * used for analysis.
+	 * 
+	 * @see ServiceLocationEnumeration#next()
+	 */
+	public Object next() throws NoSuchElementException {
+		Object obj = this.iResultTable.next();
+		if (obj instanceof Exception) throw new RuntimeException((Exception) obj);
+		if (this.iIsDASrvRequest) {
+			// DADescriptor is internal -> converting to ServiceURL
+			DADescriptor daDesc = (DADescriptor) obj;
+			return new ServiceURL(daDesc.getURL(), ServiceURL.LIFETIME_MAXIMUM);
+		}
+		return obj;
+	}
+
+	/**
+	 * @return next Object in Exception table
+	 * @throws NoSuchElementException
+	 * 
+	 *             This in internal implementation to get list of all exceptions
+	 *             thrown/caught by parser This can throw RuntimeExceptions.
+	 *             They can be ignored or used for analysis.
+	 * 
+	 *             use hasNextException to check whether there exists another
+	 *             element in Exception table
+	 */
+	public Object nextException() throws NoSuchElementException {
+		return this.iResultTable.nextException();
+	}
+
+	/**
+	 * @return true if there exists another element in Exception table
+	 * 
+	 */
+	public boolean hasMoreExceptions() {
+		return this.iResultTable.hasMoreExceptions();
+	}
+
+	/*
+	 * states: - init - initiated - finished
+	 */
+	public boolean hasMoreElements() {
+		if (!this.iInited) {
+			List daList = null;
+			/*
+			 * OpenSLP DA doesn't reply to unicasted DA discovery, therefore if
+			 * the discoverable service type is service:directory-agent a
+			 * multicasting is done.
+			 */
+			if (!this.iIsDASrvRequest) {
+				try {
+					daList = getDAList(this.iReqMsg.getScopeList());
+				} catch (Exception e) {
+					throw new RuntimeException(new ServiceLocationException(
+							ServiceLocationException.INTERNAL_ERROR, e));
+				}
+			}
+			try {
+				if (daList == null || daList.size() == 0) {
+					setupMulticasting();
+				} else {
+					setupUnicasting(daList);
+				}
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+			this.iInited = true;
+		}
+		return this.iResultTable.hasNext();
+	}
+
+	public Object nextElement() throws NoSuchElementException {
+		return next();
+	}
+
+	/**
+	 * For diagnostic only!
+	 * 
+	 * @return int
+	 */
+	public int getPort() {
+		return this.iMCastRequester == null ? -1 : this.iMCastRequester.getPort();
+	}
+
+	private boolean isDASrvRequest() {
+		if (!(this.iReqMsg instanceof ServiceRequest)) return false;
+		ServiceRequest srvReq = (ServiceRequest) this.iReqMsg;
+		return SLPDefaults.DA_SERVICE_TYPE.equals(srvReq.getServiceType());
+	}
+
+	/**
+	 * @param pScopes
+	 * @return List of DA address InetAddresses
+	 * @throws UnknownHostException
+	 */
+	private List getDAList(List pScopes) throws UnknownHostException,
+			IOException {
+		if (this.iDAList != null && this.iDAList.size() > 0) return this.iDAList;
+
+		// return cached DA list from previous discovery
+		List scopes = DACache.getDiscoverableScopeList(pScopes);
+		if (scopes != null) {
+			ResultTable resultTable = new ResultTable();
+			ServiceRequest srvReq = new ServiceRequest(null, SLPDefaults.DA_SERVICE_TYPE, scopes,
+					null, null);
+			// multicast DA discovery
+			DatagramRequester requester = new DatagramRequester(srvReq, resultTable);
+			requester.start(false);
+			if (resultTable.hasNext()) {
+				List daList = new ArrayList();
+				while (resultTable.hasNext()) {
+					try {
+						daList.add((DADescriptor) resultTable.next());
+					} catch (RuntimeException e) {
+						TRC.warning(e.getMessage(), e);
+					}
+				}
+				DACache.setDAList(scopes, daList);
+			}
+		}
+		return getInetAddresses(DACache.getDAList(pScopes));
+	}
+
+	private List getInetAddresses(List pAddrStrList) {
+		if (pAddrStrList == null) return null;
+		List list = new ArrayList(pAddrStrList.size());
+		Iterator strItr = pAddrStrList.iterator();
+		while (strItr.hasNext()) {
+			String srvURLStr = strItr.next();
+			try {
+				ServiceURL srvURL = new ServiceURL(srvURLStr, ServiceURL.LIFETIME_DEFAULT);
+				list.add(InetAddress.getByName(srvURL.getURLPath()));
+			} catch (Exception e) {
+				TRC.error("Failed to get InetAddress for srvURLStr=" + srvURLStr, e);
+			}
+		}
+		TRC.info("number of discovered DAs:" + list.size());
+		return list;
+	}
+
+	private void setupUnicasting(List pDAList) throws IOException {
+		Iterator itr = pDAList.iterator();
+		while (itr.hasNext()) {
+			InetAddress address = itr.next();
+			new DatagramRequester(this.iReqMsg, this.iResultTable, address).start(true);
+		}
+	}
+
+	private void setupMulticasting() throws ServiceLocationException, IOException {
+		try {
+			this.iMCastRequester = new DatagramRequester(this.iReqMsg, this.iResultTable);
+			this.iMCastRequester.start(true);
+		} catch (UnknownHostException e) {
+			throw new ServiceLocationException(ServiceLocationException.NETWORK_ERROR, e);
+		}
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/TCPRequester.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/TCPRequester.java
similarity index 72%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/TCPRequester.java
rename to src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/TCPRequester.java
index a37b149..8432361 100644
--- a/src/main/java/org/sentrysoftware/wbem/sblim/slp/internal/ua/TCPRequester.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/TCPRequester.java
@@ -1,153 +1,151 @@
-/*
-  (C) Copyright IBM Corp. 2007, 2009
-
-  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
-  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
-  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
-  You can obtain a current copy of the Eclipse Public License from
-  http://www.opensource.org/licenses/eclipse-1.0.php
-
-  @author : Endre Bak, IBM, ebak@de.ibm.com
- * 
- * Change History
- * Flag       Date        Prog         Description
- *------------------------------------------------------------------------------- 
- * 1804402    2007-09-28  ebak         IPv6 ready SLP
- * 1892103    2008-02-12  ebak         SLP improvements
- * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
- * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- */
-
-package org.sentrysoftware.wbem.sblim.slp.internal.ua;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-
-import org.sentrysoftware.wbem.sblim.slp.ServiceLocationException;
-import org.sentrysoftware.wbem.sblim.slp.internal.SLPConfig;
-import org.sentrysoftware.wbem.sblim.slp.internal.TRC;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.MsgFactory;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.ReplyMessage;
-import org.sentrysoftware.wbem.sblim.slp.internal.msg.RequestMessage;
-
-/**
- * TCPRequester
- * 
- */
-public class TCPRequester implements Runnable {
-
-	private InetAddress iDestination;
-
-	private Thread iThread;
-
-	private ResultTable iResTable;
-
-	private RequestMessage iReqMsg;
-
-	private byte[] iRequestBytes;
-
-	private int iPort = SLPConfig.getGlobalCfg().getPort();
-
-	private final int iTCPTimeOut = SLPConfig.getGlobalCfg().getTCPTimeout();
-
-	/**
-	 * Ctor.
-	 * 
-	 * @param pResTable
-	 * @param pDestination
-	 * @param pReqMsg
-	 * @param pAsThread
-	 * @throws ServiceLocationException
-	 */
-	public TCPRequester(ResultTable pResTable, InetAddress pDestination, RequestMessage pReqMsg,
-			boolean pAsThread) throws ServiceLocationException {
-		this.iResTable = pResTable;
-		this.iDestination = pDestination;
-		this.iReqMsg = pReqMsg;
-		this.iRequestBytes = pReqMsg.serializeWithoutResponders(false, false, true);
-		// FIXME: Is it safe to omit PreviousResopnder list for TCP request?
-		if (pAsThread) {
-			this.iThread = new Thread(this);
-			this.iThread.start();
-		} else {
-			this.iThread = null;
-			run();
-		}
-	}
-
-	/**
-	 * waitFor
-	 */
-	public void waitFor() {
-		if (this.iThread == null) return;
-		try {
-			this.iThread.join();
-		} catch (InterruptedException e) {
-			TRC.error(e);
-		}
-	}
-
-	public void run() {
-		Socket socket = null;
-		try {
-			socket = new Socket(this.iDestination, this.iPort);
-			socket.setSoTimeout(this.iTCPTimeOut);
-			OutputStream os = socket.getOutputStream();
-			TRC.debug("sendTCP");
-			os.write(this.iRequestBytes);
-			os.flush();
-			handleResponse(socket);
-			TRC.debug("recievedOnTCP");
-		} catch (Exception e) {
-			TRC.error(e.getMessage());
-		} finally {
-			if (socket != null) {
-				try {
-					socket.close();
-				} catch (IOException e) {
-					TRC.error(e);
-				}
-			}
-		}
-
-	}
-
-	private void handleResponse(Socket pSocket) {
-		ReplyMessage replyMsg;
-		try {
-			replyMsg = (ReplyMessage) MsgFactory.parse(pSocket);
-		} catch (Exception e) {
-			this.iResTable.addException(e);
-			return;
-		}
-		if (this.iReqMsg.getXID() == replyMsg.getXID()
-				&& this.iReqMsg.isAllowedResponseType(replyMsg)) this.iResTable
-				.addResults(replyMsg);
-	}
-
-}
+/*
+  (C) Copyright IBM Corp. 2007, 2009
+
+  THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+  ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+  CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+  You can obtain a current copy of the Eclipse Public License from
+  http://www.opensource.org/licenses/eclipse-1.0.php
+
+  @author : Endre Bak, IBM, ebak@de.ibm.com
+ * 
+ * Change History
+ * Flag       Date        Prog         Description
+ *------------------------------------------------------------------------------- 
+ * 1804402    2007-09-28  ebak         IPv6 ready SLP
+ * 1892103    2008-02-12  ebak         SLP improvements
+ * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
+ * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ */
+
+package org.metricshub.wbem.sblim.slp.internal.ua;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+
+import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
+import org.metricshub.wbem.sblim.slp.internal.msg.MsgFactory;
+import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.internal.msg.ReplyMessage;
+
+/**
+ * TCPRequester
+ * 
+ */
+public class TCPRequester implements Runnable {
+
+	private InetAddress iDestination;
+
+	private Thread iThread;
+
+	private ResultTable iResTable;
+
+	private RequestMessage iReqMsg;
+
+	private byte[] iRequestBytes;
+
+	private int iPort = SLPConfig.getGlobalCfg().getPort();
+
+	private final int iTCPTimeOut = SLPConfig.getGlobalCfg().getTCPTimeout();
+
+	/**
+	 * Ctor.
+	 * 
+	 * @param pResTable
+	 * @param pDestination
+	 * @param pReqMsg
+	 * @param pAsThread
+	 * @throws ServiceLocationException
+	 */
+	public TCPRequester(ResultTable pResTable, InetAddress pDestination, RequestMessage pReqMsg,
+			boolean pAsThread) throws ServiceLocationException {
+		this.iResTable = pResTable;
+		this.iDestination = pDestination;
+		this.iReqMsg = pReqMsg;
+		this.iRequestBytes = pReqMsg.serializeWithoutResponders(false, false, true);
+		// FIXME: Is it safe to omit PreviousResopnder list for TCP request?
+		if (pAsThread) {
+			this.iThread = new Thread(this);
+			this.iThread.start();
+		} else {
+			this.iThread = null;
+			run();
+		}
+	}
+
+	/**
+	 * waitFor
+	 */
+	public void waitFor() {
+		if (this.iThread == null) return;
+		try {
+			this.iThread.join();
+		} catch (InterruptedException e) {
+			TRC.error(e);
+		}
+	}
+
+	public void run() {
+		Socket socket = null;
+		try {
+			socket = new Socket(this.iDestination, this.iPort);
+			socket.setSoTimeout(this.iTCPTimeOut);
+			OutputStream os = socket.getOutputStream();
+			TRC.debug("sendTCP");
+			os.write(this.iRequestBytes);
+			os.flush();
+			handleResponse(socket);
+			TRC.debug("recievedOnTCP");
+		} catch (Exception e) {
+			TRC.error(e.getMessage());
+		} finally {
+			if (socket != null) {
+				try {
+					socket.close();
+				} catch (IOException e) {
+					TRC.error(e);
+				}
+			}
+		}
+
+	}
+
+	private void handleResponse(Socket pSocket) {
+		ReplyMessage replyMsg;
+		try {
+			replyMsg = (ReplyMessage) MsgFactory.parse(pSocket);
+		} catch (Exception e) {
+			this.iResTable.addException(e);
+			return;
+		}
+		if (this.iReqMsg.getXID() == replyMsg.getXID()
+				&& this.iReqMsg.isAllowedResponseType(replyMsg)) this.iResTable
+				.addResults(replyMsg);
+	}
+
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/sblim/slp/package.html b/src/main/java/org/metricshub/wbem/sblim/slp/package.html
similarity index 100%
rename from src/main/java/org/sentrysoftware/wbem/sblim/slp/package.html
rename to src/main/java/org/metricshub/wbem/sblim/slp/package.html
diff --git a/src/main/java/org/sentrysoftware/wbem/client/exceptions/WqlQuerySyntaxException.java b/src/main/java/org/sentrysoftware/wbem/client/exceptions/WqlQuerySyntaxException.java
deleted file mode 100644
index 98eca75..0000000
--- a/src/main/java/org/sentrysoftware/wbem/client/exceptions/WqlQuerySyntaxException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.sentrysoftware.wbem.client.exceptions;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * .
- * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
- */
-
-/**
- * Exception for a syntax error in the WQL Query parameter.
- *
- */
-public class WqlQuerySyntaxException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-
-	public WqlQuerySyntaxException(final String wqlQuery) {
-		super("Syntax error in WQL Query: " + wqlQuery);
-	}
-
-	public WqlQuerySyntaxException(final Throwable cause) {
-		super(cause);
-	}
-}
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 1f6fbb6..7cd52bd 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -49,14 +49,14 @@ java -jar --add-exports java.xml/com.sun.org.apache.xerces.internal.parsers --ad
 
 Use it as follows:
 ```Java
-package org.sentrysoftware.wbem;
+package org.metricshub.wbem;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import org.sentrysoftware.wbem.client.WbemClient;
-import org.sentrysoftware.wbem.client.WqlQuery;
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-import org.sentrysoftware.wbem.utils.exceptions.WqlQuerySyntaxException;
+import org.metricshub.wbem.client.WbemClient;
+import org.metricshub.wbem.client.WqlQuery;
+import org.metricshub.wbem.client.exceptions.WqlQuerySyntaxException;
+import org.metricshub.wbem.javax.wbem.WBEMException;
 
 public class Main {
 
diff --git a/src/site/resources/images/metricshub-logo.png b/src/site/resources/images/metricshub-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..89d6fb80d559b54044abd03ee658ddcc6a77ca3f
GIT binary patch
literal 6041
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
 		org.sentrysoftware.maven
 		sentry-maven-skin
-		6.2.00
+		6.4.01
 	
 
 	
@@ -13,15 +13,15 @@
 	
 
 	
-		images/sentry-logo-179x75px.png
-		https://sentrysoftware.com
+		images/metricshub-logo.png
+		https://metricshub.com
 	
 
 	
 
 		
 			
-			
+			
 		
 
 		
diff --git a/src/test/java/org/sentrysoftware/wbem/WbemCimDataHandlerTest.java b/src/test/java/org/metricshub/wbem/WbemCimDataHandlerTest.java
similarity index 90%
rename from src/test/java/org/sentrysoftware/wbem/WbemCimDataHandlerTest.java
rename to src/test/java/org/metricshub/wbem/WbemCimDataHandlerTest.java
index 8a9be5f..1ce5195 100644
--- a/src/test/java/org/sentrysoftware/wbem/WbemCimDataHandlerTest.java
+++ b/src/test/java/org/metricshub/wbem/WbemCimDataHandlerTest.java
@@ -1,158 +1,157 @@
-package org.sentrysoftware.wbem;
-
-import java.math.BigInteger;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import org.sentrysoftware.wbem.javax.cim.CIMClass;
-import org.sentrysoftware.wbem.javax.cim.CIMClassProperty;
-import org.sentrysoftware.wbem.javax.cim.CIMDataType;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTime;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTimeAbsolute;
-import org.sentrysoftware.wbem.javax.cim.CIMDateTimeInterval;
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.cim.CIMProperty;
-import org.sentrysoftware.wbem.client.WbemCimDataHandler;
-
-class WbemCimDataHandlerTest {
-
-	@Test
-	void testGetCimPropertyAsString() {
-
-		final CIMObjectPath objectPath = new CIMObjectPath("root/emc:Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"");
-
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString(null, new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "SYMMETRIX-+-000297800620")}), null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString("Name", null, null));
-
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString("__Path", new CIMInstance(null, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "SYMMETRIX-+-000297800620")}), null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString("Ref", new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref", 1), "x")}), null));
-
-		Assertions.assertEquals(
-				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"",
-				WbemCimDataHandler.getCimPropertyAsString("__PATH", new CIMInstance(objectPath, null), null));
-
-		Assertions.assertEquals(
-				"",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"UnknownProperty",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\"")}), null));
-
-		Assertions.assertEquals(
-				"blablaVal",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"blabla",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\""), new CIMProperty("blabla", CIMDataType.STRING_T, "blablaVal", true, false, null)}), null));
-
-		Assertions.assertEquals(
-				"",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"Name",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, null)}), null));
-
-		Assertions.assertEquals(
-				"\"SYMMETRIX-+-000297800620;\"",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"Name",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\"")}), null));
-
-		Assertions.assertEquals(
-				"true",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"EMCAutoMetaEnabled",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("EMCAutoMetaEnabled", CIMDataType.BOOLEAN_T, Boolean.TRUE)}), null));
-
-		Assertions.assertEquals(
-				"true|false|",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"EMCAutoMetaEnabledArray",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("EMCAutoMetaEnabledArray", CIMDataType.BOOLEAN_ARRAY_T, new Boolean[] {Boolean.TRUE, Boolean.FALSE})}), null));
-
-		Assertions.assertEquals(
-				"10",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"PortType",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("PortType", CIMDataType.SINT32_T, Integer.valueOf(10))}), null));
-
-		Assertions.assertEquals(
-				"2125000000",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"MaxSpeed",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("MaxSpeed", CIMDataType.UINT64_T, new BigInteger("2125000000"))}), null));
-
-		Assertions.assertEquals(
-				"1|2|",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"OperationalStatus",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("OperationalStatus", CIMDataType.SINT16_ARRAY_T, new Short[] {1,2})}), null));
-
-		Assertions.assertEquals(
-				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"Ref",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref"), objectPath)}), null));
-
-		Assertions.assertEquals(
-				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
-				"|",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"Ref",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref", 1), new CIMObjectPath[] {objectPath})}), null));
-
-		Assertions.assertEquals(
-				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
-				"||"+
-				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
-				"|",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"Ref",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref", 3), new CIMObjectPath[] {objectPath, null, objectPath})}), null));
-
-		Assertions.assertEquals(
-				"1173882243000",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"timeAbsolute",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("timeAbsolute", CIMDataType.DATETIME_T, new CIMDateTimeAbsolute("20070314160503.566012+101"))}), null));
-
-		Assertions.assertEquals(
-				"1173882243566",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"timeInterval",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("timeInterval", CIMDataType.DATETIME_T, new CIMDateTimeInterval(1173882243566L))}), null));
-
-		Assertions.assertEquals(
-				"1173882243000|1173882243566|",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"timeArray",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("timeArray", CIMDataType.DATETIME_ARRAY_T, new CIMDateTime[] {new CIMDateTimeAbsolute("20070314160503.566012+101"), new CIMDateTimeInterval(1173882243566L)})}), null));
-
-		final CIMClass cimClass =  new CIMClass(
-				"testClass",
-				null,
-				null,
-				new CIMClassProperty[] {new CIMClassProperty("KeyProp", CIMDataType.STRING_T, null, null, false, false, null)},
-				null);
-
-		Assertions.assertEquals(
-				"class testClass {" +
-				"  string KeyProp;" +
-				"};",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"propClass",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("propClass", CIMDataType.CLASS_T, cimClass)}), null).replaceAll("[\r\n]", ""));
-
-		Assertions.assertEquals(
-				"class testClass {" +
-				"  string KeyProp;" +
-				"};" +
-				"$$" +
-				"class testClass {" +
-				"  string KeyProp;" +
-				"};" +
-				"$",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"propClass",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("propClass", CIMDataType.CLASS_ARRAY_T, new CIMClass[] {cimClass, null, cimClass})}), "$").replaceAll("[\r\n]", ""));
-	}
-}
+package org.metricshub.wbem;
+
+import java.math.BigInteger;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.metricshub.wbem.client.WbemCimDataHandler;
+import org.metricshub.wbem.javax.cim.CIMClass;
+import org.metricshub.wbem.javax.cim.CIMClassProperty;
+import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
+import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMDateTime;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+
+class WbemCimDataHandlerTest {
+
+	@Test
+	void testGetCimPropertyAsString() {
+
+		final CIMObjectPath objectPath = new CIMObjectPath("root/emc:Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"");
+
+		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString(null, new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "SYMMETRIX-+-000297800620")}), null));
+		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString("Name", null, null));
+
+		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString("__Path", new CIMInstance(null, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "SYMMETRIX-+-000297800620")}), null));
+		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString("Ref", new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref", 1), "x")}), null));
+
+		Assertions.assertEquals(
+				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"",
+				WbemCimDataHandler.getCimPropertyAsString("__PATH", new CIMInstance(objectPath, null), null));
+
+		Assertions.assertEquals(
+				"",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"UnknownProperty",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\"")}), null));
+
+		Assertions.assertEquals(
+				"blablaVal",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"blabla",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\""), new CIMProperty("blabla", CIMDataType.STRING_T, "blablaVal", true, false, null)}), null));
+
+		Assertions.assertEquals(
+				"",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"Name",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, null)}), null));
+
+		Assertions.assertEquals(
+				"\"SYMMETRIX-+-000297800620;\"",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"Name",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\"")}), null));
+
+		Assertions.assertEquals(
+				"true",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"EMCAutoMetaEnabled",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("EMCAutoMetaEnabled", CIMDataType.BOOLEAN_T, Boolean.TRUE)}), null));
+
+		Assertions.assertEquals(
+				"true|false|",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"EMCAutoMetaEnabledArray",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("EMCAutoMetaEnabledArray", CIMDataType.BOOLEAN_ARRAY_T, new Boolean[] {Boolean.TRUE, Boolean.FALSE})}), null));
+
+		Assertions.assertEquals(
+				"10",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"PortType",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("PortType", CIMDataType.SINT32_T, Integer.valueOf(10))}), null));
+
+		Assertions.assertEquals(
+				"2125000000",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"MaxSpeed",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("MaxSpeed", CIMDataType.UINT64_T, new BigInteger("2125000000"))}), null));
+
+		Assertions.assertEquals(
+				"1|2|",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"OperationalStatus",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("OperationalStatus", CIMDataType.SINT16_ARRAY_T, new Short[] {1,2})}), null));
+
+		Assertions.assertEquals(
+				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"Ref",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref"), objectPath)}), null));
+
+		Assertions.assertEquals(
+				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
+				"|",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"Ref",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref", 1), new CIMObjectPath[] {objectPath})}), null));
+
+		Assertions.assertEquals(
+				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
+				"||"+
+				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
+				"|",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"Ref",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref", 3), new CIMObjectPath[] {objectPath, null, objectPath})}), null));
+
+		Assertions.assertEquals(
+				"1173882243000",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"timeAbsolute",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("timeAbsolute", CIMDataType.DATETIME_T, new CIMDateTimeAbsolute("20070314160503.566012+101"))}), null));
+
+		Assertions.assertEquals(
+				"1173882243566",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"timeInterval",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("timeInterval", CIMDataType.DATETIME_T, new CIMDateTimeInterval(1173882243566L))}), null));
+
+		Assertions.assertEquals(
+				"1173882243000|1173882243566|",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"timeArray",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("timeArray", CIMDataType.DATETIME_ARRAY_T, new CIMDateTime[] {new CIMDateTimeAbsolute("20070314160503.566012+101"), new CIMDateTimeInterval(1173882243566L)})}), null));
+
+		final CIMClass cimClass =  new CIMClass(
+				"testClass",
+				null,
+				null,
+				new CIMClassProperty[] {new CIMClassProperty("KeyProp", CIMDataType.STRING_T, null, null, false, false, null)},
+				null);
+
+		Assertions.assertEquals(
+				"class testClass {" +
+				"  string KeyProp;" +
+				"};",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"propClass",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("propClass", CIMDataType.CLASS_T, cimClass)}), null).replaceAll("[\r\n]", ""));
+
+		Assertions.assertEquals(
+				"class testClass {" +
+				"  string KeyProp;" +
+				"};" +
+				"$$" +
+				"class testClass {" +
+				"  string KeyProp;" +
+				"};" +
+				"$",
+				WbemCimDataHandler.getCimPropertyAsString(
+						"propClass",
+						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("propClass", CIMDataType.CLASS_ARRAY_T, new CIMClass[] {cimClass, null, cimClass})}), "$").replaceAll("[\r\n]", ""));
+	}
+}
diff --git a/src/test/java/org/sentrysoftware/wbem/WbemClientTest.java b/src/test/java/org/metricshub/wbem/WbemClientTest.java
similarity index 89%
rename from src/test/java/org/sentrysoftware/wbem/WbemClientTest.java
rename to src/test/java/org/metricshub/wbem/WbemClientTest.java
index 7e24bb7..a1a16bf 100644
--- a/src/test/java/org/sentrysoftware/wbem/WbemClientTest.java
+++ b/src/test/java/org/metricshub/wbem/WbemClientTest.java
@@ -1,163 +1,163 @@
-package org.sentrysoftware.wbem;
-
-import java.net.URL;
-import java.util.Locale;
-
-import javax.security.auth.Subject;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatchers;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-import org.sentrysoftware.wbem.client.WbemClient;
-import org.sentrysoftware.wbem.client.WbemQueryResult;
-import org.sentrysoftware.wbem.client.WqlQuery;
-import org.sentrysoftware.wbem.javax.cim.CIMInstance;
-import org.sentrysoftware.wbem.javax.cim.CIMObjectPath;
-import org.sentrysoftware.wbem.javax.wbem.CloseableIterator;
-import org.sentrysoftware.wbem.javax.wbem.client.EnumerateResponse;
-import org.sentrysoftware.wbem.javax.wbem.client.WBEMClient;
-import org.sentrysoftware.wbem.javax.wbem.client.WBEMClientConstants;
-import org.sentrysoftware.wbem.javax.wbem.client.WBEMClientFactory;
-
-class WbemClientTest {
-
-	@Test
-	void testConnect() throws Exception {
-		final URL url = new URL("https://host:8080");
-		final String username = "user";
-		final char[] password = {'p', 'a', 's', 's'};
-		int timeout = 60*1000;
-
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().connect(null, username, password, timeout));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().connect(url, null, password, timeout));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().connect(url, username, null, timeout));
-
-		try (final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
-				final WbemClient wbemClient = new WbemClient()) {
-			final WBEMClient client = Mockito.mock(WBEMClient.class);
-
-			mockedWBEMClientFactory.when(() -> WBEMClientFactory.getClient("CIM-XML")).thenReturn(client);
-			Mockito.doNothing().when(client).setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout));
-			Mockito.doNothing().when(client).initialize(
-					ArgumentMatchers.any(CIMObjectPath.class),
-					ArgumentMatchers.any(Subject.class),
-					ArgumentMatchers.eq(new Locale[] {Locale.ENGLISH}));
-
-			wbemClient.connect(url, username, password, timeout);
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	void testExecuteWql() throws Exception {
-		final String namespace = "root/emc";
-		final WqlQuery queryHandler = WqlQuery.parseQuery("Select * from EMC_StorageSystem");
-
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().executeWql(null, namespace, null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().executeWql(queryHandler, null, null));
-
-		Assertions.assertThrows(IllegalStateException.class, () -> new WbemClient().executeWql(queryHandler, namespace, null));
-
-		final URL url = new URL("https://host:8080");
-		final String username = "user";
-		final char[] password = {'p', 'a', 's', 's'};
-		int timeout = 60*1000;
-		final WBEMClient client = Mockito.mock(WBEMClient.class);
-		final CloseableIterator iterator = Mockito.mock(CloseableIterator.class);
-		final WbemQueryResult result = Mockito.mock(WbemQueryResult.class);
-
-		try (final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
-				final MockedStatic mockedMatsyaWbemClient = Mockito.mockStatic(WbemClient.class);
-				final WbemClient matsyaWbemClient =new WbemClient()) {
-
-			mockedWBEMClientFactory.when(() -> WBEMClientFactory.getClient("CIM-XML")).thenReturn(client);
-
-			Mockito.doNothing().when(client).setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout));
-
-			Mockito.doNothing().when(client).initialize(
-					ArgumentMatchers.any(CIMObjectPath.class),
-					ArgumentMatchers.any(Subject.class),
-					ArgumentMatchers.eq(new Locale[] {Locale.ENGLISH}));
-
-			Mockito.doReturn(iterator).when(client).enumerateInstances(
-					ArgumentMatchers.any(CIMObjectPath.class),
-					ArgumentMatchers.eq(true),
-					ArgumentMatchers.eq(false),
-					ArgumentMatchers.eq(true),
-					ArgumentMatchers.eq(queryHandler.getPropertiesArray()));
-
-			mockedMatsyaWbemClient.when(() -> WbemClient.enumerateInstances(
-					ArgumentMatchers.any(WqlQuery.class),
-					ArgumentMatchers.any(CloseableIterator.class),
-					ArgumentMatchers.isNull()))
-			.thenReturn(result);
-
-			matsyaWbemClient.connect(url, username, password, timeout);
-
-			Assertions.assertEquals(result, matsyaWbemClient.executeWql(queryHandler, namespace, null));
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	@Test
-	void testGetAssociators() throws Exception {
-		final URL url = new URL("https://host:8080");
-		final String username = "user";
-		final char[] password = {'p', 'a', 's', 's'};
-		int timeout = 60*1000;
-		final WBEMClient client = Mockito.mock(WBEMClient.class);
-		final WqlQuery queryHandler = WqlQuery.parseQuery("Select * from EMC_StorageSystem");
-		final EnumerateResponse response = Mockito.mock(EnumerateResponse.class);
-		final CloseableIterator iterator = Mockito.mock(CloseableIterator.class);
-		final WbemQueryResult result = Mockito.mock(WbemQueryResult.class);
-
-		final String objectPathAssociators = "objectPathAssociators";
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().getAssociators(null, objectPathAssociators, null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().getAssociators(queryHandler, null, null));
-
-		Assertions.assertThrows(IllegalStateException.class, () -> new WbemClient().getAssociators(queryHandler, objectPathAssociators, null));
-
-		try (final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
-				final MockedStatic mockedMatsyaWbemClient = Mockito.mockStatic(WbemClient.class);
-				final WbemClient matsyaWbemClient = new WbemClient()) {
-
-			mockedWBEMClientFactory.when(() -> WBEMClientFactory.getClient("CIM-XML")).thenReturn(client);
-
-			Mockito.doNothing().when(client).setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout));
-
-			Mockito.doNothing().when(client).initialize(
-					ArgumentMatchers.any(CIMObjectPath.class),
-					ArgumentMatchers.any(Subject.class),
-					ArgumentMatchers.eq(new Locale[] {Locale.ENGLISH}));
-
-			Mockito.doReturn(response).when(client).associators(
-					ArgumentMatchers.any(CIMObjectPath.class),
-					ArgumentMatchers.eq(queryHandler.getClassName()),
-					ArgumentMatchers.isNull(),
-					ArgumentMatchers.isNull(),
-					ArgumentMatchers.isNull(),
-					ArgumentMatchers.eq(false),
-					ArgumentMatchers.eq(queryHandler.getPropertiesArray()),
-					ArgumentMatchers.isNull(),
-					ArgumentMatchers.isNull(),
-					ArgumentMatchers.isNull(),
-					ArgumentMatchers.eq(false),
-					ArgumentMatchers.isNull());
-
-			Mockito.doReturn(iterator).when(response).getResponses();
-
-			mockedMatsyaWbemClient.when(() -> WbemClient.enumerateInstances(
-					ArgumentMatchers.any(WqlQuery.class),
-					ArgumentMatchers.any(CloseableIterator.class),
-					ArgumentMatchers.isNull()))
-			.thenReturn(result);
-
-			matsyaWbemClient.connect(url, username, password, timeout);
-
-			Assertions.assertEquals(result, matsyaWbemClient.getAssociators(queryHandler, objectPathAssociators, null));
-		}
-	}
-
-}
+package org.metricshub.wbem;
+
+import java.net.URL;
+import java.util.Locale;
+
+import javax.security.auth.Subject;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.metricshub.wbem.client.WbemClient;
+import org.metricshub.wbem.client.WqlQuery;
+import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.wbem.CloseableIterator;
+import org.metricshub.wbem.javax.wbem.client.EnumerateResponse;
+import org.metricshub.wbem.javax.wbem.client.WBEMClient;
+import org.metricshub.wbem.javax.wbem.client.WBEMClientFactory;
+import org.mockito.ArgumentMatchers;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.metricshub.wbem.client.WbemQueryResult;
+import org.metricshub.wbem.javax.wbem.client.WBEMClientConstants;
+
+class WbemClientTest {
+
+	@Test
+	void testConnect() throws Exception {
+		final URL url = new URL("https://host:8080");
+		final String username = "user";
+		final char[] password = {'p', 'a', 's', 's'};
+		int timeout = 60*1000;
+
+		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().connect(null, username, password, timeout));
+		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().connect(url, null, password, timeout));
+		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().connect(url, username, null, timeout));
+
+		try (final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
+				final WbemClient wbemClient = new WbemClient()) {
+			final WBEMClient client = Mockito.mock(WBEMClient.class);
+
+			mockedWBEMClientFactory.when(() -> WBEMClientFactory.getClient("CIM-XML")).thenReturn(client);
+			Mockito.doNothing().when(client).setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout));
+			Mockito.doNothing().when(client).initialize(
+					ArgumentMatchers.any(CIMObjectPath.class),
+					ArgumentMatchers.any(Subject.class),
+					ArgumentMatchers.eq(new Locale[] {Locale.ENGLISH}));
+
+			wbemClient.connect(url, username, password, timeout);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test
+	void testExecuteWql() throws Exception {
+		final String namespace = "root/emc";
+		final WqlQuery queryHandler = WqlQuery.parseQuery("Select * from EMC_StorageSystem");
+
+		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().executeWql(null, namespace, null));
+		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().executeWql(queryHandler, null, null));
+
+		Assertions.assertThrows(IllegalStateException.class, () -> new WbemClient().executeWql(queryHandler, namespace, null));
+
+		final URL url = new URL("https://host:8080");
+		final String username = "user";
+		final char[] password = {'p', 'a', 's', 's'};
+		int timeout = 60*1000;
+		final WBEMClient client = Mockito.mock(WBEMClient.class);
+		final CloseableIterator iterator = Mockito.mock(CloseableIterator.class);
+		final WbemQueryResult result = Mockito.mock(WbemQueryResult.class);
+
+		try (final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
+				final MockedStatic mockedMatsyaWbemClient = Mockito.mockStatic(WbemClient.class);
+				final WbemClient matsyaWbemClient =new WbemClient()) {
+
+			mockedWBEMClientFactory.when(() -> WBEMClientFactory.getClient("CIM-XML")).thenReturn(client);
+
+			Mockito.doNothing().when(client).setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout));
+
+			Mockito.doNothing().when(client).initialize(
+					ArgumentMatchers.any(CIMObjectPath.class),
+					ArgumentMatchers.any(Subject.class),
+					ArgumentMatchers.eq(new Locale[] {Locale.ENGLISH}));
+
+			Mockito.doReturn(iterator).when(client).enumerateInstances(
+					ArgumentMatchers.any(CIMObjectPath.class),
+					ArgumentMatchers.eq(true),
+					ArgumentMatchers.eq(false),
+					ArgumentMatchers.eq(true),
+					ArgumentMatchers.eq(queryHandler.getPropertiesArray()));
+
+			mockedMatsyaWbemClient.when(() -> WbemClient.enumerateInstances(
+					ArgumentMatchers.any(WqlQuery.class),
+					ArgumentMatchers.any(CloseableIterator.class),
+					ArgumentMatchers.isNull()))
+			.thenReturn(result);
+
+			matsyaWbemClient.connect(url, username, password, timeout);
+
+			Assertions.assertEquals(result, matsyaWbemClient.executeWql(queryHandler, namespace, null));
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test
+	void testGetAssociators() throws Exception {
+		final URL url = new URL("https://host:8080");
+		final String username = "user";
+		final char[] password = {'p', 'a', 's', 's'};
+		int timeout = 60*1000;
+		final WBEMClient client = Mockito.mock(WBEMClient.class);
+		final WqlQuery queryHandler = WqlQuery.parseQuery("Select * from EMC_StorageSystem");
+		final EnumerateResponse response = Mockito.mock(EnumerateResponse.class);
+		final CloseableIterator iterator = Mockito.mock(CloseableIterator.class);
+		final WbemQueryResult result = Mockito.mock(WbemQueryResult.class);
+
+		final String objectPathAssociators = "objectPathAssociators";
+		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().getAssociators(null, objectPathAssociators, null));
+		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().getAssociators(queryHandler, null, null));
+
+		Assertions.assertThrows(IllegalStateException.class, () -> new WbemClient().getAssociators(queryHandler, objectPathAssociators, null));
+
+		try (final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
+				final MockedStatic mockedMatsyaWbemClient = Mockito.mockStatic(WbemClient.class);
+				final WbemClient matsyaWbemClient = new WbemClient()) {
+
+			mockedWBEMClientFactory.when(() -> WBEMClientFactory.getClient("CIM-XML")).thenReturn(client);
+
+			Mockito.doNothing().when(client).setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout));
+
+			Mockito.doNothing().when(client).initialize(
+					ArgumentMatchers.any(CIMObjectPath.class),
+					ArgumentMatchers.any(Subject.class),
+					ArgumentMatchers.eq(new Locale[] {Locale.ENGLISH}));
+
+			Mockito.doReturn(response).when(client).associators(
+					ArgumentMatchers.any(CIMObjectPath.class),
+					ArgumentMatchers.eq(queryHandler.getClassName()),
+					ArgumentMatchers.isNull(),
+					ArgumentMatchers.isNull(),
+					ArgumentMatchers.isNull(),
+					ArgumentMatchers.eq(false),
+					ArgumentMatchers.eq(queryHandler.getPropertiesArray()),
+					ArgumentMatchers.isNull(),
+					ArgumentMatchers.isNull(),
+					ArgumentMatchers.isNull(),
+					ArgumentMatchers.eq(false),
+					ArgumentMatchers.isNull());
+
+			Mockito.doReturn(iterator).when(response).getResponses();
+
+			mockedMatsyaWbemClient.when(() -> WbemClient.enumerateInstances(
+					ArgumentMatchers.any(WqlQuery.class),
+					ArgumentMatchers.any(CloseableIterator.class),
+					ArgumentMatchers.isNull()))
+			.thenReturn(result);
+
+			matsyaWbemClient.connect(url, username, password, timeout);
+
+			Assertions.assertEquals(result, matsyaWbemClient.getAssociators(queryHandler, objectPathAssociators, null));
+		}
+	}
+
+}
diff --git a/src/test/java/org/sentrysoftware/wbem/WbemExecutorTest.java b/src/test/java/org/metricshub/wbem/WbemExecutorTest.java
similarity index 92%
rename from src/test/java/org/sentrysoftware/wbem/WbemExecutorTest.java
rename to src/test/java/org/metricshub/wbem/WbemExecutorTest.java
index a7beb0b..b94802b 100644
--- a/src/test/java/org/sentrysoftware/wbem/WbemExecutorTest.java
+++ b/src/test/java/org/metricshub/wbem/WbemExecutorTest.java
@@ -1,82 +1,82 @@
-package org.sentrysoftware.wbem;
-
-import java.net.URL;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatchers;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-import org.sentrysoftware.wbem.client.WbemExecutor;
-import org.sentrysoftware.wbem.client.WbemQueryResult;
-import org.sentrysoftware.wbem.javax.wbem.WBEMException;
-
-class WbemExecutorTest {
-
-	@SuppressWarnings("unchecked")
-	@Test
-	void testExecuteWql() throws Exception {
-		final URL url = new URL("https://host:8080");
-		final String username = "user";
-		final char[] password = {'p', 'a', 's', 's'};
-		int timeout = 60*1000;
-		final String namespace = "root/emc";
-		final String query = "Select * from EMC_StorageSystem";
-
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(null, namespace, username, password, query, timeout, null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(url, namespace, null, password, query,  timeout, null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(url, namespace, username, null, query, timeout, null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(url, namespace, username, password, null, timeout, null));
-		Assertions.assertThrows(TimeoutException.class, () -> WbemExecutor.executeWql(url, namespace, username, password, query, 0, null));
-
-		final WbemQueryResult result = Mockito.mock(WbemQueryResult.class);
-		final Future handler = Mockito.mock(Future.class);
-		final ExecutorService executor = Mockito.mock(ExecutorService.class);
-
-		try (final MockedStatic mockedExecutorService = Mockito.mockStatic(Executors.class)) {
-			final WBEMException wbemException = new WBEMException("msg");
-			final ExecutionException executionException = new ExecutionException(wbemException);
-
-			mockedExecutorService.when(Executors::newSingleThreadExecutor).thenReturn(executor);
-
-			Mockito.doReturn(handler).when(executor).submit(ArgumentMatchers.any(Callable.class));
-			Mockito.doThrow(executionException).when(handler).get(timeout, TimeUnit.MILLISECONDS);
-
-			Assertions.assertThrows(
-					WBEMException.class,
-					() -> WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null));
-		}
-
-		try (final MockedStatic mockedExecutorService = Mockito.mockStatic(Executors.class)) {
-			final IllegalArgumentException illegalArgumentException = new IllegalArgumentException("msg");
-			final ExecutionException executionException = new ExecutionException(illegalArgumentException);
-
-			mockedExecutorService.when(Executors::newSingleThreadExecutor).thenReturn(executor);
-
-			Mockito.doReturn(handler).when(executor).submit(ArgumentMatchers.any(Callable.class));
-			Mockito.doThrow(executionException).when(handler).get(timeout, TimeUnit.MILLISECONDS);
-
-			Assertions.assertThrows(
-					RuntimeException.class,
-					() -> WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null));
-		}
-
-		try (final MockedStatic mockedExecutorService = Mockito.mockStatic(Executors.class)) {
-			mockedExecutorService.when(Executors::newSingleThreadExecutor).thenReturn(executor);
-
-			Mockito.doReturn(handler).when(executor).submit(ArgumentMatchers.any(Callable.class));
-			Mockito.doReturn(result).when(handler).get(timeout, TimeUnit.MILLISECONDS);
-
-			Assertions.assertEquals(
-					result,
-					WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null));
-		}
-	}
-}
+package org.metricshub.wbem;
+
+import java.net.URL;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.metricshub.wbem.client.WbemExecutor;
+import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.mockito.ArgumentMatchers;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.metricshub.wbem.client.WbemQueryResult;
+
+class WbemExecutorTest {
+
+	@SuppressWarnings("unchecked")
+	@Test
+	void testExecuteWql() throws Exception {
+		final URL url = new URL("https://host:8080");
+		final String username = "user";
+		final char[] password = {'p', 'a', 's', 's'};
+		int timeout = 60*1000;
+		final String namespace = "root/emc";
+		final String query = "Select * from EMC_StorageSystem";
+
+		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(null, namespace, username, password, query, timeout, null));
+		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(url, namespace, null, password, query,  timeout, null));
+		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(url, namespace, username, null, query, timeout, null));
+		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(url, namespace, username, password, null, timeout, null));
+		Assertions.assertThrows(TimeoutException.class, () -> WbemExecutor.executeWql(url, namespace, username, password, query, 0, null));
+
+		final WbemQueryResult result = Mockito.mock(WbemQueryResult.class);
+		final Future handler = Mockito.mock(Future.class);
+		final ExecutorService executor = Mockito.mock(ExecutorService.class);
+
+		try (final MockedStatic mockedExecutorService = Mockito.mockStatic(Executors.class)) {
+			final WBEMException wbemException = new WBEMException("msg");
+			final ExecutionException executionException = new ExecutionException(wbemException);
+
+			mockedExecutorService.when(Executors::newSingleThreadExecutor).thenReturn(executor);
+
+			Mockito.doReturn(handler).when(executor).submit(ArgumentMatchers.any(Callable.class));
+			Mockito.doThrow(executionException).when(handler).get(timeout, TimeUnit.MILLISECONDS);
+
+			Assertions.assertThrows(
+					WBEMException.class,
+					() -> WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null));
+		}
+
+		try (final MockedStatic mockedExecutorService = Mockito.mockStatic(Executors.class)) {
+			final IllegalArgumentException illegalArgumentException = new IllegalArgumentException("msg");
+			final ExecutionException executionException = new ExecutionException(illegalArgumentException);
+
+			mockedExecutorService.when(Executors::newSingleThreadExecutor).thenReturn(executor);
+
+			Mockito.doReturn(handler).when(executor).submit(ArgumentMatchers.any(Callable.class));
+			Mockito.doThrow(executionException).when(handler).get(timeout, TimeUnit.MILLISECONDS);
+
+			Assertions.assertThrows(
+					RuntimeException.class,
+					() -> WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null));
+		}
+
+		try (final MockedStatic mockedExecutorService = Mockito.mockStatic(Executors.class)) {
+			mockedExecutorService.when(Executors::newSingleThreadExecutor).thenReturn(executor);
+
+			Mockito.doReturn(handler).when(executor).submit(ArgumentMatchers.any(Callable.class));
+			Mockito.doReturn(result).when(handler).get(timeout, TimeUnit.MILLISECONDS);
+
+			Assertions.assertEquals(
+					result,
+					WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null));
+		}
+	}
+}
diff --git a/src/test/java/org/sentrysoftware/wbem/WqlQueryTest.java b/src/test/java/org/metricshub/wbem/WqlQueryTest.java
similarity index 95%
rename from src/test/java/org/sentrysoftware/wbem/WqlQueryTest.java
rename to src/test/java/org/metricshub/wbem/WqlQueryTest.java
index acac015..beb278f 100644
--- a/src/test/java/org/sentrysoftware/wbem/WqlQueryTest.java
+++ b/src/test/java/org/metricshub/wbem/WqlQueryTest.java
@@ -1,76 +1,76 @@
-package org.sentrysoftware.wbem;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.stream.Collectors;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.sentrysoftware.wbem.client.WqlQuery;
-import org.sentrysoftware.wbem.client.exceptions.WqlQuerySyntaxException;
-
-class WqlQueryTest {
-
-	@Test
-	void testQueryCommon() {
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WqlQuery.parseQuery(null));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery(""));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Sel"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Up"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Upate T set a=x, b=y"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Upate T set a=x, b=y where c=z"));
-	}
-
-	@Test
-	void testSelect() throws Exception {
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Sel a,b From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Update a,b From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select *,a,b From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select *,* From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select * * From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b "));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select From "));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery(" a,b From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b From "));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select Select a,b From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b From From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select ,a,b From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a, ,b From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b, From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a  b From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a;b From T"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b From T U"));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b T "));
-		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("From a,b Select T"));
-
-		{
-			final WqlQuery wqlQuery = WqlQuery.parseQuery("SELECT * FROM HITACHI_FCPort");
-
-			Assertions.assertEquals("HITACHI_FCPort", wqlQuery.getClassName());
-			Assertions.assertNull(wqlQuery.getPropertiesArray());
-			Assertions.assertTrue(wqlQuery.getProperties().isEmpty());
-			Assertions.assertTrue(wqlQuery.getOriginalProperties().isEmpty());
-			Assertions.assertFalse(wqlQuery.hasDuplicateProperties());
-		}
-		{
-			final WqlQuery wqlQuery = WqlQuery.parseQuery(" select    Antecedent,     Dependent    from IBMTSDS_SHWIDToSPC");
-
-			Assertions.assertEquals("IBMTSDS_SHWIDToSPC", wqlQuery.getClassName());
-			Assertions.assertArrayEquals(new String[] {"Antecedent", "Dependent"}, wqlQuery.getPropertiesArray());
-			Assertions.assertEquals(Arrays.asList("Antecedent", "Dependent").stream().collect(Collectors.toCollection(LinkedHashSet::new)), wqlQuery.getProperties());
-			Assertions.assertEquals(Arrays.asList("Antecedent", "Dependent"), wqlQuery.getOriginalProperties());
-			Assertions.assertFalse(wqlQuery.hasDuplicateProperties());
-		}
-		{
-			final WqlQuery wqlQuery = WqlQuery.parseQuery("   SELECT __Path, Name, __PATH   from   EMC_StorageSystem   ");
-
-			Assertions.assertEquals("EMC_StorageSystem", wqlQuery.getClassName());
-			Assertions.assertArrayEquals(new String[] {"Name"}, wqlQuery.getPropertiesArray());
-			Assertions.assertEquals(Arrays.asList("__Path", "Name").stream().collect(Collectors.toCollection(LinkedHashSet::new)), wqlQuery.getProperties());
-			Assertions.assertEquals(Arrays.asList("__Path", "Name", "__PATH"), wqlQuery.getOriginalProperties());
-			Assertions.assertTrue(wqlQuery.hasDuplicateProperties());
-		}
-	}
-}
+package org.metricshub.wbem;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.metricshub.wbem.client.WqlQuery;
+import org.metricshub.wbem.client.exceptions.WqlQuerySyntaxException;
+
+class WqlQueryTest {
+
+	@Test
+	void testQueryCommon() {
+		Assertions.assertThrows(IllegalArgumentException.class, () -> WqlQuery.parseQuery(null));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery(""));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Sel"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Up"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Upate T set a=x, b=y"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Upate T set a=x, b=y where c=z"));
+	}
+
+	@Test
+	void testSelect() throws Exception {
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Sel a,b From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Update a,b From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select *,a,b From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select *,* From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select * * From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b "));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select From "));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery(" a,b From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b From "));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select Select a,b From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b From From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select ,a,b From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a, ,b From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b, From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a  b From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a;b From T"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b From T U"));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("Select a,b T "));
+		Assertions.assertThrows(WqlQuerySyntaxException.class, () -> WqlQuery.parseQuery("From a,b Select T"));
+
+		{
+			final WqlQuery wqlQuery = WqlQuery.parseQuery("SELECT * FROM HITACHI_FCPort");
+
+			Assertions.assertEquals("HITACHI_FCPort", wqlQuery.getClassName());
+			Assertions.assertNull(wqlQuery.getPropertiesArray());
+			Assertions.assertTrue(wqlQuery.getProperties().isEmpty());
+			Assertions.assertTrue(wqlQuery.getOriginalProperties().isEmpty());
+			Assertions.assertFalse(wqlQuery.hasDuplicateProperties());
+		}
+		{
+			final WqlQuery wqlQuery = WqlQuery.parseQuery(" select    Antecedent,     Dependent    from IBMTSDS_SHWIDToSPC");
+
+			Assertions.assertEquals("IBMTSDS_SHWIDToSPC", wqlQuery.getClassName());
+			Assertions.assertArrayEquals(new String[] {"Antecedent", "Dependent"}, wqlQuery.getPropertiesArray());
+			Assertions.assertEquals(Arrays.asList("Antecedent", "Dependent").stream().collect(Collectors.toCollection(LinkedHashSet::new)), wqlQuery.getProperties());
+			Assertions.assertEquals(Arrays.asList("Antecedent", "Dependent"), wqlQuery.getOriginalProperties());
+			Assertions.assertFalse(wqlQuery.hasDuplicateProperties());
+		}
+		{
+			final WqlQuery wqlQuery = WqlQuery.parseQuery("   SELECT __Path, Name, __PATH   from   EMC_StorageSystem   ");
+
+			Assertions.assertEquals("EMC_StorageSystem", wqlQuery.getClassName());
+			Assertions.assertArrayEquals(new String[] {"Name"}, wqlQuery.getPropertiesArray());
+			Assertions.assertEquals(Arrays.asList("__Path", "Name").stream().collect(Collectors.toCollection(LinkedHashSet::new)), wqlQuery.getProperties());
+			Assertions.assertEquals(Arrays.asList("__Path", "Name", "__PATH"), wqlQuery.getOriginalProperties());
+			Assertions.assertTrue(wqlQuery.hasDuplicateProperties());
+		}
+	}
+}

From 173f12331b119a8661698344361c41330517c55c Mon Sep 17 00:00:00 2001
From: Elyes Cherfa 
Date: Mon, 31 Mar 2025 19:33:31 +0200
Subject: [PATCH 2/6] Issue #35: Rebrand Codebase from Sentry Software to
 MetricsHub

* Reformatted all the classes using prettier.
* Added Favicon.ico, css and fonts inside resources directory.
---
 checkstyle.origin.xml                         |  222 ---
 pom.xml                                       |   12 +-
 .../org/metricshub/wbem/client/Utils.java     |   12 +-
 .../wbem/client/WbemCimDataHandler.java       |   59 +-
 .../metricshub/wbem/client/WbemClient.java    |  124 +-
 .../metricshub/wbem/client/WbemExecutor.java  |  110 +-
 .../wbem/client/WbemQueryResult.java          |    5 +-
 .../org/metricshub/wbem/client/WqlQuery.java  |   67 +-
 .../exceptions/WqlQuerySyntaxException.java   |    1 -
 .../wbem/javax/cim/CIMArgument.java           |    9 +-
 .../metricshub/wbem/javax/cim/CIMClass.java   |  159 +-
 .../wbem/javax/cim/CIMClassProperty.java      |   62 +-
 .../wbem/javax/cim/CIMDataType.java           |  264 +--
 .../wbem/javax/cim/CIMDateTime.java           |   15 +-
 .../wbem/javax/cim/CIMDateTimeAbsolute.java   |   59 +-
 .../wbem/javax/cim/CIMDateTimeInterval.java   |  243 ++-
 .../metricshub/wbem/javax/cim/CIMElement.java |   18 +-
 .../metricshub/wbem/javax/cim/CIMFlavor.java  |    4 +-
 .../wbem/javax/cim/CIMInstance.java           |   86 +-
 .../metricshub/wbem/javax/cim/CIMMethod.java  |   63 +-
 .../javax/cim/CIMNamedElementInterface.java   |    4 +-
 .../wbem/javax/cim/CIMObjectPath.java         |  152 +-
 .../wbem/javax/cim/CIMParameter.java          |   35 +-
 .../wbem/javax/cim/CIMProperty.java           |   35 +-
 .../cim/CIMQualifiedElementInterface.java     |   16 +-
 .../wbem/javax/cim/CIMQualifier.java          |   19 +-
 .../wbem/javax/cim/CIMQualifierType.java      |   20 +-
 .../metricshub/wbem/javax/cim/CIMScope.java   |    7 +-
 .../wbem/javax/cim/CIMTypedElement.java       |   11 +-
 .../wbem/javax/cim/CIMValuedElement.java      |   25 +-
 .../wbem/javax/cim/UnsignedInteger16.java     |   31 +-
 .../wbem/javax/cim/UnsignedInteger32.java     |   31 +-
 .../wbem/javax/cim/UnsignedInteger64.java     |   35 +-
 .../wbem/javax/cim/UnsignedInteger8.java      |   31 +-
 .../wbem/javax/wbem/CloseableIterator.java    |    6 +-
 .../wbem/javax/wbem/WBEMException.java        |   85 +-
 .../javax/wbem/client/EnumerateResponse.java  |   12 +-
 .../javax/wbem/client/PasswordCredential.java |   14 +-
 .../javax/wbem/client/RoleCredential.java     |   12 +-
 .../wbem/javax/wbem/client/RolePrincipal.java |   23 +-
 .../wbem/javax/wbem/client/UserPrincipal.java |   26 +-
 .../wbem/javax/wbem/client/WBEMClient.java    |  613 ++++---
 .../wbem/client/WBEMClientConstants.java      |   17 +-
 .../javax/wbem/client/WBEMClientFactory.java  |   23 +-
 .../wbem/listener/IndicationListener.java     |    5 +-
 .../javax/wbem/listener/WBEMListener.java     |   19 +-
 .../wbem/listener/WBEMListenerConstants.java  |    1 -
 .../wbem/listener/WBEMListenerFactory.java    |   29 +-
 .../sblim/cimclient/CIMXMLTraceListener.java  |    6 +-
 .../wbem/sblim/cimclient/GenericExts.java     |   17 +-
 .../cimclient/IndicationListenerSBLIM.java    |   10 +-
 .../sblim/cimclient/LogAndTraceManager.java   |   32 +-
 .../wbem/sblim/cimclient/LogListener.java     |    5 +-
 .../wbem/sblim/cimclient/TraceListener.java   |    8 +-
 .../wbem/sblim/cimclient/WBEMClientSBLIM.java |   49 +-
 .../WBEMConfigurationProperties.java          |  220 +--
 .../sblim/cimclient/WBEMListenerSBLIM.java    |  166 +-
 .../discovery/AdvertisementCatalog.java       |  138 +-
 .../sblim/cimclient/discovery/Discoverer.java |    7 +-
 .../discovery/DiscovererFactory.java          |   15 +-
 .../cimclient/discovery/WBEMProtocol.java     |   23 +-
 .../discovery/WBEMServiceAdvertisement.java   |   29 +-
 .../internal/cim/CIMElementSorter.java        |   17 +-
 .../cimclient/internal/cim/CIMHelper.java     |  138 +-
 .../internal/cim/CIMInstanceBuilder.java      |   37 +-
 .../internal/cim/CIMOctetString.java          |  115 +-
 .../cim/CIMQualifiedElementInterfaceImpl.java |   63 +-
 .../cimclient/internal/cim/CIMVersion.java    |   15 +-
 .../internal/cim/DTStringReader.java          |   61 +-
 .../internal/cim/DTStringWriter.java          |   14 +-
 .../cimxml/CIMClientXML_HelperImpl.java       | 1248 +++++++------
 .../cimclient/internal/cimxml/CIMMessage.java |   34 +-
 .../cimclient/internal/cimxml/CIMRequest.java |   31 +-
 .../internal/cimxml/CIMResponse.java          |   44 +-
 .../internal/cimxml/CIMXMLBuilderImpl.java    |  569 +++---
 .../internal/cimxml/CIMXMLParseException.java |    5 +-
 .../internal/cimxml/CIMXMLParserImpl.java     | 1292 +++++++------
 .../internal/cimxml/CimXmlSerializer.java     |   53 +-
 .../internal/cimxml/LocalPathBuilder.java     |   94 +-
 .../cimclient/internal/cimxml/TypedValue.java |   10 +-
 .../internal/cimxml/sax/CIMObjectFactory.java |  400 +++--
 .../internal/cimxml/sax/EmbObjHandler.java    |  109 +-
 .../internal/cimxml/sax/NodeConstIf.java      |  531 +++---
 .../internal/cimxml/sax/NodeFactory.java      |  978 ++++++----
 .../internal/cimxml/sax/NodePool.java         |   22 +-
 .../internal/cimxml/sax/SAXHelper.java        |   21 +-
 .../internal/cimxml/sax/SAXSession.java       |   11 +-
 .../cimxml/sax/XMLDefaultHandlerImpl.java     |   45 +-
 .../sax/node/AbstractArrayValueNode.java      |    3 +-
 .../cimxml/sax/node/AbstractMessageNode.java  |    5 +-
 .../sax/node/AbstractMethodCallNode.java      |   24 +-
 .../cimxml/sax/node/AbstractMultiRspNode.java |    7 +-
 .../cimxml/sax/node/AbstractObjectNode.java   |    4 +-
 .../sax/node/AbstractObjectPathNode.java      |   11 +-
 .../sax/node/AbstractParamValueNode.java      |    5 +-
 .../sax/node/AbstractParameterNode.java       |   24 +-
 .../cimxml/sax/node/AbstractPathNode.java     |    3 +-
 .../cimxml/sax/node/AbstractPropertyNode.java |   48 +-
 .../cimxml/sax/node/AbstractResponseNode.java |    3 +-
 .../sax/node/AbstractScalarValueNode.java     |    3 +-
 .../sax/node/AbstractSimpleRspNode.java       |    8 +-
 .../cimxml/sax/node/AbstractValueNode.java    |    3 +-
 .../internal/cimxml/sax/node/ArrayIf.java     |    6 +-
 .../internal/cimxml/sax/node/CIMNode.java     |   27 +-
 .../cimxml/sax/node/ClassNameNode.java        |   10 +-
 .../internal/cimxml/sax/node/ClassNode.java   |   47 +-
 .../cimxml/sax/node/ClassPathNode.java        |   34 +-
 .../cimxml/sax/node/CorrelatorNode.java       |   15 +-
 .../internal/cimxml/sax/node/ErrorIf.java     |    4 +-
 .../internal/cimxml/sax/node/ErrorNode.java   |   23 +-
 .../cimxml/sax/node/ExpMethodCallNode.java    |   19 +-
 .../sax/node/ExpMethodResponseNode.java       |   32 +-
 .../cimxml/sax/node/ExpParamValueNode.java    |   18 +-
 .../internal/cimxml/sax/node/HostNode.java    |    9 +-
 .../cimxml/sax/node/IMethodCallNode.java      |   14 +-
 .../cimxml/sax/node/IMethodResponseNode.java  |   64 +-
 .../cimxml/sax/node/IParamValueNode.java      |   45 +-
 .../cimxml/sax/node/IReturnValueNode.java     |   52 +-
 .../cimxml/sax/node/InstanceNameNode.java     |   54 +-
 .../cimxml/sax/node/InstanceNode.java         |   30 +-
 .../cimxml/sax/node/InstancePathNode.java     |   32 +-
 .../cimxml/sax/node/KeyBindingNode.java       |   15 +-
 .../cimxml/sax/node/KeyValueNode.java         |   27 +-
 .../cimxml/sax/node/LocalClassPathNode.java   |   25 +-
 .../sax/node/LocalInstancePathNode.java       |   30 +-
 .../sax/node/LocalNameSpacePathNode.java      |   28 +-
 .../internal/cimxml/sax/node/MessageNode.java |   32 +-
 .../cimxml/sax/node/MethodCallNode.java       |   14 +-
 .../internal/cimxml/sax/node/MethodNode.java  |   50 +-
 .../cimxml/sax/node/MethodResponseNode.java   |   59 +-
 .../cimxml/sax/node/MultiExpReqNode.java      |   12 +-
 .../cimxml/sax/node/MultiExpRspNode.java      |   14 +-
 .../cimxml/sax/node/MultiReqNode.java         |   14 +-
 .../cimxml/sax/node/MultiRspNode.java         |   13 +-
 .../cimxml/sax/node/NameSpaceNode.java        |   12 +-
 .../cimxml/sax/node/NameSpacePathNode.java    |   25 +-
 .../internal/cimxml/sax/node/Node.java        |   78 +-
 .../cimxml/sax/node/NonVolatileIf.java        |    4 +-
 .../cimxml/sax/node/ObjectPathIf.java         |    3 +-
 .../cimxml/sax/node/ObjectPathNode.java       |   23 +-
 .../cimxml/sax/node/ParamValueNode.java       |   46 +-
 .../cimxml/sax/node/ParameterArrayNode.java   |    9 +-
 .../cimxml/sax/node/ParameterNode.java        |   12 +-
 .../sax/node/ParameterRefArrayNode.java       |    7 +-
 .../sax/node/ParameterReferenceNode.java      |    6 +-
 .../cimxml/sax/node/PropertyArrayNode.java    |   11 +-
 .../cimxml/sax/node/PropertyNode.java         |   11 +-
 .../sax/node/PropertyReferenceNode.java       |   10 +-
 .../cimxml/sax/node/QualiDeclNode.java        |   59 +-
 .../cimxml/sax/node/QualifiedNodeHandler.java |   28 +-
 .../cimxml/sax/node/QualifierNode.java        |   41 +-
 .../cimxml/sax/node/RetValPipeIf.java         |    6 +-
 .../cimxml/sax/node/ReturnValueNode.java      |   21 +-
 .../internal/cimxml/sax/node/ScopeNode.java   |   13 +-
 .../cimxml/sax/node/SimpleExpReqNode.java     |   15 +-
 .../cimxml/sax/node/SimpleExpRspNode.java     |   18 +-
 .../cimxml/sax/node/SimpleReqNode.java        |   15 +-
 .../cimxml/sax/node/SimpleRspNode.java        |   35 +-
 .../internal/cimxml/sax/node/TypedIf.java     |    3 +-
 .../cimxml/sax/node/ValueArrayNode.java       |   19 +-
 .../internal/cimxml/sax/node/ValueIf.java     |    5 +-
 .../sax/node/ValueInstanceWithPathNode.java   |   32 +-
 .../sax/node/ValueNamedInstanceNode.java      |   34 +-
 .../internal/cimxml/sax/node/ValueNode.java   |    6 +-
 .../cimxml/sax/node/ValueNullNode.java        |    9 +-
 .../cimxml/sax/node/ValueObjectNode.java      |   23 +-
 .../node/ValueObjectWithLocalPathNode.java    |   36 +-
 .../sax/node/ValueObjectWithPathNode.java     |   25 +-
 .../cimxml/sax/node/ValueRefArrayNode.java    |   18 +-
 .../cimxml/sax/node/ValueReferenceNode.java   |   62 +-
 .../internal/discovery/slp/DiscovererSLP.java |   59 +-
 .../slp/WBEMServiceAdvertisementSLP.java      |   63 +-
 .../internal/http/AuthorizationHandler.java   |   33 +-
 .../internal/http/AuthorizationInfo.java      |  125 +-
 .../internal/http/BASE64Encoder.java          |   78 +-
 .../cimclient/internal/http/Challenge.java    |   60 +-
 .../cimclient/internal/http/HttpClient.java   |  512 +++---
 .../internal/http/HttpClientMethod.java       |   27 +-
 .../internal/http/HttpClientPool.java         |   92 +-
 .../internal/http/HttpConnectionHandler.java  |  105 +-
 .../internal/http/HttpContentHandler.java     |   13 +-
 .../internal/http/HttpException.java          |   11 +-
 .../cimclient/internal/http/HttpHeader.java   |   92 +-
 .../internal/http/HttpHeaderParser.java       |   45 +-
 .../cimclient/internal/http/HttpMethod.java   |   16 +-
 .../internal/http/HttpParseException.java     |    5 +-
 .../internal/http/HttpServerConnection.java   |  141 +-
 .../internal/http/HttpServerMethod.java       |   21 +-
 .../internal/http/HttpServerWorker.java       |    6 +-
 .../internal/http/HttpSocketFactory.java      |  111 +-
 .../internal/http/HttpUrlConnection.java      |   25 +-
 .../internal/http/MessageReader.java          |   33 +-
 .../internal/http/MessageWriter.java          |   54 +-
 .../internal/http/PegasusLocalAuthInfo.java   |   36 +-
 .../cimclient/internal/http/WwwAuthInfo.java  |  100 +-
 .../internal/http/io/ASCIIPrintStream.java    |   52 +-
 .../internal/http/io/BoundedInputStream.java  |   11 +-
 .../internal/http/io/ChunkedInputStream.java  |   38 +-
 .../internal/http/io/ChunkedOutputStream.java |    9 +-
 .../internal/http/io/DebugInputStream.java    |   22 +-
 .../http/io/KeepAliveInputStream.java         |    6 +-
 .../http/io/PersistentInputStream.java        |    7 +-
 .../http/io/PersistentOutputStream.java       |    5 +-
 .../internal/http/io/TrailerException.java    |   17 +-
 .../internal/logging/LogAndTraceBroker.java   |  382 ++--
 .../internal/logging/LogFormatter.java        |    5 +-
 .../internal/logging/MessageLoader.java       |   17 +-
 .../cimclient/internal/logging/Messages.java  |    3 +-
 .../cimclient/internal/logging/TimeStamp.java |   14 +-
 .../internal/logging/TraceFormatter.java      |    5 +-
 .../internal/pullparser/XMLPullParser.java    |  363 ++--
 .../pullparser/XMLPullParserException.java    |    7 +-
 .../cimclient/internal/uri/Authority.java     |  130 +-
 .../cimclient/internal/uri/BooleanValue.java  |   15 +-
 .../cimclient/internal/uri/CharValue.java     |   15 +-
 .../cimclient/internal/uri/DateTimeValue.java |   25 +-
 .../cimclient/internal/uri/IntegerValue.java  |   50 +-
 .../cimclient/internal/uri/KeyValuePair.java  |   16 +-
 .../cimclient/internal/uri/KeyValuePairs.java |   10 +-
 .../internal/uri/NamespaceHandle.java         |   25 +-
 .../cimclient/internal/uri/NamespacePath.java |   22 +-
 .../cimclient/internal/uri/QuotedValue.java   |    4 +-
 .../cimclient/internal/uri/RealValue.java     |   26 +-
 .../internal/uri/ReferenceValue.java          |    6 +-
 .../cimclient/internal/uri/StringValue.java   |    4 +-
 .../sblim/cimclient/internal/uri/Test.java    |  189 +-
 .../sblim/cimclient/internal/uri/URI.java     |   83 +-
 .../cimclient/internal/uri/URIString.java     |   71 +-
 .../sblim/cimclient/internal/uri/Value.java   |   45 +-
 .../sblim/cimclient/internal/util/MOF.java    |  155 +-
 .../cimclient/internal/util/StringSorter.java |    6 +-
 .../cimclient/internal/util/ThreadPool.java   |   48 +-
 .../sblim/cimclient/internal/util/Util.java   |   18 +-
 .../internal/util/WBEMConfiguration.java      |  619 ++++---
 .../util/WBEMConfigurationDefaults.java       |   11 +-
 .../internal/util/WBEMConstants.java          |    4 +-
 .../cimclient/internal/util/XMLHostStr.java   |   20 +-
 .../cimclient/internal/wbem/CIMError.java     |   40 +-
 .../internal/wbem/CloseableIteratorDOM.java   |   19 +-
 .../wbem/CloseableIteratorGeneric.java        |   12 +-
 .../internal/wbem/CloseableIteratorPULL.java  |   31 +-
 .../internal/wbem/CloseableIteratorSAX.java   |   34 +-
 .../internal/wbem/EnumerateResponseDOM.java   |   53 +-
 .../internal/wbem/EnumerateResponsePULL.java  |   58 +-
 .../internal/wbem/EnumerateResponseSAX.java   |   52 +-
 .../internal/wbem/WBEMClientCIMXML.java       | 1595 +++++++++--------
 .../internal/wbem/indications/CIMEvent.java   |   16 +-
 .../wbem/indications/CIMEventDispatcher.java  |   70 +-
 .../indications/CIMIndicationHandler.java     |  266 +--
 .../ReliableIndicationHandler.java            |  113 +-
 .../wbem/operations/CIMAssociatorNamesOp.java |   24 +-
 .../wbem/operations/CIMAssociatorsOp.java     |   34 +-
 .../wbem/operations/CIMCreateClassOp.java     |    7 +-
 .../wbem/operations/CIMCreateInstanceOp.java  |    8 +-
 .../wbem/operations/CIMCreateNameSpaceOp.java |    4 +-
 .../operations/CIMCreateQualifierTypeOp.java  |    8 +-
 .../wbem/operations/CIMDeleteClassOp.java     |    4 +-
 .../wbem/operations/CIMDeleteInstanceOp.java  |    4 +-
 .../wbem/operations/CIMDeleteNameSpaceOp.java |    5 +-
 .../operations/CIMDeleteQualifierTypeOp.java  |    4 +-
 .../wbem/operations/CIMEnumClassNamesOp.java  |    8 +-
 .../wbem/operations/CIMEnumClassesOp.java     |   23 +-
 .../operations/CIMEnumInstanceNamesOp.java    |    4 +-
 .../wbem/operations/CIMEnumInstancesOp.java   |   26 +-
 .../wbem/operations/CIMEnumNameSpaceOp.java   |    4 +-
 .../operations/CIMEnumQualifierTypesOp.java   |    4 +-
 .../wbem/operations/CIMExecQueryOp.java       |   10 +-
 .../wbem/operations/CIMGetClassOp.java        |   24 +-
 .../wbem/operations/CIMGetInstanceOp.java     |   23 +-
 .../wbem/operations/CIMGetPropertyOp.java     |    8 +-
 .../operations/CIMGetQualifierTypeOp.java     |    8 +-
 .../wbem/operations/CIMInvokeMethodOp.java    |   20 +-
 .../wbem/operations/CIMOperation.java         |   17 +-
 .../wbem/operations/CIMReferenceNamesOp.java  |   10 +-
 .../wbem/operations/CIMReferencesOp.java      |   26 +-
 .../wbem/operations/CIMSetClassOp.java        |    8 +-
 .../wbem/operations/CIMSetInstanceOp.java     |   20 +-
 .../wbem/operations/CIMSetPropertyOp.java     |   10 +-
 .../operations/CIMSetQualifierTypeOp.java     |    8 +-
 .../operations/CIMSingleResultOperation.java  |   12 +-
 .../metricshub/wbem/sblim/slp/Advertiser.java |   18 +-
 .../metricshub/wbem/sblim/slp/Locator.java    |   95 +-
 .../wbem/sblim/slp/SLPConfigProperties.java   |   10 +-
 .../sblim/slp/ServiceLocationAttribute.java   |   85 +-
 .../ServiceLocationAttributeDescriptor.java   |   24 +-
 .../slp/ServiceLocationAttributeVerifier.java |   32 +-
 .../sblim/slp/ServiceLocationEnumeration.java |    9 +-
 .../sblim/slp/ServiceLocationException.java   |   52 +-
 .../sblim/slp/ServiceLocationManager.java     |   16 +-
 .../wbem/sblim/slp/ServiceType.java           |   60 +-
 .../metricshub/wbem/sblim/slp/ServiceURL.java |   63 +-
 .../wbem/sblim/slp/TemplateRegistry.java      |   27 +-
 .../sblim/slp/internal/AdvertiserImpl.java    |   67 +-
 .../sblim/slp/internal/AttributeHandler.java  |   18 +-
 .../wbem/sblim/slp/internal/Convert.java      |   30 +-
 .../internal/IPv6MulticastAddressFactory.java |   35 +-
 .../wbem/sblim/slp/internal/Net.java          |   10 +-
 .../wbem/sblim/slp/internal/SLPConfig.java    |  167 +-
 .../wbem/sblim/slp/internal/SLPDefaults.java  |   16 +-
 .../wbem/sblim/slp/internal/SLPLimits.java    |    4 +-
 .../wbem/sblim/slp/internal/SLPString.java    |   15 +-
 .../wbem/sblim/slp/internal/TRC.java          |   73 +-
 .../slp/internal/msg/AttributeReply.java      |   28 +-
 .../slp/internal/msg/AttributeRequest.java    |   67 +-
 .../wbem/sblim/slp/internal/msg/DAAdvert.java |   83 +-
 .../sblim/slp/internal/msg/DADescriptor.java  |   23 +-
 .../sblim/slp/internal/msg/FunctionIDs.java   |    2 -
 .../sblim/slp/internal/msg/MsgFactory.java    |  188 +-
 .../sblim/slp/internal/msg/MsgHeader.java     |   76 +-
 .../sblim/slp/internal/msg/ReplyMessage.java  |   16 +-
 .../slp/internal/msg/RequestMessage.java      |   61 +-
 .../wbem/sblim/slp/internal/msg/SAAdvert.java |   45 +-
 .../slp/internal/msg/SLPInputStream.java      |  121 +-
 .../sblim/slp/internal/msg/SLPMessage.java    |   59 +-
 .../slp/internal/msg/SLPOutputStream.java     |   73 +-
 .../slp/internal/msg/SerializeOption.java     |    3 +-
 .../internal/msg/ServiceAcknowledgment.java   |   15 +-
 .../internal/msg/ServiceDeregistration.java   |   34 +-
 .../slp/internal/msg/ServiceRegistration.java |   78 +-
 .../sblim/slp/internal/msg/ServiceReply.java  |   32 +-
 .../slp/internal/msg/ServiceRequest.java      |   67 +-
 .../slp/internal/msg/ServiceTypeReply.java    |   18 +-
 .../slp/internal/msg/ServiceTypeRequest.java  |   43 +-
 .../wbem/sblim/slp/internal/msg/Util.java     |    5 +-
 .../sblim/slp/internal/sa/DatagramThread.java |   11 +-
 .../sblim/slp/internal/sa/MessageTable.java   |   43 +-
 .../sblim/slp/internal/sa/RecieverThread.java |   11 +-
 .../sblim/slp/internal/sa/ServiceAgent.java   |   50 +-
 .../sblim/slp/internal/sa/ServiceTable.java   |   87 +-
 .../wbem/sblim/slp/internal/sa/TCPThread.java |   11 +-
 .../wbem/sblim/slp/internal/ua/DACache.java   |   15 +-
 .../slp/internal/ua/DatagramRequester.java    |   78 +-
 .../sblim/slp/internal/ua/LocatorImpl.java    |   98 +-
 .../sblim/slp/internal/ua/ResponseCache.java  |   13 +-
 .../sblim/slp/internal/ua/ResultTable.java    |   30 +-
 .../slp/internal/ua/SLEnumerationImpl.java    |   28 +-
 .../sblim/slp/internal/ua/TCPRequester.java   |   22 +-
 src/site/markdown/index.md                    |   14 +-
 src/site/resources/css/site.css               |   86 +
 src/site/resources/favicon.ico                |  Bin 0 -> 15406 bytes
 src/site/resources/fonts/Poppins-Bold.ttf     |  Bin 0 -> 153944 bytes
 src/site/resources/fonts/Poppins-Bold.woff    |  Bin 0 -> 72548 bytes
 src/site/resources/fonts/Poppins-Bold.woff2   |  Bin 0 -> 50576 bytes
 .../resources/fonts/Poppins-ExtraBold.ttf     |  Bin 0 -> 152764 bytes
 .../resources/fonts/Poppins-ExtraBold.woff    |  Bin 0 -> 72388 bytes
 .../resources/fonts/Poppins-ExtraBold.woff2   |  Bin 0 -> 50492 bytes
 src/site/resources/fonts/Poppins-Regular.ttf  |  Bin 0 -> 158240 bytes
 .../resources/fonts/Poppins-Regular.woff2     |  Bin 0 -> 51148 bytes
 src/site/site.xml                             |    3 +-
 .../wbem/WbemCimDataHandlerTest.java          |  386 +++-
 .../org/metricshub/wbem/WbemClientTest.java   |  163 +-
 .../org/metricshub/wbem/WbemExecutorTest.java |   47 +-
 .../org/metricshub/wbem/WqlQueryTest.java     |   15 +-
 353 files changed, 11697 insertions(+), 10166 deletions(-)
 delete mode 100644 checkstyle.origin.xml
 create mode 100644 src/site/resources/css/site.css
 create mode 100644 src/site/resources/favicon.ico
 create mode 100644 src/site/resources/fonts/Poppins-Bold.ttf
 create mode 100644 src/site/resources/fonts/Poppins-Bold.woff
 create mode 100644 src/site/resources/fonts/Poppins-Bold.woff2
 create mode 100644 src/site/resources/fonts/Poppins-ExtraBold.ttf
 create mode 100644 src/site/resources/fonts/Poppins-ExtraBold.woff
 create mode 100644 src/site/resources/fonts/Poppins-ExtraBold.woff2
 create mode 100644 src/site/resources/fonts/Poppins-Regular.ttf
 create mode 100644 src/site/resources/fonts/Poppins-Regular.woff2

diff --git a/checkstyle.origin.xml b/checkstyle.origin.xml
deleted file mode 100644
index 2098fe6..0000000
--- a/checkstyle.origin.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
-
-
-
-
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-	
-
-	
-	
-		
-		
-	
-
-	
-	
-	
-		
-		
-		
-		
-	
-
-	
-
-		
-		
-		
-
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-
-		
-		
-
-
-		
-		
-		
-		 
-		
-		
-
-
-		
-		
-		
-		
-		
-			
-		
-
-
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-		
-			
-		
-		
-			
-		
-
-
-		
-		
-		
-		
-
-
-		
-		
-		
-		
-		
-			
-		
-		
-		
-
-
-		
-		
-		
-		
-		
-		
-			
-			
-		
-		
-		
-		
-		
-		
-		
-
-		
-		
-		
-		
-		
-		
-		
-
-
-		
-		
-		
-		
-		
-			
-		
-		
-			
-			
-		
-		
-			
-			
-		
-		
-
-	
-
-
diff --git a/pom.xml b/pom.xml
index 1108870..b80fce4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 
 	
 		MetricsHub
-		https://metricshub.com
+		https://metricshub.org
 	
 
 	https://metricshub.org/wbem
@@ -32,11 +32,11 @@
 
 	
 		GitHub
-		https://github.com/MetricsHub/wbem-java/issues/
+		https://github.com/metricshub/wbem-java/issues/
 	
 
 	
-		scm:git:https://github.com/MetricsHub/wbem-java.git
+		scm:git:https://github.com/metricshub/wbem-java.git
 		https://github.com/metricshub/wbem-java
 		HEAD
 	
@@ -44,21 +44,21 @@
 	
 		
 			Bertrand Martin (@bertysentry)
-			bertrand@metricshub.com
+			bertrand@sentrysoftware.com
 			
 				maintainer
 			
 		
 		
 			Nassim BOUTEKEDJIRET (@NassimBtk)
-			nassim@metricshub.com
+			nassim@sentrysoftware.com
 			
 				maintainer
 			
 		
 		
 			Elyes Cherfa (@CherfaElyes)
-			elyes@metricshub.com
+			elyes@sentrysoftware.com
 			
 				maintainer
 			
diff --git a/src/main/java/org/metricshub/wbem/client/Utils.java b/src/main/java/org/metricshub/wbem/client/Utils.java
index 835e14f..7d1e072 100644
--- a/src/main/java/org/metricshub/wbem/client/Utils.java
+++ b/src/main/java/org/metricshub/wbem/client/Utils.java
@@ -62,18 +62,18 @@ public static  void checkNonNull(final T argument, final String name) {
 	 * 
    • group(2): optional fraction of seconds
 	 * 
    • group(3): timezone offset... in minutes (sigh)
 	 */
-	private static final Pattern CIM_DATETIME_PATTERN = Pattern
-			.compile("^([0-9]{14})(?:\\.([0-9]{3,6}))?([+-][0-9]{3})$");
+	private static final Pattern CIM_DATETIME_PATTERN = Pattern.compile(
+		"^([0-9]{14})(?:\\.([0-9]{3,6}))?([+-][0-9]{3})$"
+	);
 
 	/**
 	 * Convert a String holding a CIM_DATETIME (i.e. a string in the form of
 	 * yyyymmddHHMMSS.mmmmmmsUUU) to an OffsetDateTime object
-	 * 
+	 *
 	 * @param stringValue String value with a CIM_DATETIME
 	 * @return OffsetDateTime instance
 	 */
 	public static OffsetDateTime convertCimDateTime(final String stringValue) {
-
 		if (stringValue == null) {
 			return null;
 		}
@@ -92,13 +92,11 @@ public static OffsetDateTime convertCimDateTime(final String stringValue) {
 		// Zone Offset
 		final String zoneOffset = dateTimeMatcher.group(3);
 		if (zoneOffset == null) {
-			throw new IllegalStateException(
-					"Unable to get the timezone offset from CIM_DATETIME value: " + stringValue);
+			throw new IllegalStateException("Unable to get the timezone offset from CIM_DATETIME value: " + stringValue);
 		}
 		final int secondsOffset = Integer.parseInt(zoneOffset) * 60;
 		final ZoneOffset offset = ZoneOffset.ofTotalSeconds(secondsOffset);
 
 		return OffsetDateTime.of(localDateTime, offset);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/client/WbemCimDataHandler.java b/src/main/java/org/metricshub/wbem/client/WbemCimDataHandler.java
index 538e136..2495289 100644
--- a/src/main/java/org/metricshub/wbem/client/WbemCimDataHandler.java
+++ b/src/main/java/org/metricshub/wbem/client/WbemCimDataHandler.java
@@ -27,7 +27,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.metricshub.wbem.javax.cim.CIMDataType;
 import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
 import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
@@ -41,11 +40,12 @@
  */
 public class WbemCimDataHandler {
 
-	private WbemCimDataHandler() { }
+	private WbemCimDataHandler() {}
 
 	public static final String PATH_PROPERTY = "__Path";
 
 	private static final Map> CONVERT_MAP;
+
 	static {
 		final Map> map = new HashMap<>();
 		map.put(CIMDataType.STRING, String::valueOf);
@@ -76,9 +76,10 @@ private WbemCimDataHandler() { }
 	 * @return
 	 */
 	public static String getCimPropertyAsString(
-			final String property,
-			final CIMInstance cimInstance,
-			final String arraySeparator) {
+		final String property,
+		final CIMInstance cimInstance,
+		final String arraySeparator
+	) {
 		Utils.checkNonNull(property, "property");
 		Utils.checkNonNull(cimInstance, "cimInstance");
 
@@ -92,17 +93,17 @@ public static String getCimPropertyAsString(
 		CIMProperty cimProperty = cimInstance.getProperty(property);
 
 		// then, if null, check getKeys
-		final String separator = arraySeparator == null? Utils.DEFAULT_ARRAY_SEPARATOR : arraySeparator;
+		final String separator = arraySeparator == null ? Utils.DEFAULT_ARRAY_SEPARATOR : arraySeparator;
 		if (cimProperty == null && cimInstance.getKeys() != null) {
-			return Stream.of(cimInstance.getKeys())
-					.filter(key -> key.getName() != null && key.getName().equalsIgnoreCase(property))
-					.findFirst()
-					.map(cp -> convertCimPropertyValue(cp, separator))
-					.orElse(Utils.EMPTY);
+			return Stream
+				.of(cimInstance.getKeys())
+				.filter(key -> key.getName() != null && key.getName().equalsIgnoreCase(property))
+				.findFirst()
+				.map(cp -> convertCimPropertyValue(cp, separator))
+				.orElse(Utils.EMPTY);
 		}
 
-		return cimProperty == null ?
-				Utils.EMPTY : convertCimPropertyValue(cimProperty, separator);
+		return cimProperty == null ? Utils.EMPTY : convertCimPropertyValue(cimProperty, separator);
 	}
 
 	/**
@@ -112,9 +113,7 @@ public static String getCimPropertyAsString(
 	 * @param arraySeparator The array separator value.
 	 * @return
 	 */
-	private static String convertCimPropertyValue(
-			final CIMProperty cimProperty,
-			final String arraySeparator) {
+	private static String convertCimPropertyValue(final CIMProperty cimProperty, final String arraySeparator) {
 		final Object cimPropertyValue = cimProperty.getValue();
 		if (cimPropertyValue == null) {
 			return Utils.EMPTY;
@@ -125,9 +124,9 @@ private static String convertCimPropertyValue(
 			return cimPropertyValue.toString();
 		}
 
-		return dataType.isArray() ?
-				convertArray(cimProperty, arraySeparator) :
-				CONVERT_MAP.getOrDefault(dataType.getType(), Object::toString).apply(cimPropertyValue);
+		return dataType.isArray()
+			? convertArray(cimProperty, arraySeparator)
+			: CONVERT_MAP.getOrDefault(dataType.getType(), Object::toString).apply(cimPropertyValue);
 	}
 
 	/**
@@ -137,12 +136,16 @@ private static String convertCimPropertyValue(
 	 * @param arraySeparator The array separator value.
 	 * @return
 	 */
-	private static String convertArray(
-			final CIMProperty cimProperty,
-			final String arraySeparator) {
-		return Arrays.stream((Object[]) cimProperty.getValue())
-				.map(obj -> (obj == null) ? Utils.EMPTY : CONVERT_MAP.getOrDefault(cimProperty.getDataType().getType(), Object::toString).apply(obj))
-				.collect(Collectors.joining(arraySeparator, Utils.EMPTY, arraySeparator));
+	private static String convertArray(final CIMProperty cimProperty, final String arraySeparator) {
+		return Arrays
+			.stream((Object[]) cimProperty.getValue())
+			.map(
+				obj ->
+					(obj == null)
+						? Utils.EMPTY
+						: CONVERT_MAP.getOrDefault(cimProperty.getDataType().getType(), Object::toString).apply(obj)
+			)
+			.collect(Collectors.joining(arraySeparator, Utils.EMPTY, arraySeparator));
 	}
 
 	/**
@@ -158,9 +161,9 @@ private static String convertReference(final Object cimPropertyValue) {
 		final CIMObjectPath objectPath = (CIMObjectPath) cimPropertyValue;
 		final String str = objectPath.toString();
 		return str
-				.substring(str.indexOf(':') + 1) // take the part after : (if exists)
-				.replace("\\\\", "\\") // Replace \\ by \
-				.replace("\\\"", "\""); // Replace \" by "
+			.substring(str.indexOf(':') + 1) // take the part after : (if exists)
+			.replace("\\\\", "\\") // Replace \\ by \
+			.replace("\\\"", "\""); // Replace \" by "
 	}
 
 	/**
diff --git a/src/main/java/org/metricshub/wbem/client/WbemClient.java b/src/main/java/org/metricshub/wbem/client/WbemClient.java
index 1ed9248..421c451 100644
--- a/src/main/java/org/metricshub/wbem/client/WbemClient.java
+++ b/src/main/java/org/metricshub/wbem/client/WbemClient.java
@@ -29,11 +29,10 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javax.security.auth.Subject;
-
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
 import org.metricshub.wbem.javax.wbem.WBEMException;
 import org.metricshub.wbem.javax.wbem.client.EnumerateResponse;
@@ -42,15 +41,13 @@
 import org.metricshub.wbem.javax.wbem.client.WBEMClient;
 import org.metricshub.wbem.javax.wbem.client.WBEMClientConstants;
 import org.metricshub.wbem.javax.wbem.client.WBEMClientFactory;
-import org.metricshub.wbem.javax.cim.CIMProperty;
 
 /**
  * Matsya WBEM client for query execution.
  *
  */
 public class WbemClient implements AutoCloseable {
-
-	private static final Locale[] FIXED_AVAILABLE_LOCALES_ARRAY = {Locale.ENGLISH};
+	private static final Locale[] FIXED_AVAILABLE_LOCALES_ARRAY = { Locale.ENGLISH };
 
 	private WBEMClient client;
 
@@ -65,23 +62,19 @@ public class WbemClient implements AutoCloseable {
 	 * @param timeout
 	 * @throws WBEMException
 	 */
-	public void connect(
-			final URL url,
-			final String username,
-			final char[] password,
-			int timeout) throws WBEMException {
-
+	public void connect(final URL url, final String username, final char[] password, int timeout) throws WBEMException {
 		Utils.checkNonNull(url, "url");
 		Utils.checkNonNull(username, "username");
 		Utils.checkNonNull(password, "password");
 
 		final CIMObjectPath cimObjectPath = new CIMObjectPath(
-				url.getProtocol(),
-				url.getHost(),
-				String.valueOf(url.getPort()),
-				null,
-				null,
-				null);
+			url.getProtocol(),
+			url.getHost(),
+			String.valueOf(url.getPort()),
+			null,
+			null,
+			null
+		);
 
 		final Subject subject = new Subject();
 		subject.getPrincipals().add(new UserPrincipal(username));
@@ -112,11 +105,8 @@ public void close() {
 	 * @return
 	 * @throws WBEMException
 	 */
-	public WbemQueryResult executeWql(
-			final WqlQuery wqlQuery,
-			final String namespace,
-			final String arraySeparator) throws WBEMException {
-
+	public WbemQueryResult executeWql(final WqlQuery wqlQuery, final String namespace, final String arraySeparator)
+		throws WBEMException {
 		Utils.checkNonNull(wqlQuery, "wqlQuery");
 		Utils.checkNonNull(namespace, "namespace");
 
@@ -124,12 +114,14 @@ public WbemQueryResult executeWql(
 			throw new IllegalStateException("client must be connected first.");
 		}
 
-		iterator = client.enumerateInstances(
+		iterator =
+			client.enumerateInstances(
 				new CIMObjectPath(null, null, null, namespace, wqlQuery.getClassName(), null),
 				true,
 				false,
 				true,
-				wqlQuery.getPropertiesArray());
+				wqlQuery.getPropertiesArray()
+			);
 
 		return enumerateInstances(wqlQuery, iterator, arraySeparator);
 	}
@@ -143,10 +135,11 @@ public WbemQueryResult executeWql(
 	 * @throws WBEMException
 	 */
 	public WbemQueryResult getAssociators(
-			final WqlQuery wqlQuery,
-			final String objectPathAssociators,
-			final String arraySeparator) throws WBEMException {
-
+		final WqlQuery wqlQuery,
+		final String objectPathAssociators,
+		final String arraySeparator
+	)
+		throws WBEMException {
 		Utils.checkNonNull(wqlQuery, "wqlQuery");
 		Utils.checkNonNull(objectPathAssociators, "objectPathAssociators");
 
@@ -155,28 +148,30 @@ public WbemQueryResult getAssociators(
 		}
 
 		final EnumerateResponse response = client.associators(
-				new CIMObjectPath(objectPathAssociators),
-				wqlQuery.getClassName(),
-				null,
-				null,
-				null,
-				false,
-				wqlQuery.getPropertiesArray(),
-				null,
-				null,
-				null,
-				false,
-				null);
+			new CIMObjectPath(objectPathAssociators),
+			wqlQuery.getClassName(),
+			null,
+			null,
+			null,
+			false,
+			wqlQuery.getPropertiesArray(),
+			null,
+			null,
+			null,
+			false,
+			null
+		);
 		iterator = response.getResponses();
 
 		return enumerateInstances(wqlQuery, iterator, arraySeparator);
 	}
 
 	public static WbemQueryResult enumerateInstances(
-			final WqlQuery wqlQuery,
-			final CloseableIterator iterator,
-			final String arraySeparator) {
-		if (iterator == null)  {
+		final WqlQuery wqlQuery,
+		final CloseableIterator iterator,
+		final String arraySeparator
+	) {
+		if (iterator == null) {
 			return new WbemQueryResult(new ArrayList<>(), new ArrayList<>());
 		}
 
@@ -189,32 +184,41 @@ public static WbemQueryResult enumerateInstances(
 
 			if (properties == null) {
 				properties =
-						wqlQuery.getProperties().isEmpty() ?
-						Stream.of(cimInstance.getProperties())
-								.map(CIMProperty::getName)
-								.collect(Collectors.toCollection(LinkedHashSet::new)) :
-						wqlQuery.getProperties();
+					wqlQuery.getProperties().isEmpty()
+						? Stream
+							.of(cimInstance.getProperties())
+							.map(CIMProperty::getName)
+							.collect(Collectors.toCollection(LinkedHashSet::new))
+						: wqlQuery.getProperties();
 			}
 
 			if (originalProperties == null) {
-				originalProperties = wqlQuery.hasDuplicateProperties() ?
-						wqlQuery.getOriginalProperties() :
-						properties.stream().collect(Collectors.toList());
+				originalProperties =
+					wqlQuery.hasDuplicateProperties()
+						? wqlQuery.getOriginalProperties()
+						: properties.stream().collect(Collectors.toList());
 			}
 
 			final List row;
 			if (wqlQuery.hasDuplicateProperties()) {
-
-				final Map cimProperties = properties.stream().collect(Collectors.toMap(
-						String::toLowerCase,
-						property -> WbemCimDataHandler.getCimPropertyAsString(property, cimInstance, arraySeparator)));
-
-				row = originalProperties.stream()
+				final Map cimProperties = properties
+					.stream()
+					.collect(
+						Collectors.toMap(
+							String::toLowerCase,
+							property -> WbemCimDataHandler.getCimPropertyAsString(property, cimInstance, arraySeparator)
+						)
+					);
+
+				row =
+					originalProperties
+						.stream()
 						.map(property -> cimProperties.get(property.toLowerCase()))
 						.collect(Collectors.toList());
-
 			} else {
-				row = properties.stream()
+				row =
+					properties
+						.stream()
 						.map(property -> WbemCimDataHandler.getCimPropertyAsString(property, cimInstance, arraySeparator))
 						.collect(Collectors.toList());
 			}
diff --git a/src/main/java/org/metricshub/wbem/client/WbemExecutor.java b/src/main/java/org/metricshub/wbem/client/WbemExecutor.java
index 08014b8..ab15c5c 100644
--- a/src/main/java/org/metricshub/wbem/client/WbemExecutor.java
+++ b/src/main/java/org/metricshub/wbem/client/WbemExecutor.java
@@ -27,7 +27,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-
 import org.metricshub.wbem.client.exceptions.WqlQuerySyntaxException;
 import org.metricshub.wbem.javax.wbem.WBEMException;
 
@@ -37,7 +36,7 @@
  */
 public class WbemExecutor {
 
-	private WbemExecutor() { }
+	private WbemExecutor() {}
 
 	/**
 	 * Execute a WBEM query on remote.
@@ -56,26 +55,16 @@ private WbemExecutor() { }
 	 * @throws InterruptedException
 	 */
 	public static WbemQueryResult executeWql(
-			final URL url,
-			final String namespace,
-			final String username,
-			final char[] password,
-			final String query,
-			int timeout,
-			final String arraySeparator)
-					throws WqlQuerySyntaxException,
-					WBEMException,
-					TimeoutException,
-					InterruptedException  {
-		return executeMethod(
-				url,
-				namespace,
-				username,
-				password,
-				query,
-				null,
-				timeout,
-				arraySeparator);
+		final URL url,
+		final String namespace,
+		final String username,
+		final char[] password,
+		final String query,
+		int timeout,
+		final String arraySeparator
+	)
+		throws WqlQuerySyntaxException, WBEMException, TimeoutException, InterruptedException {
+		return executeMethod(url, namespace, username, password, query, null, timeout, arraySeparator);
 	}
 
 	/**
@@ -95,26 +84,16 @@ public static WbemQueryResult executeWql(
 	 * @throws InterruptedException
 	 */
 	public static WbemQueryResult getAssociators(
-			final URL url,
-			final String username,
-			final char[] password,
-			final String query,
-			final String objectPathAssociators,
-			int timeout,
-			final String arraySeparator)
-					throws WqlQuerySyntaxException,
-					WBEMException,
-					TimeoutException,
-					InterruptedException   {
-		return executeMethod(
-				url,
-				null,
-				username,
-				password,
-				query,
-				objectPathAssociators,
-				timeout,
-				arraySeparator);
+		final URL url,
+		final String username,
+		final char[] password,
+		final String query,
+		final String objectPathAssociators,
+		int timeout,
+		final String arraySeparator
+	)
+		throws WqlQuerySyntaxException, WBEMException, TimeoutException, InterruptedException {
+		return executeMethod(url, null, username, password, query, objectPathAssociators, timeout, arraySeparator);
 	}
 
 	/**
@@ -135,19 +114,16 @@ public static WbemQueryResult getAssociators(
 	 * @throws WqlQuerySyntaxException
 	 */
 	private static WbemQueryResult executeMethod(
-			final URL url,
-			final String namespace,
-			final String username,
-			final char[] password,
-			final String query,
-			final String objectPathAssociators,
-			int timeout,
-			final String arraySeparator)
-					throws InterruptedException,
-					TimeoutException,
-					WBEMException,
-					WqlQuerySyntaxException {
-
+		final URL url,
+		final String namespace,
+		final String username,
+		final char[] password,
+		final String query,
+		final String objectPathAssociators,
+		int timeout,
+		final String arraySeparator
+	)
+		throws InterruptedException, TimeoutException, WBEMException, WqlQuerySyntaxException {
 		Utils.checkNonNull(url, "url");
 		Utils.checkNonNull(username, "username");
 		Utils.checkNonNull(password, "password");
@@ -156,36 +132,34 @@ private static WbemQueryResult executeMethod(
 
 		final ExecutorService executor = Executors.newSingleThreadExecutor();
 
-		final Future future = executor.submit(() -> {
-			try (final WbemClient matsyaWbemClient = new WbemClient()) {
-				matsyaWbemClient.connect(url, username, password, timeout);
+		final Future future = executor.submit(
+			() -> {
+				try (final WbemClient matsyaWbemClient = new WbemClient()) {
+					matsyaWbemClient.connect(url, username, password, timeout);
 
-				return objectPathAssociators == null ?
-						matsyaWbemClient.executeWql(wqlQuery, namespace, arraySeparator) :
-						matsyaWbemClient.getAssociators(wqlQuery, objectPathAssociators, arraySeparator);
+					return objectPathAssociators == null
+						? matsyaWbemClient.executeWql(wqlQuery, namespace, arraySeparator)
+						: matsyaWbemClient.getAssociators(wqlQuery, objectPathAssociators, arraySeparator);
+				}
 			}
-		});
+		);
 
 		try {
 			return future.get(timeout, TimeUnit.MILLISECONDS);
-
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
 			throw (InterruptedException) e;
-
 		} catch (TimeoutException e) {
 			future.cancel(true);
 			throw e;
-
-		}  catch (ExecutionException e) {
+		} catch (ExecutionException e) {
 			if (e.getCause() instanceof WBEMException) {
 				throw (WBEMException) e.getCause();
 			}
 			// else should be RunTimeException as matsyaWbemClient only thrown
 			// WBEMException as checked exceptions.
 			throw (RuntimeException) e.getCause();
-		}
-		finally {
+		} finally {
 			executor.shutdownNow();
 		}
 	}
diff --git a/src/main/java/org/metricshub/wbem/client/WbemQueryResult.java b/src/main/java/org/metricshub/wbem/client/WbemQueryResult.java
index c402f41..04e8eb4 100644
--- a/src/main/java/org/metricshub/wbem/client/WbemQueryResult.java
+++ b/src/main/java/org/metricshub/wbem/client/WbemQueryResult.java
@@ -27,16 +27,13 @@
  *
  */
 public class WbemQueryResult {
-
 	/** List of the properties of the query. */
 	private final List properties;
 
 	/** Query results. */
 	private final List> values;
 
-	public WbemQueryResult(
-			final List properties,
-			final List> values) {
+	public WbemQueryResult(final List properties, final List> values) {
 		this.properties = properties;
 		this.values = values;
 	}
diff --git a/src/main/java/org/metricshub/wbem/client/WqlQuery.java b/src/main/java/org/metricshub/wbem/client/WqlQuery.java
index 489326a..18e4f02 100644
--- a/src/main/java/org/metricshub/wbem/client/WqlQuery.java
+++ b/src/main/java/org/metricshub/wbem/client/WqlQuery.java
@@ -30,7 +30,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.metricshub.wbem.client.exceptions.WqlQuerySyntaxException;
 
 /**
@@ -39,18 +38,20 @@
  */
 public class WqlQuery {
 
-	private WqlQuery() { }
+	private WqlQuery() {}
 
 	private static final String ID = "[^\\s]+";
 	private static final String LIST_SEPARATOR = "\\s*,\\s*";
 
 	private static final Pattern CHECK_SELECT_PATTERN = Pattern.compile(
-			"^\\s*SELECT\\s+(\\*|(?!SELECT|FROM|WHERE)\\w+|((?!SELECT|FROM|WHERE)\\w+\\s*,\\s*)+((?!SELECT|FROM|WHERE)\\w+))\\s+FROM\\s+((?!SELECT|WHERE|FROM)\\w+)\\s*?$",
-			Pattern.CASE_INSENSITIVE);
-
-	private static final Pattern EXTRACT_SELECT_PATTERN= Pattern.compile(
-			"^\\s*SELECT\\s+(.+)\\s+FROM\\s+("+ID+")\\s*$",
-			Pattern.CASE_INSENSITIVE);
+		"^\\s*SELECT\\s+(\\*|(?!SELECT|FROM|WHERE)\\w+|((?!SELECT|FROM|WHERE)\\w+\\s*,\\s*)+((?!SELECT|FROM|WHERE)\\w+))\\s+FROM\\s+((?!SELECT|WHERE|FROM)\\w+)\\s*?$",
+		Pattern.CASE_INSENSITIVE
+	);
+
+	private static final Pattern EXTRACT_SELECT_PATTERN = Pattern.compile(
+		"^\\s*SELECT\\s+(.+)\\s+FROM\\s+(" + ID + ")\\s*$",
+		Pattern.CASE_INSENSITIVE
+	);
 	private static final int SELECT_GROUP_CLASSNAME = 2;
 	private static final int SELECT_GROUP_FIELDS = 1;
 	private static final int SELECT_GROUP_COUNT = 2;
@@ -66,7 +67,6 @@ private WqlQuery() { }
 	 * @throws WqlQuerySyntaxException On WQL Syntax exception.
 	 */
 	public static WqlQuery parseQuery(final String query) throws WqlQuerySyntaxException {
-
 		Utils.checkNonNull(query, "query");
 
 		if (CHECK_SELECT_PATTERN.matcher(query).find()) {
@@ -82,11 +82,12 @@ public String getClassName() {
 	}
 
 	public String[] getPropertiesArray() {
-		return properties.isEmpty() ?
-				null :
-				properties.stream()
-					.filter(property -> !WbemCimDataHandler.PATH_PROPERTY.equalsIgnoreCase(property))
-					.toArray(String[]::new);
+		return properties.isEmpty()
+			? null
+			: properties
+				.stream()
+				.filter(property -> !WbemCimDataHandler.PATH_PROPERTY.equalsIgnoreCase(property))
+				.toArray(String[]::new);
 	}
 
 	public Set getProperties() {
@@ -101,35 +102,35 @@ public boolean hasDuplicateProperties() {
 		return properties != null && originalProperties != null && properties.size() != originalProperties.size();
 	}
 
-	private void parseSelect(
-			final String query) throws WqlQuerySyntaxException {
-
+	private void parseSelect(final String query) throws WqlQuerySyntaxException {
 		final Matcher matcher = EXTRACT_SELECT_PATTERN.matcher(query);
 		if (!matcher.find()) {
 			throw new WqlQuerySyntaxException(query);
 		}
- 		if (matcher.groupCount() < SELECT_GROUP_COUNT) {
- 			throw new WqlQuerySyntaxException(query);
+		if (matcher.groupCount() < SELECT_GROUP_COUNT) {
+			throw new WqlQuerySyntaxException(query);
 		}
 
- 		className = matcher.group(SELECT_GROUP_CLASSNAME);
+		className = matcher.group(SELECT_GROUP_CLASSNAME);
 
- 		final String fieldsList = matcher.group(SELECT_GROUP_FIELDS);
- 		final String[] fieldArray = Optional.ofNullable(fieldsList)
-				.filter(s -> !"*".equals(s))
-				.map(s -> s.split(LIST_SEPARATOR))
-				.orElse(new String[0]);
+		final String fieldsList = matcher.group(SELECT_GROUP_FIELDS);
+		final String[] fieldArray = Optional
+			.ofNullable(fieldsList)
+			.filter(s -> !"*".equals(s))
+			.map(s -> s.split(LIST_SEPARATOR))
+			.orElse(new String[0]);
 
- 		originalProperties = Stream.of(fieldArray)
-				.map(String::trim)
-				.collect(Collectors.toList());
+		originalProperties = Stream.of(fieldArray).map(String::trim).collect(Collectors.toList());
 
- 		// using a map, so the properties will keep the case and the order of the query.
- 		final Map originalMap = new HashMap<>();
- 		originalProperties.stream().forEach(
- 				property -> originalMap.computeIfAbsent(property.toLowerCase(), prop -> property));
+		// using a map, so the properties will keep the case and the order of the query.
+		final Map originalMap = new HashMap<>();
+		originalProperties
+			.stream()
+			.forEach(property -> originalMap.computeIfAbsent(property.toLowerCase(), prop -> property));
 
-		properties = originalProperties.stream()
+		properties =
+			originalProperties
+				.stream()
 				.map(property -> originalMap.get(property.toLowerCase()))
 				.collect(Collectors.toCollection(LinkedHashSet::new));
 	}
diff --git a/src/main/java/org/metricshub/wbem/client/exceptions/WqlQuerySyntaxException.java b/src/main/java/org/metricshub/wbem/client/exceptions/WqlQuerySyntaxException.java
index 08c7189..a54c3ed 100644
--- a/src/main/java/org/metricshub/wbem/client/exceptions/WqlQuerySyntaxException.java
+++ b/src/main/java/org/metricshub/wbem/client/exceptions/WqlQuerySyntaxException.java
@@ -25,7 +25,6 @@
  *
  */
 public class WqlQuerySyntaxException extends Exception {
-
 	private static final long serialVersionUID = 1L;
 
 	public WqlQuerySyntaxException(final String wqlQuery) {
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMArgument.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMArgument.java
index fc076cb..b3136ae 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMArgument.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMArgument.java
@@ -51,14 +51,13 @@
  * method invocation. A CIMArgument has a name, data type and
  * value. A CIMArgument corresponds to a CIMParameter
  * defined for a CIMMethod.
- * 
+ *
  * @param 
  *            Type parameter.
- * 
+ *
  * @see CIMParameter
  */
 public class CIMArgument extends CIMValuedElement {
-
 	private static final long serialVersionUID = 4727439564059428267L;
 
 	/**
@@ -66,7 +65,7 @@ public class CIMArgument extends CIMValuedElement {
 	 * A CIMArgument corresponds to a CIMParameter.
 	 * For each CIMParameter being populated during a method
 	 * invocation a CIMArgument object must be created.
-	 * 
+	 *
 	 * @param pName
 	 *            Name of the CIM argument.
 	 * @param pType
@@ -86,7 +85,7 @@ public CIMArgument(String pName, CIMDataType pType, E pValue) throws IllegalArgu
 	 * true if and only if the argument is not null
 	 * and is a CIMArgument that represents the same name, type and
 	 * value as this CIMArgument.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare with.
 	 * @return true if the objects are the same; false
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMClass.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMClass.java
index 30ea988..40291e1 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMClass.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMClass.java
@@ -60,7 +60,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.TreeSet;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMElementSorter;
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
@@ -80,9 +79,7 @@
  * 
    • an array of methods
      • 
  * 
  */
-public class CIMClass extends CIMElement implements CIMQualifiedElementInterface,
-		CIMNamedElementInterface {
-
+public class CIMClass extends CIMElement implements CIMQualifiedElementInterface, CIMNamedElementInterface {
 	private static final long serialVersionUID = -5634561913210025100L;
 
 	private CIMQualifiedElementInterfaceImpl iQualiImpl;
@@ -105,7 +102,7 @@ public class CIMClass extends CIMElement implements CIMQualifiedElementInterface
 	 * pIsKeyed parameters. If an invalid value is supplied (i.e.
 	 * the class is an association, but the pIsAssociation was set
 	 * to false), it may or may not be corrected.
-	 * 
+	 *
 	 * @param pPath
 	 *            Object Name of the CIM class.
 	 * @param pSuperClass
@@ -124,11 +121,17 @@ public class CIMClass extends CIMElement implements CIMQualifiedElementInterface
 	 *            false otherwise.
 	 * @throws IllegalArgumentException
 	 *             If pPath is null.
-	 * 
+	 *
 	 */
-	public CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQualifiers,
-			CIMClassProperty[] pProperties, CIMMethod[] pMethods, boolean pIsAssociation,
-			boolean pIsKeyed) {
+	public CIMClass(
+		CIMObjectPath pPath,
+		String pSuperClass,
+		CIMQualifier[] pQualifiers,
+		CIMClassProperty[] pProperties,
+		CIMMethod[] pMethods,
+		boolean pIsAssociation,
+		boolean pIsKeyed
+	) {
 		this(pPath, pSuperClass, pQualifiers, pProperties, pMethods);
 		// if (this.isAssociation() != pIsAssociation) {
 		// throw new IllegalArgumentException(
@@ -153,7 +156,7 @@ public CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQual
 	 * Creates and instantiates a Java object representing a CIM Class. This
 	 * constructor will inspect the class to determine if it is an association
 	 * or has keys.
-	 * 
+	 *
 	 * @param pName
 	 *            Name of the CIM class.
 	 * @param pSuperClass
@@ -167,10 +170,14 @@ public CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQual
 	 * @throws IllegalArgumentException
 	 *             If pName is null.
 	 */
-	public CIMClass(String pName, String pSuperClass, CIMQualifier[] pQualifiers,
-			CIMClassProperty[] pProperties, CIMMethod[] pMethods) {
-		this(new CIMObjectPath(null, null, null, null, pName, null), pSuperClass, pQualifiers,
-				pProperties, pMethods);
+	public CIMClass(
+		String pName,
+		String pSuperClass,
+		CIMQualifier[] pQualifiers,
+		CIMClassProperty[] pProperties,
+		CIMMethod[] pMethods
+	) {
+		this(new CIMObjectPath(null, null, null, null, pName, null), pSuperClass, pQualifiers, pProperties, pMethods);
 	}
 
 	/**
@@ -179,8 +186,13 @@ public CIMClass(String pName, String pSuperClass, CIMQualifier[] pQualifiers,
 	 * on whether there is qualifier with name="Association" and value=true and
 	 * a property with a qualifier with name="Key" and value=true, respectively.
 	 */
-	private CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQualifiers,
-			CIMClassProperty[] pProperties, CIMMethod[] pMethods) {
+	private CIMClass(
+		CIMObjectPath pPath,
+		String pSuperClass,
+		CIMQualifier[] pQualifiers,
+		CIMClassProperty[] pProperties,
+		CIMMethod[] pMethods
+	) {
 		super(pPath == null ? null : pPath.getObjectName());
 		this.iObjPath = pPath;
 		this.iSuperClass = pSuperClass;
@@ -194,7 +206,7 @@ private CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQua
 	/**
 	 * Indicates whether the specified CIMClass is equal to this
 	 * CIMClass.
-	 * 
+	 *
 	 * @param pObj
 	 *            The CIMClass object with which to compare.
 	 * @return true if this object is the same as the
@@ -205,11 +217,16 @@ public boolean equals(Object pObj) {
 		if (!(pObj instanceof CIMClass)) return false;
 		CIMClass that = (CIMClass) pObj;
 		if (!super.equals(that)) return false;
-		if (this.iSuperClass == null ? that.iSuperClass != null : !this.iSuperClass
-				.equalsIgnoreCase(that.iSuperClass)) return false;
-		if (!this.iQualiImpl.equals(that.iQualiImpl) || !Arrays.equals(this.iProps, that.iProps)
-				|| !Arrays.equals(this.iMethods, that.iMethods) || this.iIsAssoc != that.iIsAssoc
-				|| isKeyed() != that.isKeyed()) return false;
+		if (
+			this.iSuperClass == null ? that.iSuperClass != null : !this.iSuperClass.equalsIgnoreCase(that.iSuperClass)
+		) return false;
+		if (
+			!this.iQualiImpl.equals(that.iQualiImpl) ||
+			!Arrays.equals(this.iProps, that.iProps) ||
+			!Arrays.equals(this.iMethods, that.iMethods) ||
+			this.iIsAssoc != that.iIsAssoc ||
+			isKeyed() != that.isKeyed()
+		) return false;
 		return true;
 	}
 
@@ -218,7 +235,7 @@ public boolean equals(Object pObj) {
 	 * according to the input parameters. Inclusion of class origin and
 	 * qualifiers can also be controlled. Methods will not be included in the
 	 * class returned.
-	 * 
+	 *
 	 * @param pLocalOnly
 	 *            If true only the elements defined in this class
 	 *            are included; otherwise all elements are included.
@@ -241,35 +258,49 @@ public boolean equals(Object pObj) {
 	 *            invalid property names, they are ignored.
 	 * @return CIMClass matching the requested criteria.
 	 */
-	public CIMClass filterProperties(boolean pLocalOnly, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) {
+	public CIMClass filterProperties(
+		boolean pLocalOnly,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	) {
 		ArrayList> newPropAList = new ArrayList>();
 		// place pPropertyList into a set, for easy and fast search
 		TreeSet set;
 		if (pPropertyList != null) {
 			set = new TreeSet();
-			for (int i = 0; i < pPropertyList.length; i++)
-				set.add(pPropertyList[i].toUpperCase());
+			for (int i = 0; i < pPropertyList.length; i++) set.add(pPropertyList[i].toUpperCase());
 		} else set = null;
 		for (int i = 0; i < getPropertyCount(); i++) {
 			CIMClassProperty refProp = getProperty(i);
 			if (pLocalOnly && refProp.isPropagated()) continue;
-			if (set == null || set.contains(refProp.getName().toUpperCase())) newPropAList
-					.add(new CIMClassProperty(refProp.getName(), refProp.getDataType(),
-							refProp.getValue(),
-							pIncludeQualifiers ? refProp.getQualifiers() : null,
-							pIncludeQualifiers ? refProp.isKey() : false, // FIXME:
-							// Should it depend on pIncludeQualifiers?
-							refProp.isPropagated(), pIncludeClassOrigin ? refProp.getOriginClass()
-									: null));
+			if (set == null || set.contains(refProp.getName().toUpperCase())) newPropAList.add(
+				new CIMClassProperty(
+					refProp.getName(),
+					refProp.getDataType(),
+					refProp.getValue(),
+					pIncludeQualifiers ? refProp.getQualifiers() : null,
+					pIncludeQualifiers ? refProp.isKey() : false, // FIXME:
+					// Should it depend on pIncludeQualifiers?
+					refProp.isPropagated(),
+					pIncludeClassOrigin ? refProp.getOriginClass() : null
+				)
+			);
 		}
-		return new CIMClass(getObjectPath(), getSuperClassName(), getQualifiers(), newPropAList
-				.toArray(new CIMClassProperty[0]), null, isAssociation(), isKeyed());
+		return new CIMClass(
+			getObjectPath(),
+			getSuperClassName(),
+			getQualifiers(),
+			newPropAList.toArray(new CIMClassProperty[0]),
+			null,
+			isAssociation(),
+			isKeyed()
+		);
 	}
 
 	/**
 	 * Returns a list of key properties for this CIM class.
-	 * 
+	 *
 	 * @return The list of CIM properties that are keys for this CIM class.
 	 */
 	public CIMClassProperty[] getKeys() {
@@ -283,7 +314,7 @@ public CIMClassProperty[] getKeys() {
 
 	/**
 	 * Get a method by index.
-	 * 
+	 *
 	 * @param pIndex
 	 *            The index of the method to retrieve.
 	 * @return The CIMMethod at the specified index.
@@ -295,7 +326,7 @@ public CIMMethod getMethod(int pIndex) throws ArrayIndexOutOfBoundsException
 
 	/**
 	 * Returns the specified CIM method in this CIM class.
-	 * 
+	 *
 	 * @param pName
 	 *            The string name of the method to retrieve. The name may be
 	 *            specified in the form "originClass.methodName".
@@ -310,7 +341,7 @@ public CIMMethod getMethod(String pName) {
 	/**
 	 * Returns the CIM method specified by its name and optionally, its origin
 	 * class. The origin class is the class in which the method is defined.
-	 * 
+	 *
 	 * @param pName
 	 *            The string name of the method to get.
 	 * @param pOriginClass
@@ -327,7 +358,7 @@ public CIMMethod getMethod(String pName, String pOriginClass) {
 
 	/**
 	 * Get the number of methods defined in this CIM class.
-	 * 
+	 *
 	 * @return The number of methods defined in the CIM class.
 	 */
 	public int getMethodCount() {
@@ -336,7 +367,7 @@ public int getMethodCount() {
 
 	/**
 	 * Get the CIM methods defined in this CIM class.
-	 * 
+	 *
 	 * @return The methods in this CIM class.
 	 */
 	public CIMMethod[] getMethods() {
@@ -346,7 +377,7 @@ public CIMMethod[] getMethods() {
 	/**
 	 * This method returns the CIMObjectPath that represents this
 	 * CIM class.
-	 * 
+	 *
 	 * @return The CIMObjectPath that represents this CIM class.
 	 */
 	public CIMObjectPath getObjectPath() {
@@ -355,7 +386,7 @@ public CIMObjectPath getObjectPath() {
 
 	/**
 	 * Get the properties defined for this CIM class.
-	 * 
+	 *
 	 * @return The properties for this class.
 	 */
 	public CIMClassProperty[] getProperties() {
@@ -364,7 +395,7 @@ public CIMClassProperty[] getProperties() {
 
 	/**
 	 * Get a class property by index.
-	 * 
+	 *
 	 * @param pIndex
 	 *            The index of the class property to retrieve.
 	 * @return The CIMClassProperty at the specified index.
@@ -376,7 +407,7 @@ public CIMClassProperty getProperty(int pIndex) throws ArrayIndexOutOfBoundsE
 
 	/**
 	 * Gets the specified property.
-	 * 
+	 *
 	 * @param pName
 	 *            The text string for the name of the property.
 	 * @return The property requested or null if the property does
@@ -388,7 +419,7 @@ public CIMClassProperty getProperty(String pName) {
 
 	/**
 	 * Gets the specified property.
-	 * 
+	 *
 	 * @param pName
 	 *            The string name of the property to get.
 	 * @param pOriginClass
@@ -405,7 +436,7 @@ public CIMClassProperty getProperty(String pName, String pOriginClass) {
 
 	/**
 	 * Get the number of properties defined in this CIMClass.
-	 * 
+	 *
 	 * @return The number of properties defined in the CIMClass.
 	 */
 	public int getPropertyCount() {
@@ -414,7 +445,7 @@ public int getPropertyCount() {
 
 	/**
 	 * Get a qualifier by index.
-	 * 
+	 *
 	 * @param pIndex
 	 *            The index of the qualifier to retrieve.
 	 * @return The qualifier at the specified index.
@@ -426,7 +457,7 @@ public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsExce
 
 	/**
 	 * Gets a qualifier by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier to get.
 	 * @return The qualifier requested or null if the qualifier
@@ -438,7 +469,7 @@ public CIMQualifier getQualifier(String pName) {
 
 	/**
 	 * Get the number of qualifiers defined in this CIM class.
-	 * 
+	 *
 	 * @return The number of qualifiers defined in the CIM class.
 	 */
 	public int getQualifierCount() {
@@ -447,7 +478,7 @@ public int getQualifierCount() {
 
 	/**
 	 * Returns the list of qualifiers for the CIM class.
-	 * 
+	 *
 	 * @return Qualifiers for this class.
 	 */
 	public CIMQualifier[] getQualifiers() {
@@ -456,7 +487,7 @@ public CIMQualifier[] getQualifiers() {
 
 	/**
 	 * Gets a qualifier value by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier to get.
 	 * @return null if the qualifier does not exist or value is
@@ -469,7 +500,7 @@ public Object getQualifierValue(String pName) {
 
 	/**
 	 * Gets the name of the parent of this CIM class.
-	 * 
+	 *
 	 * @return The name of the parent class.
 	 */
 	public String getSuperClassName() {
@@ -479,7 +510,7 @@ public String getSuperClassName() {
 	/**
 	 * Checks whether the specified qualifier is one of the qualifiers in this
 	 * CIM class.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @return true if the qualifier exists in this CIM class,
@@ -494,7 +525,7 @@ public boolean hasQualifier(String pName) {
 	 * for this class with the specified value. This method will return
 	 * false if the qualifier is not applied or if the value does
 	 * not match.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @param pValue
@@ -512,7 +543,7 @@ public boolean hasQualifierValue(String pName, Object pValue) {
 	 * two or more classes. The properties of an association class include
 	 * references, or pointers, to the two or more instances. All CIM classes
 	 * can be included in one or more associations.
-	 * 
+	 *
 	 * @return true if this CIM class is an association; otherwise,
 	 *         false.
 	 */
@@ -524,7 +555,7 @@ public boolean isAssociation() {
 	 * Identifies whether or not this class is keyed. Only keyed classes can
 	 * have instances. Returns true if this CIM class has one or
 	 * more key properties. Otherwise, returns false.
-	 * 
+	 *
 	 * @return true if this CIM class has a key property, otherwise
 	 *         returns false.
 	 */
@@ -535,7 +566,7 @@ public boolean isKeyed() {
 	/**
 	 * Returns a new CIM instance initialized with the default CIM properties,
 	 * values and name of this CIM class.
-	 * 
+	 *
 	 * @return A CIM instance of this CIM class.
 	 */
 	public CIMInstance newInstance() {
@@ -547,7 +578,7 @@ public CIMInstance newInstance() {
 	 * method is intended to be used only for debugging purposes, and the format
 	 * of the returned string may vary between implementations. The returned
 	 * string may be empty but may not be null.
-	 * 
+	 *
 	 * @return A String representation of this CIM class.
 	 */
 	@Override
@@ -557,7 +588,7 @@ public String toString() {
 
 	/**
 	 * Checks whether an array of properties contains a key.
-	 * 
+	 *
 	 * @param pProps
 	 *            Array of properties.
 	 * @return true if at least one of the class properties is a
@@ -565,9 +596,7 @@ public String toString() {
 	 */
 	private static boolean hasKey(CIMClassProperty[] pProps) {
 		if (pProps == null) return false;
-		for (int i = 0; i < pProps.length; i++)
-			if (pProps[i].isKey()) return true;
+		for (int i = 0; i < pProps.length; i++) if (pProps[i].isKey()) return true;
 		return false;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMClassProperty.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMClassProperty.java
index b6a8d2f..c8d3eb5 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMClassProperty.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMClassProperty.java
@@ -62,20 +62,19 @@
  * >DSP004). This class is to be used for all CIMClass
  * properties. NOTE: For instance properties, use the class
  * CIMProperty.
- * 
+ *
  * @param 
  *            Type parameter.
- * 
+ *
  */
 public class CIMClassProperty extends CIMProperty implements CIMQualifiedElementInterface {
-
 	private static final long serialVersionUID = -1455588144409014311L;
 
 	private CIMQualifiedElementInterfaceImpl iQualiImpl;
 
 	/**
 	 * This method constructs an instance of CIMClassProperty.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the property.
 	 * @param pType
@@ -93,8 +92,15 @@ public class CIMClassProperty extends CIMProperty implements CIMQualifiedE
 	 * @param pOriginClass
 	 *            The original class in which the property was defined.
 	 */
-	public CIMClassProperty(String pName, CIMDataType pType, E pValue,
-			CIMQualifier[] pQualifiers, boolean pKey, boolean pPropagated, String pOriginClass) {
+	public CIMClassProperty(
+		String pName,
+		CIMDataType pType,
+		E pValue,
+		CIMQualifier[] pQualifiers,
+		boolean pKey,
+		boolean pPropagated,
+		String pOriginClass
+	) {
 		super(pName, pType, pValue, pKey | hasKey(pQualifiers), pPropagated, pOriginClass);
 		this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers, pKey, true);
 	}
@@ -104,7 +110,7 @@ public CIMClassProperty(String pName, CIMDataType pType, E pValue,
 	 * true if and only if the argument is not null and is a
 	 * CIMClassProperty that represents the same name, type and
 	 * value as this object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare with.
 	 * @return true if the objects are the same; false
@@ -119,7 +125,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Returns a CIMClassProperty filtered as specified.
-	 * 
+	 *
 	 * @param pIncludeQualifiers
 	 *            If true all qualifiers are returned; otherwise no
 	 *            qualifiers.
@@ -134,7 +140,7 @@ public CIMClassProperty filter(boolean pIncludeQualifiers, boolean pIncludeCl
 
 	/**
 	 * Returns a CIMClassProperty filtered as specified.
-	 * 
+	 *
 	 * @param pIncludeQualifiers
 	 *            If true all qualifiers are returned; otherwise no
 	 *            qualifiers.
@@ -146,17 +152,22 @@ public CIMClassProperty filter(boolean pIncludeQualifiers, boolean pIncludeCl
 	 *            propagated will be included.
 	 * @return CIMClassProperty A filtered CIMClassProperty.
 	 */
-	public CIMClassProperty filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin,
-			boolean pLocalOnly) {
+	public CIMClassProperty filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin, boolean pLocalOnly) {
 		// FIXME: should key depend on pIncludeQualifiers?
-		return new CIMClassProperty(getName(), getDataType(), getValue(),
-				pIncludeQualifiers ? this.iQualiImpl.getQualifiers(pLocalOnly) : null, isKey(),
-				isPropagated(), pIncludeClassOrigin ? getOriginClass() : null);
+		return new CIMClassProperty(
+			getName(),
+			getDataType(),
+			getValue(),
+			pIncludeQualifiers ? this.iQualiImpl.getQualifiers(pLocalOnly) : null,
+			isKey(),
+			isPropagated(),
+			pIncludeClassOrigin ? getOriginClass() : null
+		);
 	}
 
 	/**
 	 * Get a qualifier by index.
-	 * 
+	 *
 	 * @param pIndex
 	 *            The index of the qualifier to retrieve.
 	 * @return The qualifier at the specified index.
@@ -168,7 +179,7 @@ public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsExce
 
 	/**
 	 * Gets a qualifier by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier to get.
 	 * @return The qualifier requested or null if the qualifier
@@ -180,7 +191,7 @@ public CIMQualifier getQualifier(String pName) {
 
 	/**
 	 * Get the number of qualifiers defined for this property.
-	 * 
+	 *
 	 * @return The number of qualifiers defined for this property.
 	 */
 	public int getQualifierCount() {
@@ -189,7 +200,7 @@ public int getQualifierCount() {
 
 	/**
 	 * Returns the list of qualifiers for this property.
-	 * 
+	 *
 	 * @return Qualifiers for this property.
 	 */
 	public CIMQualifier[] getQualifiers() {
@@ -198,7 +209,7 @@ public CIMQualifier[] getQualifiers() {
 
 	/**
 	 * Gets a qualifier value by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier to get.
 	 * @return null if the qualifier does not exist or value is
@@ -212,7 +223,7 @@ public Object getQualifierValue(String pName) {
 	/**
 	 * Checks whether the specified qualifier is one of the qualifiers defined
 	 * for this property.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @return true if the qualifier exists in this property,
@@ -227,7 +238,7 @@ public boolean hasQualifier(String pName) {
 	 * for this property with the specified value. This method will return
 	 * false if the qualifier is not applied or if the value does
 	 * not match.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @param pValue
@@ -241,10 +252,10 @@ public boolean hasQualifierValue(String pName, Object pValue) {
 
 	/**
 	 * Checks whether an array of qualifiers contains a key.
-	 * 
+	 *
 	 * @param pQualiA
 	 *            Array of qualifiers.
-	 * 
+	 *
 	 * @return true if at least one of the qualifiers is a key,
 	 *         false otherwise.
 	 */
@@ -253,9 +264,10 @@ private static boolean hasKey(CIMQualifier[] pQualiA) {
 		Boolean trueBool = Boolean.TRUE;
 		for (int i = 0; i < pQualiA.length; i++) {
 			CIMQualifier quali = pQualiA[i];
-			if ("key".equalsIgnoreCase(quali.getName())) { return trueBool.equals(quali.getValue()); }
+			if ("key".equalsIgnoreCase(quali.getName())) {
+				return trueBool.equals(quali.getValue());
+			}
 		}
 		return false;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java
index aca33c9..1917b0b 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java
@@ -51,7 +51,6 @@
  */
 
 import java.io.Serializable;
-
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
 
 //Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_02) on Sun Apr 22 15:31:53 EDT 2012
@@ -137,47 +136,46 @@
  * 
  */
 public class CIMDataType extends Object implements Serializable {
-
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * Boolean
-	 * 
+	 *
 	 * @see Boolean
 	 */
 	public static final int BOOLEAN = 9;
 
 	/**
 	 * Boolean unbounded array data type
-	 * 
+	 *
 	 * @see Boolean
 	 */
 	public static final CIMDataType BOOLEAN_ARRAY_T = new CIMDataType(BOOLEAN, true);
 
 	/**
 	 * Boolean data type
-	 * 
+	 *
 	 * @see Boolean
 	 */
 	public static final CIMDataType BOOLEAN_T = new CIMDataType(BOOLEAN, false);
 
 	/**
 	 * 16-bit UCS-2 character
-	 * 
+	 *
 	 * @see Character
 	 */
 	public static final int CHAR16 = 13;
 
 	/**
 	 * 16-bit UCS-2 character unbounded Array type
-	 * 
+	 *
 	 * @see Character
 	 */
 	public static final CIMDataType CHAR16_ARRAY_T = new CIMDataType(CHAR16, true);
 
 	/**
 	 * 16-bit UCS-2 character data type
-	 * 
+	 *
 	 * @see Character
 	 */
 	public static final CIMDataType CHAR16_T = new CIMDataType(CHAR16, false);
@@ -189,35 +187,35 @@ public class CIMDataType extends Object implements Serializable {
 
 	/**
 	 * CIMClass unbounded Array type
-	 * 
+	 *
 	 * @see CIMClass
 	 */
 	public static final CIMDataType CLASS_ARRAY_T = new CIMDataType(CLASS, true);
 
 	/**
 	 * CIMClass type
-	 * 
+	 *
 	 * @see CIMClass
 	 */
 	public static final CIMDataType CLASS_T = new CIMDataType(CLASS, false);
 
 	/**
 	 * A string containing the date-time
-	 * 
+	 *
 	 * @see CIMDateTimeInterval CIMDateTimeAbsolute
 	 */
 	public static final int DATETIME = 12;
 
 	/**
 	 * A date-time unbounded array data type
-	 * 
+	 *
 	 * @see CIMDateTimeInterval CIMDateTimeAbsolute
 	 */
 	public static final CIMDataType DATETIME_ARRAY_T = new CIMDataType(DATETIME, true);
 
 	/**
 	 * A date-time data type
-	 * 
+	 *
 	 * @see CIMDateTimeInterval CIMDateTimeAbsolute
 	 */
 	public static final CIMDataType DATETIME_T = new CIMDataType(DATETIME, false);
@@ -239,14 +237,14 @@ public class CIMDataType extends Object implements Serializable {
 
 	/**
 	 * CIMInstance type
-	 * 
+	 *
 	 * @see CIMInstance
 	 */
 	public static final int OBJECT = 15;
 
 	/**
 	 * CIMInstance unbounded Array type
-	 * 
+	 *
 	 * @see CIMInstance
 	 */
 	public static final CIMDataType OBJECT_ARRAY_T = new CIMDataType(OBJECT, true);
@@ -254,98 +252,98 @@ public class CIMDataType extends Object implements Serializable {
 	/**
 	 * CIMInstance type data type (Note: For CIMV2, this can only be used when
 	 * the property has either an EmbeddedInstance or EmbeddedObject qualifier)
-	 * 
+	 *
 	 * @see CIMInstance
 	 */
 	public static final CIMDataType OBJECT_T = new CIMDataType(OBJECT, false);
 
 	/**
 	 * IEEE 4-byte floating-point
-	 * 
+	 *
 	 * @see Float
 	 */
 	public static final int REAL32 = 10;
 
 	/**
 	 * IEEE 4-byte floating-point unbounded array data type
-	 * 
+	 *
 	 * @see Float
 	 */
 	public static final CIMDataType REAL32_ARRAY_T = new CIMDataType(REAL32, true);
 
 	/**
 	 * IEEE 4-byte floating-point data type
-	 * 
+	 *
 	 * @see Float
 	 */
 	public static final CIMDataType REAL32_T = new CIMDataType(REAL32, false);
 
 	/**
 	 * IEEE 8-byte floating-point
-	 * 
+	 *
 	 * @see Double
 	 */
 	public static final int REAL64 = 11;
 
 	/**
 	 * IEEE 8-byte floating-point unbounded array data type
-	 * 
+	 *
 	 * @see Double
 	 */
 	public static final CIMDataType REAL64_ARRAY_T = new CIMDataType(REAL64, true);
 
 	/**
 	 * IEEE 8-byte floating-point data type
-	 * 
+	 *
 	 * @see Double
 	 */
 	public static final CIMDataType REAL64_T = new CIMDataType(REAL64, false);
 
 	/**
 	 * Reference type
-	 * 
+	 *
 	 * @see CIMObjectPath
 	 */
 	public static final int REFERENCE = 14;
 
 	/**
 	 * Signed 16-bit integer
-	 * 
+	 *
 	 * @see Short
 	 */
 	public static final int SINT16 = 3;
 
 	/**
 	 * Signed 16-bit integer unbounded array data type
-	 * 
+	 *
 	 * @see Short
 	 */
 	public static final CIMDataType SINT16_ARRAY_T = new CIMDataType(SINT16, true);
 
 	/**
 	 * Signed 16-bit integer data type
-	 * 
+	 *
 	 * @see Short
 	 */
 	public static final CIMDataType SINT16_T = new CIMDataType(SINT16, false);
 
 	/**
 	 * Signed 32-bit integer
-	 * 
+	 *
 	 * @see Integer
 	 */
 	public static final int SINT32 = 5;
 
 	/**
 	 * Signed 32-bit integer unbounded array data type
-	 * 
+	 *
 	 * @see Integer
 	 */
 	public static final CIMDataType SINT32_ARRAY_T = new CIMDataType(SINT32, true);
 
 	/**
 	 * Signed 32-bit integer data type
-	 * 
+	 *
 	 * @see Integer
 	 */
 	public static final CIMDataType SINT32_T = new CIMDataType(SINT32, false);
@@ -357,140 +355,140 @@ public class CIMDataType extends Object implements Serializable {
 
 	/**
 	 * Signed 64-bit integer unbounded array data type
-	 * 
+	 *
 	 * @see Long
 	 */
 	public static final CIMDataType SINT64_ARRAY_T = new CIMDataType(SINT64, true);
 
 	/**
 	 * Signed 64-bit integer data type
-	 * 
+	 *
 	 * @see Long
 	 */
 	public static final CIMDataType SINT64_T = new CIMDataType(SINT64, false);
 
 	/**
 	 * Signed 8-bit integer
-	 * 
+	 *
 	 * @see Byte
 	 */
 	public static final int SINT8 = 1;
 
 	/**
 	 * Signed 8-bit integer unbounded array data type
-	 * 
+	 *
 	 * @see Byte
 	 */
 	public static final CIMDataType SINT8_ARRAY_T = new CIMDataType(SINT8, true);
 
 	/**
 	 * Signed 8-bit integer data type
-	 * 
+	 *
 	 * @see Byte
 	 */
 	public static final CIMDataType SINT8_T = new CIMDataType(SINT8, false);
 
 	/**
 	 * UCS-2 string
-	 * 
+	 *
 	 * @see String
 	 */
 	public static final int STRING = 8;
 
 	/**
 	 * UCS-2 string unbounded array data type
-	 * 
+	 *
 	 * @see String
 	 */
 	public static final CIMDataType STRING_ARRAY_T = new CIMDataType(STRING, true);
 
 	/**
 	 * UCS-2 string data type
-	 * 
+	 *
 	 * @see String
 	 */
 	public static final CIMDataType STRING_T = new CIMDataType(STRING, false);
 
 	/**
 	 * Unsigned 16-bit integer
-	 * 
+	 *
 	 * @see UnsignedInteger16
 	 */
 	public static final int UINT16 = 2;
 
 	/**
 	 * Unsigned 16-bit integer unbounded array data type
-	 * 
+	 *
 	 * @see UnsignedInteger16
 	 */
 	public static final CIMDataType UINT16_ARRAY_T = new CIMDataType(UINT16, true);
 
 	/**
 	 * Unsigned 16-bit integer data type
-	 * 
+	 *
 	 * @see UnsignedInteger16
 	 */
 	public static final CIMDataType UINT16_T = new CIMDataType(UINT16, false);
 
 	/**
 	 * Unsigned 32-bit integer
-	 * 
+	 *
 	 * @see UnsignedInteger32
 	 */
 	public static final int UINT32 = 4;
 
 	/**
 	 * Unsigned 32-bit integer unbounded array data type
-	 * 
+	 *
 	 * @see UnsignedInteger32
 	 */
 	public static final CIMDataType UINT32_ARRAY_T = new CIMDataType(UINT32, true);
 
 	/**
 	 * Unsigned 32-bit integer data type
-	 * 
+	 *
 	 * @see UnsignedInteger32
 	 */
 	public static final CIMDataType UINT32_T = new CIMDataType(UINT32, false);
 
 	/**
 	 * Unsigned 64-bit integer
-	 * 
+	 *
 	 * @see UnsignedInteger64
 	 */
 	public static final int UINT64 = 6;
 
 	/**
 	 * Unsigned 64-bit integer unbounded array data type
-	 * 
+	 *
 	 * @see UnsignedInteger64
 	 */
 	public static final CIMDataType UINT64_ARRAY_T = new CIMDataType(UINT64, true);
 
 	/**
 	 * Unsigned 64-bit integer data type
-	 * 
+	 *
 	 * @see UnsignedInteger64
 	 */
 	public static final CIMDataType UINT64_T = new CIMDataType(UINT64, false);
 
 	/**
 	 * Unsigned 8-bit integer
-	 * 
+	 *
 	 * @see UnsignedInteger8
 	 */
 	public static final int UINT8 = 0;
 
 	/**
 	 * Unsigned 8-bit integer unbounded array data type
-	 * 
+	 *
 	 * @see UnsignedInteger8
 	 */
 	public static final CIMDataType UINT8_ARRAY_T = new CIMDataType(UINT8, true);
 
 	/**
 	 * Unsigned 8-bit integer data type
-	 * 
+	 *
 	 * @see UnsignedInteger8
 	 */
 	public static final CIMDataType UINT8_T = new CIMDataType(UINT8, false);
@@ -508,7 +506,7 @@ public class CIMDataType extends Object implements Serializable {
 
 	/**
 	 * Sets the data type (non-array).
-	 * 
+	 *
 	 * @param pType
 	 *            The data type of the class.
 	 */
@@ -519,12 +517,12 @@ private void setType(int pType) {
 
 	/**
 	 * Sets the data type (array).
-	 * 
+	 *
 	 * @param pType
 	 *            The data type of the class.
 	 * @param pBound
 	 *            Array bounds or unbounded if zero.
-	 * 
+	 *
 	 */
 	private void setType(int pType, int pBound) {
 		this.iTypeCode = pType;
@@ -533,7 +531,7 @@ private void setType(int pType, int pBound) {
 
 	/**
 	 * Constructs a CIMDataType.
-	 * 
+	 *
 	 * @param pType
 	 *            The data type as defined in the CIM class.
 	 * @param pIsArray
@@ -553,7 +551,7 @@ public CIMDataType(int pType, boolean pIsArray) throws IllegalArgumentException
 	 * Constructs a CIMDataType array object of the specified type
 	 * and size. This should only be used when the size is being limited/defined
 	 * as part of the data type.
-	 * 
+	 *
 	 * @param pType
 	 *            The data type as defined in the CIM class.
 	 * @param pSize
@@ -563,15 +561,14 @@ public CIMDataType(int pType, boolean pIsArray) throws IllegalArgumentException
 	 *             integer.
 	 */
 	public CIMDataType(int pType, int pSize) throws IllegalArgumentException {
-		if (pSize <= 0) throw new IllegalArgumentException(
-				"Maximum number of elements must be positive integer!");
+		if (pSize <= 0) throw new IllegalArgumentException("Maximum number of elements must be positive integer!");
 		setType(pType, pSize);
 	}
 
 	/**
 	 * Creates a new CIM REFERENCE data type object with the specified class
 	 * reference.
-	 * 
+	 *
 	 * @param pClassName
 	 *            The CIM class reference name.
 	 * @throws IllegalArgumentException
@@ -586,7 +583,7 @@ public CIMDataType(String pClassName) {
 	/**
 	 * Creates a new CIM REFERENCE array data type object with the specified
 	 * class reference.
-	 * 
+	 *
 	 * @param pClassName
 	 *            The CIM class reference name.
 	 * @param pSize
@@ -596,8 +593,7 @@ public CIMDataType(String pClassName) {
 	 */
 	public CIMDataType(String pClassName, int pSize) {
 		if (pClassName == null) throw new IllegalArgumentException("Class name must not be null!");
-		if (pSize < 0) throw new IllegalArgumentException(
-				"Maximum number of elements cannot be negative integer!");
+		if (pSize < 0) throw new IllegalArgumentException("Maximum number of elements cannot be negative integer!");
 		setType(REFERENCE, pSize);
 		this.iRefClassName = pClassName;
 	}
@@ -605,7 +601,7 @@ public CIMDataType(String pClassName, int pSize) {
 	/**
 	 * Checks that the specified CIMDataType is equal to this
 	 * CIMDataType.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare.
 	 * @return true if the specified object is equal to this
@@ -617,14 +613,13 @@ public boolean equals(Object pObj) {
 		if (!(pObj instanceof CIMDataType)) return false;
 		CIMDataType that = (CIMDataType) pObj;
 		if (this.iRefClassName == null && that.iRefClassName != null) return false;
-		boolean refMatch = (this.iRefClassName == null ? true : this.iRefClassName
-				.equals(that.iRefClassName));
+		boolean refMatch = (this.iRefClassName == null ? true : this.iRefClassName.equals(that.iRefClassName));
 		return (this.iTypeCode == that.iTypeCode && isArray() == that.isArray() && refMatch);
 	}
 
 	/**
 	 * Get the data type of an object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object whose data type is to be returned.
 	 * @return The data type of the specified object.
@@ -632,46 +627,109 @@ public boolean equals(Object pObj) {
 	 *             If pObj is not a valid CIM Type.
 	 */
 	public static final CIMDataType getDataType(Object pObj) throws IllegalArgumentException {
-		if (pObj instanceof Byte) { return SINT8_T; }
-		if (pObj instanceof Byte[]) { return SINT8_ARRAY_T; }
-		if (pObj instanceof Short) { return SINT16_T; }
-		if (pObj instanceof Short[]) { return SINT16_ARRAY_T; }
-		if (pObj instanceof Integer) { return SINT32_T; }
-		if (pObj instanceof Integer[]) { return SINT32_ARRAY_T; }
-		if (pObj instanceof Long) { return SINT64_T; }
-		if (pObj instanceof Long[]) { return SINT64_ARRAY_T; }
-		if (pObj instanceof UnsignedInteger8) { return UINT8_T; }
-		if (pObj instanceof UnsignedInteger8[]) { return UINT8_ARRAY_T; }
-		if (pObj instanceof UnsignedInteger16) { return UINT16_T; }
-		if (pObj instanceof UnsignedInteger16[]) { return UINT16_ARRAY_T; }
-		if (pObj instanceof UnsignedInteger32) { return UINT32_T; }
-		if (pObj instanceof UnsignedInteger32[]) { return UINT32_ARRAY_T; }
-		if (pObj instanceof UnsignedInteger64) { return UINT64_T; }
-		if (pObj instanceof UnsignedInteger64[]) { return UINT64_ARRAY_T; }
-		if (pObj instanceof Boolean) { return BOOLEAN_T; }
-		if (pObj instanceof Boolean[]) { return BOOLEAN_ARRAY_T; }
-		if (pObj instanceof Character) { return CHAR16_T; }
-		if (pObj instanceof Character[]) { return CHAR16_ARRAY_T; }
-		if (pObj instanceof String) { return STRING_T; }
-		if (pObj instanceof String[]) { return STRING_ARRAY_T; }
-		if (pObj instanceof Float) { return REAL32_T; }
-		if (pObj instanceof Float[]) { return REAL32_ARRAY_T; }
-		if (pObj instanceof Double) { return REAL64_T; }
-		if (pObj instanceof Double[]) { return REAL64_ARRAY_T; }
-		if (pObj instanceof CIMDateTime) { return DATETIME_T; }
-		if (pObj instanceof CIMDateTime[]) { return DATETIME_ARRAY_T; }
-		if (pObj instanceof CIMClass) { return CLASS_T; }
-		if (pObj instanceof CIMClass[]) { return CLASS_ARRAY_T; }
-		if (pObj instanceof CIMInstance) { return OBJECT_T; }
-		if (pObj instanceof CIMInstance[]) { return OBJECT_ARRAY_T; }
+		if (pObj instanceof Byte) {
+			return SINT8_T;
+		}
+		if (pObj instanceof Byte[]) {
+			return SINT8_ARRAY_T;
+		}
+		if (pObj instanceof Short) {
+			return SINT16_T;
+		}
+		if (pObj instanceof Short[]) {
+			return SINT16_ARRAY_T;
+		}
+		if (pObj instanceof Integer) {
+			return SINT32_T;
+		}
+		if (pObj instanceof Integer[]) {
+			return SINT32_ARRAY_T;
+		}
+		if (pObj instanceof Long) {
+			return SINT64_T;
+		}
+		if (pObj instanceof Long[]) {
+			return SINT64_ARRAY_T;
+		}
+		if (pObj instanceof UnsignedInteger8) {
+			return UINT8_T;
+		}
+		if (pObj instanceof UnsignedInteger8[]) {
+			return UINT8_ARRAY_T;
+		}
+		if (pObj instanceof UnsignedInteger16) {
+			return UINT16_T;
+		}
+		if (pObj instanceof UnsignedInteger16[]) {
+			return UINT16_ARRAY_T;
+		}
+		if (pObj instanceof UnsignedInteger32) {
+			return UINT32_T;
+		}
+		if (pObj instanceof UnsignedInteger32[]) {
+			return UINT32_ARRAY_T;
+		}
+		if (pObj instanceof UnsignedInteger64) {
+			return UINT64_T;
+		}
+		if (pObj instanceof UnsignedInteger64[]) {
+			return UINT64_ARRAY_T;
+		}
+		if (pObj instanceof Boolean) {
+			return BOOLEAN_T;
+		}
+		if (pObj instanceof Boolean[]) {
+			return BOOLEAN_ARRAY_T;
+		}
+		if (pObj instanceof Character) {
+			return CHAR16_T;
+		}
+		if (pObj instanceof Character[]) {
+			return CHAR16_ARRAY_T;
+		}
+		if (pObj instanceof String) {
+			return STRING_T;
+		}
+		if (pObj instanceof String[]) {
+			return STRING_ARRAY_T;
+		}
+		if (pObj instanceof Float) {
+			return REAL32_T;
+		}
+		if (pObj instanceof Float[]) {
+			return REAL32_ARRAY_T;
+		}
+		if (pObj instanceof Double) {
+			return REAL64_T;
+		}
+		if (pObj instanceof Double[]) {
+			return REAL64_ARRAY_T;
+		}
+		if (pObj instanceof CIMDateTime) {
+			return DATETIME_T;
+		}
+		if (pObj instanceof CIMDateTime[]) {
+			return DATETIME_ARRAY_T;
+		}
+		if (pObj instanceof CIMClass) {
+			return CLASS_T;
+		}
+		if (pObj instanceof CIMClass[]) {
+			return CLASS_ARRAY_T;
+		}
+		if (pObj instanceof CIMInstance) {
+			return OBJECT_T;
+		}
+		if (pObj instanceof CIMInstance[]) {
+			return OBJECT_ARRAY_T;
+		}
 		if (pObj instanceof CIMObjectPath) {
 			CIMObjectPath op = (CIMObjectPath) pObj;
 			return new CIMDataType(op.getObjectName());
 		}
 		if (pObj instanceof CIMObjectPath[]) {
 			CIMObjectPath[] ops = (CIMObjectPath[]) pObj;
-			for (int i = 0; i < ops.length; i++)
-				if (ops[i] != null) return new CIMDataType(ops[i].getObjectName(), 0);
+			for (int i = 0; i < ops.length; i++) if (ops[i] != null) return new CIMDataType(ops[i].getObjectName(), 0);
 		}
 		// TODO: tracing
 		/*
@@ -683,7 +741,7 @@ public static final CIMDataType getDataType(Object pObj) throws IllegalArgumentE
 
 	/**
 	 * Returns the class name of the CIM REFERENCE data type.
-	 * 
+	 *
 	 * @return The CIM REFERENCE class name.
 	 */
 	public String getRefClassName() {
@@ -693,7 +751,7 @@ public String getRefClassName() {
 	/**
 	 * Returns the size of the maximum number of elements an array data type may
 	 * hold.
-	 * 
+	 *
 	 * @return The maximum size of the array data type.
 	 */
 	public int getSize() {
@@ -702,7 +760,7 @@ public int getSize() {
 
 	/**
 	 * Returns the data type.
-	 * 
+	 *
 	 * @return The data type.
 	 */
 	public int getType() {
@@ -711,7 +769,7 @@ public int getType() {
 
 	/**
 	 * Checks if the data type is an array type.
-	 * 
+	 *
 	 * @return true if the data type is an array type,
 	 *         false otherwise.
 	 */
@@ -725,7 +783,7 @@ public boolean isArray() {
 	 * debugging purposes, and the format of the returned string may vary
 	 * between implementations. The returned string may be empty but may not be
 	 * null.
-	 * 
+	 *
 	 * @return A string representation of this data type.
 	 */
 	@Override
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java
index 1c44ded..15bbaca 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java
@@ -69,7 +69,7 @@
  * 
    • utc - is the offset from UTC in minutes (using the sign indicated by s).
  * It is ignored for a time interval.
      • 
  * 
- * 
+ *
  * For example, the absolute datetime for Monday, May 25, 1998, at 1:30 PM EST
  * would be represented as: 19980525133015.000000-300. Values must be
  * zero-padded so that the entire string is always the same 25-character length.
@@ -81,29 +81,28 @@
  * is always used for interval properties.
  */
 public abstract class CIMDateTime extends Object implements Serializable, Comparable {
-
 	private static final long serialVersionUID = 3424668043014662166L;
 
 	/**
 	 * Creates a CIMDateTime object using a string.
-	 * 
+	 *
 	 * @param pDateString
 	 *            A string in the format of yyyyMMddHHmmss.SSSSSSsutc.
 	 * @throws IllegalArgumentException
 	 *             If string is not in the correct format.
 	 */
 	public CIMDateTime(String pDateString) throws IllegalArgumentException {
-	// FIXME: what to do here?
+		// FIXME: what to do here?
 	}
 
 	protected CIMDateTime() {
-	// FIXME: what to do here?
+		// FIXME: what to do here?
 	}
 
 	/**
 	 * Determines whether the CIMDateTime that is passed in is
 	 * equal to the current CIMDateTime object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The CIMDateTime object to compare to.
 	 * @return true if this CIMDateTime object is equal to the one
@@ -118,7 +117,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Gets the internal string representation of this object.
-	 * 
+	 *
 	 * @return The internal representation of the CIMDateTime
 	 *         object.
 	 */
@@ -126,7 +125,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Returns the hash code for this object.
-	 * 
+	 *
 	 * @return A hash code value for this object.
 	 * @see java.lang.Object#hashCode()
 	 */
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeAbsolute.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeAbsolute.java
index 510a514..8421e43 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeAbsolute.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeAbsolute.java
@@ -54,7 +54,6 @@
  */
 
 import java.util.Calendar;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cim.DTStringReader;
 import org.metricshub.wbem.sblim.cimclient.internal.cim.DTStringWriter;
 
@@ -81,7 +80,6 @@
  * significant must be replaced with asterisk characters.
  */
 public class CIMDateTimeAbsolute extends CIMDateTime {
-
 	private static final long serialVersionUID = 7556792806296945178l;
 
 	private int iYear, iMonth, iDay, iHour, iMin, iSec, iUSec, iUtc;
@@ -101,7 +99,7 @@ public CIMDateTimeAbsolute() {
 	/**
 	 * Create a CIMDateTimeAbsolute object using a
 	 * Calendar object.
-	 * 
+	 *
 	 * @param pCalendar
 	 *            A Calendar object used to initialize this object.
 	 * @throws IllegalArgumentException
@@ -110,13 +108,14 @@ public CIMDateTimeAbsolute() {
 	public CIMDateTimeAbsolute(Calendar pCalendar) throws IllegalArgumentException {
 		if (pCalendar == null) throw new IllegalArgumentException("Null Calendar is not allowed!");
 		if (pCalendar.get(Calendar.YEAR) > 9999) throw new IllegalArgumentException(
-				"The year field cannot be greater than 9999!");
+			"The year field cannot be greater than 9999!"
+		);
 		set(pCalendar);
 	}
 
 	/**
 	 * Creates a CIMDateTimeAbsolute object using a string.
-	 * 
+	 *
 	 * @param pDateTime
 	 *            A string in the format of yyyyMMddHHmmss.SSSSSSsutc.
 	 * @throws IllegalArgumentException
@@ -135,8 +134,7 @@ public CIMDateTimeAbsolute(String pDateTime) throws IllegalArgumentException {
 		this.iUSec = reader.readAndCheck(6, "microSeconds", 0, 999999, true);
 		char sign = reader.read();
 		if (sign != '+' && sign != '-') {
-			String msg = "Illegal character '" + sign + "' at position " + reader.getPos()
-					+ "! '+' or '-' is expected.";
+			String msg = "Illegal character '" + sign + "' at position " + reader.getPos() + "! '+' or '-' is expected.";
 			throw new IllegalArgumentException(msg);
 		}
 		this.iUtc = reader.read(3, "utc", true);
@@ -145,8 +143,7 @@ public CIMDateTimeAbsolute(String pDateTime) throws IllegalArgumentException {
 		} else if (sign == '-') {
 			this.iUtc = -this.iUtc;
 		}
-		if (reader.read() != 0) throw new IllegalArgumentException("Extra character at the end of "
-				+ pDateTime + " !");
+		if (reader.read() != 0) throw new IllegalArgumentException("Extra character at the end of " + pDateTime + " !");
 		this.iStr = pDateTime;
 	}
 
@@ -154,7 +151,7 @@ public CIMDateTimeAbsolute(String pDateTime) throws IllegalArgumentException {
 	 * Compares the CIMDateTimeAbsolute object with this one. If
 	 * either date has "Not Significant" fields then we can only compare the
 	 * significant fields.
-	 * 
+	 *
 	 * @param pDateTime
 	 *            The CIMDateTimeAbsolute to be compared with this
 	 *            one.
@@ -166,8 +163,9 @@ public CIMDateTimeAbsolute(String pDateTime) throws IllegalArgumentException {
 	 */
 	public int compareTo(CIMDateTime pDateTime) throws IllegalArgumentException {
 		if (!(pDateTime instanceof CIMDateTimeAbsolute)) {
-			String msg = "pDateTime must be a CIMDateTimeAbsolute instance while it is a "
-					+ (pDateTime == null ? "null!" : pDateTime.getClass().getName() + " instance!");
+			String msg =
+				"pDateTime must be a CIMDateTimeAbsolute instance while it is a " +
+				(pDateTime == null ? "null!" : pDateTime.getClass().getName() + " instance!");
 			throw new IllegalArgumentException(msg);
 		}
 
@@ -186,7 +184,7 @@ public int compareTo(CIMDateTime pDateTime) throws IllegalArgumentException {
 
 	/**
 	 * Gets the internal string representation of the date/time object.
-	 * 
+	 *
 	 * @return The internal representation of the date/time object.
 	 */
 	@Override
@@ -202,14 +200,13 @@ public String getDateTimeString() {
 		dTWriter.write(2, this.iSec);
 		dTWriter.write('.');
 		dTWriter.write(6, this.iUSec);
-		if (this.iUnsignificantUtc) dTWriter.write("+***");
-		else dTWriter.writeSigned(3, this.iUtc);
+		if (this.iUnsignificantUtc) dTWriter.write("+***"); else dTWriter.writeSigned(3, this.iUtc);
 		return this.iStr = dTWriter.toString();
 	}
 
 	/**
 	 * Returns day value of this date.
-	 * 
+	 *
 	 * @return If day field "not significant" this returns -1, otherwise returns
 	 *         day of this date.
 	 */
@@ -219,7 +216,7 @@ public int getDay() {
 
 	/**
 	 * Returns hour value of this date.
-	 * 
+	 *
 	 * @return If hour field "not significant" this returns -1, otherwise
 	 *         returns hour of this date.
 	 */
@@ -229,7 +226,7 @@ public int getHour() {
 
 	/**
 	 * Returns microsecond value of this date.
-	 * 
+	 *
 	 * @return If microsecond field "not significant" this returns -1, otherwise
 	 *         returns microseconds of this date.
 	 */
@@ -239,7 +236,7 @@ public int getMicrosecond() {
 
 	/**
 	 * Returns minute value of this date.
-	 * 
+	 *
 	 * @return If minute field "not significant" this returns -1, otherwise
 	 *         returns minute of this date.
 	 */
@@ -249,7 +246,7 @@ public int getMinute() {
 
 	/**
 	 * Returns month value of this date.
-	 * 
+	 *
 	 * @return If month field "not significant" this returns -1, otherwise
 	 *         returns the month of this date.
 	 */
@@ -259,7 +256,7 @@ public int getMonth() {
 
 	/**
 	 * Returns second value of this date.
-	 * 
+	 *
 	 * @return If second field "not significant" this returns -1, otherwise
 	 *         returns second of this date.
 	 */
@@ -269,7 +266,7 @@ public int getSecond() {
 
 	/**
 	 * Returns UTC offset value of this date.
-	 * 
+	 *
 	 * @return UTC offset of this date.
 	 */
 	public int getUTCOffset() {
@@ -278,7 +275,7 @@ public int getUTCOffset() {
 
 	/**
 	 * Returns year value of this Date.
-	 * 
+	 *
 	 * @return If year field "not significant" this returns -1, otherwise
 	 *         returns the year of this date.
 	 */
@@ -288,7 +285,7 @@ public int getYear() {
 
 	/**
 	 * Returns the hash code for this object.
-	 * 
+	 *
 	 * @return A hash code value for this object.
 	 * @see java.lang.Object#hashCode()
 	 */
@@ -303,7 +300,7 @@ public int hashCode() {
 	 * for debugging purposes, and the format of the returned string may vary
 	 * between implementations. The returned string may be empty but may not be
 	 * null.
-	 * 
+	 *
 	 * @return String representation of this datetime.
 	 */
 	@Override
@@ -311,13 +308,12 @@ public String toString() {
 		return getDateTimeString();
 	}
 
-	private static final int YEAR = 1, MONTH = 2, DAY = 4, HOUR = 8, MIN = 16, SEC = 32, USEC = 64,
-			UTC = 128;
+	private static final int YEAR = 1, MONTH = 2, DAY = 4, HOUR = 8, MIN = 16, SEC = 32, USEC = 64, UTC = 128;
 
 	/**
 	 * Get mask of this CIMDateTimeAbsolute where bit is set if the
 	 * corresponding field is significant or clear if it is not significant.
-	 * 
+	 *
 	 * @return Mask of significant fields in datetime object.
 	 */
 	private int getMask() {
@@ -335,7 +331,7 @@ private int getMask() {
 
 	/**
 	 * Get value of a field based on mask.
-	 * 
+	 *
 	 * @param pMask
 	 *            Mask of significant fields.
 	 * @param pField
@@ -353,7 +349,7 @@ private int mask(int pMask, int pField, int pValue, int pInitValue) {
 	/**
 	 * Get total microseconds of CIMDateTimeAbsolute object where
 	 * only significant fields are used in calculation.
-	 * 
+	 *
 	 * @param pMask
 	 *            Mask of significant fields.
 	 * @return Total microseconds of significant fields in datetime.
@@ -380,7 +376,7 @@ private long getTotalUSec(int pMask) {
 	/**
 	 * Initializes this CIMDateTimeAbsolute object from the
 	 * Calendar passed in.
-	 * 
+	 *
 	 * @param pCal
 	 *            Calendar object.
 	 */
@@ -398,5 +394,4 @@ private void set(Calendar pCal) {
 			this.iUtc = pCal.get(Calendar.ZONE_OFFSET) / 60000;
 		}
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeInterval.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeInterval.java
index d36ea4f..e34571a 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeInterval.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTimeInterval.java
@@ -88,10 +88,9 @@
  * For example, if an interval of 1 day, 13 hours, 23 minutes, 12 seconds, and
  * 125 milliseconds was measured with a precision of 1 millisecond, the format
  * would be: 00000001132312.125***:000.
- * 
+ *
  */
 public class CIMDateTimeInterval extends CIMDateTime {
-
 	private static final long serialVersionUID = -7362881414085831668l;
 
 	private int iDays, iHours, iMinutes, iSeconds, iUSeconds;
@@ -104,21 +103,26 @@ public class CIMDateTimeInterval extends CIMDateTime {
 
 	private int iUnsignificantUSecDigits;
 
-	private static final int MAX_DAY = 99999999, MAX_HOUR = 23, MAX_MIN = 59, MAX_SEC = 59,
-			MAX_MILLISEC = 999, MAX_MICROSEC = 999999;
+	private static final int MAX_DAY = 99999999, MAX_HOUR = 23, MAX_MIN = 59, MAX_SEC = 59, MAX_MILLISEC =
+		999, MAX_MICROSEC = 999999;
 
-	private static final long MAX_INTERVAL = ((((long) MAX_DAY * 24 * 60 * 60)
-			+ ((long) MAX_HOUR * 60 * 60) + ((long) MAX_MIN * 60) + MAX_SEC) * 1000)
-			+ MAX_MILLISEC;
+	private static final long MAX_INTERVAL =
+		((((long) MAX_DAY * 24 * 60 * 60) + ((long) MAX_HOUR * 60 * 60) + ((long) MAX_MIN * 60) + MAX_SEC) * 1000) +
+		MAX_MILLISEC;
 
-	private static final long MILLISEC_ACCURACY_DIV = 1000,
-			SEC_ACCURACY_DIV = 1000 * MILLISEC_ACCURACY_DIV,
-			MIN_ACCURACY_DIV = 60 * SEC_ACCURACY_DIV, HOUR_ACCURACY_DIV = 60 * MIN_ACCURACY_DIV,
-			DAY_ACCURACY_DIV = 24 * HOUR_ACCURACY_DIV,
-			NO_ACCURACY_DIV = 100000000 * DAY_ACCURACY_DIV;
+	private static final long MILLISEC_ACCURACY_DIV = 1000, SEC_ACCURACY_DIV =
+		1000 * MILLISEC_ACCURACY_DIV, MIN_ACCURACY_DIV = 60 * SEC_ACCURACY_DIV, HOUR_ACCURACY_DIV =
+		60 * MIN_ACCURACY_DIV, DAY_ACCURACY_DIV = 24 * HOUR_ACCURACY_DIV, NO_ACCURACY_DIV = 100000000 * DAY_ACCURACY_DIV;
 
-	private static final long[] USEC_ACCURACY_DIV_A = { 1, 10, 100, MILLISEC_ACCURACY_DIV, 10000,
-			100000, SEC_ACCURACY_DIV };
+	private static final long[] USEC_ACCURACY_DIV_A = {
+		1,
+		10,
+		100,
+		MILLISEC_ACCURACY_DIV,
+		10000,
+		100000,
+		SEC_ACCURACY_DIV
+	};
 
 	private long iAccuracyDivisor = 1;
 
@@ -127,7 +131,7 @@ public class CIMDateTimeInterval extends CIMDateTime {
 	 * of the interval (day, hours, minutes, seconds and microseconds). Any
 	 * property that has a -1 will make that field "not significant" (i.e. that
 	 * field has asterisks in the datetime string).
-	 * 
+	 *
 	 * @param pDays
 	 *            Number of days in the interval (-1 - 99999999).
 	 * @param pHours
@@ -142,7 +146,7 @@ public class CIMDateTimeInterval extends CIMDateTime {
 	 *             If any value is not valid.
 	 */
 	public CIMDateTimeInterval(int pDays, int pHours, int pMinutes, int pSeconds, int pMicroseconds)
-			throws IllegalArgumentException {
+		throws IllegalArgumentException {
 		boolean notSignificant = checkLimits("pDays", pDays, 0, MAX_DAY, false);
 		if (notSignificant) this.iAccuracyDivisor = NO_ACCURACY_DIV;
 		notSignificant = checkLimits("pHours", pHours, 0, MAX_HOUR, notSignificant);
@@ -151,8 +155,7 @@ public CIMDateTimeInterval(int pDays, int pHours, int pMinutes, int pSeconds, in
 		if (notSignificant && this.iAccuracyDivisor == 1) this.iAccuracyDivisor = HOUR_ACCURACY_DIV;
 		notSignificant = checkLimits("pSeconds", pSeconds, 0, MAX_SEC, notSignificant);
 		if (notSignificant && this.iAccuracyDivisor == 1) this.iAccuracyDivisor = MIN_ACCURACY_DIV;
-		notSignificant = checkLimits("pMicroseconds", pMicroseconds, 0, MAX_MICROSEC,
-				notSignificant);
+		notSignificant = checkLimits("pMicroseconds", pMicroseconds, 0, MAX_MICROSEC, notSignificant);
 		if (notSignificant) {
 			this.iUnsignificantUSecDigits = 6;
 			if (this.iAccuracyDivisor == 1) this.iAccuracyDivisor = USEC_ACCURACY_DIV_A[this.iUnsignificantUSecDigits];
@@ -166,24 +169,45 @@ public CIMDateTimeInterval(int pDays, int pHours, int pMinutes, int pSeconds, in
 		this.iSeconds = pSeconds;
 		this.iUSeconds = pMicroseconds;
 
-		debug("CIMDateTimeInterval(" + pDays + "," + pHours + "," + pMinutes + "," + pSeconds + ","
-				+ pMicroseconds + "): days=" + this.iDays + ", hours=" + this.iHours + ", mins="
-				+ this.iMinutes + ", secs=" + this.iSeconds + ", usecs=" + this.iUSeconds
-				+ ", acc div=" + this.iAccuracyDivisor + ", unsig digits="
-				+ this.iUnsignificantUSecDigits);
+		debug(
+			"CIMDateTimeInterval(" +
+			pDays +
+			"," +
+			pHours +
+			"," +
+			pMinutes +
+			"," +
+			pSeconds +
+			"," +
+			pMicroseconds +
+			"): days=" +
+			this.iDays +
+			", hours=" +
+			this.iHours +
+			", mins=" +
+			this.iMinutes +
+			", secs=" +
+			this.iSeconds +
+			", usecs=" +
+			this.iUSeconds +
+			", acc div=" +
+			this.iAccuracyDivisor +
+			", unsig digits=" +
+			this.iUnsignificantUSecDigits
+		);
 	}
 
 	/**
 	 * Constructs a CIMDateTimeInterval using a milliseconds value.
-	 * 
+	 *
 	 * @param pMilliseconds
 	 *            Number of milliseconds in the interval (0 - 8639999999999999).
 	 * @throws IllegalArgumentException
 	 */
 	public CIMDateTimeInterval(long pMilliseconds) throws IllegalArgumentException {
 		if (pMilliseconds < 0 || pMilliseconds > MAX_INTERVAL) throw new IllegalArgumentException(
-				"pMilliseconds must be between 0 and " + MAX_INTERVAL + ". " + pMilliseconds
-						+ " is illegal!");
+			"pMilliseconds must be between 0 and " + MAX_INTERVAL + ". " + pMilliseconds + " is illegal!"
+		);
 		long totalUSecs = pMilliseconds * 1000;
 		long totalSecs = pMilliseconds / 1000;
 		long totalMins = totalSecs / 60;
@@ -202,26 +226,39 @@ public CIMDateTimeInterval(long pMilliseconds) throws IllegalArgumentException {
 		this.iTotalMicrosCalced = true;
 		this.iTotalMicros = pMilliseconds * 1000;
 
-		debug("CIMDateTimeInterval(" + pMilliseconds + "): days=" + this.iDays + ", hours="
-				+ this.iHours + ", mins=" + this.iMinutes + ", secs=" + this.iSeconds + ", usecs="
-				+ this.iUSeconds + ", acc div=" + this.iAccuracyDivisor + ", unsig digits="
-				+ this.iUnsignificantUSecDigits);
+		debug(
+			"CIMDateTimeInterval(" +
+			pMilliseconds +
+			"): days=" +
+			this.iDays +
+			", hours=" +
+			this.iHours +
+			", mins=" +
+			this.iMinutes +
+			", secs=" +
+			this.iSeconds +
+			", usecs=" +
+			this.iUSeconds +
+			", acc div=" +
+			this.iAccuracyDivisor +
+			", unsig digits=" +
+			this.iUnsignificantUSecDigits
+		);
 	}
 
 	/**
 	 * Creates a CIMDateTimeInterval object using a string.
-	 * 
+	 *
 	 * @param pIntervalString
 	 *            A string in the format of ddddddddHHMMSS.mmmmmm:000.
 	 * @throws IllegalArgumentException
 	 *             If string is not in the correct format or null.
 	 */
 	public CIMDateTimeInterval(String pIntervalString) throws IllegalArgumentException {
-		if (pIntervalString == null) throw new IllegalArgumentException(
-				"Null IntervalString is not allowed!");
-		if (pIntervalString.length() != LENGTH) throw new IllegalArgumentException("Length of "
-				+ pIntervalString + " must be " + LENGTH + ", " + pIntervalString.length()
-				+ " is not valid!");
+		if (pIntervalString == null) throw new IllegalArgumentException("Null IntervalString is not allowed!");
+		if (pIntervalString.length() != LENGTH) throw new IllegalArgumentException(
+			"Length of " + pIntervalString + " must be " + LENGTH + ", " + pIntervalString.length() + " is not valid!"
+		);
 		String intervalStr = setAccuracy(pIntervalString);
 		DTStringReader dtReader = new DTStringReader(intervalStr);
 		this.iDays = dtReader.readAndCheck(8, "days", 0, MAX_DAY, true);
@@ -234,22 +271,35 @@ public CIMDateTimeInterval(String pIntervalString) throws IllegalArgumentExcepti
 		dtReader.read(':');
 		int zeros = dtReader.read(3, "zeros", false);
 		if (zeros != 0) {
-			String msg = "In " + pIntervalString
-					+ " the last 3 characters after ':' must be zeros!";
+			String msg = "In " + pIntervalString + " the last 3 characters after ':' must be zeros!";
 			throw new IllegalArgumentException(msg);
 		}
 
-		debug("CIMDateTimeInterval(\"" + pIntervalString + "\"): days=" + this.iDays + ", hours="
-				+ this.iHours + ", mins=" + this.iMinutes + ", secs=" + this.iSeconds + ", usecs="
-				+ this.iUSeconds + ", acc div=" + this.iAccuracyDivisor + ", unsig digits="
-				+ this.iUnsignificantUSecDigits);
+		debug(
+			"CIMDateTimeInterval(\"" +
+			pIntervalString +
+			"\"): days=" +
+			this.iDays +
+			", hours=" +
+			this.iHours +
+			", mins=" +
+			this.iMinutes +
+			", secs=" +
+			this.iSeconds +
+			", usecs=" +
+			this.iUSeconds +
+			", acc div=" +
+			this.iAccuracyDivisor +
+			", unsig digits=" +
+			this.iUnsignificantUSecDigits
+		);
 	}
 
 	/**
 	 * Compares the CIMDateTimeInterval object with this one. If
 	 * either interval has "Not Significant" fields then we only compare the
 	 * significant fields.
-	 * 
+	 *
 	 * @param pObj
 	 *            The CIMDateTimeInterval to be compared with this
 	 *            one.
@@ -261,14 +311,16 @@ public CIMDateTimeInterval(String pIntervalString) throws IllegalArgumentExcepti
 	 */
 	public int compareTo(CIMDateTime pObj) throws IllegalArgumentException {
 		if (!(pObj instanceof CIMDateTimeInterval)) {
-			String msg = "This method requires a CIMDateTimeInterval instance, while it has received a "
-					+ (pObj == null ? "null!" : pObj.getClass().getName() + " instance!");
+			String msg =
+				"This method requires a CIMDateTimeInterval instance, while it has received a " +
+				(pObj == null ? "null!" : pObj.getClass().getName() + " instance!");
 			throw new IllegalArgumentException(msg);
 		}
 		CIMDateTimeInterval that = (CIMDateTimeInterval) pObj;
 		long accuracyDivisor = Math.max(this.iAccuracyDivisor, that.iAccuracyDivisor);
-		debug("this.acDiv=" + this.iAccuracyDivisor + ", that.acDiv=" + that.iAccuracyDivisor
-				+ ", acDiv=" + accuracyDivisor);
+		debug(
+			"this.acDiv=" + this.iAccuracyDivisor + ", that.acDiv=" + that.iAccuracyDivisor + ", acDiv=" + accuracyDivisor
+		);
 		Long thisMicros = Long.valueOf(calcMicros(accuracyDivisor));
 		Long thatMicros = Long.valueOf(that.calcMicros(accuracyDivisor));
 		debug("thisUs=" + thisMicros + ", thatUs=" + thatMicros);
@@ -277,7 +329,7 @@ public int compareTo(CIMDateTime pObj) throws IllegalArgumentException {
 
 	/**
 	 * Gets the internal string representation of this object.
-	 * 
+	 *
 	 * @return The internal representation of the
 	 *         CIMDateTimeInterval object.
 	 */
@@ -291,15 +343,14 @@ public String getDateTimeString() {
 		dtWriter.write(2, this.iMinutes);
 		dtWriter.write(2, this.iSeconds);
 		dtWriter.write('.');
-		dtWriter.writeUSec(this.iUSeconds / (int) this.iAccuracyDivisor,
-				this.iUnsignificantUSecDigits);
+		dtWriter.writeUSec(this.iUSeconds / (int) this.iAccuracyDivisor, this.iUnsignificantUSecDigits);
 		dtWriter.write(":000");
 		return dtWriter.toString();
 	}
 
 	/**
 	 * Returns days value of this interval.
-	 * 
+	 *
 	 * @return If days field "not significant" this returns -1, otherwise
 	 *         returns number of days in the interval.
 	 */
@@ -309,7 +360,7 @@ public int getDays() {
 
 	/**
 	 * Returns hours value of this interval.
-	 * 
+	 *
 	 * @return If hours field "not significant" this returns -1, otherwise
 	 *         returns number of hours in the interval.
 	 */
@@ -319,7 +370,7 @@ public int getHours() {
 
 	/**
 	 * Returns microseconds value of this interval.
-	 * 
+	 *
 	 * @return If microseconds field "not significant" this returns -1,
 	 *         otherwise returns number of microseconds in the interval.
 	 */
@@ -329,7 +380,7 @@ public int getMicroseconds() {
 
 	/**
 	 * Returns minutes value of this interval.
-	 * 
+	 *
 	 * @return If minutes field "not significant" this returns -1, otherwise
 	 *         returns number of minutes in the interval.
 	 */
@@ -339,7 +390,7 @@ public int getMinutes() {
 
 	/**
 	 * Returns seconds value of this interval.
-	 * 
+	 *
 	 * @return If seconds field "not significant" this returns -1, otherwise
 	 *         returns number of seconds in the interval.
 	 */
@@ -349,7 +400,7 @@ public int getSeconds() {
 
 	/**
 	 * Returns the total length of the interval in milliseconds.
-	 * 
+	 *
 	 * @return The length of the interval in milliseconds.
 	 */
 	public long getTotalMilliseconds() {
@@ -358,7 +409,7 @@ public long getTotalMilliseconds() {
 
 	/**
 	 * Returns the hash code for this object.
-	 * 
+	 *
 	 * @return A hash code value for this object.
 	 * @see java.lang.Object#hashCode()
 	 */
@@ -373,7 +424,7 @@ public int hashCode() {
 	 * for debugging purposes, and the format of the returned string may vary
 	 * between implementations. The returned string may be empty but may not be
 	 * null.
-	 * 
+	 *
 	 * @return String representation of this datetime.
 	 */
 	@Override
@@ -383,12 +434,12 @@ public String toString() {
 
 	// ddddddddHHMMSS.mmmmmm:000
 
-	private static final int DAY_START_IDX = 0, HOUR_START_IDX = 8, MIN_START_IDX = 10,
-			SEC_START_IDX = 12, DOT_IDX = 14, USEC_START_IDX = 15, UTC_START_IDX = 21, LENGTH = 25;
+	private static final int DAY_START_IDX = 0, HOUR_START_IDX = 8, MIN_START_IDX = 10, SEC_START_IDX = 12, DOT_IDX =
+		14, USEC_START_IDX = 15, UTC_START_IDX = 21, LENGTH = 25;
 
 	/**
 	 * Checks the granularity of the CIMDateTimeAbsolute precision.
-	 * 
+	 *
 	 * @param pIdx
 	 *            Index of first asterisk in datetime string.
 	 * @param pFieldName
@@ -404,31 +455,30 @@ public String toString() {
 	 *             If field is not completely significant or completely
 	 *             unsignificant (mix of asterisks and digits).
 	 */
-	private boolean checkGranularity(int pIdx, String pFieldName, int pFieldStartIdx,
-			int pNextStartIdx) throws IllegalArgumentException {
+	private boolean checkGranularity(int pIdx, String pFieldName, int pFieldStartIdx, int pNextStartIdx)
+		throws IllegalArgumentException {
 		if (pIdx > pFieldStartIdx && pIdx < pNextStartIdx) throw new IllegalArgumentException(
-				"Partial unsignificant digits are not allowed for field " + pFieldName + " in "
-						+ this.iStr + "!");
+			"Partial unsignificant digits are not allowed for field " + pFieldName + " in " + this.iStr + "!"
+		);
 		return pIdx == pFieldStartIdx;
 	}
 
 	/**
 	 * Find index of first asterisk within string.
-	 * 
+	 *
 	 * @param pIvStr
 	 *            Time interval string.
 	 * @return Index of first asterisk or -1 if asterisk does not exist.
 	 */
 	private static int findStar(String pIvStr) {
-		for (int i = 0; i < UTC_START_IDX; i++)
-			if (pIvStr.charAt(i) == '*') return i;
+		for (int i = 0; i < UTC_START_IDX; i++) if (pIvStr.charAt(i) == '*') return i;
 		return -1;
 	}
 
 	/**
 	 * Verify that all characters in the string after the starting index are
 	 * asterisks.
-	 * 
+	 *
 	 * @param pIvStr
 	 *            Time interval string.
 	 * @param pStartIdx
@@ -437,16 +487,21 @@ private static int findStar(String pIvStr) {
 	private static void checkStars(String pIvStr, int pStartIdx) {
 		for (int i = pStartIdx; i < UTC_START_IDX; i++) {
 			char ch = pIvStr.charAt(i);
-			if (i != DOT_IDX && ch != '*') throw new IllegalArgumentException("In " + pIvStr
-					+ " every digit character after the first '*' character must " + "be '*', '"
-					+ ch + "' is invalid!");
+			if (i != DOT_IDX && ch != '*') throw new IllegalArgumentException(
+				"In " +
+				pIvStr +
+				" every digit character after the first '*' character must " +
+				"be '*', '" +
+				ch +
+				"' is invalid!"
+			);
 		}
 	}
 
 	/**
 	 * Determines the accuracy (precision) of the interval string and replaces
 	 * all asterisks in microsecond field with zeros.
-	 * 
+	 *
 	 * @param pIntervalStr
 	 *            Time interval string.
 	 * @return Corrected time interval string with iAccuracyDivisor
@@ -482,7 +537,8 @@ private String setAccuracy(String pIntervalStr) throws IllegalArgumentException
 		for (int i = startIdx; i < UTC_START_IDX; i++) {
 			if (i == DOT_IDX) continue;
 			if (this.iStr.charAt(i) != '*') throw new IllegalArgumentException(
-					"All remaining digits must be marked as unsignificant in " + this.iStr + " !");
+				"All remaining digits must be marked as unsignificant in " + this.iStr + " !"
+			);
 			buf[i] = '0';
 		}
 		return new String(buf);
@@ -490,7 +546,7 @@ private String setAccuracy(String pIntervalStr) throws IllegalArgumentException
 
 	/**
 	 * Get total microseconds of CIMDateTimeInterval object.
-	 * 
+	 *
 	 * @return Total microseconds of time interval.
 	 */
 	private long getTotalMicros() {
@@ -503,16 +559,27 @@ private long getTotalMicros() {
 		if (this.iMinutes > 0) this.iTotalMicros += MIN_ACCURACY_DIV * this.iMinutes;
 		if (this.iHours > 0) this.iTotalMicros += HOUR_ACCURACY_DIV * this.iHours;
 		if (this.iDays > 0) this.iTotalMicros += DAY_ACCURACY_DIV * this.iDays;
-		debug("days=" + this.iDays + " ,hours=" + this.iHours + " ,mins=" + this.iMinutes
-				+ ", secs=" + this.iSeconds + ", usecs=" + this.iUSeconds + ", totalMicros="
-				+ this.iTotalMicros);
+		debug(
+			"days=" +
+			this.iDays +
+			" ,hours=" +
+			this.iHours +
+			" ,mins=" +
+			this.iMinutes +
+			", secs=" +
+			this.iSeconds +
+			", usecs=" +
+			this.iUSeconds +
+			", totalMicros=" +
+			this.iTotalMicros
+		);
 		return this.iTotalMicros;
 	}
 
 	/**
 	 * Calculates microseconds of CIMDateTimeInterval object taking
 	 * accuracy (precision) into consideration.
-	 * 
+	 *
 	 * @param pAccuracyDivisor
 	 *            Accuracy divisor of time interval.
 	 * @return Total microseconds of time interval rounded down to precision.
@@ -526,7 +593,7 @@ private long calcMicros(long pAccuracyDivisor) {
 	 * Checks validity of time interval field, making sure value is between
 	 * minimum and maximum values and is not significant if following an
 	 * unsignifcant field.
-	 * 
+	 *
 	 * @param pName
 	 *            Name of field.
 	 * @param pValue
@@ -541,23 +608,25 @@ private long calcMicros(long pAccuracyDivisor) {
 	 *         otherwise.
 	 * @throws IllegalArgumentException
 	 */
-	private static boolean checkLimits(String pName, int pValue, int pLow, int pHigh,
-			boolean pNotSignificant) throws IllegalArgumentException {
+	private static boolean checkLimits(String pName, int pValue, int pLow, int pHigh, boolean pNotSignificant)
+		throws IllegalArgumentException {
 		if (pValue == -1) return true;
 		if (pNotSignificant) throw new IllegalArgumentException(
-				"Not significant fields must be followed by not significant fields!");
-		if (pValue < pLow || pValue > pHigh) throw new IllegalArgumentException(pName
-				+ " must be between " + pLow + " and " + pHigh + ". " + pValue + " is invalid!");
+			"Not significant fields must be followed by not significant fields!"
+		);
+		if (pValue < pLow || pValue > pHigh) throw new IllegalArgumentException(
+			pName + " must be between " + pLow + " and " + pHigh + ". " + pValue + " is invalid!"
+		);
 		return false;
 	}
 
 	/**
 	 * Prints debug message.
-	 * 
+	 *
 	 * @param pMsg
 	 *            Debug message.
 	 */
 	private static void debug(String pMsg) {
-	// System.out.println(pMsg);
+		// System.out.println(pMsg);
 	}
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java
index 27888fa..ba02dc0 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java
@@ -58,14 +58,13 @@
  * >DSP004).
  */
 public abstract class CIMElement extends Object implements Serializable, Comparable {
-
 	private static final long serialVersionUID = -3310480832682118922L;
 
 	private String iName;
 
 	/**
 	 * Creates a new CIM element with the given name.
-	 * 
+	 *
 	 * @param pName
 	 *            The string for the name of the element.
 	 * @throws IllegalArgumentException
@@ -78,7 +77,7 @@ public CIMElement(String pName) {
 
 	/**
 	 * Compares this element name to the CIMElement passed in.
-	 * 
+	 *
 	 * @param pObj
 	 *            The CIMElement to be compared.
 	 * @return A negative integer, zero, or a positive integer as this object is
@@ -95,7 +94,7 @@ public int compareTo(CIMElement pObj) {
 	 * CIM element. Otherwise, it returns false. Useful for
 	 * comparing two CIM elements, for example, to determine whether a CIM
 	 * element exists in a Collection.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to be compared a CIM element.
 	 * @return true indicates the specified CIM element equals this
@@ -104,14 +103,15 @@ public int compareTo(CIMElement pObj) {
 	 */
 	@Override
 	public boolean equals(Object pObj) {
-		if (pObj instanceof CIMElement) { return this.iName
-				.equalsIgnoreCase(((CIMElement) pObj).iName); }
+		if (pObj instanceof CIMElement) {
+			return this.iName.equalsIgnoreCase(((CIMElement) pObj).iName);
+		}
 		return false;
 	}
 
 	/**
 	 * Returns a string representing the name of a CIM element instance.
-	 * 
+	 *
 	 * @return The name of this CIM element.
 	 */
 	public String getName() {
@@ -122,7 +122,7 @@ public String getName() {
 	 * Returns a hash code value for the CIM element. This method is supported
 	 * for the benefit of hashtables such as those provided by
 	 * java.util.Hashtable.
-	 * 
+	 *
 	 * @return A hash code value for this CIM element.
 	 */
 	@Override
@@ -136,7 +136,7 @@ public int hashCode() {
 	 * debugging purposes. The format of the returned string may vary between
 	 * implementations. The returned string may be empty but may not be
 	 * null
-	 * 
+	 *
 	 * @return String representation of this CIM element.
 	 */
 	@Override
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java
index fd9faac..6f152ce 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java
@@ -54,7 +54,6 @@
  * rules specify how qualifiers are transmitted from classes to derived classes.
  */
 public class CIMFlavor extends Object implements Serializable {
-
 	private static final long serialVersionUID = -4177389103635687939l;
 
 	/**
@@ -77,11 +76,10 @@ public class CIMFlavor extends Object implements Serializable {
 
 	/**
 	 * Returns an array of possible flavors.
-	 * 
+	 *
 	 * @return All possible flavors.
 	 */
 	public static int[] getFlavors() {
 		return flavors;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java
index 3380ff9..cd7c846 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java
@@ -51,7 +51,6 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMElementSorter;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
@@ -66,7 +65,6 @@
  * >DSP004).
  */
 public class CIMInstance extends Object implements CIMNamedElementInterface, Serializable {
-
 	private static final long serialVersionUID = -249160087013230559L;
 
 	private static final CIMProperty[] EMPTY_PROP_A = new CIMProperty[0];
@@ -78,7 +76,7 @@ public class CIMInstance extends Object implements CIMNamedElementInterface, Ser
 	/**
 	 * Constructs a CIMInstance object using the name and
 	 * properties specified.
-	 * 
+	 *
 	 * @param pName
 	 *            The CIMObjectPath for this
 	 *            CIMInstance.
@@ -92,8 +90,7 @@ public class CIMInstance extends Object implements CIMNamedElementInterface, Ser
 	 *             cost of the verification. Some implementations may leave it
 	 *             up to the developer to ensure that the values match.
 	 */
-	public CIMInstance(CIMObjectPath pName, CIMProperty[] pProps)
-			throws IllegalArgumentException {
+	public CIMInstance(CIMObjectPath pName, CIMProperty[] pProps) throws IllegalArgumentException {
 		if (pName == null) {
 			String msg = "CIMObjectPath parameter cannot be null!";
 			// TODO: tracing
@@ -117,7 +114,7 @@ public CIMInstance(CIMObjectPath pName, CIMProperty[] pProps)
 	/**
 	 * Returns a CIMInstance with the updated
 	 * CIMObjectPath.
-	 * 
+	 *
 	 * @param pPath
 	 *            The complete CIMObjectPath for this instance.
 	 * @return A new CIMInstance with the updated
@@ -130,7 +127,7 @@ public CIMInstance deriveInstance(CIMObjectPath pPath) {
 	/**
 	 * Returns a CIMInstance with the updated values for the
 	 * properties in pPropA. Any new properties are ignored.
-	 * 
+	 *
 	 * @param pPropA
 	 *            The array of properties to update.
 	 * @return A new instance with the updated properties.
@@ -138,8 +135,7 @@ public CIMInstance deriveInstance(CIMObjectPath pPath) {
 	public CIMInstance deriveInstance(CIMProperty[] pPropA) {
 		if (pPropA == null || pPropA.length == 0) return this;
 		CIMProperty[] newPropA = new CIMProperty[getPropertyCount()];
-		for (int i = 0; i < newPropA.length; i++)
-			newPropA[i] = this.iProps[i];
+		for (int i = 0; i < newPropA.length; i++) newPropA[i] = this.iProps[i];
 		for (int i = 0; i < pPropA.length; i++) {
 			CIMProperty newProp = pPropA[i];
 			int idx = CIMElementSorter.findIdx(newPropA, newProp.getName());
@@ -150,16 +146,28 @@ public CIMInstance deriveInstance(CIMProperty[] pPropA) {
 			 * the referenced class name due to derivation
 			 */
 			if (!typesEqual(oldProp, newProp)) {
-				LogAndTraceBroker.getBroker().trace(
+				LogAndTraceBroker
+					.getBroker()
+					.trace(
 						Level.FINE,
-						"CIMInstance.deriveInstance() can update only property "
-								+ "values but not property types!\n" + "original property: "
-								+ oldProp + "\nnew property: " + newProp);
+						"CIMInstance.deriveInstance() can update only property " +
+						"values but not property types!\n" +
+						"original property: " +
+						oldProp +
+						"\nnew property: " +
+						newProp
+					);
 				continue;
 			}
-			newPropA[idx] = new CIMProperty(oldProp.getName(), newProp.getDataType(),
-					newProp.getValue(), oldProp.isKey(), oldProp.isPropagated(), oldProp
-							.getOriginClass());
+			newPropA[idx] =
+				new CIMProperty(
+					oldProp.getName(),
+					newProp.getDataType(),
+					newProp.getValue(),
+					oldProp.isKey(),
+					oldProp.isPropagated(),
+					oldProp.getOriginClass()
+				);
 		}
 		return new CIMInstance(this.iObjPath, newPropA);
 	}
@@ -168,7 +176,7 @@ public CIMInstance deriveInstance(CIMProperty[] pPropA) {
 	 * Indicates whether some other instance is equal to this one. Two
 	 * CIMInstances are considered equal if the names are the same.
 	 * This method does NOT compare each property value.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare.
 	 * @return true if the specified path references the same
@@ -185,7 +193,7 @@ public boolean equals(Object pObj) {
 	 * This method returns a new CIMInstance with properties
 	 * filtered according to the input parameters. Inclusion of class origin and
 	 * qualifiers can also be controlled.
-	 * 
+	 *
 	 * @param pLocalOnly
 	 *            Include only the properties values that were instantiated in
 	 *            this instance.
@@ -205,24 +213,30 @@ public boolean equals(Object pObj) {
 	 *            invalid property names, they are ignored.
 	 * @return CIMInstance matching the input filter.
 	 */
-	public CIMInstance filterProperties(boolean pLocalOnly, boolean pIncludeClassOrigin,
-			String[] pPropertyList) {
+	public CIMInstance filterProperties(boolean pLocalOnly, boolean pIncludeClassOrigin, String[] pPropertyList) {
 		StringSorter.sort(pPropertyList);
 		ArrayList> propAList = new ArrayList>();
 		for (int i = 0; i < getPropertyCount(); i++) {
 			CIMProperty prop = getProperty(i);
 			if (pLocalOnly && prop.isPropagated()) continue;
 			if (pPropertyList != null && !StringSorter.find(pPropertyList, prop.getName())) continue;
-			propAList.add(new CIMProperty(prop.getName(), prop.getDataType(), prop
-					.getValue(), prop.isKey(), prop.isPropagated(), pIncludeClassOrigin ? prop
-					.getOriginClass() : null));
+			propAList.add(
+				new CIMProperty(
+					prop.getName(),
+					prop.getDataType(),
+					prop.getValue(),
+					prop.isKey(),
+					prop.isPropagated(),
+					pIncludeClassOrigin ? prop.getOriginClass() : null
+				)
+			);
 		}
 		return new CIMInstance(this.iObjPath, propAList.toArray(EMPTY_PROP_A));
 	}
 
 	/**
 	 * Get the name of the class that instantiates this CIM instance.
-	 * 
+	 *
 	 * @return Name of class that instantiates this CIM instance.
 	 */
 	public String getClassName() {
@@ -231,7 +245,7 @@ public String getClassName() {
 
 	/**
 	 * Get the key properties for this instance.
-	 * 
+	 *
 	 * @return An array of key properties.
 	 */
 	public CIMProperty[] getKeys() {
@@ -240,7 +254,7 @@ public CIMProperty[] getKeys() {
 
 	/**
 	 * Returns the CIMObjectPath that represents this instance.
-	 * 
+	 *
 	 * @return The CIMObjectPath that represents this instance.
 	 */
 	public CIMObjectPath getObjectPath() {
@@ -249,7 +263,7 @@ public CIMObjectPath getObjectPath() {
 
 	/**
 	 * Retrieve an array of the properties for this instance.
-	 * 
+	 *
 	 * @return An array of the CIM properties for this instance.
 	 */
 	public CIMProperty[] getProperties() {
@@ -258,7 +272,7 @@ public CIMProperty[] getProperties() {
 
 	/**
 	 * Get a class property by index.
-	 * 
+	 *
 	 * @param pIndex
 	 *            The index of the class property to retrieve.
 	 * @return The CIMProperty at the specified index.
@@ -270,7 +284,7 @@ public CIMProperty getProperty(int pIndex) throws ArrayIndexOutOfBoundsExcept
 
 	/**
 	 * Returns the specified property.
-	 * 
+	 *
 	 * @param pName
 	 *            The text string for the name of the property.
 	 * @return The property requested or null if the property does
@@ -282,7 +296,7 @@ public CIMProperty getProperty(String pName) {
 
 	/**
 	 * Returns the specified CIMProperty.
-	 * 
+	 *
 	 * @param pName
 	 *            The string name of the property to get.
 	 * @param pOriginClass
@@ -301,7 +315,7 @@ public CIMProperty getProperty(String pName, String pOriginClass) {
 
 	/**
 	 * Get the number of properties defined in this CIMInstance.
-	 * 
+	 *
 	 * @return The number of properties defined in the CIMInstance.
 	 */
 	public int getPropertyCount() {
@@ -310,7 +324,7 @@ public int getPropertyCount() {
 
 	/**
 	 * Returns the value of a property of this CIM Instance.
-	 * 
+	 *
 	 * @param name
 	 *            The name of the property.
 	 * @return The value for the specified property name or null if
@@ -325,7 +339,7 @@ public Object getPropertyValue(String name) {
 	 * Computes the hash code for this instance. The hash code will be the
 	 * object path of the instance not including the host or namespace
 	 * information.
-	 * 
+	 *
 	 * @return The integer representing the hash code for this object path.
 	 */
 	@Override
@@ -339,7 +353,7 @@ public int hashCode() {
 	 * debugging purposes, and the format of the returned string may vary
 	 * between implementations. The returned string may be empty but may not be
 	 * null.
-	 * 
+	 *
 	 * @return String representation of this instance.
 	 */
 	@Override
@@ -349,7 +363,7 @@ public String toString() {
 
 	/**
 	 * Indicates whether the data types of the two properties are equal.
-	 * 
+	 *
 	 * @param pProp0
 	 *            First property.
 	 *@param pProp1
@@ -360,7 +374,5 @@ public String toString() {
 	private static boolean typesEqual(CIMProperty pProp0, CIMProperty pProp1) {
 		CIMDataType type0 = pProp0.getDataType(), type1 = pProp0.getDataType();
 		return type0.getType() == type1.getType() && type0.isArray() == type1.isArray();
-
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMMethod.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMMethod.java
index 0c4624c..93dcae3 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMMethod.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMMethod.java
@@ -50,7 +50,6 @@
  */
 
 import java.util.Arrays;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMElementSorter;
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
@@ -62,12 +61,11 @@
  * Specification (DSP004).
- * 
+ *
  * @param 
  *            Type parameter.
  */
 public class CIMMethod extends CIMTypedElement implements CIMQualifiedElementInterface {
-
 	private static final long serialVersionUID = -3920536802046705977L;
 
 	private CIMQualifiedElementInterfaceImpl iQualiImpl;
@@ -81,7 +79,7 @@ public class CIMMethod extends CIMTypedElement implements CIMQualifiedElement
 	/**
 	 * Constructs a CIMMethod object with the specified
 	 * information.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the method.
 	 * @param pType
@@ -95,8 +93,14 @@ public class CIMMethod extends CIMTypedElement implements CIMQualifiedElement
 	 * @param pOriginClass
 	 *            The class this method was defined or overridden in.
 	 */
-	public CIMMethod(String pName, CIMDataType pType, CIMQualifier[] pQualis,
-			CIMParameter[] pParams, boolean pPropagated, String pOriginClass) {
+	public CIMMethod(
+		String pName,
+		CIMDataType pType,
+		CIMQualifier[] pQualis,
+		CIMParameter[] pParams,
+		boolean pPropagated,
+		String pOriginClass
+	) {
 		super(pName, pType);
 		this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualis, false, true);
 		this.iParams = (CIMParameter[]) CIMElementSorter.sort(pParams);
@@ -109,7 +113,7 @@ public CIMMethod(String pName, CIMDataType pType, CIMQualifier[] pQualis,
 	 * true if and only if the argument is not null
 	 * and is a CIMMethod object that represents the same value as
 	 * this object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare.
 	 * @return true if the objects are the same; false
@@ -127,7 +131,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Returns a CIMMethod filtered as specified.
-	 * 
+	 *
 	 * @param pIncludeQualifiers
 	 *            If true all qualifiers are returned; otherwise no
 	 *            qualifiers.
@@ -142,7 +146,7 @@ public CIMMethod filter(boolean pIncludeQualifiers, boolean pIncludeClassOrig
 
 	/**
 	 * Returns a CIMMethod filtered as specified.
-	 * 
+	 *
 	 * @param pIncludeQualifiers
 	 *            If true all qualifiers are returned; otherwise no
 	 *            qualifiers.
@@ -152,19 +156,23 @@ public CIMMethod filter(boolean pIncludeQualifiers, boolean pIncludeClassOrig
 	 * @param pLocalOnly
 	 *            If true only the qualifiers defined on this class
 	 *            are included; otherwise all qualifiers are included.
-	 * 
+	 *
 	 * @return A filtered CIMMethod.
 	 */
-	public CIMMethod filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin,
-			boolean pLocalOnly) {
-		return new CIMMethod(getName(), getDataType(), pIncludeQualifiers ? this.iQualiImpl
-				.getQualifiers(pLocalOnly) : null, this.iParams, this.iPropagated,
-				pIncludeClassOrigin ? this.iOriginClass : null);
+	public CIMMethod filter(boolean pIncludeQualifiers, boolean pIncludeClassOrigin, boolean pLocalOnly) {
+		return new CIMMethod(
+			getName(),
+			getDataType(),
+			pIncludeQualifiers ? this.iQualiImpl.getQualifiers(pLocalOnly) : null,
+			this.iParams,
+			this.iPropagated,
+			pIncludeClassOrigin ? this.iOriginClass : null
+		);
 	}
 
 	/**
 	 * Returns the class name in which this method was defined or overridden.
-	 * 
+	 *
 	 * @return Name of class where this property was defined.
 	 */
 	public String getOriginClass() {
@@ -173,7 +181,7 @@ public String getOriginClass() {
 
 	/**
 	 * Get the parameter that matches the specified name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the CIMParameter to retrieve.
 	 * @return CIMParameter matching the name specified; otherwise
@@ -185,7 +193,7 @@ public CIMParameter getParameter(String pName) {
 
 	/**
 	 * Returns an array of the parameters for this method.
-	 * 
+	 *
 	 * @return The parameters for this method.
 	 */
 	public CIMParameter[] getParameters() {
@@ -194,7 +202,7 @@ public CIMParameter[] getParameters() {
 
 	/**
 	 * Get a qualifier by index.
-	 * 
+	 *
 	 * @param pIndex
 	 *            The index of the qualifier.
 	 * @return The Qualifier at index pIndex.
@@ -206,7 +214,7 @@ public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsExce
 
 	/**
 	 * Gets a qualifier by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier to get.
 	 * @return null if the qualifier does not exist, otherwise
@@ -218,7 +226,7 @@ public CIMQualifier getQualifier(String pName) {
 
 	/**
 	 * Get the number of qualifiers defined for this CIM Method.
-	 * 
+	 *
 	 * @return The number of qualifiers.
 	 */
 	public int getQualifierCount() {
@@ -227,7 +235,7 @@ public int getQualifierCount() {
 
 	/**
 	 * Returns the list of qualifiers for this class.
-	 * 
+	 *
 	 * @return Qualifiers for this class.
 	 */
 	public CIMQualifier[] getQualifiers() {
@@ -236,7 +244,7 @@ public CIMQualifier[] getQualifiers() {
 
 	/**
 	 * Gets a qualifier value by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier to get.
 	 * @return null if the qualifier does not exist or value is
@@ -250,7 +258,7 @@ public Object getQualifierValue(String pName) {
 	/**
 	 * Checks whether the specified qualifier is one of the qualifiers in this
 	 * CIM method.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @return true if the qualifier exists in this CIM method,
@@ -265,7 +273,7 @@ public boolean hasQualifier(String pName) {
 	 * for this method with the specified value. This method will return
 	 * false if the qualifier is not applied or if the value does
 	 * not match.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @param pValue
@@ -279,7 +287,7 @@ public boolean hasQualifierValue(String pName, Object pValue) {
 
 	/**
 	 * Determines if this method is Propagated.
-	 * 
+	 *
 	 * @return true if this method is propagated.
 	 */
 	public boolean isPropagated() {
@@ -292,12 +300,11 @@ public boolean isPropagated() {
 	 * debugging purposes, and the format of the returned string may vary
 	 * between implementations. The returned string may be empty but may not be
 	 * null.
-	 * 
+	 *
 	 * @return The string representation of this method.
 	 */
 	@Override
 	public String toString() {
 		return MOF.methodDeclaration(this, MOF.EMPTY);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMNamedElementInterface.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMNamedElementInterface.java
index 7b78352..b7c498b 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMNamedElementInterface.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMNamedElementInterface.java
@@ -48,12 +48,10 @@
  * can be retrieved by a WBEM client.
  */
 public interface CIMNamedElementInterface {
-
 	/**
 	 * Retrieve the ObjectPath that represents the name for this element.
-	 * 
+	 *
 	 * @return The Object Path that represents the element.
 	 */
 	CIMObjectPath getObjectPath();
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java
index 3db7a92..f395b8f 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java
@@ -63,7 +63,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Arrays;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMElementSorter;
 import org.metricshub.wbem.sblim.cimclient.internal.uri.BooleanValue;
 import org.metricshub.wbem.sblim.cimclient.internal.uri.CharValue;
@@ -118,7 +117,6 @@
  * CreationClassName=My_ComputerSystem 
  */
 public class CIMObjectPath extends Object implements Serializable {
-
 	private static final long serialVersionUID = 4593259690658425064L;
 
 	private String iScheme, iHost, iPort, iNamespace, iObjectName, iXmlSchemaName;
@@ -128,17 +126,16 @@ public class CIMObjectPath extends Object implements Serializable {
 	/**
 	 * Class TypeValuePair represents a type-value pair with special
 	 * identification functionality for integer and real numbers.
-	 * 
+	 *
 	 */
 	private static class TypeValuePair {
-
 		private CIMDataType iType;
 
 		private Object iValue;
 
 		/**
 		 * Constructs a type-value pair with the specified type and value.
-		 * 
+		 *
 		 * @param pType
 		 *            Type.
 		 * @param pValue
@@ -151,7 +148,7 @@ public TypeValuePair(CIMDataType pType, Object pValue) {
 
 		/**
 		 * Constructs a type-value pair with the specified integer value.
-		 * 
+		 *
 		 * @param intVal
 		 *            Integer value.
 		 */
@@ -174,7 +171,6 @@ public TypeValuePair(IntegerValue intVal) {
 						this.iType = CIMDataType.SINT64_T;
 						this.iValue = Long.valueOf(intVal.longValue());
 				}
-
 			} else { // unsigned integers
 				switch (intVal.getBitWidth()) {
 					case 8:
@@ -198,7 +194,7 @@ public TypeValuePair(IntegerValue intVal) {
 
 		/**
 		 * Constructs a type-value pair with the specified real value.
-		 * 
+		 *
 		 * @param pRealVal
 		 *            Real value.
 		 */
@@ -215,7 +211,7 @@ public TypeValuePair(RealValue pRealVal) {
 
 		/**
 		 * Returns the type of the type-value pair.
-		 * 
+		 *
 		 * @return Type of type-value pair.
 		 */
 		public CIMDataType getType() {
@@ -224,18 +220,17 @@ public CIMDataType getType() {
 
 		/**
 		 * Returns the value of the type-value pair.
-		 * 
+		 *
 		 * @return Value of type-value pair.
 		 */
 		public Object getValue() {
 			return this.iValue;
 		}
-
 	}
 
 	/**
 	 * Extracts and returns sorted list of key-value pairs from the URI.
-	 * 
+	 *
 	 * @param pURI
 	 *            The Uniform Resource Identifier.
 	 * @return Sorted array of keys in URI.
@@ -256,24 +251,20 @@ private CIMProperty[] getKeysFromURI(URI pURI) {
 				CIMObjectPath op = new CIMObjectPath(refVal.getRef());
 				typeValue = new TypeValuePair(new CIMDataType(op.getObjectName()), op);
 			} else if (uriVal instanceof BooleanValue) {
-				typeValue = new TypeValuePair(CIMDataType.BOOLEAN_T, ((BooleanValue) uriVal)
-						.getBoolean());
+				typeValue = new TypeValuePair(CIMDataType.BOOLEAN_T, ((BooleanValue) uriVal).getBoolean());
 			} else if (uriVal instanceof CharValue) {
-				typeValue = new TypeValuePair(CIMDataType.CHAR16_T, ((CharValue) uriVal)
-						.getCharacter());
+				typeValue = new TypeValuePair(CIMDataType.CHAR16_T, ((CharValue) uriVal).getCharacter());
 			} else if (uriVal instanceof IntegerValue) {
 				typeValue = new TypeValuePair((IntegerValue) uriVal);
 			} else if (uriVal instanceof RealValue) {
 				typeValue = new TypeValuePair((RealValue) uriVal);
 			} else if (uriVal instanceof DateTimeValue) {
-				typeValue = new TypeValuePair(CIMDataType.DATETIME_T, ((DateTimeValue) uriVal)
-						.getDateTime());
+				typeValue = new TypeValuePair(CIMDataType.DATETIME_T, ((DateTimeValue) uriVal).getDateTime());
 			} else {
 				// TODO: error or warning tracing
 				typeValue = new TypeValuePair(CIMDataType.INVALID_T, null);
 			}
-			keys[i] = new CIMProperty(name, typeValue.getType(), typeValue.getValue(),
-					true, false, null);
+			keys[i] = new CIMProperty(name, typeValue.getType(), typeValue.getValue(), true, false, null);
 		}
 		return (CIMProperty[]) CIMElementSorter.sort(keys);
 	}
@@ -281,7 +272,7 @@ private CIMProperty[] getKeysFromURI(URI pURI) {
 	/**
 	 * Initializes the elements of the CIMObjectPath from the given
 	 * URI.
-	 * 
+	 *
 	 * @param pURI
 	 *            The Uniform Resource Identifier.
 	 */
@@ -297,7 +288,7 @@ private void setURI(URI pURI) {
 	/**
 	 * Constructs a CIM Object Path referencing an instance of the specified CIM
 	 * element in the given URI.
-	 * 
+	 *
 	 * @param pURI
 	 *            The Uniform Resource Identifier.
 	 */
@@ -320,7 +311,7 @@ private CIMObjectPath(URI pURI) {
 	 * //myserver.org/root/cimv2:My_ComputerSystem
      
 	 * /root/cimv2:My_ComputerSystem
 	 * 
-	 * 
+	 *
 	 * @param pObjectPath
 	 *            The string representation of an object path for a CIM element
 	 *            that will be parsed and used to initialize the object.
@@ -332,8 +323,7 @@ public CIMObjectPath(String pObjectPath) {
 		URI uri;
 
 		if (pObjectPath == null) throw new IllegalArgumentException("ObjectPath is null!");
-		if (pObjectPath.trim().length() == 0) throw new IllegalArgumentException(
-				"ObjectPath is empty!");
+		if (pObjectPath.trim().length() == 0) throw new IllegalArgumentException("ObjectPath is empty!");
 
 		try {
 			uri = URI.parse(pObjectPath);
@@ -344,11 +334,15 @@ public CIMObjectPath(String pObjectPath) {
 				try {
 					uri = URI.parseRef(new URIString(pObjectPath), true);
 				} catch (IllegalArgumentException asTypedRef) {
-					String msg = "Parsing of ObjectPath string has failed!\n"
-							+ "Nested error messages:\n" + "When parsing as normal URI string:\n"
-							+ asURI.getMessage() + "When parsing as untyped reference:\n"
-							+ asUntypedRef.getMessage() + "When parsing as typed reference:\n"
-							+ asTypedRef.getMessage();
+					String msg =
+						"Parsing of ObjectPath string has failed!\n" +
+						"Nested error messages:\n" +
+						"When parsing as normal URI string:\n" +
+						asURI.getMessage() +
+						"When parsing as untyped reference:\n" +
+						asUntypedRef.getMessage() +
+						"When parsing as typed reference:\n" +
+						asTypedRef.getMessage();
 					// TODO: tracing
 					throw new IllegalArgumentException(msg);
 				}
@@ -368,7 +362,7 @@ public CIMObjectPath(String pObjectPath) {
 	 * preceding '/' in the namespace parameter. For example, OpenPegasus will
 	 * accept "root/cimv2" as a namespace but will not accept
 	 * "/root/cimv2".
-	 * 
+	 *
 	 * @param pScheme
 	 *            The connection scheme to the host (e.g. http, https, ...)
 	 * @param pHost
@@ -383,17 +377,23 @@ public CIMObjectPath(String pObjectPath) {
 	 *            The keys and their corresponding values that identify an
 	 *            instance of the CIM element.
 	 */
-	public CIMObjectPath(String pScheme, String pHost, String pPort, String pNamespace,
-			String pObjectName, CIMProperty[] pKeys) {
+	public CIMObjectPath(
+		String pScheme,
+		String pHost,
+		String pPort,
+		String pNamespace,
+		String pObjectName,
+		CIMProperty[] pKeys
+	) {
 		this.iScheme = pScheme;
 		this.iHost = pHost;
 		this.iPort = pPort;
 		this.iNamespace = pNamespace;
 		this.iObjectName = pObjectName;
 		if (pKeys != null) {
-			for (int i = 0; i < pKeys.length; i++)
-				if (!pKeys[i].isKey()) throw new IllegalArgumentException(
-						"All CIMObjectPath properties must be keys!");
+			for (int i = 0; i < pKeys.length; i++) if (!pKeys[i].isKey()) throw new IllegalArgumentException(
+				"All CIMObjectPath properties must be keys!"
+			);
 		}
 		this.iKeys = (CIMProperty[]) CIMElementSorter.sort(pKeys);
 	}
@@ -409,7 +409,7 @@ public CIMObjectPath(String pScheme, String pHost, String pPort, String pNamespa
 	 * preceding '/' in the namespace parameter. For example, OpenPegasus will
 	 * accept "root/cimv2" as a namespace but will not accept
 	 * "/root/cimv2".
-	 * 
+	 *
 	 * @param pScheme
 	 *            The connection scheme to the host (e.g. http, https, ...)
 	 * @param pHost
@@ -427,8 +427,15 @@ public CIMObjectPath(String pScheme, String pHost, String pPort, String pNamespa
 	 *            The name of the XML Schema for this object. This is only
 	 *            needed for protocols that require this information.
 	 */
-	public CIMObjectPath(String pScheme, String pHost, String pPort, String pNamespace,
-			String pObjectName, CIMProperty[] pKeys, String pXmlSchemaName) {
+	public CIMObjectPath(
+		String pScheme,
+		String pHost,
+		String pPort,
+		String pNamespace,
+		String pObjectName,
+		CIMProperty[] pKeys,
+		String pXmlSchemaName
+	) {
 		this(pScheme, pHost, pPort, pNamespace, pObjectName, pKeys);
 		if (pXmlSchemaName != null) {
 			try {
@@ -443,7 +450,7 @@ public CIMObjectPath(String pScheme, String pHost, String pPort, String pNamespa
 	/**
 	 * Compares this CIM object path with the specified CIM object path for
 	 * equality.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare to this CIM object path. Only the model
 	 *            paths are compared.
@@ -461,13 +468,14 @@ private boolean equalsWorker(Object pObj, boolean pIncludeNamespacePath) {
 		// hostname information is not any longer part of the comparison, since
 		// there is no reliable way to attach hostnames
 		if (pIncludeNamespacePath) {
-			boolean namespaceEqual = (this.iNamespace == null ? that.iNamespace == null
-					: this.iNamespace.equalsIgnoreCase(that.iNamespace));
+			boolean namespaceEqual =
+				(this.iNamespace == null ? that.iNamespace == null : this.iNamespace.equalsIgnoreCase(that.iNamespace));
 			if (!namespaceEqual) return false;
 		}
-		return (this.iObjectName == null ? that.iObjectName == null : this.iObjectName
-				.equalsIgnoreCase(that.iObjectName))
-				&& keysEqual(that);
+		return (
+			(this.iObjectName == null ? that.iObjectName == null : this.iObjectName.equalsIgnoreCase(that.iObjectName)) &&
+			keysEqual(that)
+		);
 	}
 
 	/**
@@ -476,7 +484,7 @@ private boolean equalsWorker(Object pObj, boolean pIncludeNamespacePath) {
 	 * 
      
 	 * NOTE: CIMProperty.equals() shouldn't be used for keys,
 	 * because the XML doesn't contain originClass and propagated information.
-	 * 
+	 *
 	 * @param pThat
 	 *            The object path whose keys are to be compared to this CIM
 	 *            object path's keys.
@@ -490,14 +498,16 @@ private boolean keysEqual(CIMObjectPath pThat) {
 		if (this.iKeys.length != pThat.iKeys.length) return false;
 		for (int i = 0; i < this.iKeys.length; i++) {
 			CIMProperty thisKey = this.iKeys[i], thatKey = pThat.iKeys[i];
-			if (!equals(thisKey, thatKey)) { return false; }
+			if (!equals(thisKey, thatKey)) {
+				return false;
+			}
 		}
 		return true;
 	}
 
 	/**
 	 * Compares two properties for equality.
-	 * 
+	 *
 	 * @param pThis
 	 *            First property.
 	 * @param pThat
@@ -506,20 +516,23 @@ private boolean keysEqual(CIMObjectPath pThat) {
 	 *         otherwise.
 	 */
 	private boolean equals(CIMProperty pThis, CIMProperty pThat) {
-		if (pThis.getDataType() != null && pThis.getDataType().isArray()) { return ncEqualsIC(pThis
-				.getName(), pThat.getName())
-				&& ncEquals(pThis.getDataType(), pThat.getDataType())
-				&& Arrays.equals((Object[]) pThis.getValue(), (Object[]) pThat.getValue());
-
+		if (pThis.getDataType() != null && pThis.getDataType().isArray()) {
+			return (
+				ncEqualsIC(pThis.getName(), pThat.getName()) &&
+				ncEquals(pThis.getDataType(), pThat.getDataType()) &&
+				Arrays.equals((Object[]) pThis.getValue(), (Object[]) pThat.getValue())
+			);
 		}
-		return ncEqualsIC(pThis.getName(), pThat.getName())
-				&& ncEquals(pThis.getDataType(), pThat.getDataType())
-				&& ncEquals(pThis.getValue(), pThat.getValue());
+		return (
+			ncEqualsIC(pThis.getName(), pThat.getName()) &&
+			ncEquals(pThis.getDataType(), pThat.getDataType()) &&
+			ncEquals(pThis.getValue(), pThat.getValue())
+		);
 	}
 
 	/**
 	 * Compares two objects for equality.
-	 * 
+	 *
 	 * @param pThis
 	 *            First object.
 	 * @param pThat
@@ -533,7 +546,7 @@ private boolean ncEquals(Object pThis, Object pThat) {
 
 	/**
 	 * Compares two strings for equality, ignoring case.
-	 * 
+	 *
 	 * @param pThis
 	 *            First string.
 	 * @param pThat
@@ -550,7 +563,7 @@ private boolean ncEqualsIC(String pThis, String pThat) {
 	 * the model path includes references, then the references will also be
 	 * compared for the model path (i.e. the namespace part of the object path
 	 * will be ignored).
-	 * 
+	 *
 	 * @param pModelPath
 	 *            The object to compare.
 	 * @return true if the specified path references the same
@@ -562,7 +575,7 @@ public boolean equalsModelPath(CIMObjectPath pModelPath) {
 
 	/**
 	 * Gets the host.
-	 * 
+	 *
 	 * @return The name of the host.
 	 */
 	public String getHost() {
@@ -571,7 +584,7 @@ public String getHost() {
 
 	/**
 	 * Gets a key property by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the key property to retrieve.
 	 * @return The CIMProperty with the given name, or
@@ -583,7 +596,7 @@ public CIMProperty getKey(String pName) {
 
 	/**
 	 * Gets all key properties.
-	 * 
+	 *
 	 * @return The container of key properties.
 	 */
 	public CIMProperty[] getKeys() {
@@ -602,7 +615,7 @@ public Object getKeyValue(String pName) {
 
 	/**
 	 * Gets the namespace.
-	 * 
+	 *
 	 * @return The name of the namespace.
 	 */
 	public String getNamespace() {
@@ -612,7 +625,7 @@ public String getNamespace() {
 	/**
 	 * Gets the object name. Depending on the type of CIM element referenced,
 	 * this may be either a class name or a qualifier type name.
-	 * 
+	 *
 	 * @return The name of this CIM element.
 	 */
 	public String getObjectName() {
@@ -621,7 +634,7 @@ public String getObjectName() {
 
 	/**
 	 * Gets the the port on the host to which the connection was established.
-	 * 
+	 *
 	 * @return The port on the host.
 	 */
 	public String getPort() {
@@ -630,7 +643,7 @@ public String getPort() {
 
 	/**
 	 * Get the connection scheme.
-	 * 
+	 *
 	 * @return The connection scheme (e.g. http, https,...)
 	 */
 	public String getScheme() {
@@ -639,7 +652,7 @@ public String getScheme() {
 
 	/**
 	 * Get the XML Schema for this object (optional).
-	 * 
+	 *
 	 * @return The XML Schema name.
 	 */
 	public String getXmlSchemaName() {
@@ -648,7 +661,7 @@ public String getXmlSchemaName() {
 
 	/**
 	 * Computes the hash code for this object path.
-	 * 
+	 *
 	 * @return The integer representing the hash code for this object path.
 	 */
 	@Override
@@ -661,12 +674,11 @@ public int hashCode() {
 	 * method is intended to be used only for debugging purposes. The format of
 	 * the value returned may vary between implementations. The string returned
 	 * may be empty but may not be null.
-	 * 
+	 *
 	 * @return A string representation of this CIM object path.
 	 */
 	@Override
 	public String toString() {
 		return MOF.objectHandle(this, false, false);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMParameter.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMParameter.java
index b1c6d22..9ec83a0 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMParameter.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMParameter.java
@@ -62,14 +62,13 @@
  * Infrastructure Specification (DSP004). To invoke a method, you would use CIMArgument.
- * 
+ *
  * @param 
  *            Type parameter.
- * 
+ *
  * @see CIMMethod
  */
 public class CIMParameter extends CIMTypedElement implements CIMQualifiedElementInterface {
-
 	private static final long serialVersionUID = -4741931597423829396L;
 
 	private CIMQualifiedElementInterfaceImpl iQualiImpl;
@@ -79,7 +78,7 @@ public class CIMParameter extends CIMTypedElement implements CIMQualifiedElem
 	 * data type and qualifiers. Takes a string for the name of an existing CIM
 	 * parameter and creates a new instance of a CIM parameter, using the name
 	 * and identifier of the existing CIM parameter.
-	 * 
+	 *
 	 * @param pName
 	 *            Name of this parameter.
 	 * @param pType
@@ -97,7 +96,7 @@ public CIMParameter(String pName, CIMDataType pType, CIMQualifier[] pQualifie
 	 * true if and only if the argument is not null
 	 * and is a CIMParameter object that represents the same value
 	 * as this object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare.
 	 * @return true if the objects are the same; false
@@ -113,7 +112,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Returns a CIMParameter filtered as specified.
-	 * 
+	 *
 	 * @param pIncludeQualifiers
 	 *            If true all qualifiers are returned; otherwise no
 	 *            qualifiers.
@@ -123,13 +122,16 @@ public boolean equals(Object pObj) {
 	 * @return A filtered CIMParameter.
 	 */
 	public CIMParameter filter(boolean pIncludeQualifiers, boolean pLocalOnly) {
-		return new CIMParameter(getName(), getDataType(), pIncludeQualifiers ? this.iQualiImpl
-				.getQualifiers(pLocalOnly) : null);
+		return new CIMParameter(
+			getName(),
+			getDataType(),
+			pIncludeQualifiers ? this.iQualiImpl.getQualifiers(pLocalOnly) : null
+		);
 	}
 
 	/**
 	 * Get a qualifier by index.
-	 * 
+	 *
 	 * @param pIndex
 	 *            The index of the qualifier.
 	 * @return The Qualifier at index pIndex.
@@ -141,7 +143,7 @@ public CIMQualifier getQualifier(int pIndex) throws ArrayIndexOutOfBoundsExce
 
 	/**
 	 * Gets a qualifier by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier to get.
 	 * @return null if the qualifier does not exist, otherwise
@@ -153,7 +155,7 @@ public CIMQualifier getQualifier(String pName) {
 
 	/**
 	 * Get the number of qualifiers defined for this CIM Parameter.
-	 * 
+	 *
 	 * @return The number of qualifiers.
 	 */
 	public int getQualifierCount() {
@@ -162,7 +164,7 @@ public int getQualifierCount() {
 
 	/**
 	 * Returns the list of qualifiers for this class.
-	 * 
+	 *
 	 * @return Qualifiers for this class.
 	 */
 	public CIMQualifier[] getQualifiers() {
@@ -171,7 +173,7 @@ public CIMQualifier[] getQualifiers() {
 
 	/**
 	 * Gets a qualifier value by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier to get.
 	 * @return null if the qualifier does not exist or value is
@@ -185,7 +187,7 @@ public Object getQualifierValue(String pName) {
 	/**
 	 * Checks whether the specified qualifier is one of the qualifiers in this
 	 * CIM element.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @return true if the qualifier exists in this CIM parameter,
@@ -200,7 +202,7 @@ public boolean hasQualifier(String pName) {
 	 * for this parameter with the specified value. This method will return
 	 * false if the qualifier is not applied or if the value does
 	 * not match.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @param pValue
@@ -218,12 +220,11 @@ public boolean hasQualifierValue(String pName, Object pValue) {
 	 * debugging purposes, and the format of the returned string may vary
 	 * between implementations. The returned string may be empty but may not be
 	 * null.
-	 * 
+	 *
 	 * @return String representation of this parameter.
 	 */
 	@Override
 	public String toString() {
 		return MOF.parameter(this, MOF.EMPTY);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMProperty.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMProperty.java
index c37c0c5..7f203e8 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMProperty.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMProperty.java
@@ -58,12 +58,11 @@
  * is a key property (used as part of the name of the CIM element), a flag to
  * signify whether it was propagated from a parent class and the class origin
  * information (where the property was originally defined).
- * 
+ *
  * @param 
  *            Type parameter.
  */
 public class CIMProperty extends CIMValuedElement {
-
 	private static final long serialVersionUID = -4741931597423829396L;
 
 	private boolean iKey, iPropagated;
@@ -75,7 +74,7 @@ public class CIMProperty extends CIMValuedElement {
 	 * CIMClass, CIMClassProperty shall be used. This
 	 * can only be used for non-Key properties, non-propagated properties and
 	 * when the the origin class is not needed.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the property.
 	 * @param pType
@@ -90,7 +89,7 @@ public CIMProperty(String pName, CIMDataType pType, E pValue) {
 	/**
 	 * Constructs a CIMProperty to be used in instances. For a
 	 * CIMClass, CIMClassProperty shall be used.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the property.
 	 * @param pType
@@ -105,8 +104,14 @@ public CIMProperty(String pName, CIMDataType pType, E pValue) {
 	 * @param pOriginClass
 	 *            The class in which this property was defined or overridden.
 	 */
-	public CIMProperty(String pName, CIMDataType pType, E pValue, boolean pKey,
-			boolean pPropagated, String pOriginClass) {
+	public CIMProperty(
+		String pName,
+		CIMDataType pType,
+		E pValue,
+		boolean pKey,
+		boolean pPropagated,
+		String pOriginClass
+	) {
 		super(pName, pType, pValue);
 		this.iKey = pKey;
 		this.iPropagated = pPropagated;
@@ -118,7 +123,7 @@ public CIMProperty(String pName, CIMDataType pType, E pValue, boolean pKey,
 	 * true if and only if the argument is not null
 	 * and is a CIMProperty that represents the same name, type and
 	 * value as this object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare with.
 	 * @return true if the objects are the same; false
@@ -129,15 +134,16 @@ public boolean equals(Object pObj) {
 		if (!(pObj instanceof CIMProperty)) return false;
 		if (!super.equals(pObj)) return false;
 		CIMProperty that = (CIMProperty) pObj;
-		return this.iKey == that.iKey
-				&& this.iPropagated == that.iPropagated
-				&& (this.iOriginClass == null ? that.iOriginClass == null : this.iOriginClass
-						.equalsIgnoreCase(that.iOriginClass));
+		return (
+			this.iKey == that.iKey &&
+			this.iPropagated == that.iPropagated &&
+			(this.iOriginClass == null ? that.iOriginClass == null : this.iOriginClass.equalsIgnoreCase(that.iOriginClass))
+		);
 	}
 
 	/**
 	 * Returns the class in which this property was defined or overridden.
-	 * 
+	 *
 	 * @return Name of class where this property was defined.
 	 */
 	public String getOriginClass() {
@@ -146,7 +152,7 @@ public String getOriginClass() {
 
 	/**
 	 * Convenience method for determining if this property is a Key.
-	 * 
+	 *
 	 * @return true if this property is a key.
 	 */
 	public boolean isKey() {
@@ -157,11 +163,10 @@ public boolean isKey() {
 	 * Determines if this property is Propagated. When this property is part of
 	 * a class, this value designates that the class origin value is the same as
 	 * the class name.
-	 * 
+	 *
 	 * @return true if this property is propagated.
 	 */
 	public boolean isPropagated() {
 		return this.iPropagated;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifiedElementInterface.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifiedElementInterface.java
index 5097df7..f7f7f76 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifiedElementInterface.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifiedElementInterface.java
@@ -48,10 +48,9 @@
  * CIM Parameters are all CIM Elements that have qualifiers.
  */
 public interface CIMQualifiedElementInterface {
-
 	/**
 	 * Get a qualifier by index.
-	 * 
+	 *
 	 * @param pIndex
 	 *            The index of the qualifier.
 	 * @return The Qualifier at index pIndex.
@@ -60,7 +59,7 @@ public interface CIMQualifiedElementInterface {
 
 	/**
 	 * Gets a qualifier by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier to get.
 	 * @return null if the qualifier does not exist, otherwise
@@ -70,21 +69,21 @@ public interface CIMQualifiedElementInterface {
 
 	/**
 	 * Get the number of qualifiers defined for this CIM Element.
-	 * 
+	 *
 	 * @return The number of qualifiers.
 	 */
 	public int getQualifierCount();
 
 	/**
 	 * Returns the list of qualifiers for this class.
-	 * 
+	 *
 	 * @return Qualifiers for this class.
 	 */
 	public CIMQualifier[] getQualifiers();
 
 	/**
 	 * Gets a qualifier value by name.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier to get.
 	 * @return null if the qualifier does not exist or value is
@@ -96,7 +95,7 @@ public interface CIMQualifiedElementInterface {
 	/**
 	 * Checks whether the specified qualifier is one of the qualifiers in this
 	 * CIM element.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @return true if the qualifier exists in this CIM element,
@@ -109,7 +108,7 @@ public interface CIMQualifiedElementInterface {
 	 * for this property with the specified value. This method will return
 	 * false if the qualifier is not applied or if the value does
 	 * not match.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @param pValue
@@ -118,5 +117,4 @@ public interface CIMQualifiedElementInterface {
 	 *         otherwise false.
 	 */
 	public boolean hasQualifierValue(String pName, Object pValue);
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifier.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifier.java
index 0e0051f..667db18 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifier.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifier.java
@@ -60,13 +60,12 @@
  * qualifier type must have the same name and data type. CIM Qualifiers can only
  * be applied to elements that are allowed by the scope defined by the CIM
  * Qualifier Type.
- * 
+ *
  * @param 
  *            Type parameter.
  * @see CIMQualifierType
  */
 public class CIMQualifier extends CIMValuedElement {
-
 	private static final long serialVersionUID = 3568987946093931214L;
 
 	private int iFlavor;
@@ -76,7 +75,7 @@ public class CIMQualifier extends CIMValuedElement {
 	/**
 	 * Constructs a CIM qualifier with the specified name, type, value, and
 	 * flavors.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @param pType
@@ -97,7 +96,7 @@ public CIMQualifier(String pName, CIMDataType pType, E pValue, int pFlavor) {
 	/**
 	 * Constructs a CIM qualifier with the specified name, type, value, and
 	 * flavors.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the qualifier.
 	 * @param pType
@@ -114,8 +113,7 @@ public CIMQualifier(String pName, CIMDataType pType, E pValue, int pFlavor) {
 	 *            false otherwise.
 	 * @see CIMFlavor
 	 */
-	public CIMQualifier(String pName, CIMDataType pType, E pValue, int pFlavor,
-			boolean pIsPropagated) {
+	public CIMQualifier(String pName, CIMDataType pType, E pValue, int pFlavor, boolean pIsPropagated) {
 		super(pName, pType, pValue);
 		this.iFlavor = pFlavor;
 		this.iPropagated = pIsPropagated;
@@ -127,7 +125,7 @@ public CIMQualifier(String pName, CIMDataType pType, E pValue, int pFlavor,
 	 * the argument is not null and is a CIMQualifier
 	 * that represents the same name, type and value as this
 	 * CIMQualifier.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare.
 	 * @return true if the input qualifier is equal, otherwise
@@ -143,7 +141,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Returns the CIM flavors for this CIM qualifier.
-	 * 
+	 *
 	 * @return A BitSet of CIM flavors in this CIM qualifier.
 	 */
 	public int getFlavor() {
@@ -154,7 +152,7 @@ public int getFlavor() {
 	 * Determines if this qualifier is propagated. If the qualifier was
 	 * inherited, this value will be true. If the qualifier was
 	 * applied to the element directly, this value will be false.
-	 * 
+	 *
 	 * @return true if this property is propagated;
 	 *         false otherwise.
 	 */
@@ -168,12 +166,11 @@ public boolean isPropagated() {
 	 * debugging purposes, and the format of the returned string may vary
 	 * between implementations. The returned string may be empty but may not be
 	 * null.
-	 * 
+	 *
 	 * @return A string representation of this qualifier.
 	 */
 	@Override
 	public String toString() {
 		return MOF.qualifier(this);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifierType.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifierType.java
index 7cad6a2..4c0802b 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifierType.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMQualifierType.java
@@ -67,7 +67,7 @@
  * 
    • Flavors - The flavors applicable to this qualifier type.
  * Flavors describe the propagation and override rules for a qualifier.
      • 
  * 
- * 
+ *
  * @param 
  *            Type parameter.
  * @see CIMScope
@@ -75,7 +75,6 @@
  * @see CIMQualifier
  */
 public class CIMQualifierType extends CIMValuedElement implements CIMNamedElementInterface {
-
 	private static final long serialVersionUID = -4563643521754840535L;
 
 	private CIMObjectPath iObjPath;
@@ -85,7 +84,7 @@ public class CIMQualifierType extends CIMValuedElement implements CIMNamed
 	/**
 	 * Constructs a new CIM qualifier type, using the name, type of the
 	 * specified CIM qualifier type.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIMObjectPath of a CIM qualifier type.
 	 * @param pType
@@ -99,8 +98,8 @@ public class CIMQualifierType extends CIMValuedElement implements CIMNamed
 	 * @throws IllegalArgumentException
 	 *             If the value/data type does not match.
 	 */
-	public CIMQualifierType(CIMObjectPath pPath, CIMDataType pType, E pValue, int pScope,
-			int pFlavor) throws IllegalArgumentException {
+	public CIMQualifierType(CIMObjectPath pPath, CIMDataType pType, E pValue, int pScope, int pFlavor)
+		throws IllegalArgumentException {
 		super(pPath == null ? null : pPath.getObjectName(), pType, pValue);
 		this.iObjPath = pPath;
 		this.iScope = pScope;
@@ -112,7 +111,7 @@ public CIMQualifierType(CIMObjectPath pPath, CIMDataType pType, E pValue, int pS
 	 * true if and only if the argument is not null
 	 * and is a CIMQualifierType object that represents the same
 	 * value as this object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare.
 	 * @return true if the specified object it is the same as this
@@ -128,7 +127,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Returns the flavors of this qualifier type as a BitSet.
-	 * 
+	 *
 	 * @return BitSet of flavors for this qualifier type.
 	 */
 	public int getFlavor() {
@@ -137,7 +136,7 @@ public int getFlavor() {
 
 	/**
 	 * Get the object path for this CIMQualifierType.
-	 * 
+	 *
 	 * @return The CIMObjectPath that represents this qualifier
 	 *         type.
 	 */
@@ -147,7 +146,7 @@ public CIMObjectPath getObjectPath() {
 
 	/**
 	 * Returns the scopes of this qualifier type as a bit set.
-	 * 
+	 *
 	 * @return Bit set of CIM element scopes for which this qualifier type is
 	 *         applicable.
 	 */
@@ -161,12 +160,11 @@ public int getScope() {
 	 * debugging purposes, and the format of the returned string may vary
 	 * between implementations. The returned string may be empty but may not be
 	 * null.
-	 * 
+	 *
 	 * @return A string representation of this qualifier type.
 	 */
 	@Override
 	public String toString() {
 		return MOF.qualifierDeclaration(this);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java
index f0c082d..f898d54 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java
@@ -53,7 +53,6 @@
  * what elements the qualifier can be applied to.
  */
 public class CIMScope extends Object implements Serializable {
-
 	private static final long serialVersionUID = -4563643521754840535l;
 
 	/**
@@ -96,16 +95,14 @@ public class CIMScope extends Object implements Serializable {
 	 */
 	public static final int REFERENCE = 16;
 
-	private static final int[] SCOPES = { ANY, ASSOCIATION, CLASS, INDICATION, METHOD, PARAMETER,
-			PROPERTY, REFERENCE };
+	private static final int[] SCOPES = { ANY, ASSOCIATION, CLASS, INDICATION, METHOD, PARAMETER, PROPERTY, REFERENCE };
 
 	/**
 	 * Returns the complete set of possible scopes.
-	 * 
+	 *
 	 * @return An int array of all scopes.
 	 */
 	public static int[] getScopes() {
 		return SCOPES;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMTypedElement.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMTypedElement.java
index 2a42582..fdfe782 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMTypedElement.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMTypedElement.java
@@ -51,7 +51,6 @@
  * element that contains just the data type, but no value.
  */
 public abstract class CIMTypedElement extends CIMElement {
-
 	private static final long serialVersionUID = -8839964536590822815L;
 
 	private CIMDataType iType;
@@ -59,7 +58,7 @@ public abstract class CIMTypedElement extends CIMElement {
 	/**
 	 * Constructs a CIMTypedElement with the given name and data
 	 * type.
-	 * 
+	 *
 	 * @param pName
 	 *            Name of the element.
 	 * @param pType
@@ -75,7 +74,7 @@ public CIMTypedElement(String pName, CIMDataType pType) {
 	 * true if and only if the argument is not null
 	 * and is a CIMTypedElement that represents the same name and
 	 * type as this object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare with.
 	 * @return true if the objects are the same; false
@@ -91,7 +90,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Returns the CIMDataType for this CIM Element.
-	 * 
+	 *
 	 * @return CIMDataType of this CIM element.
 	 */
 	public CIMDataType getDataType() {
@@ -102,7 +101,7 @@ public CIMDataType getDataType() {
 	 * Returns a hash code value for the CIM typed element. This method is
 	 * supported for the benefit of hashtables such as those provided by
 	 * java.util.Hashtable.
-	 * 
+	 *
 	 * @return A hash code value for this CIM typed element.
 	 */
 	@Override
@@ -115,7 +114,7 @@ public int hashCode() {
 	 * method is intended to be used only for debugging purposes, and the format
 	 * of the returned string may vary between implementations. The returned
 	 * string may be empty but may not be null.
-	 * 
+	 *
 	 * @return String representation of this element.
 	 */
 	@Override
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMValuedElement.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMValuedElement.java
index 9e4f5f6..2b46061 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMValuedElement.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMValuedElement.java
@@ -46,26 +46,24 @@
  */
 
 import java.util.Arrays;
-
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
 
 //Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013
 /**
  * CIMValuedElement is a base class used by any element that
  * contains a name, type and value.
- * 
+ *
  * @param 
  *            Type parameter.
  */
 public abstract class CIMValuedElement extends CIMTypedElement {
-
 	private static final long serialVersionUID = 4234L;
 
 	private E iValue;
 
 	/**
 	 * Creates a new CIM element with the given name, type and value.
-	 * 
+	 *
 	 * @param pName
 	 *            The string for the name for this element.
 	 * @param pType
@@ -78,7 +76,6 @@ public abstract class CIMValuedElement extends CIMTypedElement {
 	 */
 	protected CIMValuedElement(String pName, CIMDataType pType, E pValue) {
 		super(pName, pType);
-
 		if (pType != null && pValue != null) {
 			CIMDataType valueDataType;
 			try {
@@ -88,8 +85,8 @@ protected CIMValuedElement(String pName, CIMDataType pType, E pValue) {
 				valueDataType = null;
 			}
 			if (valueDataType != null && valueDataType.getType() != pType.getType()) throw new IllegalArgumentException(
-					"CIM value does not match type: " + valueDataType.getType() + " != "
-							+ pType.getType());
+				"CIM value does not match type: " + valueDataType.getType() + " != " + pType.getType()
+			);
 		}
 
 		this.iValue = pValue;
@@ -100,7 +97,7 @@ protected CIMValuedElement(String pName, CIMDataType pType, E pValue) {
 	 * true if and only if the argument is not null
 	 * and is a CIMValuedElement that represents the same name,
 	 * type and value as this object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare with.
 	 * @return true if the objects are the same; false
@@ -111,14 +108,15 @@ public boolean equals(Object pObj) {
 		if (!(pObj instanceof CIMValuedElement)) return false;
 		CIMValuedElement that = (CIMValuedElement) pObj;
 		if (!super.equals(that)) return false;
-		if (getDataType().isArray()) { return Arrays.equals((Object[]) this.iValue,
-				(Object[]) that.iValue); }
+		if (getDataType().isArray()) {
+			return Arrays.equals((Object[]) this.iValue, (Object[]) that.iValue);
+		}
 		return this.iValue == null ? that.iValue == null : this.iValue.equals(that.iValue);
 	}
 
 	/**
 	 * Returns the value for this CIM Element.
-	 * 
+	 *
 	 * @return The value of the CIM Element. null is a valid value.
 	 */
 	public E getValue() {
@@ -129,7 +127,7 @@ public E getValue() {
 	 * Returns a hash code value for the CIM valued element. This method is
 	 * supported for the benefit of hashtables such as those provided by
 	 * java.util.Hashtable.
-	 * 
+	 *
 	 * @return A hash code value for this CIM valued element.
 	 */
 	@Override
@@ -142,12 +140,11 @@ public int hashCode() {
 	 * method is intended to be used only for debugging purposes, and the format
 	 * of the returned string may vary between implementations. The returned
 	 * string may be empty but may not be null.
-	 * 
+	 *
 	 * @return String representation of this element.
 	 */
 	@Override
 	public String toString() {
 		return MOF.valuedElement(this, MOF.EMPTY);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger16.java b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger16.java
index 433742b..b767aa1 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger16.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger16.java
@@ -56,7 +56,6 @@
  * >DSP004).
  */
 public class UnsignedInteger16 extends Number implements Comparable {
-
 	private static final long serialVersionUID = -4992164525643467216L;
 
 	/**
@@ -74,7 +73,7 @@ public class UnsignedInteger16 extends Number implements Comparablenull.
 	 */
 	public int compareTo(UnsignedInteger16 pOther) {
-		if (pOther == null) throw new IllegalArgumentException(
-				"Other UnsignedInteger16 cannot be null!");
+		if (pOther == null) throw new IllegalArgumentException("Other UnsignedInteger16 cannot be null!");
 		UnsignedInteger16 that = pOther;
 		int d = this.iValue - that.iValue;
 		if (d == 0) return 0;
@@ -146,7 +144,7 @@ public int compareTo(UnsignedInteger16 pOther) {
 	 * true if and only if the argument is not null and is an
 	 * UnsignedInteger16 object that represents the same value as
 	 * this object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare.
 	 * @return true if the objects are the same; false
@@ -160,7 +158,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Returns the value of this unsigned integer object as a byte.
-	 * 
+	 *
 	 * @return The byte value of this unsigned integer object.
 	 */
 	@Override
@@ -171,7 +169,7 @@ public byte byteValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a
 	 * double.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a double.
 	 */
 	@Override
@@ -182,7 +180,7 @@ public double doubleValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a float
 	 * .
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a float.
 	 */
 	@Override
@@ -192,7 +190,7 @@ public float floatValue() {
 
 	/**
 	 * Computes the hash code for this unsigned integer object.
-	 * 
+	 *
 	 * @return The integer representing the hash code for this unsigned integer
 	 *         object.
 	 */
@@ -203,7 +201,7 @@ public int hashCode() {
 
 	/**
 	 * Returns the value of this unsigned integer object as an int.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as an int.
 	 */
 	@Override
@@ -213,7 +211,7 @@ public int intValue() {
 
 	/**
 	 * Returns the value of this unsigned integer object as a long.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a long.
 	 */
 	@Override
@@ -224,7 +222,7 @@ public long longValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a short
 	 * .
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a short.
 	 */
 	@Override
@@ -234,12 +232,11 @@ public short shortValue() {
 
 	/**
 	 * Returns the text representation of this unsigned integer object.
-	 * 
+	 *
 	 * @return Text representation of this unsigned integer.
 	 */
 	@Override
 	public String toString() {
 		return Integer.toString(this.iValue);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger32.java b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger32.java
index 7722dce..426ffee 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger32.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger32.java
@@ -56,7 +56,6 @@
  * >DSP004).
  */
 public class UnsignedInteger32 extends Number implements Comparable {
-
 	private static final long serialVersionUID = -8861436527534071393L;
 
 	/**
@@ -74,7 +73,7 @@ public class UnsignedInteger32 extends Number implements Comparablenull.
 	 */
 	public int compareTo(UnsignedInteger32 pOther) {
-		if (pOther == null) throw new IllegalArgumentException(
-				"Other UnsignedInteger32 cannot be null!");
+		if (pOther == null) throw new IllegalArgumentException("Other UnsignedInteger32 cannot be null!");
 		UnsignedInteger32 that = pOther;
 		long d = this.iValue - that.iValue;
 		if (d == 0) return 0;
@@ -145,7 +143,7 @@ public int compareTo(UnsignedInteger32 pOther) {
 	 * Compares this object against the specified object. The result is
 	 * true if and only if the argument is not null and is an
 	 * UnsignedInteger32 object that represents the same value as this object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare.
 	 * @return true if the objects are the same; false
@@ -159,7 +157,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Returns the value of this unsigned integer object as a byte.
-	 * 
+	 *
 	 * @return The byte value of this unsigned integer object.
 	 */
 	@Override
@@ -170,7 +168,7 @@ public byte byteValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a
 	 * double.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a double.
 	 */
 	@Override
@@ -181,7 +179,7 @@ public double doubleValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a float
 	 * .
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a float.
 	 */
 	@Override
@@ -191,7 +189,7 @@ public float floatValue() {
 
 	/**
 	 * Computes the hash code for this unsigned integer object.
-	 * 
+	 *
 	 * @return The integer representing the hash code for this unsigned integer
 	 *         object.
 	 */
@@ -202,7 +200,7 @@ public int hashCode() {
 
 	/**
 	 * Returns the value of this unsigned integer object as an int.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as an int.
 	 */
 	@Override
@@ -212,7 +210,7 @@ public int intValue() {
 
 	/**
 	 * Returns the value of this unsigned integer object as a long.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a long.
 	 */
 	@Override
@@ -223,7 +221,7 @@ public long longValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a short
 	 * .
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a short.
 	 */
 	@Override
@@ -233,12 +231,11 @@ public short shortValue() {
 
 	/**
 	 * Returns the text representation of this unsigned integer object.
-	 * 
+	 *
 	 * @return Text representation of this unsigned integer.
 	 */
 	@Override
 	public String toString() {
 		return Long.toString(this.iValue);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger64.java b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger64.java
index ced03b6..7d72fa0 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger64.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger64.java
@@ -57,7 +57,6 @@
  * >DSP004).
  */
 public class UnsignedInteger64 extends Number implements Comparable {
-
 	private static final long serialVersionUID = -3734165689168941119L;
 
 	/**
@@ -75,7 +74,7 @@ public class UnsignedInteger64 extends Number implements ComparableBigInteger. Only the lower 64 bits are considered.
-	 * 
+	 *
 	 * @param pValue
 	 *            The BigInteger to be represented as an unsigned
 	 *            64-bit integer.
@@ -109,7 +108,7 @@ public UnsignedInteger64(BigInteger pValue) throws NumberFormatException {
 	/**
 	 * Constructs an unsigned 64-bit integer object for the specified array of
 	 * bytes. Only the lower 64 bits are considered.
-	 * 
+	 *
 	 * @param pValue
 	 *            The byte array to be represented as an unsigned 64-bit
 	 *            integer.
@@ -126,7 +125,7 @@ public UnsignedInteger64(byte[] pValue) throws NumberFormatException {
 	/**
 	 * Constructs an unsigned 64-bit integer object from the specified string.
 	 * Only the lower 64 bits are considered.
-	 * 
+	 *
 	 * @param pValue
 	 *            The string to be represented as an unsigned 64-bit integer.
 	 * @throws NumberFormatException
@@ -141,7 +140,7 @@ public UnsignedInteger64(String pValue) throws NumberFormatException {
 
 	/**
 	 * Get the value as a BigInteger.
-	 * 
+	 *
 	 * @return BigInteger representation of this object.
 	 */
 	public BigInteger bigIntegerValue() {
@@ -152,7 +151,7 @@ public BigInteger bigIntegerValue() {
 	 * Compares this object with the specified object for order. Returns a
 	 * negative integer, zero, or a positive integer as this object is less
 	 * than, equal to, or greater than the specified object.
-	 * 
+	 *
 	 * @param pOther
 	 *            The Object to be compared.
 	 * @return A negative integer, zero, or a positive integer as this object is
@@ -164,8 +163,7 @@ public BigInteger bigIntegerValue() {
 	 *             If value is null.
 	 */
 	public int compareTo(UnsignedInteger64 pOther) {
-		if (pOther == null) throw new IllegalArgumentException(
-				"Other UnsignedInteger64 cannot be null!");
+		if (pOther == null) throw new IllegalArgumentException("Other UnsignedInteger64 cannot be null!");
 		UnsignedInteger64 that = pOther;
 		int d = this.iValue.compareTo(that.iValue);
 		if (d == 0) return 0;
@@ -177,7 +175,7 @@ public int compareTo(UnsignedInteger64 pOther) {
 	 * true if and only if the argument is not null
 	 * and is an UnsignedInteger64 object that represents the same
 	 * value as this object.
-	 * 
+	 *
 	 * @param pOther
 	 *            The object to compare.
 	 * @return true if the objects are the same; false
@@ -191,7 +189,7 @@ public boolean equals(Object pOther) {
 
 	/**
 	 * Returns the value of this unsigned integer object as a byte.
-	 * 
+	 *
 	 * @return The byte value of this unsigned integer object.
 	 */
 	@Override
@@ -202,7 +200,7 @@ public byte byteValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a
 	 * double.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a double.
 	 */
 	@Override
@@ -213,7 +211,7 @@ public double doubleValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a float
 	 * .
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a float.
 	 */
 	@Override
@@ -223,7 +221,7 @@ public float floatValue() {
 
 	/**
 	 * Computes the hash code for this unsigned integer object.
-	 * 
+	 *
 	 * @return The integer representing the hash code for this unsigned integer
 	 *         object.
 	 */
@@ -234,7 +232,7 @@ public int hashCode() {
 
 	/**
 	 * Returns the value of this unsigned integer object as an int.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as an int.
 	 */
 	@Override
@@ -244,7 +242,7 @@ public int intValue() {
 
 	/**
 	 * Returns the value of this unsigned integer object as a long.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a long.
 	 */
 	@Override
@@ -255,7 +253,7 @@ public long longValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a short
 	 * .
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a short.
 	 */
 	@Override
@@ -265,12 +263,11 @@ public short shortValue() {
 
 	/**
 	 * Returns the text representation of this unsigned integer object.
-	 * 
+	 *
 	 * @return Text representation of this unsigned integer.
 	 */
 	@Override
 	public String toString() {
 		return this.iValue.toString();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger8.java b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger8.java
index 9b97880..fc72da7 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger8.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/UnsignedInteger8.java
@@ -57,7 +57,6 @@
  * >DSP004).
  */
 public class UnsignedInteger8 extends Number implements Comparable {
-
 	private static final long serialVersionUID = 4392496278679167896L;
 
 	/**
@@ -75,7 +74,7 @@ public class UnsignedInteger8 extends Number implements Comparablenull.
 	 */
 	public int compareTo(UnsignedInteger8 pOther) {
-		if (pOther == null) throw new IllegalArgumentException(
-				"Other UnsignedInteger8 cannot be null!");
+		if (pOther == null) throw new IllegalArgumentException("Other UnsignedInteger8 cannot be null!");
 		UnsignedInteger8 that = pOther;
 		int d = this.iValue - that.iValue;
 		if (d == 0) return 0;
@@ -148,7 +146,7 @@ public int compareTo(UnsignedInteger8 pOther) {
 	 * and only if the argument is not null and is an
 	 * UnsignedInteger8 object that represents the same value as
 	 * this object.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to compare.
 	 * @return true if the objects are the same; false
@@ -162,7 +160,7 @@ public boolean equals(Object pObj) {
 
 	/**
 	 * Returns the value of this unsigned integer object as a byte.
-	 * 
+	 *
 	 * @return The byte value of this unsigned integer object.
 	 */
 	@Override
@@ -173,7 +171,7 @@ public byte byteValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a
 	 * double.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a double.
 	 */
 	@Override
@@ -184,7 +182,7 @@ public double doubleValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a float
 	 * .
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a float.
 	 */
 	@Override
@@ -194,7 +192,7 @@ public float floatValue() {
 
 	/**
 	 * Computes the hash code for this unsigned integer object.
-	 * 
+	 *
 	 * @return The integer representing the hash code for this unsigned integer
 	 *         object.
 	 */
@@ -205,7 +203,7 @@ public int hashCode() {
 
 	/**
 	 * Returns the value of this unsigned integer object as an int.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as an int.
 	 */
 	@Override
@@ -215,7 +213,7 @@ public int intValue() {
 
 	/**
 	 * Returns the value of this unsigned integer object as a long.
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a long.
 	 */
 	@Override
@@ -226,7 +224,7 @@ public long longValue() {
 	/**
 	 * Returns the value of this unsigned integer object as a short
 	 * .
-	 * 
+	 *
 	 * @return Value of this unsigned integer object as a short.
 	 */
 	@Override
@@ -236,12 +234,11 @@ public short shortValue() {
 
 	/**
 	 * Returns the text representation of this unsigned integer object.
-	 * 
+	 *
 	 * @return Text representation of this unsigned integer.
 	 */
 	@Override
 	public String toString() {
 		return Short.toString(this.iValue);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java b/src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java
index e77a71b..59a3bbc 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java
@@ -55,12 +55,11 @@
  * throw runtime exceptions, if a consumer receives a runtime exception for one
  * of these methods they must call getWBEMException() to get the
  * actual WBEMException.
- * 
+ *
  * @param 
  *            Type parameter.
  */
 public interface CloseableIterator extends Iterator {
-
 	/**
 	 * Closes the Iterator. This allows the underlying
 	 * implementation to do any cleanup and disconnect from any source that it
@@ -72,9 +71,8 @@ public interface CloseableIterator extends Iterator {
 	 * If next() or hasNext() throws a
 	 * RuntimeException, this method must be called to get the
 	 * WBEMException.
-	 * 
+	 *
 	 * @return The WBEMException or null if one was not thrown.
 	 */
 	public WBEMException getWBEMException();
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/WBEMException.java b/src/main/java/org/metricshub/wbem/javax/wbem/WBEMException.java
index c8f325e..dae941f 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/WBEMException.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/WBEMException.java
@@ -62,7 +62,6 @@
  * 
  */
 public class WBEMException extends Exception {
-
 	private static final long serialVersionUID = 1224653110826327234L;
 
 	/**
@@ -221,35 +220,36 @@ public class WBEMException extends Exception {
 	public static final int CIM_ERR_SERVER_LIMITS_EXCEEDED = 27;
 
 	private static final String[] MESSAGES = new String[] {
-	/* 00 */"SUCCESS",
-	/* 01 */"CIM_ERR_FAILED",
-	/* 02 */"CIM_ERR_ACCESS_DENIED",
-	/* 03 */"CIM_ERR_INVALID_NAMESPACE",
-	/* 04 */"CIM_ERR_INVALID_PARAMETER",
-	/* 05 */"CIM_ERR_INVALID_CLASS",
-	/* 06 */"CIM_ERR_NOT_FOUND",
-	/* 07 */"CIM_ERR_NOT_SUPPORTED",
-	/* 08 */"CIM_ERR_CLASS_HAS_CHILDREN",
-	/* 09 */"CIM_ERR_CLASS_HAS_INSTANCES",
-	/* 10 */"CIM_ERR_INVALID_SUPERCLASS",
-	/* 11 */"CIM_ERR_ALREADY_EXISTS",
-	/* 12 */"CIM_ERR_NO_SUCH_PROPERTY",
-	/* 13 */null,
-	/* 14 */"CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED",
-	/* 15 */"CIM_ERR_INVALID_QUERY",
-	/* 16 */"CIM_ERR_METHOD_NOT_AVAILABLE",
-	/* 17 */"CIM_ERR_METHOD_NOT_FOUND",
-	/* 18 */null,
-	/* 19 */"CIM_ERR_INVALID_RESPONSE_DESTINATION",
-	/* 20 */"CIM_ERR_NAMESPACE_NOT_EMPTY",
-	/* 21 */"CIM_ERR_INVALID_ENUMERATION_CONTEXT",
-	/* 22 */"CIM_ERR_INVALID_OPERATION_TIMEOUT",
-	/* 23 */"CIM_ERR_PULL_HAS_BEEN_ABANDONED",
-	/* 24 */"CIM_ERR_PULL_CANNOT_BE_ABANDONED",
-	/* 25 */"CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED",
-	/* 26 */"CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED",
-	/* 27 */"CIM_ERR_SERVER_LIMITS_EXCEEDED",
-	/* 28 */"CIM_ERR_SERVER_IS_SHUTTING_DOWN" };
+		/* 00 */"SUCCESS",
+		/* 01 */"CIM_ERR_FAILED",
+		/* 02 */"CIM_ERR_ACCESS_DENIED",
+		/* 03 */"CIM_ERR_INVALID_NAMESPACE",
+		/* 04 */"CIM_ERR_INVALID_PARAMETER",
+		/* 05 */"CIM_ERR_INVALID_CLASS",
+		/* 06 */"CIM_ERR_NOT_FOUND",
+		/* 07 */"CIM_ERR_NOT_SUPPORTED",
+		/* 08 */"CIM_ERR_CLASS_HAS_CHILDREN",
+		/* 09 */"CIM_ERR_CLASS_HAS_INSTANCES",
+		/* 10 */"CIM_ERR_INVALID_SUPERCLASS",
+		/* 11 */"CIM_ERR_ALREADY_EXISTS",
+		/* 12 */"CIM_ERR_NO_SUCH_PROPERTY",
+		/* 13 */null,
+		/* 14 */"CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED",
+		/* 15 */"CIM_ERR_INVALID_QUERY",
+		/* 16 */"CIM_ERR_METHOD_NOT_AVAILABLE",
+		/* 17 */"CIM_ERR_METHOD_NOT_FOUND",
+		/* 18 */null,
+		/* 19 */"CIM_ERR_INVALID_RESPONSE_DESTINATION",
+		/* 20 */"CIM_ERR_NAMESPACE_NOT_EMPTY",
+		/* 21 */"CIM_ERR_INVALID_ENUMERATION_CONTEXT",
+		/* 22 */"CIM_ERR_INVALID_OPERATION_TIMEOUT",
+		/* 23 */"CIM_ERR_PULL_HAS_BEEN_ABANDONED",
+		/* 24 */"CIM_ERR_PULL_CANNOT_BE_ABANDONED",
+		/* 25 */"CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED",
+		/* 26 */"CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED",
+		/* 27 */"CIM_ERR_SERVER_LIMITS_EXCEEDED",
+		/* 28 */"CIM_ERR_SERVER_IS_SHUTTING_DOWN"
+	};
 
 	private int iErrorID;
 
@@ -258,7 +258,7 @@ public class WBEMException extends Exception {
 	/**
 	 * Constructs a new exception using the specified ID. The detailed message
 	 * will be null.
-	 * 
+	 *
 	 * @param pID
 	 *            The Error ID to use.
 	 * @throws IllegalArgumentException
@@ -270,7 +270,7 @@ public WBEMException(int pID) {
 
 	/**
 	 * Constructs a new exception using the specified ID and detailed message.
-	 * 
+	 *
 	 * @param pID
 	 *            The error ID.
 	 * @param pMessage
@@ -285,7 +285,7 @@ public WBEMException(int pID, String pMessage) {
 	/**
 	 * Constructs a new exception using the specified ID, detailed message and
 	 * CIM_Error instances.
-	 * 
+	 *
 	 * @param pID
 	 *            The error ID.
 	 * @param pMessage
@@ -302,7 +302,7 @@ public WBEMException(int pID, String pMessage, CIMInstance[] pErrors) {
 	/**
 	 * Constructs a new exception using the specified ID, detailed message,
 	 * CIM_Error instances and cause.
-	 * 
+	 *
 	 * @param pID
 	 *            The error ID.
 	 * @param pMessage
@@ -324,7 +324,7 @@ public WBEMException(int pID, String pMessage, CIMInstance[] pErrors, Throwable
 	/**
 	 * Constructs a new exception using the specified detailed message. The
 	 * ID will be CIM_ERR_FAILED.
-	 * 
+	 *
 	 * @param pMessage
 	 *            The detailed message.
 	 */
@@ -334,7 +334,7 @@ public WBEMException(String pMessage) {
 
 	/**
 	 * Get the CIM Error Instances.
-	 * 
+	 *
 	 * @return Any CIM Error instances associated with this exception;
 	 *         null if none.
 	 */
@@ -344,7 +344,7 @@ public CIMInstance[] getCIMErrors() {
 
 	/**
 	 * Returns the ID of the error.
-	 * 
+	 *
 	 * @return The ID of the error.
 	 */
 	public int getID() {
@@ -353,18 +353,17 @@ public int getID() {
 
 	/**
 	 * Prints out the ID and the optional detailed message.
-	 * 
+	 *
 	 * @return A String representation of the exception.
 	 */
 	@Override
 	public String toString() {
-		return "WBEMException: " + getCIMMessage()
-				+ (super.getMessage() != null ? " (" + super.getMessage() + ")" : "");
+		return "WBEMException: " + getCIMMessage() + (super.getMessage() != null ? " (" + super.getMessage() + ")" : "");
 	}
 
 	/**
 	 * Returns a string representation of the exception ID.
-	 * 
+	 *
 	 * @return A String representation of the exception ID.
 	 */
 	private String getCIMMessage() {
@@ -373,10 +372,10 @@ private String getCIMMessage() {
 
 	/**
 	 * Returns validity of error ID.
-	 * 
+	 *
 	 * @param pID
 	 *            The error ID.
-	 * 
+	 *
 	 * @return true if error ID is valid, false
 	 *         otherwise.
 	 */
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/EnumerateResponse.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/EnumerateResponse.java
index ee5f83f..9bdf5f4 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/EnumerateResponse.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/EnumerateResponse.java
@@ -42,12 +42,11 @@
 //Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010
 /**
  * This class is a container that stores the information from a Pull request.
- * 
+ *
  * @param 
  *            Type parameter.
  */
 public class EnumerateResponse {
-
 	private String iContext;
 
 	private CloseableIterator iResponses;
@@ -56,7 +55,7 @@ public class EnumerateResponse {
 
 	/**
 	 * Creates an EnumerateResponse.
-	 * 
+	 *
 	 * @param pContext
 	 *            The enumeration context returned. This will be used for any
 	 *            future calls for this particular enumeration.
@@ -74,7 +73,7 @@ public EnumerateResponse(String pContext, CloseableIterator pResponses, boole
 
 	/**
 	 * Get the context that can be used for a subsequent pull request.
-	 * 
+	 *
 	 * @return The Enumeration Context returned from the server.
 	 */
 	public String getContext() {
@@ -83,7 +82,7 @@ public String getContext() {
 
 	/**
 	 * Get the CloseableIterator for the returned CIM Elements.
-	 * 
+	 *
 	 * @return CloseableIterator for the elements returned.
 	 */
 	public CloseableIterator getResponses() {
@@ -92,14 +91,13 @@ public CloseableIterator getResponses() {
 
 	/**
 	 * If true, there are no more elements to be returned.
-	 * 
+	 *
 	 * @return true if this is the last of the results;
 	 *         false otherwise.
 	 */
 	public boolean isEnd() {
 		return this.iEnd;
 	}
-
 	/*
 	  This iterates over the responses. As a side effect,
 	  CloseableIterator.hasNext() will not return anything after this is
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java
index 5978798..c37e1d0 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java
@@ -52,17 +52,16 @@
  * is used with UserPrincipal. PasswordCredential
  * includes the password and optionally the host information for which the
  * password is used to authenticate the UserPrincipal.
- * 
+ *
  */
 public class PasswordCredential extends Object {
-
 	private String iPw;
 
 	private String iHostname;
 
 	/**
 	 * Creates a PasswordCredential using the supplied password.
-	 * 
+	 *
 	 * @param pCredential
 	 *            The user login password in clear text.
 	 * @throws IllegalArgumentException
@@ -78,7 +77,7 @@ public PasswordCredential(char[] pCredential) {
 
 	/**
 	 * Creates a PasswordCredential using the supplied password.
-	 * 
+	 *
 	 * @param pCredential
 	 *            The user login password in clear text.
 	 * @throws IllegalArgumentException
@@ -95,7 +94,7 @@ public PasswordCredential(String pCredential) {
 	/**
 	 * Creates a PasswordCredential using the supplied password and
 	 * host name.
-	 * 
+	 *
 	 * @param pCredential
 	 *            The user login password in clear text.
 	 * @param pHostname
@@ -115,7 +114,7 @@ public PasswordCredential(String pCredential, String pHostname) {
 
 	/**
 	 * Get the host name for which the password is used to authenticate.
-	 * 
+	 *
 	 * @return The host name.
 	 */
 	public String getHostName() {
@@ -124,11 +123,10 @@ public String getHostName() {
 
 	/**
 	 * Return the user login password in clear text.
-	 * 
+	 *
 	 * @return The user login password.
 	 */
 	public char[] getUserPassword() {
 		return this.iPw.toCharArray();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java
index f87ae5f..2f38a39 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java
@@ -55,14 +55,13 @@
  * that requires a password.
  */
 public class RoleCredential extends Object {
-
 	private String iCredential;
 
 	private String iHostname;
 
 	/**
 	 * Creates a role credential using the supplied credential.
-	 * 
+	 *
 	 * @param pCredential
 	 *            The role credential in clear text.
 	 * @throws IllegalArgumentException
@@ -75,7 +74,7 @@ public RoleCredential(char[] pCredential) throws IllegalArgumentException {
 
 	/**
 	 * Creates a role credential using the supplied credential.
-	 * 
+	 *
 	 * @param pCredential
 	 *            The role credential in clear text.
 	 * @throws IllegalArgumentException
@@ -88,7 +87,7 @@ public RoleCredential(String pCredential) throws IllegalArgumentException {
 
 	/**
 	 * Creates a role credential using the supplied credential and host name.
-	 * 
+	 *
 	 * @param pCredential
 	 *            The role credential in clear text.
 	 * @param pHostname
@@ -104,7 +103,7 @@ public RoleCredential(String pCredential, String pHostname) throws IllegalArgume
 
 	/**
 	 * Return the role credential in clear text.
-	 * 
+	 *
 	 * @return The role credential.
 	 */
 	public char[] getCredential() {
@@ -113,11 +112,10 @@ public char[] getCredential() {
 
 	/**
 	 * Get the host name for which the password is used to authenticate.
-	 * 
+	 *
 	 * @return The host name.
 	 */
 	public String getHostName() {
 		return this.iHostname;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java
index 137cb3d..b547524 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java
@@ -52,14 +52,13 @@
  * information for which the role is used to authenticate.
  */
 public class RolePrincipal extends Object implements Principal {
-
 	private String iRole;
 
 	private String iHost;
 
 	/**
 	 * This constructor accepts the role name.
-	 * 
+	 *
 	 * @param pRole
 	 *            The role name.
 	 */
@@ -69,7 +68,7 @@ public RolePrincipal(String pRole) {
 
 	/**
 	 * This constructor accepts the role name and host name.
-	 * 
+	 *
 	 * @param pRole
 	 *            The role name.
 	 * @param pHost
@@ -85,7 +84,7 @@ public RolePrincipal(String pRole, String pHost) {
 	 * same principal as this object. The principals are equal if the specified
 	 * object is an instance of RolePrincipal and the user name and
 	 * host name are the same.
-	 * 
+	 *
 	 * @param pObj
 	 *            The Principal to compare for equality.
 	 * @return true if they are equal, otherwise false
@@ -95,14 +94,15 @@ public RolePrincipal(String pRole, String pHost) {
 	public boolean equals(Object pObj) {
 		if (!(pObj instanceof RolePrincipal)) return false;
 		RolePrincipal that = (RolePrincipal) pObj;
-		return (this.iRole == null ? that.iRole == null : this.iRole.equalsIgnoreCase(that.iRole))
-				&& (this.iHost == null ? that.iHost == null : this.iHost
-						.equalsIgnoreCase(that.iHost));
+		return (
+			(this.iRole == null ? that.iRole == null : this.iRole.equalsIgnoreCase(that.iRole)) &&
+			(this.iHost == null ? that.iHost == null : this.iHost.equalsIgnoreCase(that.iHost))
+		);
 	}
 
 	/**
 	 * Get the host for which the principal uses to authenticate.
-	 * 
+	 *
 	 * @return The host name.
 	 */
 	public String getHostName() {
@@ -112,7 +112,7 @@ public String getHostName() {
 	/**
 	 * Return the name of this principal identity; that is, return the login
 	 * name.
-	 * 
+	 *
 	 * @return The name of this principal identity.
 	 * @see java.security.Principal#getName()
 	 */
@@ -123,7 +123,7 @@ public String getName() {
 	/**
 	 * The hashCode() method returns an integer hash code to
 	 * represent this principal.
-	 * 
+	 *
 	 * @return An integer hash code representing the principal.
 	 */
 	@Override
@@ -135,12 +135,11 @@ public int hashCode() {
 	 * The toString() method returns a string representation of the
 	 * principal suitable for displaying in messages. It should not be used for
 	 * making authorization checks.
-	 * 
+	 *
 	 * @return A printable string form of the role principal.
 	 */
 	@Override
 	public String toString() {
 		return this.iRole;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java
index d874fe8..df2efad 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java
@@ -53,14 +53,13 @@
  * information for which the username is used to authenticate.
  */
 public class UserPrincipal extends Object implements Principal {
-
 	private String iUserName;
 
 	private String iHostName;
 
 	/**
 	 * This constructor accepts the user name.
-	 * 
+	 *
 	 * @param pUserName
 	 *            The user login name.
 	 * @throws IllegalArgumentException
@@ -73,7 +72,7 @@ public UserPrincipal(String pUserName) throws IllegalArgumentException {
 
 	/**
 	 * This constructor accepts the user name and host name.
-	 * 
+	 *
 	 * @param pUserName
 	 *            The user login name.
 	 * @param pHostName
@@ -92,7 +91,7 @@ public UserPrincipal(String pUserName, String pHostName) throws IllegalArgumentE
 	 * principal as this object. The principals are equal if the specified
 	 * object is an instance of UserPrincipal and the user name and
 	 * authentication host name are the same.
-	 * 
+	 *
 	 * @param pOtherPrincipal
 	 *            Principal instance to compare for equality.
 	 * @return true if the object are equal; false
@@ -102,15 +101,15 @@ public UserPrincipal(String pUserName, String pHostName) throws IllegalArgumentE
 	public boolean equals(Object pOtherPrincipal) {
 		if (!(pOtherPrincipal instanceof UserPrincipal)) return false;
 		UserPrincipal that = (UserPrincipal) pOtherPrincipal;
-		return (this.iUserName == null ? that.iUserName == null : this.iUserName
-				.equalsIgnoreCase(that.iUserName))
-				&& (this.iHostName == null ? that.iHostName == null : this.iHostName
-						.equalsIgnoreCase(that.iHostName));
+		return (
+			(this.iUserName == null ? that.iUserName == null : this.iUserName.equalsIgnoreCase(that.iUserName)) &&
+			(this.iHostName == null ? that.iHostName == null : this.iHostName.equalsIgnoreCase(that.iHostName))
+		);
 	}
 
 	/**
 	 * Return the host name associated with this principal.
-	 * 
+	 *
 	 * @return The host name.
 	 */
 	public String getHostName() {
@@ -120,7 +119,7 @@ public String getHostName() {
 	/**
 	 * Return the name of this principal identity; that is, return the login
 	 * name.
-	 * 
+	 *
 	 * @return The name of this principal identity.
 	 * @see java.security.Principal#getName()
 	 */
@@ -130,7 +129,7 @@ public String getName() {
 
 	/**
 	 * Return the principal's login user name.
-	 * 
+	 *
 	 * @return The user login name.
 	 */
 	public String getUserName() {
@@ -141,7 +140,7 @@ public String getUserName() {
 	 * The hashCode method returns an integer hash code to
 	 * represent this principal. It can be used to test for non-equality, or as
 	 * an index key in a hash table.
-	 * 
+	 *
 	 * @return An integer hash code representing the principal.
 	 */
 	@Override
@@ -153,12 +152,11 @@ public int hashCode() {
 	 * The toString method returns a string representation of the
 	 * principal suitable for displaying in messages. It should not be used for
 	 * making authorization checks, however.
-	 * 
+	 *
 	 * @return A printable string form of the principal identity.
 	 */
 	@Override
 	public String toString() {
 		return this.iUserName;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClient.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClient.java
index 185c156..882e8c9 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClient.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClient.java
@@ -58,17 +58,16 @@
  */
 
 import java.util.Locale;
-
+import javax.security.auth.Subject;
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.cim.CIMQualifierType;
-import org.metricshub.wbem.javax.wbem.CloseableIterator;
-import org.metricshub.wbem.javax.wbem.WBEMException;
 import org.metricshub.wbem.javax.cim.UnsignedInteger32;
 import org.metricshub.wbem.javax.cim.UnsignedInteger64;
-import javax.security.auth.Subject;
+import org.metricshub.wbem.javax.wbem.CloseableIterator;
+import org.metricshub.wbem.javax.wbem.WBEMException;
 
 //Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Dec 10 07:02:50 EST 2013
 /**
@@ -76,15 +75,14 @@
  * against a WBEM Server. A WBEMClient implementation can be
  * retrieved from the WBEMClientFactory specifying the protocol to
  * be used.
- * 
+ *
  * @see WBEMClientFactory
  */
 public interface WBEMClient {
-
 	/**
 	 * Enumerates CIM classes that are associated to a specified source CIM
 	 * class.
-	 * 
+	 *
 	 * @param pObjectName
 	 *            CIMObjectPath defining the source CIM Class whose
 	 *            associated classes are to be returned. The
@@ -146,24 +144,31 @@ public interface WBEMClient {
 	 *             If unsuccessful, one of the following status codes shall be
 	 *             returned along with zero or more instances of
 	 *             CIM_Error. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
 	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CloseableIterator associatorClasses(CIMObjectPath pObjectName,
-			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException;
+	public CloseableIterator associatorClasses(
+		CIMObjectPath pObjectName,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException;
 
 	/**
 	 * Enumerates CIM Instances associated to a specified source CIM Instance.
-	 * 
+	 *
 	 * @param pObjectName
 	 *            CIMObjectPath defining the source CIM Instance
 	 *            whose associated instances are to be returned. The
@@ -223,19 +228,26 @@ public CloseableIterator associatorClasses(CIMObjectPath pObjectName,
 	 *             If unsuccessful, one of the following status codes shall be
 	 *             returned along with zero or more instances of
 	 *             CIM_Error. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
 	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CloseableIterator associatorInstances(CIMObjectPath pObjectName,
-			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException;
+	public CloseableIterator associatorInstances(
+		CIMObjectPath pObjectName,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException;
 
 	/**
 	 * Enumerates the CIMObjectPaths of CIM Objects that are
@@ -246,7 +258,7 @@ public CloseableIterator associatorInstances(CIMObjectPath pObjectN
 	 * CloseableIterator of CIMObjectPaths of the
 	 * CIMInstance objects associated to the source Object is
 	 * returned.
-	 * 
+	 *
 	 * @param pObjectName
 	 *            CIMObjectPath defining the source CIM Object
 	 *            whose associated Objects are to be returned. This argument may
@@ -287,26 +299,31 @@ public CloseableIterator associatorInstances(CIMObjectPath pObjectN
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
 	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CloseableIterator associatorNames(CIMObjectPath pObjectName,
-			String pAssociationClass, String pResultClass, String pRole, String pResultRole)
-			throws WBEMException;
+	public CloseableIterator associatorNames(
+		CIMObjectPath pObjectName,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole
+	)
+		throws WBEMException;
 
 	/**
 	 * associatorPaths shall start an enumeration session for
 	 * traversing associations starting from the instance defined in the
 	 * pInstancePath parameter using any specified filtering
 	 * criteria and return zero or more CIMObjectPath objects.
-	 * 
+	 *
 	 * @param pInstancePath
 	 *            The CIMObjectPath for the instance for which the
 	 *            enumeration is to be performed.
@@ -420,8 +437,8 @@ public CloseableIterator associatorNames(CIMObjectPath pObjectNam
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -434,19 +451,28 @@ public CloseableIterator associatorNames(CIMObjectPath pObjectNam
 	 *      CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_QUERY
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public EnumerateResponse associatorPaths(CIMObjectPath pInstancePath,
-			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException;
+	public EnumerateResponse associatorPaths(
+		CIMObjectPath pInstancePath,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException;
 
 	/**
 	 * associators shall start an enumeration session for
 	 * traversing associations starting from the instance defined in the
 	 * pInstancePath parameter using any specified filtering
 	 * criteria and return zero or more CIMInstance objects.
-	 * 
+	 *
 	 * @param pInstancePath
 	 *            The CIMObjectPath for the instance for which the
 	 *            enumeration is to be performed.
@@ -580,8 +606,8 @@ public EnumerateResponse associatorPaths(CIMObjectPath pInstanceP
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -594,13 +620,23 @@ public EnumerateResponse associatorPaths(CIMObjectPath pInstanceP
 	 *      CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_QUERY
 	 *      CIM_ERR_FAILED (Some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public EnumerateResponse associators(CIMObjectPath pInstancePath,
-			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeClassOrigin, String[] pPropertyList, String pFilterQueryLanguage,
-			String pFilterQuery, UnsignedInteger32 pTimeout, boolean pContinueOnError,
-			UnsignedInteger32 pMaxObjects) throws WBEMException;
+	public EnumerateResponse associators(
+		CIMObjectPath pInstancePath,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException;
 
 	/**
 	 * Closes the WBEMClient session.
@@ -615,7 +651,7 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	 * session and retrieves all the results until the
 	 * EnumerationResponse.isEnd() is true, this method shall not
 	 * be called.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIMObjectPath representing the namespace to
 	 *            be used.
@@ -628,7 +664,7 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	/**
 	 * Create a CIM class. The namespace from the
 	 * CIMClass.getObjectPath() shall be used.
-	 * 
+	 *
 	 * @param pClass
 	 *            The CIMClass to be created.
 	 * @throws UnsupportedOperationException
@@ -637,8 +673,8 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
@@ -648,7 +684,7 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	 *      CIM_ERR_INVALID_SUPERCLASS (the putative CIM Class declares a
 	 *            non-existent superclass)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
 	public void createClass(CIMClass pClass) throws WBEMException;
 
@@ -661,15 +697,15 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	 * null and the provider can fill them in. This is
 	 * implementation specific unless specified by a CIM Schema or in a DMTF
 	 * Profile.
-	 * 
+	 *
 	 * @param pInstance
 	 *            The CIMInstance to be created.
 	 * @return CIMObjectPath of the instance created.
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED (provider does not support this method)
 	 *      CIM_ERR_INVALID_NAMESPACE
@@ -677,13 +713,13 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	 *      CIM_ERR_INVALID_CLASS (in this namespace)
 	 *      CIM_ERR_ALREADY_EXISTS
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
 	public CIMObjectPath createInstance(CIMInstance pInstance) throws WBEMException;
 
 	/**
 	 * Deletes the CIM class for the object specified by the CIM object path.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIMObjectPath identifying the namespace and
 	 *            class name to delete.
@@ -693,12 +729,12 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_NOT_FOUND (the CIM Class to be deleted does not exist)
 	 *      CIM_ERR_CLASS_HAS_CHILDREN (the CIM Class has one or more subclasses
@@ -706,21 +742,21 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	 *      CIM_ERR_CLASS_HAS_INSTANCES (the CIM Class has one or more instances
 	 *            which cannot be deleted)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
 	public void deleteClass(CIMObjectPath pPath) throws WBEMException;
 
 	/**
 	 * Delete the CIM instance specified by the CIM object path.
-	 * 
+	 *
 	 * @param pPath
 	 *            The object path of the instance to be deleted. It must include
 	 *            all of the keys.
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED (provider does not support this method)
 	 *      CIM_ERR_INVALID_NAMESPACE
@@ -728,13 +764,13 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	 *      CIM_ERR_INVALID_CLASS (in this namespace)
 	 *      CIM_ERR_NOT_FOUND (if the instance does not exist)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
 	public void deleteInstance(CIMObjectPath pPath) throws WBEMException;
 
 	/**
 	 * Delete a CIM Qualifier type.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIMObjectPath identifying the name and
 	 *            namespace of the CIM qualifier type to delete.
@@ -744,21 +780,21 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
 	 *      CIM_ERR_INVALID_PARAMETER (for this method)
 	 *      CIM_ERR_NOT_FOUND (the Qualifier did not exist)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
 	public void deleteQualifierType(CIMObjectPath pPath) throws WBEMException;
 
 	/**
 	 * Enumerate CIM Classes.
-	 * 
+	 *
 	 * @param pPath
 	 *            The object path of the class to be enumerated. Only the
 	 *            namespace and object name should be populated. If the object
@@ -791,25 +827,30 @@ public EnumerateResponse associators(CIMObjectPath pInstancePath,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_INVALID_CLASS (the CIM Class that is the basis for this
 	 *            enumeration does not exist)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CloseableIterator enumerateClasses(CIMObjectPath pPath, boolean pDeep,
-			boolean pLocalOnly, boolean pIncludeQualifiers, boolean pIncludeClassOrigin)
-			throws WBEMException;
+	public CloseableIterator enumerateClasses(
+		CIMObjectPath pPath,
+		boolean pDeep,
+		boolean pLocalOnly,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin
+	)
+		throws WBEMException;
 
 	/**
 	 * Enumerate the names of CIM Classes.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIMObjectPath identifying the class to be
 	 *            enumerated. If the class name in the object path specified is
@@ -829,25 +870,24 @@ public CloseableIterator enumerateClasses(CIMObjectPath pPath, boolean
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_INVALID_CLASS (the CIM Class that is the basis for this
 	 *            enumeration does not exist)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CloseableIterator enumerateClassNames(CIMObjectPath pPath, boolean pDeep)
-			throws WBEMException;
+	public CloseableIterator enumerateClassNames(CIMObjectPath pPath, boolean pDeep) throws WBEMException;
 
 	/**
 	 * Enumerate the names of the instances for a specified class. The names of
 	 * all subclass instances are returned.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIMObjectPath identifying the class whose
 	 *            instances are to be enumerated. Only the namespace and class
@@ -857,24 +897,23 @@ public CloseableIterator enumerateClassNames(CIMObjectPath pPath,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED (provider does not support this method)
 	 *      CIM_ERR_INVALID_NAMESPACE
 	 *      CIM_ERR_INVALID_PARAMETER (for this method)
 	 *      CIM_ERR_INVALID_CLASS (in this namespace)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CloseableIterator enumerateInstanceNames(CIMObjectPath pPath)
-			throws WBEMException;
+	public CloseableIterator enumerateInstanceNames(CIMObjectPath pPath) throws WBEMException;
 
 	/**
 	 * enumerateInstancePaths shall enumerate the instances of the
 	 * specified class in pClassPath and return zero or more
 	 * CIMObjectPaths.
-	 * 
+	 *
 	 * @param pClassPath
 	 *            The CIMObjectPath for the class for which the
 	 *            enumeration is to be performed.
@@ -959,8 +998,8 @@ public CloseableIterator enumerateInstanceNames(CIMObjectPath pPa
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -973,16 +1012,22 @@ public CloseableIterator enumerateInstanceNames(CIMObjectPath pPa
 	 *      CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_QUERY
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public EnumerateResponse enumerateInstancePaths(CIMObjectPath pClassPath,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException;
+	public EnumerateResponse enumerateInstancePaths(
+		CIMObjectPath pClassPath,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException;
 
 	/**
 	 * Enumerate the instances of a class. The instances of all subclasses are
 	 * also returned.
-	 * 
+	 *
 	 * @param pPath
 	 *            The object path of the class to be enumerated. Only the
 	 *            namespace and class name components are used. Any other
@@ -1018,25 +1063,30 @@ public EnumerateResponse enumerateInstancePaths(CIMObjectPath pCl
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
 	 *      CIM_ERR_INVALID_PARAMETER (for this method)
 	 *      CIM_ERR_INVALID_CLASS (in this namespace)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CloseableIterator enumerateInstances(CIMObjectPath pPath, boolean pDeep,
-			boolean pLocalOnly, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException;
+	public CloseableIterator enumerateInstances(
+		CIMObjectPath pPath,
+		boolean pDeep,
+		boolean pLocalOnly,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException;
 
 	/**
 	 * enumerateInstances shall enumerate the instances of the
 	 * specified class in pClassPath and return zero or more
 	 * CIMInstances.
-	 * 
+	 *
 	 * @param pClassPath
 	 *            The CIMObjectPath for the class for which the
 	 *            enumeration is to be performed.
@@ -1145,9 +1195,9 @@ public CloseableIterator enumerateInstances(CIMObjectPath pPath, bo
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
-	 * 
+	 *
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -1160,16 +1210,24 @@ public CloseableIterator enumerateInstances(CIMObjectPath pPath, bo
 	 *      CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_QUERY
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public EnumerateResponse enumerateInstances(CIMObjectPath pClassPath,
-			boolean pDeepInheritance, boolean pIncludeClassOrigin, String[] pPropertyList,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException;
+	public EnumerateResponse enumerateInstances(
+		CIMObjectPath pClassPath,
+		boolean pDeepInheritance,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException;
 
 	/**
 	 * Enumerates the CIM Qualifier types for a specific namespace.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIMObjectPath identifying the namespace whose
 	 *            qualifier types are to be enumerated.
@@ -1181,24 +1239,23 @@ public EnumerateResponse enumerateInstances(CIMObjectPath pClassPat
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CloseableIterator> enumerateQualifierTypes(CIMObjectPath pPath)
-			throws WBEMException;
+	public CloseableIterator> enumerateQualifierTypes(CIMObjectPath pPath) throws WBEMException;
 
 	/**
 	 * enumerationCount provides an estimated count of the total
 	 * number of objects in an open enumeration session represented by an
 	 * enumeration context.
-	 * 
+	 *
 	 * @param pPath
 	 *            The namespace for the enumeration context.
 	 * @param pEnumerationContext
@@ -1208,9 +1265,9 @@ public CloseableIterator> enumerateQualifierTypes(CIMObjectP
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
-	 * 
+	 *
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -1219,15 +1276,14 @@ public CloseableIterator> enumerateQualifierTypes(CIMObjectP
 	 *      CIM_ERR_INVALID_ENUMERATION_CONTEXT
 	 *      CIM_ERR_SERVER_LIMITS_EXCEEDED
 	 *      CIM_ERR_FAILED
-	 * 
-	 * 
+	 *
+	 *
 	 */
-	public UnsignedInteger64 enumerationCount(CIMObjectPath pPath, String pEnumerationContext)
-			throws WBEMException;
+	public UnsignedInteger64 enumerationCount(CIMObjectPath pPath, String pEnumerationContext) throws WBEMException;
 
 	/**
 	 * execQuery shall execute a query to retrieve objects.
-	 * 
+	 *
 	 * @param pPath
 	 *            CIMObjectPath identifying the class to query.
 	 *            Only the namespace and class name components are used. All
@@ -1241,8 +1297,8 @@ public UnsignedInteger64 enumerationCount(CIMObjectPath pPath, String pEnumerati
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED (provider does not support this method)
 	 *      CIM_ERR_INVALID_NAMESPACE
@@ -1253,15 +1309,15 @@ public UnsignedInteger64 enumerationCount(CIMObjectPath pPath, String pEnumerati
 	 *      CIM_ERR_INVALID_QUERY (the query is not a valid query in the specified
 	 *            query language)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CloseableIterator execQuery(CIMObjectPath pPath, String pQuery,
-			String pQueryLanguage) throws WBEMException;
+	public CloseableIterator execQuery(CIMObjectPath pPath, String pQuery, String pQueryLanguage)
+		throws WBEMException;
 
 	/**
 	 * execQueryInstances shall execute a query to retrieve
 	 * instances.
-	 * 
+	 *
 	 * @param pObjectName
 	 *            The CIMObjectPath representing the namespace to
 	 *            be used.
@@ -1366,8 +1422,8 @@ public CloseableIterator execQuery(CIMObjectPath pPath, String pQue
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -1378,22 +1434,29 @@ public CloseableIterator execQuery(CIMObjectPath pPath, String pQue
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED (the requested filter query
 	 *            language is not recognized)
-	 *      CIM_ERR_INVALID_QUERY (the filter query is not a valid query in the 
+	 *      CIM_ERR_INVALID_QUERY (the filter query is not a valid query in the
 	 *            specified filter query language)
-	 *      CIM_ERR_QUERY_FEATURE_NOT_SUPPORTED (the query requires support for 
+	 *      CIM_ERR_QUERY_FEATURE_NOT_SUPPORTED (the query requires support for
 	 *            features that are not supported)
 	 *      CIM_ERR_FAILED (Some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public EnumerateResponse execQueryInstances(CIMObjectPath pObjectName,
-			String pFilterQuery, String pFilterQueryLanguage, boolean pReturnQueryResultClass,
-			UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects,
-			CIMClass pQueryResultClass) throws WBEMException;
+	public EnumerateResponse execQueryInstances(
+		CIMObjectPath pObjectName,
+		String pFilterQuery,
+		String pFilterQueryLanguage,
+		boolean pReturnQueryResultClass,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects,
+		CIMClass pQueryResultClass
+	)
+		throws WBEMException;
 
 	/**
 	 * Returns the CIMClass for the specified
 	 * CIMObjectPath.
-	 * 
+	 *
 	 * @param pName
 	 *            The object path of the class to be returned. Only the name
 	 *            space and class name components are used. All other
@@ -1430,23 +1493,29 @@ public EnumerateResponse execQueryInstances(CIMObjectPath pObjectNa
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_NOT_FOUND (the requested CIM Class does not exist in the
 	 *            specified namespace)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CIMClass getClass(CIMObjectPath pName, boolean pLocalOnly, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException;
+	public CIMClass getClass(
+		CIMObjectPath pName,
+		boolean pLocalOnly,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException;
 
 	/**
 	 * Get a CIMInstance.
-	 * 
+	 *
 	 * @param pName
 	 *            The object path of the instance to be returned. The Keys in
 	 *            this CIMObjectPath must be populated.
@@ -1477,8 +1546,8 @@ public CIMClass getClass(CIMObjectPath pName, boolean pLocalOnly, boolean pInclu
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED (provider does not support this method)
 	 *      CIM_ERR_INVALID_NAMESPACE
@@ -1486,15 +1555,20 @@ public CIMClass getClass(CIMObjectPath pName, boolean pLocalOnly, boolean pInclu
 	 *      CIM_ERR_INVALID_CLASS (in this namespace)
 	 *      CIM_ERR_NOT_FOUND (if instance does not exist)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CIMInstance getInstance(CIMObjectPath pName, boolean pLocalOnly,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException;
+	public CIMInstance getInstance(
+		CIMObjectPath pName,
+		boolean pLocalOnly,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException;
 
 	/**
 	 * getInstancePaths shall get the CIMObjectPaths
 	 * using an enumeration context.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIMObjectPath representing the namespace to
 	 *            be used.
@@ -1514,9 +1588,9 @@ public CIMInstance getInstance(CIMObjectPath pName, boolean pLocalOnly,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
-	 * 
+	 *
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -1526,15 +1600,19 @@ public CIMInstance getInstance(CIMObjectPath pName, boolean pLocalOnly,
 	 *      CIM_ERR_SERVER_LIMITS_EXCEEDED
 	 *      CIM_ERR_PULL_HAS_BEEN_ABANDONED
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public EnumerateResponse getInstancePaths(CIMObjectPath pPath, String pContext,
-			UnsignedInteger32 pMaxObjects) throws WBEMException;
+	public EnumerateResponse getInstancePaths(
+		CIMObjectPath pPath,
+		String pContext,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException;
 
 	/**
 	 * getInstances shall get the instances from an enumeration
 	 * session started by execQueryInstances.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIMObjectPath representing the namespace to
 	 *            be used.
@@ -1556,9 +1634,9 @@ public EnumerateResponse getInstancePaths(CIMObjectPath pPath, St
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
-	 * 
+	 *
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -1568,15 +1646,19 @@ public EnumerateResponse getInstancePaths(CIMObjectPath pPath, St
 	 *      CIM_ERR_SERVER_LIMITS_EXCEEDED
 	 *      CIM_ERR_PULL_HAS_BEEN_ABANDONED
 	 *      CIM_ERR_FAILED
-	 * 
+	 *
 	 */
-	public EnumerateResponse getInstances(CIMObjectPath pPath, String pContext,
-			UnsignedInteger32 pMaxObjects) throws WBEMException;
+	public EnumerateResponse getInstances(
+		CIMObjectPath pPath,
+		String pContext,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException;
 
 	/**
 	 * getInstancesWithPath shall use the enumeration context
 	 * provided to get the next set of instances for the enumeration session.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIMObjectPath representing the namespace to
 	 *            be used.
@@ -1596,9 +1678,9 @@ public EnumerateResponse getInstances(CIMObjectPath pPath, String p
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
-	 * 
+	 *
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -1608,15 +1690,19 @@ public EnumerateResponse getInstances(CIMObjectPath pPath, String p
 	 *      CIM_ERR_SERVER_LIMITS_EXCEEDED
 	 *      CIM_ERR_PULL_HAS_BEEN_ABANDONED
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public EnumerateResponse getInstancesWithPath(CIMObjectPath pPath,
-			String pContext, UnsignedInteger32 pMaxObjects) throws WBEMException;
+	public EnumerateResponse getInstancesWithPath(
+		CIMObjectPath pPath,
+		String pContext,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException;
 
 	/**
 	 * Get property values. See WBEMClientConstants for a list of
 	 * standard properties.
-	 * 
+	 *
 	 * @param pKey
 	 *            The name of the property.
 	 * @return The value of the property.
@@ -1626,7 +1712,7 @@ public EnumerateResponse getInstancesWithPath(CIMObjectPath pPath,
 
 	/**
 	 * Get a CIMQualifierType.
-	 * 
+	 *
 	 * @param pName
 	 *            CIMObjectPath that identifies the
 	 *            CIMQualifierType to return.
@@ -1637,23 +1723,23 @@ public EnumerateResponse getInstancesWithPath(CIMObjectPath pPath,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_NOT_FOUND (the requested Qualifier declaration did not exist)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
 	public CIMQualifierType getQualifierType(CIMObjectPath pName) throws WBEMException;
 
 	/**
 	 * Initialize the client connection. This must be called before any
 	 * operations. This must only be called once.
-	 * 
+	 *
 	 * @param pName
 	 *            The protocol and host to use (e.g. http://192.168.1.128/). Any
 	 *            other fields shall be ignored.
@@ -1668,11 +1754,11 @@ public EnumerateResponse getInstancesWithPath(CIMObjectPath pPath,
 	 *             If the protocol adapter or security cannot be initialized.
 	 */
 	public void initialize(CIMObjectPath pName, Subject pSubject, Locale[] pLocales)
-			throws IllegalArgumentException, WBEMException;
+		throws IllegalArgumentException, WBEMException;
 
 	/**
 	 * Executes the specified method on the specified object.
-	 * 
+	 *
 	 * @param pName
 	 *            CIM object path of the object whose method must be invoked. It
 	 *            must include all of the keys.
@@ -1689,10 +1775,10 @@ public void initialize(CIMObjectPath pName, Subject pSubject, Locale[] pLocales)
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
-	 *      CIM_ERR_NOT_SUPPORTED (implementation DOES NOT support ANY 
+	 *      CIM_ERR_NOT_SUPPORTED (implementation DOES NOT support ANY
 	 *            Extrinsic Method Invocation)
 	 *      CIM_ERR_INVALID_NAMESPACE
 	 *      CIM_ERR_INVALID_PARAMETER (for this method)
@@ -1700,15 +1786,19 @@ public void initialize(CIMObjectPath pName, Subject pSubject, Locale[] pLocales)
 	 *      CIM_ERR_METHOD_NOT_FOUND
 	 *      CIM_ERR_METHOD_NOT_AVAILABLE
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public Object invokeMethod(CIMObjectPath pName, String pMethodName,
-			CIMArgument[] pInputArguments, CIMArgument[] pOutputArguments)
-			throws WBEMException;
+	public Object invokeMethod(
+		CIMObjectPath pName,
+		String pMethodName,
+		CIMArgument[] pInputArguments,
+		CIMArgument[] pOutputArguments
+	)
+		throws WBEMException;
 
 	/**
 	 * Modify the CIMClass.
-	 * 
+	 *
 	 * @param pClass
 	 *            CIMClass to be modified.
 	 * @throws UnsupportedOperationException
@@ -1717,12 +1807,12 @@ public Object invokeMethod(CIMObjectPath pName, String pMethodName,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_INVALID_SUPERCLASS (the putative CIM Class declares a
 	 *            non-existent superclass)
@@ -1733,14 +1823,14 @@ public Object invokeMethod(CIMObjectPath pName, String pMethodName,
 	 *            because it was not possible to update the instances of the Class in
 	 *            a consistent fashion)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
 	public void modifyClass(CIMClass pClass) throws WBEMException;
 
 	/**
 	 * Modify some or all of the properties of the specified
 	 * CIMInstance.
-	 * 
+	 *
 	 * @param pInstance
 	 *            CIMInstance to be modified. All Keys must be
 	 *            populated.
@@ -1758,8 +1848,8 @@ public Object invokeMethod(CIMObjectPath pName, String pMethodName,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED (provider does not support this method)
 	 *      CIM_ERR_INVALID_NAMESPACE
@@ -1768,14 +1858,14 @@ public Object invokeMethod(CIMObjectPath pName, String pMethodName,
 	 *      CIM_ERR_NOT_FOUND (if instance does not exist)
 	 *      CIM_ERR_NO_SUCH_PROPERTY (in this instance)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
 	public void modifyInstance(CIMInstance pInstance, String[] pPropertyList) throws WBEMException;
 
 	/**
 	 * Enumerates the Association classes that refer to a specified source CIM
 	 * Class.
-	 * 
+	 *
 	 * @param pObjectName
 	 *            CIMObjectPath defining the source CIM class whose
 	 *            referring classes are to be returned. pObjectName
@@ -1823,25 +1913,31 @@ public Object invokeMethod(CIMObjectPath pName, String pMethodName,
 	 *             If unsuccessful, one of the following status codes shall be
 	 *             returned along with zero or more instance of
 	 *             CIM_Error. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
 
-	CloseableIterator referenceClasses(CIMObjectPath pObjectName, String pResultClass,
-			String pRole, boolean pIncludeQualifiers, boolean pIncludeClassOrigin,
-			String[] pPropertyList) throws WBEMException;
+	CloseableIterator referenceClasses(
+		CIMObjectPath pObjectName,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException;
 
 	/**
 	 * Enumerates the Association instances that refer to a specified source CIM
 	 * Instance.
-	 * 
+	 *
 	 * @param pObjectName
 	 *            CIMObjectPath defining the source CIM Instance
 	 *            whose referring instances are to be returned. The
@@ -1882,19 +1978,24 @@ CloseableIterator referenceClasses(CIMObjectPath pObjectName, String p
 	 *             If unsuccessful, one of the following status codes shall be
 	 *             returned along with zero or more CIM_Error
 	 *             instances. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	CloseableIterator referenceInstances(CIMObjectPath pObjectName,
-			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException;
+	CloseableIterator referenceInstances(
+		CIMObjectPath pObjectName,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException;
 
 	/**
 	 * Enumerates the CIMObjectPaths of Association Objects that
@@ -1905,7 +2006,7 @@ CloseableIterator referenceInstances(CIMObjectPath pObjectName,
 	 * CloseableIterator of CIMObjectPaths of the
 	 * CIMInstance objects that refer to the source Object is
 	 * returned.
-	 * 
+	 *
 	 * @param pObjectName
 	 *            CIMObjectPath defining the source CIM Object
 	 *            whose referring Objects are to be returned. This argument may
@@ -1928,25 +2029,25 @@ CloseableIterator referenceInstances(CIMObjectPath pObjectName,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public CloseableIterator referenceNames(CIMObjectPath pObjectName,
-			String pResultClass, String pRole) throws WBEMException;
+	public CloseableIterator referenceNames(CIMObjectPath pObjectName, String pResultClass, String pRole)
+		throws WBEMException;
 
 	/**
 	 * referencePaths shall start an enumeration session for
 	 * association instances that have references that refer to the instance
 	 * defined in the pInstancePath parameter and return zero or
 	 * more CIMObjectPath objects.
-	 * 
+	 *
 	 * @param pInstancePath
 	 *            The CIMObjectPath for the instance for which the
 	 *            enumeration is to be performed.
@@ -2042,9 +2143,9 @@ public CloseableIterator referenceNames(CIMObjectPath pObjectName
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
-	 * 
+	 *
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -2057,19 +2158,26 @@ public CloseableIterator referenceNames(CIMObjectPath pObjectName
 	 *      CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_QUERY
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public EnumerateResponse referencePaths(CIMObjectPath pInstancePath,
-			String pResultClass, String pRole, String pFilterQueryLanguage, String pFilterQuery,
-			UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects)
-			throws WBEMException;
+	public EnumerateResponse referencePaths(
+		CIMObjectPath pInstancePath,
+		String pResultClass,
+		String pRole,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException;
 
 	/**
 	 * references shall start an enumeration session for
 	 * association instances that have references that refer to the instance
 	 * defined in the pInstancePath parameter and return zero or
 	 * more CIMInstance objects.
-	 * 
+	 *
 	 * @param pInstancePath
 	 *            The CIMObjectPath for the instance for which the
 	 *            enumeration is to be performed.
@@ -2182,8 +2290,8 @@ public EnumerateResponse referencePaths(CIMObjectPath pInstancePa
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_SERVER_IS_SHUTTING_DOWN
 	 *      CIM_ERR_NOT_SUPPORTED
@@ -2196,16 +2304,25 @@ public EnumerateResponse referencePaths(CIMObjectPath pInstancePa
 	 *      CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_QUERY
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
-	public EnumerateResponse references(CIMObjectPath pInstancePath,
-			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException;
+	public EnumerateResponse references(
+		CIMObjectPath pInstancePath,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException;
 
 	/**
 	 * Change the locales that were provided during initialization.
-	 * 
+	 *
 	 * @param pLocales
 	 *            An array of locales in order of priority of preference.
 	 */
@@ -2214,7 +2331,7 @@ public EnumerateResponse references(CIMObjectPath pInstancePath,
 	/**
 	 * Set properties that enable options or protocol specific properties. See
 	 * WBEMClientConstants for a list of standard properties.
-	 * 
+	 *
 	 * @param pKey
 	 *            The name of the property.
 	 * @param pValue
@@ -2229,7 +2346,7 @@ public EnumerateResponse references(CIMObjectPath pInstancePath,
 	 * Add a CIMQualifierType to the specified namespace if it does
 	 * not already exist. Otherwise, it modifies the qualifier type to the value
 	 * specified.
-	 * 
+	 *
 	 * @param pQualifierType
 	 *            The CIM qualifier type to be added.
 	 * @throws UnsupportedOperationException
@@ -2238,15 +2355,15 @@ public EnumerateResponse references(CIMObjectPath pInstancePath,
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
-	 *             
+	 *
+	 *
 	 *      CIM_ERR_ACCESS_DENIED
 	 *      CIM_ERR_NOT_SUPPORTED
 	 *      CIM_ERR_INVALID_NAMESPACE
-	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized 
+	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
-	 * 
+	 *
 	 */
 	public void setQualifierType(CIMQualifierType pQualifierType) throws WBEMException;
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientConstants.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientConstants.java
index 5d4ecf9..d02cde4 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientConstants.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientConstants.java
@@ -52,7 +52,6 @@
  * property value is attempted to be set.
  */
 public class WBEMClientConstants {
-
 	/**
 	 * Use this property to set the list of ciphers the client will support.
 	 * Setting this value to null will use the default set of ciphers provided
@@ -135,24 +134,24 @@ public class WBEMClientConstants {
 	/**
 	 * The CIM-XML Protocol as defined by the DMTF in the following
 	 * specifications:
-	 * 
+	 *
 	 * 
      -	 * DSP0200 - CIM Operations over HTTP 
-	 * DSP0201 - Representation of CIM Using XML 
+	 * DSP0200 - CIM Operations over HTTP
+	 * DSP0201 - Representation of CIM Using XML
 	 * DSP0203 - CIM DTD
-	 * 
+	 *
 	 */
 	public static final String PROTOCOL_CIMXML = "CIM-XML";
 
 	/**
 	 * The WS-Management Protocol as defined by the DMTF in the following
 	 * specifications:
-	 * 
+	 *
 	 * 
      -	 * DSP0226 - WS-Management 
-	 * DSP0227 - WS-Management CIM Binding Specification 
+	 * DSP0226 - WS-Management
+	 * DSP0227 - WS-Management CIM Binding Specification
 	 * DSP0230 - WS-CIM Mapping Specification
-	 * 
+	 *
 	 */
 	public static final String PROTOCOL_WSMANAGEMENT = "WS-Management";
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java
index b896b10..2eb4817 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java
@@ -53,36 +53,37 @@
  * This class defines the functionality of a WBEMClient factory,
  * which is used to retrieve a WBEMClient for a specified protocol.
  * An example of how to use the factory is included below.
- * 
+ *
  * 
        *   ...
  *   WBEMClient cc = null;
- *   
+ *
  *   try {
  *     cc = WBEMClientFactory.getClient(WBEMClientConstants.PROTOCOL_CIMXML);
  *   } catch (Exception e) {
  *     System.out.println("Received error when trying to retrieve client handle");
  *     System.exit(-1);
  *   }
- *   
- *   // initialize the client 
+ *
+ *   // initialize the client
  *   cc.initialize(cns, s, null);
  *   ...
  * 
      
  */
 
 public class WBEMClientFactory extends Object {
-
 	private static final String[] cProtocols = { WBEMClientConstants.PROTOCOL_CIMXML };
 
 	/**
 	 *
 	 */
-	public WBEMClientFactory() { /**/}
+	public WBEMClientFactory() {
+		/**/
+	}
 
 	/**
 	 * Get a WBEMClient for a protocol.
-	 * 
+	 *
 	 * @param pProtocol
 	 *            The protocol name (e.g. "CIM-XML").
 	 * @return The WBEMClient implementation for the protocol
@@ -95,19 +96,19 @@ public WBEMClientFactory() { /**/}
 	 *             If the protocol implementation could not be loaded.
 	 */
 	public static WBEMClient getClient(String pProtocol) throws WBEMException {
-
-		if (WBEMClientConstants.PROTOCOL_CIMXML.equalsIgnoreCase(pProtocol)) { return new WBEMClientCIMXML(); }
+		if (WBEMClientConstants.PROTOCOL_CIMXML.equalsIgnoreCase(pProtocol)) {
+			return new WBEMClientCIMXML();
+		}
 
 		throw new IllegalArgumentException("\"" + pProtocol + "\" is not a supported protocol");
 	}
 
 	/**
 	 * Get the names of the supported protocols.
-	 * 
+	 *
 	 * @return A string array of the supported protocols.
 	 */
 	public static String[] getSupportedProtocols() {
 		return cProtocols;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/listener/IndicationListener.java b/src/main/java/org/metricshub/wbem/javax/wbem/listener/IndicationListener.java
index 137e86c..fe03af6 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/listener/IndicationListener.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/listener/IndicationListener.java
@@ -42,7 +42,6 @@
  */
 
 import java.util.EventListener;
-
 import org.metricshub.wbem.javax.cim.CIMInstance;
 
 //Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010
@@ -51,10 +50,9 @@
  * indications. See the WBEMListenerFactory class for an example.
  */
 public interface IndicationListener extends EventListener {
-
 	/**
 	 * Called when an indication has been received by the listener
-	 * 
+	 *
 	 * @param pIndicationURL
 	 *            The URL to which the indication was posted. For example if the
 	 *            indication was delivered over the https protocol to the
@@ -64,5 +62,4 @@ public interface IndicationListener extends EventListener {
 	 *            The indication received.
 	 */
 	public void indicationOccured(String pIndicationURL, CIMInstance pIndication);
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListener.java b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListener.java
index 7b09f81..6cba4d4 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListener.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListener.java
@@ -52,10 +52,9 @@
  * listen for indications.
  */
 public interface WBEMListener {
-
 	/**
 	 * Add a new listener using the specified port.
-	 * 
+	 *
 	 * @param pListener
 	 *            The Indication Listener that will be called when an indication
 	 *            is received.
@@ -67,12 +66,11 @@ public interface WBEMListener {
 	 * @throws IOException
 	 *             If the port is already in use.
 	 */
-	public int addListener(IndicationListener pListener, int pPort, String pTransport)
-			throws IOException;
+	public int addListener(IndicationListener pListener, int pPort, String pTransport) throws IOException;
 
 	/**
 	 * Add a new listener using the specified port.
-	 * 
+	 *
 	 * @param pListener
 	 *            The Indication Listener that will be called when an indication
 	 *            is received.
@@ -87,12 +85,12 @@ public int addListener(IndicationListener pListener, int pPort, String pTranspor
 	 * @throws IOException
 	 *             If the port is already in use.
 	 */
-	public int addListener(IndicationListener pListener, int pPort, String pTransport,
-			String localAddr) throws IOException;
+	public int addListener(IndicationListener pListener, int pPort, String pTransport, String localAddr)
+		throws IOException;
 
 	/**
 	 * Get a property value.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the property.
 	 * @return The value of the property.
@@ -101,7 +99,7 @@ public int addListener(IndicationListener pListener, int pPort, String pTranspor
 
 	/**
 	 * Remove the listener associated with the specified port.
-	 * 
+	 *
 	 * @param pPort
 	 *            The port.
 	 */
@@ -109,7 +107,7 @@ public int addListener(IndicationListener pListener, int pPort, String pTranspor
 
 	/**
 	 * Set a property for the WBEM Listener.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the property.
 	 * @param pValue
@@ -118,5 +116,4 @@ public int addListener(IndicationListener pListener, int pPort, String pTranspor
 	 *             If the name is not a supported property name.
 	 */
 	public void setProperty(String pName, String pValue);
-
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerConstants.java b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerConstants.java
index 4645fa0..d173999 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerConstants.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerConstants.java
@@ -46,7 +46,6 @@
  * property value is attempted to be set.
  */
 public class WBEMListenerConstants {
-
 	/**
 	 * Use this property to set the list of ciphers the listener will support.
 	 * Setting this value to null will use the default set of ciphers provided
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java
index 3e20ed4..26ae3d0 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java
@@ -25,8 +25,6 @@
 
 package org.metricshub.wbem.javax.wbem.listener;
 
-import org.metricshub.wbem.sblim.cimclient.WBEMListenerSBLIM;
-
 /*-
  * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
  * WBEM Java Client
@@ -48,39 +46,41 @@
  */
 
 import org.metricshub.wbem.javax.wbem.client.WBEMClientConstants;
+import org.metricshub.wbem.sblim.cimclient.WBEMListenerSBLIM;
 
 //Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010
 /**
  * This class is a factory for getting a WBEMListener
  * implementation for a specified protocol. An example of how to use the factory
  * is included below.
- * 
+ *
  * 
        * ...
  * class MyListener implements IndicationListener {
- * 
+ *
  *   public void indicationOccured(String pIndicationURL, CIMInstance pIndication) {
  *     System.out.println(pIndication);
  * 	 }
  * }
- * 
+ *
  * String protocol = WBEMClientConstants.PROTOCOL_CIMXML;
  * WBEMListener api = WBEMListenerFactory.getListener(protocol);
  * int port = api.addListener(MyListener, 1234, protocol);
  * 
      
  */
 public class WBEMListenerFactory extends Object {
-
 	private static final String[] PROTOCOLS = { WBEMClientConstants.PROTOCOL_CIMXML };
 
 	/**
 	 *
 	 */
-	public WBEMListenerFactory() { /**/}
+	public WBEMListenerFactory() {
+		/**/
+	}
 
 	/**
 	 * Get a WBEM Listener implementation for the specified protocol.
-	 * 
+	 *
 	 * @param pProtocol
 	 *            The protocol name.
 	 * @return Implementation of WBEMListener.
@@ -88,16 +88,17 @@ public WBEMListenerFactory() { /**/}
 	 *             Could not load protocol implementation.
 	 */
 	public static WBEMListener getListener(String pProtocol) throws IllegalArgumentException {
-
-		if (WBEMClientConstants.PROTOCOL_CIMXML.equalsIgnoreCase(pProtocol)) { return new WBEMListenerSBLIM(); }
-		throw new IllegalArgumentException("Protocol: " + pProtocol
-				+ " is not supported! Invoke getProtocols() for the list of "
-				+ "supported protocols.");
+		if (WBEMClientConstants.PROTOCOL_CIMXML.equalsIgnoreCase(pProtocol)) {
+			return new WBEMListenerSBLIM();
+		}
+		throw new IllegalArgumentException(
+			"Protocol: " + pProtocol + " is not supported! Invoke getProtocols() for the list of " + "supported protocols."
+		);
 	}
 
 	/**
 	 * Get the names of the supported protocols.
-	 * 
+	 *
 	 * @return A string array of the protocol names supported.
 	 */
 	public static String[] getProtocols() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/CIMXMLTraceListener.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/CIMXMLTraceListener.java
index c789c16..94d4c34 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/CIMXMLTraceListener.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/CIMXMLTraceListener.java
@@ -44,14 +44,13 @@
 /**
  * The interface CIMXMLTraceListener must be implemented if you want to attach
  * your own CIM-XML logging framework to the CIM Client.
- * 
+ *
  * @see LogAndTraceManager
  */
 public interface CIMXMLTraceListener {
-
 	/**
 	 * Receive a CIM-XML trace message.
-	 * 
+	 *
 	 * @param pLevel
 	 *            One of the message level identifiers, e.g. FINE
 	 * @param pMessage
@@ -62,5 +61,4 @@ public interface CIMXMLTraceListener {
 	 *            (being sent from server to client)
 	 */
 	public void traceCIMXML(Level pLevel, String pMessage, boolean pOutgoing);
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/GenericExts.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/GenericExts.java
index e9689f2..1d0078b 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/GenericExts.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/GenericExts.java
@@ -50,10 +50,10 @@ public class GenericExts {
 	/**
 	 * initArrayList : If arrayList is null then it will return the new
 	 * arrayList of same type if it is not null then it will clear the arrayList
-	 * 
+	 *
 	 * @param 
 	 *            : Type Parameter
-	 * 
+	 *
 	 * @param pAL
 	 *            : ArrayList to be initialized
 	 * @return ArrayList : initialized ArrayList
@@ -68,10 +68,10 @@ public static  ArrayList initClearArrayList(ArrayList pAL) {
 	 * initArrayList : If arrayList is null then it will return the new
 	 * arrayList of same type if it is not null then it will return the same
 	 * arrayList
-	 * 
+	 *
 	 * @param 
 	 *            : Type Parameter
-	 * 
+	 *
 	 * @param pAL
 	 *            : ArrayList to be initialized
 	 * @return ArrayList : initialized ArrayList
@@ -84,20 +84,19 @@ public static  ArrayList initArrayList(ArrayList pAL) {
 	/**
 	 * cloneVector : Generic deep copy of the vector. If original vector is null
 	 * then return value will also be null.
-	 * 
+	 *
 	 * @param 
 	 *            : Type of vector
-	 * 
+	 *
 	 * @param oldVec
 	 *            : The original vector.
-	 * 
+	 *
 	 * @return Vector<T> : Deep copy of original vector.
 	 */
 	public static synchronized  Vector cloneVector(Vector oldVec) {
 		if (oldVec == null) return null;
 		Vector newVec = new Vector(oldVec.size());
-		for (T obj : oldVec)
-			newVec.add(obj);
+		for (T obj : oldVec) newVec.add(obj);
 		return newVec;
 	}
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/IndicationListenerSBLIM.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/IndicationListenerSBLIM.java
index 2f0b230..e1c8051 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/IndicationListenerSBLIM.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/IndicationListenerSBLIM.java
@@ -41,13 +41,12 @@
 
 import java.net.InetAddress;
 import java.util.EventListener;
-
 import org.metricshub.wbem.javax.cim.CIMInstance;
 
 /**
  * This interface is implemented by the code that wants to create a listener for
  * indications. See the WBEMListenerFactory class for an example.
- * 
+ *
  * The difference between this interface and IndicationListener is
  * that the JSR48 standard (javax.wbem.listener.IndicationListener)
  * does not allow for the listener to receive the IP of the indication sender
@@ -55,10 +54,9 @@
  * org.sblim.cimclinet.IndicationListenerSBLIM) does.
  */
 public interface IndicationListenerSBLIM extends EventListener {
-
 	/**
 	 * Called when an indication has been received by the listener
-	 * 
+	 *
 	 * @param pIndicationURL
 	 *            The URL to which the indication was posted. For example if the
 	 *            indication was delivered over the https protocol to the
@@ -69,7 +67,5 @@ public interface IndicationListenerSBLIM extends EventListener {
 	 * @param pSenderIP
 	 *            The internet address of the indication sender.
 	 */
-	public void indicationOccured(String pIndicationURL, CIMInstance pIndication,
-			InetAddress pSenderIP);
-
+	public void indicationOccured(String pIndicationURL, CIMInstance pIndication, InetAddress pSenderIP);
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/LogAndTraceManager.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/LogAndTraceManager.java
index f7aa039..107687b 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/LogAndTraceManager.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/LogAndTraceManager.java
@@ -45,22 +45,20 @@
 import java.io.OutputStream;
 import java.util.Collections;
 import java.util.List;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 
 /**
  * Class LogAndTraceManager provides the means to register/unregister log and
  * trace listeners. It is the entry point for application that want to redirect
  * the CIM Client's log and trace messages into their own logging framework.
- * 
+ *
  */
 public class LogAndTraceManager {
-
 	private static LogAndTraceManager cManager = new LogAndTraceManager();
 
 	/**
 	 * Returns the singleton instance of the manager.
-	 * 
+	 *
 	 * @return The manager
 	 */
 	public static LogAndTraceManager getManager() {
@@ -74,7 +72,7 @@ private LogAndTraceManager() {
 	/**
 	 * Adds a listener for log messages. The listener will be notified of any
 	 * log event.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -85,7 +83,7 @@ public void addLogListener(LogListener pListener) {
 	/**
 	 * Remove a listener. This listener will not be notified of log events
 	 * anymore.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -104,7 +102,7 @@ public void clearLogListeners() {
 	/**
 	 * Gets the registered log listeners including the internal console and file
 	 * loggers.
-	 * 
+	 *
 	 * @return An unmodifiable list of listeners
 	 */
 	public List getLogListeners() {
@@ -114,7 +112,7 @@ public List getLogListeners() {
 	/**
 	 * Adds a listener for log messages. The listener will be notified of any
 	 * trace event.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -125,7 +123,7 @@ public void addTraceListener(TraceListener pListener) {
 	/**
 	 * Removes a listener. This listener will not be notified of trace events
 	 * anymore.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -144,7 +142,7 @@ public void clearTraceListeners() {
 	/**
 	 * Gets the registered trace listeners including the internal console and
 	 * file loggers.
-	 * 
+	 *
 	 * @return A unmodifiable list of listeners
 	 */
 	public List getTraceListeners() {
@@ -154,7 +152,7 @@ public List getTraceListeners() {
 	/**
 	 * Adds a listener for CIM-XML trace messages. The listener will be notified
 	 * of any CIM-XML trace event.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -165,7 +163,7 @@ public void addCIMXMLTraceListener(CIMXMLTraceListener pListener) {
 	/**
 	 * Removes a CIM-XML trace listener. This listener will not be notified of
 	 * CIM-XML trace events anymore.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -182,12 +180,11 @@ public void clearCIMXMLTraceListeners() {
 
 	/**
 	 * Gets the registered CIM-XML trace listeners.
-	 * 
+	 *
 	 * @return A unmodifiable list of listeners
 	 */
 	public List getCIMXMLTraceListeners() {
-		return Collections
-				.unmodifiableList(LogAndTraceBroker.getBroker().getCIMXMLTraceListeners());
+		return Collections.unmodifiableList(LogAndTraceBroker.getBroker().getCIMXMLTraceListeners());
 	}
 
 	/**
@@ -195,7 +192,7 @@ public List getCIMXMLTraceListeners() {
 	 * null means that tracing is effectively disabled. Otherwise
 	 * the CIM-XML tracing can be activated either globally or per-connection
 	 * via the "sblim.wbem.cimxmlTracing" configuration property.
-	 * 
+	 *
 	 * @return The CIM-XML trace stream
 	 */
 	public OutputStream getXmlTraceStream() {
@@ -207,12 +204,11 @@ public OutputStream getXmlTraceStream() {
 	 * null means that tracing is effectively disabled. Otherwise
 	 * the CIM-XML tracing can be activated either globally or per-connection
 	 * via the "sblim.wbem.cimxmlTracing" configuration property.
-	 * 
+	 *
 	 * @param pStream
 	 *            The CIM-XML trace stream
 	 */
 	public void setXmlTraceStream(OutputStream pStream) {
 		LogAndTraceBroker.getBroker().setXmlTraceStream(pStream);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/LogListener.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/LogListener.java
index 6a647ef..7e24c27 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/LogListener.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/LogListener.java
@@ -45,14 +45,13 @@
 /**
  * The interface LogListener must be implemented if you want to attach your own
  * logging framework to the CIM Client.
- * 
+ *
  * @see LogAndTraceManager
  */
 public interface LogListener {
-
 	/**
 	 * Receive a message.
-	 * 
+	 *
 	 * @param pLevel
 	 *            One of the message level identifiers, e.g. SEVERE
 	 * @param pMessageKey
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/TraceListener.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/TraceListener.java
index 04adebc..d8adedf 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/TraceListener.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/TraceListener.java
@@ -46,14 +46,13 @@
 /**
  * The interface TraceListener must be implemented if you want to attach your
  * own logging framework to the CIM Client.
- * 
+ *
  * @see LogAndTraceManager
  */
 public interface TraceListener {
-
 	/**
 	 * Receive a trace message.
-	 * 
+	 *
 	 * @param pLevel
 	 *            One of the message level identifiers, e.g. FINE
 	 * @param pOrigin
@@ -66,7 +65,7 @@ public interface TraceListener {
 
 	/**
 	 * Receive a trace message.
-	 * 
+	 *
 	 * @param pLevel
 	 *            One of the message level identifiers, e.g. SEVERE
 	 * @param pOrigin
@@ -77,5 +76,4 @@ public interface TraceListener {
 	 *            The throwable associated with the message
 	 */
 	public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage, Throwable pThrown);
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMClientSBLIM.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMClientSBLIM.java
index 056329c..12f1910 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMClientSBLIM.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMClientSBLIM.java
@@ -50,10 +50,8 @@
 import java.net.URI;
 import java.util.Locale;
 import java.util.Properties;
-
 import javax.net.SocketFactory;
 import javax.security.auth.Subject;
-
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
@@ -63,16 +61,15 @@
 /**
  * Class WBEMClientSBLIM contains the SBLIM CIM Client specific extensions to
  * the WBEMClient interface.
- * 
+ *
  * @see WBEMClient
- * 
+ *
  */
 public interface WBEMClientSBLIM extends WBEMClient {
-
 	/**
 	 * Initialize the client connection. This must be called before any
 	 * operations. This must only be called once.
-	 * 
+	 *
 	 * @param pUri
 	 *            The protocol and host to use. Any other fields will be
 	 *            ignored.
@@ -86,8 +83,7 @@ public interface WBEMClientSBLIM extends WBEMClient {
 	 * @throws WBEMException
 	 *             If the protocol adapter or security cannot be initialized.
 	 */
-	public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
-			throws IllegalArgumentException, WBEMException;
+	public void initialize(URI pUri, Subject pSubject, Locale[] pLocales) throws IllegalArgumentException, WBEMException;
 
 	/**
 	 * Returns the client specific configuration properties. Note that only
@@ -96,7 +92,7 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 	 * class.
      
 	 * If the no client specific configuration is set, this method returns
 	 * null
-	 * 
+	 *
 	 * @return The configuration properties
 	 * @see System#getProperties()
 	 */
@@ -110,11 +106,11 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 	 * properties not specified here are taken from the global properties. The
 	 * global settings can be accessed via the java.lang.System
 	 * class.
-	 * 
+	 *
 	 * @param pProperties
 	 *            The session specific properties. null resets this
 	 *            client to the global settings.
-	 * 
+	 *
 	 * @see System#setProperties(Properties)
 	 */
 	public void setProperties(Properties pProperties);
@@ -125,10 +121,10 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 	 * otherwise client specific value if one was set or otherwise the global
 	 * value if one was set or otherwise the default value. Valid property names
 	 * can be found in the WBEMConfigurationProperties interface.
-	 * 
+	 *
 	 * @param pKey
 	 *            The name of the configuration property
-	 * 
+	 *
 	 * @return The value of the given configuration property
 	 * @see WBEMConfigurationProperties
 	 */
@@ -141,7 +137,7 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 	 * class. Valid property names can be found in the
 	 * WBEMConfigurationProperties interface. Unknown properties
 	 * are ignored.
-	 * 
+	 *
 	 * @param pKey
 	 *            The name of the configuration property
 	 * @param pValue
@@ -160,7 +156,7 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 	 * getProperties().
      
 	 * If the no client specific configuration is set, this method returns
 	 * null
-	 * 
+	 *
 	 * @return The configuration properties
 	 * @see System#getProperties()
 	 * @see #getProperties()
@@ -176,11 +172,11 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 	 * specified here are taken from the client or global properties. The global
 	 * settings can be accessed via the java.lang.System class, the
 	 * client setting via getProperties().
-	 * 
+	 *
 	 * @param pProperties
 	 *            The thread specific properties. null remove the
 	 *            local setting of the current thread.
-	 * 
+	 *
 	 * @see System#setProperties(Properties)
 	 * @see #setProperties(Properties)
 	 */
@@ -194,7 +190,7 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 	 * getProperties(). Valid property names can be found in the
 	 * WBEMConfigurationProperties interface. Unknown properties
 	 * are ignored.
-	 * 
+	 *
 	 * @param pKey
 	 *            The name of the configuration property
 	 * @param pValue
@@ -209,7 +205,7 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 	/**
 	 * Gets the custom socket factory if one is set. The client uses this
 	 * factory for socket creation instead of the default one.
-	 * 
+	 *
 	 * @return The custom factory used for socket creation. null
 	 *         indicates set the JRE default factory is used.
 	 */
@@ -218,7 +214,7 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 	/**
 	 * Sets a custom socket factory. The client will use this factory for socket
 	 * creation instead of the JRE default.
-	 * 
+	 *
 	 * @param pFactory
 	 *            The factory to use for socket creation. null
 	 *            resets to the JRE default factory.
@@ -229,7 +225,7 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 
 	/**
 	 * Enumerate the names of the instances of CIM namespaces.
-	 * 
+	 *
 	 * @param pNamespace
 	 *            The Interop Namespace, if known. If null, the default Interop
 	 *            Namespace names defined by DSP1033 are used.
@@ -237,18 +233,17 @@ public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
+	 *
 	 *             
       	 *      CIM_ERR_FAILED (some other unspecified error occurred)
 	 * 
      
 	 */
-	public CloseableIterator enumerateNamespaces(String pNamespace)
-			throws WBEMException;
+	public CloseableIterator enumerateNamespaces(String pNamespace) throws WBEMException;
 
 	/**
 	 * Returns an indication of whether the client is active (initialized and
 	 * not closed) or inactive (not initialized or closed).
-	 * 
+	 *
 	 * @return true if client is active, false
 	 *         otherwise.
 	 */
@@ -256,7 +251,7 @@ public CloseableIterator enumerateNamespaces(String pNamespace)
 
 	/**
 	 * Sends the indication to the specified recipient.
-	 * 
+	 *
 	 * @param pRecipient
 	 *            URI of indication recipient.
 	 * @param pIndication
@@ -266,7 +261,7 @@ public CloseableIterator enumerateNamespaces(String pNamespace)
 	 * @throws WBEMException
 	 *             If unsuccessful, one of the following status codes must be
 	 *             returned. The ORDERED list is:
-	 * 
+	 *
 	 *             
       	 *      CIM_ERR_INVALID_PARAMETER (including missing, duplicate, unrecognized
 	 *            or otherwise incorrect parameters)
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMConfigurationProperties.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMConfigurationProperties.java
index e1a36c4..aaea277 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMConfigurationProperties.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMConfigurationProperties.java
@@ -77,10 +77,9 @@
 /**
  * The interface WBEMConfigurationProperties contains the names of all
  * configuration properties that are recognized by the CIM Client.
- * 
+ *
  */
 public interface WBEMConfigurationProperties {
-
 	/**
 	 * A URL string giving the location of the CIM client config file. 
      
 	 * 
      
@@ -300,7 +299,7 @@ public interface WBEMConfigurationProperties {
 	 * Type: String
      
 	 * Recognition: On next authentication
      
 	 * Range:
-	 * 
+	 *
 	 * org.sblim.cimclient.internal.http.WwwAuthInfo, org.sblim.cimclient.internal.http.PegasusLocalAuthInfo or any self-written subclass of org.sblim.cimclient.internal.http.AuthorizationInfo
 	 * 
      
 	 * Default: org.sblim.cimclient.internal.http.WwwAuthInfo
      
@@ -315,12 +314,12 @@ public interface WBEMConfigurationProperties {
 	 * WWW-Authenticate field of an HTTP 401 response when authentication
      
 	 * fails. The following two strings are examples:
      
 	 * 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * Basic realm="Secure Area"
 	 * Digest realm="testrealm@host.com",qop="auth,auth-int",nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",opaque="5ccc069c403ebaf9f0171e9517f40e41"
-	 * 
-	 * 
+	 *
+	 *
 	 * Type: String
      
 	 * Recognition: On next authentication
      
 	 * Range: Basic, Digest
      
@@ -632,19 +631,19 @@ public interface WBEMConfigurationProperties {
 	 * event the application does not set one via the LogAndTraceManager class.
 	 * This stream can either be standard output (System.out), standard error
 	 * output (System.err) or a filename to be opened by the client.
-	 * 
+	 *
 	 * Note: This property has no effect unless sblim.wbem.cimxmlTracing is set
 	 * to true.
-	 * 
+	 *
 	 * Note: This property has no effect if the application already set the
 	 * stream prior to client initialization. If the application sets the stream
 	 * after client initialization, the stream specified by this property is
 	 * overridden.
-	 * 
+	 *
 	 * Note: If a filename is specified, it is opened and all CIM-XML
 	 * communication is written to it - no checks are made for an existing file
 	 * or for filling up the disk. USE WITH CAUTION.
-	 * 
+	 *
 	 * Type: String
      
 	 * Recognition: Startup
      
 	 * Range: System.out, System.err, filename
      
@@ -653,7 +652,7 @@ public interface WBEMConfigurationProperties {
 	public static final String CIMXML_TRACE_STREAM = "sblim.wbem.cimxmlTraceStream";
 
 	/**
-	 * 
+	 *
 	 * Tells the XML builder how to sign embedded objects. This is necessary due to
 	 * the non-consequent handling of embedded objects on different CIMOMs.
 	 * "AttribOnly"       - only the EmbeddedObject="instance/object" is used
@@ -663,101 +662,102 @@ public interface WBEMConfigurationProperties {
 	 * "EmbObjAndEmbInstQuali" -
 	 *                      on qualified CIM-XML elements the EmbeddedObject qualifier is used
 	 *                      for embedded classes and the EmbeddedInstance="className" qualifier
-	 *                      is used for embedded instances 
+	 *                      is used for embedded instances
 	 * Type: String
 	 * Recognition: Anytime
 	 * Range: AttribOnly, EmbObjQuali, EmbObjAndEmbInstQuali
 	 * Default: AttribOnly
-	 * 
+	 *
 	 */
 	public static final String CIMXML_EMBOBJBUILDER = "sblim.wbem.cimxmlEmbObjBuilder";
 
 	/**
-	 * 
+	 *
 	 * If set the type of valueless EmbeddedObjects are mapped to CLASS_T. It should work well
 	 * with OpenPegasus-2.7.0.
-	 * If unset no type mapping is done for valuless EmbeddedObjects.  
-	 * 
+	 * If unset no type mapping is done for valuless EmbeddedObjects.
+	 *
 	 * Type: Boolean
 	 * Default: true
-	 * 
+	 *
 	 */
 	public static final String CIMXML_PARSER_STRICT_EMBOBJ_TYPES = "sblim.wbem.cimxmlParser.strictEmbObjTypes";
 
 	/**
-	 * 
+	 *
 	 * If set to false, the embedded object entity in all requests is in mixed case
 	 * (EmbeddedObject) per DSP0203.  If set to true, the embedded object entity is in
-	 * upper case (EMBEDDEDOBJECT) - this works with some older CIMOMs, such as OpenPegasus 
+	 * upper case (EMBEDDEDOBJECT) - this works with some older CIMOMs, such as OpenPegasus
 	 * 2.6.1 and 2.7.0.
-	 * 
+	 *
 	 * <!ENTITY % EmbeddedObject "EmbeddedObject (object|instance) #IMPLIED">
-	 * 
+	 *
 	 * Type: Boolean
 	 * Recognition: Startup
 	 * Range: true, false
 	 * Default: true
-	 * 
+	 *
 	 */
-	public static final String CIMXML_BUILDER_UPPERCASE_EMBOBJ_ENTITIES = "sblim.wbem.cimxmlBuilder.upperCaseEmbObjEntities";
+	public static final String CIMXML_BUILDER_UPPERCASE_EMBOBJ_ENTITIES =
+		"sblim.wbem.cimxmlBuilder.upperCaseEmbObjEntities";
 
 	/**
-	 * 
+	 *
 	 * If set to true, SSL handshakes are performed after an SSL socket is created by the
 	 * socket factory.  If set to false, handshakes are not performed, which is useful if
 	 * if the handshake has already taken place.
-	 * 
+	 *
 	 * Type: Boolean
 	 * Recognition: Anytime
 	 * Default: true
-	 * 
+	 *
 	 */
 	public static final String PERFORM_SSL_HANDSHAKE = "sblim.wbem.performSslHandshake";
 
 	/**
-	 * 
+	 *
 	 * If set to false, SSL handshakes are not synchronized.  If set to true, SSL handshakes
 	 * are synchronized as a workaround for an IBMJSSE1 problem with thread-safe handshakes.
-	 * 
-	 * Note: This property has no affect unless sblim.wbem.performSslHandshake is set to 
+	 *
+	 * Note: This property has no affect unless sblim.wbem.performSslHandshake is set to
 	 * true.
-	 * 
+	 *
 	 * Type: Boolean
 	 * Recognition: Anytime
 	 * Default: false
-	 * 
+	 *
 	 */
 	public static final String SYNCHRONIZED_SSL_HANDSHAKE = "sblim.wbem.synchronizedSslHandshake";
 
 	/**
-	 * 
-	 * If set to true, socket connections are attempted with the timeout value defined by 
+	 *
+	 * If set to true, socket connections are attempted with the timeout value defined by
 	 * sblim.wbem.socketConnectTimeout.  If set to false, socket connections are attempted
 	 * without a timeout.  Using a timeout for socket connections is the preferred method
-	 * but may introduce intermittent, significant performance impacts during the connection 
-	 * process in Java 5+ (see Sun bug 5092063).   
-	 * 
+	 * but may introduce intermittent, significant performance impacts during the connection
+	 * process in Java 5+ (see Sun bug 5092063).
+	 *
 	 * Type: Boolean
 	 * Recognition: Anytime
 	 * Default: true
-	 * 
+	 *
 	 */
 	public static final String SOCKET_CONNECT_WITH_TIMEOUT = "sblim.wbem.socketConnectWithTimeout";
 
 	/**
-	 * 
+	 *
 	 * The timeout for socket connect requests. A timeout of zero is interpreted
 	 * as infinite timeout.
-	 * 
+	 *
 	 * Note: This property has no effect unless socket connection with timeout is
 	 * enabled (see the sblim.wbem.socketConnectWithTimeout property).
-	 * 
+	 *
 	 * Type: Integer
 	 * Unit: Milliseconds
 	 * Recognition: Anytime
 	 * Range: 0 .. Integer.MAX_VALUE
 	 * Default: 0
-	 * 
+	 *
 	 */
 	public static final String SOCKET_CONNECT_TIMEOUT = "sblim.wbem.socketConnectTimeout";
 
@@ -774,47 +774,47 @@ public interface WBEMConfigurationProperties {
 	public static final String SOCKET_IDLE_TIMEOUT = "sblim.wbem.socketIdleTimeout";
 
 	/**
-	 * 
+	 *
 	 * Turn on/off usage of the default user/password, which can be used
 	 * if the CIMOM requires a "garbage" credential.  If set to false,
 	 * user-supplied credentials will be applied.  If set to true,
 	 * default credentials will be applied when both the user-supplied
 	 * principal and credential are null/empty.
-	 * 
+	 *
 	 * Type: Boolean
 	 * Recognition: Startup
 	 * Default: false
-	 * 
+	 *
 	 */
 	public static final String KEY_CREDENTIALS_DEFAULT_ENABLED = "sblim.wbem.default.authorization.enabled";
 
 	/**
-	 * 
+	 *
 	 * The name of the user for the "garbage" credential.
-	 * 
+	 *
 	 * Note: This property has no effect unless default authorization is
 	 * enabled (see the sblim.wbem.default.authorization.enabled property)
 	 * AND both the user-supplied principal and credential are null/empty.
-	 * 
+	 *
 	 * Type: String
 	 * Recognition: Startup
 	 * Default: "default"
-	 * 
+	 *
 	 */
 	public static final String KEY_DEFAULT_PRINCIPAL = "sblim.wbem.default.principal";
 
 	/**
-	 * 
+	 *
 	 * The credential of the user for the "garbage" credential.
-	 * 
+	 *
 	 * Note: This property has no effect unless default authorization is
 	 * enabled (see the sblim.wbem.default.authorization.enabled property)
 	 * AND both the user-supplied principal and credential are null/empty.
-	 * 
+	 *
 	 * Type: String
 	 * Recognition: Startup
 	 * Default: "default"
-	 * 
+	 *
 	 */
 	public static final String KEY_DEFAULT_CREDENTIAL = "sblim.wbem.default.credential";
 
@@ -942,191 +942,192 @@ public interface WBEMConfigurationProperties {
 	public static final String LISTENER_MAX_QUEUED_EVENTS = "sblim.wbem.listenerMaxQueuedEvents";
 
 	/**
-	 * 
+	 *
 	 * If set to true, reliable indication support is enabled and indications
-	 * are processed accordingly.  If set to false, reliable indication 
+	 * are processed accordingly.  If set to false, reliable indication
 	 * support is disabled and indications are passed directly to listener.
-	 * 
+	 *
 	 * If reliable indication support is enabled, incoming indications are
-	 * handled as documented in DSP1054 which includes queuing unexpected 
-	 * indications, caching all indications for the duration of their sequence 
-	 * identifier lifetime, and logging missing, duplicate and out-of-order 
+	 * handled as documented in DSP1054 which includes queuing unexpected
+	 * indications, caching all indications for the duration of their sequence
+	 * identifier lifetime, and logging missing, duplicate and out-of-order
 	 * indications.
-	 * 
+	 *
 	 * The sequence identifier lifetime is defined as:
 	 *   DeliveryRetryAttempts * DeliveryRetryInterval * 10
 	 * These values can be set by the sblim.wbem.listenerDeliveryRetryAttempts
 	 * and sblim.wbem.listenerDeliveryRetryInterval properties below.
-	 * 
+	 *
 	 * Unexpected indications are queued in either a linked list or a hash
 	 * table based on the sblim.wbem.listenerReliableIndicationHashtableCapacity
-	 * property below.  The linked list is better suited for a small number of 
-	 * listener destinations per WBEMListener while the hash table is better 
+	 * property below.  The linked list is better suited for a small number of
+	 * listener destinations per WBEMListener while the hash table is better
 	 * suited for a large number.
-	 * 
+	 *
 	 * Type: Boolean
 	 * Recognition: On next creation of a WBEMListener
 	 * Default: false
-	 * 
+	 *
 	 */
 	public static final String LISTENER_ENABLE_RELIABLE_INDICATIONS = "sblim.wbem.listenerEnableReliableIndications";
 
 	/**
-	 * 
+	 *
 	 * The default value to use for the CIM_IndicationService DeliveryRetryAttempts
 	 * property.  See DSP1054 for details on reliable indications.
-	 * 
+	 *
 	 * Note: This property has no effect unless reliable indication support is
 	 * enabled.  See the sblim.wbem.listenerEnableReliableIndications property.
-	 * 
+	 *
 	 * Type: Long
 	 * Unit: Count
 	 * Recognition: On next creation of a WBEMListener
 	 * Range: 1 .. 1000
 	 * Default: 3
-	 * 
+	 *
 	 */
 	public static final String LISTENER_DELIVERY_RETRY_ATTEMPTS = "sblim.wbem.listenerDeliveryRetryAttempts";
 
 	/**
-	 * 
+	 *
 	 * The default value to use for the CIM_IndicationService DeliveryRetryInterval
 	 * property.  See DSP1054 for details on reliable indications.
-	 * 
+	 *
 	 * Note: This property has no effect unless reliable indication support is
 	 * enabled.  See the sblim.wbem.listenerEnableReliableIndications property.
-	 * 
+	 *
 	 * Type: Long
 	 * Unit: Seconds
 	 * Recognition: On next creation of a WBEMListener
 	 * Range: 1 .. 86400
 	 * Default: 20
-	 * 
+	 *
 	 */
 	public static final String LISTENER_DELIVERY_RETRY_INTERVAL = "sblim.wbem.listenerDeliveryRetryInterval";
 
 	/**
-	 * 
+	 *
 	 * The default value to use for the reliable indication handler's initial
 	 * hash table capacity.  A value of 0 indicates use a linked list instead.
 	 * Linked lists are better suited for a small number of listener destinations
 	 * per WBEMListener while hash tables are better suited for a large number.
-	 * 
+	 *
 	 * Note: This property has no effect unless reliable indication support is
 	 * enabled.  See the sblim.wbem.listenerEnableReliableIndications property.
-	 * 
+	 *
 	 * Type: Integer
 	 * Unit: Count
 	 * Recognition: On next creation of a WBEMListener
 	 * Range: 0 .. 25000
 	 * Default: 0
-	 * 
+	 *
 	 */
-	public static final String LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY = "sblim.wbem.listenerReliableIndicationHashtableCapacity";
+	public static final String LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY =
+		"sblim.wbem.listenerReliableIndicationHashtableCapacity";
 
 	/**
-	 * 
+	 *
 	 * The filter to use for tracing of incoming indications at the FINE level.
-	 * 
+	 *
 	 * If string is empty, no tracing of incoming indications will occur.  If
 	 * string is not empty, it identifies one or more properties to be included
 	 * in the trace of all incoming indications.  An optional class can be used
 	 * to filter the output to include only those indications that contain the
 	 * substring.  For example, to trace the SequenceContext and SequenceNumber
 	 * properties of all alerts, use the following:
-	 * 
+	 *
 	 *    alert:sequencecontext,sequencenumber
-	 * 
+	 *
 	 * To trace the IndicationTime of all indications, use the following:
-	 * 
+	 *
 	 *    indicationtime
-	 * 
+	 *
 	 * Note: This property has no effect unless tracing is enabled.  See the
 	 * sblim.wbem.traceFileLevel property.
-	 * 
+	 *
 	 * Type: String
 	 * Recognition: On next creation of WBEMListener
 	 * Format: [class:]property[,property]*
-	 * 
+	 *
 	 */
 	public static final String LISTENER_INDICATION_TRACE_FILTER = "sblim.wbem.listenerIndicationTraceFilter";
 
 	/**
-	 * 
+	 *
 	 * If set to true, a property will be added to all indications that identifies
 	 * the sender's IP address.  If set to false, the property will not be added.
-	 * 
+	 *
 	 * The property is a CIMProperty with:
 	 *   name = "SBLIMJCC_SenderIPAddress"
 	 *   data type = CIMDataType.STRING_T
 	 *   value = String returned by InetAddress.getHostAddress() (i.e. 1.2.3.4)
-	 * 
+	 *
 	 * Type: Boolean
 	 * Recognition: On next creation of a WBEMListener
 	 * Default: false
-	 * 
+	 *
 	 */
 	public static final String LISTENER_ADD_SENDER_IP_ADDRESS = "sblim.wbem.listenerAddSenderIPAddress";
 
 	/**
-	 * 
+	 *
 	 * If set to true, numeric string values passed to the java.lang.Double
 	 * constructor or its parseDouble method will be checked to make sure they
 	 * are not in the range that hangs Java 6- (see Sun bug 4421494).  If
 	 * set to false, the string values will not be checked.
-	 * 
+	 *
 	 * Note: This property should only be set to true if running on Java 5 or
 	 * Java 6 prior to update 24.
-	 * 
+	 *
 	 * Type: Boolean
 	 * Recognition: Startup
 	 * Default: true
-	 * 
+	 *
 	 */
 	public static final String VERIFY_JAVA_LANG_DOUBLE_STRINGS = "sblim.wbem.verifyJavaLangDoubleStrings";
 
 	/**
-	 * 
+	 *
 	 * If set to true, numeric key data types in a CIMInstance's CIMObjectPath
 	 * will be synchronized to match those of the corresponding keys within
 	 * the CIMInstance's CIMProperty[].  If set to false, the numeric key data
-	 * types will not be synchronized. 
-	 * 
+	 * types will not be synchronized.
+	 *
 	 * Note: Only numeric key data types in CIMInstances from CIMOM responses
 	 * are synchronized, application calls to the CIMInstance constructor are
 	 * not affected.
-	 * 
+	 *
 	 * Type: Boolean
 	 * Recognition: Startup
 	 * Default: false
-	 * 
+	 *
 	 */
 	public static final String SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES = "sblim.wbem.synchronizeNumericKeyDataTypes";
 
 	/**
-	 * 
+	 *
 	 * If set to true, gzip encoding is enabled.  If set to false, gzip encoding
 	 * is not enabled.  When enabled, outgoing requests include the HTTP header
 	 * "Accept-Encoding: gzip" to indicate to the CIMOM that the client handles
 	 * message bodies compressed with gzip.  If the incoming response includes
 	 * "Content-Encoding: gzip" the message body will be decompressed with gzip
 	 * before being processed.
-	 * 
+	 *
 	 * Note: This property does not affect indications or outgoing requests.
-	 * 
+	 *
 	 * Type: Boolean
 	 * Recognition: Anytime
 	 * Default: false
-	 * 
+	 *
 	 */
 	public static final String ENABLE_GZIP_ENCODING = "sblim.wbem.enableGzipEncoding";
 
 	/**
-	 * 
+	 *
 	 * If set to true, the CIM-XML parser will allow empty LOCALNAMESPACEPATH
 	 * elements in incoming responses.  If set to false, the parser will not
 	 * allow empty LOCALNAMESPACEPATH elements.
-	 * 
+	 *
 	 * Note: Some older CIMOMs sent empty LOCALNAMESPACEPATHs, relying on the
 	 * client to provide the local namespace path.  This is a violation of
 	 * DSP0201, which dictates that LOCALNAMESPACEPATH must contain at least
@@ -1134,14 +1135,15 @@ public interface WBEMConfigurationProperties {
 	 * client can adhere to the CIM-XML specifications.  Set this property to
 	 * true if "LOCALNAMESPACEPATH requires NAMESPACE" exceptions occur while
 	 * interacting with one of these older CIMOMs.
-	 * 
+	 *
 	 * Type: Boolean
 	 * Recognition: Anytime
 	 * Default: false
-	 * 
+	 *
 	 */
-	public static final String CIMXML_PARSER_ALLOW_EMPTY_LOCALNAMESPACEPATH = "sblim.wbem.cimxmlParser.allowEmptyLocalNameSpacePath";
-	
+	public static final String CIMXML_PARSER_ALLOW_EMPTY_LOCALNAMESPACEPATH =
+		"sblim.wbem.cimxmlParser.allowEmptyLocalNameSpacePath";
+
 	/**
 	 * AMMO-863
 	 * 
      
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMListenerSBLIM.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMListenerSBLIM.java
index 66ae31a..9a96ead 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMListenerSBLIM.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/WBEMListenerSBLIM.java
@@ -61,8 +61,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
 import org.metricshub.wbem.javax.wbem.listener.IndicationListener;
+import org.metricshub.wbem.javax.wbem.listener.WBEMListener;
 import org.metricshub.wbem.javax.wbem.listener.WBEMListenerConstants;
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpConnectionHandler;
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpServerConnection;
@@ -70,22 +70,20 @@
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.indications.CIMEventDispatcher;
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.indications.CIMIndicationHandler;
-import org.metricshub.wbem.javax.wbem.listener.WBEMListener;
 
 /**
  * Class WBEMListenerSBLIM is the SBLIM implementation of the WBEMListener
  * interface.
- * 
+ *
  */
 public class WBEMListenerSBLIM implements WBEMListener {
 
 	/**
 	 * The real implementation of a listener that starts a HTTP server and
 	 * processes incoming indications
-	 * 
+	 *
 	 */
 	public class WBEMListenerImpl {
-
 		private EventListener iIndicationListener;
 
 		private HttpServerConnection iConnection;
@@ -96,7 +94,7 @@ public class WBEMListenerImpl {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pLocalAddress
 		 *            The local address to bind the port to. If null the port is
 		 *            bound to all local addresses. For use on multi-homed
@@ -114,9 +112,14 @@ public class WBEMListenerImpl {
 		 *            The configuration.
 		 * @throws IOException
 		 */
-		public WBEMListenerImpl(String pLocalAddress, int pPort, boolean pSSL,
-				EventListener pIndicationListener, Properties pProperties) throws IOException {
-
+		public WBEMListenerImpl(
+			String pLocalAddress,
+			int pPort,
+			boolean pSSL,
+			EventListener pIndicationListener,
+			Properties pProperties
+		)
+			throws IOException {
 			// Merge any properties passed via addListener
 			if (pProperties != null) {
 				for (Enumeration e = pProperties.keys(); e.hasMoreElements();) {
@@ -126,16 +129,20 @@ public WBEMListenerImpl(String pLocalAddress, int pPort, boolean pSSL,
 				}
 			}
 			WBEMConfiguration config = WBEMListenerSBLIM.this.iConfiguration;
-			if (!(pIndicationListener instanceof IndicationListener)
-					&& !(pIndicationListener instanceof IndicationListenerSBLIM)) throw new IllegalArgumentException(
-					"Listener must be instance of IndicationListener or IndicationListenerSBLIM");
+			if (
+				!(pIndicationListener instanceof IndicationListener) &&
+				!(pIndicationListener instanceof IndicationListenerSBLIM)
+			) throw new IllegalArgumentException(
+				"Listener must be instance of IndicationListener or IndicationListenerSBLIM"
+			);
 			this.iIndicationListener = pIndicationListener;
-			CIMEventDispatcher eventDispatcher = new CIMEventDispatcher(this.iIndicationListener,
-					config.getListenerMaxQueuedEvents());
+			CIMEventDispatcher eventDispatcher = new CIMEventDispatcher(
+				this.iIndicationListener,
+				config.getListenerMaxQueuedEvents()
+			);
 			this.iIndicationHandler = new CIMIndicationHandler(eventDispatcher, config);
 			this.iConnectionHandler = new HttpConnectionHandler(this.iIndicationHandler, config);
-			this.iConnection = new HttpServerConnection(this.iConnectionHandler, pLocalAddress,
-					pPort, pSSL, config);
+			this.iConnection = new HttpServerConnection(this.iConnectionHandler, pLocalAddress, pPort, pSSL, config);
 		}
 
 		@Override
@@ -165,27 +172,29 @@ public void stop() {
 
 		/**
 		 * Returns the listener we forward the indications to.
-		 * 
+		 *
 		 * @return The listener.
 		 */
 		public IndicationListener getIndicationListener() {
-			return (this.iIndicationListener instanceof IndicationListener) ? (IndicationListener) this.iIndicationListener
-					: null;
+			return (this.iIndicationListener instanceof IndicationListener)
+				? (IndicationListener) this.iIndicationListener
+				: null;
 		}
 
 		/**
 		 * Returns the listener we forward the indications to.
-		 * 
+		 *
 		 * @return The listener.
 		 */
 		public IndicationListenerSBLIM getIndicationListenerSBLIM() {
-			return (this.iIndicationListener instanceof IndicationListenerSBLIM) ? (IndicationListenerSBLIM) this.iIndicationListener
-					: null;
+			return (this.iIndicationListener instanceof IndicationListenerSBLIM)
+				? (IndicationListenerSBLIM) this.iIndicationListener
+				: null;
 		}
 
 		/**
 		 * Returns the listener port.
-		 * 
+		 *
 		 * @return The listener port.
 		 */
 		public int getListenerPort() {
@@ -194,7 +203,7 @@ public int getListenerPort() {
 
 		/**
 		 * Get the IPs blocked by the listener.
-		 * 
+		 *
 		 * @return The comma-separated list of blocked IPs.
 		 */
 		public String getBlockedIPs() {
@@ -203,7 +212,7 @@ public String getBlockedIPs() {
 
 		/**
 		 * Set the IPs to be blocked by the listener.
-		 * 
+		 *
 		 * @param pIPs
 		 *            The comma-separated list of blocked IPs.
 		 */
@@ -225,29 +234,28 @@ public WBEMListenerSBLIM() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.metricshub.wbem.javax.wbem.listener.WBEMListener#addListener(javax.wbem.listener.
 	 * IndicationListener, int, java.lang.String)
 	 */
-	public int addListener(IndicationListener pListener, int pPort, String pTransport)
-			throws IOException {
+	public int addListener(IndicationListener pListener, int pPort, String pTransport) throws IOException {
 		return addListener((EventListener) pListener, pPort, pTransport, null, null);
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.metricshub.wbem.javax.wbem.listener.WBEMListener#addListener(javax.wbem.listener.
 	 * IndicationListener, int, java.lang.String, java.lang.String)
 	 */
-	public int addListener(IndicationListener pListener, int pPort, String pTransport,
-			String pLocalAddr) throws IOException {
+	public int addListener(IndicationListener pListener, int pPort, String pTransport, String pLocalAddr)
+		throws IOException {
 		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr, null);
 	}
 
 	/**
 	 * Add a new listener using the specified port.
-	 * 
+	 *
 	 * @param pListener
 	 *            The Indication Listener that will be called when an indication
 	 *            is received.
@@ -265,16 +273,20 @@ public int addListener(IndicationListener pListener, int pPort, String pTranspor
 	 * @throws IOException
 	 *             This exception is thrown when binding to pPort fails.
 	 */
-	public int addListener(IndicationListener pListener, int pPort, String pTransport,
-			String pLocalAddr, Properties pConfigurationProperties) throws IOException {
-
-		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr,
-				pConfigurationProperties);
+	public int addListener(
+		IndicationListener pListener,
+		int pPort,
+		String pTransport,
+		String pLocalAddr,
+		Properties pConfigurationProperties
+	)
+		throws IOException {
+		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr, pConfigurationProperties);
 	}
 
 	/**
 	 * Add a new listener using the specified port.
-	 * 
+	 *
 	 * @param pListener
 	 *            The SBLIM Indication Listener that will be called when an
 	 *            indication is received.
@@ -286,14 +298,13 @@ public int addListener(IndicationListener pListener, int pPort, String pTranspor
 	 * @throws IOException
 	 *             This exception is thrown when binding to pPort fails.
 	 */
-	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport)
-			throws IOException {
+	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport) throws IOException {
 		return addListener((EventListener) pListener, pPort, pTransport, null, null);
 	}
 
 	/**
 	 * Add a new listener using the specified port and local address.
-	 * 
+	 *
 	 * @param pListener
 	 *            The SBLIM Indication Listener that will be called when an
 	 *            indication is received.
@@ -309,15 +320,15 @@ public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTra
 	 * @throws IOException
 	 *             This exception is thrown when binding to pPort fails.
 	 */
-	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport,
-			String pLocalAddr) throws IOException {
+	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport, String pLocalAddr)
+		throws IOException {
 		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr, null);
 	}
 
 	/**
 	 * Add a new listener using the specified port, local address and
 	 * properties.
-	 * 
+	 *
 	 * @param pListener
 	 *            The SBLIM Indication Listener that will be called when an
 	 *            indication is received.
@@ -335,18 +346,22 @@ public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTra
 	 * @throws IOException
 	 *             This exception is thrown when binding to pPort fails.
 	 */
-	public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTransport,
-			String pLocalAddr, Properties pConfigurationProperties) throws IOException {
-
-		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr,
-				pConfigurationProperties);
+	public int addListener(
+		IndicationListenerSBLIM pListener,
+		int pPort,
+		String pTransport,
+		String pLocalAddr,
+		Properties pConfigurationProperties
+	)
+		throws IOException {
+		return addListener((EventListener) pListener, pPort, pTransport, pLocalAddr, pConfigurationProperties);
 	}
 
 	/**
 	 * Add a new listener using the specified port, local address and
 	 * properties. This is the worker routine for all public addListener
 	 * methods.
-	 * 
+	 *
 	 * @param pListener
 	 *            The indication listener (IndicationListener or
 	 *            IndicationListenerSBLIM) that will be called when
@@ -365,19 +380,25 @@ public int addListener(IndicationListenerSBLIM pListener, int pPort, String pTra
 	 * @throws IOException
 	 *             This exception is thrown when binding to pPort fails.
 	 */
-	private synchronized int addListener(EventListener pListener, int pPort, String pTransport,
-			String pLocalAddr, Properties pConfigurationProperties) throws IOException {
-
-		if (pPort > 0 && this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new BindException(
-				"Port already in use."); }
+	private synchronized int addListener(
+		EventListener pListener,
+		int pPort,
+		String pTransport,
+		String pLocalAddr,
+		Properties pConfigurationProperties
+	)
+		throws IOException {
+		if (pPort > 0 && this.iPortMap.containsKey(Integer.valueOf(pPort))) {
+			throw new BindException("Port already in use.");
+		}
 		boolean ssl;
-		if (pTransport.equalsIgnoreCase(WBEMConstants.HTTP)) ssl = false;
-		else if (pTransport.equalsIgnoreCase(WBEMConstants.HTTPS)) ssl = true;
-		else throw new IllegalArgumentException("Unknown transport: " + pTransport
-				+ "! Valid values are http and https.");
+		if (pTransport.equalsIgnoreCase(WBEMConstants.HTTP)) ssl = false; else if (
+			pTransport.equalsIgnoreCase(WBEMConstants.HTTPS)
+		) ssl = true; else throw new IllegalArgumentException(
+			"Unknown transport: " + pTransport + "! Valid values are http and https."
+		);
 
-		WBEMListenerImpl listener = new WBEMListenerImpl(pLocalAddr, pPort, ssl, pListener,
-				pConfigurationProperties);
+		WBEMListenerImpl listener = new WBEMListenerImpl(pLocalAddr, pPort, ssl, pListener, pConfigurationProperties);
 		listener.start();
 
 		this.iPortMap.put(Integer.valueOf(listener.getListenerPort()), listener);
@@ -387,14 +408,15 @@ else throw new IllegalArgumentException("Unknown transport: " + pTransport
 
 	/**
 	 * Get the IPs blocked by the listener associated with the specified port.
-	 * 
+	 *
 	 * @param pPort
 	 *            The port.
 	 * @return The comma-separated list of blocked IPs.
 	 */
 	public String getBlockedIPs(int pPort) {
-		if (pPort <= 0 || !this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new IllegalArgumentException(
-				"Port not in use."); }
+		if (pPort <= 0 || !this.iPortMap.containsKey(Integer.valueOf(pPort))) {
+			throw new IllegalArgumentException("Port not in use.");
+		}
 		WBEMListenerImpl listener = this.iPortMap.get(Integer.valueOf(pPort));
 		return listener != null ? listener.getBlockedIPs() : null;
 	}
@@ -425,15 +447,16 @@ public synchronized void removeListener(int pPort) {
 	/**
 	 * Set the IPs to be blocked by the listener associated with the specified
 	 * port.
-	 * 
+	 *
 	 * @param pPort
 	 *            The port.
 	 * @param pIPs
 	 *            The comma-separated list of blocked IPs.
 	 */
 	public void setBlockedIPs(int pPort, String pIPs) {
-		if (pPort <= 0 || !this.iPortMap.containsKey(Integer.valueOf(pPort))) { throw new IllegalArgumentException(
-				"Port not in use."); }
+		if (pPort <= 0 || !this.iPortMap.containsKey(Integer.valueOf(pPort))) {
+			throw new IllegalArgumentException("Port not in use.");
+		}
 		WBEMListenerImpl listener = this.iPortMap.get(Integer.valueOf(pPort));
 		if (listener != null) {
 			listener.setBlockedIPs(pIPs);
@@ -444,14 +467,11 @@ public void setProperty(String pName, String pValue) {
 		if (pName.startsWith("javax.wbem.")) {
 			// Process JSR48 properties
 			if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE)) {
-				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
-						pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.KEYSTORE_PATH, pValue);
 			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE_PASSWORD)) {
-				this.iConfiguration.setDomainProperty(
-						WBEMConfigurationProperties.KEYSTORE_PASSWORD, pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD, pValue);
 			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_TRUSTSTORE)) {
-				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
-						pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, pValue);
 			} else {
 				throw new IllegalArgumentException(pName);
 			}
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java
index b1100e1..54daae7 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/AdvertisementCatalog.java
@@ -23,6 +23,16 @@
 
 package org.metricshub.wbem.sblim.cimclient.discovery;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
 /*-
  * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
  * WBEM Java Client
@@ -44,21 +54,9 @@
  */
 
 import javax.security.auth.Subject;
-
 import org.metricshub.wbem.javax.wbem.client.WBEMClient;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Class AdvertisementCatalog implements a catalog for WBEM service
  * advertisements. In practice we usually have multiple advertisements for a
@@ -67,7 +65,7 @@
  * of this by indexing services by the unique service id and therefore surfacing
  * which advertisements belong to the same service. The application might then
  * choose it's preferred communication mechanism.
- * 
+ *
  * No thread synchronization provided, this is the responsibility of
  *            the caller.
  * @since 2.0.2
@@ -78,19 +76,18 @@ public class AdvertisementCatalog {
 	 * Interface EventListener specifies listener that are called when an
 	 * advertisement is added to or removed from the catalog, expires or is
 	 * renewed.
-	 * 
+	 *
 	 */
 	public static interface EventListener {
-
 		/**
 		 * Called when an advertisement is added to the catalog that has not
 		 * been a member of the catalog before.
-		 * 
+		 *
 		 * @param pEvent
 		 *            The type of the event. One of the constants
 		 *            EVENT_ADD, EVENT_REMOVE, EVENT_EXPIRE, EVENT_RENEW
 		 *            in AdvertisementCatalog.
-		 * 
+		 *
 		 * @param pAdvertisment
 		 *            The added advertisement
 		 */
@@ -100,19 +97,18 @@ public static interface EventListener {
 	/**
 	 * Class AdvertisementDecorator decorates a WBEMAdvertisement with state
 	 * information required by the AdvertisementCatalog class
-	 * 
+	 *
 	 * @pattern Decorator
 	 * iAvertisement!=null
 	 */
 	private static class AdvertisementDecorator implements WBEMServiceAdvertisement {
-
 		private WBEMServiceAdvertisement iAdvertisement;
 
 		private boolean iRefresh = false;
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pAdvertisement
 		 *            The advertisement to decorate
 		 */
@@ -123,7 +119,7 @@ protected AdvertisementDecorator(WBEMServiceAdvertisement pAdvertisement) {
 
 		/**
 		 * Returns advertisement
-		 * 
+		 *
 		 * @return The value of advertisement.
 		 */
 		protected WBEMServiceAdvertisement getAdvertisementXXX() {
@@ -132,7 +128,7 @@ protected WBEMServiceAdvertisement getAdvertisementXXX() {
 
 		/**
 		 * Returns refresh
-		 * 
+		 *
 		 * @return The value of refresh.
 		 */
 		protected boolean isRefresh() {
@@ -141,7 +137,7 @@ protected boolean isRefresh() {
 
 		/**
 		 * Sets advertisement
-		 * 
+		 *
 		 * @param pAdvertisement
 		 *            The new value of advertisement.
 		 */
@@ -151,7 +147,7 @@ protected void setAdvertisement(WBEMServiceAdvertisement pAdvertisement) {
 
 		/**
 		 * Sets refresh
-		 * 
+		 *
 		 * @param pRefresh
 		 *            The new value of refresh.
 		 */
@@ -161,7 +157,7 @@ protected void setRefresh(boolean pRefresh) {
 
 		/*
 		 * (non-Javadoc)
-		 * 
+		 *
 		 * @see java.lang.Object#equals(java.lang.Object)
 		 */
 		@Override
@@ -171,7 +167,7 @@ public boolean equals(Object pObj) {
 
 		/*
 		 * (non-Javadoc)
-		 * 
+		 *
 		 * @see java.lang.Object#hashCode()
 		 */
 		@Override
@@ -280,13 +276,13 @@ public void setExpired(boolean pExpired) {
 	 * Ctor.
 	 */
 	public AdvertisementCatalog() {
-	/**/
+		/**/
 	}
 
 	/**
 	 * Adds a listener for "add" events. The listener will be called whenever a
 	 * advertisement is added to the catalog.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -297,7 +293,7 @@ public void addEventListener(EventListener pListener) {
 	/**
 	 * Adds new advertisements to the catalog. Existing advertisements sharing
 	 * concrete type, url and directory are replaced.
-	 * 
+	 *
 	 * @param pAdvertisements
 	 *            The new advertisements
 	 */
@@ -310,8 +306,7 @@ public void addAdvertisements(WBEMServiceAdvertisement[] pAdvertisements) {
 				WBEMProtocol protocol = makeProtocol(advertisement);
 				String serviceId = advertisement.getAttribute(WBEMServiceAdvertisement.SERVICE_ID);
 				{
-					List innerList = this.iCatalogByDirectory
-							.get(advertisement.getDirectory());
+					List innerList = this.iCatalogByDirectory.get(advertisement.getDirectory());
 					if (innerList == null) {
 						innerList = new ArrayList();
 						this.iCatalogByDirectory.put(advertisement.getDirectory(), innerList);
@@ -331,8 +326,7 @@ public void addAdvertisements(WBEMServiceAdvertisement[] pAdvertisements) {
 					}
 				}
 				{
-					Map innerMap = this.iCatalogById
-							.get(serviceId);
+					Map innerMap = this.iCatalogById.get(serviceId);
 					if (innerMap == null) {
 						innerMap = new HashMap();
 						this.iCatalogById.put(serviceId, innerMap);
@@ -340,8 +334,7 @@ public void addAdvertisements(WBEMServiceAdvertisement[] pAdvertisements) {
 					innerMap.put(protocol, advertisement);
 				}
 			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINE,
-				                                    "Incomplete advertisement for" + url, e);
+				LogAndTraceBroker.getBroker().trace(Level.FINE, "Incomplete advertisement for" + url, e);
 			}
 		}
 	}
@@ -349,7 +342,7 @@ public void addAdvertisements(WBEMServiceAdvertisement[] pAdvertisements) {
 	/**
 	 * Returns the advertisement from the catalog corresponding to a given id
 	 * and with the protocol preferred most.
-	 * 
+	 *
 	 * @param pId
 	 *            The service id
 	 * @param pProtocols
@@ -358,13 +351,16 @@ public void addAdvertisements(WBEMServiceAdvertisement[] pAdvertisements) {
 	 *            protocols this service returns null.
 	 * @return The corresponding advertisement
 	 */
-	public WBEMServiceAdvertisement getAdvertisement(final String pId,
-			final WBEMProtocol[] pProtocols) {
+	public WBEMServiceAdvertisement getAdvertisement(final String pId, final WBEMProtocol[] pProtocols) {
 		Map innerMap = this.iCatalogById.get(pId);
-		if (innerMap == null) { return null; }
+		if (innerMap == null) {
+			return null;
+		}
 		for (int i = 0; i < pProtocols.length; ++i) {
 			WBEMServiceAdvertisement advertisement = innerMap.get(pProtocols[i]);
-			if (advertisement != null) { return advertisement; }
+			if (advertisement != null) {
+				return advertisement;
+			}
 		}
 		return null;
 	}
@@ -372,35 +368,39 @@ public WBEMServiceAdvertisement getAdvertisement(final String pId,
 	/**
 	 * Returns the advertisements from the catalog corresponding to a given
 	 * directory
-	 * 
+	 *
 	 * @param pDirectory
 	 *            The directory service
 	 * @return The corresponding advertisements
 	 */
 	public WBEMServiceAdvertisement[] getAdvertisementsByDirectory(String pDirectory) {
 		List result = this.iCatalogByDirectory.get(pDirectory);
-		return (result != null ? (WBEMServiceAdvertisement[]) result
-				.toArray(new WBEMServiceAdvertisement[result.size()])
-				: new WBEMServiceAdvertisement[] {});
+		return (
+			result != null
+				? (WBEMServiceAdvertisement[]) result.toArray(new WBEMServiceAdvertisement[result.size()])
+				: new WBEMServiceAdvertisement[] {}
+		);
 	}
 
 	/**
 	 * Returns the advertisements from the catalog corresponding to a given id
-	 * 
+	 *
 	 * @param pId
 	 *            The service id
 	 * @return The corresponding advertisements
 	 */
 	public WBEMServiceAdvertisement[] getAdvertisementsById(String pId) {
 		Map innerMap = this.iCatalogById.get(pId);
-		if (innerMap == null) { return null; }
+		if (innerMap == null) {
+			return null;
+		}
 		Collection advertisements = innerMap.values();
 		return advertisements.toArray(new WBEMServiceAdvertisement[advertisements.size()]);
 	}
 
 	/**
 	 * Returns an array of service ids known by this catalog
-	 * 
+	 *
 	 * @return The service ids
 	 */
 	public String[] getKnownIds() {
@@ -412,14 +412,13 @@ public String[] getKnownIds() {
 	 * Refreshes the advertisements from a given directory. All existing
 	 * advertisements from this directory are deleted first before the new ones
 	 * are added.
-	 * 
+	 *
 	 * @param pDirectory
 	 *            The directory services we got the advertisements from
 	 * @param pAdvertisements
 	 *            The advertisements
 	 */
-	public void refreshAdvertisements(final String[] pDirectory,
-			WBEMServiceAdvertisement[] pAdvertisements) {
+	public void refreshAdvertisements(final String[] pDirectory, WBEMServiceAdvertisement[] pAdvertisements) {
 		for (int i = 0; i < pDirectory.length; ++i) {
 			markRefresh(pDirectory[i]);
 		}
@@ -431,7 +430,7 @@ public void refreshAdvertisements(final String[] pDirectory,
 
 	/**
 	 * Removes a listener
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener to remove
 	 */
@@ -441,14 +440,13 @@ public void removeEventListener(EventListener pListener) {
 
 	/**
 	 * Removes the expired advertisements from the catalog.
-	 * 
+	 *
 	 * @param pDirectory
 	 *            When not null only the expired advertisements of
 	 *            the given directory are removed. Otherwise all expired
 	 *            advertisements are removed.
 	 */
 	public void removeExpired(String pDirectory) {
-
 		if (pDirectory == null) {
 			Iterator iter = this.iCatalogByDirectory.keySet().iterator();
 			while (iter.hasNext()) {
@@ -464,8 +462,7 @@ public void removeExpired(String pDirectory) {
 			if (decorator.isExpired()) {
 				iter.remove();
 				notifyEventListeners(EVENT_REMOVE, decorator);
-				Map innerMap = this.iCatalogById
-						.get(decorator.getServiceId());
+				Map innerMap = this.iCatalogById.get(decorator.getServiceId());
 				innerMap.remove(makeProtocol(decorator));
 			}
 		}
@@ -473,15 +470,15 @@ public void removeExpired(String pDirectory) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
 	public String toString() {
 		StringBuffer result = new StringBuffer();
 		result.append("AdvertisementCatalog:");
-		Iterator>> outer = this.iCatalogById
-				.entrySet().iterator();
+		Iterator>> outer =
+			this.iCatalogById.entrySet().iterator();
 		while (outer.hasNext()) {
 			Map.Entry> entry = outer.next();
 			if (entry.getValue() == null) {
@@ -491,8 +488,7 @@ public String toString() {
 			result.append(entry.getKey());
 			result.append("\"");
 			Map innerMap = entry.getValue();
-			Iterator> inner = innerMap.entrySet()
-			                                                                            .iterator();
+			Iterator> inner = innerMap.entrySet().iterator();
 			while (inner.hasNext()) {
 				Map.Entry innerEntry = inner.next();
 				result.append("[");
@@ -506,7 +502,9 @@ public String toString() {
 
 	private void expire(String pDirectory) {
 		List advertisementList = this.iCatalogByDirectory.get(pDirectory);
-		if (advertisementList == null) { return; }
+		if (advertisementList == null) {
+			return;
+		}
 		Iterator iter = advertisementList.iterator();
 		while (iter.hasNext()) {
 			AdvertisementDecorator advertisement = iter.next();
@@ -518,12 +516,16 @@ private void expire(String pDirectory) {
 		}
 	}
 
-	private AdvertisementDecorator findAdvertisement(List pList,
-			WBEMServiceAdvertisement pAdvertisement) {
+	private AdvertisementDecorator findAdvertisement(
+		List pList,
+		WBEMServiceAdvertisement pAdvertisement
+	) {
 		Iterator iter = pList.iterator();
 		while (iter.hasNext()) {
 			AdvertisementDecorator entry = iter.next();
-			if (entry.getServiceUrl().equals(pAdvertisement.getServiceUrl())) { return entry; }
+			if (entry.getServiceUrl().equals(pAdvertisement.getServiceUrl())) {
+				return entry;
+			}
 		}
 		return null;
 	}
@@ -531,8 +533,7 @@ private AdvertisementDecorator findAdvertisement(List pL
 	private WBEMProtocol makeProtocol(WBEMServiceAdvertisement advertisement) {
 		String presentation = advertisement.getAttribute(WBEMServiceAdvertisement.COMM_MECHANISM);
 		if ("OTHER".equalsIgnoreCase(presentation)) {
-			presentation = advertisement
-					.getAttribute(WBEMServiceAdvertisement.OTHER_COMM_MECHN_DESC);
+			presentation = advertisement.getAttribute(WBEMServiceAdvertisement.OTHER_COMM_MECHN_DESC);
 		}
 		String transport = advertisement.getServiceUrl().split(":", 2)[0];
 		WBEMProtocol protocol = new WBEMProtocol(transport, presentation);
@@ -541,7 +542,9 @@ private WBEMProtocol makeProtocol(WBEMServiceAdvertisement advertisement) {
 
 	private void markRefresh(String pDirectory) {
 		List advertisementList = this.iCatalogByDirectory.get(pDirectory);
-		if (advertisementList == null) { return; }
+		if (advertisementList == null) {
+			return;
+		}
 		Iterator iter = advertisementList.iterator();
 		while (iter.hasNext()) {
 			AdvertisementDecorator advertisement = iter.next();
@@ -555,5 +558,4 @@ private void notifyEventListeners(int pEvent, WBEMServiceAdvertisement pAdvertis
 			iter.next().advertisementEvent(pEvent, pAdvertisement);
 		}
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/Discoverer.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/Discoverer.java
index 92f333f..274eaaf 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/Discoverer.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/Discoverer.java
@@ -43,15 +43,14 @@
 
 /**
  * Interface Discoverer offers methodology for discovering WBEM services.
- * 
+ *
  * Implementations SHALL ensure thread-safety
  * @since 2.0.2
  */
 public interface Discoverer {
-
 	/**
 	 * Finds WBEM services using a given list of directory servers
-	 * 
+	 *
 	 * @param pDirectoryUrls
 	 *            An array of directory servers. For SLP this would be a list of
 	 *            DA URLs.
@@ -63,7 +62,7 @@ public interface Discoverer {
 	 * Finds directory services. The semantics of this method might be protocol
 	 * specific. E.g. for SLP this sends a multicast into the local subnet
 	 * looking first for directory agent, second for service agents.
-	 * 
+	 *
 	 * @return A String[] containing the URLs of the directories
 	 * @since 2.0.3
 	 */
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/DiscovererFactory.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/DiscovererFactory.java
index 47b40bc..fa747b0 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/DiscovererFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/DiscovererFactory.java
@@ -41,20 +41,18 @@
  */
 
 import java.util.Locale;
-
-import org.metricshub.wbem.sblim.cimclient.internal.discovery.slp.DiscovererSLP;
 import org.metricshub.wbem.sblim.cimclient.discovery.Discoverer;
+import org.metricshub.wbem.sblim.cimclient.internal.discovery.slp.DiscovererSLP;
 
 /**
  * Class DiscovererFactory is responsible for creating concrete instances of the
  * Discoverer interface.
- * 
+ *
  * This class is thread-safe.
- * 
+ *
  * @since 2.0.2
  */
 public class DiscovererFactory {
-
 	/**
 	 * The Service Location Protocol (SLP)
 	 */
@@ -64,7 +62,7 @@ public class DiscovererFactory {
 
 	/**
 	 * Returns the concrete Discoverer for a given discovery protocol.
-	 * 
+	 *
 	 * @param pProtocol The discovery protocol, e.g. "SLP"
 	 * @return The corresponding discoverer
 	 * @throws IllegalArgumentException On unsupported protocols
@@ -79,7 +77,7 @@ public static Discoverer getDiscoverer(String pProtocol) throws IllegalArgumentE
 
 	/**
 	 * Return an array of all supported discovery protocols
-	 * 
+	 *
 	 * @return The supported protocols
 	 */
 	public static String[] getSupportedProtocols() {
@@ -87,5 +85,6 @@ public static String[] getSupportedProtocols() {
 	}
 
 	private DiscovererFactory() {
-		/**/}
+		/**/
+	}
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMProtocol.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMProtocol.java
index a1f31c7..ebe1956 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMProtocol.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMProtocol.java
@@ -43,19 +43,18 @@
 /**
  * Class WBEMProtocol encapsulates a transport/presentation protocol pair. E.g.
  * "HTTPS/CIM-XML"
- * 
+ *
  * iTransport != null
      iPresentation != null      
  * @since 2.0.2
  */
 public class WBEMProtocol {
-
 	private String iTransport;
 
 	private String iPresentation;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pTransport
 	 *            The transport protocol (e.g. HTTP, HTTPS, RMI)
 	 * @param pPresentation
@@ -68,7 +67,7 @@ public WBEMProtocol(String pTransport, String pPresentation) {
 
 	/**
 	 * Returns the presentation protocol (e.g. CIM-XML)
-	 * 
+	 *
 	 * @return The value.
 	 */
 	public String getPresentation() {
@@ -77,7 +76,7 @@ public String getPresentation() {
 
 	/**
 	 * Sets the presentation protocol
-	 * 
+	 *
 	 * @param pPresentation
 	 *            The new value (e.g. CIM-XML)
 	 */
@@ -87,7 +86,7 @@ public void setPresentation(String pPresentation) {
 
 	/**
 	 * Returns transport protocol (e.g. HTTP)
-	 * 
+	 *
 	 * @return The value.
 	 */
 	public String getTransport() {
@@ -96,7 +95,7 @@ public String getTransport() {
 
 	/**
 	 * Sets the transport protocol
-	 * 
+	 *
 	 * @param pTransport
 	 *            The new value (e.g. HTTP).
 	 */
@@ -106,22 +105,21 @@ public void setTransport(String pTransport) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	@Override
 	public boolean equals(Object pObj) {
 		if (pObj instanceof WBEMProtocol) {
 			WBEMProtocol that = (WBEMProtocol) pObj;
-			return (this.iTransport.equals(that.iTransport))
-					&& (this.iPresentation.equals(that.iPresentation));
+			return (this.iTransport.equals(that.iTransport)) && (this.iPresentation.equals(that.iPresentation));
 		}
 		return false;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#hashCode()
 	 */
 	@Override
@@ -131,12 +129,11 @@ public int hashCode() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
 	public String toString() {
 		return this.iTransport + "/" + this.iPresentation;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java
index 803a842..4fb64aa 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/discovery/WBEMServiceAdvertisement.java
@@ -43,11 +43,9 @@
  */
 
 import java.util.Locale;
-import java.util.Set;
 import java.util.Map.Entry;
-
+import java.util.Set;
 import javax.security.auth.Subject;
-
 import org.metricshub.wbem.javax.wbem.client.WBEMClient;
 
 /**
@@ -58,13 +56,12 @@
  * attribute by name. This design was chosen because the set of attributes might
  * be extended by DMTF and vendor implementations. It's also unclear if upcoming
  * new discovery protocols will have the same set of attributes as SLP.
- * 
+ *
  * Immutable
  * This class is thread-safe
  * @since 2.0.2
  */
 public interface WBEMServiceAdvertisement {
-
 	/**
 	 * template-type (string): The scheme name of the service scheme. The scheme
 	 * name consists of the service type name and an optional naming authority
@@ -249,13 +246,13 @@ public interface WBEMServiceAdvertisement {
 	 * MUST be the CIM_RegisteredProfile.RegisteredName property value when it
 	 * is used as a Dependent in the CIM_SubProfileRequiresProfile association
 	 * for the specified Profile Name (used as the antecedent).
-	 * 
+	 *
 	 */
 	public static final String REG_PROF_SUPP = "RegisteredProfilesSupported";
 
 	/**
 	 * Gets the URL of the directory from which this advertisement was received
-	 * 
+	 *
 	 * @return The directory URL
 	 */
 	public abstract String getDirectory();
@@ -264,28 +261,28 @@ public interface WBEMServiceAdvertisement {
 	 * Returns the concrete service type. E.g. for the SLP advertised service
 	 * service:wbem:https this method would return
 	 * https.
-	 * 
+	 *
 	 * @return The concrete service type
 	 */
 	public abstract String getConcreteServiceType();
 
 	/**
 	 * Returns the interop namespaces
-	 * 
+	 *
 	 * @return The interop namespaces
 	 */
 	public abstract String[] getInteropNamespaces();
 
 	/**
 	 * Returns the service url, e.g. http://9.155.62.79:5988
-	 * 
+	 *
 	 * @return The service url
 	 */
 	public abstract String getServiceUrl();
 
 	/**
 	 * Return the attribute value for a given attribute name
-	 * 
+	 *
 	 * @param pAttributeName
 	 *            The attribute name
 	 * @return The value
@@ -294,7 +291,7 @@ public interface WBEMServiceAdvertisement {
 
 	/**
 	 * Return the set of attributes of this advertisement
-	 * 
+	 *
 	 * @return A Set<Map.Entry<String, String>> containing the name
 	 *         value pairs of the attributes.
 	 */
@@ -302,14 +299,14 @@ public interface WBEMServiceAdvertisement {
 
 	/**
 	 * Returns the service id
-	 * 
+	 *
 	 * @return The service id
 	 */
 	public abstract String getServiceId();
 
 	/**
 	 * Returns the expiration state of the advertisement.
-	 * 
+	 *
 	 * @return true when advertisement is expired.
 	 */
 	public abstract boolean isExpired();
@@ -319,7 +316,7 @@ public interface WBEMServiceAdvertisement {
 	 * application to mark an advertisement as expired, e.g. when it's no longer
 	 * reported by the corresponding directory. Used for this purpose by
 	 * AdvertisementCatalog.
-	 * 
+	 *
 	 * @param pExpired
 	 *            The new value
 	 */
@@ -330,7 +327,7 @@ public interface WBEMServiceAdvertisement {
 	 * that is subject of this advertisement. On every call to this method a new
 	 * client will be created. The client is not stored or cached anywhere in
 	 * this class.
-	 * 
+	 *
 	 * @param pSubject
 	 *            The credential for authenticating with the service
 	 * @param pLocales
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java
index 29a43e9..ee9f515 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMElementSorter.java
@@ -44,7 +44,6 @@
 
 import java.util.Arrays;
 import java.util.Comparator;
-
 import org.metricshub.wbem.javax.cim.CIMElement;
 
 /**
@@ -52,12 +51,11 @@
  * name in them.
  */
 public class CIMElementSorter implements Comparator {
-
 	private static final Comparator COMPARATOR = new CIMElementSorter();
 
 	/**
 	 * Sorts the passed CIMElement array, the passed array is not copied.
-	 * 
+	 *
 	 * @param pArray
 	 *            the array which will be sorted if it's not null
 	 * @return pArray
@@ -65,7 +63,7 @@ public class CIMElementSorter implements Comparator {
 	public static CIMElement[] sort(CIMElement[] pArray) {
 		if (pArray == null || pArray.length == 0) return null;
 		synchronized (pArray) {
-			Arrays.sort(pArray /* , COMPARATOR */);
+			Arrays.sort(pArray/* , COMPARATOR */);
 		}
 		return pArray;
 	}
@@ -73,7 +71,7 @@ public static CIMElement[] sort(CIMElement[] pArray) {
 	/**
 	 * Finds CIMElement, named pName, in pArray which must be a sorted array of
 	 * CIMElements.
-	 * 
+	 *
 	 * @param pArray
 	 * @param pName
 	 * @return the CIMElement if found, otherwise null
@@ -91,7 +89,7 @@ public static CIMElement find(CIMElement[] pArray, String pName) {
 	/**
 	 * Finds the index of CIMElement, named pName, in pArray which must be a
 	 * sorted array of CIMElements.
-	 * 
+	 *
 	 * @param pArray
 	 * @param pName
 	 * @return the index, just like in case of Arrays.binarySearch()
@@ -111,11 +109,8 @@ public int compare(Object pObj0, Object pObj1) {
 		// ebak: handling null objects
 		if (pObj0 == null) return pObj1 == null ? 0 : 1;
 		if (pObj1 == null) return -1;
-		String name0 = pObj0 instanceof CIMElement ? ((CIMElement) pObj0).getName()
-				: (String) pObj0;
-		String name1 = pObj1 instanceof CIMElement ? ((CIMElement) pObj1).getName()
-				: (String) pObj1;
+		String name0 = pObj0 instanceof CIMElement ? ((CIMElement) pObj0).getName() : (String) pObj0;
+		String name1 = pObj1 instanceof CIMElement ? ((CIMElement) pObj1).getName() : (String) pObj1;
 		return name0.compareToIgnoreCase(name1);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMHelper.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMHelper.java
index e048802..5d0af54 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMHelper.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMHelper.java
@@ -48,32 +48,31 @@
 import java.math.BigInteger;
 import java.net.URI;
 import java.net.URISyntaxException;
-
 import org.metricshub.wbem.javax.cim.CIMDataType;
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
-import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
 import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.metricshub.wbem.javax.cim.UnsignedInteger16;
 import org.metricshub.wbem.javax.cim.UnsignedInteger32;
 import org.metricshub.wbem.javax.cim.UnsignedInteger64;
 import org.metricshub.wbem.javax.cim.UnsignedInteger8;
+import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
 
 /**
  * Class CIMHelper provides convenience methods that are missing from the
  * official JSR48 API
- * 
+ *
  */
 public abstract class CIMHelper {
 
 	private CIMHelper() {
-	// no instances
+		// no instances
 	}
 
 	/**
 	 * Creates a URI of a CIMOM from a given CIM object path, adding default
 	 * port if port not parsable.
-	 * 
+	 *
 	 * @param pPath
 	 *            The CIM object path.
 	 * @return The URI.
@@ -94,7 +93,7 @@ public static URI createCimomUri(CIMObjectPath pPath) throws URISyntaxException
 	/**
 	 * Creates a URI of a CIMOM from a given URI, adding default port if port
 	 * not specified.
-	 * 
+	 *
 	 * @param pUri
 	 *            The URI.
 	 * @return The URI.
@@ -112,30 +111,31 @@ public static URI createCimomUri(URI pUri) throws URISyntaxException {
 	}
 
 	private static CIMDataType CIMScalarDataTypes[] = {
-	/* 00 */CIMDataType.UINT8_T,
-	/* 01 */CIMDataType.SINT8_T,
-	/* 02 */CIMDataType.UINT16_T,
-	/* 03 */CIMDataType.SINT16_T,
-	/* 04 */CIMDataType.UINT32_T,
-	/* 05 */CIMDataType.SINT32_T,
-	/* 06 */CIMDataType.UINT64_T,
-	/* 07 */CIMDataType.SINT64_T,
-	/* 08 */CIMDataType.STRING_T,
-	/* 09 */CIMDataType.BOOLEAN_T,
-	/* 10 */CIMDataType.REAL32_T,
-	/* 11 */CIMDataType.REAL64_T,
-	/* 12 */CIMDataType.DATETIME_T,
-	/* 13 */CIMDataType.CHAR16_T,
-	/* 14 */new CIMDataType(""),
-	/* 15 */CIMDataType.OBJECT_T,
-	/* 16 */null,
-	/* 17 */CIMDataType.CLASS_T };
+		/* 00 */CIMDataType.UINT8_T,
+		/* 01 */CIMDataType.SINT8_T,
+		/* 02 */CIMDataType.UINT16_T,
+		/* 03 */CIMDataType.SINT16_T,
+		/* 04 */CIMDataType.UINT32_T,
+		/* 05 */CIMDataType.SINT32_T,
+		/* 06 */CIMDataType.UINT64_T,
+		/* 07 */CIMDataType.SINT64_T,
+		/* 08 */CIMDataType.STRING_T,
+		/* 09 */CIMDataType.BOOLEAN_T,
+		/* 10 */CIMDataType.REAL32_T,
+		/* 11 */CIMDataType.REAL64_T,
+		/* 12 */CIMDataType.DATETIME_T,
+		/* 13 */CIMDataType.CHAR16_T,
+		/* 14 */new CIMDataType(""),
+		/* 15 */CIMDataType.OBJECT_T,
+		/* 16 */null,
+		/* 17 */CIMDataType.CLASS_T
+	};
 
 	/**
 	 * Returns the CIMDataType of a scalar of the specified data type. This
 	 * should be used in lieu of "new CIMDataType(pType)" which is not supported
 	 * by the JSR48 standard.
-	 * 
+	 *
 	 * @param pType
 	 *            Data type.
 	 * @return CIMDataType corresponding to data type.
@@ -146,30 +146,31 @@ public static CIMDataType ScalarDataType(int pType) {
 	}
 
 	private static CIMDataType CIMArrayDataTypes[] = {
-	/* 00 */CIMDataType.UINT8_ARRAY_T,
-	/* 01 */CIMDataType.SINT8_ARRAY_T,
-	/* 02 */CIMDataType.UINT16_ARRAY_T,
-	/* 03 */CIMDataType.SINT16_ARRAY_T,
-	/* 04 */CIMDataType.UINT32_ARRAY_T,
-	/* 05 */CIMDataType.SINT32_ARRAY_T,
-	/* 06 */CIMDataType.UINT64_ARRAY_T,
-	/* 07 */CIMDataType.SINT64_ARRAY_T,
-	/* 08 */CIMDataType.STRING_ARRAY_T,
-	/* 09 */CIMDataType.BOOLEAN_ARRAY_T,
-	/* 10 */CIMDataType.REAL32_ARRAY_T,
-	/* 11 */CIMDataType.REAL64_ARRAY_T,
-	/* 12 */CIMDataType.DATETIME_ARRAY_T,
-	/* 13 */CIMDataType.CHAR16_ARRAY_T,
-	/* 14 */new CIMDataType("", 0),
-	/* 15 */CIMDataType.OBJECT_ARRAY_T,
-	/* 16 */null,
-	/* 17 */CIMDataType.CLASS_ARRAY_T };
+		/* 00 */CIMDataType.UINT8_ARRAY_T,
+		/* 01 */CIMDataType.SINT8_ARRAY_T,
+		/* 02 */CIMDataType.UINT16_ARRAY_T,
+		/* 03 */CIMDataType.SINT16_ARRAY_T,
+		/* 04 */CIMDataType.UINT32_ARRAY_T,
+		/* 05 */CIMDataType.SINT32_ARRAY_T,
+		/* 06 */CIMDataType.UINT64_ARRAY_T,
+		/* 07 */CIMDataType.SINT64_ARRAY_T,
+		/* 08 */CIMDataType.STRING_ARRAY_T,
+		/* 09 */CIMDataType.BOOLEAN_ARRAY_T,
+		/* 10 */CIMDataType.REAL32_ARRAY_T,
+		/* 11 */CIMDataType.REAL64_ARRAY_T,
+		/* 12 */CIMDataType.DATETIME_ARRAY_T,
+		/* 13 */CIMDataType.CHAR16_ARRAY_T,
+		/* 14 */new CIMDataType("", 0),
+		/* 15 */CIMDataType.OBJECT_ARRAY_T,
+		/* 16 */null,
+		/* 17 */CIMDataType.CLASS_ARRAY_T
+	};
 
 	/**
 	 * Returns the CIMDataType of an unbounded array of the specified data type.
 	 * This should be used in lieu of "new CIMDataType(pType,0)" which is not
 	 * supported by the JSR48 standard.
-	 * 
+	 *
 	 * @param pType
 	 *            Data type.
 	 * @return CIMDataType corresponding to data type.
@@ -184,7 +185,7 @@ public static CIMDataType UnboundedArrayDataType(int pType) {
 	 * CIMInstance where the data types of all numeric keys in the
 	 * CIMObjectPath match those of the corresponding keys within
 	 * the CIMProperty[].
-	 * 
+	 *
 	 * The need for this conversion mechanism arises from a deficiency in the
 	 * CIM-XML specs, where the TYPE (sint8, uint8, etc.) is required for
 	 * PROPERTY but not for KEYVALUE. If a CIMOM sends a KEYVALUE of
@@ -192,7 +193,7 @@ public static CIMDataType UnboundedArrayDataType(int pType) {
 	 * sint64, uint64 or real64. This can cause problems (i.e.
 	 * ClassCastException) down the line if the TYPE of the corresponding
 	 * PROPERTY is different.
-	 * 
+	 *
 	 * @param pObjectPath
 	 *            Instance object path.
 	 * @param pProps
@@ -200,7 +201,9 @@ public static CIMDataType UnboundedArrayDataType(int pType) {
 	 * @return CIMInstance with numeric key data types synchronized.
 	 */
 	public static CIMInstance CIMInstanceWithSynchonizedNumericKeyDataTypes(
-			CIMObjectPath pObjectPath, CIMProperty[] pProps) {
+		CIMObjectPath pObjectPath,
+		CIMProperty[] pProps
+	) {
 		CIMInstance inst = new CIMInstance(pObjectPath, pProps);
 		CIMProperty[] oldKeys = inst.getKeys();
 		CIMProperty[] newKeys = new CIMProperty[oldKeys.length];
@@ -209,21 +212,43 @@ public static CIMInstance CIMInstanceWithSynchonizedNumericKeyDataTypes(
 		for (int i = 0; i < oldKeys.length; i++) {
 			CIMDataType oldType = oldKeys[i].getDataType();
 			CIMProperty prop = inst.getProperty(oldKeys[i].getName());
-			if (oldType != null && prop != null && prop.getDataType() != null
-					&& !prop.getDataType().equals(oldType) && isNumericObject(oldType)
-					&& isNumericObject(prop.getDataType())) {
+			if (
+				oldType != null &&
+				prop != null &&
+				prop.getDataType() != null &&
+				!prop.getDataType().equals(oldType) &&
+				isNumericObject(oldType) &&
+				isNumericObject(prop.getDataType())
+			) {
 				update = true;
-				newKeys[i] = new CIMProperty(oldKeys[i].getName(), prop.getDataType(),
+				newKeys[i] =
+					new CIMProperty(
+						oldKeys[i].getName(),
+						prop.getDataType(),
 						translateNumericObject(oldKeys[i].getValue(), oldType, prop.getDataType()),
-						oldKeys[i].isKey(), oldKeys[i].isPropagated(), oldKeys[i].getOriginClass());
+						oldKeys[i].isKey(),
+						oldKeys[i].isPropagated(),
+						oldKeys[i].getOriginClass()
+					);
 			} else {
 				newKeys[i] = oldKeys[i];
 			}
 		}
 
-		return (update ? inst.deriveInstance(new CIMObjectPath(pObjectPath.getScheme(), pObjectPath
-				.getHost(), pObjectPath.getPort(), pObjectPath.getNamespace(), pObjectPath
-				.getObjectName(), newKeys)) : inst);
+		return (
+			update
+				? inst.deriveInstance(
+					new CIMObjectPath(
+						pObjectPath.getScheme(),
+						pObjectPath.getHost(),
+						pObjectPath.getPort(),
+						pObjectPath.getNamespace(),
+						pObjectPath.getObjectName(),
+						newKeys
+					)
+				)
+				: inst
+		);
 	}
 
 	private static boolean isNumericObject(CIMDataType type) {
@@ -243,8 +268,7 @@ private static boolean isNumericObject(CIMDataType type) {
 		return false;
 	}
 
-	private static Object translateNumericObject(Object oldValue, CIMDataType oldType,
-			CIMDataType newType) {
+	private static Object translateNumericObject(Object oldValue, CIMDataType oldType, CIMDataType newType) {
 		if (oldValue == null) return null;
 
 		int from = oldType.getType(), to = newType.getType();
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java
index 4413836..9cf6c06 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMInstanceBuilder.java
@@ -46,7 +46,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.cim.CIMProperty;
 
@@ -60,23 +59,21 @@
  * ( VALUE.NAMEDINSTANCE->INSTANCE->PROPERTY* )
      
  * The implementation merges the properties from both params.
      
  * From CIMObjectPath's keys only the type and value information is considered.
      
- * 
+ *
  */
 public class CIMInstanceBuilder {
-
 	private CIMProperty[] iProperties;
 
 	private static final Object[] EMPTY_RPOP_A = new CIMProperty[0];
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pPath
 	 * @param pProps
 	 * @throws IllegalArgumentException
 	 */
-	public CIMInstanceBuilder(CIMObjectPath pPath, CIMProperty[] pProps)
-			throws IllegalArgumentException {
+	public CIMInstanceBuilder(CIMObjectPath pPath, CIMProperty[] pProps) throws IllegalArgumentException {
 		this.iProperties = pProps != null ? pProps : new CIMProperty[0];
 		CIMElementSorter.sort(this.iProperties);
 		addPathKeys(pPath);
@@ -84,7 +81,7 @@ public CIMInstanceBuilder(CIMObjectPath pPath, CIMProperty[] pProps)
 
 	/**
 	 * Extends the keys of the passed CIMObjectPath.
-	 * 
+	 *
 	 * @param pPath
 	 * @return the new CIMObjectPath
 	 */
@@ -99,13 +96,19 @@ public CIMObjectPath setKeys(CIMObjectPath pPath) {
 		 * CIMObjectPath( String scheme, String host, String port, String
 		 * namespace, String objectName, CIMProperty[] keys )
 		 */
-		return new CIMObjectPath(pPath.getScheme(), pPath.getHost(), pPath.getPort(), pPath
-				.getNamespace(), pPath.getObjectName(), (CIMProperty[]) keys.toArray(EMPTY_RPOP_A));
+		return new CIMObjectPath(
+			pPath.getScheme(),
+			pPath.getHost(),
+			pPath.getPort(),
+			pPath.getNamespace(),
+			pPath.getObjectName(),
+			(CIMProperty[]) keys.toArray(EMPTY_RPOP_A)
+		);
 	}
 
 	/**
 	 * getAllPropertis
-	 * 
+	 *
 	 * @return all properties in an ordered way
 	 */
 	public CIMProperty[] getAllPropertis() {
@@ -122,8 +125,7 @@ private void addPathKeys(CIMObjectPath pPath) throws IllegalArgumentException {
 				CIMProperty[] newArray = new CIMProperty[this.iProperties.length + 1];
 				System.arraycopy(this.iProperties, 0, newArray, 0, pos);
 				newArray[pos] = key;
-				System.arraycopy(this.iProperties, pos, newArray, pos + 1, this.iProperties.length
-						- pos);
+				System.arraycopy(this.iProperties, pos, newArray, pos + 1, this.iProperties.length - pos);
 				this.iProperties = newArray;
 			} else {
 				CIMProperty prop = this.iProperties[pos];
@@ -134,10 +136,15 @@ private void addPathKeys(CIMObjectPath pPath) throws IllegalArgumentException {
 	}
 
 	private static CIMProperty mkKey(CIMProperty pProp) {
-		return new CIMProperty(pProp.getName(), pProp.getDataType(), pProp.getValue(),
-				true, pProp.isPropagated(), pProp.getOriginClass());
+		return new CIMProperty(
+			pProp.getName(),
+			pProp.getDataType(),
+			pProp.getValue(),
+			true,
+			pProp.isPropagated(),
+			pProp.getOriginClass()
+		);
 	}
-
 	/*
 	 * private static void typeAndValueCheck(CIMProperty pPathProp, CIMProperty
 	 * pArrayProp) throws IllegalArgumentException { CIMDataType pType =
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMOctetString.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMOctetString.java
index f75d9a3..9e8f891 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMOctetString.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMOctetString.java
@@ -62,7 +62,6 @@
  * representations in common.
  */
 public class CIMOctetString {
-
 	private UnsignedInteger8 iBytes[];
 
 	private String iASCIIString;
@@ -75,7 +74,7 @@ public class CIMOctetString {
 
 	/**
 	 * Constructs a CIMOctetString from the given byte array.
-	 * 
+	 *
 	 * @param pBytes
 	 *            Byte array representation of octet string.
 	 * @throws IllegalArgumentException
@@ -83,37 +82,40 @@ public class CIMOctetString {
 	public CIMOctetString(UnsignedInteger8 pBytes[]) throws IllegalArgumentException {
 		// Minimum (empty) byte array is { 0x00 0x00 0x00 0x04 }
 		if (pBytes == null || pBytes.length < 4) throw new IllegalArgumentException(
-				"Array of bytes must contain at least four bytes");
+			"Array of bytes must contain at least four bytes"
+		);
 
 		// Verify there are no null entries in byte array
-		for (int i = pBytes.length - 1; i >= 0; i--)
-			if (pBytes[i] == null) throw new IllegalArgumentException(
-					"Array of bytes must not contain any null bytes");
+		for (int i = pBytes.length - 1; i >= 0; i--) if (pBytes[i] == null) throw new IllegalArgumentException(
+			"Array of bytes must not contain any null bytes"
+		);
 
 		// Calculate length
-		this.iLength = pBytes[3].byteValue() + (pBytes[2].byteValue() * 0x100)
-				+ (pBytes[1].byteValue() * 0x10000) + (pBytes[0].byteValue() * 0x1000000);
+		this.iLength =
+			pBytes[3].byteValue() +
+			(pBytes[2].byteValue() * 0x100) +
+			(pBytes[1].byteValue() * 0x10000) +
+			(pBytes[0].byteValue() * 0x1000000);
 
 		// Verify calculated length matches actual length
 		if (this.iLength != pBytes.length) throw new IllegalArgumentException(
-				"Array of bytes contains invalid length: found " + this.iLength + ", expected "
-						+ pBytes.length);
+			"Array of bytes contains invalid length: found " + this.iLength + ", expected " + pBytes.length
+		);
 
 		// Save byte array in new object
 		this.iBytes = new UnsignedInteger8[this.iLength];
-		for (int i = this.iLength - 1; i >= 0; i--)
-			this.iBytes[i] = pBytes[i];
+		for (int i = this.iLength - 1; i >= 0; i--) this.iBytes[i] = pBytes[i];
 	}
 
 	/**
 	 * Constructs a CIMOctetString from the given string.
-	 * 
+	 *
 	 * @param pString
 	 *            String representation of octet string.
 	 * @param pIsHex
 	 *            true if string is hexadecimal string,
 	 *            false if string is ASCII string.
-	 * 
+	 *
 	 * @throws IllegalArgumentException
 	 */
 	public CIMOctetString(String pString, boolean pIsHex) throws IllegalArgumentException {
@@ -122,32 +124,38 @@ public CIMOctetString(String pString, boolean pIsHex) throws IllegalArgumentExce
 		if (pIsHex) {
 			// Minimum (empty) hexadecimal string is "0x00000004"
 			if (pString.length() < 10) throw new IllegalArgumentException(
-					"Hexadecimal string must contain \"0x\" and at least four pairs of hex digits");
+				"Hexadecimal string must contain \"0x\" and at least four pairs of hex digits"
+			);
 
 			// Verify hexadecimal string starts with "0x"
 			if (pString.charAt(0) != '0' || pString.charAt(1) != 'x') throw new IllegalArgumentException(
-					"Hexadecimal string must begin with \"0x\"");
+				"Hexadecimal string must begin with \"0x\""
+			);
 
 			// Calculate length
 			try {
 				this.iLength = Integer.parseInt(pString.substring(2, 10), 16);
 			} catch (NumberFormatException e) {
-				throw new IllegalArgumentException(
-						"Hexadecimal string length could not be parsed: " + e.toString());
+				throw new IllegalArgumentException("Hexadecimal string length could not be parsed: " + e.toString());
 			}
 
 			// Verify calculated length matches actual length
 			if ((this.iLength * 2) + 2 != pString.length()) throw new IllegalArgumentException(
-					"Hexadecimal string contains invalid length: found " + this.iLength
-							+ ", expected " + ((pString.length() - 2 / 2)));
+				"Hexadecimal string contains invalid length: found " +
+				this.iLength +
+				", expected " +
+				((pString.length() - 2 / 2))
+			);
 
 			// Verify remainder of hexadecimal string contains only hexadecimal
 			// digits
 			for (int i = pString.length() - 1; i >= 10; i--) {
 				char ch = pString.charAt(i);
-				if (!((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'))) throw new IllegalArgumentException(
-						"Hexadecimal string could not be parsed, invalid character \'" + ch
-								+ "\' at index " + i);
+				if (
+					!((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'))
+				) throw new IllegalArgumentException(
+					"Hexadecimal string could not be parsed, invalid character \'" + ch + "\' at index " + i
+				);
 			}
 
 			// Save hexadecimal string in new object
@@ -169,10 +177,10 @@ public CIMOctetString(String pString, boolean pIsHex) throws IllegalArgumentExce
 	 * are equal. If the octet strings have no representations in common, this
 	 * method will build the missing one, starting with byte array and then
 	 * hexadecmial string.
-	 * 
+	 *
 	 * NOTE: The ASCII string representation is only considered if both octet
 	 * strings were constructed with an ASCII string.
-	 * 
+	 *
 	 * @param pObj
 	 *            The object to be compared a CIM element.
 	 * @return true if the specified CIM octet string equals this
@@ -191,8 +199,9 @@ public synchronized boolean equals(Object pObj) {
 
 		// Verify byte arrays match if both non-null
 		if (this.iBytes != null && that.iBytes != null) {
-			for (int i = this.iLength - 1; i >= 0; i--)
-				if (this.iBytes[i].byteValue() != that.iBytes[i].byteValue()) return false;
+			for (int i = this.iLength - 1; i >= 0; i--) if (
+				this.iBytes[i].byteValue() != that.iBytes[i].byteValue()
+			) return false;
 			numCompares++;
 		}
 
@@ -203,8 +212,7 @@ public synchronized boolean equals(Object pObj) {
 		}
 
 		// Verify ASCII strings match if both non-null
-		if (this.iASCIIString != null && that.iASCIIString != null
-				&& this.iReplacementChar == that.iReplacementChar) {
+		if (this.iASCIIString != null && that.iASCIIString != null && this.iReplacementChar == that.iReplacementChar) {
 			if (!this.iASCIIString.equalsIgnoreCase(that.iASCIIString)) return false;
 			numCompares++;
 		}
@@ -218,8 +226,9 @@ public synchronized boolean equals(Object pObj) {
 		if (this.iBytes != null && that.iBytes == null) {
 			that.getBytes();
 			if (this.iBytes != null && that.iBytes != null) {
-				for (int i = this.iLength - 1; i >= 0; i--)
-					if (this.iBytes[i].byteValue() != that.iBytes[i].byteValue()) return false;
+				for (int i = this.iLength - 1; i >= 0; i--) if (
+					this.iBytes[i].byteValue() != that.iBytes[i].byteValue()
+				) return false;
 				numCompares++;
 			}
 		}
@@ -230,8 +239,9 @@ public synchronized boolean equals(Object pObj) {
 		if (this.iBytes == null && that.iBytes != null) {
 			getBytes();
 			if (this.iBytes != null && that.iBytes != null) {
-				for (int i = this.iLength - 1; i >= 0; i--)
-					if (this.iBytes[i].byteValue() != that.iBytes[i].byteValue()) return false;
+				for (int i = this.iLength - 1; i >= 0; i--) if (
+					this.iBytes[i].byteValue() != that.iBytes[i].byteValue()
+				) return false;
 				numCompares++;
 			}
 		}
@@ -269,7 +279,7 @@ public synchronized boolean equals(Object pObj) {
 	 * characters replaced by pReplacementChar. If the ASCII string
 	 * has not yet been created, it is created from the byte array or
 	 * hexadecimal string.
-	 * 
+	 *
 	 * @param pReplacementChar
 	 *            Replacement character for non-printable characters which must
 	 *            be between 0x20 and 0x7E, inclusive.
@@ -281,7 +291,8 @@ public synchronized String getASCIIString(char pReplacementChar) {
 
 		// Verify replacement character is printable
 		if (pReplacementChar <= 0x1F || pReplacementChar >= 0x7F) throw new IllegalArgumentException(
-				"Replacement character not printable");
+			"Replacement character not printable"
+		);
 
 		// If we already did this once, return previous string
 		if (this.iASCIIString != null && this.iReplacementChar == pReplacementChar) return this.iASCIIString;
@@ -291,14 +302,12 @@ public synchronized String getASCIIString(char pReplacementChar) {
 		if (this.iBytes != null) {
 			for (int i = 4; i < this.iBytes.length; i++) {
 				char ch = (char) this.iBytes[i].byteValue();
-				if (ch <= 0x1F || ch >= 0x7F) str.append(pReplacementChar);
-				else str.append(ch);
+				if (ch <= 0x1F || ch >= 0x7F) str.append(pReplacementChar); else str.append(ch);
 			}
 		} else /* (this.iHexString != null) */{
 			for (int i = 10; i < this.iHexString.length(); i += 2) {
 				char ch = (char) Integer.parseInt(this.iHexString.substring(i, i + 2), 16);
-				if (ch <= 0x1F || ch >= 0x7F) str.append(pReplacementChar);
-				else str.append(ch);
+				if (ch <= 0x1F || ch >= 0x7F) str.append(pReplacementChar); else str.append(ch);
 			}
 		}
 
@@ -314,7 +323,7 @@ public synchronized String getASCIIString(char pReplacementChar) {
 	 * Returns byte array representation of octet string. If the byte array has
 	 * not yet been created, it is created from the hexadecimal string or ASCII
 	 * string.
-	 * 
+	 *
 	 * @return Byte array representation of octet string.
 	 */
 	public synchronized UnsignedInteger8[] getBytes() {
@@ -333,7 +342,7 @@ public synchronized UnsignedInteger8[] getBytes() {
 	 * Returns hexadecimal string representation of octet string. If the
 	 * hexadecimal string has not yet been created, it is created from the byte
 	 * array or ASCII string.
-	 * 
+	 *
 	 * @return Hexadecimal string representation of octet string.
 	 */
 	public synchronized String getHexString() {
@@ -350,7 +359,7 @@ public synchronized String getHexString() {
 
 	/**
 	 * Returns hash code value for octet string.
-	 * 
+	 *
 	 * @return Hash code value for octet string.
 	 */
 	@Override
@@ -361,7 +370,7 @@ public int hashCode() {
 	/**
 	 * Returns length of octet string, where length is number of octets plus
 	 * four.
-	 * 
+	 *
 	 * @return Length of octet string.
 	 */
 	public int length() {
@@ -370,7 +379,7 @@ public int length() {
 
 	/**
 	 * Returns string representation of octet string.
-	 * 
+	 *
 	 * @return String representation of octet string.
 	 */
 	@Override
@@ -384,8 +393,7 @@ private void convertBytesToHexString() {
 
 		// Append length
 		String len = Integer.toHexString(this.iLength);
-		for (int i = 8 - len.length(); i > 0; i--)
-			str.append('0');
+		for (int i = 8 - len.length(); i > 0; i--) str.append('0');
 		str.append(len);
 
 		// Append string
@@ -397,7 +405,6 @@ private void convertBytesToHexString() {
 
 		// Save hexadecimal string in new object
 		this.iHexString = new String(str);
-
 		// debug("convertBytesToHexString: from {" + toBytesString() + "} to \""
 		// + this.iHexString + "\"");
 	}
@@ -412,12 +419,10 @@ private void convertHexStringToBytes() {
 			try {
 				s = Short.parseShort(this.iHexString.substring(idxStr, idxStr + 2), 16);
 			} catch (NumberFormatException e) {
-				throw new IllegalArgumentException("Hex string length could not be parsed: "
-						+ e.toString());
+				throw new IllegalArgumentException("Hex string length could not be parsed: " + e.toString());
 			}
 			this.iBytes[idxByte] = new UnsignedInteger8(s);
 		}
-
 		// debug("convertHexStringToBytes: from \"" + this.iHexString +
 		// "\" to {" + toBytesString() + "}");
 	}
@@ -433,9 +438,8 @@ private void convertASCIIStringToBytes() {
 		this.iBytes[3] = new UnsignedInteger8((short) (this.iLength & 0xFF));
 
 		// Convert each character in ASCII string to byte
-		for (int idxStr = 0, idxByte = 4; idxStr < this.iASCIIString.length(); idxStr++, idxByte++)
-			this.iBytes[idxByte] = new UnsignedInteger8((short) (this.iASCIIString.charAt(idxStr)));
-
+		for (int idxStr = 0, idxByte = 4; idxStr < this.iASCIIString.length(); idxStr++, idxByte++) this.iBytes[idxByte] =
+			new UnsignedInteger8((short) (this.iASCIIString.charAt(idxStr)));
 		// debug("convertASCIIStringToBytes: from \"" + this.iASCIIString +
 		// "\" to {" + toBytesString() + "}");
 	}
@@ -446,8 +450,7 @@ private void convertASCIIStringToHexString() {
 
 		// Append length
 		String len = Integer.toHexString(this.iLength);
-		for (int i = 8 - len.length(); i > 0; i--)
-			str.append('0');
+		for (int i = 8 - len.length(); i > 0; i--) str.append('0');
 		str.append(len);
 
 		// Append string
@@ -459,11 +462,9 @@ private void convertASCIIStringToHexString() {
 
 		// Save hexadecimal string in new object
 		this.iHexString = new String(str);
-
 		// debug("convertASCIIStringToHexString: from \"" + this.iASCIIString +
 		// "\" to \"" + this.iHexString + "\"");
 	}
-
 	// private String toBytesString() {
 	// StringBuilder str = new StringBuilder();
 	//
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java
index eefe45c..932649a 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMQualifiedElementInterfaceImpl.java
@@ -55,18 +55,16 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
-
 import org.metricshub.wbem.javax.cim.CIMDataType;
-import org.metricshub.wbem.javax.cim.CIMQualifier;
 import org.metricshub.wbem.javax.cim.CIMFlavor;
 import org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface;
+import org.metricshub.wbem.javax.cim.CIMQualifier;
 
 /**
  * Class CIMQualifiedElementInterfaceImpl is responsible for implementing the
  * functionality of javax.cim.CIMQualifiedElementInterface
  */
 public class CIMQualifiedElementInterfaceImpl implements CIMQualifiedElementInterface, Serializable {
-
 	/**
 	 * serialVersionUID
 	 */
@@ -78,17 +76,25 @@ public class CIMQualifiedElementInterfaceImpl implements CIMQualifiedElementInte
 
 	private boolean iEmbeddedObject;
 
-	private static final CIMQualifier KEY = new CIMQualifier("Key",
-			CIMDataType.BOOLEAN_T, Boolean.TRUE, CIMFlavor.DISABLEOVERRIDE);
+	private static final CIMQualifier KEY = new CIMQualifier(
+		"Key",
+		CIMDataType.BOOLEAN_T,
+		Boolean.TRUE,
+		CIMFlavor.DISABLEOVERRIDE
+	);
 
 	private static final CIMQualifier ASSOCIATION = new CIMQualifier(
-			"Association", CIMDataType.BOOLEAN_T, Boolean.TRUE, CIMFlavor.DISABLEOVERRIDE);
+		"Association",
+		CIMDataType.BOOLEAN_T,
+		Boolean.TRUE,
+		CIMFlavor.DISABLEOVERRIDE
+	);
 
 	private static final CIMQualifier[] EMPTY_QA = new CIMQualifier[0];
 
 	/**
 	 * Ctor. This constructor doesn't modify the passed qualifier list.
-	 * 
+	 *
 	 * @param pQualifiers
 	 */
 	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers) {
@@ -98,7 +104,7 @@ public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers) {
 	/**
 	 * Ctor. This constructor modifies the qualifier list according to the
 	 * pIsKeyed flag.
-	 * 
+	 *
 	 * @param pQualifiers
 	 * @param pIsKeyed
 	 */
@@ -110,13 +116,12 @@ public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean p
 	 * Ctor. This constructor is able to not remove the EmbeddedObject
 	 * qualifier. It is useful for the XML parser to parse EmbeddedObject
 	 * qualified elements without values.
-	 * 
+	 *
 	 * @param pQualifiers
 	 * @param pIsKeyed
 	 * @param pKeepEmbObj
 	 */
-	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean pIsKeyed,
-			boolean pKeepEmbObj) {
+	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean pIsKeyed, boolean pKeepEmbObj) {
 		this(pQualifiers, pIsKeyed, pKeepEmbObj, false);
 	}
 
@@ -125,14 +130,18 @@ public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean p
 	 * qualifier. It is useful for the XML parser to parse EmbeddedObject
 	 * qualified elements without values. It also adds or removes the
 	 * Association qualifier depending on the value of pIsAssociation.
-	 * 
+	 *
 	 * @param pQualifiers
 	 * @param pIsKeyed
 	 * @param pKeepEmbObj
 	 * @param pIsAssociation
 	 */
-	public CIMQualifiedElementInterfaceImpl(CIMQualifier[] pQualifiers, boolean pIsKeyed,
-			boolean pKeepEmbObj, boolean pIsAssociation) {
+	public CIMQualifiedElementInterfaceImpl(
+		CIMQualifier[] pQualifiers,
+		boolean pIsKeyed,
+		boolean pKeepEmbObj,
+		boolean pIsAssociation
+	) {
 		if (pKeepEmbObj) {
 			this.iQualis = (CIMQualifier[]) CIMElementSorter.sort(pQualifiers);
 			this.iEmbeddedObject = CIMElementSorter.findIdx(this.iQualis, "EmbeddedObject") >= 0;
@@ -164,7 +173,7 @@ public int hashCode() {
 	/**
 	 * Sets the Qualifiers. If there is an EmbeddedObject qualifier,
 	 * corresponding flag is set.
-	 * 
+	 *
 	 * @param pQualiA
 	 */
 	private void setQualis(CIMQualifier[] pQualiA) {
@@ -182,7 +191,7 @@ private void setQualis(CIMQualifier[] pQualiA) {
 	 * if pValue is false and boolean qualifier exists it is removed.
      
 	 * if pValue is true and boolean qualifier exists, it's value is changed to
 	 * true, if boolean qualifier doesn't exist it is added.
-	 * 
+	 *
 	 * @param pQuali
 	 * @param pValue
 	 */
@@ -210,22 +219,18 @@ private void insertQuali(CIMQualifier pQuali, int idx) {
 		int origLength = this.iQualis == null ? 0 : this.iQualis.length;
 		CIMQualifier[] qualis = new CIMQualifier[origLength + 1];
 		int srcIdx = 0, dstIdx = 0;
-		while (srcIdx < idx)
-			qualis[dstIdx++] = this.iQualis[srcIdx++];
+		while (srcIdx < idx) qualis[dstIdx++] = this.iQualis[srcIdx++];
 		qualis[dstIdx++] = pQuali;
-		while (srcIdx < origLength)
-			qualis[dstIdx++] = this.iQualis[srcIdx++];
+		while (srcIdx < origLength) qualis[dstIdx++] = this.iQualis[srcIdx++];
 		this.iQualis = qualis;
 	}
 
 	private void removeQuali(int idx) {
 		CIMQualifier[] qualis = new CIMQualifier[this.iQualis.length - 1];
 		int srcIdx = 0, dstIdx = 0;
-		while (srcIdx < idx)
-			qualis[dstIdx++] = this.iQualis[srcIdx++];
+		while (srcIdx < idx) qualis[dstIdx++] = this.iQualis[srcIdx++];
 		++srcIdx;
-		while (srcIdx < this.iQualis.length)
-			qualis[dstIdx++] = this.iQualis[srcIdx++];
+		while (srcIdx < this.iQualis.length) qualis[dstIdx++] = this.iQualis[srcIdx++];
 		this.iQualis = qualis;
 	}
 
@@ -236,7 +241,7 @@ private void removeQuali(int idx) {
 
 	/**
 	 * Returns true if the "key" Qualifier with true value presents.
-	 * 
+	 *
 	 * @return true/false
 	 */
 	public boolean isKeyed() {
@@ -245,7 +250,7 @@ public boolean isKeyed() {
 
 	/**
 	 * Returns true if the "EmbeddedObject" qualifier with true value presents.
-	 * 
+	 *
 	 * @return true/false
 	 */
 	public boolean isEmbeddedObject() {
@@ -291,7 +296,7 @@ public CIMQualifier[] getQualifiers() {
 
 	/**
 	 * getQualifiers - helps filtering based on the propagated flag.
-	 * 
+	 *
 	 * @param pLocalOnly
 	 * @return CIMQualifier[]
 	 */
@@ -300,8 +305,7 @@ public CIMQualifier[] getQualifiers(boolean pLocalOnly) {
 		if (!pLocalOnly) return this.iQualis;
 		if (this.iLocalOnlyQualis == null) {
 			ArrayList> qualiL = new ArrayList>(this.iQualis.length);
-			for (int i = 0; i < this.iQualis.length; i++)
-				if (!this.iQualis[i].isPropagated()) qualiL.add(this.iQualis[i]);
+			for (int i = 0; i < this.iQualis.length; i++) if (!this.iQualis[i].isPropagated()) qualiL.add(this.iQualis[i]);
 			this.iLocalOnlyQualis = qualiL.toArray(new CIMQualifier[qualiL.size()]);
 		}
 		return this.iLocalOnlyQualis;
@@ -323,5 +327,4 @@ public boolean hasQualifierValue(String pName, Object pValue) {
 		Object value = getQualifierValue(pName);
 		return value == null ? pValue == null : value.equals(pValue);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMVersion.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMVersion.java
index bbd8836..a272c98 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMVersion.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/CIMVersion.java
@@ -53,7 +53,6 @@
  * product name, etc. of the Java CIM Client
  */
 public class CIMVersion {
-
 	private static String PRODUCT_NAME = "n/a";
 
 	private static String VERSION = "n/a";
@@ -92,7 +91,7 @@ public class CIMVersion {
 
 	/**
 	 * Gets the build date
-	 * 
+	 *
 	 * @return The build date
 	 */
 	public static String getBuildDate() {
@@ -101,7 +100,7 @@ public static String getBuildDate() {
 
 	/**
 	 * Gets the build time
-	 * 
+	 *
 	 * @return The build time
 	 */
 	public static String getBuildTime() {
@@ -110,7 +109,7 @@ public static String getBuildTime() {
 
 	/**
 	 * Gets the copyright statement
-	 * 
+	 *
 	 * @return THe copyright
 	 */
 	public static String getCopyright() {
@@ -119,7 +118,7 @@ public static String getCopyright() {
 
 	/**
 	 * Gets the product name
-	 * 
+	 *
 	 * @return The product name
 	 */
 	public static String getProductName() {
@@ -128,7 +127,7 @@ public static String getProductName() {
 
 	/**
 	 * Gets the version
-	 * 
+	 *
 	 * @return The version
 	 */
 	public static String getVersion() {
@@ -137,7 +136,7 @@ public static String getVersion() {
 
 	/**
 	 * toString
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
@@ -147,7 +146,7 @@ public String toString() {
 
 	/**
 	 * main
-	 * 
+	 *
 	 * @param args
 	 */
 	public static void main(String[] args) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringReader.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringReader.java
index bd669b0..b58dc8b 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringReader.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringReader.java
@@ -47,10 +47,9 @@
 
 /**
  * Class DTString helps parsing CIMDateTime Strings.
- * 
+ *
  */
 public class DTStringReader {
-
 	private String iDateTimeStr;
 
 	private StringReader iReader;
@@ -61,7 +60,7 @@ public class DTStringReader {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pDateTimeStr
 	 */
 	public DTStringReader(String pDateTimeStr) {
@@ -71,7 +70,7 @@ public DTStringReader(String pDateTimeStr) {
 
 	/**
 	 * read
-	 * 
+	 *
 	 * @param pLen
 	 *            - number of characters to be read from the string
 	 * @param pFieldName
@@ -81,8 +80,7 @@ public DTStringReader(String pDateTimeStr) {
 	 * @return int
 	 * @throws IllegalArgumentException
 	 */
-	public int read(int pLen, String pFieldName, boolean pAllowUnsignificant)
-			throws IllegalArgumentException {
+	public int read(int pLen, String pFieldName, boolean pAllowUnsignificant) throws IllegalArgumentException {
 		char[] buf = new char[pLen];
 		int read;
 		try {
@@ -93,15 +91,14 @@ public int read(int pLen, String pFieldName, boolean pAllowUnsignificant)
 			throw new IllegalArgumentException(msg);
 		}
 		if (read != pLen) {
-			String msg = "Length of " + pFieldName + " field should be " + pLen + " but only"
-					+ read + " characters could be read!";
+			String msg =
+				"Length of " + pFieldName + " field should be " + pLen + " but only" + read + " characters could be read!";
 			throw new IllegalArgumentException(msg);
 		}
 		// Not significant check
 		if (pAllowUnsignificant) {
 			int cnt = 0;
-			for (int i = 0; i < buf.length; i++)
-				if (buf[i] == '*') ++cnt;
+			for (int i = 0; i < buf.length; i++) if (buf[i] == '*') ++cnt;
 			if (cnt == buf.length) {
 				this.iUnsignificant = true;
 				return -1;
@@ -113,21 +110,22 @@ public int read(int pLen, String pFieldName, boolean pAllowUnsignificant)
 		try {
 			res = Integer.parseInt(field);
 		} catch (NumberFormatException e) {
-			String msg = "Illegal " + pFieldName + " field \"" + field + "\" in \""
-					+ this.iDateTimeStr + "\"!";
+			String msg = "Illegal " + pFieldName + " field \"" + field + "\" in \"" + this.iDateTimeStr + "\"!";
 			throw new IllegalArgumentException(msg);
 		}
-		if (res < 0) throw new IllegalArgumentException("Negative value is not allowed for "
-				+ pFieldName + " in " + this.iDateTimeStr + "!");
+		if (res < 0) throw new IllegalArgumentException(
+			"Negative value is not allowed for " + pFieldName + " in " + this.iDateTimeStr + "!"
+		);
 		// Java 7 parseInt began allowing plus sign
 		if (field.indexOf('+') != -1) throw new IllegalArgumentException(
-				"Plus sign is not allowed for " + pFieldName + " in " + this.iDateTimeStr + "!");
+			"Plus sign is not allowed for " + pFieldName + " in " + this.iDateTimeStr + "!"
+		);
 		return res;
 	}
 
 	/**
 	 * readAndCheck
-	 * 
+	 *
 	 * @param pLen
 	 *            - number of digits to read
 	 * @param pFieldName
@@ -142,19 +140,28 @@ public int read(int pLen, String pFieldName, boolean pAllowUnsignificant)
 	 * @return int
 	 * @throws IllegalArgumentException
 	 */
-	public int readAndCheck(int pLen, String pFieldName, int pMin, int pMax,
-			boolean pAllowUnsignificant) throws IllegalArgumentException {
+	public int readAndCheck(int pLen, String pFieldName, int pMin, int pMax, boolean pAllowUnsignificant)
+		throws IllegalArgumentException {
 		int val = read(pLen, pFieldName, pAllowUnsignificant);
 		if (pAllowUnsignificant && val == -1) return val;
-		if (val < pMin || val > pMax) throw new IllegalArgumentException(pFieldName
-				+ " must be between " + pMin + " and " + pMax + ", but " + val + " was read from "
-				+ this.iDateTimeStr + " !");
+		if (val < pMin || val > pMax) throw new IllegalArgumentException(
+			pFieldName +
+			" must be between " +
+			pMin +
+			" and " +
+			pMax +
+			", but " +
+			val +
+			" was read from " +
+			this.iDateTimeStr +
+			" !"
+		);
 		return val;
 	}
 
 	/**
 	 * read
-	 * 
+	 *
 	 * @return a char, 0 if failed
 	 */
 	public char read() {
@@ -172,22 +179,21 @@ public char read() {
 
 	/**
 	 * read - Throws an IllegalArgumentException if the read character is not c.
-	 * 
+	 *
 	 * @param c
 	 *            - contains the character which should be read from the String.
 	 * @throws IllegalArgumentException
 	 */
 	public void read(char c) throws IllegalArgumentException {
 		if (read() != c) {
-			String msg = "'" + c + "' expected at position " + getPos() + " in "
-					+ this.iDateTimeStr + "!";
+			String msg = "'" + c + "' expected at position " + getPos() + " in " + this.iDateTimeStr + "!";
 			throw new IllegalArgumentException(msg);
 		}
 	}
 
 	/**
 	 * getPos
-	 * 
+	 *
 	 * @return the position in the reader
 	 */
 	public int getPos() {
@@ -196,11 +202,10 @@ public int getPos() {
 
 	/**
 	 * isUnsignificant
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isUnsignificant() {
 		return this.iUnsignificant;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringWriter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringWriter.java
index 095d3bc..2e2ea07 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringWriter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cim/DTStringWriter.java
@@ -48,12 +48,11 @@
  * Class DTStringWriter helps making CIMDateTime Strings.
  */
 public class DTStringWriter {
-
 	private StringBuffer iBuf = new StringBuffer();
 
 	/**
 	 * writeInt - writes an integer, the upper digits are filled with zeros
-	 * 
+	 *
 	 * @param pNum
 	 *            -1 means that asterisks have to be printed
 	 * @param pDigits
@@ -77,7 +76,7 @@ public void write(int pDigits, int pNum) {
 
 	/**
 	 * writeSignedInt - used for utc writing
-	 * 
+	 *
 	 * @param pNum
 	 * @param pDigits
 	 */
@@ -93,20 +92,19 @@ public void writeSigned(int pDigits, int pNum) {
 
 	/**
 	 * writeUSec
-	 * 
+	 *
 	 * @param pUSec
 	 * @param pUnsignificantDigits
 	 */
 	public void writeUSec(int pUSec, int pUnsignificantDigits) {
 		int digits = 6 - pUnsignificantDigits;
 		write(digits, pUSec);
-		for (int i = 0; i < pUnsignificantDigits; i++)
-			write('*');
+		for (int i = 0; i < pUnsignificantDigits; i++) write('*');
 	}
 
 	/**
 	 * writeChar
-	 * 
+	 *
 	 * @param pChar
 	 */
 	public void write(char pChar) {
@@ -115,7 +113,7 @@ public void write(char pChar) {
 
 	/**
 	 * write
-	 * 
+	 *
 	 * @param pStr
 	 */
 	public void write(String pStr) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java
index d9ea7ad..ffc3edd 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java
@@ -80,14 +80,19 @@
 import java.util.Iterator;
 import java.util.Random;
 import java.util.Vector;
-
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMDataType;
 import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.metricshub.wbem.javax.cim.CIMQualifierType;
 import org.metricshub.wbem.javax.cim.CIMValuedElement;
+import org.metricshub.wbem.javax.cim.UnsignedInteger32;
 import org.metricshub.wbem.javax.wbem.WBEMException;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.TimeStamp;
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
@@ -120,14 +125,6 @@
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMSetInstanceOp;
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMSetPropertyOp;
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.operations.CIMSetQualifierTypeOp;
-import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
-import org.metricshub.wbem.javax.cim.CIMProperty;
-import org.metricshub.wbem.javax.cim.UnsignedInteger32;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
@@ -140,7 +137,6 @@
 public class CIMClientXML_HelperImpl {
 
 	private static class Counter {
-
 		private int iCounter;
 
 		protected Counter(int pCounter) {
@@ -206,7 +202,7 @@ private static String valueStr(CIMValuedElement pE) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @throws ParserConfigurationException
 	 */
 	public CIMClientXML_HelperImpl() throws ParserConfigurationException {
@@ -216,7 +212,7 @@ public CIMClientXML_HelperImpl() throws ParserConfigurationException {
 
 	/**
 	 * getDocumentBuilder
-	 * 
+	 *
 	 * @return DocumentBuilder
 	 */
 	public DocumentBuilder getDocumentBuilder() {
@@ -225,7 +221,7 @@ public DocumentBuilder getDocumentBuilder() {
 
 	/**
 	 * newDocument
-	 * 
+	 *
 	 * @return Document
 	 */
 	public Document newDocument() {
@@ -234,7 +230,7 @@ public Document newDocument() {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pIS
 	 * @return Document
 	 * @throws IOException
@@ -247,7 +243,7 @@ public Document parse(InputSource pIS) throws IOException, SAXException {
 
 	/**
 	 * Serializes a given DOM document as (CIM-)XML to a given output stream
-	 * 
+	 *
 	 * @param pOS
 	 *            The output stream
 	 * @param pDoc
@@ -263,7 +259,7 @@ public static void serialize(OutputStream pOS, Document pDoc) throws IOException
 	 * Serializes a given DOM document as (CIM-)XML to a given output stream.
 	 * The document is pretty wrapped and indented and surrounded with markers
 	 * for the begin and end.
-	 * 
+	 *
 	 * @param pOS
 	 *            The output stream
 	 * @param pDoc
@@ -278,7 +274,7 @@ public static void dumpDocument(OutputStream pOS, Document pDoc) throws IOExcept
 	 * Serializes a given DOM document as (CIM-)XML to a given output stream.
 	 * The document is pretty wrapped and indented and surrounded with markers
 	 * for the begin and end.
-	 * 
+	 *
 	 * @param pOS
 	 *            The output stream
 	 * @param pDoc
@@ -288,10 +284,11 @@ public static void dumpDocument(OutputStream pOS, Document pDoc) throws IOExcept
 	 *            etc.)
 	 * @throws IOException
 	 */
-	public static void dumpDocument(OutputStream pOS, Document pDoc, String pOrigin)
-			throws IOException {
+	public static void dumpDocument(OutputStream pOS, Document pDoc, String pOrigin) throws IOException {
 		// debug
-		if (pOS == null) { return; }
+		if (pOS == null) {
+			return;
+		}
 		if (pOrigin == null) pOrigin = "unknown";
 		pOS.write("<--- ".getBytes());
 		pOS.write(pOrigin.getBytes());
@@ -306,15 +303,14 @@ public static void dumpDocument(OutputStream pOS, Document pDoc, String pOrigin)
 
 	/**
 	 * createCIMMessage
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pRequestE
 	 * @return Element
 	 */
 	public Element createCIMMessage(Document pDoc, Element pRequestE) {
 		Element cimE = CIMXMLBuilderImpl.createCIM(pDoc);
-		Element messageE = CIMXMLBuilderImpl.createMESSAGE(pDoc, cimE, String.valueOf(getNextId()),
-				VERSION);
+		Element messageE = CIMXMLBuilderImpl.createMESSAGE(pDoc, cimE, String.valueOf(getNextId()), VERSION);
 		if (pRequestE != null) {
 			messageE.appendChild(pRequestE);
 		}
@@ -323,7 +319,7 @@ public Element createCIMMessage(Document pDoc, Element pRequestE) {
 
 	/**
 	 * createMultiReq
-	 * 
+	 *
 	 * @param pDoc
 	 * @return Element
 	 */
@@ -334,7 +330,7 @@ public Element createMultiReq(Document pDoc) {
 
 	/**
 	 * associatorNames_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pObjectName
 	 * @param pAssocClass
@@ -344,23 +340,25 @@ public Element createMultiReq(Document pDoc) {
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element associatorNames_request(Document pDoc, CIMObjectPath pObjectName,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole)
-			throws WBEMException {
-
+	public Element associatorNames_request(
+		Document pDoc,
+		CIMObjectPath pObjectName,
+		String pAssocClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole
+	)
+		throws WBEMException {
 		// obtain data
 		String className = pObjectName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 		CIMProperty[] keysA = pObjectName.getKeys();
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				ASSOCIATOR_NAMES);
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, ASSOCIATOR_NAMES);
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
 
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
 		Element instancenameE = CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
 		for (int i = 0; i < keysA.length; i++) {
 			CIMProperty prop = keysA[i];
@@ -393,15 +391,14 @@ public Element associatorNames_request(Document pDoc, CIMObjectPath pObjectName,
 
 	/**
 	 * associatorNames_response
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPathA
 	 * @return Element
 	 */
 	public static Element associatorNames_response(Document pDoc, CIMObjectPath[] pPathA) {
 		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
-		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
-				"associatorNames");
+		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE, "associatorNames");
 		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
 		try {
 			for (int i = 0; i < pPathA.length; i++) {
@@ -415,7 +412,7 @@ public static Element associatorNames_response(Document pDoc, CIMObjectPath[] pP
 
 	/**
 	 * associatorInstances_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pObjectName
 	 * @param pAssocClass
@@ -427,24 +424,31 @@ public static Element associatorNames_response(Document pDoc, CIMObjectPath[] pP
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element associatorInstances_request(Document pDoc, CIMObjectPath pObjectName,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
-
+	public Element associatorInstances_request(
+		Document pDoc,
+		CIMObjectPath pObjectName,
+		String pAssocClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		String className = pObjectName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 		CIMProperty[] keysA = pObjectName.getKeys();
 
 		// Make sure keys are populated
-		if (keysA.length == 0) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"associatorInstances requires keys for the instance to be populated");
+		if (keysA.length == 0) throw new WBEMException(
+			WBEMException.CIM_ERR_INVALID_PARAMETER,
+			"associatorInstances requires keys for the instance to be populated"
+		);
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "Associators");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
 		Element instancenameE = CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
 		for (int i = 0; i < keysA.length; i++) {
 			CIMProperty prop = keysA[i];
@@ -472,8 +476,7 @@ public Element associatorInstances_request(Document pDoc, CIMObjectPath pObjectN
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
 		}
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
@@ -489,7 +492,7 @@ public Element associatorInstances_request(Document pDoc, CIMObjectPath pObjectN
 
 	/**
 	 * associatorClasses_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pObjectName
 	 * @param pAssocClass
@@ -502,25 +505,31 @@ public Element associatorInstances_request(Document pDoc, CIMObjectPath pObjectN
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element associatorClasses_request(Document pDoc, CIMObjectPath pObjectName,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-
+	public Element associatorClasses_request(
+		Document pDoc,
+		CIMObjectPath pObjectName,
+		String pAssocClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		String className = pObjectName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		// Make sure keys are not populated
 		if (pObjectName.getKeys().length != 0) throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"Keys should not be populated for associatorClasses");
+			WBEMException.CIM_ERR_INVALID_PARAMETER,
+			"Keys should not be populated for associatorClasses"
+		);
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "Associators");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
 
 		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
 
@@ -543,8 +552,7 @@ public Element associatorClasses_request(Document pDoc, CIMObjectPath pObjectNam
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
@@ -560,7 +568,7 @@ public Element associatorClasses_request(Document pDoc, CIMObjectPath pObjectNam
 
 	/**
 	 * associators_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pObjectName
 	 * @param pAssocClass
@@ -573,22 +581,27 @@ public Element associatorClasses_request(Document pDoc, CIMObjectPath pObjectNam
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element associators_request(Document pDoc, CIMObjectPath pObjectName,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-
+	public Element associators_request(
+		Document pDoc,
+		CIMObjectPath pObjectName,
+		String pAssocClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		// obtain data
 		String className = pObjectName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 		CIMProperty[] keysA = pObjectName.getKeys();
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "Associators");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pObjectName);
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
 		Element instancenameE = CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, className);
 		for (int i = 0; i < keysA.length; i++) {
 			CIMProperty prop = keysA[i];
@@ -620,8 +633,7 @@ public Element associators_request(Document pDoc, CIMObjectPath pObjectName,
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
@@ -638,13 +650,12 @@ public Element associators_request(Document pDoc, CIMObjectPath pObjectName,
 
 	/**
 	 * associators_response
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pNamedElementA
 	 * @return Element
 	 */
-	public static Element associators_response(Document pDoc,
-			CIMNamedElementInterface[] pNamedElementA) {
+	public static Element associators_response(Document pDoc, CIMNamedElementInterface[] pNamedElementA) {
 		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
 		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE, "associators");
 		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
@@ -653,8 +664,7 @@ public static Element associators_response(Document pDoc,
 				CIMNamedElementInterface namedElement = pNamedElementA[i];
 				CIMObjectPath op = namedElement.getObjectPath();
 				String nameSpace = op == null ? null : op.getNamespace();
-				CIMXMLBuilderImpl
-						.createVALUEOBJECTWITHPATH(pDoc, iRetValE, namedElement, nameSpace);
+				CIMXMLBuilderImpl.createVALUEOBJECTWITHPATH(pDoc, iRetValE, namedElement, nameSpace);
 				/*
 				 * CIMXMLBuilderImpl.createCLASSPATH( pDoc, iRetValE,
 				 * pClassA[i].getObjectPath() );
@@ -670,22 +680,19 @@ public static Element associators_response(Document pDoc,
 
 	/**
 	 * enumerateInstanceNames_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element enumerateInstanceNames_request(Document pDoc, CIMObjectPath pPath)
-			throws WBEMException {
+	public Element enumerateInstanceNames_request(Document pDoc, CIMObjectPath pPath) throws WBEMException {
 		// obtain data
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerateInstanceNames");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "EnumerateInstanceNames");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
@@ -696,7 +703,7 @@ public Element enumerateInstanceNames_request(Document pDoc, CIMObjectPath pPath
 
 	/**
 	 * enumerateInstances_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pDeepInheritance
@@ -707,18 +714,22 @@ public Element enumerateInstanceNames_request(Document pDoc, CIMObjectPath pPath
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element enumerateInstances_request(Document pDoc, CIMObjectPath pPath,
-			boolean pDeepInheritance, boolean pLocalOnly, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
-
+	public Element enumerateInstances_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		boolean pDeepInheritance,
+		boolean pLocalOnly,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		// obtain data
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerateInstances");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "EnumerateInstances");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
@@ -732,8 +743,7 @@ public Element enumerateInstances_request(Document pDoc, CIMObjectPath pPath,
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
@@ -748,7 +758,7 @@ public Element enumerateInstances_request(Document pDoc, CIMObjectPath pPath,
 
 	/**
 	 * getInstance_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pName
 	 * @param pLocalOnly
@@ -758,20 +768,24 @@ public Element enumerateInstances_request(Document pDoc, CIMObjectPath pPath,
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element getInstance_request(Document pDoc, CIMObjectPath pName, boolean pLocalOnly,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
+	public Element getInstance_request(
+		Document pDoc,
+		CIMObjectPath pName,
+		boolean pLocalOnly,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		// obtain data
 		String className = pName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "GetInstance");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"InstanceName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "InstanceName");
 		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pName);
 
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "LocalOnly");
@@ -780,8 +794,7 @@ public Element getInstance_request(Document pDoc, CIMObjectPath pName, boolean p
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
@@ -797,26 +810,22 @@ public Element getInstance_request(Document pDoc, CIMObjectPath pName, boolean p
 
 	/**
 	 * deleteInstance_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pName
 	 * @return Element
 	 * @throws WBEMException
 	 */
 	public Element deleteInstance_request(Document pDoc, CIMObjectPath pName) throws WBEMException {
-
 		// obtain data
 		String className = pName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"DeleteInstance");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "DeleteInstance");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"InstanceName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "InstanceName");
 		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pName);
 
 		return simplereqE;
@@ -824,7 +833,7 @@ public Element deleteInstance_request(Document pDoc, CIMObjectPath pName) throws
 
 	/**
 	 * getClass_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pName
 	 * @param pLocalOnly
@@ -834,14 +843,18 @@ public Element deleteInstance_request(Document pDoc, CIMObjectPath pName) throws
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element getClass_request(Document pDoc, CIMObjectPath pName, boolean pLocalOnly,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-
+	public Element getClass_request(
+		Document pDoc,
+		CIMObjectPath pName,
+		boolean pLocalOnly,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		// obtain data
 		String className = pName.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "GetClass");
@@ -855,8 +868,7 @@ public Element getClass_request(Document pDoc, CIMObjectPath pName, boolean pLoc
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
@@ -872,7 +884,7 @@ public Element getClass_request(Document pDoc, CIMObjectPath pName, boolean pLoc
 
 	/**
 	 * createInstance_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pName
 	 * @param pInstance
@@ -880,18 +892,14 @@ public Element getClass_request(Document pDoc, CIMObjectPath pName, boolean pLoc
 	 * @throws WBEMException
 	 */
 	public Element createInstance_request(Document pDoc, CIMObjectPath pName, CIMInstance pInstance)
-			throws WBEMException {
-
+		throws WBEMException {
 		String className = pInstance.getObjectPath().getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"CreateInstance");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "CreateInstance");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pName);
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"NewInstance");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "NewInstance");
 
 		CIMXMLBuilderImpl.createINSTANCE(pDoc, iparamvalueE, pInstance);
 
@@ -900,7 +908,7 @@ public Element createInstance_request(Document pDoc, CIMObjectPath pName, CIMIns
 
 	/**
 	 * invokeMethod_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pLocalPath
 	 * @param pMethodName
@@ -908,13 +916,16 @@ public Element createInstance_request(Document pDoc, CIMObjectPath pName, CIMIns
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element invokeMethod_request(Document pDoc, CIMObjectPath pLocalPath,
-			String pMethodName, CIMArgument[] pInArgs) throws WBEMException {
-
+	public Element invokeMethod_request(
+		Document pDoc,
+		CIMObjectPath pLocalPath,
+		String pMethodName,
+		CIMArgument[] pInArgs
+	)
+		throws WBEMException {
 		// obtain data
 		String className = pLocalPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 		CIMProperty[] keysA = pLocalPath.getKeys();
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
@@ -936,7 +947,7 @@ public Element invokeMethod_request(Document pDoc, CIMObjectPath pLocalPath,
 
 	/**
 	 * invokeMethod_response
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pMethodName
 	 * @param pLocalPath
@@ -945,11 +956,15 @@ public Element invokeMethod_request(Document pDoc, CIMObjectPath pLocalPath,
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element invokeMethod_response(Document pDoc, String pMethodName,
-			CIMObjectPath pLocalPath, Object pRetVal, CIMArgument[] pOutArgA)
-			throws WBEMException {
-		if (pMethodName == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null method name");
+	public static Element invokeMethod_response(
+		Document pDoc,
+		String pMethodName,
+		CIMObjectPath pLocalPath,
+		Object pRetVal,
+		CIMArgument[] pOutArgA
+	)
+		throws WBEMException {
+		if (pMethodName == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null method name");
 		Element simpleRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
 		Element methodRspE = CIMXMLBuilderImpl.createMETHODRESPONSE(pDoc, simpleRspE, pMethodName);
 
@@ -962,8 +977,13 @@ public static Element invokeMethod_response(Document pDoc, String pMethodName,
 	/**
 	 * @param pLocalPath
 	 */
-	private static void buildParamValues(Document pDoc, Element pParentE, CIMObjectPath pLocalPath,
-			CIMArgument[] pArgA) throws WBEMException {
+	private static void buildParamValues(
+		Document pDoc,
+		Element pParentE,
+		CIMObjectPath pLocalPath,
+		CIMArgument[] pArgA
+	)
+		throws WBEMException {
 		if (pArgA == null) return;
 		for (int i = 0; i < pArgA.length; i++) {
 			CIMArgument arg = pArgA[i];
@@ -991,20 +1011,17 @@ private static void buildParamValues(Document pDoc, Element pParentE, CIMObjectP
 
 	/**
 	 * createIndication_response
-	 * 
+	 *
 	 * @param error
 	 * @return Document
 	 */
 	public Document createIndication_response(CIMError error) {
-
 		// CIMXMLBuilderImpl.create XML
 		Document doc = this.iBuilder.newDocument();
 		Element cimE = CIMXMLBuilderImpl.createCIM(doc);
-		Element messageE = CIMXMLBuilderImpl.createMESSAGE(doc, cimE, String.valueOf(getNextId()),
-				"1.0");
+		Element messageE = CIMXMLBuilderImpl.createMESSAGE(doc, cimE, String.valueOf(getNextId()), "1.0");
 		Element simpleexprspE = CIMXMLBuilderImpl.createSIMPLEEXPRSP(doc, messageE);
-		Element expmethodresponseE = CIMXMLBuilderImpl.createEXPMETHODRESPONSE(doc, simpleexprspE,
-				"ExportIndication");
+		Element expmethodresponseE = CIMXMLBuilderImpl.createEXPMETHODRESPONSE(doc, simpleexprspE, "ExportIndication");
 		if (error == null) {
 			CIMXMLBuilderImpl.createIRETURNVALUE(doc, expmethodresponseE);
 		} else {
@@ -1016,18 +1033,16 @@ public Document createIndication_response(CIMError error) {
 
 	/**
 	 * createClass_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pClass
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element createClass_request(Document pDoc, CIMObjectPath pPath, CIMClass pClass)
-			throws WBEMException {
+	public Element createClass_request(Document pDoc, CIMObjectPath pPath, CIMClass pClass) throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "CreateClass");
@@ -1042,27 +1057,23 @@ public Element createClass_request(Document pDoc, CIMObjectPath pPath, CIMClass
 
 	/**
 	 * getQualifier_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pQt
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element getQualifier_request(Document pDoc, CIMObjectPath pPath, String pQt)
-			throws WBEMException {
+	public Element getQualifier_request(Document pDoc, CIMObjectPath pPath, String pQt) throws WBEMException {
 		// obtain data
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl
-				.createIMETHODCALL(pDoc, simplereqE, "GetQualifier");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "GetQualifier");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"QualifierName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "QualifierName");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pPath.getObjectName());
 
 		return simplereqE;
@@ -1071,26 +1082,23 @@ public Element getQualifier_request(Document pDoc, CIMObjectPath pPath, String p
 	/**
 	 * createQualifierType_request : This has been replaced by
 	 * setQualifierType_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pQt
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element createQualifierType_request(Document pDoc, CIMObjectPath pPath,
-			CIMQualifierType pQt) throws WBEMException {
+	public Element createQualifierType_request(Document pDoc, CIMObjectPath pPath, CIMQualifierType pQt)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl
-				.createIMETHODCALL(pDoc, simplereqE, "SetQualifier");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "SetQualifier");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"QualifierDeclaration");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "QualifierDeclaration");
 		CIMXMLBuilderImpl.createQUALIFIER_DECLARATION(pDoc, iparamvalueE, pQt);
 
 		return simplereqE;
@@ -1098,7 +1106,7 @@ public Element createQualifierType_request(Document pDoc, CIMObjectPath pPath,
 
 	/**
 	 * deleteClass_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @return Element
@@ -1106,8 +1114,7 @@ public Element createQualifierType_request(Document pDoc, CIMObjectPath pPath,
 	 */
 	public Element deleteClass_request(Document pDoc, CIMObjectPath pPath) throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "DeleteClass");
@@ -1122,33 +1129,29 @@ public Element deleteClass_request(Document pDoc, CIMObjectPath pPath) throws WB
 
 	/**
 	 * deleteQualifierType_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element deleteQualifierType_request(Document pDoc, CIMObjectPath pPath)
-			throws WBEMException {
+	public Element deleteQualifierType_request(Document pDoc, CIMObjectPath pPath) throws WBEMException {
 		// obtain data
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"DeleteQualifier");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "DeleteQualifier");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"QualifierName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "QualifierName");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pPath.getObjectName());
 		return simplereqE;
 	}
 
 	/**
 	 * enumerateClasses_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pDeepInheritance
@@ -1157,18 +1160,20 @@ public Element deleteQualifierType_request(Document pDoc, CIMObjectPath pPath)
 	 * @param pIncludeClassOrigin
 	 * @return Element
 	 */
-	public Element enumerateClasses_request(Document pDoc, CIMObjectPath pPath,
-			boolean pDeepInheritance, boolean pLocalOnly, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin) {
-
+	public Element enumerateClasses_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		boolean pDeepInheritance,
+		boolean pLocalOnly,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin
+	) {
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerateClasses");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "EnumerateClasses");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		Element iparamvalueE;
-		if (pPath != null && pPath.getObjectName() != null
-				&& pPath.getObjectName().trim().length() != 0) {
+		if (pPath != null && pPath.getObjectName() != null && pPath.getObjectName().trim().length() != 0) {
 			String className = pPath.getObjectName();
 			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
 			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
@@ -1182,23 +1187,21 @@ public Element enumerateClasses_request(Document pDoc, CIMObjectPath pPath,
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 		return simplereqE;
 	}
 
 	/**
 	 * enumerateClasses_response
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pClA
 	 * @return Element
 	 */
 	public static Element enumerateClasses_response(Document pDoc, CIMClass[] pClA) {
 		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
-		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
-				"enumerateClasses");
+		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE, "enumerateClasses");
 		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
 		try {
 			for (int i = 0; i < pClA.length; i++) {
@@ -1212,15 +1215,14 @@ public static Element enumerateClasses_response(Document pDoc, CIMClass[] pClA)
 
 	/**
 	 * enumerateInstances_response
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pInstA
 	 * @return Element
 	 */
 	public static Element enumerateInstances_response(Document pDoc, CIMInstance[] pInstA) {
 		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
-		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
-				"enumerateInstances");
+		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE, "enumerateInstances");
 		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
 		try {
 			for (int i = 0; i < pInstA.length; i++) {
@@ -1234,24 +1236,20 @@ public static Element enumerateInstances_response(Document pDoc, CIMInstance[] p
 
 	/**
 	 * enumerateClassNames_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pDeepInheritance
 	 * @return Element
 	 */
-	public Element enumerateClassNames_request(Document pDoc, CIMObjectPath pPath,
-			boolean pDeepInheritance) {
-
+	public Element enumerateClassNames_request(Document pDoc, CIMObjectPath pPath, boolean pDeepInheritance) {
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerateClassNames");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "EnumerateClassNames");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		Element iparamvalueE;
 
-		if (pPath != null && pPath.getObjectName() != null
-				&& pPath.getObjectName().trim().length() != 0) {
+		if (pPath != null && pPath.getObjectName() != null && pPath.getObjectName().trim().length() != 0) {
 			String className = pPath.getObjectName();
 			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ClassName");
 			CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
@@ -1265,26 +1263,23 @@ public Element enumerateClassNames_request(Document pDoc, CIMObjectPath pPath,
 
 	/**
 	 * getProperty_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pPropertyName
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element getProperty_request(Document pDoc, CIMObjectPath pPath, String pPropertyName)
-			throws WBEMException {
+	public Element getProperty_request(Document pDoc, CIMObjectPath pPath, String pPropertyName) throws WBEMException {
 		// obtain data
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "GetProperty");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"InstanceName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "InstanceName");
 		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
 
 		if (pPropertyName != null) {
@@ -1297,7 +1292,7 @@ public Element getProperty_request(Document pDoc, CIMObjectPath pPath, String pP
 
 	/**
 	 * referenceNames_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pResultClass
@@ -1305,19 +1300,16 @@ public Element getProperty_request(Document pDoc, CIMObjectPath pPath, String pP
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element referenceNames_request(Document pDoc, CIMObjectPath pPath, String pResultClass,
-			String pRole) throws WBEMException {
+	public Element referenceNames_request(Document pDoc, CIMObjectPath pPath, String pResultClass, String pRole)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"ReferenceNames");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "ReferenceNames");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
 		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
 
 		if (pResultClass != null) {
@@ -1334,7 +1326,7 @@ public Element referenceNames_request(Document pDoc, CIMObjectPath pPath, String
 
 	/**
 	 * referenceClasses_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pResultClass
@@ -1345,25 +1337,30 @@ public Element referenceNames_request(Document pDoc, CIMObjectPath pPath, String
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element referenceClasses_request(Document pDoc, CIMObjectPath pPath,
-			String pResultClass, String pRole, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
-
+	public Element referenceClasses_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		// Make sure keys are not populated
 		if (pPath.getKeys().length != 0) throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"Keys should not be populated for referenceClasses");
+			WBEMException.CIM_ERR_INVALID_PARAMETER,
+			"Keys should not be populated for referenceClasses"
+		);
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "References");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
 		// createOBJECTNAME will internally call createINSTANCENAME but as there
 		// are no keys Element containing keys will not be populated
 		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
@@ -1380,8 +1377,7 @@ public Element referenceClasses_request(Document pDoc, CIMObjectPath pPath,
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
@@ -1396,7 +1392,7 @@ public Element referenceClasses_request(Document pDoc, CIMObjectPath pPath,
 
 	/**
 	 * referenceInstances_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pResultClass
@@ -1406,25 +1402,29 @@ public Element referenceClasses_request(Document pDoc, CIMObjectPath pPath,
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element referenceInstances_request(Document pDoc, CIMObjectPath pPath,
-			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-
+	public Element referenceInstances_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		// keys are required for CIMInstance
 		if (pPath.getKeys().length == 0) throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"refrenceInstances requires keys for the instance to be populated");
+			WBEMException.CIM_ERR_INVALID_PARAMETER,
+			"refrenceInstances requires keys for the instance to be populated"
+		);
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "References");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ObjectName");
 		// createOBJECTNAME will internally call createINSTANCENAME to populate
 		// Element containing keys
 		CIMXMLBuilderImpl.createOBJECTNAME(pDoc, iparamvalueE, pPath);
@@ -1438,8 +1438,7 @@ public Element referenceInstances_request(Document pDoc, CIMObjectPath pPath,
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
 		}
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
@@ -1454,7 +1453,7 @@ public Element referenceInstances_request(Document pDoc, CIMObjectPath pPath,
 
 	/**
 	 * references_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pResultClass
@@ -1465,12 +1464,18 @@ public Element referenceInstances_request(Document pDoc, CIMObjectPath pPath,
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element references_request(Document pDoc, CIMObjectPath pPath, String pResultClass,
-			String pRole, boolean pIncludeQualifiers, boolean pIncludeClassOrigin,
-			String[] pPropertyList) throws WBEMException {
+	public Element references_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "References");
@@ -1493,8 +1498,7 @@ public Element references_request(Document pDoc, CIMObjectPath pPath, String pRe
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeQualifiers);
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeClassOrigin");
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
@@ -1510,25 +1514,22 @@ public Element references_request(Document pDoc, CIMObjectPath pPath, String pRe
 
 	/**
 	 * setClass_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pClass
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element setClass_request(Document pDoc, CIMObjectPath pPath, CIMClass pClass)
-			throws WBEMException {
+	public Element setClass_request(Document pDoc, CIMObjectPath pPath, CIMClass pClass) throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "ModifyClass");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"ModifiedClass");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ModifiedClass");
 		CIMXMLBuilderImpl.createCLASS(pDoc, iparamvalueE, pClass);
 
 		return simplereqE;
@@ -1536,7 +1537,7 @@ public Element setClass_request(Document pDoc, CIMObjectPath pPath, CIMClass pCl
 
 	/**
 	 * setInstance_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pInstance
@@ -1545,19 +1546,22 @@ public Element setClass_request(Document pDoc, CIMObjectPath pPath, CIMClass pCl
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element setInstance_request(Document pDoc, CIMObjectPath pPath, CIMInstance pInstance,
-			boolean pIncludeQualifiers, String[] pPropertyList) throws WBEMException {
+	public Element setInstance_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		CIMInstance pInstance,
+		boolean pIncludeQualifiers,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"ModifyInstance");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "ModifyInstance");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"ModifiedInstance");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "ModifiedInstance");
 		CIMXMLBuilderImpl.createVALUENAMEDINSTANCE(pDoc, iparamvalueE, pPath, pInstance);
 
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "IncludeQualifiers");
@@ -1576,7 +1580,7 @@ public Element setInstance_request(Document pDoc, CIMObjectPath pPath, CIMInstan
 
 	/**
 	 * setProperty_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pPropertyName
@@ -1584,18 +1588,16 @@ public Element setInstance_request(Document pDoc, CIMObjectPath pPath, CIMInstan
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element setProperty_request(Document pDoc, CIMObjectPath pPath, String pPropertyName,
-			Object pNewValue) throws WBEMException {
+	public Element setProperty_request(Document pDoc, CIMObjectPath pPath, String pPropertyName, Object pNewValue)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "SetProperty");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"InstanceName");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "InstanceName");
 		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
 
 		if (pPropertyName != null) {
@@ -1613,28 +1615,25 @@ public Element setProperty_request(Document pDoc, CIMObjectPath pPath, String pP
 
 	/**
 	 * setQualifierType_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pQt
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element setQualifierType_request(Document pDoc, CIMObjectPath pPath,
-			CIMQualifierType pQt) throws WBEMException {
+	public Element setQualifierType_request(Document pDoc, CIMObjectPath pPath, CIMQualifierType pQt)
+		throws WBEMException {
 		// Make sure class name exists, it is required to uniquely identify
 		// qualifier in namespace
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl
-				.createIMETHODCALL(pDoc, simplereqE, "SetQualifier");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "SetQualifier");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"QualifierDeclaration");
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "QualifierDeclaration");
 		CIMXMLBuilderImpl.createQUALIFIER_DECLARATION(pDoc, iparamvalueE, pQt);
 
 		return simplereqE;
@@ -1642,18 +1641,15 @@ public Element setQualifierType_request(Document pDoc, CIMObjectPath pPath,
 
 	/**
 	 * enumQualifierTypes_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element enumQualifierTypes_request(Document pDoc, CIMObjectPath pPath)
-			throws WBEMException {
-
+	public Element enumQualifierTypes_request(Document pDoc, CIMObjectPath pPath) throws WBEMException {
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerateQualifiers");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "EnumerateQualifiers");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		return simplereqE;
@@ -1661,17 +1657,16 @@ public Element enumQualifierTypes_request(Document pDoc, CIMObjectPath pPath)
 
 	/**
 	 * enumQualifierTypes_response
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pQualiTypeA
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element enumQualifierTypes_response(Document pDoc,
-			CIMQualifierType[] pQualiTypeA) throws WBEMException {
+	public static Element enumQualifierTypes_response(Document pDoc, CIMQualifierType[] pQualiTypeA)
+		throws WBEMException {
 		Element simpRspE = CIMXMLBuilderImpl.createSIMPLERSP(pDoc, null);
-		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE,
-				"associatorNames");
+		Element iMethRspE = CIMXMLBuilderImpl.createIMETHODRESPONSE(pDoc, simpRspE, "associatorNames");
 		Element iRetValE = CIMXMLBuilderImpl.createIRETURNVALUE(pDoc, iMethRspE);
 		for (int i = 0; i < pQualiTypeA.length; i++) {
 			CIMXMLBuilderImpl.createQUALIFIER_DECLARATION(pDoc, iRetValE, pQualiTypeA[i]);
@@ -1681,21 +1676,19 @@ public static Element enumQualifierTypes_response(Document pDoc,
 
 	/**
 	 * execQuery_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pQuery
 	 * @param pQueryLanguage
 	 * @return Element
 	 */
-	public Element execQuery_request(Document pDoc, CIMObjectPath pPath, String pQuery,
-			String pQueryLanguage) {
+	public Element execQuery_request(Document pDoc, CIMObjectPath pPath, String pQuery, String pQueryLanguage) {
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
 		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "ExecQuery");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element querylanguageE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				"QueryLanguage");
+		Element querylanguageE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "QueryLanguage");
 		CIMXMLBuilderImpl.createVALUE(pDoc, querylanguageE, pQueryLanguage);
 
 		Element queryE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, "Query");
@@ -1706,15 +1699,13 @@ public Element execQuery_request(Document pDoc, CIMObjectPath pPath, String pQue
 
 	/**
 	 * performBatchOperation_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pOperations
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element performBatchOperation_request(Document pDoc, Vector pOperations)
-			throws WBEMException {
-
+	public Element performBatchOperation_request(Document pDoc, Vector pOperations) throws WBEMException {
 		Element messageE = createCIMMessage(pDoc, null);
 		if (pOperations.size() > 1) {
 			Element multireqE = createMultiReq(pDoc);
@@ -1730,32 +1721,45 @@ public Element performBatchOperation_request(Document pDoc, Vector
 
 				if (op instanceof CIMAssociatorsOp) {
 					CIMAssociatorsOp associatorsOp = (CIMAssociatorsOp) op;
-					requestE = associators_request(pDoc, associatorsOp.getObjectName(),
-							associatorsOp.getAssocClass(), associatorsOp.getResultClass(),
-							associatorsOp.getRole(), associatorsOp.getResultRole(), associatorsOp
-									.isIncludeQualifiers(), associatorsOp.isIncludeClassOrigin(),
-							associatorsOp.getPropertyList());
+					requestE =
+						associators_request(
+							pDoc,
+							associatorsOp.getObjectName(),
+							associatorsOp.getAssocClass(),
+							associatorsOp.getResultClass(),
+							associatorsOp.getRole(),
+							associatorsOp.getResultRole(),
+							associatorsOp.isIncludeQualifiers(),
+							associatorsOp.isIncludeClassOrigin(),
+							associatorsOp.getPropertyList()
+						);
 				} else if (op instanceof CIMAssociatorNamesOp) {
 					CIMAssociatorNamesOp associatorNamesOp = (CIMAssociatorNamesOp) op;
-					requestE = associatorNames_request(pDoc, associatorNamesOp.getObjectName(),
-							associatorNamesOp.getAssocClass(), associatorNamesOp.getResultClass(),
-							associatorNamesOp.getRole(), associatorNamesOp.getResultRole());
+					requestE =
+						associatorNames_request(
+							pDoc,
+							associatorNamesOp.getObjectName(),
+							associatorNamesOp.getAssocClass(),
+							associatorNamesOp.getResultClass(),
+							associatorNamesOp.getRole(),
+							associatorNamesOp.getResultRole()
+						);
 				} else if (op instanceof CIMCreateClassOp) {
 					CIMCreateClassOp createClassOp = (CIMCreateClassOp) op;
-					requestE = createClass_request(pDoc, createClassOp.getObjectName(),
-							createClassOp.getCimClass());
+					requestE = createClass_request(pDoc, createClassOp.getObjectName(), createClassOp.getCimClass());
 				} else if (op instanceof CIMCreateInstanceOp) {
 					CIMCreateInstanceOp createInstanceOp = (CIMCreateInstanceOp) op;
-					requestE = createInstance_request(pDoc, createInstanceOp.getObjectName(),
-							createInstanceOp.getInstance());
+					requestE = createInstance_request(pDoc, createInstanceOp.getObjectName(), createInstanceOp.getInstance());
 				} else if (op instanceof CIMCreateNameSpaceOp) {
 					CIMCreateNameSpaceOp createNameSpaceOp = (CIMCreateNameSpaceOp) op;
 
 					String namespace = createNameSpaceOp.getNameSpace();
 					int j = namespace.lastIndexOf('/');
 
-					if (j < 0) throw new WBEMException(WBEMException.CIM_ERR_NOT_FOUND,
-							"Invalid namespace. Must contain at least /");
+					if (j < 0) throw new WBEMException(
+						WBEMException.CIM_ERR_NOT_FOUND,
+						"Invalid namespace. Must contain at least /"
+					);
 					String parentNs = namespace.substring(0, j);
 					namespace = namespace.substring(j + 1);
 
@@ -1768,16 +1772,23 @@ public Element performBatchOperation_request(Document pDoc, Vector
 					 * Vector(); v.add(prop); inst.setProperties(v);
 					 */
 
-					CIMInstance inst = new CIMInstance(new CIMObjectPath(null, null, null, null,
-							"CIM_NameSpace", null), new CIMProperty[] { new CIMProperty(
-							"NameSpace", CIMDataType.STRING_T, namespace, true, false, null) });
+					CIMInstance inst = new CIMInstance(
+						new CIMObjectPath(null, null, null, null, "CIM_NameSpace", null),
+						new CIMProperty[] {
+							new CIMProperty("NameSpace", CIMDataType.STRING_T, namespace, true, false, null)
+						}
+					);
 					CIMObjectPath object = new CIMObjectPath(null, null, null, parentNs, null, null);
 
 					requestE = createInstance_request(pDoc, object, inst);
 				} else if (op instanceof CIMCreateQualifierTypeOp) {
 					CIMCreateQualifierTypeOp createQualifierTypeOp = (CIMCreateQualifierTypeOp) op;
-					requestE = createQualifierType_request(pDoc, createQualifierTypeOp
-							.getObjectName(), createQualifierTypeOp.getQualifierType());
+					requestE =
+						createQualifierType_request(
+							pDoc,
+							createQualifierTypeOp.getObjectName(),
+							createQualifierTypeOp.getQualifierType()
+						);
 				} else if (op instanceof CIMDeleteClassOp) {
 					CIMDeleteClassOp deleteClassOp = (CIMDeleteClassOp) op;
 					requestE = deleteClass_request(pDoc, deleteClassOp.getObjectName());
@@ -1789,99 +1800,163 @@ public Element performBatchOperation_request(Document pDoc, Vector
 					requestE = deleteClass_request(pDoc, deleteQualifierTypeOp.getObjectName());
 				} else if (op instanceof CIMEnumClassesOp) {
 					CIMEnumClassesOp enumClassesOp = (CIMEnumClassesOp) op;
-					requestE = enumerateClasses_request(pDoc, enumClassesOp.getObjectName(),
-							enumClassesOp.isDeep(), enumClassesOp.isLocalOnly(), enumClassesOp
-									.isIncludeQualifiers(), enumClassesOp.isIncludeClassOrigin());
+					requestE =
+						enumerateClasses_request(
+							pDoc,
+							enumClassesOp.getObjectName(),
+							enumClassesOp.isDeep(),
+							enumClassesOp.isLocalOnly(),
+							enumClassesOp.isIncludeQualifiers(),
+							enumClassesOp.isIncludeClassOrigin()
+						);
 				} else if (op instanceof CIMEnumClassNamesOp) {
 					CIMEnumClassNamesOp enumClassNamesOp = (CIMEnumClassNamesOp) op;
-					requestE = enumerateClassNames_request(pDoc, enumClassNamesOp.getObjectName(),
-							enumClassNamesOp.isDeep());
+					requestE = enumerateClassNames_request(pDoc, enumClassNamesOp.getObjectName(), enumClassNamesOp.isDeep());
 				} else if (op instanceof CIMEnumInstanceNamesOp) {
 					CIMEnumInstanceNamesOp enumInstanceNamesOp = (CIMEnumInstanceNamesOp) op;
-					requestE = enumerateInstanceNames_request(pDoc, enumInstanceNamesOp
-							.getObjectName());
+					requestE = enumerateInstanceNames_request(pDoc, enumInstanceNamesOp.getObjectName());
 				} else if (op instanceof CIMEnumInstancesOp) {
 					CIMEnumInstancesOp enumInstancesOp = (CIMEnumInstancesOp) op;
-					requestE = enumerateInstances_request(pDoc, enumInstancesOp.getObjectName(),
-							enumInstancesOp.isDeep(), enumInstancesOp.isLocalOnly(),
-							enumInstancesOp.isIncludeQualifiers(), enumInstancesOp
-									.isIncludeClassOrigin(), enumInstancesOp.getPropertyList());
+					requestE =
+						enumerateInstances_request(
+							pDoc,
+							enumInstancesOp.getObjectName(),
+							enumInstancesOp.isDeep(),
+							enumInstancesOp.isLocalOnly(),
+							enumInstancesOp.isIncludeQualifiers(),
+							enumInstancesOp.isIncludeClassOrigin(),
+							enumInstancesOp.getPropertyList()
+						);
 				} else if (op instanceof CIMEnumNameSpaceOp) {
 					CIMEnumNameSpaceOp enumNameSpaceOp = (CIMEnumNameSpaceOp) op;
 					// ebak: here we have to set CIMObjectPath's objectname
 					// enumNameSpaceOp.getObjectName().setObjectName("CIM_NameSpace");
 					CIMObjectPath objPath = enumNameSpaceOp.getObjectName();
-					objPath = new CIMObjectPath(objPath.getScheme(), objPath.getHost(), objPath
-							.getPort(), objPath.getNamespace(), "CIM_NameSpace", objPath.getKeys());
+					objPath =
+						new CIMObjectPath(
+							objPath.getScheme(),
+							objPath.getHost(),
+							objPath.getPort(),
+							objPath.getNamespace(),
+							"CIM_NameSpace",
+							objPath.getKeys()
+						);
 					requestE = enumerateInstanceNames_request(pDoc, enumNameSpaceOp.getObjectName());
 				} else if (op instanceof CIMEnumQualifierTypesOp) {
 					CIMEnumQualifierTypesOp enumQualifierTypesOp = (CIMEnumQualifierTypesOp) op;
-					requestE = enumQualifierTypes_request(pDoc, enumQualifierTypesOp
-							.getObjectName());
+					requestE = enumQualifierTypes_request(pDoc, enumQualifierTypesOp.getObjectName());
 				} else if (op instanceof CIMExecQueryOp) {
 					CIMExecQueryOp execQueryOp = (CIMExecQueryOp) op;
-					requestE = execQuery_request(pDoc, execQueryOp.getObjectName(), execQueryOp
-							.getQuery(), execQueryOp.getQueryLanguage());
+					requestE =
+						execQuery_request(
+							pDoc,
+							execQueryOp.getObjectName(),
+							execQueryOp.getQuery(),
+							execQueryOp.getQueryLanguage()
+						);
 				} else if (op instanceof CIMGetPropertyOp) {
 					CIMGetPropertyOp getPropertyOp = (CIMGetPropertyOp) op;
-					requestE = getInstance_request(pDoc, getPropertyOp.getObjectName(), false,
-							false, false, new String[] { getPropertyOp.getPropertyName() });
-
+					requestE =
+						getInstance_request(
+							pDoc,
+							getPropertyOp.getObjectName(),
+							false,
+							false,
+							false,
+							new String[] { getPropertyOp.getPropertyName() }
+						);
 				} else if (op instanceof CIMGetClassOp) {
 					CIMGetClassOp getClassOp = (CIMGetClassOp) op;
-					requestE = getClass_request(pDoc, getClassOp.getObjectName(), getClassOp
-							.isLocalOnly(), getClassOp.isIncludeQualifiers(), getClassOp
-							.isIncludeClassOrigin(), getClassOp.getPropertyList());
+					requestE =
+						getClass_request(
+							pDoc,
+							getClassOp.getObjectName(),
+							getClassOp.isLocalOnly(),
+							getClassOp.isIncludeQualifiers(),
+							getClassOp.isIncludeClassOrigin(),
+							getClassOp.getPropertyList()
+						);
 				} else if (op instanceof CIMGetInstanceOp) {
 					CIMGetInstanceOp getInstanceOp = (CIMGetInstanceOp) op;
-					requestE = getInstance_request(pDoc, getInstanceOp.getObjectName(),
-							getInstanceOp.isLocalOnly(), getInstanceOp.isIncludeQualifiers(),
-							getInstanceOp.isIncludeClassOrigin(), getInstanceOp.getPropertyList());
+					requestE =
+						getInstance_request(
+							pDoc,
+							getInstanceOp.getObjectName(),
+							getInstanceOp.isLocalOnly(),
+							getInstanceOp.isIncludeQualifiers(),
+							getInstanceOp.isIncludeClassOrigin(),
+							getInstanceOp.getPropertyList()
+						);
 				} else if (op instanceof CIMGetQualifierTypeOp) {
 					CIMGetQualifierTypeOp getQualifierTypeOp = (CIMGetQualifierTypeOp) op;
-					requestE = getQualifier_request(pDoc, getQualifierTypeOp.getObjectName(),
-							getQualifierTypeOp.getQualifierType());
+					requestE =
+						getQualifier_request(pDoc, getQualifierTypeOp.getObjectName(), getQualifierTypeOp.getQualifierType());
 				} else if (op instanceof CIMInvokeMethodOp) {
 					CIMInvokeMethodOp invokeMethodOp = (CIMInvokeMethodOp) op;
-					requestE = invokeMethod_request(pDoc, invokeMethodOp.getObjectName(),
-							invokeMethodOp.getMethodCall(), invokeMethodOp.getInParams());
+					requestE =
+						invokeMethod_request(
+							pDoc,
+							invokeMethodOp.getObjectName(),
+							invokeMethodOp.getMethodCall(),
+							invokeMethodOp.getInParams()
+						);
 				} else if (op instanceof CIMReferenceNamesOp) {
 					CIMReferenceNamesOp referenceNamesOp = (CIMReferenceNamesOp) op;
-					requestE = referenceNames_request(pDoc, referenceNamesOp.getObjectName(),
-							referenceNamesOp.getResultClass(), referenceNamesOp.getResultRole());
+					requestE =
+						referenceNames_request(
+							pDoc,
+							referenceNamesOp.getObjectName(),
+							referenceNamesOp.getResultClass(),
+							referenceNamesOp.getResultRole()
+						);
 				} else if (op instanceof CIMReferencesOp) {
 					CIMReferencesOp referencesOp = (CIMReferencesOp) op;
-					requestE = references_request(pDoc, referencesOp.getObjectName(), referencesOp
-							.getResultClass(), referencesOp.getRole(), referencesOp
-							.isIncludeQualifiers(), referencesOp.isIncludeClassOrigin(),
-							referencesOp.getPropertyList());
+					requestE =
+						references_request(
+							pDoc,
+							referencesOp.getObjectName(),
+							referencesOp.getResultClass(),
+							referencesOp.getRole(),
+							referencesOp.isIncludeQualifiers(),
+							referencesOp.isIncludeClassOrigin(),
+							referencesOp.getPropertyList()
+						);
 				} else if (op instanceof CIMSetClassOp) {
 					CIMSetClassOp setClassOp = (CIMSetClassOp) op;
-					requestE = setClass_request(pDoc, setClassOp.getObjectName(), setClassOp
-							.getCimClass());
+					requestE = setClass_request(pDoc, setClassOp.getObjectName(), setClassOp.getCimClass());
 				} else if (op instanceof CIMSetInstanceOp) {
 					CIMSetInstanceOp setInstanceOp = (CIMSetInstanceOp) op;
-					requestE = setInstance_request(pDoc, setInstanceOp.getObjectName(),
-							setInstanceOp.getInstance(), setInstanceOp.isIncludeQualifiers(),
-							setInstanceOp.getPropertyList());
+					requestE =
+						setInstance_request(
+							pDoc,
+							setInstanceOp.getObjectName(),
+							setInstanceOp.getInstance(),
+							setInstanceOp.isIncludeQualifiers(),
+							setInstanceOp.getPropertyList()
+						);
 				} else if (op instanceof CIMSetPropertyOp) {
 					CIMSetPropertyOp setPropertyOp = (CIMSetPropertyOp) op;
-					requestE = setProperty_request(pDoc, setPropertyOp.getObjectName(),
-							setPropertyOp.getPropertyName(), setPropertyOp.getCimValue());
+					requestE =
+						setProperty_request(
+							pDoc,
+							setPropertyOp.getObjectName(),
+							setPropertyOp.getPropertyName(),
+							setPropertyOp.getCimValue()
+						);
 				} else if (op instanceof CIMSetQualifierTypeOp) {
 					CIMSetQualifierTypeOp setQualifierTypeOp = (CIMSetQualifierTypeOp) op;
-					requestE = setQualifierType_request(pDoc, setQualifierTypeOp.getObjectName(),
-							setQualifierTypeOp.getQualifierType());
+					requestE =
+						setQualifierType_request(pDoc, setQualifierTypeOp.getObjectName(), setQualifierTypeOp.getQualifierType());
 				}
 				if (requestE == null) throw new WBEMException(
-						WBEMException.CIM_ERR_INVALID_PARAMETER, "Illegal batch operation number ("
-								+ i + ") " + op.getClass());
+					WBEMException.CIM_ERR_INVALID_PARAMETER,
+					"Illegal batch operation number (" + i + ") " + op.getClass()
+				);
 				messageE.appendChild(requestE);
 			} catch (WBEMException e) {
 				throw e;
 			} catch (Exception e) {
-				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "At batch operation (" + i
-						+ ')', null, e);
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "At batch operation (" + i + ')', null, e);
 			}
 			i++;
 		}
@@ -1891,7 +1966,7 @@ public Element performBatchOperation_request(Document pDoc, Vector
 	/**
 	 * Sets the message id counter to a given value. For use in units tests
 	 * only.
-	 * 
+	 *
 	 * @param pId
 	 *            The new value
 	 */
@@ -1904,7 +1979,7 @@ public void setId(int pId) {
 	 * the current thread it will choose a start value randomly. Afterwards the
 	 * id is incremented by 1. Be aware that different threads will have
 	 * distinct id counters.
-	 * 
+	 *
 	 * @return The next message id
 	 */
 	private int getNextId() {
@@ -1916,7 +1991,7 @@ private int getNextId() {
 
 	/**
 	 * pAssociatorPaths_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pAssocClass
@@ -1931,22 +2006,28 @@ private int getNextId() {
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element OpenAssociatorInstancePaths_request(Document pDoc, CIMObjectPath pPath,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
+	public Element OpenAssociatorInstancePaths_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pAssocClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pOperationTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjectCount
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenAssociatorInstancePaths");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "OpenAssociatorInstancePaths");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				INSTANCE_NAME);
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, INSTANCE_NAME);
 		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
 
 		if (pAssocClass != null) {
@@ -1966,8 +2047,7 @@ public Element OpenAssociatorInstancePaths_request(Document pDoc, CIMObjectPath
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
 		}
 		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY_LANGUAGE);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
 		}
 		if (pFilterQuery != null) {
@@ -1975,8 +2055,7 @@ public Element OpenAssociatorInstancePaths_request(Document pDoc, CIMObjectPath
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
 		}
 		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, OPERATION_TIMEOUT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
 		}
 
@@ -1984,8 +2063,7 @@ public Element OpenAssociatorInstancePaths_request(Document pDoc, CIMObjectPath
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
 
 		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
 		}
 
@@ -1994,7 +2072,7 @@ public Element OpenAssociatorInstancePaths_request(Document pDoc, CIMObjectPath
 
 	/**
 	 * OpenAssociatorInstances_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pAssocClass
@@ -2011,24 +2089,31 @@ public Element OpenAssociatorInstancePaths_request(Document pDoc, CIMObjectPath
 	 * @return Element OpenAssociatorInstances_request
 	 * @throws WBEMException
 	 */
-	public Element OpenAssociatorInstances_request(Document pDoc, CIMObjectPath pPath,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeClassOrigin, String[] pPropertyList, String pFilterQueryLanguage,
-			String pFilterQuery, UnsignedInteger32 pOperationTimeout, boolean pContinueOnError,
-			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
+	public Element OpenAssociatorInstances_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pAssocClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pOperationTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjectCount
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
 
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenAssociatorInstances");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "OpenAssociatorInstances");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				INSTANCE_NAME);
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, INSTANCE_NAME);
 		// createINSTANCENAME will take care of keyBindings
 		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
 
@@ -2048,19 +2133,16 @@ public Element OpenAssociatorInstances_request(Document pDoc, CIMObjectPath pPat
 			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RESULT_ROLE);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pResultRole);
 		}
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
 			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, PROPERTY_LIST);
 			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++)
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			for (int i = 0; i < pPropertyList.length; i++) CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
 		}
 		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY_LANGUAGE);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
 		}
 		if (pFilterQuery != null) {
@@ -2068,8 +2150,7 @@ public Element OpenAssociatorInstances_request(Document pDoc, CIMObjectPath pPat
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
 		}
 		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, OPERATION_TIMEOUT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
 		}
 
@@ -2077,8 +2158,7 @@ public Element OpenAssociatorInstances_request(Document pDoc, CIMObjectPath pPat
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
 
 		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
 		}
 
@@ -2087,7 +2167,7 @@ public Element OpenAssociatorInstances_request(Document pDoc, CIMObjectPath pPat
 
 	/**
 	 * OpenEnumerateInstancePaths_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pFilterQueryLanguage
@@ -2098,25 +2178,28 @@ public Element OpenAssociatorInstances_request(Document pDoc, CIMObjectPath pPat
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element OpenEnumerateInstancePaths_request(Document pDoc, CIMObjectPath pPath,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
+	public Element OpenEnumerateInstancePaths_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pOperationTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjectCount
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenEnumerateInstancePaths");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "OpenEnumerateInstancePaths");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CLASS_NAME);
 		CIMXMLBuilderImpl.createCLASSNAME(pDoc, iparamvalueE, className);
 
 		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY_LANGUAGE);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
 		}
 		if (pFilterQuery != null) {
@@ -2124,8 +2207,7 @@ public Element OpenEnumerateInstancePaths_request(Document pDoc, CIMObjectPath p
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
 		}
 		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, OPERATION_TIMEOUT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
 		}
 
@@ -2133,8 +2215,7 @@ public Element OpenEnumerateInstancePaths_request(Document pDoc, CIMObjectPath p
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
 
 		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
 		}
 
@@ -2143,7 +2224,7 @@ public Element OpenEnumerateInstancePaths_request(Document pDoc, CIMObjectPath p
 
 	/**
 	 * OpenEnumerateInstances_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pPropertyList
@@ -2157,18 +2238,24 @@ public Element OpenEnumerateInstancePaths_request(Document pDoc, CIMObjectPath p
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element OpenEnumerateInstances_request(Document pDoc, CIMObjectPath pPath,
-			boolean pDeepInheritance, boolean pIncludeClassOrigin, String[] pPropertyList,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
+	public Element OpenEnumerateInstances_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		boolean pDeepInheritance,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pOperationTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjectCount
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenEnumerateInstances");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "OpenEnumerateInstances");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, CLASS_NAME);
@@ -2177,20 +2264,17 @@ public Element OpenEnumerateInstances_request(Document pDoc, CIMObjectPath pPath
 		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, DEEP_INHERITANCE);
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pDeepInheritance);
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
 			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, PROPERTY_LIST);
 			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++)
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			for (int i = 0; i < pPropertyList.length; i++) CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
 		}
 
 		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY_LANGUAGE);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
 		}
 		if (pFilterQuery != null) {
@@ -2198,8 +2282,7 @@ public Element OpenEnumerateInstances_request(Document pDoc, CIMObjectPath pPath
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
 		}
 		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, OPERATION_TIMEOUT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
 		}
 
@@ -2207,8 +2290,7 @@ public Element OpenEnumerateInstances_request(Document pDoc, CIMObjectPath pPath
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
 
 		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
 		}
 
@@ -2217,60 +2299,51 @@ public Element OpenEnumerateInstances_request(Document pDoc, CIMObjectPath pPath
 
 	/**
 	 * EnumerationCount_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pEnumerationContext
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element EnumerationCount_request(Document pDoc, CIMObjectPath pPath,
-			String pEnumerationContext) throws WBEMException {
-
+	public Element EnumerationCount_request(Document pDoc, CIMObjectPath pPath, String pEnumerationContext)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"EnumerationCount");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "EnumerationCount");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		if (pEnumerationContext != null) {
-			Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					ENUMERATION_CONTEXT);
+			Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ENUMERATION_CONTEXT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pEnumerationContext);
 		}
 
 		return simplereqE;
-
 	}
 
 	/**
 	 * CloseEnumeration_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pEnumerationContext
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public Element CloseEnumeration_request(Document pDoc, CIMObjectPath pPath,
-			String pEnumerationContext) throws WBEMException {
-
+	public Element CloseEnumeration_request(Document pDoc, CIMObjectPath pPath, String pEnumerationContext)
+		throws WBEMException {
 		String className = pPath.getObjectName();
 
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"CloseEnumeration");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "CloseEnumeration");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		if (pEnumerationContext != null) {
-			Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					ENUMERATION_CONTEXT);
+			Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ENUMERATION_CONTEXT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pEnumerationContext);
 		}
 		return simplereqE;
@@ -2278,7 +2351,7 @@ public Element CloseEnumeration_request(Document pDoc, CIMObjectPath pPath,
 
 	/**
 	 * referencePaths_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pResultClass
@@ -2291,22 +2364,26 @@ public Element CloseEnumeration_request(Document pDoc, CIMObjectPath pPath,
 	 * @return Element referencePaths_request
 	 * @throws WBEMException
 	 */
-	public Element OpenReferenceInstancePaths_request(Document pDoc, CIMObjectPath pPath,
-			String pResultClass, String pRole, String pFilterQueryLanguage, String pFilterQuery,
-			UnsignedInteger32 pOperationTimeout, boolean pContinueOnError,
-			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
+	public Element OpenReferenceInstancePaths_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pResultClass,
+		String pRole,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pOperationTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjectCount
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenReferenceInstancePaths");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "OpenReferenceInstancePaths");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				INSTANCE_NAME);
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, INSTANCE_NAME);
 		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
 
 		if (pResultClass != null) {
@@ -2318,8 +2395,7 @@ public Element OpenReferenceInstancePaths_request(Document pDoc, CIMObjectPath p
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
 		}
 		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY_LANGUAGE);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
 		}
 		if (pFilterQuery != null) {
@@ -2327,8 +2403,7 @@ public Element OpenReferenceInstancePaths_request(Document pDoc, CIMObjectPath p
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
 		}
 		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, OPERATION_TIMEOUT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
 		}
 
@@ -2336,18 +2411,16 @@ public Element OpenReferenceInstancePaths_request(Document pDoc, CIMObjectPath p
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
 
 		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
 		}
 
 		return simplereqE;
-
 	}
 
 	/**
 	 * references_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pResultClass
@@ -2362,22 +2435,28 @@ public Element OpenReferenceInstancePaths_request(Document pDoc, CIMObjectPath p
 	 * @return Element references_request
 	 * @throws WBEMException
 	 */
-	public Element OpenReferenceInstances_request(Document pDoc, CIMObjectPath pPath,
-			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pOperationTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
+	public Element OpenReferenceInstances_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pOperationTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjectCount
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenReferenceInstances");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "OpenReferenceInstances");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
-		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				INSTANCE_NAME);
+		Element iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, INSTANCE_NAME);
 		CIMXMLBuilderImpl.createINSTANCENAME(pDoc, iparamvalueE, pPath);
 
 		if (pResultClass != null) {
@@ -2389,20 +2468,17 @@ public Element OpenReferenceInstances_request(Document pDoc, CIMObjectPath pPath
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pRole);
 		}
 
-		iparamvalueE = CIMXMLBuilderImpl
-				.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, INCLUDE_CLASS_ORIGIN);
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pIncludeClassOrigin);
 
 		if (pPropertyList != null) {
 			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, PROPERTY_LIST);
 			Element valuearrayE = CIMXMLBuilderImpl.createVALUEARRAY(pDoc, iparamvalueE);
-			for (int i = 0; i < pPropertyList.length; i++)
-				CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
+			for (int i = 0; i < pPropertyList.length; i++) CIMXMLBuilderImpl.createVALUE(pDoc, valuearrayE, pPropertyList[i]);
 		}
 
 		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY_LANGUAGE);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
 		}
 		if (pFilterQuery != null) {
@@ -2410,8 +2486,7 @@ public Element OpenReferenceInstances_request(Document pDoc, CIMObjectPath pPath
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
 		}
 		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, OPERATION_TIMEOUT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
 		}
 
@@ -2419,8 +2494,7 @@ public Element OpenReferenceInstances_request(Document pDoc, CIMObjectPath pPath
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
 
 		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
 		}
 
@@ -2429,7 +2503,7 @@ public Element OpenReferenceInstances_request(Document pDoc, CIMObjectPath pPath
 
 	/**
 	 * OpenQueryInstances_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pFilterQuery
@@ -2442,18 +2516,23 @@ public Element OpenReferenceInstances_request(Document pDoc, CIMObjectPath pPath
 	 * @return Element OpenQueryInstances_request
 	 * @throws WBEMException
 	 */
-	public Element OpenQueryInstances_request(Document pDoc, CIMObjectPath pPath,
-			String pFilterQuery, String pFilterQueryLanguage, boolean pReturnQueryResultClass,
-			UnsignedInteger32 pOperationTimeout, boolean pContinueOnError,
-			UnsignedInteger32 pMaxObjectCount, CIMClass pQueryResultClass) throws WBEMException {
-
+	public Element OpenQueryInstances_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pFilterQuery,
+		String pFilterQueryLanguage,
+		boolean pReturnQueryResultClass,
+		UnsignedInteger32 pOperationTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjectCount,
+		CIMClass pQueryResultClass
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"OpenQueryInstances");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "OpenQueryInstances");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		Element iparamvalueE;
@@ -2463,17 +2542,14 @@ public Element OpenQueryInstances_request(Document pDoc, CIMObjectPath pPath,
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQuery);
 		}
 		if (pFilterQueryLanguage != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					FILTER_QUERY_LANGUAGE);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, FILTER_QUERY_LANGUAGE);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pFilterQueryLanguage);
 		}
-		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-				RETURN_QUERY_RESULT_CLASS);
+		iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, RETURN_QUERY_RESULT_CLASS);
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pReturnQueryResultClass);
 
 		if (pOperationTimeout != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					OPERATION_TIMEOUT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, OPERATION_TIMEOUT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pOperationTimeout);
 		}
 
@@ -2481,13 +2557,11 @@ public Element OpenQueryInstances_request(Document pDoc, CIMObjectPath pPath,
 		CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContinueOnError);
 
 		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
 		}
 		if (pQueryResultClass != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					QUERY_RESULT_CLASS);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, QUERY_RESULT_CLASS);
 			CIMXMLBuilderImpl.createCLASS(pDoc, iparamvalueE, pQueryResultClass);
 		}
 		return simplereqE;
@@ -2495,7 +2569,7 @@ public Element OpenQueryInstances_request(Document pDoc, CIMObjectPath pPath,
 
 	/**
 	 * PullInstancesWithPath_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pContext
@@ -2503,29 +2577,29 @@ public Element OpenQueryInstances_request(Document pDoc, CIMObjectPath pPath,
 	 * @return Element PullInstancesWithPath_request
 	 * @throws WBEMException
 	 */
-	public Element PullInstancesWithPath_request(Document pDoc, CIMObjectPath pPath,
-			String pContext, UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
+	public Element PullInstancesWithPath_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pContext,
+		UnsignedInteger32 pMaxObjectCount
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"PullInstancesWithPath");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "PullInstancesWithPath");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		Element iparamvalueE;
 
 		if (pContext != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					ENUMERATION_CONTEXT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ENUMERATION_CONTEXT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContext);
 		}
 
 		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
 		}
 
@@ -2534,7 +2608,7 @@ public Element PullInstancesWithPath_request(Document pDoc, CIMObjectPath pPath,
 
 	/**
 	 * PullInstancePaths_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pContext
@@ -2542,30 +2616,30 @@ public Element PullInstancesWithPath_request(Document pDoc, CIMObjectPath pPath,
 	 * @return Element PullInstancePaths
 	 * @throws WBEMException
 	 */
-	public Element PullInstancePaths_request(Document pDoc, CIMObjectPath pPath, String pContext,
-			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
-
+	public Element PullInstancePaths_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pContext,
+		UnsignedInteger32 pMaxObjectCount
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
 
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"PullInstancePaths");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "PullInstancePaths");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		Element iparamvalueE;
 
 		if (pContext != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					ENUMERATION_CONTEXT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ENUMERATION_CONTEXT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContext);
 		}
 
 		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
 		}
 
@@ -2574,7 +2648,7 @@ public Element PullInstancePaths_request(Document pDoc, CIMObjectPath pPath, Str
 
 	/**
 	 * PullInstances_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pPath
 	 * @param pContext
@@ -2582,29 +2656,30 @@ public Element PullInstancePaths_request(Document pDoc, CIMObjectPath pPath, Str
 	 * @return Element PullInstances_request
 	 * @throws WBEMException
 	 */
-	public Element PullInstances_request(Document pDoc, CIMObjectPath pPath, String pContext,
-			UnsignedInteger32 pMaxObjectCount) throws WBEMException {
+	public Element PullInstances_request(
+		Document pDoc,
+		CIMObjectPath pPath,
+		String pContext,
+		UnsignedInteger32 pMaxObjectCount
+	)
+		throws WBEMException {
 		String className = pPath.getObjectName();
 
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
-		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE,
-				"PullInstances");
+		Element imethodcallE = CIMXMLBuilderImpl.createIMETHODCALL(pDoc, simplereqE, "PullInstances");
 		CIMXMLBuilderImpl.createLOCALNAMESPACEPATH(pDoc, imethodcallE, pPath);
 
 		Element iparamvalueE;
 
 		if (pContext != null) {
-			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE,
-					ENUMERATION_CONTEXT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, ENUMERATION_CONTEXT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pContext);
 		}
 
 		if (pMaxObjectCount != null) {
-			iparamvalueE = CIMXMLBuilderImpl
-					.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
+			iparamvalueE = CIMXMLBuilderImpl.createIPARAMVALUE(pDoc, imethodcallE, MAX_OBJECT_COUNT);
 			CIMXMLBuilderImpl.createVALUE(pDoc, iparamvalueE, pMaxObjectCount);
 		}
 
@@ -2613,19 +2688,16 @@ public Element PullInstances_request(Document pDoc, CIMObjectPath pPath, String
 
 	/**
 	 * sendIndication_request
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pIndication
 	 * @return Element sendIndication_request
 	 * @throws WBEMException
 	 */
-	public Element sendIndication_request(Document pDoc, CIMInstance pIndication)
-			throws WBEMException {
+	public Element sendIndication_request(Document pDoc, CIMInstance pIndication) throws WBEMException {
 		Element simpleexpreqE = CIMXMLBuilderImpl.createSIMPLEEXPREQ(pDoc);
-		Element expmethodcallE = CIMXMLBuilderImpl.createEXPMETHODCALL(pDoc, simpleexpreqE,
-				"ExportIndication");
-		Element expparamvalueE = CIMXMLBuilderImpl.createEXPPARAMVALUE(pDoc, expmethodcallE,
-				"NewIndication");
+		Element expmethodcallE = CIMXMLBuilderImpl.createEXPMETHODCALL(pDoc, simpleexpreqE, "ExportIndication");
+		Element expparamvalueE = CIMXMLBuilderImpl.createEXPPARAMVALUE(pDoc, expmethodcallE, "NewIndication");
 
 		CIMXMLBuilderImpl.createINSTANCE(pDoc, expparamvalueE, pIndication);
 
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java
index b064249..9b091d4 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMMessage.java
@@ -46,14 +46,12 @@
  */
 
 import java.util.Hashtable;
-
 import org.w3c.dom.Document;
 
 /**
  * Class CIMMessage is used by the CIM-XML DOM parser.
  */
 public class CIMMessage {
-
 	protected Document iDoc;
 
 	protected Hashtable iElements;
@@ -74,11 +72,13 @@ public class CIMMessage {
 
 	protected boolean iIsRequest = false;
 
-	protected CIMMessage() { /**/}
+	protected CIMMessage() {
+		/**/
+	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pCimVersion
 	 * @param pDtdVersion
 	 * @param pId
@@ -93,7 +93,7 @@ public CIMMessage(String pCimVersion, String pDtdVersion, String pId, String pMe
 
 	/**
 	 * getCIMVersion
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getCIMVersion() {
@@ -102,7 +102,7 @@ public String getCIMVersion() {
 
 	/**
 	 * getDTDVersion
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getDTDVersion() {
@@ -111,7 +111,7 @@ public String getDTDVersion() {
 
 	/**
 	 * isCIMOperation
-	 * 
+	 *
 	 * @return String
 	 */
 	public boolean isCIMOperation() {
@@ -120,7 +120,7 @@ public boolean isCIMOperation() {
 
 	/**
 	 * isCIMExport
-	 * 
+	 *
 	 * @return String
 	 */
 	public boolean isCIMExport() {
@@ -129,7 +129,7 @@ public boolean isCIMExport() {
 
 	/**
 	 * setId
-	 * 
+	 *
 	 * @param pId
 	 */
 	public void setId(String pId) {
@@ -138,21 +138,19 @@ public void setId(String pId) {
 
 	/**
 	 * setMethod
-	 * 
+	 *
 	 * @param pMethod
 	 */
 	public void setMethod(String pMethod) {
-
 		this.iMethod = pMethod;
-		this.iIsCIMExport = (pMethod.toUpperCase().endsWith("EXPREQ") || pMethod.toUpperCase()
-				.endsWith("EXPRSP"));
+		this.iIsCIMExport = (pMethod.toUpperCase().endsWith("EXPREQ") || pMethod.toUpperCase().endsWith("EXPRSP"));
 		this.iIsRequest = (pMethod.toUpperCase().endsWith("REQ"));
 		this.iIsSimple = pMethod.toUpperCase().startsWith("SIMPLE");
 	}
 
 	/**
 	 * setCIMVersion
-	 * 
+	 *
 	 * @param pCimVersion
 	 */
 	public void setCIMVersion(String pCimVersion) {
@@ -161,7 +159,7 @@ public void setCIMVersion(String pCimVersion) {
 
 	/**
 	 * setDTDVersion
-	 * 
+	 *
 	 * @param pDtdVersion
 	 */
 	public void setDTDVersion(String pDtdVersion) {
@@ -170,7 +168,7 @@ public void setDTDVersion(String pDtdVersion) {
 
 	/**
 	 * setIsRequest
-	 * 
+	 *
 	 * @param pValue
 	 */
 	public void setIsRequest(boolean pValue) {
@@ -179,7 +177,7 @@ public void setIsRequest(boolean pValue) {
 
 	/**
 	 * getId
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getId() {
@@ -188,7 +186,7 @@ public String getId() {
 
 	/**
 	 * getProtocolVersion
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getProtocolVersion() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java
index a87d204..e5bc5fe 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMRequest.java
@@ -46,15 +46,13 @@
  */
 
 import java.util.Vector;
-
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 
 /**
  * Class CIMRequest is used by the CIM-XML DOM parser.
- * 
+ *
  */
 public class CIMRequest extends CIMMessage {
-
 	protected Vector iRequests = new Vector(0);
 
 	protected Vector iParamValue = new Vector(0);
@@ -68,11 +66,13 @@ public class CIMRequest extends CIMMessage {
 	/**
 	 * Ctor.
 	 */
-	public CIMRequest() { /**/}
+	public CIMRequest() {
+		/**/
+	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pCimVersion
 	 * @param pDtdVersion
 	 * @param pId
@@ -84,17 +84,16 @@ public CIMRequest(String pCimVersion, String pDtdVersion, String pId, String pMe
 
 	/**
 	 * addParamValue
-	 * 
+	 *
 	 * @param v
 	 */
 	public void addParamValue(Object v) {
-		if (v instanceof Vector) this.iParamValue.addAll((Vector) v);
-		else this.iParamValue.add(v);
+		if (v instanceof Vector) this.iParamValue.addAll((Vector) v); else this.iParamValue.add(v);
 	}
 
 	/**
 	 * addRequest
-	 * 
+	 *
 	 * @param request
 	 */
 	public void addRequest(CIMRequest request) {
@@ -103,7 +102,7 @@ public void addRequest(CIMRequest request) {
 
 	/**
 	 * getMethodName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getMethodName() {
@@ -112,7 +111,7 @@ public String getMethodName() {
 
 	/**
 	 * getNameSpace
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getNameSpace() {
@@ -121,7 +120,7 @@ public String getNameSpace() {
 
 	/**
 	 * getObjectPath
-	 * 
+	 *
 	 * @return String
 	 */
 	public CIMObjectPath getObjectPath() {
@@ -130,7 +129,7 @@ public CIMObjectPath getObjectPath() {
 
 	/**
 	 * getParamValue
-	 * 
+	 *
 	 * @return String
 	 */
 	public Vector getParamValue() {
@@ -139,7 +138,7 @@ public Vector getParamValue() {
 
 	/**
 	 * setMethodName
-	 * 
+	 *
 	 * @param methodName
 	 */
 	public void setMethodName(String methodName) {
@@ -148,7 +147,7 @@ public void setMethodName(String methodName) {
 
 	/**
 	 * setNameSpace
-	 * 
+	 *
 	 * @param namespace
 	 */
 	public void setNameSpace(String namespace) {
@@ -157,7 +156,7 @@ public void setNameSpace(String namespace) {
 
 	/**
 	 * setObjectPath
-	 * 
+	 *
 	 * @param path
 	 */
 	public void setObjectPath(CIMObjectPath path) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java
index 22cab16..7206e5e 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMResponse.java
@@ -49,14 +49,12 @@
 
 import java.util.List;
 import java.util.Vector;
-
 import org.metricshub.wbem.javax.wbem.WBEMException;
 
 /**
  * Represent a CIMReponse message.
  */
 public class CIMResponse extends CIMMessage {
-
 	protected Vector iResponses = new Vector(0);
 
 	protected WBEMException iError = null;
@@ -67,14 +65,16 @@ public class CIMResponse extends CIMMessage {
 
 	/**
 	 * Constructs a CIMResponse object.
-	 * 
+	 *
 	 */
-	public CIMResponse() { /**/}
+	public CIMResponse() {
+		/**/
+	}
 
 	/**
 	 * Constructs a CIMResponse object with the specified CIMVersion, DTDVersion
 	 * and method.
-	 * 
+	 *
 	 * @param pCimVersion
 	 * @param pDtdVersion
 	 * @param pId
@@ -86,7 +86,7 @@ public CIMResponse(String pCimVersion, String pDtdVersion, String pId, String pM
 
 	/**
 	 * Constructs a CIM Response message from a given CIM Request.
-	 * 
+	 *
 	 * @param request
 	 */
 	public CIMResponse(CIMRequest request) {
@@ -97,7 +97,7 @@ public CIMResponse(CIMRequest request) {
 
 	/**
 	 * addParamValue
-	 * 
+	 *
 	 * @param o
 	 */
 	public void addParamValue(Object o) {
@@ -106,7 +106,7 @@ public void addParamValue(Object o) {
 
 	/**
 	 * addParamValue
-	 * 
+	 *
 	 * @param v
 	 */
 	public void addParamValue(Vector v) {
@@ -115,7 +115,7 @@ public void addParamValue(Vector v) {
 
 	/**
 	 * addResponse
-	 * 
+	 *
 	 * @param response
 	 */
 	public void addResponse(CIMResponse response) {
@@ -124,7 +124,7 @@ public void addResponse(CIMResponse response) {
 
 	/**
 	 * addReturnValue
-	 * 
+	 *
 	 * @param o
 	 */
 	public void addReturnValue(Object o) {
@@ -133,7 +133,7 @@ public void addReturnValue(Object o) {
 
 	/**
 	 * Verify the status code for this CIMResponse.
-	 * 
+	 *
 	 * @throws WBEMException
 	 *             if the status code is other than success.
 	 */
@@ -143,7 +143,7 @@ public void checkError() throws WBEMException {
 
 	/**
 	 * getAllResponses
-	 * 
+	 *
 	 * @return List
 	 */
 	public List getAllResponses() {
@@ -152,7 +152,7 @@ public List getAllResponses() {
 
 	/**
 	 * getException
-	 * 
+	 *
 	 * @return WBEMException
 	 */
 	public WBEMException getException() {
@@ -161,7 +161,7 @@ public WBEMException getException() {
 
 	/**
 	 * isSuccessful
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isSuccessful() {
@@ -170,18 +170,17 @@ public boolean isSuccessful() {
 
 	/**
 	 * getFirstResponse
-	 * 
+	 *
 	 * @return CIMResponse
 	 */
 	public CIMResponse getFirstResponse() {
-		if (this.iResponses != null && this.iResponses.size() > 0) return this.iResponses
-				.elementAt(0);
+		if (this.iResponses != null && this.iResponses.size() > 0) return this.iResponses.elementAt(0);
 		return null;
 	}
 
 	/**
 	 * getParamValues
-	 * 
+	 *
 	 * @return List
 	 */
 	public List getParamValues() {
@@ -190,7 +189,7 @@ public List getParamValues() {
 
 	/**
 	 * getFirstReturnValue
-	 * 
+	 *
 	 * @return List
 	 */
 	public List getFirstReturnValue() {
@@ -199,7 +198,7 @@ public List getFirstReturnValue() {
 
 	/**
 	 * setError
-	 * 
+	 *
 	 * @param error
 	 */
 	public void setError(WBEMException error) {
@@ -208,7 +207,7 @@ public void setError(WBEMException error) {
 
 	/**
 	 * setParamValue
-	 * 
+	 *
 	 * @param paramValue
 	 */
 	public void setParamValue(Vector paramValue) {
@@ -217,11 +216,10 @@ public void setParamValue(Vector paramValue) {
 
 	/**
 	 * setReturnValue
-	 * 
+	 *
 	 * @param returnValue
 	 */
 	public void setReturnValue(Vector returnValue) {
 		this.iReturnValue = returnValue;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java
index 89e1dc7..1d6a179 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java
@@ -80,17 +80,24 @@
 import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMClassProperty;
 import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMFlavor;
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMMethod;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.cim.CIMParameter;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface;
 import org.metricshub.wbem.javax.cim.CIMQualifier;
 import org.metricshub.wbem.javax.cim.CIMQualifierType;
+import org.metricshub.wbem.javax.cim.CIMScope;
 import org.metricshub.wbem.javax.cim.CIMTypedElement;
 import org.metricshub.wbem.javax.cim.CIMValuedElement;
 import org.metricshub.wbem.javax.wbem.WBEMException;
@@ -98,16 +105,6 @@
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.metricshub.wbem.javax.cim.CIMFlavor;
-import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
-import org.metricshub.wbem.javax.cim.CIMProperty;
-import org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface;
-import org.metricshub.wbem.javax.cim.CIMScope;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
@@ -116,7 +113,6 @@
  * Class CIMXMLBuilderImpl is the core class for building CIM-XML documents.
  */
 public class CIMXMLBuilderImpl {
-
 	private static final int MAJOR_CIM_VERSION = 2;
 
 	private static final int MINOR_CIM_VERSION = 0;
@@ -127,7 +123,7 @@ public class CIMXMLBuilderImpl {
 
 	/**
 	 * createCIM
-	 * 
+	 *
 	 * @param pDoc
 	 * @return Element
 	 */
@@ -149,7 +145,7 @@ public static Element createCIM(Document pDoc) {
 
 	/**
 	 * createVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @return Element
@@ -164,7 +160,7 @@ public static Element createVALUE(Document pDoc, Element pParentE) {
 
 	/**
 	 * createVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pValue
@@ -182,7 +178,7 @@ public static Element createVALUE(Document pDoc, Element pParentE, String pValue
 
 	/**
 	 * createVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pValue
@@ -194,7 +190,7 @@ public static Element createVALUE(Document pDoc, Element pParentE, boolean pValu
 
 	/**
 	 * createVALUEARRAY
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @return Element
@@ -208,7 +204,7 @@ public static Element createVALUEARRAY(Document pDoc, Element pParentE) {
 
 	/**
 	 * createVALUEREFERENCE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @return Element
@@ -223,7 +219,7 @@ public static Element createVALUEREFERENCE(Document pDoc, Element pParentE) {
 
 	/**
 	 * createVALUEREFARRAY
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @return Element
@@ -240,7 +236,7 @@ public static Element createVALUEREFARRAY(Document pDoc, Element pParentE) {
 	// ////////////////////////////////////////////////////////////////////////////////////////
 	/**
 	 * createPROPERTY
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -265,15 +261,14 @@ public static Element createPROPERTY(Document pDoc, Element pParentE, String pNa
 
 	/**
 	 * createPROPERTYARRAY
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
 	 * @param pType
 	 * @return Element
 	 */
-	public static Element createPROPERTYARRAY(Document pDoc, Element pParentE, String pName,
-			String pType) {
+	public static Element createPROPERTYARRAY(Document pDoc, Element pParentE, String pName, String pType) {
 		// 
 		// 
 		//  0) e.setAttribute(
-				"REFERENCECLASS", pReferenceclass);
+		if (pReferenceclass != null && pReferenceclass.length() > 0) e.setAttribute("REFERENCECLASS", pReferenceclass);
 		pParentE.appendChild(e);
 		return e;
 	}
@@ -322,7 +315,7 @@ public static Element createPROPERTYREFERENCE(Document pDoc, Element pParentE, S
 
 	/**
 	 * createNAMESPACE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -341,7 +334,7 @@ public static Element createNAMESPACE(Document pDoc, Element pParentE, String pN
 
 	/**
 	 * createLOCALINSTANCEPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @return Element
@@ -355,7 +348,7 @@ public static Element createLOCALINSTANCEPATH(Document pDoc, Element pParentE) {
 
 	/**
 	 * createCLASSNAME
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -375,25 +368,22 @@ public static Element createCLASSNAME(Document pDoc, Element pParentE, String pN
 
 	/**
 	 * createCLASS
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
 	 * @param pSuperClass
 	 * @return Element
 	 */
-	public static Element createCLASS(Document pDoc, Element pParentE, String pName,
-			String pSuperClass) {
+	public static Element createCLASS(Document pDoc, Element pParentE, String pName, String pSuperClass) {
 		// 
 		// 
 		Element e = pDoc.createElement("CLASS");
 		if (pName != null) {
 			e.setAttribute("NAME", pName);
-
 		}
 		if (pSuperClass != null && pSuperClass.length() > 0) {
 			e.setAttribute("SUPERCLASS", pSuperClass);
-
 		}
 		if (pParentE != null) pParentE.appendChild(e);
 		return e;
@@ -401,7 +391,7 @@ public static Element createCLASS(Document pDoc, Element pParentE, String pName,
 
 	/**
 	 * createINSTANCENAME
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pClassName
@@ -420,7 +410,7 @@ public static Element createINSTANCENAME(Document pDoc, Element pParentE, String
 
 	/**
 	 * createKEYBINDING
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -437,18 +427,16 @@ public static Element createKEYBINDING(Document pDoc, Element pParentE, String p
 		return e;
 	}
 
-	private static final Pattern NUM_PAT = Pattern.compile("^[su]int(8|16|32|64)$",
-			Pattern.CASE_INSENSITIVE);
+	private static final Pattern NUM_PAT = Pattern.compile("^[su]int(8|16|32|64)$", Pattern.CASE_INSENSITIVE);
 
 	/**
 	 * 
 	 * getValueTypeStr
-	 * 
+	 *
 	 * @param pTypeStr
 	 * @return String
 	 */
 	private static String getValueTypeStr(String pTypeStr) {
-
 		if (pTypeStr == null || MOF.DT_STR.equalsIgnoreCase(pTypeStr)) return MOF.DT_STR;
 		if (MOF.DT_BOOL.equalsIgnoreCase(pTypeStr)) return MOF.DT_BOOL;
 		Matcher m = NUM_PAT.matcher(pTypeStr);
@@ -458,15 +446,14 @@ private static String getValueTypeStr(String pTypeStr) {
 
 	/**
 	 * createKEYVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pValueType
 	 * @param pValue
 	 * @return KEYVALUE
 	 */
-	public static Element createKEYVALUE(Document pDoc, Element pParentE, String pValueType,
-			String pValue) {
+	public static Element createKEYVALUE(Document pDoc, Element pParentE, String pValueType, String pValue) {
 		/*
 		 *  
@@ -489,7 +476,7 @@ public static Element createKEYVALUE(Document pDoc, Element pParentE, String pVa
 
 	/**
 	 * createINSTANCE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pClassName
@@ -510,15 +497,14 @@ public static Element createINSTANCE(Document pDoc, Element pParentE, String pCl
 
 	/**
 	 * createQUALIFIER
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
 	 * @param pType
 	 * @return Element
 	 */
-	public static Element createQUALIFIER(Document pDoc, Element pParentE, String pName,
-			String pType) {
+	public static Element createQUALIFIER(Document pDoc, Element pParentE, String pName, String pType) {
 		// 
 		// 
 		// 
@@ -563,7 +548,7 @@ public static Element createMESSAGE(Document pDoc, Element pParentE, String pId,
 
 	/**
 	 * createSIMPLEREQ
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @return Element
@@ -577,7 +562,7 @@ public static Element createSIMPLEREQ(Document pDoc, Element pParentE) {
 
 	/**
 	 * createSIMPLEREQ
-	 * 
+	 *
 	 * @param pDoc
 	 * @return Element
 	 */
@@ -589,7 +574,7 @@ public static Element createSIMPLEREQ(Document pDoc) {
 
 	/**
 	 * createMULTIREQ
-	 * 
+	 *
 	 * @param pDoc
 	 * @return Element
 	 */
@@ -601,7 +586,7 @@ public static Element createMULTIREQ(Document pDoc) {
 
 	/**
 	 * createMETHODCALL
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -621,15 +606,14 @@ public static Element createMETHODCALL(Document pDoc, Element pParentE, String p
 
 	/**
 	 * createPARAMVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pArg
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createPARAMVALUE(Document pDoc, Element pParentE, CIMArgument pArg)
-			throws WBEMException {
+	public static Element createPARAMVALUE(Document pDoc, Element pParentE, CIMArgument pArg) throws WBEMException {
 		// )
 		// 
@@ -648,7 +632,7 @@ public static Element createPARAMVALUE(Document pDoc, Element pParentE, CIMArgum
 
 	/**
 	 * createSIMPLERSP
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @return Element
@@ -663,7 +647,7 @@ public static Element createSIMPLERSP(Document pDoc, Element pParentE) {
 
 	/**
 	 * createSIMPLEEXPRSP
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @return Element
@@ -678,7 +662,7 @@ public static Element createSIMPLEEXPRSP(Document pDoc, Element pParentE) {
 
 	/**
 	 * createMETHODRESPONSE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -700,7 +684,7 @@ public static Element createMETHODRESPONSE(Document pDoc, Element pParentE, Stri
 
 	/**
 	 * createIMETHODRESPONSE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -721,7 +705,7 @@ public static Element createIMETHODRESPONSE(Document pDoc, Element pParentE, Str
 
 	/**
 	 * createEXPMETHODRESPONSE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -741,7 +725,7 @@ public static Element createEXPMETHODRESPONSE(Document pDoc, Element pParentE, S
 
 	/**
 	 * createIRETURNVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @return Element
@@ -762,17 +746,16 @@ public static Element createIRETURNVALUE(Document pDoc, Element pParentE) {
 	 * !ATTLIST RETURNVALUE
 	 * %ParamType;       #IMPLIED
 	 * 
-	 * 
+	 *
 	 * createRETURNVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pValue
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createRETURNVALUE(Document pDoc, Element pParentE, Object pValue)
-			throws WBEMException {
+	public static Element createRETURNVALUE(Document pDoc, Element pParentE, Object pValue) throws WBEMException {
 		Element retValE = pDoc.createElement("RETURNVALUE");
 		CIMDataType type = CIMDataType.getDataType(pValue);
 		retValE.setAttribute("PARAMTYPE", getTypeStr(type));
@@ -783,7 +766,7 @@ public static Element createRETURNVALUE(Document pDoc, Element pParentE, Object
 
 	/**
 	 * createIMETHODCALL
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -802,7 +785,7 @@ public static Element createIMETHODCALL(Document pDoc, Element pParentE, String
 
 	/**
 	 * createIPARAMVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -823,7 +806,7 @@ public static Element createIPARAMVALUE(Document pDoc, Element pParentE, String
 
 	/**
 	 * createERROR
-	 * 
+	 *
 	 * @param doc
 	 * @param parentE
 	 * @param error
@@ -852,7 +835,7 @@ public static Element createERROR(Document doc, Element parentE, CIMError error)
 	 * ENTITY % QualifierFlavor "OVERRIDABLE (true|false) 'true' TOSUBCLASS
 	 * (true|false) 'true' TOINSTANCE (true|false) 'false' TRANSLATABLE
 	 * (true|false) 'false'"
-	 * 
+	 *
 	 * @param pElement
 	 * @param pFlavors
 	 */
@@ -874,15 +857,19 @@ private static void setFlavors(Element pElement, int pFlavors) {
 
 	/**
 	 * createQUALIFIER_DECLARATION
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pQualifierType
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createQUALIFIER_DECLARATION(Document pDoc, Element pParentE,
-			CIMQualifierType pQualifierType) throws WBEMException {
+	public static Element createQUALIFIER_DECLARATION(
+		Document pDoc,
+		Element pParentE,
+		CIMQualifierType pQualifierType
+	)
+		throws WBEMException {
 		// 
 		//  pQualifier) throws WBEMException {
+	public static Element createQUALIFIER(Document pDoc, Element pParentE, CIMQualifier pQualifier)
+		throws WBEMException {
 		// 
 		// [] pQualifiersA) throws WBEMException {
+	public static void createQUALIFIERS(Document pDoc, Element pParentE, CIMQualifier[] pQualifiersA)
+		throws WBEMException {
 		if (pQualifiersA == null) return;
 		for (int i = 0; i < pQualifiersA.length; i++) {
 			createQUALIFIER(pDoc, pParentE, pQualifiersA[i]);
@@ -972,14 +957,14 @@ public static void createQUALIFIERS(Document pDoc, Element pParentE,
 
 	/**
 	 * createPROPERTIES
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pProperties
 	 * @throws WBEMException
 	 */
-	public static void createPROPERTIES(Document pDoc, Element pParentE,
-			CIMProperty[] pProperties) throws WBEMException {
+	public static void createPROPERTIES(Document pDoc, Element pParentE, CIMProperty[] pProperties)
+		throws WBEMException {
 		if (pProperties == null) return;
 		for (int i = 0; i < pProperties.length; i++) {
 			createPROPERTY(pDoc, pParentE, pProperties[i]);
@@ -987,16 +972,22 @@ public static void createPROPERTIES(Document pDoc, Element pParentE,
 	}
 
 	private static final CIMQualifiedElementInterfaceImpl KEYQUALIFIERS_IMPL = new CIMQualifiedElementInterfaceImpl(
-			null, true);
+		null,
+		true
+	);
 
-	static final CIMQualifier EMB_OBJ_QUALI = new CIMQualifier("EmbeddedObject",
-			CIMDataType.BOOLEAN_T, Boolean.TRUE, CIMFlavor.DISABLEOVERRIDE);
+	static final CIMQualifier EMB_OBJ_QUALI = new CIMQualifier(
+		"EmbeddedObject",
+		CIMDataType.BOOLEAN_T,
+		Boolean.TRUE,
+		CIMFlavor.DISABLEOVERRIDE
+	);
 
 	// ebak: embedded object: CLASS_T or INSTANCE_T?
 
 	/**
 	 * isCIMObject
-	 * 
+	 *
 	 * @param typeCode
 	 * @return boolean
 	 */
@@ -1006,7 +997,7 @@ public static boolean isCIMObject(int typeCode) {
 
 	/**
 	 * isCIMObject
-	 * 
+	 *
 	 * @param pType
 	 * @return boolean
 	 */
@@ -1016,7 +1007,7 @@ public static boolean isCIMObject(CIMDataType pType) {
 
 	/**
 	 * getEmbObjTypeStr
-	 * 
+	 *
 	 * @param pType
 	 * @return String
 	 */
@@ -1036,7 +1027,7 @@ private static Document getDoc() {
 
 	/**
 	 * cimObjectToXMLString - for embedded object support
-	 * 
+	 *
 	 * @param pObj
 	 * @return String
 	 * @throws WBEMException
@@ -1052,36 +1043,38 @@ public static String cimObjectToXMLString(Object pObj) throws WBEMException {
 			doc = getDoc();
 			e = createINSTANCE(doc, null, (CIMInstance) pObj);
 		} else {
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED, pObj.getClass().getName()
-					+ " parameter is not suitable for this method!");
+			throw new WBEMException(
+				WBEMException.CIM_ERR_FAILED,
+				pObj.getClass().getName() + " parameter is not suitable for this method!"
+			);
 		}
 		doc.appendChild(e);
 		ByteArrayOutputStream os = new ByteArrayOutputStream();
 		try {
 			CimXmlSerializer.serialize(os, doc.getDocumentElement(), false);
 		} catch (IOException ex) {
-			throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-					"XML serialization failed with IOException!", null, ex);
+			throw new WBEMException(WBEMException.CIM_ERR_FAILED, "XML serialization failed with IOException!", null, ex);
 		}
 		return os.toString();
 	}
 
 	/**
 	 * cimObjectArrayToXMLString - for embedded object support
-	 * 
+	 *
 	 * @param pObj
 	 * @return String[]
 	 * @throws WBEMException
 	 */
 	public static String[] cimObjectArrayToXMLString(Object pObj) throws WBEMException {
 		if (pObj == null) return null;
-		if (!(pObj instanceof Object[])) throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-				"Object[] parameter is required for this method!");
+		if (!(pObj instanceof Object[])) throw new WBEMException(
+			WBEMException.CIM_ERR_FAILED,
+			"Object[] parameter is required for this method!"
+		);
 		Object[] objA = (Object[]) pObj;
 		String[] strA = new String[objA.length];
 		// here we don't deal with the consistency check of the Object[]
-		for (int i = 0; i < objA.length; i++)
-			strA[i] = cimObjectToXMLString(objA[i]);
+		for (int i = 0; i < objA.length; i++) strA[i] = cimObjectToXMLString(objA[i]);
 		return strA;
 	}
 
@@ -1090,7 +1083,6 @@ static boolean embObjQualified(CIMQualifiedElementInterface pQualid) {
 	}
 
 	static class EmbObjBuilder {
-
 		private static final int ATTRIB_ONLY = 0, EO_QUALI = 1, EO_AND_EI_QUALI = 2;
 
 		private int iSignMethod;
@@ -1102,11 +1094,12 @@ static class EmbObjBuilder {
 		private boolean iXMLQualified;
 
 		private static final boolean iUpperCaseEmbObjEntities = WBEMConfiguration
-				.getGlobalConfiguration().upperCaseEmbObjEntities();
+			.getGlobalConfiguration()
+			.upperCaseEmbObjEntities();
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pDoc
 		 * @param pTypedE
 		 */
@@ -1116,7 +1109,7 @@ public EmbObjBuilder(Document pDoc, CIMTypedElement pTypedE) {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pDoc
 		 * @param pTypedE
 		 * @param pXMLQualified
@@ -1139,7 +1132,7 @@ public EmbObjBuilder(Document pDoc, CIMTypedElement pTypedE, boolean pXMLQualifi
 
 		/**
 		 * getTypeStr
-		 * 
+		 *
 		 * @return String
 		 */
 		public String getTypeStr() {
@@ -1148,7 +1141,7 @@ public String getTypeStr() {
 
 		/**
 		 * isArray
-		 * 
+		 *
 		 * @return String
 		 */
 		public boolean isArray() {
@@ -1158,12 +1151,11 @@ public boolean isArray() {
 		private Object getValue() {
 			if (!(this.iTypedE instanceof CIMValuedElement)) return null;
 			return ((CIMValuedElement) this.iTypedE).getValue();
-
 		}
 
 		/**
 		 * addSign
-		 * 
+		 *
 		 * @param pElement
 		 * @throws WBEMException
 		 */
@@ -1177,10 +1169,10 @@ public void addSign(Element pElement) throws WBEMException {
 				qualified = null;
 			}
 			if (this.iSignMethod == ATTRIB_ONLY || (qualified == null && !this.iXMLQualified)) {
-				pElement.setAttribute(iUpperCaseEmbObjEntities ? "EMBEDDEDOBJECT"
-						: "EmbeddedObject",
-						this.iTypedE.getDataType().getType() == CIMDataType.OBJECT ? "instance"
-								: "object");
+				pElement.setAttribute(
+					iUpperCaseEmbObjEntities ? "EMBEDDEDOBJECT" : "EmbeddedObject",
+					this.iTypedE.getDataType().getType() == CIMDataType.OBJECT ? "instance" : "object"
+				);
 			} else {
 				if (this.iSignMethod == EO_AND_EI_QUALI) {
 					addEmbObjOrEmbInstQuali(pElement);
@@ -1201,8 +1193,8 @@ private void addEmbObjOrEmbInstQuali(Element pElement) throws WBEMException {
 					inst = (CIMInstance) getValue();
 				}
 				String className = inst == null ? "" : inst.getClassName();
-				signQuali = new CIMQualifier("EmbeddedInstance", CIMDataType.STRING_T,
-						className, CIMFlavor.DISABLEOVERRIDE);
+				signQuali =
+					new CIMQualifier("EmbeddedInstance", CIMDataType.STRING_T, className, CIMFlavor.DISABLEOVERRIDE);
 			} else { // class
 				signQuali = EMB_OBJ_QUALI;
 			}
@@ -1211,7 +1203,7 @@ private void addEmbObjOrEmbInstQuali(Element pElement) throws WBEMException {
 
 		/**
 		 * addValue
-		 * 
+		 *
 		 * @param pElement
 		 * @throws WBEMException
 		 */
@@ -1227,20 +1219,18 @@ public void addValue(Element pElement) throws WBEMException {
 			}
 			createVALUE(this.iDoc, pElement, value);
 		}
-
 	}
 
 	/**
 	 * createPROPERTY
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pProperty
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createPROPERTY(Document pDoc, Element pParentE, CIMProperty pProperty)
-			throws WBEMException {
+	public static Element createPROPERTY(Document pDoc, Element pParentE, CIMProperty pProperty) throws WBEMException {
 		CIMDataType propType = pProperty.getDataType();
 		Element propertyE;
 		EmbObjBuilder embObjBuilder = new EmbObjBuilder(pDoc, pProperty, true);
@@ -1248,15 +1238,13 @@ public static Element createPROPERTY(Document pDoc, Element pParentE, CIMPropert
 		if (propType.isArray()) {
 			propertyE = createPROPERTYARRAY(pDoc, pParentE, pProperty.getName(), typeStr);
 		} else if (propType.getType() == CIMDataType.REFERENCE) {
-			propertyE = createPROPERTYREFERENCE(pDoc, pParentE, pProperty.getName(), propType
-					.getRefClassName());
+			propertyE = createPROPERTYREFERENCE(pDoc, pParentE, pProperty.getName(), propType.getRefClassName());
 		} else {
 			propertyE = createPROPERTY(pDoc, pParentE, pProperty.getName(), typeStr);
 		}
 
 		String classorigin = pProperty.getOriginClass();
-		if (classorigin != null && classorigin.length() > 0) propertyE.setAttribute("CLASSORIGIN",
-				classorigin);
+		if (classorigin != null && classorigin.length() > 0) propertyE.setAttribute("CLASSORIGIN", classorigin);
 
 		if (pProperty.isPropagated()) propertyE.setAttribute("PROPAGATED", MOF.TRUE);
 		// FIXME: here key qualifier should be added if the property is a key
@@ -1264,8 +1252,7 @@ public static Element createPROPERTY(Document pDoc, Element pParentE, CIMPropert
 		if (pProperty instanceof CIMClassProperty) {
 			createQUALIFIERS(pDoc, propertyE, ((CIMClassProperty) pProperty).getQualifiers());
 		} else { // CIMProperty
-			if (pProperty.isKey()) createQUALIFIERS(pDoc, propertyE, KEYQUALIFIERS_IMPL
-					.getQualifiers());
+			if (pProperty.isKey()) createQUALIFIERS(pDoc, propertyE, KEYQUALIFIERS_IMPL.getQualifiers());
 		}
 		embObjBuilder.addValue(propertyE);
 		return propertyE;
@@ -1273,18 +1260,19 @@ public static Element createPROPERTY(Document pDoc, Element pParentE, CIMPropert
 
 	/**
 	 * createVALUEARRAY
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pValA
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createVALUEARRAY(Document pDoc, Element pParentE, Object[] pValA)
-			throws WBEMException {
-		Element valuearrayE = (pValA != null && pValA.length > 0 && (pValA[0] instanceof CIMObjectPath || pValA[0] instanceof CIMInstance)) ? createVALUEREFARRAY(
-				pDoc, pParentE)
-				: createVALUEARRAY(pDoc, pParentE);
+	public static Element createVALUEARRAY(Document pDoc, Element pParentE, Object[] pValA) throws WBEMException {
+		Element valuearrayE = (
+				pValA != null && pValA.length > 0 && (pValA[0] instanceof CIMObjectPath || pValA[0] instanceof CIMInstance)
+			)
+			? createVALUEREFARRAY(pDoc, pParentE)
+			: createVALUEARRAY(pDoc, pParentE);
 
 		if (pValA != null) for (int i = 0; i < pValA.length; i++) {
 			createVALUE(pDoc, valuearrayE, pValA[i]);
@@ -1295,15 +1283,14 @@ public static Element createVALUEARRAY(Document pDoc, Element pParentE, Object[]
 
 	/**
 	 * createVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pArgValue
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createVALUE(Document pDoc, Element pParentE, Object pArgValue)
-			throws WBEMException {
+	public static Element createVALUE(Document pDoc, Element pParentE, Object pArgValue) throws WBEMException {
 		if (pArgValue == null) return null;
 
 		Element valueE = null;
@@ -1357,23 +1344,21 @@ public static Element createVALUE(Document pDoc, Element pParentE, Object pArgVa
 
 	/**
 	 * createINSTANCE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pInstance
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createINSTANCE(Document pDoc, Element pParentE, CIMInstance pInstance)
-			throws WBEMException {
+	public static Element createINSTANCE(Document pDoc, Element pParentE, CIMInstance pInstance) throws WBEMException {
 		// 
 		// 
 
 		String className = pInstance.getObjectPath().getObjectName();
-		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-				"null class name");
+		if (className == null) throw new WBEMException(WBEMException.CIM_ERR_FAILED, "null class name");
 
 		Element instanceE = createINSTANCE(pDoc, pParentE, className);
 
@@ -1388,15 +1373,14 @@ public static Element createINSTANCE(Document pDoc, Element pParentE, CIMInstanc
 
 	/**
 	 * createOBJECTPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pPath
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createOBJECTPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
+	public static Element createOBJECTPATH(Document pDoc, Element pParentE, CIMObjectPath pPath) throws WBEMException {
 		Element objectpathE = pDoc.createElement("OBJECTPATH");
 
 		CIMProperty[] keys = pPath.getKeys();
@@ -1412,34 +1396,36 @@ public static Element createOBJECTPATH(Document pDoc, Element pParentE, CIMObjec
 
 	/**
 	 * createOBJECTNAME
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pPath
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createOBJECTNAME(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
-
+	public static Element createOBJECTNAME(Document pDoc, Element pParentE, CIMObjectPath pPath) throws WBEMException {
 		CIMProperty[] keys = pPath.getKeys();
-		if (keys.length > 0) { return createINSTANCENAME(pDoc, pParentE, pPath); }
+		if (keys.length > 0) {
+			return createINSTANCENAME(pDoc, pParentE, pPath);
+		}
 		if (pPath.getObjectName() == null) throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
+			WBEMException.CIM_ERR_INVALID_PARAMETER,
+			"null class name"
+		);
 		return createCLASSNAME(pDoc, pParentE, pPath.getObjectName());
 	}
 
 	/**
 	 * createLOCALINSTANCEPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pPath
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createLOCALINSTANCEPATH(Document pDoc, Element pParentE,
-			CIMObjectPath pPath) throws WBEMException {
+	public static Element createLOCALINSTANCEPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
+		throws WBEMException {
 		Element localinstancepathE = pDoc.createElement("LOCALINSTANCEPATH");
 
 		createLOCALNAMESPACEPATH(pDoc, localinstancepathE, pPath);
@@ -1451,7 +1437,7 @@ public static Element createLOCALINSTANCEPATH(Document pDoc, Element pParentE,
 
 	/**
 	 * createLOCALCLASSPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pPath
@@ -1459,13 +1445,15 @@ public static Element createLOCALINSTANCEPATH(Document pDoc, Element pParentE,
 	 * @throws WBEMException
 	 */
 	public static Element createLOCALCLASSPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
+		throws WBEMException {
 		Element localinstancepathE = pDoc.createElement("LOCALCLASSPATH");
 
 		createLOCALNAMESPACEPATH(pDoc, localinstancepathE, pPath);
 
 		if (pPath.getObjectName() == null) throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER, "null class name");
+			WBEMException.CIM_ERR_INVALID_PARAMETER,
+			"null class name"
+		);
 		createCLASSNAME(pDoc, localinstancepathE, pPath.getObjectName());
 
 		pParentE.appendChild(localinstancepathE);
@@ -1474,7 +1462,7 @@ public static Element createLOCALCLASSPATH(Document pDoc, Element pParentE, CIMO
 
 	/**
 	 * createLOCALOBJECTPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pPath
@@ -1482,16 +1470,17 @@ public static Element createLOCALCLASSPATH(Document pDoc, Element pParentE, CIMO
 	 * @throws WBEMException
 	 */
 	public static Element createLOCALOBJECTPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
-
+		throws WBEMException {
 		CIMProperty[] keys = pPath.getKeys();
-		if (keys.length > 0) { return createLOCALINSTANCEPATH(pDoc, pParentE, pPath); }
+		if (keys.length > 0) {
+			return createLOCALINSTANCEPATH(pDoc, pParentE, pPath);
+		}
 		return createLOCALCLASSPATH(pDoc, pParentE, pPath);
 	}
 
 	/**
 	 * createVALUEREFERENCE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pPath
@@ -1499,7 +1488,7 @@ public static Element createLOCALOBJECTPATH(Document pDoc, Element pParentE, CIM
 	 * @throws WBEMException
 	 */
 	public static Element createVALUEREFERENCE(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
+		throws WBEMException {
 		Element objectpathE = pDoc.createElement("VALUE.REFERENCE");
 
 		String ns = pPath.getNamespace();
@@ -1524,7 +1513,7 @@ public static Element createVALUEREFERENCE(Document pDoc, Element pParentE, CIMO
 
 	/**
 	 * createINSTANCENAME
-	 * 
+	 *
 	 * @param doc
 	 * @param parentE
 	 * @param instanceOP
@@ -1532,8 +1521,7 @@ public static Element createVALUEREFERENCE(Document pDoc, Element pParentE, CIMO
 	 * @throws WBEMException
 	 */
 	public static Element createINSTANCENAME(Document doc, Element parentE, CIMObjectPath instanceOP)
-			throws WBEMException {
-
+		throws WBEMException {
 		Element instancenameE = doc.createElement("INSTANCENAME");
 		String classname = instanceOP.getObjectName();
 		if (classname != null) {
@@ -1554,28 +1542,40 @@ public static Element createINSTANCENAME(Document doc, Element parentE, CIMObjec
 			 * KEYVALUE? | VALUE.REFERENCE?)> Handling direct KEYVALUE and
 			 * VALUE.REFERENCE children is difficult, KEYBINDING can wrap them
 			 * -> dropping out KEYVALUE? | VALUE.REFERENCE?.
-			 * 
+			 *
 			 *  
-			 * 
+			 *
 			 *   - non
 			 * reference values can be null
-			 * 
+			 *
 			 *  - reference
 			 * value shouldn't be null
 			 */
-			if (propType == null) { throw new WBEMException(
+			if (propType == null) {
+				throw new WBEMException(
 					WBEMException.CIM_ERR_INVALID_PARAMETER,
-					"Type of property or key cannot be a null! " + propName + " in ObjectPath "
-							+ instanceOP.toString() + " has null type."); }
+					"Type of property or key cannot be a null! " +
+					propName +
+					" in ObjectPath " +
+					instanceOP.toString() +
+					" has null type."
+				);
+			}
 
 			if (propValue == null) {
-				if (propType.getType() == CIMDataType.REFERENCE) { throw new WBEMException(
+				if (propType.getType() == CIMDataType.REFERENCE) {
+					throw new WBEMException(
 						WBEMException.CIM_ERR_INVALID_PARAMETER,
-						"Value of reference cannot be null! " + propName + " in ObjectPath "
-								+ instanceOP.toString() + " has null value."); }
+						"Value of reference cannot be null! " +
+						propName +
+						" in ObjectPath " +
+						instanceOP.toString() +
+						" has null value."
+					);
+				}
 			}
 
 			Element keybindingE = createKEYBINDING(doc, instancenameE, propName);
@@ -1596,7 +1596,7 @@ public static Element createINSTANCENAME(Document doc, Element parentE, CIMObjec
 
 	/**
 	 * createCLASSPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pPath
@@ -1615,14 +1615,14 @@ public static Element createCLASSPATH(Document pDoc, Element pParentE, CIMObject
 
 	/**
 	 * createPARAMETERS
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pParameters
 	 * @throws WBEMException
 	 */
-	public static void createPARAMETERS(Document pDoc, Element pParentE,
-			CIMParameter[] pParameters) throws WBEMException {
+	public static void createPARAMETERS(Document pDoc, Element pParentE, CIMParameter[] pParameters)
+		throws WBEMException {
 		if (pParameters == null) return;
 		for (int i = 0; i < pParameters.length; i++) {
 			createPARAMETER(pDoc, pParentE, pParameters[i]);
@@ -1631,15 +1631,15 @@ public static void createPARAMETERS(Document pDoc, Element pParentE,
 
 	/**
 	 * createPARAMETER
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pParameter
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createPARAMETER(Document pDoc, Element pParentE,
-			CIMParameter pParameter) throws WBEMException {
+	public static Element createPARAMETER(Document pDoc, Element pParentE, CIMParameter pParameter)
+		throws WBEMException {
 		Element parameterE;
 		CIMDataType type = pParameter.getDataType();
 		int typeCode = type.getType();
@@ -1650,7 +1650,9 @@ public static Element createPARAMETER(Document pDoc, Element pParentE,
 				parameterE = pDoc.createElement("PARAMETER.REFARRAY");
 				String refclass = type.getRefClassName();
 				if (refclass != null && refclass.length() > 0) parameterE.setAttribute(
-						"REFERENCECLASS", type.getRefClassName());
+					"REFERENCECLASS",
+					type.getRefClassName()
+				);
 			} else {
 				parameterE = pDoc.createElement("PARAMETER.ARRAY");
 				parameterE.setAttribute("TYPE", typeStr);
@@ -1660,7 +1662,9 @@ public static Element createPARAMETER(Document pDoc, Element pParentE,
 				parameterE = pDoc.createElement("PARAMETER.REFERENCE");
 				String refclass = type.getRefClassName();
 				if (refclass != null && refclass.length() > 0) parameterE.setAttribute(
-						"REFERENCECLASS", type.getRefClassName());
+					"REFERENCECLASS",
+					type.getRefClassName()
+				);
 			} else {
 				parameterE = pDoc.createElement("PARAMETER");
 				parameterE.setAttribute("TYPE", typeStr);
@@ -1676,15 +1680,15 @@ public static Element createPARAMETER(Document pDoc, Element pParentE,
 
 	/**
 	 * createMETHODS
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pMethods
 	 * @param pClassName
 	 * @throws WBEMException
 	 */
-	public static void createMETHODS(Document pDoc, Element pParentE, CIMMethod[] pMethods,
-			String pClassName) throws WBEMException {
+	public static void createMETHODS(Document pDoc, Element pParentE, CIMMethod[] pMethods, String pClassName)
+		throws WBEMException {
 		for (int i = 0; i < pMethods.length; i++) {
 			createMETHOD(pDoc, pParentE, pMethods[i], pClassName);
 		}
@@ -1692,7 +1696,7 @@ public static void createMETHODS(Document pDoc, Element pParentE, CIMMethod[]
 
 	/**
 	 * createMETHOD
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pMethod
@@ -1700,8 +1704,8 @@ public static void createMETHODS(Document pDoc, Element pParentE, CIMMethod[]
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createMETHOD(Document pDoc, Element pParentE, CIMMethod pMethod,
-			String pClassName) throws WBEMException {
+	public static Element createMETHOD(Document pDoc, Element pParentE, CIMMethod pMethod, String pClassName)
+		throws WBEMException {
 		Element methodE = pDoc.createElement("METHOD");
 
 		methodE.setAttribute("NAME", pMethod.getName());
@@ -1710,8 +1714,7 @@ public static Element createMETHOD(Document pDoc, Element pParentE, CIMMethod
 		methodE.setAttribute("TYPE", typeStr);
 		String classorigin = pMethod.getOriginClass();
 
-		if (classorigin != null && classorigin.length() != 0) methodE.setAttribute("CLASSORIGIN",
-				classorigin);
+		if (classorigin != null && classorigin.length() != 0) methodE.setAttribute("CLASSORIGIN", classorigin);
 
 		// 17459
 		if (pMethod.isPropagated()) {
@@ -1739,16 +1742,14 @@ public static Element createMETHOD(Document pDoc, Element pParentE, CIMMethod
 
 	/**
 	 * createCLASS
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pClass
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createCLASS(Document pDoc, Element pParentE, CIMClass pClass)
-			throws WBEMException {
-
+	public static Element createCLASS(Document pDoc, Element pParentE, CIMClass pClass) throws WBEMException {
 		Element classE = createCLASS(pDoc, pParentE, pClass.getName(), pClass.getSuperClassName());
 
 		createQUALIFIERS(pDoc, classE, pClass.getQualifiers());
@@ -1761,7 +1762,7 @@ public static Element createCLASS(Document pDoc, Element pParentE, CIMClass pCla
 
 	/**
 	 * createHOST
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pHost
@@ -1779,7 +1780,7 @@ public static Element createHOST(Document pDoc, Element pParentE, String pHost)
 
 	/**
 	 * createNAMESPACEPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pPath
@@ -1807,15 +1808,14 @@ public static Element createNAMESPACEPATH(Document pDoc, Element pParentE, CIMOb
 
 	/**
 	 * createINSTANCEPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pPath
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createINSTANCEPATH(Document pDoc, Element pParentE, CIMObjectPath pPath)
-			throws WBEMException {
+	public static Element createINSTANCEPATH(Document pDoc, Element pParentE, CIMObjectPath pPath) throws WBEMException {
 		Element instancepathE = pDoc.createElement("INSTANCEPATH");
 
 		createNAMESPACEPATH(pDoc, instancepathE, pPath);
@@ -1826,7 +1826,7 @@ public static Element createINSTANCEPATH(Document pDoc, Element pParentE, CIMObj
 
 	/**
 	 * createVALUENAMEDINSTANCE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pPath
@@ -1834,8 +1834,13 @@ public static Element createINSTANCEPATH(Document pDoc, Element pParentE, CIMObj
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createVALUENAMEDINSTANCE(Document pDoc, Element pParentE,
-			CIMObjectPath pPath, CIMInstance pInst) throws WBEMException {
+	public static Element createVALUENAMEDINSTANCE(
+		Document pDoc,
+		Element pParentE,
+		CIMObjectPath pPath,
+		CIMInstance pInst
+	)
+		throws WBEMException {
 		Element valuenamedinstanceE = pDoc.createElement("VALUE.NAMEDINSTANCE");
 		createINSTANCENAME(pDoc, valuenamedinstanceE, pPath);
 		createINSTANCE(pDoc, valuenamedinstanceE, pInst);
@@ -1846,15 +1851,15 @@ public static Element createVALUENAMEDINSTANCE(Document pDoc, Element pParentE,
 
 	/**
 	 * createVALUENAMEDINSTANCE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pInst
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createVALUENAMEDINSTANCE(Document pDoc, Element pParentE,
-			CIMInstance pInst) throws WBEMException {
+	public static Element createVALUENAMEDINSTANCE(Document pDoc, Element pParentE, CIMInstance pInst)
+		throws WBEMException {
 		Element valuenamedinstanceE = pDoc.createElement("VALUE.NAMEDINSTANCE");
 		createINSTANCENAME(pDoc, valuenamedinstanceE, pInst.getObjectPath());
 		createINSTANCE(pDoc, valuenamedinstanceE, pInst);
@@ -1863,17 +1868,29 @@ public static Element createVALUENAMEDINSTANCE(Document pDoc, Element pParentE,
 		return valuenamedinstanceE;
 	}
 
-	private static CIMObjectPath changeNameSpace(CIMNamedElementInterface pNamedElement,
-			String pNameSpace) {
+	private static CIMObjectPath changeNameSpace(CIMNamedElementInterface pNamedElement, String pNameSpace) {
 		CIMObjectPath path = pNamedElement.getObjectPath();
-		return new CIMObjectPath(path.getScheme(), path.getHost(), path.getPort(), pNameSpace, path
-				.getObjectName(), path.getKeys());
+		return new CIMObjectPath(
+			path.getScheme(),
+			path.getHost(),
+			path.getPort(),
+			pNameSpace,
+			path.getObjectName(),
+			path.getKeys()
+		);
 	}
 
 	private static CIMClass changeClassNameSpace(CIMClass pClass, String pNameSpace) {
 		CIMObjectPath newOp = changeNameSpace(pClass, pNameSpace);
-		return new CIMClass(newOp, pClass.getSuperClassName(), pClass.getQualifiers(), pClass
-				.getProperties(), pClass.getMethods(), pClass.isAssociation(), pClass.isKeyed());
+		return new CIMClass(
+			newOp,
+			pClass.getSuperClassName(),
+			pClass.getQualifiers(),
+			pClass.getProperties(),
+			pClass.getMethods(),
+			pClass.isAssociation(),
+			pClass.isKeyed()
+		);
 	}
 
 	private static CIMInstance changeInstanceNameSpace(CIMInstance pInst, String pNameSpace) {
@@ -1883,7 +1900,7 @@ private static CIMInstance changeInstanceNameSpace(CIMInstance pInst, String pNa
 
 	/**
 	 * createVALUEOBJECTWITHPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pObj
@@ -1891,14 +1908,13 @@ private static CIMInstance changeInstanceNameSpace(CIMInstance pInst, String pNa
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createVALUEOBJECTWITHPATH(Document pDoc, Element pParentE, Object pObj,
-			String pNameSpace) throws WBEMException {
+	public static Element createVALUEOBJECTWITHPATH(Document pDoc, Element pParentE, Object pObj, String pNameSpace)
+		throws WBEMException {
 		Element valueobjectwithpathE = pDoc.createElement("VALUE.OBJECTWITHPATH");
 		if (pObj instanceof CIMClass) {
 			CIMClass clazz = (CIMClass) pObj;
 
-			if (clazz.getObjectPath().getNamespace() == null
-					|| clazz.getObjectPath().getNamespace().length() == 0) {
+			if (clazz.getObjectPath().getNamespace() == null || clazz.getObjectPath().getNamespace().length() == 0) {
 				// ebak: changing the namespace in clazz's objectPath
 				// clazz.getObjectPath().setNameSpace(pNameSpace);
 				clazz = changeClassNameSpace(clazz, pNameSpace);
@@ -1908,8 +1924,7 @@ public static Element createVALUEOBJECTWITHPATH(Document pDoc, Element pParentE,
 			createCLASS(pDoc, valueobjectwithpathE, clazz);
 		} else if (pObj instanceof CIMInstance) {
 			CIMInstance inst = (CIMInstance) pObj;
-			if (inst.getObjectPath().getNamespace() == null
-					|| inst.getObjectPath().getNamespace().length() == 0) {
+			if (inst.getObjectPath().getNamespace() == null || inst.getObjectPath().getNamespace().length() == 0) {
 				// ebak: changing the namespace ins inst's objectPath
 				// inst.getObjectPath().setNameSpace(pNameSpace);
 				inst = changeInstanceNameSpace(inst, pNameSpace);
@@ -1924,7 +1939,7 @@ public static Element createVALUEOBJECTWITHPATH(Document pDoc, Element pParentE,
 
 	/**
 	 * createVALUEOBJECTWITHLOCALPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pObj
@@ -1932,14 +1947,13 @@ public static Element createVALUEOBJECTWITHPATH(Document pDoc, Element pParentE,
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createVALUEOBJECTWITHLOCALPATH(Document pDoc, Element pParentE,
-			Object pObj, String pNameSpace) throws WBEMException {
+	public static Element createVALUEOBJECTWITHLOCALPATH(Document pDoc, Element pParentE, Object pObj, String pNameSpace)
+		throws WBEMException {
 		Element valueobjectwithpathE = pDoc.createElement("VALUE.OBJECTWITHLOCALPATH");
 		if (pObj instanceof CIMClass) {
 			CIMClass clazz = (CIMClass) pObj;
 
-			if (clazz.getObjectPath().getNamespace() == null
-					|| clazz.getObjectPath().getNamespace().length() == 0) {
+			if (clazz.getObjectPath().getNamespace() == null || clazz.getObjectPath().getNamespace().length() == 0) {
 				// ebak: changing clazz's objectPath
 				// clazz.getObjectPath().setNameSpace(pNameSpace);
 				clazz = changeClassNameSpace(clazz, pNameSpace);
@@ -1948,8 +1962,7 @@ public static Element createVALUEOBJECTWITHLOCALPATH(Document pDoc, Element pPar
 			createCLASS(pDoc, valueobjectwithpathE, clazz);
 		} else if (pObj instanceof CIMInstance) {
 			CIMInstance inst = (CIMInstance) pObj;
-			if (inst.getObjectPath().getNamespace() == null
-					|| inst.getObjectPath().getNamespace().length() == 0) {
+			if (inst.getObjectPath().getNamespace() == null || inst.getObjectPath().getNamespace().length() == 0) {
 				// inst.getObjectPath().setNameSpace(pNameSpace);
 				inst = changeInstanceNameSpace(inst, pNameSpace);
 			}
@@ -1963,7 +1976,7 @@ public static Element createVALUEOBJECTWITHLOCALPATH(Document pDoc, Element pPar
 
 	/**
 	 * createIRETURNVALUE_ERROR
-	 * 
+	 *
 	 * @param doc
 	 * @param parentE
 	 * @param error
@@ -1978,15 +1991,15 @@ public static Element createIRETURNVALUE_ERROR(Document doc, Element parentE, CI
 
 	/**
 	 * createIRETURNVALUE_GETINSTANCE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pInst
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createIRETURNVALUE_GETINSTANCE(Document pDoc, Element pParentE,
-			CIMInstance pInst) throws WBEMException {
+	public static Element createIRETURNVALUE_GETINSTANCE(Document pDoc, Element pParentE, CIMInstance pInst)
+		throws WBEMException {
 		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
 		createINSTANCENAME(pDoc, ireturnvalueE, pInst.getObjectPath());
 
@@ -1995,15 +2008,19 @@ public static Element createIRETURNVALUE_GETINSTANCE(Document pDoc, Element pPar
 
 	/**
 	 * createIRETURNVALUE_ASSOCIATORS_NAMES
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pResultSet
 	 * @return Element
 	 * @throws Exception
 	 */
-	public static Element createIRETURNVALUE_ASSOCIATORS_NAMES(Document pDoc, Element pParentE,
-			CIMObjectPath[] pResultSet) throws Exception {
+	public static Element createIRETURNVALUE_ASSOCIATORS_NAMES(
+		Document pDoc,
+		Element pParentE,
+		CIMObjectPath[] pResultSet
+	)
+		throws Exception {
 		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
 
 		if (pResultSet != null) {
@@ -2011,8 +2028,10 @@ public static Element createIRETURNVALUE_ASSOCIATORS_NAMES(Document pDoc, Elemen
 				CIMObjectPath path = pResultSet[i];
 
 				if (path.getHost() == null || "".equals(path.getHost())) createLOCALOBJECTPATH(
-						pDoc, ireturnvalueE, path);
-				else createOBJECTPATH(pDoc, ireturnvalueE, path);
+					pDoc,
+					ireturnvalueE,
+					path
+				); else createOBJECTPATH(pDoc, ireturnvalueE, path);
 			}
 		}
 		pParentE.appendChild(ireturnvalueE);
@@ -2021,7 +2040,7 @@ public static Element createIRETURNVALUE_ASSOCIATORS_NAMES(Document pDoc, Elemen
 
 	/**
 	 * createIRETURNVALUE_ASSOCIATORS
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pResultSet
@@ -2029,8 +2048,13 @@ public static Element createIRETURNVALUE_ASSOCIATORS_NAMES(Document pDoc, Elemen
 	 * @return Element
 	 * @throws Exception
 	 */
-	public static Element createIRETURNVALUE_ASSOCIATORS(Document pDoc, Element pParentE,
-			Object[] pResultSet, String pNameSpace) throws Exception {
+	public static Element createIRETURNVALUE_ASSOCIATORS(
+		Document pDoc,
+		Element pParentE,
+		Object[] pResultSet,
+		String pNameSpace
+	)
+		throws Exception {
 		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
 		if (pResultSet != null) {
 			for (int i = 0; i < pResultSet.length; i++) {
@@ -2041,8 +2065,7 @@ public static Element createIRETURNVALUE_ASSOCIATORS(Document pDoc, Element pPar
 				} else if (obj instanceof CIMInstance) {
 					op = ((CIMInstance) obj).getObjectPath();
 				} else {
-					throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-							"object in result set neither class nor instance!");
+					throw new WBEMException(WBEMException.CIM_ERR_FAILED, "object in result set neither class nor instance!");
 				}
 				if (op.getHost() == null || "".equals(op.getHost())) {
 					createVALUEOBJECTWITHLOCALPATH(pDoc, ireturnvalueE, obj, pNameSpace);
@@ -2057,7 +2080,7 @@ public static Element createIRETURNVALUE_ASSOCIATORS(Document pDoc, Element pPar
 
 	/**
 	 * createIRETURNVALUE_ENUMERATE_INSTANCENAME
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pResultSet
@@ -2065,8 +2088,13 @@ public static Element createIRETURNVALUE_ASSOCIATORS(Document pDoc, Element pPar
 	 * @return Element
 	 * @throws Exception
 	 */
-	public static Element createIRETURNVALUE_ENUMERATE_INSTANCENAME(Document pDoc,
-			Element pParentE, Object[] pResultSet, String pNameSpace) throws Exception {
+	public static Element createIRETURNVALUE_ENUMERATE_INSTANCENAME(
+		Document pDoc,
+		Element pParentE,
+		Object[] pResultSet,
+		String pNameSpace
+	)
+		throws Exception {
 		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
 		if (pResultSet != null) {
 			for (int i = 0; i < pResultSet.length; i++) {
@@ -2077,8 +2105,7 @@ public static Element createIRETURNVALUE_ENUMERATE_INSTANCENAME(Document pDoc,
 				} else if (obj instanceof CIMInstance) {
 					op = ((CIMInstance) obj).getObjectPath();
 				} else {
-					throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-							"object in result set neither class nor instance!");
+					throw new WBEMException(WBEMException.CIM_ERR_FAILED, "object in result set neither class nor instance!");
 				}
 				if (op.getHost() == null || "".equals(op.getHost())) {
 					createVALUEOBJECTWITHLOCALPATH(pDoc, ireturnvalueE, obj, pNameSpace);
@@ -2093,15 +2120,14 @@ public static Element createIRETURNVALUE_ENUMERATE_INSTANCENAME(Document pDoc,
 
 	/**
 	 * createIRETURNVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pResultSet
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createIRETURNVALUE(Document pDoc, Element pParentE, Object[] pResultSet)
-			throws WBEMException {
+	public static Element createIRETURNVALUE(Document pDoc, Element pParentE, Object[] pResultSet) throws WBEMException {
 		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
 		if (pResultSet != null && pResultSet.length > 0) {
 			Object obj = pResultSet[0];
@@ -2125,14 +2151,13 @@ public static Element createIRETURNVALUE(Document pDoc, Element pParentE, Object
 
 	/**
 	 * createIRETURNVALUE_ENUMERATE_CLASSNAME
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pResultSet
 	 * @return Element
 	 */
-	public static Element createIRETURNVALUE_ENUMERATE_CLASSNAME(Document pDoc, Element pParentE,
-			CIMClass[] pResultSet) {
+	public static Element createIRETURNVALUE_ENUMERATE_CLASSNAME(Document pDoc, Element pParentE, CIMClass[] pResultSet) {
 		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
 		if (pResultSet != null && pResultSet.length > 0) {
 			for (int i = 0; i < pResultSet.length; i++) {
@@ -2149,7 +2174,7 @@ public static Element createIRETURNVALUE_ENUMERATE_CLASSNAME(Document pDoc, Elem
 
 	/**
 	 * createIndication_response
-	 * 
+	 *
 	 * @param doc
 	 * @param ID
 	 * @param error
@@ -2158,7 +2183,6 @@ public static Element createIRETURNVALUE_ENUMERATE_CLASSNAME(Document pDoc, Elem
 	// ebak: [ 1656285 ] IndicationHandler does not accept non-Integer message
 	// ID
 	public static Element createIndication_response(Document doc, String ID, CIMError error) {
-
 		// xmlBuilder.create XML
 		Element cimE = createCIM(doc);
 		Element messageE = createMESSAGE(doc, cimE, ID, "1.0");
@@ -2175,15 +2199,19 @@ public static Element createIndication_response(Document doc, String ID, CIMErro
 
 	/**
 	 * createIRETURNVALUE_ENUMERATE_INSTANCE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pResultSet
 	 * @return Element
 	 * @throws WBEMException
 	 */
-	public static Element createIRETURNVALUE_ENUMERATE_INSTANCE(Document pDoc, Element pParentE,
-			CIMInstance[] pResultSet) throws WBEMException {
+	public static Element createIRETURNVALUE_ENUMERATE_INSTANCE(
+		Document pDoc,
+		Element pParentE,
+		CIMInstance[] pResultSet
+	)
+		throws WBEMException {
 		Element ireturnvalueE = pDoc.createElement("IRETURNVALUE");
 		if (pResultSet != null && pResultSet.length > 0) {
 			for (int i = 0; i < pResultSet.length; i++) {
@@ -2196,7 +2224,7 @@ public static Element createIRETURNVALUE_ENUMERATE_INSTANCE(Document pDoc, Eleme
 
 	/**
 	 * getTypeStr
-	 * 
+	 *
 	 * @param pType
 	 * @return String
 	 */
@@ -2208,7 +2236,7 @@ public static String getTypeStr(CIMDataType pType) {
 
 	/**
 	 * getOpTypeStr
-	 * 
+	 *
 	 * @param pType
 	 * @return String
 	 */
@@ -2220,14 +2248,13 @@ public static String getOpTypeStr(CIMDataType pType) {
 
 	/**
 	 * createLOCALNAMESPACEPATH
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
 	 * @return Element
 	 */
-	public static Element createLOCALNAMESPACEPATH(Document pDoc, Element pParentE,
-			CIMObjectPath pName) {
+	public static Element createLOCALNAMESPACEPATH(Document pDoc, Element pParentE, CIMObjectPath pName) {
 		if (pName == null) return null;
 		// TODO: name(ObjectPath) should not be null, should an exception be
 		// thrown?
@@ -2237,9 +2264,11 @@ public static Element createLOCALNAMESPACEPATH(Document pDoc, Element pParentE,
 		String nameSpace = pName.getNamespace();
 		if (nameSpace != null) {
 			String[] nsA = NAMESPACE_SPLIT_PATTERN.split(nameSpace);
-			for (int i = 0; i < nsA.length; i++)
-				if (nsA[i] != null && nsA[i].length() > 0) createNAMESPACE(pDoc,
-						localnamespacepathE, nsA[i]);
+			for (int i = 0; i < nsA.length; i++) if (nsA[i] != null && nsA[i].length() > 0) createNAMESPACE(
+				pDoc,
+				localnamespacepathE,
+				nsA[i]
+			);
 		}
 		pParentE.appendChild(localnamespacepathE);
 
@@ -2248,7 +2277,7 @@ public static Element createLOCALNAMESPACEPATH(Document pDoc, Element pParentE,
 
 	/**
 	 * createSIMPLEEXPREQ
-	 * 
+	 *
 	 * @param pDoc
 	 * @return Element
 	 */
@@ -2260,7 +2289,7 @@ public static Element createSIMPLEEXPREQ(Document pDoc) {
 
 	/**
 	 * createEXPMETHODCALL
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
@@ -2279,7 +2308,7 @@ public static Element createEXPMETHODCALL(Document pDoc, Element pParentE, Strin
 
 	/**
 	 * createEXPPARAMVALUE
-	 * 
+	 *
 	 * @param pDoc
 	 * @param pParentE
 	 * @param pName
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java
index 72424de..fdd4238 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParseException.java
@@ -48,10 +48,9 @@
 
 /**
  * Class CIMXMLParseException is used by the CIM-XML DOM parser.
- * 
+ *
  */
 public class CIMXMLParseException extends IOException {
-
 	private static final long serialVersionUID = 1237082621297618586L;
 
 	/**
@@ -63,7 +62,7 @@ public CIMXMLParseException() {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param reason
 	 */
 	public CIMXMLParseException(String reason) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java
index e97b6bf..aa3cd0e 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java
@@ -125,19 +125,27 @@
 import java.util.TreeMap;
 import java.util.Vector;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMClassProperty;
 import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMDateTime;
 import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
 import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
+import org.metricshub.wbem.javax.cim.CIMFlavor;
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMMethod;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.cim.CIMParameter;
+import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.metricshub.wbem.javax.cim.CIMQualifier;
 import org.metricshub.wbem.javax.cim.CIMQualifierType;
+import org.metricshub.wbem.javax.cim.CIMScope;
+import org.metricshub.wbem.javax.cim.UnsignedInteger16;
+import org.metricshub.wbem.javax.cim.UnsignedInteger32;
+import org.metricshub.wbem.javax.cim.UnsignedInteger64;
+import org.metricshub.wbem.javax.cim.UnsignedInteger8;
 import org.metricshub.wbem.javax.wbem.WBEMException;
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
@@ -146,15 +154,6 @@
 import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
 import org.metricshub.wbem.sblim.cimclient.internal.util.XMLHostStr;
-import org.metricshub.wbem.javax.cim.CIMDateTime;
-import org.metricshub.wbem.javax.cim.CIMFlavor;
-import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
-import org.metricshub.wbem.javax.cim.CIMProperty;
-import org.metricshub.wbem.javax.cim.CIMScope;
-import org.metricshub.wbem.javax.cim.UnsignedInteger16;
-import org.metricshub.wbem.javax.cim.UnsignedInteger32;
-import org.metricshub.wbem.javax.cim.UnsignedInteger64;
-import org.metricshub.wbem.javax.cim.UnsignedInteger8;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -166,10 +165,9 @@
 
 /**
  * Class CIMXMLParserImpl is the main class of CIM-XML DOM parser.
- * 
+ *
  */
 public class CIMXMLParserImpl {
-
 	/*
 	 * ebak: local object path - should be used by parseLOCALCLASSPATH(),
 	 * parseLOCALINSTANCEPATH(), parseCLASSNAME(), parseINSTANCENAME(),
@@ -179,7 +177,7 @@ public class CIMXMLParserImpl {
 
 	/**
 	 * setLocalObjectPath
-	 * 
+	 *
 	 * @param pLocalOp
 	 *            - empty fields of parsed objectpaths will be substituted by
 	 *            fields coming from this parameter
@@ -194,7 +192,7 @@ public static void setLocalObjectPath(CIMObjectPath pLocalOp) {
 
 	/**
 	 * parseCIM
-	 * 
+	 *
 	 * @param pCimE
 	 * @return CIMMessage
 	 * @throws CIMXMLParseException
@@ -203,13 +201,11 @@ public static CIMMessage parseCIM(Element pCimE) throws CIMXMLParseException {
 		// 
 		// 
 		Attr cim_cimversionA = (Attr) searchAttribute(pCimE, "CIMVERSION");
-		if (cim_cimversionA == null) throw new CIMXMLParseException(
-				"CIM element missing CIMVERSION attribute!");
+		if (cim_cimversionA == null) throw new CIMXMLParseException("CIM element missing CIMVERSION attribute!");
 		String cimversion = cim_cimversionA.getNodeValue();
 
 		Attr cim_dtdversionA = (Attr) searchAttribute(pCimE, "DTDVERSION");
-		if (cim_dtdversionA == null) throw new CIMXMLParseException(
-				"CIM element missing DTDVERSION attribute!");
+		if (cim_dtdversionA == null) throw new CIMXMLParseException("CIM element missing DTDVERSION attribute!");
 		String dtdversion = cim_dtdversionA.getNodeValue();
 
 		// MESSAGE
@@ -223,7 +219,8 @@ public static CIMMessage parseCIM(Element pCimE) throws CIMXMLParseException {
 
 		// DECLARATION
 		if (searchNodes(pCimE, "DECLARATION", 0, 1, false) != null) throw new CIMXMLParseException(
-				"DECLARATION element not supported!");
+			"DECLARATION element not supported!"
+		);
 
 		throw new CIMXMLParseException("CIM element missing required child element!");
 	}
@@ -234,7 +231,7 @@ public static CIMMessage parseCIM(Element pCimE) throws CIMXMLParseException {
 
 	/**
 	 * parseVALUE - supports the non-standard TYPE attribute
-	 * 
+	 *
 	 * @param pValueE
 	 * @return TypedValue, type is null if no TYPE attribute was found, the
 	 *         value is always String, the caller method have to convert it.
@@ -260,7 +257,7 @@ public static TypedValue parseVALUE(Element pValueE) throws CIMXMLParseException
 
 	/**
 	 * parseVALUEARRAY - supports the non-standard TYPE attribute
-	 * 
+	 *
 	 * @param pValueArrayE
 	 * @return TypedValue, type is null if no TYPE attribute was found, the
 	 *         value is always String[], the caller method have to convert it.
@@ -283,21 +280,21 @@ public static TypedValue parseVALUEARRAY(Element pValueArrayE) throws CIMXMLPars
 				resStringV.add((String) parseVALUE((Element) n).getValue());
 			} else if (name.equals("VALUE.NULL")) {
 				resStringV.add(null);
-			} else if (NODENAME_HASH.containsKey(name)) { throw new CIMXMLParseException(
-					"VALUE.ARRAY element contains invalid child element " + name + "!"); }
+			} else if (NODENAME_HASH.containsKey(name)) {
+				throw new CIMXMLParseException("VALUE.ARRAY element contains invalid child element " + name + "!");
+			}
 		}
 		return new TypedValue(type, resStringV.toArray(new String[0]));
 	}
 
 	/**
 	 * parseVALUEREFERENCE
-	 * 
+	 *
 	 * @param pValuereferenceE
 	 * @return CIMObjectPath
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMObjectPath parseVALUEREFERENCE(Element pValuereferenceE)
-			throws CIMXMLParseException {
+	public static CIMObjectPath parseVALUEREFERENCE(Element pValuereferenceE) throws CIMXMLParseException {
 		// 
 
@@ -322,8 +319,16 @@ public static CIMObjectPath parseVALUEREFERENCE(Element pValuereferenceE)
 			if (op != null && op.getNamespace() != null) {
 				// LocalPathBuilder includes default namespace in CLASSNAME
 				// elements, needs to be stripped
-				op = new CIMObjectPath(op.getScheme(), op.getHost(), op.getPort(), null, op
-						.getObjectName(), op.getKeys(), op.getXmlSchemaName());
+				op =
+					new CIMObjectPath(
+						op.getScheme(),
+						op.getHost(),
+						op.getPort(),
+						null,
+						op.getObjectName(),
+						op.getKeys(),
+						op.getXmlSchemaName()
+					);
 			}
 			return op;
 		}
@@ -336,8 +341,7 @@ public static CIMObjectPath parseVALUEREFERENCE(Element pValuereferenceE)
 		}
 
 		// LOCALINSTANCEPATH
-		Element localinstancepathA[] = searchNodes(pValuereferenceE, "LOCALINSTANCEPATH", 0, 1,
-				false);
+		Element localinstancepathA[] = searchNodes(pValuereferenceE, "LOCALINSTANCEPATH", 0, 1, false);
 		if (localinstancepathA != null) {
 			CIMObjectPath op = parseLOCALINSTANCEPATH(localinstancepathA[0]);
 			return op;
@@ -350,8 +354,16 @@ public static CIMObjectPath parseVALUEREFERENCE(Element pValuereferenceE)
 			if (op != null && op.getNamespace() != null) {
 				// LocalPathBuilder includes default namespace in INSTANCENAME
 				// elements, needs to be stripped
-				op = new CIMObjectPath(op.getScheme(), op.getHost(), op.getPort(), null, op
-						.getObjectName(), op.getKeys(), op.getXmlSchemaName());
+				op =
+					new CIMObjectPath(
+						op.getScheme(),
+						op.getHost(),
+						op.getPort(),
+						null,
+						op.getObjectName(),
+						op.getKeys(),
+						op.getXmlSchemaName()
+					);
 			}
 			return op;
 		}
@@ -361,13 +373,12 @@ public static CIMObjectPath parseVALUEREFERENCE(Element pValuereferenceE)
 
 	/**
 	 * parseVALUEREFARRAY
-	 * 
+	 *
 	 * @param pValueRefArrayE
 	 * @return CIMObjectPath[]
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMObjectPath[] parseVALUEREFARRAY(Element pValueRefArrayE)
-			throws CIMXMLParseException {
+	public static CIMObjectPath[] parseVALUEREFARRAY(Element pValueRefArrayE) throws CIMXMLParseException {
 		// 
 
 		// Process node list here, order of VALUE.REFERENCE/VALUE.NULL IS
@@ -383,21 +394,21 @@ public static CIMObjectPath[] parseVALUEREFARRAY(Element pValueRefArrayE)
 				resObjectPathV.add(parseVALUEREFERENCE((Element) n));
 			} else if (name.equals("VALUE.NULL")) {
 				resObjectPathV.add(null);
-			} else if (NODENAME_HASH.containsKey(name)) { throw new CIMXMLParseException(
-					"VALUE.REFARRAY element contains invalid child element " + name + "!"); }
+			} else if (NODENAME_HASH.containsKey(name)) {
+				throw new CIMXMLParseException("VALUE.REFARRAY element contains invalid child element " + name + "!");
+			}
 		}
 		return resObjectPathV.toArray(new CIMObjectPath[0]);
 	}
 
 	/**
 	 * parseVALUEOBJECT
-	 * 
+	 *
 	 * @param pValueObjectE
 	 * @return CIMNamedElementInterface (CIMClass|CIMInstance)
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMNamedElementInterface parseVALUEOBJECT(Element pValueObjectE)
-			throws CIMXMLParseException {
+	public static CIMNamedElementInterface parseVALUEOBJECT(Element pValueObjectE) throws CIMXMLParseException {
 		// 
 
 		// CLASS
@@ -421,25 +432,26 @@ public static CIMNamedElementInterface parseVALUEOBJECT(Element pValueObjectE)
 
 	/**
 	 * parseVALUENAMEDINSTANCE
-	 * 
+	 *
 	 * @param pValueNamedInstanceE
 	 * @return CIMInstance
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMInstance parseVALUENAMEDINSTANCE(Element pValueNamedInstanceE)
-			throws CIMXMLParseException {
+	public static CIMInstance parseVALUENAMEDINSTANCE(Element pValueNamedInstanceE) throws CIMXMLParseException {
 		// 
 
 		// INSTANCENAME
 		Element instancenameA[] = searchNodes(pValueNamedInstanceE, "INSTANCENAME", 1, 1, true);
-		if (instancenameA == null) { throw new CIMXMLParseException(
-				"VALUE.NAMEDINSTANCE element missing INSTANCENAME child element!"); }
+		if (instancenameA == null) {
+			throw new CIMXMLParseException("VALUE.NAMEDINSTANCE element missing INSTANCENAME child element!");
+		}
 		CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
 
 		// INSTANCE
 		Element instanceA[] = searchNodes(pValueNamedInstanceE, "INSTANCE", 1, 1, true);
-		if (instanceA == null) { throw new CIMXMLParseException(
-				"VALUE.NAMEDINSTANCE element missing INSTANCE child element!"); }
+		if (instanceA == null) {
+			throw new CIMXMLParseException("VALUE.NAMEDINSTANCE element missing INSTANCE child element!");
+		}
 		CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
 		checkOtherNodes(pValueNamedInstanceE, nodesVALUENAMEDINSTANCE);
 		return inst;
@@ -449,25 +461,26 @@ public static CIMInstance parseVALUENAMEDINSTANCE(Element pValueNamedInstanceE)
 
 	/**
 	 * parseVALUEINSTANCEWITHPATH
-	 * 
+	 *
 	 * @param pValueNamedInstanceE
 	 * @return CIMInstance
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMInstance parseVALUEINSTANCEWITHPATH(Element pValueNamedInstanceE)
-			throws CIMXMLParseException {
+	public static CIMInstance parseVALUEINSTANCEWITHPATH(Element pValueNamedInstanceE) throws CIMXMLParseException {
 		// 
 
 		// INSTANCEPATH
 		Element instancepathA[] = searchNodes(pValueNamedInstanceE, "INSTANCEPATH", 1, 1, true);
-		if (instancepathA == null) { throw new CIMXMLParseException(
-				"VALUE.INSTANCEWITHPATH element missing INSTANCEPATH child element!"); }
+		if (instancepathA == null) {
+			throw new CIMXMLParseException("VALUE.INSTANCEWITHPATH element missing INSTANCEPATH child element!");
+		}
 		CIMObjectPath op = parseINSTANCEPATH(instancepathA[0]);
 
 		// INSTANCE
 		Element instanceA[] = searchNodes(pValueNamedInstanceE, "INSTANCE", 1, 1, true);
-		if (instanceA == null) { throw new CIMXMLParseException(
-				"VALUE.INSTANCEWITHPATH element missing INSTANCE child element!"); }
+		if (instanceA == null) {
+			throw new CIMXMLParseException("VALUE.INSTANCEWITHPATH element missing INSTANCE child element!");
+		}
 		CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
 		checkOtherNodes(pValueNamedInstanceE, nodesVALUEINSTANCEWITHPATH);
 		return inst;
@@ -477,13 +490,12 @@ public static CIMInstance parseVALUEINSTANCEWITHPATH(Element pValueNamedInstance
 
 	/**
 	 * parseVALUENAMEDOBJECT
-	 * 
+	 *
 	 * @param pValueNamedObjectE
 	 * @return CIMNamedElementInterface
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMNamedElementInterface parseVALUENAMEDOBJECT(Element pValueNamedObjectE)
-			throws CIMXMLParseException {
+	public static CIMNamedElementInterface parseVALUENAMEDOBJECT(Element pValueNamedObjectE) throws CIMXMLParseException {
 		// 
 
 		// CLASS
@@ -501,8 +513,9 @@ public static CIMNamedElementInterface parseVALUENAMEDOBJECT(Element pValueNamed
 
 			// INSTANCE
 			Element instanceA[] = searchNodes(pValueNamedObjectE, "INSTANCE", 0, 1, true);
-			if (instanceA == null) { throw new CIMXMLParseException(
-					"VALUE.NAMEDOBJECT element missing INSTANCE child element!"); }
+			if (instanceA == null) {
+				throw new CIMXMLParseException("VALUE.NAMEDOBJECT element missing INSTANCE child element!");
+			}
 			CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
 			checkOtherNodes(pValueNamedObjectE, nodesVALUENAMEDOBJECTi);
 			return inst;
@@ -517,13 +530,13 @@ public static CIMNamedElementInterface parseVALUENAMEDOBJECT(Element pValueNamed
 
 	/**
 	 * parseVALUEOBJECTWITHPATH
-	 * 
+	 *
 	 * @param pValueObjectWithPathE
 	 * @return CIMNamedElementInterface
 	 * @throws CIMXMLParseException
 	 */
 	public static CIMNamedElementInterface parseVALUEOBJECTWITHPATH(Element pValueObjectWithPathE)
-			throws CIMXMLParseException {
+		throws CIMXMLParseException {
 		// 
 
@@ -534,8 +547,9 @@ public static CIMNamedElementInterface parseVALUEOBJECTWITHPATH(Element pValueOb
 
 			// CLASS
 			Element classA[] = searchNodes(pValueObjectWithPathE, "CLASS", 0, 1, true);
-			if (classA == null) { throw new CIMXMLParseException(
-					"VALUE.OBJECTWITHPATH element missing CLASS child element!"); }
+			if (classA == null) {
+				throw new CIMXMLParseException("VALUE.OBJECTWITHPATH element missing CLASS child element!");
+			}
 
 			CIMClass obj = parseCLASS(classA[0], op);
 			checkOtherNodes(pValueObjectWithPathE, nodesVALUEOBJECTWITHPATHcls);
@@ -549,44 +563,43 @@ public static CIMNamedElementInterface parseVALUEOBJECTWITHPATH(Element pValueOb
 
 			// INSTANCE
 			Element instanceA[] = searchNodes(pValueObjectWithPathE, "INSTANCE", 0, 1, true);
-			if (instanceA == null) { throw new CIMXMLParseException(
-					"VALUE.OBJECTWITHPATH element missing INSTANCE child element!"); }
+			if (instanceA == null) {
+				throw new CIMXMLParseException("VALUE.OBJECTWITHPATH element missing INSTANCE child element!");
+			}
 			CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
 			checkOtherNodes(pValueObjectWithPathE, nodesVALUEOBJECTWITHPATHins);
 			return inst;
 		}
 
-		throw new CIMXMLParseException(
-				"VALUE.OBJECTWITHPATH element missing required child element!");
+		throw new CIMXMLParseException("VALUE.OBJECTWITHPATH element missing required child element!");
 	}
 
 	private static final String nodesVALUEOBJECTWITHLOCALPATHcls[] = { "LOCALCLASSPATH", "CLASS" };
 
-	private static final String nodesVALUEOBJECTWITHLOCALPATHins[] = { "LOCALINSTANCEPATH",
-			"INSTANCE" };
+	private static final String nodesVALUEOBJECTWITHLOCALPATHins[] = { "LOCALINSTANCEPATH", "INSTANCE" };
 
 	/**
 	 * parseVALUEOBJECTWITHLOCALPATH
-	 * 
+	 *
 	 * @param pValueObjectWithLocalPathE
 	 * @return CIMNamedElementInterface
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMNamedElementInterface parseVALUEOBJECTWITHLOCALPATH(
-			Element pValueObjectWithLocalPathE) throws CIMXMLParseException {
+	public static CIMNamedElementInterface parseVALUEOBJECTWITHLOCALPATH(Element pValueObjectWithLocalPathE)
+		throws CIMXMLParseException {
 		// 
 
 		// LOCALCLASSPATH
-		Element localclasspathA[] = searchNodes(pValueObjectWithLocalPathE, "LOCALCLASSPATH", 0, 1,
-				true);
+		Element localclasspathA[] = searchNodes(pValueObjectWithLocalPathE, "LOCALCLASSPATH", 0, 1, true);
 		if (localclasspathA != null) {
 			CIMObjectPath op = parseLOCALCLASSPATH(localclasspathA[0]);
 
 			// CLASS
 			Element classA[] = searchNodes(pValueObjectWithLocalPathE, "CLASS", 0, 1, true);
-			if (classA == null) { throw new CIMXMLParseException(
-					"VALUE.OBJECTWITHLOCALPATH element missing CLASS child element!"); }
+			if (classA == null) {
+				throw new CIMXMLParseException("VALUE.OBJECTWITHLOCALPATH element missing CLASS child element!");
+			}
 
 			CIMClass obj = parseCLASS(classA[0], op);
 			checkOtherNodes(pValueObjectWithLocalPathE, nodesVALUEOBJECTWITHLOCALPATHcls);
@@ -594,22 +607,21 @@ public static CIMNamedElementInterface parseVALUEOBJECTWITHLOCALPATH(
 		}
 
 		// LOCALINSTANCEPATH
-		Element localinstancepathA[] = searchNodes(pValueObjectWithLocalPathE, "LOCALINSTANCEPATH",
-				0, 1, true);
+		Element localinstancepathA[] = searchNodes(pValueObjectWithLocalPathE, "LOCALINSTANCEPATH", 0, 1, true);
 		if (localinstancepathA != null) {
 			CIMObjectPath op = parseLOCALINSTANCEPATH(localinstancepathA[0]);
 
 			// INSTANCE
 			Element instanceA[] = searchNodes(pValueObjectWithLocalPathE, "INSTANCE", 0, 1, true);
-			if (instanceA == null) { throw new CIMXMLParseException(
-					"VALUE.OBJECTWITHLOCALPATH element missing INSTANCE child element!"); }
+			if (instanceA == null) {
+				throw new CIMXMLParseException("VALUE.OBJECTWITHLOCALPATH element missing INSTANCE child element!");
+			}
 			CIMInstance inst = parseINSTANCE(instanceA[0], op); // BB mod
 			checkOtherNodes(pValueObjectWithLocalPathE, nodesVALUEOBJECTWITHLOCALPATHins);
 			return inst;
 		}
 
-		throw new CIMXMLParseException(
-				"VALUE.OBJECTWITHLOCALPATH element missing required child element!");
+		throw new CIMXMLParseException("VALUE.OBJECTWITHLOCALPATH element missing required child element!");
 	}
 
 	// ////////////////////////////////////////////////////////////////////////////////////////
@@ -620,67 +632,69 @@ public static CIMNamedElementInterface parseVALUEOBJECTWITHLOCALPATH(
 
 	/**
 	 * parseNAMESPACEPATH
-	 * 
+	 *
 	 * @param pNameSpacePathE
 	 * @return CIMObjectPath
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMObjectPath parseNAMESPACEPATH(Element pNameSpacePathE)
-			throws CIMXMLParseException {
+	public static CIMObjectPath parseNAMESPACEPATH(Element pNameSpacePathE) throws CIMXMLParseException {
 		// 
 		// HOST
 		Element hostA[] = searchNodes(pNameSpacePathE, "HOST", 1, 1, true);
-		if (hostA == null) { throw new CIMXMLParseException(
-				"NAMESPACEPATH element missing HOST child element!"); }
+		if (hostA == null) {
+			throw new CIMXMLParseException("NAMESPACEPATH element missing HOST child element!");
+		}
 		XMLHostStr xmlHostStr = new XMLHostStr(parseHOST(hostA[0]));
 		// LOCALNAMESPACE
-		Element localnamespacepathA[] = searchNodes(pNameSpacePathE, "LOCALNAMESPACEPATH", 1, 1,
-				true);
-		if (localnamespacepathA == null) { throw new CIMXMLParseException(
-				"NAMESPACEPATH element missing LOCALNAMESPACEPATH child element!"); }
+		Element localnamespacepathA[] = searchNodes(pNameSpacePathE, "LOCALNAMESPACEPATH", 1, 1, true);
+		if (localnamespacepathA == null) {
+			throw new CIMXMLParseException("NAMESPACEPATH element missing LOCALNAMESPACEPATH child element!");
+		}
 		String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
 		/*
 		 * CIMObjectPath( String scheme, String host, String port, String
 		 * namespace, String objectName, CIMProperty[] keys )
 		 */
 		checkOtherNodes(pNameSpacePathE, nodesNAMESPACEPATH);
-		return new CIMObjectPath(xmlHostStr.getProtocol(), xmlHostStr.getHost(), xmlHostStr
-				.getPort(), nameSpace, null, null);
+		return new CIMObjectPath(
+			xmlHostStr.getProtocol(),
+			xmlHostStr.getHost(),
+			xmlHostStr.getPort(),
+			nameSpace,
+			null,
+			null
+		);
 	}
 
 	/**
 	 * parseLOCALNAMESPACEPATH
-	 * 
+	 *
 	 * @param pLocalNameSpaceE
 	 * @return String
 	 * @throws CIMXMLParseException
 	 */
-	public static String parseLOCALNAMESPACEPATH(Element pLocalNameSpaceE)
-			throws CIMXMLParseException {
+	public static String parseLOCALNAMESPACEPATH(Element pLocalNameSpaceE) throws CIMXMLParseException {
 		// 
 
-		Element[] nameSpaceElementA = searchNodes(pLocalNameSpaceE, "NAMESPACE", 1,
-				Integer.MAX_VALUE, false);
+		Element[] nameSpaceElementA = searchNodes(pLocalNameSpaceE, "NAMESPACE", 1, Integer.MAX_VALUE, false);
 		if (nameSpaceElementA == null) {
-			if (WBEMConfiguration.getGlobalConfiguration().allowEmptyLocalNameSpacePath()
-					&& cLocalPathBuilder != null) return cLocalPathBuilder.getBasePath()
-					.getNamespace();
-			throw new CIMXMLParseException(
-					"LOCALNAMESPACEPATH element missing NAMESPACE child element!");
+			if (
+				WBEMConfiguration.getGlobalConfiguration().allowEmptyLocalNameSpacePath() && cLocalPathBuilder != null
+			) return cLocalPathBuilder.getBasePath().getNamespace();
+			throw new CIMXMLParseException("LOCALNAMESPACEPATH element missing NAMESPACE child element!");
 		}
 		StringBuffer sb = new StringBuffer();
 		for (int i = 0; i < nameSpaceElementA.length; i++) {
 			Element namespaceE = nameSpaceElementA[i];
 			String s = parseNAMESPACE(namespaceE);
-			if (i > 0) sb.append("/" + s);
-			else sb.append(s);
+			if (i > 0) sb.append("/" + s); else sb.append(s);
 		}
 		return sb.toString();
 	}
 
 	/**
 	 * parseHOST
-	 * 
+	 *
 	 * @param pHostE
 	 * @return String
 	 */
@@ -696,7 +710,7 @@ public static String parseHOST(Element pHostE) {
 
 	/**
 	 * parseNAMESPACE
-	 * 
+	 *
 	 * @param pNameSpaceE
 	 * @return String
 	 * @throws CIMXMLParseException
@@ -706,8 +720,7 @@ public static String parseNAMESPACE(Element pNameSpaceE) throws CIMXMLParseExcep
 		// 
 
 		Attr namespace_nameA = (Attr) searchAttribute(pNameSpaceE, "NAME");
-		if (namespace_nameA == null) throw new CIMXMLParseException(
-				"NAMESPACE element missing NAME attribute!");
+		if (namespace_nameA == null) throw new CIMXMLParseException("NAMESPACE element missing NAME attribute!");
 		String n = namespace_nameA.getValue();
 		checkOtherNodes(pNameSpaceE, nodesNAMESPACE);
 		return n;
@@ -717,7 +730,7 @@ public static String parseNAMESPACE(Element pNameSpaceE) throws CIMXMLParseExcep
 
 	/**
 	 * parseCLASSPATH
-	 * 
+	 *
 	 * @param pClassPathE
 	 * @return CIMObjectPath
 	 * @throws CIMXMLParseException
@@ -727,46 +740,55 @@ public static CIMObjectPath parseCLASSPATH(Element pClassPathE) throws CIMXMLPar
 
 		// NAMESPACEPATH
 		Element namespacepathA[] = searchNodes(pClassPathE, "NAMESPACEPATH", 1, 1, true);
-		if (namespacepathA == null) { throw new CIMXMLParseException(
-				"CLASSPATH element missing NAMESPACEPATH child element!"); }
+		if (namespacepathA == null) {
+			throw new CIMXMLParseException("CLASSPATH element missing NAMESPACEPATH child element!");
+		}
 		CIMObjectPath nsPath = parseNAMESPACEPATH(namespacepathA[0]);
 		// CLASSNAME
 		Element classnameA[] = searchNodes(pClassPathE, "CLASSNAME", 1, 1, true);
-		if (classnameA == null) { throw new CIMXMLParseException(
-				"CLASSPATH element missing CLASSNAME child element!"); }
+		if (classnameA == null) {
+			throw new CIMXMLParseException("CLASSPATH element missing CLASSNAME child element!");
+		}
 		String className = parseClassName(classnameA[0]);
 		/*
 		 * CIMObjectPath( String scheme, String host, String port, String
 		 * namespace, String objectName, CIMProperty[] keys )
 		 */
 		checkOtherNodes(pClassPathE, nodesCLASSPATH);
-		return new CIMObjectPath(nsPath.getScheme(), nsPath.getHost(), nsPath.getPort(), nsPath
-				.getNamespace(), className, null);
+		return new CIMObjectPath(
+			nsPath.getScheme(),
+			nsPath.getHost(),
+			nsPath.getPort(),
+			nsPath.getNamespace(),
+			className,
+			null
+		);
 	}
 
 	private static final String nodesLOCALCLASSPATH[] = { "LOCALNAMESPACEPATH", "CLASSNAME" };
 
 	/**
 	 * parseLOCALCLASSPATH
-	 * 
+	 *
 	 * @param pClassPathE
 	 * @return CIMObjectPath
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMObjectPath parseLOCALCLASSPATH(Element pClassPathE)
-			throws CIMXMLParseException {
+	public static CIMObjectPath parseLOCALCLASSPATH(Element pClassPathE) throws CIMXMLParseException {
 		// 
 
 		// NAMESPACEPATH
 		Element localnamespacepathA[] = searchNodes(pClassPathE, "LOCALNAMESPACEPATH", 1, 1, true);
-		if (localnamespacepathA == null) { throw new CIMXMLParseException(
-				"LOCALCLASSPATH element missing LOCALNAMESPACEPATH child element!"); }
+		if (localnamespacepathA == null) {
+			throw new CIMXMLParseException("LOCALCLASSPATH element missing LOCALNAMESPACEPATH child element!");
+		}
 		String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
 
 		// CLASSNAME
 		Element classnameA[] = searchNodes(pClassPathE, "CLASSNAME", 1, 1, true);
-		if (classnameA == null) { throw new CIMXMLParseException(
-				"LOCALCLASSPATH element missing CLASSNAME child element!"); }
+		if (classnameA == null) {
+			throw new CIMXMLParseException("LOCALCLASSPATH element missing CLASSNAME child element!");
+		}
 		CIMObjectPath op = parseCLASSNAME(classnameA[0]);
 		checkOtherNodes(pClassPathE, nodesLOCALCLASSPATH);
 		return cLocalPathBuilder.build(op.getObjectName(), nameSpace);
@@ -776,7 +798,7 @@ public static CIMObjectPath parseLOCALCLASSPATH(Element pClassPathE)
 
 	/**
 	 * parseClassName
-	 * 
+	 *
 	 * @param pClassNameE
 	 * @return String
 	 * @throws CIMXMLParseException
@@ -785,15 +807,14 @@ public static String parseClassName(Element pClassNameE) throws CIMXMLParseExcep
 		// 
 		// 
 		Attr classname_nameA = (Attr) searchAttribute(pClassNameE, "NAME");
-		if (classname_nameA == null) throw new CIMXMLParseException(
-				"CLASSNAME element missing NAME attribute!");
+		if (classname_nameA == null) throw new CIMXMLParseException("CLASSNAME element missing NAME attribute!");
 		checkOtherNodes(pClassNameE, nodesCLASSNAME);
 		return classname_nameA.getNodeValue();
 	}
 
 	/**
 	 * parseCLASSNAME
-	 * 
+	 *
 	 * @param pClassNameE
 	 * @return CIMObjectPath
 	 * @throws CIMXMLParseException
@@ -806,55 +827,62 @@ public static CIMObjectPath parseCLASSNAME(Element pClassNameE) throws CIMXMLPar
 
 	/**
 	 * parseINSTANCEPATH
-	 * 
+	 *
 	 * @param pInstancePathE
 	 * @return CIMObjectPath
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMObjectPath parseINSTANCEPATH(Element pInstancePathE)
-			throws CIMXMLParseException {
+	public static CIMObjectPath parseINSTANCEPATH(Element pInstancePathE) throws CIMXMLParseException {
 		// 
 
 		// NAMESPACEPATH
 		Element namespacepathA[] = searchNodes(pInstancePathE, "NAMESPACEPATH", 1, 1, true);
-		if (namespacepathA == null) { throw new CIMXMLParseException(
-				"INSTANCEPATH element missing NAMESPACEPATH child element!"); }
+		if (namespacepathA == null) {
+			throw new CIMXMLParseException("INSTANCEPATH element missing NAMESPACEPATH child element!");
+		}
 		CIMObjectPath nsPath = parseNAMESPACEPATH(namespacepathA[0]);
 		// INSTANCENAME
 		Element instancenameA[] = searchNodes(pInstancePathE, "INSTANCENAME", 1, 1, true);
-		if (instancenameA == null) { throw new CIMXMLParseException(
-				"INSTANCEPATH element missing INSTANCENAME child element!"); }
+		if (instancenameA == null) {
+			throw new CIMXMLParseException("INSTANCEPATH element missing INSTANCENAME child element!");
+		}
 		CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
 		// ebak: change host and namespace
 		checkOtherNodes(pInstancePathE, nodesINSTANCEPATH);
-		return new CIMObjectPath(nsPath.getScheme(), nsPath.getHost(), nsPath.getPort(), nsPath
-				.getNamespace(), op.getObjectName(), op.getKeys());
+		return new CIMObjectPath(
+			nsPath.getScheme(),
+			nsPath.getHost(),
+			nsPath.getPort(),
+			nsPath.getNamespace(),
+			op.getObjectName(),
+			op.getKeys()
+		);
 	}
 
 	private static final String nodesLOCALINSTANCEPATH[] = { "LOCALNAMESPACEPATH", "INSTANCENAME" };
 
 	/**
 	 * parseLOCALINSTANCEPATH
-	 * 
+	 *
 	 * @param pLocalInstancePathE
 	 * @return CIMObjectPath
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMObjectPath parseLOCALINSTANCEPATH(Element pLocalInstancePathE)
-			throws CIMXMLParseException {
+	public static CIMObjectPath parseLOCALINSTANCEPATH(Element pLocalInstancePathE) throws CIMXMLParseException {
 		// 
 
 		// LOCALNAMESPACEPATH
-		Element localnamespacepathA[] = searchNodes(pLocalInstancePathE, "LOCALNAMESPACEPATH", 1,
-				1, true);
-		if (localnamespacepathA == null) { throw new CIMXMLParseException(
-				"LOCALINSTANCEPATH element missing LOCALNAMESPACEPATH child element!"); }
+		Element localnamespacepathA[] = searchNodes(pLocalInstancePathE, "LOCALNAMESPACEPATH", 1, 1, true);
+		if (localnamespacepathA == null) {
+			throw new CIMXMLParseException("LOCALINSTANCEPATH element missing LOCALNAMESPACEPATH child element!");
+		}
 		String nameSpace = parseLOCALNAMESPACEPATH(localnamespacepathA[0]);
 
 		// INSTANCENAME
 		Element instancenameA[] = searchNodes(pLocalInstancePathE, "INSTANCENAME", 1, 1, true);
-		if (instancenameA == null) { throw new CIMXMLParseException(
-				"LOCALINSTANCEPATH element missing INSTANCENAME child element!"); }
+		if (instancenameA == null) {
+			throw new CIMXMLParseException("LOCALINSTANCEPATH element missing INSTANCENAME child element!");
+		}
 		CIMObjectPath op = parseINSTANCENAME(instancenameA[0]);
 		/*
 		 * CIMObjectPath(String objectName, String namespace, CIMProperty[]
@@ -868,23 +896,22 @@ public static CIMObjectPath parseLOCALINSTANCEPATH(Element pLocalInstancePathE)
 
 	/**
 	 * parseINSTANCENAME
-	 * 
+	 *
 	 * @param pInstanceNameE
 	 * @return CIMObjectPath
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMObjectPath parseINSTANCENAME(Element pInstanceNameE)
-			throws CIMXMLParseException {
+	public static CIMObjectPath parseINSTANCENAME(Element pInstanceNameE) throws CIMXMLParseException {
 		// 
 		// 
 		Attr instance_classnameA = (Attr) searchAttribute(pInstanceNameE, "CLASSNAME");
 		if (instance_classnameA == null) throw new CIMXMLParseException(
-				"INSTANCENAME element missing CLASSNAME attribute!");
+			"INSTANCENAME element missing CLASSNAME attribute!"
+		);
 		String opClassName = instance_classnameA.getNodeValue();
 
 		// KEYBINDING
-		Element[] keyBindingElementA = searchNodes(pInstanceNameE, "KEYBINDING", 0,
-				Integer.MAX_VALUE, false);
+		Element[] keyBindingElementA = searchNodes(pInstanceNameE, "KEYBINDING", 0, Integer.MAX_VALUE, false);
 		if (keyBindingElementA != null) {
 			CIMProperty[] keys = new CIMProperty[keyBindingElementA.length];
 			for (int i = 0; i < keyBindingElementA.length; i++) {
@@ -899,8 +926,7 @@ public static CIMObjectPath parseINSTANCENAME(Element pInstanceNameE)
 		if (keyvalueA != null) {
 			CIMProperty[] keys = new CIMProperty[1];
 			TypedValue propTypedVal = parseKEYVALUE(keyvalueA[0]);
-			keys[0] = new CIMProperty("", propTypedVal.getType(), propTypedVal.getValue(),
-					true, false, null);
+			keys[0] = new CIMProperty("", propTypedVal.getType(), propTypedVal.getValue(), true, false, null);
 			return cLocalPathBuilder.build(opClassName, null, keys);
 		}
 
@@ -909,8 +935,7 @@ public static CIMObjectPath parseINSTANCENAME(Element pInstanceNameE)
 		if (valuereferenceA != null) {
 			CIMProperty[] keys = new CIMProperty[1];
 			CIMObjectPath op = parseVALUEREFERENCE(valuereferenceA[0]);
-			keys[0] = new CIMProperty("", new CIMDataType(op.getObjectName()), op,
-					true, false, null);
+			keys[0] = new CIMProperty("", new CIMDataType(op.getObjectName()), op, true, false, null);
 			return cLocalPathBuilder.build(opClassName, null, keys);
 		}
 
@@ -921,7 +946,7 @@ public static CIMObjectPath parseINSTANCENAME(Element pInstanceNameE)
 
 	/**
 	 * parseOBJECTPATH
-	 * 
+	 *
 	 * @param pObjectPathE
 	 * @return CIMObjectPath
 	 * @throws CIMXMLParseException
@@ -948,7 +973,7 @@ public static CIMObjectPath parseOBJECTPATH(Element pObjectPathE) throws CIMXMLP
 
 	/**
 	 * parseKEYBINDING
-	 * 
+	 *
 	 * @param pKeyBindingE
 	 * @return CIMProperty
 	 * @throws CIMXMLParseException
@@ -958,37 +983,34 @@ public static CIMProperty parseKEYBINDING(Element pKeyBindingE) throws CIMXML
 		// 
 
 		Attr keybinding_nameA = (Attr) searchAttribute(pKeyBindingE, "NAME");
-		if (keybinding_nameA == null) throw new CIMXMLParseException(
-				"KEYBINDING element missing NAME attribute!");
+		if (keybinding_nameA == null) throw new CIMXMLParseException("KEYBINDING element missing NAME attribute!");
 		String propName = keybinding_nameA.getValue();
 
 		// KEYVALUE
 		Element keyvalueA[] = searchNodes(pKeyBindingE, "KEYVALUE", 0, 1, false);
 		if (keyvalueA != null) {
 			TypedValue propTypedVal = parseKEYVALUE(keyvalueA[0]);
-			return new CIMProperty(propName, propTypedVal.getType(), propTypedVal
-					.getValue(), true, false, null);
+			return new CIMProperty(propName, propTypedVal.getType(), propTypedVal.getValue(), true, false, null);
 		}
 
 		// VALUE.REFERENCE
 		Element valuereferenceA[] = searchNodes(pKeyBindingE, "VALUE.REFERENCE", 0, 1, false);
 		if (valuereferenceA != null) {
 			CIMObjectPath op = parseVALUEREFERENCE(valuereferenceA[0]);
-			return new CIMProperty(propName, new CIMDataType(op.getObjectName()),
-					op, true, false, null);
+			return new CIMProperty(propName, new CIMDataType(op.getObjectName()), op, true, false, null);
 		}
 
 		throw new CIMXMLParseException("KEYBINDING element missing required child element!");
 	}
 
 	private static final TreeMap TYPESTR_MAP = new TreeMap(
-			new Comparator() {
-
-				public int compare(Object pO1, Object pO2) {
-					return ((String) pO1).compareToIgnoreCase((String) pO2);
-				}
+		new Comparator() {
 
-			});
+			public int compare(Object pO1, Object pO2) {
+				return ((String) pO1).compareToIgnoreCase((String) pO2);
+			}
+		}
+	);
 
 	static {
 		TYPESTR_MAP.put(MOF.DT_UINT8, CIMDataType.UINT8_T);
@@ -1016,7 +1038,7 @@ public int compare(Object pO1, Object pO2) {
 
 	/**
 	 * parseScalarTypeStr
-	 * 
+	 *
 	 * @param pTypeStr
 	 * @return CIMDataType
 	 * @throws CIMXMLParseException
@@ -1027,7 +1049,7 @@ public static CIMDataType parseScalarTypeStr(String pTypeStr) throws CIMXMLParse
 
 	/**
 	 * parseArrayTypeStr
-	 * 
+	 *
 	 * @param pTypeStr
 	 * @return CIMDataType
 	 * @throws CIMXMLParseException
@@ -1038,20 +1060,18 @@ public static CIMDataType parseArrayTypeStr(String pTypeStr) throws CIMXMLParseE
 
 	/**
 	 * parseTypeStr
-	 * 
+	 *
 	 * @param pTypeStr
 	 * @param pArray
 	 * @return CIMDataType
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMDataType parseTypeStr(String pTypeStr, boolean pArray)
-			throws CIMXMLParseException {
+	public static CIMDataType parseTypeStr(String pTypeStr, boolean pArray) throws CIMXMLParseException {
 		if (pTypeStr == null) return pArray ? CIMDataType.STRING_ARRAY_T : CIMDataType.STRING_T;
 		CIMDataType type = TYPESTR_MAP.get(pTypeStr);
 		if (type == null) throw new CIMXMLParseException("Unknown TYPE string:" + pTypeStr);
 		if (pArray) {
-			if (type.getType() == CIMDataType.REFERENCE) return new CIMDataType(type
-					.getRefClassName(), 0);
+			if (type.getType() == CIMDataType.REFERENCE) return new CIMDataType(type.getRefClassName(), 0);
 			return CIMHelper.UnboundedArrayDataType(type.getType());
 		}
 		return type;
@@ -1059,7 +1079,7 @@ public static CIMDataType parseTypeStr(String pTypeStr, boolean pArray)
 
 	/**
 	 * parseKEYVALUE
-	 * 
+	 *
 	 * @param pKeyValueE
 	 * @return TypedValue
 	 * @throws CIMXMLParseException
@@ -1094,27 +1114,25 @@ public static TypedValue parseKEYVALUE(Element pKeyValueE) throws CIMXMLParseExc
 	 * parser will be removed.
 	 */
 	private static class ValueTypeHandler {
-
 		private CIMDataType iType;
 
 		private Object iValue;
 
 		/**
-		 * 
+		 *
 		 * Ctor.
-		 * 
+		 *
 		 * @param pValueTypeStr
 		 * @param pValueStr
 		 * @throws CIMXMLParseException
 		 */
 		public ValueTypeHandler(String pValueTypeStr, String pValueStr) throws CIMXMLParseException {
-
-			if (pValueTypeStr == null) throw new CIMXMLParseException(
-					"KEYVALUE element missing VALUETYPE attribute!");
+			if (pValueTypeStr == null) throw new CIMXMLParseException("KEYVALUE element missing VALUETYPE attribute!");
 
 			if (pValueTypeStr.equals("numeric")) {
 				if (!setUInt64(pValueStr) && !setSInt64(pValueStr) && !setReal64(pValueStr)) throw new CIMXMLParseException(
-						"Unparseable \"number\" value: " + pValueStr + " !");
+					"Unparseable \"number\" value: " + pValueStr + " !"
+				);
 			} else if (pValueTypeStr.equals(MOF.DT_STR)) {
 				if (!setDTAbsolute(pValueStr) && !setDTInterval(pValueStr)) {
 					this.iValue = pValueStr;
@@ -1122,18 +1140,25 @@ public ValueTypeHandler(String pValueTypeStr, String pValueStr) throws CIMXMLPar
 				}
 			} else if (pValueTypeStr.equals(MOF.DT_BOOL)) {
 				if (!setBoolean(pValueStr)) throw new CIMXMLParseException(
-						"Unparseable \"boolean\" value: " + pValueStr + " !");
+					"Unparseable \"boolean\" value: " + pValueStr + " !"
+				);
 			} else {
-				throw new CIMXMLParseException("KEYVALUE element's VALUETYPE attribute must be "
-						+ MOF.DT_STR + ", " + MOF.DT_BOOL + " or numeric! " + pValueStr
-						+ " is not allowed!");
+				throw new CIMXMLParseException(
+					"KEYVALUE element's VALUETYPE attribute must be " +
+					MOF.DT_STR +
+					", " +
+					MOF.DT_BOOL +
+					" or numeric! " +
+					pValueStr +
+					" is not allowed!"
+				);
 			}
 		}
 
 		/**
-		 * 
+		 *
 		 * getType
-		 * 
+		 *
 		 * @return CIMDataType
 		 */
 		public CIMDataType getType() {
@@ -1141,9 +1166,9 @@ public CIMDataType getType() {
 		}
 
 		/**
-		 * 
+		 *
 		 * getValue
-		 * 
+		 *
 		 * @return Object
 		 */
 		public Object getValue() {
@@ -1220,12 +1245,17 @@ private static String attribute(Element pElement, String pName) {
 		return attrib;
 	}
 
-	private static final String[] nodesCLASS = { "QUALIFIER", "PROPERTY", "PROPERTY.ARRAY",
-			"PROPERTY.REFERENCE", "METHOD" };
+	private static final String[] nodesCLASS = {
+		"QUALIFIER",
+		"PROPERTY",
+		"PROPERTY.ARRAY",
+		"PROPERTY.REFERENCE",
+		"METHOD"
+	};
 
 	/**
 	 * parseCLASS
-	 * 
+	 *
 	 * @param pClassE
 	 * @return CIMClass
 	 * @throws CIMXMLParseException
@@ -1236,21 +1266,19 @@ public static CIMClass parseCLASS(Element pClassE) throws CIMXMLParseException {
 
 	/**
 	 * parseCLASS
-	 * 
+	 *
 	 * @param pClassE
 	 * @param pObjectPath
 	 * @return CIMClass
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMClass parseCLASS(Element pClassE, CIMObjectPath pObjectPath)
-			throws CIMXMLParseException {
+	public static CIMClass parseCLASS(Element pClassE, CIMObjectPath pObjectPath) throws CIMXMLParseException {
 		// 
 		// 
 
 		Attr class_nameA = (Attr) searchAttribute(pClassE, "NAME");
-		if (class_nameA == null) throw new CIMXMLParseException(
-				"CLASS element missing NAME attribute!");
+		if (class_nameA == null) throw new CIMXMLParseException("CLASS element missing NAME attribute!");
 		String name = class_nameA.getNodeValue();
 
 		// Attr superclass_nameA = (Attr)searchAttribute(classE, "SUPERCLASS");
@@ -1280,9 +1308,9 @@ public static CIMClass parseCLASS(Element pClassE, CIMObjectPath pObjectPath)
 		/*
 		 * CIMClass( String name, String superclass, CIMQualifier[] qualifiers,
 		 * CIMClassProperty[] props, CIMMethod[] methods )
-		 * 
+		 *
 		 * return new CIMClass( name, superClass, qualis, props, methods );
-		 * 
+		 *
 		 * This constructor can provide localPath info. CIMClass( CIMObjectPath
 		 * path, String superclass, CIMQualifier[] qualifiers,
 		 * CIMClassProperty[] props, CIMMethod[] pMethods, boolean
@@ -1291,24 +1319,28 @@ public static CIMClass parseCLASS(Element pClassE, CIMObjectPath pObjectPath)
 		checkOtherNodes(pClassE, nodesCLASS);
 
 		return new CIMClass(
-				pObjectPath == null ? cLocalPathBuilder.build(name, null) : pObjectPath,
-				superClass, qualis, props, methods, hasAssocQuali(qualis), hasKeyProp(props));
+			pObjectPath == null ? cLocalPathBuilder.build(name, null) : pObjectPath,
+			superClass,
+			qualis,
+			props,
+			methods,
+			hasAssocQuali(qualis),
+			hasKeyProp(props)
+		);
 	}
 
 	private static boolean hasAssocQuali(CIMQualifier[] pQualis) {
 		if (pQualis == null) return false;
 		for (int i = 0; i < pQualis.length; i++) {
 			CIMQualifier quali = pQualis[i];
-			if ("ASSOCIATION".equalsIgnoreCase(quali.getName())
-					&& Boolean.TRUE.equals(quali.getValue())) return true;
+			if ("ASSOCIATION".equalsIgnoreCase(quali.getName()) && Boolean.TRUE.equals(quali.getValue())) return true;
 		}
 		return false;
 	}
 
 	private static boolean hasKeyProp(CIMProperty[] pProps) {
 		if (pProps == null) return false;
-		for (int i = 0; i < pProps.length; i++)
-			if (pProps[i].isKey()) return true;
+		for (int i = 0; i < pProps.length; i++) if (pProps[i].isKey()) return true;
 		return false;
 	}
 
@@ -1354,12 +1386,17 @@ private static CIMParameter[] parseParameters(Element pMethodE) throws CIMXML
 		return paramV.toArray(new CIMParameter[0]);
 	}
 
-	private static final String nodesMETHOD[] = { "QUALIFIER", "PARAMETER", "PARAMETER.REFERENCE",
-			"PARAMETER.ARRAY", "PARAMETER.REFARRAY" };
+	private static final String nodesMETHOD[] = {
+		"QUALIFIER",
+		"PARAMETER",
+		"PARAMETER.REFERENCE",
+		"PARAMETER.ARRAY",
+		"PARAMETER.REFARRAY"
+	};
 
 	/**
 	 * parseMETHOD
-	 * 
+	 *
 	 * @param pMethodE
 	 * @return CIMMethod
 	 * @throws CIMXMLParseException
@@ -1377,8 +1414,7 @@ public static CIMMethod parseMETHOD(Element pMethodE) throws CIMXMLParse
 		if (name == null) throw new CIMXMLParseException("METHOD element missing NAME attribute!");
 		EmbObjHandler embObjHandler = new EmbObjHandler(pMethodE);
 		CIMDataType type = embObjHandler.getType();
-		if (type != null && type.isArray()) throw new CIMXMLParseException(
-				"Method's type cannot be Array!");
+		if (type != null && type.isArray()) throw new CIMXMLParseException("Method's type cannot be Array!");
 		String classOrigin = attribute(pMethodE, "CLASSORIGIN");
 		String propagatedStr = pMethodE.getAttribute("PROPAGATED");
 		boolean propagated = "true".equalsIgnoreCase(propagatedStr);
@@ -1389,47 +1425,41 @@ public static CIMMethod parseMETHOD(Element pMethodE) throws CIMXMLParse
 		CIMParameter[] params = parseParameters(pMethodE);
 		// CIMMethod(String name, CIMDataType type, CIMQualifier[] qualifiers,
 		// CIMParameter[] parameters, boolean propagated, String originClass)
-		return new CIMMethod(name, type, embObjHandler.getQualifiers(), params, propagated,
-				classOrigin);
+		return new CIMMethod(name, type, embObjHandler.getQualifiers(), params, propagated, classOrigin);
 	}
 
 	private static final String nodesPARAMETER[] = { "QUALIFIER" };
 
 	/**
 	 * parsePARAMETER
-	 * 
+	 *
 	 * @param pParamE
 	 * @return CIMParameter
 	 * @throws CIMXMLParseException
 	 */
 	public static CIMParameter parsePARAMETER(Element pParamE) throws CIMXMLParseException {
 		String name = attribute(pParamE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PARAMETER element missing NAME attribute!");
-		if (attribute(pParamE, "TYPE") == null) throw new CIMXMLParseException(
-				"PARAMETER element missing TYPE attribute!");
+		if (name == null) throw new CIMXMLParseException("PARAMETER element missing NAME attribute!");
+		if (attribute(pParamE, "TYPE") == null) throw new CIMXMLParseException("PARAMETER element missing TYPE attribute!");
 		checkOtherNodes(pParamE, nodesPARAMETER);
 		EmbObjHandler iEmbObjHandler = new EmbObjHandler(pParamE);
 		// CIMParameter(String name, CIMDataType type, CIMQualifier[]
 		// qualifiers)
-		return new CIMParameter(name, iEmbObjHandler.getType(), iEmbObjHandler
-				.getQualifiers());
+		return new CIMParameter(name, iEmbObjHandler.getType(), iEmbObjHandler.getQualifiers());
 	}
 
 	private static final String nodesPARAMETERREFERENCE[] = { "QUALIFIER" };
 
 	/**
 	 * parsePARAMETERREFERENCE
-	 * 
+	 *
 	 * @param pParamE
 	 * @return CIMParameter
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMParameter parsePARAMETERREFERENCE(Element pParamE)
-			throws CIMXMLParseException {
+	public static CIMParameter parsePARAMETERREFERENCE(Element pParamE) throws CIMXMLParseException {
 		String name = attribute(pParamE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PARAMETER.REFERENCE element missing NAME attribute!");
+		if (name == null) throw new CIMXMLParseException("PARAMETER.REFERENCE element missing NAME attribute!");
 		String referenceClass = attribute(pParamE, "REFERENCECLASS");
 		CIMDataType type = new CIMDataType(referenceClass != null ? referenceClass : "");
 		checkOtherNodes(pParamE, nodesPARAMETERREFERENCE);
@@ -1442,45 +1472,40 @@ public static CIMParameter parsePARAMETERREFERENCE(Element pParamE)
 
 	/**
 	 * parsePARAMETERARRAY
-	 * 
+	 *
 	 * @param pParamE
 	 * @return CIMParameter
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMParameter parsePARAMETERARRAY(Element pParamE)
-			throws CIMXMLParseException {
+	public static CIMParameter parsePARAMETERARRAY(Element pParamE) throws CIMXMLParseException {
 		String name = attribute(pParamE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PARAMETER.ARRAY element missing NAME attribute!");
+		if (name == null) throw new CIMXMLParseException("PARAMETER.ARRAY element missing NAME attribute!");
 		if (attribute(pParamE, "TYPE") == null) throw new CIMXMLParseException(
-				"PARAMETER.ARRAY element missing TYPE attribute!");
+			"PARAMETER.ARRAY element missing TYPE attribute!"
+		);
 		String arraySizeStr = pParamE.getAttribute("ARRAYSIZE");
 		try {
 			if (arraySizeStr.length() > 0) Integer.parseInt(arraySizeStr);
 		} catch (NumberFormatException e) {
-			throw new CIMXMLParseException(arraySizeStr
-					+ " is not a valid ARRAYSIZE attribute for PARAMETER.ARRAY!");
+			throw new CIMXMLParseException(arraySizeStr + " is not a valid ARRAYSIZE attribute for PARAMETER.ARRAY!");
 		}
 		checkOtherNodes(pParamE, nodesPARAMETERARRAY);
 		EmbObjHandler iEmbObjHandler = new EmbObjHandler(pParamE);
-		return new CIMParameter(name, iEmbObjHandler.getArrayType(), iEmbObjHandler
-				.getQualifiers());
+		return new CIMParameter(name, iEmbObjHandler.getArrayType(), iEmbObjHandler.getQualifiers());
 	}
 
 	private static final String nodesPARAMETERREFARRAY[] = { "QUALIFIER" };
 
 	/**
 	 * parsePARAMETERREFARRAY
-	 * 
+	 *
 	 * @param pParamE
 	 * @return CIMParameter
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMParameter parsePARAMETERREFARRAY(Element pParamE)
-			throws CIMXMLParseException {
+	public static CIMParameter parsePARAMETERREFARRAY(Element pParamE) throws CIMXMLParseException {
 		String name = attribute(pParamE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PARAMETER.REFARRAY element missing NAME attribute!");
+		if (name == null) throw new CIMXMLParseException("PARAMETER.REFARRAY element missing NAME attribute!");
 
 		String referenceClass = attribute(pParamE, "REFERENCECLASS");
 
@@ -1489,12 +1514,10 @@ public static CIMParameter parsePARAMETERREFARRAY(Element pParamE)
 		try {
 			if (arraySizeStr.length() > 0) arraySize = Integer.parseInt(arraySizeStr);
 		} catch (NumberFormatException e) {
-			throw new CIMXMLParseException(arraySizeStr
-					+ " is not a valid ARRAYSIZE attribute for PARAMETER.REFARRAY!");
+			throw new CIMXMLParseException(arraySizeStr + " is not a valid ARRAYSIZE attribute for PARAMETER.REFARRAY!");
 		}
 
-		CIMDataType type = new CIMDataType((referenceClass != null) ? referenceClass : "",
-				arraySize);
+		CIMDataType type = new CIMDataType((referenceClass != null) ? referenceClass : "", arraySize);
 
 		// QUALIFIER
 		checkOtherNodes(pParamE, nodesPARAMETERREFARRAY);
@@ -1504,7 +1527,7 @@ public static CIMParameter parsePARAMETERREFARRAY(Element pParamE)
 
 	/**
 	 * parseINSTANCE
-	 * 
+	 *
 	 * @param pInstanceE
 	 * @return CIMInstance
 	 * @throws CIMXMLParseException
@@ -1513,27 +1536,24 @@ public static CIMInstance parseINSTANCE(Element pInstanceE) throws CIMXMLParseEx
 		return parseINSTANCE(pInstanceE, null);
 	}
 
-	private static final String[] nodesINSTANCE = { "QUALIFIER", "PROPERTY", "PROPERTY.ARRAY",
-			"PROPERTY.REFERENCE" };
+	private static final String[] nodesINSTANCE = { "QUALIFIER", "PROPERTY", "PROPERTY.ARRAY", "PROPERTY.REFERENCE" };
 
 	/**
 	 * parseINSTANCE
-	 * 
+	 *
 	 * @param pInstanceE
 	 * @param pObjPath
 	 * @return CIMInstance
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMInstance parseINSTANCE(Element pInstanceE, CIMObjectPath pObjPath)
-			throws CIMXMLParseException {
+	public static CIMInstance parseINSTANCE(Element pInstanceE, CIMObjectPath pObjPath) throws CIMXMLParseException {
 		// 
 		// 
 
 		// BB mod CIMInstance inst = new CIMInstance();
 		String className = attribute(pInstanceE, "CLASSNAME");
-		if (className == null) throw new CIMXMLParseException(
-				"INSTANCE element missing CLASSNAME attribute!");
+		if (className == null) throw new CIMXMLParseException("INSTANCE element missing CLASSNAME attribute!");
 		// QUALIFIER
 		// FIXME: in JSR48 CIMInstance doesn't have qualifiers
 		// CIMQualifier[] qualis = parseQUALIFIERS(pInstanceE);
@@ -1542,10 +1562,10 @@ public static CIMInstance parseINSTANCE(Element pInstanceE, CIMObjectPath pObjPa
 
 		checkOtherNodes(pInstanceE, nodesINSTANCE);
 
-		if (pObjPath == null) return new CIMInstance(cLocalPathBuilder.build(className, null),
-				props);
-		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
-				.CIMInstanceWithSynchonizedNumericKeyDataTypes(pObjPath, props);
+		if (pObjPath == null) return new CIMInstance(cLocalPathBuilder.build(className, null), props);
+		if (
+			WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()
+		) return CIMHelper.CIMInstanceWithSynchonizedNumericKeyDataTypes(pObjPath, props);
 		return new CIMInstance(pObjPath, props);
 	}
 
@@ -1553,7 +1573,7 @@ public static CIMInstance parseINSTANCE(Element pInstanceE, CIMObjectPath pObjPa
 	 * ebak: Access to enclosing method parseQUALIFIERS(Element) from the type
 	 * CIMXMLParserImpl is emulated by a synthetic accessor method. Increasing
 	 * its visibility will improve your performance
-	 * 
+	 *
 	 * @param pElement
 	 * @return CIMQualifier[]
 	 * @throws CIMXMLParseException
@@ -1579,7 +1599,7 @@ public static CIMQualifier[] parseQUALIFIERS(Element pElement) throws CIMXMLP
 	 *  TOINSTANCE     (true|false)  'false'
 	 *  TRANSLATABLE   (true|false)  'false'"
 	 * 
-	 * 
+	 *
 	 * @param pElement
 	 * @return int - CIMFlavor bit mixture
 	 */
@@ -1597,8 +1617,7 @@ private static TypedValue parseSingleValue(Element pElement) throws CIMXMLParseE
 
 	private static final int VALUE = 1, VALUEA = 2, VALUEREF = 4, VALUEREFA = 8;
 
-	private static TypedValue parseSingleValue(Element pElement, int pMask)
-			throws CIMXMLParseException {
+	private static TypedValue parseSingleValue(Element pElement, int pMask) throws CIMXMLParseException {
 		boolean foundSingleValue = false;
 		String typeStr = attribute(pElement, "TYPE");
 		// ebak: there was an ESS fix in the base implementation
@@ -1635,8 +1654,7 @@ private static TypedValue parseSingleValue(Element pElement, int pMask)
 				if (valStrA != null) {
 					Object[] values = new Object[valStrA.length];
 					for (int i = 0; i < valStrA.length; i++) {
-						values[i] = createJavaObject(type == null ? null : type.toString(),
-								valStrA[i]);
+						values[i] = createJavaObject(type == null ? null : type.toString(), valStrA[i]);
 					}
 					value = values;
 				}
@@ -1654,9 +1672,8 @@ private static TypedValue parseSingleValue(Element pElement, int pMask)
 			}
 		}
 		if (!foundSingleValue) {
-			if (value instanceof Object[]) type = CIMDataType.STRING_ARRAY_T;
-			else if (value != null) type = CIMDataType.STRING_T;
-			else type = CIMDataType.STRING_T; // /throw new
+			if (value instanceof Object[]) type = CIMDataType.STRING_ARRAY_T; else if (value != null) type =
+				CIMDataType.STRING_T; else type = CIMDataType.STRING_T; // /throw new
 			// CIMXMLParseException("null
 			// type with null value!");
 		}
@@ -1667,7 +1684,7 @@ private static TypedValue parseSingleValue(Element pElement, int pMask)
 
 	/**
 	 * parseQUALIFIER
-	 * 
+	 *
 	 * @param pQualifierE
 	 * @return CIMQualifier
 	 * @throws CIMXMLParseException
@@ -1677,41 +1694,40 @@ public static CIMQualifier parseQUALIFIER(Element pQualifierE) throws CIMXMLP
 		// 
 
 		String name = attribute(pQualifierE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"QUALIFIER element missing NAME attribute!");
+		if (name == null) throw new CIMXMLParseException("QUALIFIER element missing NAME attribute!");
 		String typeStr = attribute(pQualifierE, "TYPE");
 		if (typeStr == null && !hasTypeAttrsInNodes(pQualifierE)) throw new CIMXMLParseException(
-				"QUALIFIER element missing TYPE attribute!");
+			"QUALIFIER element missing TYPE attribute!"
+		);
 		boolean propagated = MOF.TRUE.equalsIgnoreCase(pQualifierE.getAttribute("PROPAGATED"));
 		// FLAVORS
 		int flavors = parseFLAVORS(pQualifierE);
 		// VALUE
-		if (searchNodes(pQualifierE, "VALUE", 0, 1, false) != null
-				|| searchNodes(pQualifierE, "VALUE.ARRAY", 0, 1, false) != null) {
+		if (
+			searchNodes(pQualifierE, "VALUE", 0, 1, false) != null ||
+			searchNodes(pQualifierE, "VALUE.ARRAY", 0, 1, false) != null
+		) {
 			TypedValue typedValue = parseSingleValue(pQualifierE);
-			if (typedValue.getType() == null) throw new CIMXMLParseException(
-					"Qualifier's type is null!");
+			if (typedValue.getType() == null) throw new CIMXMLParseException("Qualifier's type is null!");
 			// CIMQualifier(String pName, CIMDataType pType, Object pValue, int
 			// pFlavor)
-			return new CIMQualifier(name, typedValue.getType(), typedValue.getValue(),
-					flavors, propagated);
+			return new CIMQualifier(name, typedValue.getType(), typedValue.getValue(), flavors, propagated);
 		}
 		checkOtherNodes(pQualifierE, nodesQUALIFIER);
 
 		CIMDataType type = parseScalarTypeStr(typeStr);
-		return new CIMQualifier(name, type != null ? type : CIMDataType.STRING_T, null,
-				flavors, propagated);
+		return new CIMQualifier(name, type != null ? type : CIMDataType.STRING_T, null, flavors, propagated);
 	}
 
 	/**
 	 * parseQUALIFIERDECLARATION
-	 * 
+	 *
 	 * @param pQualifierTypeE
 	 * @return CIMQualifierType
 	 * @throws CIMXMLParseException
 	 */
 	public static CIMQualifierType parseQUALIFIERDECLARATION(Element pQualifierTypeE)
-			throws CIMXMLParseException {
+		throws CIMXMLParseException {
 		// 
 		//  parseQUALIFIERDECLARATION(Element pQualif
 		// %QualifierFlavor;>
 
 		String name = attribute(pQualifierTypeE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"QUALIFIER.DECLARATION element missing NAME attribute!");
+		if (name == null) throw new CIMXMLParseException("QUALIFIER.DECLARATION element missing NAME attribute!");
 		String type = attribute(pQualifierTypeE, "TYPE");
 		if (type == null && !hasTypeAttrsInNodes(pQualifierTypeE)) throw new CIMXMLParseException(
-				"QUALIFIER.DECLARATION element missing TYPE attribute!");
+			"QUALIFIER.DECLARATION element missing TYPE attribute!"
+		);
 
 		// SCOPES
 		// ebak: there should be only 1 scope node
@@ -1753,15 +1769,15 @@ public static CIMQualifierType parseQUALIFIERDECLARATION(Element pQualif
 			boolean isArray = hasTrueAttribute(pQualifierTypeE, "ISARRAY");
 			String arraySizeStr = attribute(pQualifierTypeE, "ARRAYSIZE");
 			try {
-				int arraySize = (arraySizeStr == null ? (isArray ? 0 : -1) : Integer
-						.parseInt(arraySizeStr));
+				int arraySize = (arraySizeStr == null ? (isArray ? 0 : -1) : Integer.parseInt(arraySizeStr));
 				if (isArray || arraySize >= 0) {
-					qdType = (arraySize > 0) ? new CIMDataType(qdType.getType(), arraySize)
+					qdType =
+						(arraySize > 0)
+							? new CIMDataType(qdType.getType(), arraySize)
 							: CIMHelper.UnboundedArrayDataType(qdType.getType());
 				}
 			} catch (NumberFormatException e) {
-				throw new CIMXMLParseException(arraySizeStr
-						+ " is not a valid ARRAYSIZE attribute for QUALIFIER.DECLARATION!");
+				throw new CIMXMLParseException(arraySizeStr + " is not a valid ARRAYSIZE attribute for QUALIFIER.DECLARATION!");
 			}
 		} else {
 			nodes = new String[] { "SCOPE" };
@@ -1772,8 +1788,13 @@ public static CIMQualifierType parseQUALIFIERDECLARATION(Element pQualif
 		checkOtherNodes(pQualifierTypeE, nodes);
 
 		// FIXME: ebak: what about the flavors?
-		return new CIMQualifierType(new CIMObjectPath(null, null, null, null, name, null),
-				qdType, qdValue, scopes, 0);
+		return new CIMQualifierType(
+			new CIMObjectPath(null, null, null, null, name, null),
+			qdType,
+			qdValue,
+			scopes,
+			0
+		);
 	}
 
 	private static boolean hasTrueAttribute(Element pElement, String pName) {
@@ -1790,7 +1811,7 @@ private static boolean getBoolAttribute(Element pElement, String pName, boolean
 
 	/**
 	 * parseSCOPES
-	 * 
+	 *
 	 * @param pScopeE
 	 * @return int
 	 */
@@ -1806,15 +1827,13 @@ public static int parseSCOPES(Element pScopeE) {
 		return scopes;
 	}
 
-	private static Vector> parseClassPropsToVec(Element pElement)
-			throws CIMXMLParseException {
+	private static Vector> parseClassPropsToVec(Element pElement) throws CIMXMLParseException {
 		Element[] propElementA = searchNodes(pElement, "PROPERTY");
 		Vector> propVec = new Vector>();
 		if (propElementA != null) {
 			for (int i = 0; i < propElementA.length; i++) {
 				Element propertyE = propElementA[i];
 				propVec.add(parseCLASSPROPERTY(propertyE));
-
 			}
 		}
 
@@ -1840,7 +1859,7 @@ private static Vector> parseClassPropsToVec(Element pElement
 
 	/**
 	 * parsePROPERTIES
-	 * 
+	 *
 	 * @param pElement
 	 * @return CIMProperty[]
 	 * @throws CIMXMLParseException
@@ -1857,28 +1876,34 @@ public static CIMProperty[] parsePROPERTIES(Element pElement) throws CIMXMLPa
 		CIMProperty[] retA = new CIMProperty[arraySize];
 		for (int i = 0; i < arraySize; i++) {
 			CIMClassProperty prop = classPropVec.get(i);
-			retA[i] = new CIMProperty(prop.getName(), prop.getDataType(), prop.getValue(),
-					prop.isKey(), prop.isPropagated(), prop.getOriginClass());
+			retA[i] =
+				new CIMProperty(
+					prop.getName(),
+					prop.getDataType(),
+					prop.getValue(),
+					prop.isKey(),
+					prop.isPropagated(),
+					prop.getOriginClass()
+				);
 		}
 		return retA;
 	}
 
 	/**
 	 * parseCLASSPROPERTIES
-	 * 
+	 *
 	 * @param pElement
 	 * @return CIMClassProperty[]
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMClassProperty[] parseCLASSPROPERTIES(Element pElement)
-			throws CIMXMLParseException {
+	public static CIMClassProperty[] parseCLASSPROPERTIES(Element pElement) throws CIMXMLParseException {
 		Vector> classPropVec = parseClassPropsToVec(pElement);
 		return classPropVec.toArray(new CIMClassProperty[0]);
 	}
 
 	/**
 	 * parsePROPERTY
-	 * 
+	 *
 	 * @param pPropertyE
 	 * @return CIMProperty
 	 * @throws CIMXMLParseException
@@ -1888,7 +1913,6 @@ public static CIMProperty parsePROPERTY(Element pPropertyE) throws CIMXMLPars
 	}
 
 	private static class EmbObjHandler {
-
 		private CIMQualifier[] iQualiA;
 
 		private boolean iHasEmbObjAttr, iHasEmbInstAttr, iHasEmbObjQuali, iHasEmbInstQuali, iKeyed;
@@ -1899,12 +1923,11 @@ private static class EmbObjHandler {
 
 		private Element iElement;
 
-		private boolean iStrictParsing = WBEMConfiguration.getGlobalConfiguration()
-				.strictEmbObjTypes();
+		private boolean iStrictParsing = WBEMConfiguration.getGlobalConfiguration().strictEmbObjTypes();
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pElement
 		 * @throws CIMXMLParseException
 		 */
@@ -1980,27 +2003,28 @@ private void handleAttribs() throws CIMXMLParseException {
 			} else if ("instance".equalsIgnoreCase(embObjAttrStr)) {
 				this.iHasEmbObjAttr = false;
 				this.iHasEmbInstAttr = true;
-			} else throw new CIMXMLParseException("EmbeddedObject attribute cannot contain \""
-					+ embObjAttrStr + "\" value!");
+			} else throw new CIMXMLParseException("EmbeddedObject attribute cannot contain \"" + embObjAttrStr + "\" value!");
 		}
 
 		/**
 		 * getQualifiers
-		 * 
+		 *
 		 * @return CIMQualifier[]
 		 * @throws CIMXMLParseException
 		 */
 		public CIMQualifier[] getQualifiers() throws CIMXMLParseException {
 			transform();
 			CIMQualifiedElementInterfaceImpl qualiImpl = new CIMQualifiedElementInterfaceImpl(
-					this.iQualiA, isKeyed(), this.iType == null
-							|| this.iType.getType() == CIMDataType.STRING);
+				this.iQualiA,
+				isKeyed(),
+				this.iType == null || this.iType.getType() == CIMDataType.STRING
+			);
 			return qualiImpl.getQualifiers();
 		}
 
 		/**
 		 * isKeyed
-		 * 
+		 *
 		 * @return boolean
 		 */
 		public boolean isKeyed() {
@@ -2009,17 +2033,16 @@ public boolean isKeyed() {
 
 		/**
 		 * isEmbeddedObject
-		 * 
+		 *
 		 * @return boolean
 		 */
 		private boolean isEmbeddedObject() {
-			return this.iHasEmbObjAttr || this.iHasEmbInstAttr || this.iHasEmbObjQuali
-					|| this.iHasEmbInstQuali;
+			return this.iHasEmbObjAttr || this.iHasEmbInstAttr || this.iHasEmbObjQuali || this.iHasEmbInstQuali;
 		}
 
 		/**
 		 * isEmbeddedClass
-		 * 
+		 *
 		 * @return boolean
 		 */
 		private boolean isEmbeddedClass() {
@@ -2028,7 +2051,7 @@ private boolean isEmbeddedClass() {
 
 		/**
 		 * isEmbeddedInstance
-		 * 
+		 *
 		 * @return boolean
 		 */
 		private boolean isEmbeddedInstance() {
@@ -2037,7 +2060,7 @@ private boolean isEmbeddedInstance() {
 
 		/**
 		 * getType
-		 * 
+		 *
 		 * @return CIMDataType
 		 * @throws CIMXMLParseException
 		 */
@@ -2048,19 +2071,18 @@ public CIMDataType getType() throws CIMXMLParseException {
 
 		/**
 		 * getArrayType
-		 * 
+		 *
 		 * @return CIMDataType
 		 * @throws CIMXMLParseException
 		 */
 		public CIMDataType getArrayType() throws CIMXMLParseException {
 			transform();
-			return this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
-					.getType());
+			return this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType.getType());
 		}
 
 		/**
 		 * getValue
-		 * 
+		 *
 		 * @return Object
 		 * @throws CIMXMLParseException
 		 */
@@ -2074,24 +2096,22 @@ private void transform() throws CIMXMLParseException {
 			if (this.iRawValue == null) {
 				if (isEmbeddedObject()) {
 					if (this.iRawType != CIMDataType.STRING_T) throw new CIMXMLParseException(
-							"Embedded Object CIM-XML element's type must be string. "
-									+ this.iRawType + " is invalid!");
+						"Embedded Object CIM-XML element's type must be string. " + this.iRawType + " is invalid!"
+					);
 					if (this.iStrictParsing) {
 						/*
 						 * In case of strict parsing Object means CIMClass,
 						 * Instance means CIMInstance. Pegasus 2.7.0 seems to
 						 * handle it this way.
 						 */
-						this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T
-								: CIMDataType.CLASS_T;
+						this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T : CIMDataType.CLASS_T;
 					} else {
 						/*
 						 * for valueless EmbeddedObject="object" the type is
 						 * undeterminable since Pegasus's CIMObject can contain
 						 * both CIMClass and CIMInstance
 						 */
-						this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T
-								: CIMDataType.STRING_T;
+						this.iType = isEmbeddedInstance() ? CIMDataType.OBJECT_T : CIMDataType.STRING_T;
 					}
 				} else {
 					this.iType = this.iRawType;
@@ -2115,26 +2135,24 @@ private void transformEmbObj() throws CIMXMLParseException {
 				this.iType = getCIMObjAType((Object[]) this.iValue);
 			}
 			if (isEmbeddedInstance() && this.iType.getType() != CIMDataType.OBJECT) throw new CIMXMLParseException(
-					this.iElement.getNodeName()
-							+ " element is an EmbeddedInstance with non INSTANCE value. "
-							+ "It's not valid!");
-			if (isEmbeddedClass() && this.iType.getType() != CIMDataType.CLASS
-					&& this.iType.getType() != CIMDataType.OBJECT) throw new CIMXMLParseException(
-					this.iElement.getNodeName()
-							+ " element is an EmbeddedObject with non CLASS/INSTANCE value. It's not valid!");
+				this.iElement.getNodeName() + " element is an EmbeddedInstance with non INSTANCE value. " + "It's not valid!"
+			);
+			if (
+				isEmbeddedClass() && this.iType.getType() != CIMDataType.CLASS && this.iType.getType() != CIMDataType.OBJECT
+			) throw new CIMXMLParseException(
+				this.iElement.getNodeName() + " element is an EmbeddedObject with non CLASS/INSTANCE value. It's not valid!"
+			);
 		}
 
 		private void transformNormObj() throws CIMXMLParseException {
 			if (this.iRawValue instanceof String) {
 				this.iType = this.iRawType;
-				this.iValue = createJavaObject(this.iType == null ? null : this.iType.toString(),
-						(String) this.iRawValue);
+				this.iValue = createJavaObject(this.iType == null ? null : this.iType.toString(), (String) this.iRawValue);
 			} else {
 				String[] rawValueA = (String[]) this.iRawValue;
 				String typeStr = this.iRawType.toString();
 				Object[] objA = new Object[rawValueA.length];
-				for (int i = 0; i < objA.length; i++)
-					objA[i] = createJavaObject(typeStr, rawValueA[i]);
+				for (int i = 0; i < objA.length; i++) objA[i] = createJavaObject(typeStr, rawValueA[i]);
 				this.iType = CIMHelper.UnboundedArrayDataType(this.iRawType.getType());
 				this.iValue = objA;
 			}
@@ -2142,7 +2160,7 @@ private void transformNormObj() throws CIMXMLParseException {
 
 		/**
 		 * parseXmlStr
-		 * 
+		 *
 		 * @param pXmlStr
 		 * @return CIMClass or CIMInstance
 		 * @throws CIMXMLParseException
@@ -2164,7 +2182,7 @@ public static Object parseXmlStr(String pXmlStr) throws CIMXMLParseException {
 
 		/**
 		 * parseXmlStrA
-		 * 
+		 *
 		 * @param pXmlStrA
 		 * @return Object[]
 		 * @throws CIMXMLParseException
@@ -2181,23 +2199,21 @@ public static Object[] parseXmlStrA(String[] pXmlStrA) throws CIMXMLParseExcepti
 
 		/**
 		 * getCIMObjType
-		 * 
+		 *
 		 * @param pCIMObj
 		 * @return CIMDataType
 		 * @throws CIMXMLParseException
 		 */
 		public static CIMDataType getCIMObjType(Object pCIMObj) throws CIMXMLParseException {
-			if (pCIMObj == null) throw new CIMXMLParseException(
-					"cannot have null CIM object! (CIMClass or CIMInstance)");
+			if (pCIMObj == null) throw new CIMXMLParseException("cannot have null CIM object! (CIMClass or CIMInstance)");
 			if (pCIMObj instanceof CIMInstance) return CIMDataType.OBJECT_T;
 			if (pCIMObj instanceof CIMClass) return CIMDataType.CLASS_T;
-			throw new CIMXMLParseException(pCIMObj.getClass().getName()
-					+ " is not a CIM object! (CIMClass or CIMInstance)");
+			throw new CIMXMLParseException(pCIMObj.getClass().getName() + " is not a CIM object! (CIMClass or CIMInstance)");
 		}
 
 		/**
 		 * getCIMObjAType
-		 * 
+		 *
 		 * @param pCIMObjA
 		 * @return CIMDataType
 		 * @throws CIMXMLParseException
@@ -2210,36 +2226,35 @@ public static CIMDataType getCIMObjAType(Object[] pCIMObjA) throws CIMXMLParseEx
 				CIMDataType currType = getCIMObjType(pCIMObjA[i]);
 				if (type == null) {
 					type = currType;
-				} else if (type != currType) { throw new CIMXMLParseException(
-						"Embedded Object arrays with different types are not supported"); }
+				} else if (type != currType) {
+					throw new CIMXMLParseException("Embedded Object arrays with different types are not supported");
+				}
 			}
 			if (type == CIMDataType.OBJECT_T) return CIMDataType.OBJECT_ARRAY_T;
 			if (type == CIMDataType.CLASS_T) return CIMDataType.CLASS_ARRAY_T;
 			return CIMDataType.STRING_ARRAY_T;
 		}
-
 	}
 
 	private static final String nodesPROPERTY[] = { "QUALIFIER", "VALUE" };
 
 	/**
 	 * parseCLASSPROPERTY
-	 * 
+	 *
 	 * @param pPropertyE
 	 * @return CIMClassProperty
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMClassProperty parseCLASSPROPERTY(Element pPropertyE)
-			throws CIMXMLParseException {
+	public static CIMClassProperty parseCLASSPROPERTY(Element pPropertyE) throws CIMXMLParseException {
 		// 
 		// 
 
 		Attr property_nameA = (Attr) searchAttribute(pPropertyE, "NAME");
-		if (property_nameA == null) throw new CIMXMLParseException(
-				"PROPERTY element missing NAME attribute!");
+		if (property_nameA == null) throw new CIMXMLParseException("PROPERTY element missing NAME attribute!");
 		String name = property_nameA.getNodeValue();
 		if (attribute(pPropertyE, "TYPE") == null && !hasTypeAttrsInNodes(pPropertyE)) throw new CIMXMLParseException(
-				"PROPERTY element missing TYPE attribute!");
+			"PROPERTY element missing TYPE attribute!"
+		);
 
 		String classOrigin = pPropertyE.getAttribute("CLASSORIGIN");
 		if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
@@ -2259,20 +2274,25 @@ public static CIMClassProperty parseCLASSPROPERTY(Element pPropertyE)
 		 * CIMQualifier[] pQualifiers, boolean pKey, boolean propagated, String
 		 * originClass)
 		 */
-		return new CIMClassProperty(name, embObjHandler.getType(),
-				embObjHandler.getValue(), embObjHandler.getQualifiers(), embObjHandler.isKeyed(),
-				propagated, classOrigin);
+		return new CIMClassProperty(
+			name,
+			embObjHandler.getType(),
+			embObjHandler.getValue(),
+			embObjHandler.getQualifiers(),
+			embObjHandler.isKeyed(),
+			propagated,
+			classOrigin
+		);
 	}
 
 	/**
 	 * parsePROPERTYARRAY
-	 * 
+	 *
 	 * @param pPropertyArrayE
 	 * @return CIMProperty
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMProperty parsePROPERTYARRAY(Element pPropertyArrayE)
-			throws CIMXMLParseException {
+	public static CIMProperty parsePROPERTYARRAY(Element pPropertyArrayE) throws CIMXMLParseException {
 		return parseCLASSPROPERTYARRAY(pPropertyArrayE);
 	}
 
@@ -2280,37 +2300,34 @@ public static CIMProperty parsePROPERTYARRAY(Element pPropertyArrayE)
 
 	/**
 	 * parseCLASSPROPERTYARRAY
-	 * 
+	 *
 	 * @param pPropArrayE
 	 * @return CIMClassProperty
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMClassProperty parseCLASSPROPERTYARRAY(Element pPropArrayE)
-			throws CIMXMLParseException {
+	public static CIMClassProperty parseCLASSPROPERTYARRAY(Element pPropArrayE) throws CIMXMLParseException {
 		// 
 		// 
 
 		String name = attribute(pPropArrayE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PROPERTY.ARRAY element missing NAME attribute!");
+		if (name == null) throw new CIMXMLParseException("PROPERTY.ARRAY element missing NAME attribute!");
 		if (attribute(pPropArrayE, "TYPE") == null && !hasTypeAttrsInNodes(pPropArrayE)) throw new CIMXMLParseException(
-				"PROPERTY.ARRAY element missing TYPE attribute!");
+			"PROPERTY.ARRAY element missing TYPE attribute!"
+		);
 
 		String valueArraysizeStr = pPropArrayE.getAttribute("ARRAYSIZE");
 		try {
 			if (valueArraysizeStr.length() > 0) Integer.parseInt(valueArraysizeStr);
 		} catch (NumberFormatException e) {
-			throw new CIMXMLParseException(valueArraysizeStr
-					+ " is not a valid ARRAYSIZE attribute for VALUE.ARRAY!");
+			throw new CIMXMLParseException(valueArraysizeStr + " is not a valid ARRAYSIZE attribute for VALUE.ARRAY!");
 		}
 
 		String classOrigin = pPropArrayE.getAttribute("CLASSORIGIN");
 		if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
 
 		String valuePropagatedStr = pPropArrayE.getAttribute("PROPAGATED");
-		boolean propagated = (valuePropagatedStr != null && valuePropagatedStr
-				.equalsIgnoreCase(MOF.TRUE));
+		boolean propagated = (valuePropagatedStr != null && valuePropagatedStr.equalsIgnoreCase(MOF.TRUE));
 
 		// only QUALIFIER(s) and 0/1 VALUE.ARRAY
 		searchNodes(pPropArrayE, "VALUE.ARRAY", 0, 1, true);
@@ -2319,20 +2336,25 @@ public static CIMClassProperty parseCLASSPROPERTYARRAY(Element pPropArra
 		// QUALIFIER
 		// ebak: EmbeddedObject support
 		EmbObjHandler embObjHandler = new EmbObjHandler(pPropArrayE);
-		return new CIMClassProperty(name, embObjHandler.getArrayType(), embObjHandler
-				.getValue(), embObjHandler.getQualifiers(), embObjHandler.isKeyed(), propagated,
-				classOrigin);
+		return new CIMClassProperty(
+			name,
+			embObjHandler.getArrayType(),
+			embObjHandler.getValue(),
+			embObjHandler.getQualifiers(),
+			embObjHandler.isKeyed(),
+			propagated,
+			classOrigin
+		);
 	}
 
 	/**
 	 * parsePROPERTYREFERENCE
-	 * 
+	 *
 	 * @param pPropRefE
 	 * @return CIMProperty
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMProperty parsePROPERTYREFERENCE(Element pPropRefE)
-			throws CIMXMLParseException {
+	public static CIMProperty parsePROPERTYREFERENCE(Element pPropRefE) throws CIMXMLParseException {
 		return parseCLASSPROPERTYREFERENCE(pPropRefE);
 	}
 
@@ -2340,20 +2362,18 @@ public static CIMProperty parsePROPERTYREFERENCE(Element pPropRefE)
 
 	/**
 	 * parseCLASSPROPERTYREFERENCE
-	 * 
+	 *
 	 * @param pPropRefE
 	 * @return CIMClassProperty
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMClassProperty parseCLASSPROPERTYREFERENCE(Element pPropRefE)
-			throws CIMXMLParseException {
+	public static CIMClassProperty parseCLASSPROPERTYREFERENCE(Element pPropRefE) throws CIMXMLParseException {
 		// 
 		// 
 
 		String name = attribute(pPropRefE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PROPERTY.REFERENCE element missing NAME attribute!");
+		if (name == null) throw new CIMXMLParseException("PROPERTY.REFERENCE element missing NAME attribute!");
 
 		String classOrigin = pPropRefE.getAttribute("CLASSORIGIN");
 		if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
@@ -2374,13 +2394,12 @@ public static CIMClassProperty parseCLASSPROPERTYREFERENCE(Element pProp
 		// return a CIMProperty without a CIMValue
 		checkOtherNodes(pPropRefE, nodesPROPERTYREFERENCE);
 		CIMQualifiedElementInterfaceImpl qualiImpl = new CIMQualifiedElementInterfaceImpl(qualis);
-		return new CIMClassProperty(name, type, value, qualis, qualiImpl.isKeyed(),
-				propagated, classOrigin);
+		return new CIMClassProperty(name, type, value, qualis, qualiImpl.isKeyed(), propagated, classOrigin);
 	}
 
 	/**
 	 * parseMESSAGE
-	 * 
+	 *
 	 * @param pCimVersion
 	 * @param pDtdVersion
 	 * @param pMessageE
@@ -2388,7 +2407,7 @@ public static CIMClassProperty parseCLASSPROPERTYREFERENCE(Element pProp
 	 * @throws CIMXMLParseException
 	 */
 	public static CIMMessage parseMESSAGE(String pCimVersion, String pDtdVersion, Element pMessageE)
-			throws CIMXMLParseException {
+		throws CIMXMLParseException {
 		// 
 		// 
@@ -2398,11 +2417,9 @@ public static CIMMessage parseMESSAGE(String pCimVersion, String pDtdVersion, El
 		String id = idA.getNodeValue();
 
 		Attr protocolA = (Attr) searchAttribute(pMessageE, "PROTOCOLVERSION");
-		if (protocolA == null) throw new CIMXMLParseException(
-				"MESSAGE element missing PROTOCOLVERSION attribute!");
+		if (protocolA == null) throw new CIMXMLParseException("MESSAGE element missing PROTOCOLVERSION attribute!");
 		// TODO
 		if (pCimVersion.equals("2.0") && pDtdVersion.equals("2.0")) {
-
 			// Attr message_idA = (Attr)searchAttribute(messageE, "ID");
 			// String messadeID = message_idA.getNodeValue();
 
@@ -2482,41 +2499,51 @@ public static CIMMessage parseMESSAGE(String pCimVersion, String pDtdVersion, El
 		throw new CIMXMLParseException("DTD not supported");
 	}
 
-	private static final String nodesPARAMVALUE[] = { "VALUE", "VALUE.REFERENCE", "VALUE.ARRAY",
-			"VALUE.REFARRAY", "CLASSNAME", "INSTANCENAME", "CLASS", "INSTANCE",
-			"VALUE.NAMEDINSTANCE" };
+	private static final String nodesPARAMVALUE[] = {
+		"VALUE",
+		"VALUE.REFERENCE",
+		"VALUE.ARRAY",
+		"VALUE.REFARRAY",
+		"CLASSNAME",
+		"INSTANCENAME",
+		"CLASS",
+		"INSTANCE",
+		"VALUE.NAMEDINSTANCE"
+	};
 
 	/**
 	 * parsePARAMVALUE
-	 * 
+	 *
 	 * @param pParamValueE
 	 * @return CIMArgument
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMArgument parsePARAMVALUE(Element pParamValueE)
-			throws CIMXMLParseException {
+	public static CIMArgument parsePARAMVALUE(Element pParamValueE) throws CIMXMLParseException {
 		// )
 		// 
 		String name = attribute(pParamValueE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"PARAMVALUE element missing NAME attribute!");
+		if (name == null) throw new CIMXMLParseException("PARAMVALUE element missing NAME attribute!");
 		// FIXME: ebak: The base implementation didn't contain VALUE.REFARRAY
 		// handling. Why?
 		// ebak: embedded object support, different parsing for VALUE and
 		// VALUE.ARRAY sub elements
-		if (searchNodes(pParamValueE, "VALUE.REFERENCE", 0, 1, false) != null
-				|| searchNodes(pParamValueE, "VALUE.REFARRAY", 0, 1, false) != null) {
+		if (
+			searchNodes(pParamValueE, "VALUE.REFERENCE", 0, 1, false) != null ||
+			searchNodes(pParamValueE, "VALUE.REFARRAY", 0, 1, false) != null
+		) {
 			TypedValue typedValue = parseSingleValue(pParamValueE, VALUEREF | VALUEREFA);
 			CIMDataType type = typedValue.getType();
 			Object value = typedValue.getValue();
 			if (type == null) throw new CIMXMLParseException("PARAMVALUE element type is null!");
 			return new CIMArgument(name, type, value);
 		}
-		if (searchNodes(pParamValueE, "VALUE", 0, 1, false) != null
-				|| searchNodes(pParamValueE, "VALUE.ARRAY", 0, 1, false) != null
-				|| !hasNodes(pParamValueE)) {
+		if (
+			searchNodes(pParamValueE, "VALUE", 0, 1, false) != null ||
+			searchNodes(pParamValueE, "VALUE.ARRAY", 0, 1, false) != null ||
+			!hasNodes(pParamValueE)
+		) {
 			EmbObjHandler embObjHandler = new EmbObjHandler(pParamValueE);
 			return new CIMArgument(name, embObjHandler.getType(), embObjHandler.getValue());
 		}
@@ -2552,8 +2579,7 @@ public static CIMArgument parsePARAMVALUE(Element pParamValueE)
 		}
 
 		// VALUE.NAMEDINSTANCE
-		Element valuenamedisntanceA[] = searchNodes(pParamValueE, "VALUE.NAMEDINSTANCE", 0, 1,
-				false);
+		Element valuenamedisntanceA[] = searchNodes(pParamValueE, "VALUE.NAMEDINSTANCE", 0, 1, false);
 		if (valuenamedisntanceA != null) {
 			CIMInstance inst = parseVALUENAMEDINSTANCE(valuenamedisntanceA[0]);
 			return new CIMArgument(name, CIMDataType.OBJECT_T, inst);
@@ -2562,19 +2588,26 @@ public static CIMArgument parsePARAMVALUE(Element pParamValueE)
 		return new CIMArgument(name, CIMDataType.STRING_T, null);
 	}
 
-	private static final String nodesIPARAMVALUE[] = { "VALUE", "VALUE.ARRAY", "VALUE.REFERENCE",
-			"CLASSNAME", "INSTANCENAME", "QUALIFIER.DECLARATION", "CLASS", "INSTANCE",
-			"VALUE.NAMEDINSTANCE" };
+	private static final String nodesIPARAMVALUE[] = {
+		"VALUE",
+		"VALUE.ARRAY",
+		"VALUE.REFERENCE",
+		"CLASSNAME",
+		"INSTANCENAME",
+		"QUALIFIER.DECLARATION",
+		"CLASS",
+		"INSTANCE",
+		"VALUE.NAMEDINSTANCE"
+	};
 
 	/**
 	 * parseIPARAMVALUE
-	 * 
+	 *
 	 * @param pParamValueE
 	 * @return CIMArgument
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMArgument parseIPARAMVALUE(Element pParamValueE)
-			throws CIMXMLParseException {
+	public static CIMArgument parseIPARAMVALUE(Element pParamValueE) throws CIMXMLParseException {
 		// 
@@ -2582,15 +2615,17 @@ public static CIMArgument parseIPARAMVALUE(Element pParamValueE)
 		// %CIMName;>
 
 		String name = attribute(pParamValueE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"IPARAMVALUE element missing NAME attribute!");
+		if (name == null) throw new CIMXMLParseException("IPARAMVALUE element missing NAME attribute!");
 		// this can parse VALUE, VALUE.ARRAY and VALUE.REFERENCE
-		if (searchNodes(pParamValueE, "VALUE", 0, 1, false) != null
-				|| searchNodes(pParamValueE, "VALUE.ARRAY", 0, 1, false) != null
-				|| searchNodes(pParamValueE, "VALUE.REFERENCE", 0, 1, false) != null) {
+		if (
+			searchNodes(pParamValueE, "VALUE", 0, 1, false) != null ||
+			searchNodes(pParamValueE, "VALUE.ARRAY", 0, 1, false) != null ||
+			searchNodes(pParamValueE, "VALUE.REFERENCE", 0, 1, false) != null
+		) {
 			TypedValue typedValue = parseSingleValue(pParamValueE, VALUE | VALUEA | VALUEREF);
-			if (typedValue.getType() != null) { return new CIMArgument(name, typedValue
-					.getType(), typedValue.getValue()); }
+			if (typedValue.getType() != null) {
+				return new CIMArgument(name, typedValue.getType(), typedValue.getValue());
+			}
 		}
 		// we can have different types too which cannot be handled by
 		// parseSingleValue()
@@ -2612,8 +2647,7 @@ public static CIMArgument parseIPARAMVALUE(Element pParamValueE)
 		}
 
 		// QUALIFIER.DECLARATION
-		Element qualiDeclarationA[] = searchNodes(pParamValueE, "QUALIFIER.DECLARATION", 0, 1,
-				false);
+		Element qualiDeclarationA[] = searchNodes(pParamValueE, "QUALIFIER.DECLARATION", 0, 1, false);
 		if (qualiDeclarationA != null) {
 			CIMQualifierType qualiType = parseQUALIFIERDECLARATION(qualiDeclarationA[0]);
 			// FIXME: ebak: Does it surely have to be mapped to type:
@@ -2636,8 +2670,7 @@ public static CIMArgument parseIPARAMVALUE(Element pParamValueE)
 		}
 
 		// VALUE.NAMEDINSTANCE
-		Element valuenamedisntanceA[] = searchNodes(pParamValueE, "VALUE.NAMEDINSTANCE", 0, 1,
-				false);
+		Element valuenamedisntanceA[] = searchNodes(pParamValueE, "VALUE.NAMEDINSTANCE", 0, 1, false);
 		if (valuenamedisntanceA != null) {
 			CIMInstance inst = parseVALUENAMEDINSTANCE(valuenamedisntanceA[0]);
 			return new CIMArgument(name, CIMDataType.OBJECT_T, inst);
@@ -2649,7 +2682,7 @@ public static CIMArgument parseIPARAMVALUE(Element pParamValueE)
 
 	/**
 	 * parseSIMPLERSP
-	 * 
+	 *
 	 * @param pSimpleRspE
 	 * @return CIMResponse
 	 * @throws CIMXMLParseException
@@ -2660,19 +2693,21 @@ public static CIMResponse parseSIMPLERSP(Element pSimpleRspE) throws CIMXMLParse
 		// METHODRESPONSE
 		Element methodresponseA[] = searchNodes(pSimpleRspE, "METHODRESPONSE", 0, 1, false);
 		if (methodresponseA != null) {
-
-		return parseMETHODRESPONSE(methodresponseA[0]); }
+			return parseMETHODRESPONSE(methodresponseA[0]);
+		}
 
 		// IMETHODRESPONSE
 		Element imethodresponseA[] = searchNodes(pSimpleRspE, "IMETHODRESPONSE", 0, 1, false);
-		if (imethodresponseA != null) { return parseIMETHODRESPONSE(imethodresponseA[0]); }
+		if (imethodresponseA != null) {
+			return parseIMETHODRESPONSE(imethodresponseA[0]);
+		}
 
 		throw new CIMXMLParseException("SIMPLERSP element missing required child element!");
 	}
 
 	/**
 	 * parseMULTIRSP
-	 * 
+	 *
 	 * @param pSimpleRspE
 	 * @return CIMResponse
 	 * @throws CIMXMLParseException
@@ -2680,8 +2715,7 @@ public static CIMResponse parseSIMPLERSP(Element pSimpleRspE) throws CIMXMLParse
 	public static CIMResponse parseMULTIRSP(Element pSimpleRspE) throws CIMXMLParseException {
 		// 
 
-		Element[] multiRespElementA = searchNodes(pSimpleRspE, "SIMPLERSP", 2, Integer.MAX_VALUE,
-				false);
+		Element[] multiRespElementA = searchNodes(pSimpleRspE, "SIMPLERSP", 2, Integer.MAX_VALUE, false);
 		if (multiRespElementA != null) {
 			CIMResponse multiRsp = new CIMResponse();
 			for (int i = 0; i < multiRespElementA.length; i++) {
@@ -2700,7 +2734,7 @@ public static CIMResponse parseMULTIRSP(Element pSimpleRspE) throws CIMXMLParseE
 
 	/**
 	 * parseSIMPLEREQ
-	 * 
+	 *
 	 * @param pSimpleReqE
 	 * @return CIMRequest
 	 * @throws CIMXMLParseException
@@ -2718,20 +2752,19 @@ public static CIMRequest parseSIMPLEREQ(Element pSimpleReqE) throws CIMXMLParseE
 		// IMETHODCALL
 		Element imethodcallA[] = searchNodes(pSimpleReqE, "IMETHODCALL", 0, 1, true);
 		if (imethodcallA != null) {
-			if (request != null) { throw new CIMXMLParseException(
-					"SIMPLEREQ element cannot have METHODCALL and IMETHODCALL child elements!"); }
+			if (request != null) {
+				throw new CIMXMLParseException("SIMPLEREQ element cannot have METHODCALL and IMETHODCALL child elements!");
+			}
 			request = parseIMETHODCALL(imethodcallA[0]);
 		}
 
-		if (request == null) throw new CIMXMLParseException(
-				"SIMPLEREQ element missing required child element!");
+		if (request == null) throw new CIMXMLParseException("SIMPLEREQ element missing required child element!");
 
 		// CORRELATOR
 		Element[] correlatorA = searchNodes(pSimpleReqE, "CORRELATOR", 0, Integer.MAX_VALUE, true);
 		if (correlatorA != null) {
-			for (int i = 0; i < correlatorA.length; i++)
-				// TODO: return to WBEMClient API if JSR48 changes
-				parseCORRELATOR(correlatorA[i]);
+			for (int i = 0; i < correlatorA.length; i++) // TODO: return to WBEMClient API if JSR48 changes
+			parseCORRELATOR(correlatorA[i]);
 		}
 
 		checkOtherNodes(pSimpleReqE, nodesSIMPLEREQ);
@@ -2740,7 +2773,7 @@ public static CIMRequest parseSIMPLEREQ(Element pSimpleReqE) throws CIMXMLParseE
 
 	/**
 	 * parseMULTIREQ
-	 * 
+	 *
 	 * @param pMultiReqE
 	 * @return CIMRequest
 	 * @throws CIMXMLParseException
@@ -2748,8 +2781,7 @@ public static CIMRequest parseSIMPLEREQ(Element pSimpleReqE) throws CIMXMLParseE
 	public static CIMRequest parseMULTIREQ(Element pMultiReqE) throws CIMXMLParseException {
 		// 
 
-		Element[] methodReqElementA = searchNodes(pMultiReqE, "SIMPLEREQ", 2, Integer.MAX_VALUE,
-				false);
+		Element[] methodReqElementA = searchNodes(pMultiReqE, "SIMPLEREQ", 2, Integer.MAX_VALUE, false);
 		if (methodReqElementA != null) {
 			CIMRequest multiReq = new CIMRequest();
 			for (int i = 0; i < methodReqElementA.length; i++) {
@@ -2764,12 +2796,11 @@ public static CIMRequest parseMULTIREQ(Element pMultiReqE) throws CIMXMLParseExc
 		throw new CIMXMLParseException("MULTIREQ element missing SIMPLEREQ child element!");
 	}
 
-	private static final String nodesMETHODCALL[] = { "LOCALCLASSPATH", "LOCALINSTANCEPATH",
-			"PARAMVALUE" };
+	private static final String nodesMETHODCALL[] = { "LOCALCLASSPATH", "LOCALINSTANCEPATH", "PARAMVALUE" };
 
 	/**
 	 * parseMETHODCALL
-	 * 
+	 *
 	 * @param pMethodCallE
 	 * @return CIMRequest
 	 * @throws CIMXMLParseException
@@ -2782,8 +2813,7 @@ public static CIMRequest parseMETHODCALL(Element pMethodCallE) throws CIMXMLPars
 
 		CIMRequest request = new CIMRequest();
 		String methodname = attribute(pMethodCallE, "NAME");
-		if (methodname == null) throw new CIMXMLParseException(
-				"METHODCALL element missing NAME attribute!");
+		if (methodname == null) throw new CIMXMLParseException("METHODCALL element missing NAME attribute!");
 		request.setMethodName(methodname);
 
 		// EXPMETHODCALL
@@ -2799,18 +2829,17 @@ public static CIMRequest parseMETHODCALL(Element pMethodCallE) throws CIMXMLPars
 		Element localinstancepathA[] = searchNodes(pMethodCallE, "LOCALINSTANCEPATH", 0, 1, true);
 		if (localinstancepathA != null) {
 			if (localclasspathFound) throw new CIMXMLParseException(
-					"METHODCALL element cannot have both LOCALCLASSPATH and LOCALINSTANCEPATH child elements!");
+				"METHODCALL element cannot have both LOCALCLASSPATH and LOCALINSTANCEPATH child elements!"
+			);
 
 			CIMObjectPath path = parseLOCALINSTANCEPATH(localinstancepathA[0]);
 
 			request.setObjectPath(path);
 		} else {
-			if (!localclasspathFound) throw new CIMXMLParseException(
-					"METHODCALL element missing required child element!");
+			if (!localclasspathFound) throw new CIMXMLParseException("METHODCALL element missing required child element!");
 		}
 
-		Element[] paramValueElementA = searchNodes(pMethodCallE, "PARAMVALUE", 0,
-				Integer.MAX_VALUE, true);
+		Element[] paramValueElementA = searchNodes(pMethodCallE, "PARAMVALUE", 0, Integer.MAX_VALUE, true);
 
 		if (paramValueElementA != null) {
 			CIMArgument[] argA = new CIMArgument[paramValueElementA.length];
@@ -2829,7 +2858,7 @@ public static CIMRequest parseMETHODCALL(Element pMethodCallE) throws CIMXMLPars
 
 	/**
 	 * parseIMETHODCALL
-	 * 
+	 *
 	 * @param pIMethodCallE
 	 * @return CIMRequest
 	 * @throws CIMXMLParseException
@@ -2842,8 +2871,7 @@ public static CIMRequest parseIMETHODCALL(Element pIMethodCallE) throws CIMXMLPa
 		CIMRequest request = new CIMRequest();
 		String methodname = attribute(pIMethodCallE, "NAME"); // ebak:
 		// CIMName->NAME
-		if (methodname == null) throw new CIMXMLParseException(
-				"IMETHODCALL element missing NAME attribute!");
+		if (methodname == null) throw new CIMXMLParseException("IMETHODCALL element missing NAME attribute!");
 		request.setMethodName(methodname);
 
 		// METHODCALL
@@ -2853,8 +2881,7 @@ public static CIMRequest parseIMETHODCALL(Element pIMethodCallE) throws CIMXMLPa
 			request.setNameSpace(nameSpace);
 		}
 
-		Element[] iParamValElementA = searchNodes(pIMethodCallE, "IPARAMVALUE", 0,
-				Integer.MAX_VALUE, true); // ebak:
+		Element[] iParamValElementA = searchNodes(pIMethodCallE, "IPARAMVALUE", 0, Integer.MAX_VALUE, true); // ebak:
 		// PARAMVALUE->IPARAMVALUE
 
 		if (iParamValElementA != null) {
@@ -2870,12 +2897,22 @@ public static CIMRequest parseIMETHODCALL(Element pIMethodCallE) throws CIMXMLPa
 				if (value instanceof CIMObjectPath) {
 					CIMObjectPath op = (CIMObjectPath) value;
 					if (op.getNamespace() == null || op.getNamespace().length() == 0) {
-						arg = new CIMArgument(arg.getName(), arg.getDataType(),
-						// CIMObjectPath(String scheme, String host, String
+						arg =
+							new CIMArgument(
+								arg.getName(),
+								arg.getDataType(),
+								// CIMObjectPath(String scheme, String host, String
 								// port, String namespace, String objectName,
 								// CIMProperty[] keys)
-								new CIMObjectPath(op.getScheme(), op.getHost(), op.getPort(),
-										request.getNameSpace(), op.getObjectName(), op.getKeys()));
+								new CIMObjectPath(
+									op.getScheme(),
+									op.getHost(),
+									op.getPort(),
+									request.getNameSpace(),
+									op.getObjectName(),
+									op.getKeys()
+								)
+							);
 					}
 				}
 				argA[i] = arg;
@@ -2891,7 +2928,7 @@ public static CIMRequest parseIMETHODCALL(Element pIMethodCallE) throws CIMXMLPa
 
 	/**
 	 * parseSIMPLEEXPREQ
-	 * 
+	 *
 	 * @param pSimpleExpReqE
 	 * @return CIMRequest
 	 * @throws CIMXMLParseException
@@ -2905,17 +2942,14 @@ public static CIMRequest parseSIMPLEEXPREQ(Element pSimpleExpReqE) throws CIMXML
 		if (expmethodcallA != null) {
 			request = parseEXPMETHODCALL(expmethodcallA[0]);
 		} else {
-			throw new CIMXMLParseException(
-					"SIMPLEEXPREQ element missing EXPMETHODCALL child element!");
+			throw new CIMXMLParseException("SIMPLEEXPREQ element missing EXPMETHODCALL child element!");
 		}
 
 		// CORRELATOR
-		Element[] correlatorA = searchNodes(pSimpleExpReqE, "CORRELATOR", 0, Integer.MAX_VALUE,
-				true);
+		Element[] correlatorA = searchNodes(pSimpleExpReqE, "CORRELATOR", 0, Integer.MAX_VALUE, true);
 		if (correlatorA != null) {
-			for (int i = 0; i < correlatorA.length; i++)
-				// TODO: return to WBEMClient API if JSR48 changes
-				parseCORRELATOR(correlatorA[i]);
+			for (int i = 0; i < correlatorA.length; i++) // TODO: return to WBEMClient API if JSR48 changes
+			parseCORRELATOR(correlatorA[i]);
 		}
 
 		checkOtherNodes(pSimpleExpReqE, nodesSIMPLEEXPREQ);
@@ -2924,7 +2958,7 @@ public static CIMRequest parseSIMPLEEXPREQ(Element pSimpleExpReqE) throws CIMXML
 
 	/**
 	 * parseMULTIEXPREQ
-	 * 
+	 *
 	 * @param pMultiExpReqE
 	 * @return CIMRequest
 	 * @throws CIMXMLParseException
@@ -2932,8 +2966,7 @@ public static CIMRequest parseSIMPLEEXPREQ(Element pSimpleExpReqE) throws CIMXML
 	public static CIMRequest parseMULTIEXPREQ(Element pMultiExpReqE) throws CIMXMLParseException {
 		// 
 
-		Element[] methodReqElementA = searchNodes(pMultiExpReqE, "SIMPLEEXPREQ", 2,
-				Integer.MAX_VALUE, false);
+		Element[] methodReqElementA = searchNodes(pMultiExpReqE, "SIMPLEEXPREQ", 2, Integer.MAX_VALUE, false);
 		if (methodReqElementA != null) {
 			CIMRequest multiReq = new CIMRequest();
 			for (int i = 0; i < methodReqElementA.length; i++) {
@@ -2952,24 +2985,21 @@ public static CIMRequest parseMULTIEXPREQ(Element pMultiExpReqE) throws CIMXMLPa
 
 	/**
 	 * parseEXPMETHODCALL
-	 * 
+	 *
 	 * @param pExpMethodCallE
 	 * @return CIMRequest
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMRequest parseEXPMETHODCALL(Element pExpMethodCallE)
-			throws CIMXMLParseException {
+	public static CIMRequest parseEXPMETHODCALL(Element pExpMethodCallE) throws CIMXMLParseException {
 		// 
 
 		// EXPMETHODCALL
 		CIMRequest request = new CIMRequest();
 		String methodname = attribute(pExpMethodCallE, "NAME");
-		if (methodname == null) throw new CIMXMLParseException(
-				"EXPMETHODCALL element missing NAME attribute!");
+		if (methodname == null) throw new CIMXMLParseException("EXPMETHODCALL element missing NAME attribute!");
 		request.setMethodName(methodname);
 
-		Element[] paramValElementA = searchNodes(pExpMethodCallE, "EXPPARAMVALUE", 0,
-				Integer.MAX_VALUE, false);
+		Element[] paramValElementA = searchNodes(pExpMethodCallE, "EXPPARAMVALUE", 0, Integer.MAX_VALUE, false);
 		Vector v = new Vector();
 		if (paramValElementA != null) {
 			for (int i = 0; i < paramValElementA.length; i++) {
@@ -2987,19 +3017,19 @@ public static CIMRequest parseEXPMETHODCALL(Element pExpMethodCallE)
 
 	/**
 	 * parseEXPPARAMVALUE
-	 * 
+	 *
 	 * @param pExpParamValueE
 	 * @return CIMInstance
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMInstance parseEXPPARAMVALUE(Element pExpParamValueE)
-			throws CIMXMLParseException {
+	public static CIMInstance parseEXPPARAMVALUE(Element pExpParamValueE) throws CIMXMLParseException {
 		// 
 		// 
 		// INSTANCE
 		if (attribute(pExpParamValueE, "NAME") == null) throw new CIMXMLParseException(
-				"EXPPARAMVALUE element missing NAME attribute!");
+			"EXPPARAMVALUE element missing NAME attribute!"
+		);
 
 		Element[] instanceA = searchNodes(pExpParamValueE, "INSTANCE", 0, 1, false);
 		if (instanceA != null) {
@@ -3016,16 +3046,16 @@ public static CIMInstance parseEXPPARAMVALUE(Element pExpParamValueE)
 
 	/**
 	 * parseMETHODRESPONSE
-	 * 
+	 *
 	 * @param pMethodResponseE
 	 * @return CIMResponse
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMResponse parseMETHODRESPONSE(Element pMethodResponseE)
-			throws CIMXMLParseException {
+	public static CIMResponse parseMETHODRESPONSE(Element pMethodResponseE) throws CIMXMLParseException {
 		// 
 		if (attribute(pMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
-				"METHODRESPONSE element missing NAME attribute!");
+			"METHODRESPONSE element missing NAME attribute!"
+		);
 
 		CIMResponse response = new CIMResponse();
 
@@ -3049,8 +3079,7 @@ public static CIMResponse parseMETHODRESPONSE(Element pMethodResponseE)
 		}
 
 		// PARAMVALUE
-		Element[] paramValElementA = searchNodes(pMethodResponseE, "PARAMVALUE", 0,
-				Integer.MAX_VALUE, true);
+		Element[] paramValElementA = searchNodes(pMethodResponseE, "PARAMVALUE", 0, Integer.MAX_VALUE, true);
 		if (paramValElementA != null) {
 			Vector v = new Vector();
 			for (int i = 0; i < paramValElementA.length; i++) {
@@ -3087,16 +3116,16 @@ public static CIMResponse parseMETHODRESPONSE(Element pMethodResponseE)
 
 	/**
 	 * parseIMETHODRESPONSE
-	 * 
+	 *
 	 * @param pIMethodResponseE
 	 * @return CIMResponse
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMResponse parseIMETHODRESPONSE(Element pIMethodResponseE)
-			throws CIMXMLParseException {
+	public static CIMResponse parseIMETHODRESPONSE(Element pIMethodResponseE) throws CIMXMLParseException {
 		// 
 		if (attribute(pIMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
-				"IMETHODRESPONSE element missing NAME attribute!");
+			"IMETHODRESPONSE element missing NAME attribute!"
+		);
 
 		CIMResponse response = new CIMResponse();
 		// ERROR
@@ -3119,8 +3148,7 @@ public static CIMResponse parseIMETHODRESPONSE(Element pIMethodResponseE)
 		}
 
 		// PARAMVALUE
-		Element[] paramValElementA = searchNodes(pIMethodResponseE, "PARAMVALUE", 0,
-				Integer.MAX_VALUE, true);
+		Element[] paramValElementA = searchNodes(pIMethodResponseE, "PARAMVALUE", 0, Integer.MAX_VALUE, true);
 		if (paramValElementA != null) {
 			Vector v = new Vector();
 			for (int i = 0; i < paramValElementA.length; i++) {
@@ -3139,7 +3167,7 @@ public static CIMResponse parseIMETHODRESPONSE(Element pIMethodResponseE)
 
 	/**
 	 * parseERROR
-	 * 
+	 *
 	 * @param pErrorE
 	 * @return WBEMException
 	 * @throws CIMXMLParseException
@@ -3149,15 +3177,13 @@ public static WBEMException parseERROR(Element pErrorE) throws CIMXMLParseExcept
 		// 
 
 		Attr error_codeA = (Attr) searchAttribute(pErrorE, "CODE");
-		if (error_codeA == null) throw new CIMXMLParseException(
-				"ERROR element missing CODE attribute!");
+		if (error_codeA == null) throw new CIMXMLParseException("ERROR element missing CODE attribute!");
 		String code = error_codeA.getNodeValue();
 		int errorCode = 0;
 		try {
 			if (code.length() > 0) errorCode = Integer.parseInt(code);
 		} catch (Exception e) {
-			LogAndTraceBroker.getBroker().trace(Level.WARNING,
-					"exception while parsing error code from XML", e);
+			LogAndTraceBroker.getBroker().trace(Level.WARNING, "exception while parsing error code from XML", e);
 			errorCode = WBEMException.CIM_ERR_FAILED;
 		}
 		Attr error_descriptionA = (Attr) searchAttribute(pErrorE, "DESCRIPTION");
@@ -3181,17 +3207,19 @@ public static WBEMException parseERROR(Element pErrorE) throws CIMXMLParseExcept
 
 		// throw new CIMException(CIMException.getErrorName(errorCode),
 		// description.substring(description.indexOf(':')+1));
-		if (!rtnV.isEmpty()) return new WBEMException(errorCode, "ErrorCode:" + errorCode
-				+ " description:" + description, rtnV.toArray(new CIMInstance[0]));
-		return new WBEMException(errorCode, "ErrorCode:" + errorCode + " description:"
-				+ description);
+		if (!rtnV.isEmpty()) return new WBEMException(
+			errorCode,
+			"ErrorCode:" + errorCode + " description:" + description,
+			rtnV.toArray(new CIMInstance[0])
+		);
+		return new WBEMException(errorCode, "ErrorCode:" + errorCode + " description:" + description);
 	}
 
 	private static final String nodesRETURNVALUE[] = { "VALUE", "VALUE.REFERENCE" };
 
 	/**
 	 * parseRETURNVALUE
-	 * 
+	 *
 	 * @param pRetValE
 	 * @return Object
 	 * @throws CIMXMLParseException
@@ -3214,14 +3242,26 @@ public static Object parseRETURNVALUE(Element pRetValE) throws CIMXMLParseExcept
 		return null;
 	}
 
-	private static final String nodesIRETURNVALUE[] = { "CLASSNAME", "INSTANCENAME", "VALUE",
-			"VALUE.OBJECTWITHPATH", "VALUE.OBJECTWITHLOCALPATH", "VALUE.OBJECT", "OBJECTPATH",
-			"QUALIFIER.DECLARATION", "VALUE.ARRAY", "VALUE.REFERENCE", "CLASS", "INSTANCE",
-			"INSTANCEPATH", "VALUE.NAMEDINSTANCE" };
+	private static final String nodesIRETURNVALUE[] = {
+		"CLASSNAME",
+		"INSTANCENAME",
+		"VALUE",
+		"VALUE.OBJECTWITHPATH",
+		"VALUE.OBJECTWITHLOCALPATH",
+		"VALUE.OBJECT",
+		"OBJECTPATH",
+		"QUALIFIER.DECLARATION",
+		"VALUE.ARRAY",
+		"VALUE.REFERENCE",
+		"CLASS",
+		"INSTANCE",
+		"INSTANCEPATH",
+		"VALUE.NAMEDINSTANCE"
+	};
 
 	/**
 	 * parseIRETURNVALUE
-	 * 
+	 *
 	 * @param pIRetValE
 	 * @return Vector
 	 * @throws CIMXMLParseException
@@ -3257,8 +3297,7 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 		}
 
 		// CLASSNAME
-		Element[] classNameElementA = searchNodes(pIRetValE, "CLASSNAME", 0, Integer.MAX_VALUE,
-				false);
+		Element[] classNameElementA = searchNodes(pIRetValE, "CLASSNAME", 0, Integer.MAX_VALUE, false);
 		if (classNameElementA != null) {
 			for (int i = 0; i < classNameElementA.length; i++) {
 				Element classnameE = classNameElementA[i];
@@ -3269,8 +3308,7 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 		}
 
 		// INSTANCENAME
-		Element[] instNameElementA = searchNodes(pIRetValE, "INSTANCENAME", 0, Integer.MAX_VALUE,
-				false);
+		Element[] instNameElementA = searchNodes(pIRetValE, "INSTANCENAME", 0, Integer.MAX_VALUE, false);
 		if (instNameElementA != null) {
 			for (int i = 0; i < instNameElementA.length; i++) {
 				Element instancenameE = instNameElementA[i];
@@ -3281,8 +3319,7 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 		}
 
 		// INSTANCEPATH
-		Element[] instpathElementA = searchNodes(pIRetValE, "INSTANCEPATH", 0, Integer.MAX_VALUE,
-				false);
+		Element[] instpathElementA = searchNodes(pIRetValE, "INSTANCEPATH", 0, Integer.MAX_VALUE, false);
 		if (instpathElementA != null) {
 			for (int i = 0; i < instpathElementA.length; i++) {
 				Element instancePathE = instpathElementA[i];
@@ -3293,8 +3330,7 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 		}
 
 		// OBJECTPATH
-		Element[] objPathElementA = searchNodes(pIRetValE, "OBJECTPATH", 0, Integer.MAX_VALUE,
-				false);
+		Element[] objPathElementA = searchNodes(pIRetValE, "OBJECTPATH", 0, Integer.MAX_VALUE, false);
 		if (objPathElementA != null) {
 			for (int i = 0; i < objPathElementA.length; i++) {
 				Element objectpathE = objPathElementA[i];
@@ -3334,8 +3370,7 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 		}
 
 		// VALUE.OBJECT
-		Element[] valObjElementA = searchNodes(pIRetValE, "VALUE.OBJECT", 0, Integer.MAX_VALUE,
-				false);
+		Element[] valObjElementA = searchNodes(pIRetValE, "VALUE.OBJECT", 0, Integer.MAX_VALUE, false);
 		if (valObjElementA != null) {
 			for (int i = 0; i < valObjElementA.length; i++) {
 				Element valueobjectE = valObjElementA[i];
@@ -3346,8 +3381,7 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 		}
 
 		// VALUE.NAMEDINSTANCE
-		Element[] valNamedInstElementA = searchNodes(pIRetValE, "VALUE.NAMEDINSTANCE", 0,
-				Integer.MAX_VALUE, false);
+		Element[] valNamedInstElementA = searchNodes(pIRetValE, "VALUE.NAMEDINSTANCE", 0, Integer.MAX_VALUE, false);
 		if (valNamedInstElementA != null) {
 			for (int i = 0; i < valNamedInstElementA.length; i++) {
 				Element valuenamedisntanceE = valNamedInstElementA[i];
@@ -3358,8 +3392,7 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 		}
 
 		// VALUE.INSTANCEWITHPATH
-		Element[] valInstWithPathElementA = searchNodes(pIRetValE, "VALUE.INSTANCEWITHPATH", 0,
-				Integer.MAX_VALUE, false);
+		Element[] valInstWithPathElementA = searchNodes(pIRetValE, "VALUE.INSTANCEWITHPATH", 0, Integer.MAX_VALUE, false);
 		if (valInstWithPathElementA != null) {
 			for (int i = 0; i < valInstWithPathElementA.length; i++) {
 				Element valueinstancewithpathE = valInstWithPathElementA[i];
@@ -3370,8 +3403,7 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 		}
 
 		// VALUE.OBJECTWITHPATH
-		Element[] valObjWithPathElementA = searchNodes(pIRetValE, "VALUE.OBJECTWITHPATH", 0,
-				Integer.MAX_VALUE, false);
+		Element[] valObjWithPathElementA = searchNodes(pIRetValE, "VALUE.OBJECTWITHPATH", 0, Integer.MAX_VALUE, false);
 		if (valObjWithPathElementA != null) {
 			for (int i = 0; i < valObjWithPathElementA.length; i++) {
 				Element valueobjectwithpathE = valObjWithPathElementA[i];
@@ -3382,8 +3414,13 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 		}
 
 		// VALUE.OBJECTWITHLOCALPATH
-		Element[] valObjWithLocalPathElementA = searchNodes(pIRetValE, "VALUE.OBJECTWITHLOCALPATH",
-				0, Integer.MAX_VALUE, false);
+		Element[] valObjWithLocalPathElementA = searchNodes(
+			pIRetValE,
+			"VALUE.OBJECTWITHLOCALPATH",
+			0,
+			Integer.MAX_VALUE,
+			false
+		);
 		if (valObjWithLocalPathElementA != null) {
 			for (int i = 0; i < valObjWithLocalPathElementA.length; i++) {
 				Element valueobjectwithlocalpathE = valObjWithLocalPathElementA[i];
@@ -3394,8 +3431,7 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 		}
 
 		// QUALIFIER.DECLARATION
-		Element[] qualiDeclElementA = searchNodes(pIRetValE, "QUALIFIER.DECLARATION", 0,
-				Integer.MAX_VALUE, false);
+		Element[] qualiDeclElementA = searchNodes(pIRetValE, "QUALIFIER.DECLARATION", 0, Integer.MAX_VALUE, false);
 		if (qualiDeclElementA != null) {
 			for (int i = 0; i < qualiDeclElementA.length; i++) {
 				Element qualifierdeclarationE = qualiDeclElementA[i];
@@ -3410,7 +3446,7 @@ public static Vector parseIRETURNVALUE(Element pIRetValE) throws CIMXMLP
 
 	/**
 	 * parseObject
-	 * 
+	 *
 	 * @param pRootE
 	 * @return Object
 	 * @throws CIMXMLParseException
@@ -3470,7 +3506,7 @@ public static Object parseObject(Element pRootE) throws CIMXMLParseException {
 
 	/**
 	 * hasNodes
-	 * 
+	 *
 	 * @param pParentE
 	 * @return boolean
 	 */
@@ -3486,11 +3522,11 @@ private static boolean hasNodes(Element pParentE) {
 
 	/**
 	 * hasTypeAttrsInNodes
-	 * 
+	 *
 	 * SVC CIMOM sends typed CIM-XML elements in a non-standard way. The TYPE
 	 * attribute is included in the VALUE or VALUE.ARRAY element not in the
 	 * enclosing element as the standard says.
-	 * 
+	 *
 	 * @param pParentE
 	 * @return boolean
 	 */
@@ -3502,8 +3538,7 @@ private static boolean hasTypeAttrsInNodes(Element pParentE) {
 			String name = n.getNodeName();
 			if ("VALUE".equalsIgnoreCase(name) || "VALUE.ARRAY".equalsIgnoreCase(name)) {
 				NamedNodeMap nm = n.getAttributes();
-				if (nm != null
-						&& (nm.getNamedItem("TYPE") != null || nm.getNamedItem("PARAMTYPE") != null)) return true;
+				if (nm != null && (nm.getNamedItem("TYPE") != null || nm.getNamedItem("PARAMTYPE") != null)) return true;
 			}
 		}
 		return false;
@@ -3512,35 +3547,87 @@ private static boolean hasTypeAttrsInNodes(Element pParentE) {
 	private static final HashMap NODENAME_HASH = new HashMap();
 
 	private static void initNodeNameHash(String[] pEnumA) {
-		for (int i = 0; i < pEnumA.length; i++)
-			NODENAME_HASH.put(pEnumA[i], pEnumA[i]);
+		for (int i = 0; i < pEnumA.length; i++) NODENAME_HASH.put(pEnumA[i], pEnumA[i]);
 	}
 
 	static {
-		initNodeNameHash(new String[] { "CIM", "DECLARATION", "DECLGROUP", "DECLGROUP.WITHNAME",
-				"DECLGROUP.WITHPATH", "QUALIFIER.DECLARATION", "SCOPE", "VALUE", "VALUE.ARRAY",
-				"VALUE.REFERENCE", "VALUE.REFARRAY", "VALUE.OBJECT", "VALUE.NAMEDINSTANCE",
-				"VALUE.NAMEDOBJECT", "VALUE.OBJECTWITHLOCALPATH", "VALUE.OBJECTWITHPATH",
-				"VALUE.NULL", "VALUE.INSTANCEWITHPATH", "NAMESPACEPATH", "LOCALNAMESPACEPATH",
-				"HOST", "NAMESPACE", "CLASSPATH", "LOCALCLASSPATH", "CLASSNAME", "INSTANCEPATH",
-				"LOCALINSTANCEPATH", "INSTANCENAME", "OBJECTPATH", "KEYBINDING", "KEYVALUE",
-				"CLASS", "INSTANCE", "QUALIFIER", "PROPERTY", "PROPERTY.ARRAY",
-				"PROPERTY.REFERENCE", "METHOD", "PARAMETER", "PARAMETER.REFERENCE",
-				"PARAMETER.ARRAY", "PARAMETER.REFARRAY", "MESSAGE", "MULTIREQ", "MULTIEXPREQ",
-				"SIMPLEREQ", "SIMPLEEXPREQ", "IMETHODCALL", "METHODCALL", "EXPMETHODCALL",
-				"PARAMVALUE", "IPARAMVALUE", "EXPPARAMVALUE", "MULTIRSP", "MULTIEXPRSP",
-				"SIMPLERSP", "SIMPLEEXPRSP", "METHODRESPONSE", "EXPMETHODRESPONSE",
-				"IMETHODRESPONSE", "ERROR", "RETURNVALUE", "IRETURNVALUE", "CORRELATOR" });
+		initNodeNameHash(
+			new String[] {
+				"CIM",
+				"DECLARATION",
+				"DECLGROUP",
+				"DECLGROUP.WITHNAME",
+				"DECLGROUP.WITHPATH",
+				"QUALIFIER.DECLARATION",
+				"SCOPE",
+				"VALUE",
+				"VALUE.ARRAY",
+				"VALUE.REFERENCE",
+				"VALUE.REFARRAY",
+				"VALUE.OBJECT",
+				"VALUE.NAMEDINSTANCE",
+				"VALUE.NAMEDOBJECT",
+				"VALUE.OBJECTWITHLOCALPATH",
+				"VALUE.OBJECTWITHPATH",
+				"VALUE.NULL",
+				"VALUE.INSTANCEWITHPATH",
+				"NAMESPACEPATH",
+				"LOCALNAMESPACEPATH",
+				"HOST",
+				"NAMESPACE",
+				"CLASSPATH",
+				"LOCALCLASSPATH",
+				"CLASSNAME",
+				"INSTANCEPATH",
+				"LOCALINSTANCEPATH",
+				"INSTANCENAME",
+				"OBJECTPATH",
+				"KEYBINDING",
+				"KEYVALUE",
+				"CLASS",
+				"INSTANCE",
+				"QUALIFIER",
+				"PROPERTY",
+				"PROPERTY.ARRAY",
+				"PROPERTY.REFERENCE",
+				"METHOD",
+				"PARAMETER",
+				"PARAMETER.REFERENCE",
+				"PARAMETER.ARRAY",
+				"PARAMETER.REFARRAY",
+				"MESSAGE",
+				"MULTIREQ",
+				"MULTIEXPREQ",
+				"SIMPLEREQ",
+				"SIMPLEEXPREQ",
+				"IMETHODCALL",
+				"METHODCALL",
+				"EXPMETHODCALL",
+				"PARAMVALUE",
+				"IPARAMVALUE",
+				"EXPPARAMVALUE",
+				"MULTIRSP",
+				"MULTIEXPRSP",
+				"SIMPLERSP",
+				"SIMPLEEXPRSP",
+				"METHODRESPONSE",
+				"EXPMETHODRESPONSE",
+				"IMETHODRESPONSE",
+				"ERROR",
+				"RETURNVALUE",
+				"IRETURNVALUE",
+				"CORRELATOR"
+			}
+		);
 	}
 
 	/**
 	 * checkOtherNodes
-	 * 
+	 *
 	 * @param pParentE
 	 * @param pAllowedChildNodes
 	 */
-	private static void checkOtherNodes(Element pParentE, String[] pAllowedChildNodes)
-			throws CIMXMLParseException {
+	private static void checkOtherNodes(Element pParentE, String[] pAllowedChildNodes) throws CIMXMLParseException {
 		NodeList nl = pParentE.getChildNodes();
 		if (nl == null || nl.getLength() == 0) return;
 		for (int i = 0; i < nl.getLength(); i++) {
@@ -3554,15 +3641,15 @@ private static void checkOtherNodes(Element pParentE, String[] pAllowedChildNode
 					break;
 				}
 			}
-			if (!found && NODENAME_HASH.containsKey(name)) throw new CIMXMLParseException(pParentE
-					.getNodeName()
-					+ " element contains invalid child element " + name + "!");
+			if (!found && NODENAME_HASH.containsKey(name)) throw new CIMXMLParseException(
+				pParentE.getNodeName() + " element contains invalid child element " + name + "!"
+			);
 		}
 	}
 
 	/**
 	 * searchNodes
-	 * 
+	 *
 	 * @param pParentE
 	 * @param pTagName
 	 * @return Element[]
@@ -3584,7 +3671,7 @@ public static Element[] searchNodes(Element pParentE, String pTagName) {
 
 	/**
 	 * searchNodes
-	 * 
+	 *
 	 * @param pParentE
 	 * @param pTagName
 	 * @param pMin
@@ -3593,14 +3680,15 @@ public static Element[] searchNodes(Element pParentE, String pTagName) {
 	 * @return Element[]
 	 * @throws CIMXMLParseException
 	 */
-	public static Element[] searchNodes(Element pParentE, String pTagName, int pMin, int pMax,
-			boolean pAllowOtherNodes) throws CIMXMLParseException {
+	public static Element[] searchNodes(Element pParentE, String pTagName, int pMin, int pMax, boolean pAllowOtherNodes)
+		throws CIMXMLParseException {
 		// return all child nodes immediately below parent, null if none found
 
 		NodeList nl = pParentE.getChildNodes();
 		if (nl == null || nl.getLength() == 0) {
-			if (pMin > 0) throw new CIMXMLParseException(pParentE.getNodeName()
-					+ " element must have at least " + pMin + " " + pTagName + " child element(s)!");
+			if (pMin > 0) throw new CIMXMLParseException(
+				pParentE.getNodeName() + " element must have at least " + pMin + " " + pTagName + " child element(s)!"
+			);
 			return null;
 		}
 
@@ -3616,13 +3704,20 @@ public static Element[] searchNodes(Element pParentE, String pTagName, int pMin,
 			}
 		}
 
-		if (resElementV.size() < pMin) throw new CIMXMLParseException(pParentE.getNodeName()
-				+ " element must have at least " + pMin + " " + pTagName + " child element(s)!");
-		if (resElementV.size() > pMax) throw new CIMXMLParseException(pParentE.getNodeName()
-				+ " element can have no more than " + pMax + " " + pTagName + " child element(s)!");
+		if (resElementV.size() < pMin) throw new CIMXMLParseException(
+			pParentE.getNodeName() + " element must have at least " + pMin + " " + pTagName + " child element(s)!"
+		);
+		if (resElementV.size() > pMax) throw new CIMXMLParseException(
+			pParentE.getNodeName() + " element can have no more than " + pMax + " " + pTagName + " child element(s)!"
+		);
 		if (resElementV.size() > 0 && !pAllowOtherNodes && otherNode != null) throw new CIMXMLParseException(
-				pParentE.getNodeName() + " element cannot have " + otherNode
-						+ " child element(s) when it already has " + pTagName + " element(s)!");
+			pParentE.getNodeName() +
+			" element cannot have " +
+			otherNode +
+			" child element(s) when it already has " +
+			pTagName +
+			" element(s)!"
+		);
 		if (resElementV.size() == 0) return null;
 
 		return resElementV.toArray(new Element[0]);
@@ -3630,7 +3725,7 @@ public static Element[] searchNodes(Element pParentE, String pTagName, int pMin,
 
 	/**
 	 * searchFirstNode
-	 * 
+	 *
 	 * @param pParentE
 	 * @param pTagName
 	 * @return Node
@@ -3641,14 +3736,16 @@ public static Node searchFirstNode(Element pParentE, String pTagName) {
 		NodeList nl = pParentE.getChildNodes();
 		for (int i = 0; i < nl.getLength(); i++) {
 			Node n = nl.item(i);
-			if (n.getNodeName().equals(pTagName)) { return n; }
+			if (n.getNodeName().equals(pTagName)) {
+				return n;
+			}
 		}
 		return null;
 	}
 
 	/**
 	 * searchAttribute
-	 * 
+	 *
 	 * @param pParentN
 	 * @param pAttrName
 	 * @return Node
@@ -3661,7 +3758,7 @@ public static Node searchAttribute(Node pParentN, String pAttrName) {
 
 	/**
 	 * searchFirstChild
-	 * 
+	 *
 	 * @param pParentE
 	 * @return Node
 	 */
@@ -3673,14 +3770,13 @@ public static Node searchFirstChild(Element pParentE) {
 
 	/**
 	 * createJavaObject
-	 * 
+	 *
 	 * @param pTypeStr
 	 * @param pValue
 	 * @return Object
 	 * @throws CIMXMLParseException
 	 */
-	public static Object createJavaObject(String pTypeStr, String pValue)
-			throws CIMXMLParseException {
+	public static Object createJavaObject(String pTypeStr, String pValue) throws CIMXMLParseException {
 		// return a java object with the specific type
 		if (pTypeStr == null) pTypeStr = MOF.DT_STR;
 		if (MOF.NULL.equalsIgnoreCase(pTypeStr)) return null;
@@ -3692,8 +3788,8 @@ public static Object createJavaObject(String pTypeStr, String pValue)
 			pValue = pValue.toLowerCase();
 			if (pValue.startsWith("0x") || pValue.startsWith("+0x") || pValue.startsWith("-0x")) {
 				radix = 16;
-				if (pValue.startsWith("-")) pValue = "-" + pValue.substring(3);
-				else pValue = pValue.substring(pValue.indexOf('x') + 1);
+				if (pValue.startsWith("-")) pValue = "-" + pValue.substring(3); else pValue =
+					pValue.substring(pValue.indexOf('x') + 1);
 			}
 		}
 
@@ -3734,7 +3830,8 @@ public static Object createJavaObject(String pTypeStr, String pValue)
 			case CIMDataType.REAL64:
 				if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
 					if (Util.isBadDoubleString(pValue)) throw new IllegalArgumentException(
-							"Double value string hangs older JVMs!\n" + pValue);
+						"Double value string hangs older JVMs!\n" + pValue
+					);
 				}
 				o = new Double(pValue);
 				break;
@@ -3760,16 +3857,23 @@ private static CIMDateTime getDateTime(String pValue) throws CIMXMLParseExceptio
 			try {
 				return new CIMDateTimeInterval(pValue);
 			} catch (IllegalArgumentException eInt) {
-				throw new CIMXMLParseException("Failed to parse dateTime string: " + pValue + "!\n"
-						+ "CIMDateTimeAbsolute parsing error:\n" + eAbs.getMessage() + "\n"
-						+ "CIMDateTimeInterval parsing error:\n" + eInt.getMessage());
+				throw new CIMXMLParseException(
+					"Failed to parse dateTime string: " +
+					pValue +
+					"!\n" +
+					"CIMDateTimeAbsolute parsing error:\n" +
+					eAbs.getMessage() +
+					"\n" +
+					"CIMDateTimeInterval parsing error:\n" +
+					eInt.getMessage()
+				);
 			}
 		}
 	}
 
 	/**
 	 * parseSIMPLEEXPRSP
-	 * 
+	 *
 	 * @param pSimpleExpRspE
 	 * @return CIMResponse
 	 * @throws CIMXMLParseException
@@ -3781,13 +3885,12 @@ public static CIMResponse parseSIMPLEEXPRSP(Element pSimpleExpRspE) throws CIMXM
 		Element[] expmethodresponseA = searchNodes(pSimpleExpRspE, "EXPMETHODRESPONSE", 1, 1, false);
 		if (expmethodresponseA != null) return parseEXPMETHODRESPONSE(expmethodresponseA[0]);
 
-		throw new CIMXMLParseException(
-				"SIMPLEEXPRSP element missing EXPMETHODRESPONSE child element!");
+		throw new CIMXMLParseException("SIMPLEEXPRSP element missing EXPMETHODRESPONSE child element!");
 	}
 
 	/**
 	 * parseMULTIEXPRSP
-	 * 
+	 *
 	 * @param pMultiExpRspE
 	 * @return CIMResponse
 	 * @throws CIMXMLParseException
@@ -3795,8 +3898,7 @@ public static CIMResponse parseSIMPLEEXPRSP(Element pSimpleExpRspE) throws CIMXM
 	public static CIMResponse parseMULTIEXPRSP(Element pMultiExpRspE) throws CIMXMLParseException {
 		// 
 
-		Element[] multiExpRespElementA = searchNodes(pMultiExpRspE, "SIMPLEEXPRSP", 2,
-				Integer.MAX_VALUE, false);
+		Element[] multiExpRespElementA = searchNodes(pMultiExpRspE, "SIMPLEEXPRSP", 2, Integer.MAX_VALUE, false);
 		if (multiExpRespElementA != null) {
 			CIMResponse multiExpRsp = new CIMResponse();
 			for (int i = 0; i < multiExpRespElementA.length; i++) {
@@ -3815,19 +3917,19 @@ public static CIMResponse parseMULTIEXPRSP(Element pMultiExpRspE) throws CIMXMLP
 
 	/**
 	 * parseEXPMETHODRESPONSE
-	 * 
+	 *
 	 * @param pExpMethodResponseE
 	 * @return CIMResponse
 	 * @throws CIMXMLParseException
 	 */
-	public static CIMResponse parseEXPMETHODRESPONSE(Element pExpMethodResponseE)
-			throws CIMXMLParseException {
+	public static CIMResponse parseEXPMETHODRESPONSE(Element pExpMethodResponseE) throws CIMXMLParseException {
 		// 
 
 		CIMResponse response = new CIMResponse();
 
 		if (attribute(pExpMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
-				"EXPMETHODRESPONSE element missing NAME attribute!");
+			"EXPMETHODRESPONSE element missing NAME attribute!"
+		);
 
 		// ERROR
 		Element[] errorA = searchNodes(pExpMethodResponseE, "ERROR", 0, 1, false);
@@ -3856,7 +3958,7 @@ public static CIMResponse parseEXPMETHODRESPONSE(Element pExpMethodResponseE)
 
 	/**
 	 * parseCORRELATOR
-	 * 
+	 *
 	 * @param pCorrelatorE
 	 * @throws CIMXMLParseException
 	 * */
@@ -3864,11 +3966,9 @@ public static void parseCORRELATOR(Element pCorrelatorE) throws CIMXMLParseExcep
 		// 
 		// 
 		String name = attribute(pCorrelatorE, "NAME");
-		if (name == null) throw new CIMXMLParseException(
-				"CORRELATOR element missing NAME attribute!");
+		if (name == null) throw new CIMXMLParseException("CORRELATOR element missing NAME attribute!");
 		String type = attribute(pCorrelatorE, "TYPE");
-		if (type == null) throw new CIMXMLParseException(
-				"CORRELATOR element missing TYPE attribute!");
+		if (type == null) throw new CIMXMLParseException("CORRELATOR element missing TYPE attribute!");
 
 		// VALUE
 		Element[] valueA = searchNodes(pCorrelatorE, "VALUE", 1, 1, false);
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java
index 3b34eb7..1cd1c92 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/CimXmlSerializer.java
@@ -48,7 +48,6 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
-
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -58,35 +57,33 @@
  * Class CimXmlSerializer implements a XML serializer for DOM documents that is
  * specialized for CIM-XML. It might not be used as a general purpose serializer
  * since it doesn't support any DOM or XML features not required by CIM-XML.
- * 
+ *
  */
 public class CimXmlSerializer {
 
 	/**
 	 * Class XmlWriter implements a writer on an output stream that escapes XML
 	 * values according to the CIM-XML requirements.
-	 * 
+	 *
 	 */
 	private static class XmlWriter {
-
 		private BufferedWriter iWriter;
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pOut
 		 *            The output stream the serialized document is written to
 		 * @param pCharsetName
 		 *            The encoding the use for the output stream
 		 */
 		public XmlWriter(OutputStream pOut, String pCharsetName) {
-			this.iWriter = new BufferedWriter(new OutputStreamWriter(pOut, Charset.forName(
-					pCharsetName).newEncoder()));
+			this.iWriter = new BufferedWriter(new OutputStreamWriter(pOut, Charset.forName(pCharsetName).newEncoder()));
 		}
 
 		/**
 		 * Writes text to the stream
-		 * 
+		 *
 		 * @param pText
 		 *            The text
 		 * @throws IOException
@@ -97,7 +94,7 @@ public void write(String pText) throws IOException {
 
 		/**
 		 * Closes the stream
-		 * 
+		 *
 		 * @throws IOException
 		 */
 		public void close() throws IOException {
@@ -106,7 +103,7 @@ public void close() throws IOException {
 
 		/**
 		 * Flushes the buffer to the stream
-		 * 
+		 *
 		 * @throws IOException
 		 */
 		public void flush() throws IOException {
@@ -160,23 +157,25 @@ public void flush() throws IOException {
 		 * 
 		 * 
 		 * 
-		 * 
+		 *
 		 * @param pText
 		 *            The text
 		 * @throws IOException
 		 */
 		public void writeValue(final String pText) throws IOException {
-			if (pText == null) { return; }
+			if (pText == null) {
+				return;
+			}
 			boolean escapeSpace = true;
 			final int oneBeforeLast = pText.length() - 2;
 			for (int i = 0; i < pText.length(); ++i) {
-
 				char currentChar = pText.charAt(i);
 				boolean isSpace = false;
 
 				if (isHighSurrogate(currentChar)) {
-					if (i > oneBeforeLast || !isLowSurrogate(pText.charAt(i + 1))) { throw new IOException(
-							"Illegal Unicode character"); }
+					if (i > oneBeforeLast || !isLowSurrogate(pText.charAt(i + 1))) {
+						throw new IOException("Illegal Unicode character");
+					}
 					this.iWriter.write(pText, i++, 2);
 				} else if (currentChar < ' ') {
 					writeAsHex(currentChar);
@@ -220,15 +219,12 @@ private void writeAsHex(char pChar) throws IOException {
 		}
 
 		private boolean isHighSurrogate(char pChar) {
-			return pChar >= WBEMConstants.UTF16_MIN_HIGH_SURROGATE
-					&& pChar <= WBEMConstants.UTF16_MAX_HIGH_SURROGATE;
+			return pChar >= WBEMConstants.UTF16_MIN_HIGH_SURROGATE && pChar <= WBEMConstants.UTF16_MAX_HIGH_SURROGATE;
 		}
 
 		private boolean isLowSurrogate(char pChar) {
-			return pChar >= WBEMConstants.UTF16_MIN_LOW_SURROGATE
-					&& pChar <= WBEMConstants.UTF16_MAX_LOW_SURROGATE;
+			return pChar >= WBEMConstants.UTF16_MIN_LOW_SURROGATE && pChar <= WBEMConstants.UTF16_MAX_LOW_SURROGATE;
 		}
-
 	}
 
 	private boolean iPretty;
@@ -252,7 +248,7 @@ private CimXmlSerializer(boolean pPretty) {
 	 * and then serializes the document node. If you want to suppress this
 	 * header just call {@link #serialize(OutputStream, Node, boolean)} on the
 	 * document node.
-	 * 
+	 *
 	 * @param pOS
 	 *            The output stream
 	 * @param pDoc
@@ -263,9 +259,7 @@ private CimXmlSerializer(boolean pPretty) {
 	 * @throws IOException
 	 *             Whenever something goes wrong
 	 */
-	public static void serialize(OutputStream pOS, Document pDoc, boolean pPretty)
-			throws IOException {
-
+	public static void serialize(OutputStream pOS, Document pDoc, boolean pPretty) throws IOException {
 		try {
 			XmlWriter writer = new XmlWriter(pOS, WBEMConstants.UTF8);
 			writer.write("\n");
@@ -280,7 +274,7 @@ public static void serialize(OutputStream pOS, Document pDoc, boolean pPretty)
 
 	/**
 	 * Serializes a given DOM node as (CIM-)XML to a given output stream
-	 * 
+	 *
 	 * @param pOS
 	 *            The output stream
 	 * @param pNode
@@ -292,7 +286,6 @@ public static void serialize(OutputStream pOS, Document pDoc, boolean pPretty)
 	 *             Whenever something goes wrong
 	 */
 	public static void serialize(OutputStream pOS, Node pNode, boolean pPretty) throws IOException {
-
 		try {
 			XmlWriter writer = new XmlWriter(pOS, WBEMConstants.UTF8);
 			new CimXmlSerializer(pPretty).serializeNode(writer, pNode);
@@ -369,7 +362,9 @@ private void serializeNode(XmlWriter pWriter, Node pNode) throws IOException {
 						int end = value.indexOf(this.CDATA_END, idx);
 
 						// invalid CDATA
-						if (end == -1) { throw new IOException("CDATA section not closed: " + value); }
+						if (end == -1) {
+							throw new IOException("CDATA section not closed: " + value);
+						}
 
 						// write CDATA (not escaped)
 						pWriter.write(value.substring(idx, end + this.CDATA_END.length()));
@@ -380,7 +375,9 @@ private void serializeNode(XmlWriter pWriter, Node pNode) throws IOException {
 	}
 
 	private String indent() {
-		if (!this.iPretty) { return ""; }
+		if (!this.iPretty) {
+			return "";
+		}
 		StringBuffer result = new StringBuffer();
 		result.append('\n');
 		for (int i = 0; i < this.iIndent; ++i) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java
index 9b16f2a..11402e0 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/LocalPathBuilder.java
@@ -47,12 +47,11 @@
  * Class LocalPathBuilder helps CIM-XML parsers to build local CIMObjectPathes.
  */
 public class LocalPathBuilder {
-
 	private CIMObjectPath iBasePath;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pBasePath
 	 */
 	public LocalPathBuilder(CIMObjectPath pBasePath) {
@@ -61,7 +60,7 @@ public LocalPathBuilder(CIMObjectPath pBasePath) {
 
 	/**
 	 * getBasePath
-	 * 
+	 *
 	 * @return CIMObjectPath
 	 */
 	public CIMObjectPath getBasePath() {
@@ -70,7 +69,7 @@ public CIMObjectPath getBasePath() {
 
 	/**
 	 * build
-	 * 
+	 *
 	 * @param pObjPathStr
 	 * @return CIMObjectPath
 	 */
@@ -80,7 +79,7 @@ public CIMObjectPath build(String pObjPathStr) {
 
 	/**
 	 * build
-	 * 
+	 *
 	 * @param pObjName
 	 * @param pNameSpace
 	 * @return CIMObjectPath
@@ -91,7 +90,7 @@ public CIMObjectPath build(String pObjName, String pNameSpace) {
 
 	/**
 	 * build
-	 * 
+	 *
 	 * @param pObjName
 	 * @param pNameSpace
 	 * @param pKeys
@@ -103,21 +102,20 @@ public CIMObjectPath build(String pObjName, String pNameSpace, CIMProperty[]
 
 	/**
 	 * build
-	 * 
+	 *
 	 * @param pHost
 	 * @param pNameSpace
 	 * @param pObjName
 	 * @param pKeys
 	 * @return CIMObjectPath
 	 */
-	public CIMObjectPath build(String pHost, String pNameSpace, String pObjName,
-			CIMProperty[] pKeys) {
+	public CIMObjectPath build(String pHost, String pNameSpace, String pObjName, CIMProperty[] pKeys) {
 		return build(this.iBasePath, pHost, pNameSpace, pObjName, pKeys);
 	}
 
 	/**
 	 * build
-	 * 
+	 *
 	 * @param pScheme
 	 * @param pHost
 	 * @param pPort
@@ -126,27 +124,40 @@ public CIMObjectPath build(String pHost, String pNameSpace, String pObjName,
 	 * @param pKeys
 	 * @return CIMObjectPath
 	 */
-	public CIMObjectPath build(String pScheme, String pHost, String pPort, String pNameSpace,
-			String pObjName, CIMProperty[] pKeys) {
+	public CIMObjectPath build(
+		String pScheme,
+		String pHost,
+		String pPort,
+		String pNameSpace,
+		String pObjName,
+		CIMProperty[] pKeys
+	) {
 		return build(this.iBasePath, pScheme, pHost, pPort, pNameSpace, pObjName, pKeys);
 	}
 
 	/**
 	 * build
-	 * 
+	 *
 	 * @param pBasePath
 	 * @param pObjPathStr
 	 * @return CIMObjectPath
 	 */
 	public static CIMObjectPath build(CIMObjectPath pBasePath, String pObjPathStr) {
 		CIMObjectPath path = new CIMObjectPath(pObjPathStr);
-		return build(pBasePath, path.getScheme(), path.getHost(), path.getPort(), path
-				.getNamespace(), path.getObjectName(), path.getKeys());
+		return build(
+			pBasePath,
+			path.getScheme(),
+			path.getHost(),
+			path.getPort(),
+			path.getNamespace(),
+			path.getObjectName(),
+			path.getKeys()
+		);
 	}
 
 	/**
 	 * build
-	 * 
+	 *
 	 * @param pBasePath
 	 * @param pObjName
 	 * @param pNameSpace
@@ -158,21 +169,25 @@ public static CIMObjectPath build(CIMObjectPath pBasePath, String pObjName, Stri
 
 	/**
 	 * build
-	 * 
+	 *
 	 * @param pBasePath
 	 * @param pObjName
 	 * @param pNameSpace
 	 * @param pKeys
 	 * @return CIMObjectPath
 	 */
-	public static CIMObjectPath build(CIMObjectPath pBasePath, String pObjName, String pNameSpace,
-			CIMProperty[] pKeys) {
+	public static CIMObjectPath build(
+		CIMObjectPath pBasePath,
+		String pObjName,
+		String pNameSpace,
+		CIMProperty[] pKeys
+	) {
 		return build(pBasePath, null, null, null, pNameSpace, pObjName, pKeys);
 	}
 
 	/**
 	 * build
-	 * 
+	 *
 	 * @param pBasePath
 	 * @param pHost
 	 * @param pNameSpace
@@ -180,14 +195,19 @@ public static CIMObjectPath build(CIMObjectPath pBasePath, String pObjName, Stri
 	 * @param pKeys
 	 * @return CIMObjectPath
 	 */
-	public static CIMObjectPath build(CIMObjectPath pBasePath, String pHost, String pNameSpace,
-			String pObjName, CIMProperty[] pKeys) {
+	public static CIMObjectPath build(
+		CIMObjectPath pBasePath,
+		String pHost,
+		String pNameSpace,
+		String pObjName,
+		CIMProperty[] pKeys
+	) {
 		return build(pBasePath, null, pHost, null, pNameSpace, pObjName, pKeys);
 	}
 
 	/**
 	 * build
-	 * 
+	 *
 	 * @param pBasePath
 	 * @param pScheme
 	 * @param pHost
@@ -197,16 +217,24 @@ public static CIMObjectPath build(CIMObjectPath pBasePath, String pHost, String
 	 * @param pKeys
 	 * @return CIMObjectPath
 	 */
-	public static CIMObjectPath build(CIMObjectPath pBasePath, String pScheme, String pHost,
-			String pPort, String pNameSpace, String pObjName, CIMProperty[] pKeys) {
-		if (pBasePath == null) return new CIMObjectPath(pScheme, pHost, pPort, pNameSpace,
-				pObjName, pKeys);
-		return new CIMObjectPath(pScheme == null ? pBasePath.getScheme() : pScheme,
-				pHost == null ? pBasePath.getHost() : pHost, pPort == null ? pBasePath.getPort()
-						: pPort, pNameSpace == null ? pBasePath.getNamespace() : pNameSpace,
-				pObjName == null ? pBasePath.getObjectName() : pObjName, pKeys // local
-		// objectpath shouldn't contain keys
+	public static CIMObjectPath build(
+		CIMObjectPath pBasePath,
+		String pScheme,
+		String pHost,
+		String pPort,
+		String pNameSpace,
+		String pObjName,
+		CIMProperty[] pKeys
+	) {
+		if (pBasePath == null) return new CIMObjectPath(pScheme, pHost, pPort, pNameSpace, pObjName, pKeys);
+		return new CIMObjectPath(
+			pScheme == null ? pBasePath.getScheme() : pScheme,
+			pHost == null ? pBasePath.getHost() : pHost,
+			pPort == null ? pBasePath.getPort() : pPort,
+			pNameSpace == null ? pBasePath.getNamespace() : pNameSpace,
+			pObjName == null ? pBasePath.getObjectName() : pObjName,
+			pKeys // local
+			// objectpath shouldn't contain keys
 		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/TypedValue.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/TypedValue.java
index 6a98cef..aaadb82 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/TypedValue.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/TypedValue.java
@@ -43,17 +43,16 @@
 
 /**
  * Class TypedValue is required for the CIM-XML DOM parser.
- * 
+ *
  */
 public class TypedValue {
-
 	private CIMDataType iType;
 
 	private Object iValue;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pType
 	 * @param pValue
 	 */
@@ -64,7 +63,7 @@ public TypedValue(CIMDataType pType, Object pValue) {
 
 	/**
 	 * getType
-	 * 
+	 *
 	 * @return CIMDataType
 	 */
 	public CIMDataType getType() {
@@ -73,11 +72,10 @@ public CIMDataType getType() {
 
 	/**
 	 * getValue
-	 * 
+	 *
 	 * @return Object
 	 */
 	public Object getValue() {
 		return this.iValue;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java
index e3bc52a..417d268 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java
@@ -54,13 +54,19 @@
 import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
-
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMDateTime;
 import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
 import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.UnsignedInteger16;
+import org.metricshub.wbem.javax.cim.UnsignedInteger32;
+import org.metricshub.wbem.javax.cim.UnsignedInteger64;
+import org.metricshub.wbem.javax.cim.UnsignedInteger8;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.ClassNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.InstanceNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
@@ -69,14 +75,6 @@
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
 import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.metricshub.wbem.javax.cim.CIMDateTime;
-import org.metricshub.wbem.javax.cim.UnsignedInteger16;
-import org.metricshub.wbem.javax.cim.UnsignedInteger32;
-import org.metricshub.wbem.javax.cim.UnsignedInteger64;
-import org.metricshub.wbem.javax.cim.UnsignedInteger8;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
 import org.xml.sax.SAXException;
 
 /**
@@ -87,30 +85,30 @@ public class CIMObjectFactory {
 
 	/**
 	 * getEmbbeddedObjectA
-	 * 
+	 *
 	 * @param pType
 	 * @param pValueArrayNode
 	 * @param pSession
 	 * @return CIMInstance[], CIMClass[], String[] or null
 	 * @throws SAXException
 	 */
-	public static Object[] getEmbeddedObjA(CIMDataType pType, ValueArrayNode pValueArrayNode,
-			SAXSession pSession) throws SAXException {
+	public static Object[] getEmbeddedObjA(CIMDataType pType, ValueArrayNode pValueArrayNode, SAXSession pSession)
+		throws SAXException {
 		if (pValueArrayNode == null) return null;
 		return getEmbeddedObjA(pType, (String[]) pValueArrayNode.getValue(), pSession);
 	}
 
 	/**
 	 * getEmbeddedObjectA
-	 * 
+	 *
 	 * @param pType
 	 * @param pValueStrA
 	 * @param pSession
 	 * @return CIMInstance[], CIMClass[], String[] or null
 	 * @throws SAXException
 	 */
-	public static Object[] getEmbeddedObjA(CIMDataType pType, String[] pValueStrA,
-			SAXSession pSession) throws SAXException {
+	public static Object[] getEmbeddedObjA(CIMDataType pType, String[] pValueStrA, SAXSession pSession)
+		throws SAXException {
 		embeddedObjTypeCheck(pType);
 		if (pValueStrA == null || pValueStrA.length == 0) return null;
 		CIMDataType type = null;
@@ -122,35 +120,36 @@ public static Object[] getEmbeddedObjA(CIMDataType pType, String[] pValueStrA,
 			} else {
 				CIMDataType type2 = getCIMObjScalarType(obj, false);
 				if (type2 != null && type != type2) throw new SAXException(
-						"Embedded Object array contains both Instance and Class objects. "
-								+ "This is not handled!");
+					"Embedded Object array contains both Instance and Class objects. " + "This is not handled!"
+				);
 			}
 			objAL.add(obj);
 		}
 		if (type == CIMDataType.OBJECT_T) {
 			return objAL.toArray(EMPTY_INST_A);
-		} else if (type == CIMDataType.CLASS_T) { return objAL.toArray(EMPTY_CLASS_A); }
+		} else if (type == CIMDataType.CLASS_T) {
+			return objAL.toArray(EMPTY_CLASS_A);
+		}
 		return objAL.toArray(EMPTY_STR_A);
 	}
 
 	/**
 	 * getEmbeddedObject
-	 * 
+	 *
 	 * @param pType
 	 * @param pValueStr
 	 * @param pSession
 	 * @return CIMInstance, CIMClass or null
 	 * @throws SAXException
 	 */
-	public static Object getEmbeddedObj(CIMDataType pType, String pValueStr, SAXSession pSession)
-			throws SAXException {
+	public static Object getEmbeddedObj(CIMDataType pType, String pValueStr, SAXSession pSession) throws SAXException {
 		embeddedObjTypeCheck(pType);
 		return parseEmbeddedObj(pValueStr, pSession);
 	}
 
 	/**
 	 * getEmbeddedObj
-	 * 
+	 *
 	 * @param pType
 	 * @param pValObj
 	 * @param pSession
@@ -158,9 +157,10 @@ public static Object getEmbeddedObj(CIMDataType pType, String pValueStr, SAXSess
 	 *         String[] or null
 	 * @throws SAXException
 	 */
-	public static Object getEmbeddedObj(CIMDataType pType, Object pValObj, SAXSession pSession)
-			throws SAXException {
-		if (pValObj instanceof String) { return getEmbeddedObj(pType, (String) pValObj, pSession); }
+	public static Object getEmbeddedObj(CIMDataType pType, Object pValObj, SAXSession pSession) throws SAXException {
+		if (pValObj instanceof String) {
+			return getEmbeddedObj(pType, (String) pValObj, pSession);
+		}
 		return getEmbeddedObjA(pType, (String[]) pValObj, pSession);
 	}
 
@@ -178,7 +178,7 @@ public static Object[] getObjectArray(CIMDataType pType, ArrayList pAL)
 
 	/**
 	 * getObject
-	 * 
+	 *
 	 * @param pType
 	 * @param pValueStr
 	 * @return Object
@@ -197,7 +197,7 @@ public static Object getObject(CIMDataType pType, String pValueStr) throws SAXEx
 
 	/**
 	 * getObject
-	 * 
+	 *
 	 * @param pType
 	 * @param pValueNode
 	 * @return Object
@@ -210,43 +210,42 @@ public static Object getObject(CIMDataType pType, ValueNode pValueNode) throws S
 
 	/**
 	 * getObject
-	 * 
+	 *
 	 * @param pType
 	 * @param pValueArrayNode
 	 * @return Object
 	 * @throws SAXException
 	 */
-	public static Object getObject(CIMDataType pType, ValueArrayNode pValueArrayNode)
-			throws SAXException {
+	public static Object getObject(CIMDataType pType, ValueArrayNode pValueArrayNode) throws SAXException {
 		if (pValueArrayNode == null) return null;
 		ArrayList objAL = new ArrayList(pValueArrayNode.size());
-		for (int i = 0; i < pValueArrayNode.size(); i++)
-			objAL.add(getObject(pType, (String) pValueArrayNode.elementAt(i)));
+		for (int i = 0; i < pValueArrayNode.size(); i++) objAL.add(getObject(pType, (String) pValueArrayNode.elementAt(i)));
 		return getObjectArray(pType, objAL);
 	}
 
 	/**
 	 * getCIMObjType
-	 * 
+	 *
 	 * @param pObj
 	 * @param pNullToString
 	 * @return CIMDataType OBJECT_T, CLASS_T, STRING_T
 	 * @throws SAXException
 	 */
-	public static CIMDataType getCIMObjScalarType(Object pObj, boolean pNullToString)
-			throws SAXException {
+	public static CIMDataType getCIMObjScalarType(Object pObj, boolean pNullToString) throws SAXException {
 		if (pObj == null) return pNullToString ? CIMDataType.STRING_T : null;
 		if (pObj instanceof CIMInstance) {
 			return CIMDataType.OBJECT_T;
 		} else if (pObj instanceof CIMClass) {
 			return CIMDataType.CLASS_T;
-		} else if (pObj instanceof String) { return CIMDataType.STRING_T; }
+		} else if (pObj instanceof String) {
+			return CIMDataType.STRING_T;
+		}
 		throw new SAXException(pObj.getClass().getName() + " is not a CIMObject!");
 	}
 
 	/**
 	 * getCIMObjType
-	 * 
+	 *
 	 * @param pObj
 	 * @return CIMDataType OBJECT_T, OBJECT_ARRAY_T
 	 * @throws SAXException
@@ -257,7 +256,7 @@ public static CIMDataType getCIMObjScalarType(Object pObj) throws SAXException {
 
 	/**
 	 * getCIMObjArrayType
-	 * 
+	 *
 	 * @param pObj
 	 * @return CIMDataType: OBJECT_ARRAY_T, CLASS_T array, STRING_ARRAY_T
 	 * @throws SAXException
@@ -268,27 +267,28 @@ public static CIMDataType getCIMObjArrayType(Object pObj) throws SAXException {
 
 	/**
 	 * getArrayCIMObjType
-	 * 
+	 *
 	 * @param pObj
 	 * @param pNullToString
 	 * @return CIMDataType: OBJECT_ARRAY_T, CLASS_T array, STRING_ARRAY_T or
 	 *         null
 	 * @throws SAXException
 	 */
-	public static CIMDataType getCIMObjArrayType(Object pObj, boolean pNullToString)
-			throws SAXException {
+	public static CIMDataType getCIMObjArrayType(Object pObj, boolean pNullToString) throws SAXException {
 		if (pObj == null) return pNullToString ? CIMDataType.STRING_ARRAY_T : null;
 		if (pObj instanceof CIMInstance[]) {
 			return CIMDataType.OBJECT_ARRAY_T;
 		} else if (pObj instanceof CIMClass[]) {
 			return CIMDataType.CLASS_ARRAY_T;
-		} else if (pObj instanceof String[]) { return CIMDataType.STRING_ARRAY_T; }
+		} else if (pObj instanceof String[]) {
+			return CIMDataType.STRING_ARRAY_T;
+		}
 		throw new SAXException(pObj.getClass().getName() + " is not a CIMObject array!");
 	}
 
 	/**
 	 * getType
-	 * 
+	 *
 	 * @param pTypeStr
 	 * @return CIMDataType
 	 * @throws SAXException
@@ -297,8 +297,7 @@ public static CIMDataType getType(String pTypeStr) throws SAXException {
 		if (pTypeStr == null) return null;
 		createTypeStrMap();
 		CIMDataType type = cTypeStrMap.get(pTypeStr);
-		if (type == null && !cTypeStrMap.containsKey(pTypeStr)) throw new SAXException(pTypeStr
-				+ " is invalid PARAMTYPE!");
+		if (type == null && !cTypeStrMap.containsKey(pTypeStr)) throw new SAXException(pTypeStr + " is invalid PARAMTYPE!");
 		return type;
 	}
 
@@ -338,11 +337,11 @@ public static CIMDataType getType(String pTypeStr) throws SAXException {
 
 	private static void embeddedObjTypeCheck(CIMDataType pType) throws SAXException {
 		if (pType.getType() != CIMDataType.STRING) throw new SAXException(
-				"TYPE attribute should be 'string' for EmbeddedObjects!");
+			"TYPE attribute should be 'string' for EmbeddedObjects!"
+		);
 	}
 
-	private static Object parseEmbeddedObj(String pValueStr, SAXSession pSession)
-			throws SAXException {
+	private static Object parseEmbeddedObj(String pValueStr, SAXSession pSession) throws SAXException {
 		if (pValueStr == null || pValueStr.length() == 0) return null;
 		XMLDefaultHandlerImpl ourHandler = new XMLDefaultHandlerImpl(pSession, true);
 		// XML String of embedded Object is parsed by the SAX parser
@@ -356,15 +355,18 @@ private static Object parseEmbeddedObj(String pValueStr, SAXSession pSession)
 			throw new SAXException("Exception occurred during embedded object parsing!", e);
 		}
 		Node node = ourHandler.getRootNode();
-		if (node instanceof InstanceNode) { return ((InstanceNode) node).getCIMInstance(); }
-		if (node instanceof ClassNode) { return ((ClassNode) node).getCIMClass(); }
-		throw new SAXException(node.getNodeName()
-				+ " root element is unexpected for Embedded Object XML String!");
+		if (node instanceof InstanceNode) {
+			return ((InstanceNode) node).getCIMInstance();
+		}
+		if (node instanceof ClassNode) {
+			return ((ClassNode) node).getCIMClass();
+		}
+		throw new SAXException(node.getNodeName() + " root element is unexpected for Embedded Object XML String!");
 	}
 
 	private static HashMap cTypeStrMap;
 
-	private synchronized static void createTypeStrMap() {
+	private static synchronized void createTypeStrMap() {
 		if (cTypeStrMap != null) return;
 		cTypeStrMap = new HashMap();
 		cTypeStrMap.put(MOF.DT_UINT8, CIMDataType.UINT8_T);
@@ -385,10 +387,9 @@ private synchronized static void createTypeStrMap() {
 	}
 
 	private interface ValueFactory {
-
 		/**
 		 * make
-		 * 
+		 *
 		 * @param pStr
 		 * @return Object
 		 */
@@ -396,7 +397,7 @@ private interface ValueFactory {
 
 		/**
 		 * make
-		 * 
+		 *
 		 * @param pAL
 		 * @return Object[]
 		 */
@@ -409,182 +410,229 @@ private static void putFactory(int pTypeCode, ValueFactory pFactory) {
 		cValFactoryA[pTypeCode] = pFactory;
 	}
 
-	private synchronized static void createValFactoryA() {
+	private static synchronized void createValFactoryA() {
 		if (cValFactoryA != null) return;
 		cValFactoryA = new ValueFactory[64];
 		// unsigned integers
-		putFactory(CIMDataType.UINT8, new ValueFactory() {
+		putFactory(
+			CIMDataType.UINT8,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return new UnsignedInteger8(pStr);
-			}
+				public Object make(String pStr) {
+					return new UnsignedInteger8(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_UINT8_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_UINT8_A);
+				}
 			}
-		});
-		putFactory(CIMDataType.UINT16, new ValueFactory() {
+		);
+		putFactory(
+			CIMDataType.UINT16,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return new UnsignedInteger16(pStr);
-			}
+				public Object make(String pStr) {
+					return new UnsignedInteger16(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_UINT16_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_UINT16_A);
+				}
 			}
-		});
-		putFactory(CIMDataType.UINT32, new ValueFactory() {
+		);
+		putFactory(
+			CIMDataType.UINT32,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return new UnsignedInteger32(pStr);
-			}
+				public Object make(String pStr) {
+					return new UnsignedInteger32(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_UINT32_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_UINT32_A);
+				}
 			}
-		});
-		putFactory(CIMDataType.UINT64, new ValueFactory() {
+		);
+		putFactory(
+			CIMDataType.UINT64,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return new UnsignedInteger64(pStr);
-			}
+				public Object make(String pStr) {
+					return new UnsignedInteger64(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_UINT64_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_UINT64_A);
+				}
 			}
-		});
+		);
 		// signed integers
-		putFactory(CIMDataType.SINT8, new ValueFactory() {
+		putFactory(
+			CIMDataType.SINT8,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return new Byte(pStr);
-			}
+				public Object make(String pStr) {
+					return new Byte(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_BYTE_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_BYTE_A);
+				}
 			}
-		});
-		putFactory(CIMDataType.SINT16, new ValueFactory() {
+		);
+		putFactory(
+			CIMDataType.SINT16,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return new Short(pStr);
-			}
+				public Object make(String pStr) {
+					return new Short(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_SHORT_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_SHORT_A);
+				}
 			}
-		});
-		putFactory(CIMDataType.SINT32, new ValueFactory() {
+		);
+		putFactory(
+			CIMDataType.SINT32,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return new Integer(pStr);
-			}
+				public Object make(String pStr) {
+					return new Integer(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_INT_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_INT_A);
+				}
 			}
-		});
-		putFactory(CIMDataType.SINT64, new ValueFactory() {
+		);
+		putFactory(
+			CIMDataType.SINT64,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return new Long(pStr);
-			}
+				public Object make(String pStr) {
+					return new Long(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_LONG_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_LONG_A);
+				}
 			}
-		});
+		);
 		// floats
-		putFactory(CIMDataType.REAL32, new ValueFactory() {
-
-			public Object make(String pStr) {
-				return new Float(pStr);
-			}
+		putFactory(
+			CIMDataType.REAL32,
+			new ValueFactory() {
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_FLOAT_A);
-			}
-		});
-		putFactory(CIMDataType.REAL64, new ValueFactory() {
+				public Object make(String pStr) {
+					return new Float(pStr);
+				}
 
-			public Object make(String pStr) {
-				if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
-					if (Util.isBadDoubleString(pStr)) throw new IllegalArgumentException(
-							"Double value string hangs older JVMs!\n" + pStr);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_FLOAT_A);
 				}
-				return new Double(pStr);
 			}
+		);
+		putFactory(
+			CIMDataType.REAL64,
+			new ValueFactory() {
+
+				public Object make(String pStr) {
+					if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
+						if (Util.isBadDoubleString(pStr)) throw new IllegalArgumentException(
+							"Double value string hangs older JVMs!\n" + pStr
+						);
+					}
+					return new Double(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_DOUBLE_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_DOUBLE_A);
+				}
 			}
-		});
+		);
 		// char
-		putFactory(CIMDataType.CHAR16, new ValueFactory() {
-
-			public Object make(String pStr) {
-				if (pStr == null || pStr.length() == 0) throw new IllegalArgumentException(
-						"Cannot make Character from empty String!");
-				return Character.valueOf(pStr.charAt(0));
-			}
+		putFactory(
+			CIMDataType.CHAR16,
+			new ValueFactory() {
+
+				public Object make(String pStr) {
+					if (pStr == null || pStr.length() == 0) throw new IllegalArgumentException(
+						"Cannot make Character from empty String!"
+					);
+					return Character.valueOf(pStr.charAt(0));
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_CHAR_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_CHAR_A);
+				}
 			}
-		});
+		);
 		// string
-		putFactory(CIMDataType.STRING, new ValueFactory() {
+		putFactory(
+			CIMDataType.STRING,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return pStr;
-			}
+				public Object make(String pStr) {
+					return pStr;
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_STR_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_STR_A);
+				}
 			}
-		});
+		);
 		// boolean
-		putFactory(CIMDataType.BOOLEAN, new ValueFactory() {
+		putFactory(
+			CIMDataType.BOOLEAN,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return Boolean.valueOf(pStr);
-			}
+				public Object make(String pStr) {
+					return Boolean.valueOf(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_BOOL_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_BOOL_A);
+				}
 			}
-		});
+		);
 		// datetime
-		putFactory(CIMDataType.DATETIME, new ValueFactory() {
+		putFactory(
+			CIMDataType.DATETIME,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				try {
-					return new CIMDateTimeAbsolute(pStr);
-				} catch (IllegalArgumentException eA) {
+				public Object make(String pStr) {
 					try {
-						return new CIMDateTimeInterval(pStr);
-					} catch (IllegalArgumentException eI) {
-						throw new IllegalArgumentException("CIMDataTimeAbsolute:" + eA.getMessage()
-								+ "\nCIMDateTimeInterval:" + eI.getMessage());
+						return new CIMDateTimeAbsolute(pStr);
+					} catch (IllegalArgumentException eA) {
+						try {
+							return new CIMDateTimeInterval(pStr);
+						} catch (IllegalArgumentException eI) {
+							throw new IllegalArgumentException(
+								"CIMDataTimeAbsolute:" + eA.getMessage() + "\nCIMDateTimeInterval:" + eI.getMessage()
+							);
+						}
 					}
 				}
-			}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_DT_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_DT_A);
+				}
 			}
-		});
+		);
 		// reference
-		putFactory(CIMDataType.REFERENCE, new ValueFactory() {
+		putFactory(
+			CIMDataType.REFERENCE,
+			new ValueFactory() {
 
-			public Object make(String pStr) {
-				return new CIMObjectPath(pStr);
-			}
+				public Object make(String pStr) {
+					return new CIMObjectPath(pStr);
+				}
 
-			public Object[] make(ArrayList pAL) {
-				return pAL.toArray(EMPTY_OP_A);
+				public Object[] make(ArrayList pAL) {
+					return pAL.toArray(EMPTY_OP_A);
+				}
 			}
-		});
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java
index b24608b..e5dda83 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java
@@ -67,7 +67,6 @@
  */
 
 public class EmbObjHandler {
-
 	private String iNodeName;
 
 	private CIMDataType iRawType;
@@ -86,7 +85,7 @@ public class EmbObjHandler {
 
 	/**
 	 * Generic initialization.
-	 * 
+	 *
 	 * @param pHandler
 	 * @param pNodeName
 	 * @param pAttribs
@@ -96,21 +95,27 @@ public class EmbObjHandler {
 	 * @return EmbObjHandler
 	 * @throws SAXException
 	 */
-	public static EmbObjHandler init(EmbObjHandler pHandler, String pNodeName, Attributes pAttribs,
-			SAXSession pSession, QualifiedNodeHandler pQNodeHandler, boolean pCheckEmbObjAttrib)
-			throws SAXException {
+	public static EmbObjHandler init(
+		EmbObjHandler pHandler,
+		String pNodeName,
+		Attributes pAttribs,
+		SAXSession pSession,
+		QualifiedNodeHandler pQNodeHandler,
+		boolean pCheckEmbObjAttrib
+	)
+		throws SAXException {
 		if (pHandler == null) pHandler = new EmbObjHandler();
 		pHandler.initInst(pNodeName, pAttribs, pSession, pQNodeHandler, pCheckEmbObjAttrib);
 		return pHandler;
 	}
 
 	private EmbObjHandler() {
-	// init() used for instantiation
+		// init() used for instantiation
 	}
 
 	/**
 	 * Generic instance initialization.
-	 * 
+	 *
 	 * @param pNodeName
 	 * @param pAttribs
 	 * @param pSession
@@ -118,8 +123,14 @@ private EmbObjHandler() {
 	 * @param pCheckEmbObjAttrib
 	 * @throws SAXException
 	 */
-	public void initInst(String pNodeName, Attributes pAttribs, SAXSession pSession,
-			QualifiedNodeHandler pQNodeHandler, boolean pCheckEmbObjAttrib) throws SAXException {
+	public void initInst(
+		String pNodeName,
+		Attributes pAttribs,
+		SAXSession pSession,
+		QualifiedNodeHandler pQNodeHandler,
+		boolean pCheckEmbObjAttrib
+	)
+		throws SAXException {
 		this.iSession = pSession;
 		this.iNodeName = pNodeName;
 		this.iQualiHandler = pQNodeHandler;
@@ -156,8 +167,8 @@ public void initInst(String pNodeName, Attributes pAttribs, SAXSession pSession,
 				this.iHasEmbObjAttr = true;
 			} else {
 				throw new SAXException(
-						"EmbeddedObject attribute's value must be \"object\" or \"instance\". "
-								+ embObjStr + " is invalid!");
+					"EmbeddedObject attribute's value must be \"object\" or \"instance\". " + embObjStr + " is invalid!"
+				);
 			}
 		} else {
 			this.iHasEmbInstAttr = this.iHasEmbObjAttr = false;
@@ -167,39 +178,38 @@ public void initInst(String pNodeName, Attributes pAttribs, SAXSession pSession,
 	/**
 	 * isEmbeddedObject For this function Object means CLASS or INSTANCE. Object
 	 * can have other meanings at different places !!! :(
-	 * 
+	 *
 	 * @return boolean
 	 */
 	private boolean isEmbeddedObject() {
-		return this.iHasEmbInstAttr
-				|| this.iHasEmbObjAttr
-				|| (this.iQualiHandler != null && (this.iQualiHandler.isEmbeddedObject() || this.iQualiHandler
-						.isEmbeddedInstance()));
+		return (
+			this.iHasEmbInstAttr ||
+			this.iHasEmbObjAttr ||
+			(this.iQualiHandler != null && (this.iQualiHandler.isEmbeddedObject() || this.iQualiHandler.isEmbeddedInstance()))
+		);
 	}
 
 	/**
 	 * isEmbeddedClass
-	 * 
+	 *
 	 * @return boolean
 	 */
 	private boolean isEmbeddedClass() {
-		return this.iHasEmbObjAttr
-				|| (this.iQualiHandler != null && this.iQualiHandler.isEmbeddedObject());
+		return this.iHasEmbObjAttr || (this.iQualiHandler != null && this.iQualiHandler.isEmbeddedObject());
 	}
 
 	/**
 	 * isEmbeddedInstance
-	 * 
+	 *
 	 * @return boolean
 	 */
 	private boolean isEmbeddedInstance() {
-		return this.iHasEmbInstAttr
-				|| (this.iQualiHandler != null && this.iQualiHandler.isEmbeddedInstance());
+		return this.iHasEmbInstAttr || (this.iQualiHandler != null && this.iQualiHandler.isEmbeddedInstance());
 	}
 
 	/**
 	 * getValue
-	 * 
+	 *
 	 * @return Object
 	 * @throws SAXException
 	 */
@@ -210,7 +220,7 @@ public Object getValue() throws SAXException {
 
 	/**
 	 * getType
-	 * 
+	 *
 	 * @return Object
 	 * @throws SAXException
 	 */
@@ -221,7 +231,7 @@ public CIMDataType getType() throws SAXException {
 
 	/**
 	 * getRawType
-	 * 
+	 *
 	 * @return the type which is retrieved from the XML attributes
 	 */
 	public CIMDataType getRawType() {
@@ -230,27 +240,30 @@ public CIMDataType getRawType() {
 
 	/**
 	 * getArrayType useful e.g. for PROPERTY.ARRAY
-	 * 
+	 *
 	 * @return CIMDataType
 	 * @throws SAXException
 	 */
 	public CIMDataType getArrayType() throws SAXException {
 		transform();
-		return this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
-				.getType());
+		return this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType.getType());
 	}
 
 	/**
 	 * addValueNode
-	 * 
+	 *
 	 * @param pValueNode
 	 *            - can be ValueNode ore ValueArrayNode for Embedded Objects
 	 */
 	public void addValueNode(AbstractValueNode pValueNode) {
-		if (isEmbeddedObject()
-				&& !(pValueNode == null || pValueNode instanceof ValueNode || pValueNode instanceof ValueArrayNode)) throw new IllegalArgumentException(
-				"pValueNode's type can be ValueNode or ValueArrayNode or it can be null. "
-						+ pValueNode.getClass().getName() + " is an invalid type!");
+		if (
+			isEmbeddedObject() &&
+			!(pValueNode == null || pValueNode instanceof ValueNode || pValueNode instanceof ValueArrayNode)
+		) throw new IllegalArgumentException(
+			"pValueNode's type can be ValueNode or ValueArrayNode or it can be null. " +
+			pValueNode.getClass().getName() +
+			" is an invalid type!"
+		);
 		this.iAbsValNode = pValueNode;
 	}
 
@@ -259,8 +272,8 @@ private void transform() throws SAXException {
 		if (this.iAbsValNode == null) {
 			if (isEmbeddedObject()) {
 				if (this.iRawType != CIMDataType.STRING_T) throw new SAXException(
-						"Embedded Object CIM-XML element's type must be string. " + this.iRawType
-								+ " is invalid!");
+					"Embedded Object CIM-XML element's type must be string. " + this.iRawType + " is invalid!"
+				);
 				if (this.iSession.strictEmbObjParsing()) {
 					/*
 					 * Here the assumption is that Object = CLASS, Instance =
@@ -296,17 +309,17 @@ private void transformEmbObj() throws SAXException {
 			this.iValue = CIMObjectFactory.getEmbeddedObj(this.iRawType, valueStr, this.iSession);
 			this.iType = CIMObjectFactory.getCIMObjScalarType(this.iValue);
 		} else { // ValueArrayNode
-			this.iValue = CIMObjectFactory.getEmbeddedObjA(this.iRawType,
-					(ValueArrayNode) this.iAbsValNode, this.iSession);
+			this.iValue = CIMObjectFactory.getEmbeddedObjA(this.iRawType, (ValueArrayNode) this.iAbsValNode, this.iSession);
 			this.iType = CIMObjectFactory.getCIMObjArrayType(this.iValue);
 		}
 		if (isEmbeddedInstance() && this.iType.getType() != CIMDataType.OBJECT) throw new SAXException(
-				this.iNodeName + " element is an EmbeddedInstance with non INSTANCE value. "
-						+ "It's not valid!");
-		if (isEmbeddedClass() && this.iType.getType() != CIMDataType.CLASS
-				&& this.iType.getType() != CIMDataType.OBJECT) throw new SAXException(
-				this.iNodeName
-						+ " element is an EmbeddedObject with non CLASS/INSTANCE value. It's not valid!");
+			this.iNodeName + " element is an EmbeddedInstance with non INSTANCE value. " + "It's not valid!"
+		);
+		if (
+			isEmbeddedClass() && this.iType.getType() != CIMDataType.CLASS && this.iType.getType() != CIMDataType.OBJECT
+		) throw new SAXException(
+			this.iNodeName + " element is an EmbeddedObject with non CLASS/INSTANCE value. It's not valid!"
+		);
 	}
 
 	private void transformNormObj() throws SAXException {
@@ -315,8 +328,7 @@ private void transformNormObj() throws SAXException {
 			this.iValue = CIMObjectFactory.getObject(this.iType, (ValueNode) this.iAbsValNode);
 		} else if (this.iAbsValNode instanceof ValueArrayNode) {
 			this.iType = CIMHelper.UnboundedArrayDataType(this.iRawType.getType());
-			this.iValue = CIMObjectFactory.getObject(this.iRawType,
-					(ValueArrayNode) this.iAbsValNode);
+			this.iValue = CIMObjectFactory.getObject(this.iRawType, (ValueArrayNode) this.iAbsValNode);
 		} else {
 			this.iValue = this.iAbsValNode.getValue();
 			if (this.iAbsValNode instanceof ArrayIf) {
@@ -335,14 +347,13 @@ private void transformNormObj() throws SAXException {
 	 * Required to handle the output XML of some non-standard CIMOMs like SVC
 	 * which adds the TYPE attribute to the sub VALUE or VALUE.ARRAY XML
 	 * element.
-	 * 
+	 *
 	 * @throws SAXException
 	 */
 	private void setType() throws SAXException {
 		if (this.iType != null || this.iRawType != null) return;
 		this.iRawType = this.iAbsValNode.getType();
-		if (this.iRawType == null) this.iRawType = (this.iAbsValNode instanceof ArrayIf ? CIMDataType.STRING_ARRAY_T
-				: CIMDataType.STRING_T);
+		if (this.iRawType == null) this.iRawType =
+			(this.iAbsValNode instanceof ArrayIf ? CIMDataType.STRING_ARRAY_T : CIMDataType.STRING_T);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java
index 21ac4eb..4f82cc2 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeConstIf.java
@@ -49,21 +49,20 @@
 
 /**
  * Class NodeConstIf
- * 
+ *
  */
 public interface NodeConstIf {
-
 	/**
 	 * The CIM element is the root element of every XML Document that is valid
 	 * with respect to this schema. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT CIM (MESSAGE|DECLARATION)>
 	 * <!ATTLIST CIM
 	 * 		CIMVERSION CDATA #REQUIRED
 	 * 		DTDVERSION CDATA #REQUIRED>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String CIM = "CIM";
@@ -71,12 +70,12 @@ public interface NodeConstIf {
 	/**
 	 * The DECLARATION element defines a set of one or more declarations of CIM
 	 * objects. 
      
-	 * 
-	 * 
-	 * 
+	 *
+	 *
+	 *
 	 * <!ELEMENT DECLARATION (DECLGROUP|DECLGROUP.WITHNAME|DECLGROUP.WITHPATH)+>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String DECLARATION = "DECLARATION";
@@ -84,11 +83,11 @@ public interface NodeConstIf {
 	/**
 	 * The DECLGROUP element defines a logical set of CIM Class, Instance and
 	 * Qualifier declarations. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT DECLGROUP ((LOCALNAMESPACEPATH|NAMESPACEPATH)?,QUALIFIER.DECLARATION*,VALUE.OBJECT*)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String DECLGROUP = "DECLGROUP";
@@ -96,11 +95,11 @@ public interface NodeConstIf {
 	/**
 	 * The DECLGROUP.WITHNAME element defines a logical set of CIM Class,
 	 * Instance and Qualifier declarations. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT DECLGROUP.WITHNAME ((LOCALNAMESPACEPATH|NAMESPACEPATH)?,QUALIFIER.DECLARATION*,VALUE.NAMEDOBJECT*)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String DECLGROUP_WITHNAME = "DECLGROUP.WITHNAME";
@@ -108,11 +107,11 @@ public interface NodeConstIf {
 	/**
 	 * The DECLGROUP.WITHPATH element defines a logical set of CIM Class and
 	 * Instance declarations. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT DECLGROUP.WITHPATH (VALUE.OBJECTWITHPATH|VALUE.OBJECTWITHLOCALPATH)*>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String DECLGROUP_WITHPATH = "DECLGROUP.WITHPATH";
@@ -120,8 +119,8 @@ public interface NodeConstIf {
 	/**
 	 * The QUALIFIER.DECLARATION element defines a single CIM Qualifier
 	 * declaration. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT QUALIFIER.DECLARATION (SCOPE?,(VALUE|VALUE.ARRAY)?)>
 	 * <!ATTLIST QUALIFIER.DECLARATION
 	 * 		%CIMName;
@@ -129,8 +128,8 @@ public interface NodeConstIf {
 	 * 		ISARRAY (true|false)    #IMPLIED
 	 * 		%ArraySize;
 	 * 		%QualifierFlavor;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String QUALIFIER_DECLARATION = "QUALIFIER.DECLARATION";
@@ -139,8 +138,8 @@ public interface NodeConstIf {
 	 * The SCOPE element defines the scope of a QUALIFIER.DECLARATION in the
 	 * case that there are restrictions on the scope of the Qualifier
 	 * declaration. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT SCOPE EMPTY>
 	 * <!ATTLIST SCOPE
 	 * 		CLASS       (true|false) "false"
@@ -150,8 +149,8 @@ public interface NodeConstIf {
 	 * 		METHOD      (true|false) "false"
 	 * 		PARAMETER   (true|false) "false"
 	 * 		INDICATION  (true|false) "false">
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String SCOPE = "SCOPE";
@@ -160,11 +159,11 @@ public interface NodeConstIf {
 	 * The VALUE element is used to define a single (non-array) non-reference
 	 * non-NULL CIM Property value, CIM Qualifier value, CIM Method return
 	 * value, or CIM Method Parameter value. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT VALUE (#PCDATA)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE = "VALUE";
@@ -172,12 +171,12 @@ public interface NodeConstIf {
 	/**
 	 * The VALUE.ARRAY element is used to represent the value of a CIM Property
 	 * or Qualifier that has an array type. 
      
-	 * 
-	 * 
-	 * 
+	 *
+	 *
+	 *
 	 * <!ELEMENT VALUE.ARRAY (VALUE|VALUE.NULL)*>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE_ARRAY = "VALUE.ARRAY";
@@ -185,11 +184,11 @@ public interface NodeConstIf {
 	/**
 	 * The VALUE.REFERENCE element is used to define a single CIM reference
 	 * Property value. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT VALUE.REFERENCE (CLASSPATH|LOCALCLASSPATH|CLASSNAME|INSTANCEPATH|LOCALINSTANCEPATH|INSTANCENAME)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE_REFERENCE = "VALUE.REFERENCE";
@@ -197,11 +196,11 @@ public interface NodeConstIf {
 	/**
 	 * The VALUE.REFARRAY element is used to represent the value of an array of
 	 * CIM references. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT VALUE.REFARRAY (VALUE.REFERENCE|VALUE.NULL)*>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE_REFARRAY = "VALUE.REFARRAY";
@@ -209,11 +208,11 @@ public interface NodeConstIf {
 	/**
 	 * The VALUE.OBJECT element is used to define a value which is comprised of
 	 * a single CIM Class or Instance definition. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT VALUE.OBJECT (CLASS|INSTANCE)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE_OBJECT = "VALUE.OBJECT";
@@ -221,12 +220,12 @@ public interface NodeConstIf {
 	/**
 	 * The VALUE.NAMEDINSTANCE element is used to define a value which is
 	 * comprised of a single named CIM Instance definition. 
      
-	 * 
-	 * 
-	 * 
+	 *
+	 *
+	 *
 	 * <!ELEMENT VALUE.NAMEDINSTANCE (INSTANCENAME,INSTANCE)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE_NAMEDINSTANCE = "VALUE.NAMEDINSTANCE";
@@ -234,11 +233,11 @@ public interface NodeConstIf {
 	/**
 	 * The VALUE.NAMEDOBJECT element is used to define a value which is
 	 * comprised of a single named CIM Class or Instance definition. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT VALUE.NAMEDOBJECT (CLASS|(INSTANCENAME,INSTANCE))>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE_NAMEDOBJECT = "VALUE.NAMEDOBJECT";
@@ -247,11 +246,11 @@ public interface NodeConstIf {
 	 * The VALUE.OBJECTWITHLOCALPATH element is used to define a value which is
 	 * comprised of a single CIM Object (Class or Instance) definition with
 	 * additional information that defines the local path to that Object. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT VALUE.OBJECTWITHLOCALPATH ((LOCALCLASSPATH,CLASS)|(LOCALINSTANCEPATH,INSTANCE))>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE_OBJECTWITHLOCALPATH = "VALUE.OBJECTWITHLOCALPATH";
@@ -260,22 +259,22 @@ public interface NodeConstIf {
 	 * The VALUE.OBJECTWITHPATH element is used to define a value which is
 	 * comprised of a single CIM Object (Class or Instance) definition with
 	 * additional information that defines the absolute path to that Object. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT VALUE.OBJECTWITHPATH ((CLASSPATH,CLASS)|(INSTANCEPATH,INSTANCE))>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE_OBJECTWITHPATH = "VALUE.OBJECTWITHPATH";
 
 	/**
 	 * The VALUE.NULL element is used to represent a NULL value. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT VALUE.NULL EMPTY>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE_NULL = "VALUE.NULL";
@@ -284,22 +283,22 @@ public interface NodeConstIf {
 	 * The VALUE.INSTANCEWITHPATH element is used to define value that comprises
 	 * a single CIM instance definition with additional information that defines
 	 * the absolute path to that object. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT VALUE.INSTANCEWITHPATH (INSTANCEPATH, INSTANCE)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String VALUE_INSTANCEWITHPATH = "VALUE.INSTANCEWITHPATH";
 
 	/**
 	 * The NAMESPACEPATH element is used to define a Namespace Path. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT NAMESPACEPATH (HOST,LOCALNAMESPACEPATH)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String NAMESPACEPATH = "NAMESPACEPATH";
@@ -307,22 +306,22 @@ public interface NodeConstIf {
 	/**
 	 * The LOCALNAMESPACEPATH element is used to define a local Namespace path
 	 * (one without a Host component). 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT LOCALNAMESPACEPATH (NAMESPACE+)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String LOCALNAMESPACEPATH = "LOCALNAMESPACEPATH";
 
 	/**
 	 * The HOST element is used to define a single Host. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT HOST (#PCDATA)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String HOST = "HOST";
@@ -330,72 +329,72 @@ public interface NodeConstIf {
 	/**
 	 * The NAMESPACE element is used to define a single Namespace component of a
 	 * Namespace path. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT NAMESPACE EMPTY>
 	 * <!ATTLIST NAMESPACE
 	 * 		%CIMName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String NAMESPACE = "NAMESPACE";
 
 	/**
 	 * The CLASSPATH element defines the absolute path to a CIM Class. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT CLASSPATH (NAMESPACEPATH,CLASSNAME)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String CLASSPATH = "CLASSPATH";
 
 	/**
 	 * The LOCALCLASSPATH element defines the a local path to a CIM Class. 
      
-	 * 
-	 * 
-	 * 
+	 *
+	 *
+	 *
 	 * <!ELEMENT LOCALCLASSPATH (LOCALNAMESPACEPATH, CLASSNAME)>
-	 * 
-	 * 
-	 * 
+	 *
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String LOCALCLASSPATH = "LOCALCLASSPATH";
 
 	/**
 	 * The CLASSNAME element defines the qualifying name of a CIM Class. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT CLASSNAME EMPTY>
 	 * <!ATTLIST CLASSNAME
 	 * 		%CIMName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String CLASSNAME = "CLASSNAME";
 
 	/**
 	 * The INSTANCEPATH element defines the absolute path to a CIM Instance. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT INSTANCEPATH (NAMESPACEPATH,INSTANCENAME)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String INSTANCEPATH = "INSTANCEPATH";
 
 	/**
 	 * The LOCALINSTANCEPATH element defines the local path to a CIM Instance. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT LOCALINSTANCEPATH (LOCALNAMESPACEPATH,INSTANCENAME)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String LOCALINSTANCEPATH = "LOCALINSTANCEPATH";
@@ -403,13 +402,13 @@ public interface NodeConstIf {
 	/**
 	 * The INSTANCENAME element defines the location of a CIM Instance within a
 	 * Namespace. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT INSTANCENAME (KEYBINDING*|KEYVALUE?|VALUE.REFERENCE?)>
 	 * <!ATTLIST INSTANCENAME
 	 * 		%ClassName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String INSTANCENAME = "INSTANCENAME";
@@ -417,24 +416,24 @@ public interface NodeConstIf {
 	/**
 	 * The OBJECTPATH element is used to define a full path to a single CIM
 	 * Object (Class or Instance). 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT OBJECTPATH (INSTANCEPATH|CLASSPATH)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String OBJECTPATH = "OBJECTPATH";
 
 	/**
 	 * The KEYBINDING element defines a single key property value binding. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT KEYBINDING (KEYVALUE|VALUE.REFERENCE)>
 	 * <!ATTLIST KEYBINDING
 	 * 		%CIMName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String KEYBINDING = "KEYBINDING";
@@ -442,50 +441,50 @@ public interface NodeConstIf {
 	/**
 	 * The KEYVALUE element defines a single property key value when the key
 	 * property is a non-reference type. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT KEYVALUE (#PCDATA)>
 	 * <!ATTLIST KEYVALUE
 	 * 		VALUETYPE (string|boolean|numeric) "string"
 	 * 		%CIMType; #IMPLIED>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String KEYVALUE = "KEYVALUE";
 
 	/**
 	 * The CLASS element defines a single CIM Class. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT CLASS (QUALIFIER*,(PROPERTY|PROPERTY.ARRAY|PROPERTY.REFERENCE)*,METHOD*)>
 	 * <!ATTLIST CLASS
 	 * 		%CIMName;
 	 * 		%SuperClass;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String CLASS = "CLASS";
 
 	/**
 	 * The INSTANCE element defines a single CIM Instance of a CIM Class. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT INSTANCE (QUALIFIER*,(PROPERTY|PROPERTY.ARRAY|PROPERTY.REFERENCE)*)>
 	 * <!ATTLIST INSTANCE
 	 * 		%ClassName;
 	 * 		xml:lang NMTOKEN #IMPLIED>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String INSTANCE = "INSTANCE";
 
 	/**
 	 * The QUALIFIER element defines a single CIM Qualifier. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT QUALIFIER ((VALUE|VALUE.ARRAY)?)>
 	 * <!ATTLIST QUALIFIER
 	 * 		%CIMName;
@@ -493,8 +492,8 @@ public interface NodeConstIf {
 	 * 		%Propagated;
 	 * 		%QualifierFlavor;
 	 * 		xml:lang NMTOKEN #IMPLIED>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String QUALIFIER = "QUALIFIER";
@@ -503,8 +502,8 @@ public interface NodeConstIf {
 	 * The PROPERTY element defines the value in a CIM Instance or the
 	 * definition in a CIM Class of a single (non-array) CIM Property that is
 	 * not a reference. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT PROPERTY (QUALIFIER*,VALUE?)>
 	 * <!ATTLIST PROPERTY
 	 * 		%CIMName;
@@ -513,8 +512,8 @@ public interface NodeConstIf {
 	 * 		%Propagated;
 	 * 		%EmbeddedObject;
 	 * 		xml:lang NMTOKEN #IMPLIED>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String PROPERTY = "PROPERTY";
@@ -522,8 +521,8 @@ public interface NodeConstIf {
 	/**
 	 * The PROPERTY.ARRAY element defines the value in a CIM Instance or the
 	 * definition in a CIM Class of a single CIM Property with an array type. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT PROPERTY.ARRAY (QUALIFIER*,VALUE.ARRAY?)>
 	 * <!ATTLIST PROPERTY.ARRAY
 	 * 		%CIMName;
@@ -533,8 +532,8 @@ public interface NodeConstIf {
 	 * 		%Propagated;
 	 * 		%EmbeddedObject;
 	 * 		xml:lang NMTOKEN #IMPLIED>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String PROPERTY_ARRAY = "PROPERTY.ARRAY";
@@ -543,33 +542,33 @@ public interface NodeConstIf {
 	 * The PROPERTY.REFERENCE element defines the value in a CIM Instance or the
 	 * definition in a CIM Class of a single CIM Property with reference
 	 * semantics. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT PROPERTY.REFERENCE (QUALIFIER*,VALUE.REFERENCE?)>
 	 * <!ATTLIST PROPERTY.REFERENCE
 	 * 		%CIMName;
 	 * 		%ReferenceClass;
 	 * 		%ClassOrigin;
 	 * 		%Propagated;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String PROPERTY_REFERENCE = "PROPERTY.REFERENCE";
 
 	/**
-	 * 
+	 *
 	 * The METHOD element defines a single CIM Method. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT METHOD (QUALIFIER*,(PARAMETER|PARAMETER.REFERENCE|PARAMETER.ARRAY|PARAMETER.REFARRAY)*)>
 	 * <!ATTLIST METHOD
 	 * 		%CIMName;
 	 * 		%CIMType; #IMPLIED
 	 * 		%ClassOrigin;
 	 * 		%Propagated;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String METHOD = "METHOD";
@@ -577,14 +576,14 @@ public interface NodeConstIf {
 	/**
 	 * The PARAMETER element defines a single (non-array, non-reference)
 	 * Parameter to a CIM Method. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT PARAMETER (QUALIFIER*)>
 	 * <!ATTLIST PARAMETER
 	 * 		%CIMName;
 	 * 		%CIMType; #REQUIRED>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String PARAMETER = "PARAMETER";
@@ -592,14 +591,14 @@ public interface NodeConstIf {
 	/**
 	 * The PARAMETER.REFERENCE element defines a single reference Parameter to a
 	 * CIM Method. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT PARAMETER.REFERENCE (QUALIFIER*)>
 	 * <!ATTLIST PARAMETER.REFERENCE
 	 * 		%CIMName;
 	 * 		%ReferenceClass;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String PARAMETER_REFERENCE = "PARAMETER.REFERENCE";
@@ -607,15 +606,15 @@ public interface NodeConstIf {
 	/**
 	 * The PARAMETER.ARRAY element defines a single Parameter to a CIM Method
 	 * that has an array type. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT PARAMETER.ARRAY (QUALIFIER*)>
 	 * <!ATTLIST PARAMETER.ARRAY
 	 * 		%CIMName;
 	 * 		%CIMType; #REQUIRED
 	 * 		%ArraySize;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String PARAMETER_ARRAY = "PARAMETER.ARRAY";
@@ -623,15 +622,15 @@ public interface NodeConstIf {
 	/**
 	 * The PARAMETER.REFARRAY element defines a single Parameter to a CIM Method
 	 * that has an array of references type. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT PARAMETER.REFARRAY (QUALIFIER*)>
 	 * <!ATTLIST PARAMETER.REFARRAY
 	 * 		%CIMName;
 	 * 		%ReferenceClass;
 	 * 		%ArraySize;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String PARAMETER_REFARRAY = "PARAMETER.REFARRAY";
@@ -642,71 +641,71 @@ public interface NodeConstIf {
 
 	/**
 	 * The MESSAGE element models a single CIM message. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT MESSAGE (SIMPLEREQ|MULTIREQ|SIMPLERSP|MULTIRSP|SIMPLEEXPREQ|MULTIEXPREQ|SIMPLEEXPRSP|MULTIEXPRSP)>
 	 * <!ATTLIST MESSAGE
 	 * 		ID              CDATA #REQUIRED
 	 * 		PROTOCOLVERSION CDATA #REQUIRED>>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String MESSAGE = "MESSAGE";
 
 	/**
 	 * The MULTIREQ element defines a Multiple CIM Operation request. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT MULTIREQ (SIMPLEREQ,SIMPLEREQ+)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String MULTIREQ = "MULTIREQ";
 
 	/**
 	 * The MULTIEXPREQ element defines a Multiple CIM Export request. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT MULTIEXPREQ (SIMPLEEXPREQ,SIMPLEEXPREQ+)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String MULTIEXPREQ = "MULTIEXPREQ";
 
 	/**
 	 * The SIMPLEREQ element defines a Simple CIM Operation request. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT SIMPLEREQ (METHODCALL|IMETHODCALL)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String SIMPLEREQ = "SIMPLEREQ";
 
 	/**
 	 * The SIMPLEEXPREQ element defines a Simple CIM Export request. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT SIMPLEEXPREQ (EXPMETHODCALL)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String SIMPLEEXPREQ = "SIMPLEEXPREQ";
 
 	/**
 	 * The IMETHODCALL element defines a single intrinsic method invocation. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT IMETHODCALL (LOCALNAMESPACEPATH,IPARAMVALUE*)>
 	 * <!ATTLIST IMETHODCALL
 	 * 		%CIMName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String IMETHODCALL = "IMETHODCALL";
@@ -714,26 +713,26 @@ public interface NodeConstIf {
 	/**
 	 * The METHODCALL element defines a single method invocation on a Class or
 	 * Instance. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT METHODCALL ((LOCALCLASSPATH|LOCALINSTANCEPATH),PARAMVALUE*)>
 	 * <!ATTLIST METHODCALL
 	 * 		%CIMName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String METHODCALL = "METHODCALL";
 
 	/**
 	 * The EXPMETHODCALL element defines a single export method invocation. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT EXPMETHODCALL (EXPPARAMVALUE*)>
 	 * <!ATTLIST EXPMETHODCALL
 	 * 		%CIMName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String EXPMETHODCALL = "EXPMETHODCALL";
@@ -741,15 +740,15 @@ public interface NodeConstIf {
 	/**
 	 * The PARAMVALUE element defines a single extrinsic method named parameter
 	 * value. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT PARAMVALUE (VALUE|VALUE.REFERENCE|VALUE.ARRAY|VALUE.REFARRAY)?>
 	 * <!ATTLIST PARAMVALUE
 	 * 		%CIMName;
 	 * 		%ParamType; #IMPLIED
 	 * 		%EmbeddedObject;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String PARAMVALUE = "PARAMVALUE";
@@ -757,13 +756,13 @@ public interface NodeConstIf {
 	/**
 	 * The IPARAMVALUE element defines a single intrinsic method named parameter
 	 * value. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT IPARAMVALUE (VALUE|VALUE.ARRAY|VALUE.REFERENCE|CLASSNAME|INSTANCENAME|QUALIFIER.DECLARATION|CLASS|INSTANCE|VALUE.NAMEDINSTANCE)?>
 	 * <!ATTLIST IPARAMVALUE
 	 * 		%CIMName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String IPARAMVALUE = "IPARAMVALUE";
@@ -771,57 +770,57 @@ public interface NodeConstIf {
 	/**
 	 * The EXPPARAMVALUE element defines a single export method named parameter
 	 * value. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT EXPPARAMVALUE (INSTANCE?)>
 	 * <!ATTLIST EXPPARAMVALUE
 	 * 		%CIMName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String EXPPARAMVALUE = "EXPPARAMVALUE";
 
 	/**
 	 * The MULTIRSP element defines a Multiple CIM Operation response. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT MULTIRSP (SIMPLERSP,SIMPLERSP+)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String MULTIRSP = "MULTIRSP";
 
 	/**
 	 * The MULTIEXPRSP element defines a Multiple CIM Export response. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT MULTIEXPRSP (SIMPLEEXPRSP,SIMPLEEXPRSP+)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String MULTIEXPRSP = "MULTIEXPRSP";
 
 	/**
 	 * The SIMPLERSP element defines a Simple CIM Operation response. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT SIMPLERSP (METHODRESPONSE|IMETHODRESPONSE)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String SIMPLERSP = "SIMPLERSP";
 
 	/**
 	 * The SIMPLEEXPRSP element defines a Simple CIM Export response. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT SIMPLEEXPRSP (EXPMETHODRESPONSE)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String SIMPLEEXPRSP = "SIMPLEEXPRSP";
@@ -829,14 +828,14 @@ public interface NodeConstIf {
 	/**
 	 * The METHODRESPONSE defines the response to a single CIM extrinsic method
 	 * invocation. 
      
-	 * 
-	 * 
-	 * 
+	 *
+	 *
+	 *
 	 * <!ELEMENT METHODRESPONSE (ERROR|(RETURNVALUE?,PARAMVALUE*))>
 	 * <!ATTLIST METHODRESPONSE %CIMName;>
-	 * 
-	 * 
-	 * 
+	 *
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String METHODRESPONSE = "METHODRESPONSE";
@@ -844,13 +843,13 @@ public interface NodeConstIf {
 	/**
 	 * The EXPMETHODRESPONSE defines the response to a single export method
 	 * invocation. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT EXPMETHODRESPONSE (ERROR|IRETURNVALUE?)>
 	 * <!ATTLIST EXPMETHODRESPONSE
 	 * 		%CIMName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String EXPMETHODRESPONSE = "EXPMETHODRESPONSE";
@@ -858,13 +857,13 @@ public interface NodeConstIf {
 	/**
 	 * The IMETHODRESPONSE defines the response to a single intrinsic CIM method
 	 * invocation. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT IMETHODRESPONSE (ERROR|IRETURNVALUE?)>
 	 * <!ATTLIST IMETHODRESPONSE
 	 * 		%CIMName;>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String IMETHODRESPONSE = "IMETHODRESPONSE";
@@ -872,14 +871,14 @@ public interface NodeConstIf {
 	/**
 	 * The ERROR element is used to define a fundamental error which prevented a
 	 * method from executing normally. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT ERROR (INSTANCE*)
 	 * <!ATTLIST ERROR
 	 * 		CODE        CDATA #REQUIRED
 	 * 		DESCRIPTION CDATA #IMPLIED>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String ERROR = "ERROR";
@@ -887,14 +886,14 @@ public interface NodeConstIf {
 	/**
 	 * The RETURNVALUE element specifies the value returned from an extrinsic
 	 * method call. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT RETURNVALUE (VALUE|VALUE.REFERENCE)?>
 	 * <!ATTLIST RETURNVALUE
 	 * 		%EmbeddedObject;
 	 * 		%ParamType; #IMPLIED>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String RETURNVALUE = "RETURNVALUE";
@@ -902,25 +901,25 @@ public interface NodeConstIf {
 	/**
 	 * The IRETURNVALUE element specifies the value returned from an intrinsic
 	 * method call. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT IRETURNVALUE (CLASSNAME*|INSTANCENAME*|VALUE*|VALUE.OBJECTWITHPATH*|VALUE.OBJECTWITHLOCALPATH*VALUE.OBJECT*|OBJECTPATH*|QUALIFIER.DECLARATION*|VALUE.ARRAY?|VALUE.REFERENCE?|CLASS*|INSTANCE*|VALUE.NAMEDINSTANCE*)>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String IRETURNVALUE = "IRETURNVALUE";
 
 	/**
 	 * The CORRELATOR element represents a server-defined operation correlator. 
      
-	 * 
-	 * 
+	 *
+	 *
 	 * <!ELEMENT CORRELATOR (VALUE)>
 	 * <!ATTLIST CORRELATOR
 	 * 		%CIMName;
 	 * 		%CIMType; #REQUIRED>
-	 * 
-	 * 
+	 *
+	 *
 	 * @see String
 	 */
 	public static final String CORRELATOR = "CORRELATOR";
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java
index c21cd6d..53c7d7c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodeFactory.java
@@ -47,18 +47,17 @@
  */
 
 import java.util.HashMap;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.*;
 
 /**
  * Class NodeFactory is responsible for Node instance construction.
- * 
+ *
  */
 public class NodeFactory implements NodeConstIf {
 
 	/**
 	 * getNodeInstance
-	 * 
+	 *
 	 * @param pNodeName
 	 *            Should be an XML element name constant which is defined in
 	 *            NodeConstIf
@@ -72,7 +71,7 @@ public static Node getNodeInstance(String pNodeName) {
 
 	/**
 	 * getEnum
-	 * 
+	 *
 	 * @param pNodeName
 	 * @return The corresponding String constant for an XML element name. It
 	 *         must be used, because the Node subclasses use reference based
@@ -85,406 +84,631 @@ public static String getEnum(String pNodeName) {
 	private static HashMap cParserMap;
 
 	private interface FactoryEntry {
-
 		/**
 		 * create
-		 * 
+		 *
 		 * @return Node
 		 */
 		public Node create();
 	}
 
-	private synchronized static void createParserMap() {
+	private static synchronized void createParserMap() {
 		if (cParserMap != null) return;
 		cParserMap = new HashMap();
-		cParserMap.put(CIM, new FactoryEntry() {
+		cParserMap.put(
+			CIM,
+			new FactoryEntry() {
 
-			public Node create() {
-				return new CIMNode();
+				public Node create() {
+					return new CIMNode();
+				}
 			}
-		});
+		);
 		// DECLARATION - not implemented
 		// DECLGROUP - not implemented
 		// DECLGROUP.WITHNAME - not implemented
 		// DECLGROUP.WITHPATH - not implemented
-		cParserMap.put(QUALIFIER_DECLARATION, new FactoryEntry() {
-
-			public Node create() {
-				return new QualiDeclNode();
-			}
-		});
-		cParserMap.put(SCOPE, new FactoryEntry() {
-
-			public Node create() {
-				return new ScopeNode();
-			}
-		});
-		cParserMap.put(VALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueNode();
-			}
-		});
-		cParserMap.put(VALUE_ARRAY, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueArrayNode();
-			}
-		});
-		cParserMap.put(VALUE_REFERENCE, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueReferenceNode();
-			}
-		});
-		cParserMap.put(VALUE_REFARRAY, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueRefArrayNode();
-			}
-		});
-		cParserMap.put(VALUE_OBJECT, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueObjectNode();
-			}
-		});
-		cParserMap.put(VALUE_NAMEDINSTANCE, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueNamedInstanceNode();
-			}
-		});
-		cParserMap.put(VALUE_OBJECTWITHLOCALPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueObjectWithLocalPathNode();
-			}
-		});
-		cParserMap.put(VALUE_OBJECTWITHPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueObjectWithPathNode();
-			}
-		});
-		cParserMap.put(VALUE_NULL, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueNullNode();
-			}
-		});
-		cParserMap.put(VALUE_INSTANCEWITHPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new ValueInstanceWithPathNode();
-			}
-		});
-		cParserMap.put(NAMESPACEPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new NameSpacePathNode();
-			}
-		});
-		cParserMap.put(LOCALNAMESPACEPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new LocalNameSpacePathNode();
-			}
-		});
-		cParserMap.put(HOST, new FactoryEntry() {
-
-			public Node create() {
-				return new HostNode();
-			}
-		});
-		cParserMap.put(NAMESPACE, new FactoryEntry() {
-
-			public Node create() {
-				return new NameSpaceNode();
-			}
-		});
-		cParserMap.put(CLASSPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new ClassPathNode();
-			}
-		});
-		cParserMap.put(LOCALCLASSPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new LocalClassPathNode();
-			}
-		});
-		cParserMap.put(CLASSNAME, new FactoryEntry() {
-
-			public Node create() {
-				return new ClassNameNode();
-			}
-		});
-		cParserMap.put(INSTANCEPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new InstancePathNode();
-			}
-		});
-		cParserMap.put(LOCALINSTANCEPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new LocalInstancePathNode();
-			}
-		});
-		cParserMap.put(INSTANCENAME, new FactoryEntry() {
-
-			public Node create() {
-				return new InstanceNameNode();
-			}
-		});
-		cParserMap.put(OBJECTPATH, new FactoryEntry() {
-
-			public Node create() {
-				return new ObjectPathNode();
-			}
-		});
-		cParserMap.put(KEYBINDING, new FactoryEntry() {
-
-			public Node create() {
-				return new KeyBindingNode();
-			}
-		});
-		cParserMap.put(KEYVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new KeyValueNode();
-			}
-		});
-		cParserMap.put(CLASS, new FactoryEntry() {
-
-			public Node create() {
-				return new ClassNode();
-			}
-		});
-		cParserMap.put(INSTANCE, new FactoryEntry() {
-
-			public Node create() {
-				return new InstanceNode();
-			}
-		});
-		cParserMap.put(QUALIFIER, new FactoryEntry() {
-
-			public Node create() {
-				return new QualifierNode();
-			}
-		});
-		cParserMap.put(PROPERTY, new FactoryEntry() {
-
-			public Node create() {
-				return new PropertyNode();
-			}
-		});
-		cParserMap.put(PROPERTY_ARRAY, new FactoryEntry() {
-
-			public Node create() {
-				return new PropertyArrayNode();
-			}
-		});
-		cParserMap.put(PROPERTY_REFERENCE, new FactoryEntry() {
-
-			public Node create() {
-				return new PropertyReferenceNode();
-			}
-		});
-		cParserMap.put(METHOD, new FactoryEntry() {
-
-			public Node create() {
-				return new MethodNode();
-			}
-		});
-		cParserMap.put(PARAMETER, new FactoryEntry() {
-
-			public Node create() {
-				return new ParameterNode();
-			}
-		});
-		cParserMap.put(PARAMETER_REFERENCE, new FactoryEntry() {
-
-			public Node create() {
-				return new ParameterReferenceNode();
-			}
-		});
-		cParserMap.put(PARAMETER_ARRAY, new FactoryEntry() {
-
-			public Node create() {
-				return new ParameterArrayNode();
-			}
-		});
-		cParserMap.put(PARAMETER_REFARRAY, new FactoryEntry() {
-
-			public Node create() {
-				return new ParameterRefArrayNode();
-			}
-		});
-		cParserMap.put(MESSAGE, new FactoryEntry() {
-
-			public Node create() {
-				return new MessageNode();
-			}
-		});
-		cParserMap.put(MULTIREQ, new FactoryEntry() {
-
-			public Node create() {
-				return new MultiReqNode();
-			}
-		});
-		cParserMap.put(MULTIEXPREQ, new FactoryEntry() {
-
-			public Node create() {
-				return new MultiExpReqNode();
-			}
-		});
-		cParserMap.put(SIMPLEREQ, new FactoryEntry() {
-
-			public Node create() {
-				return new SimpleReqNode();
-			}
-		});
-		cParserMap.put(SIMPLEEXPREQ, new FactoryEntry() {
-
-			public Node create() {
-				return new SimpleExpReqNode();
-			}
-		});
-		cParserMap.put(IMETHODCALL, new FactoryEntry() {
-
-			public Node create() {
-				return new IMethodCallNode();
-			}
-		});
-		cParserMap.put(METHODCALL, new FactoryEntry() {
-
-			public Node create() {
-				return new MethodCallNode();
-			}
-		});
-		cParserMap.put(EXPMETHODCALL, new FactoryEntry() {
-
-			public Node create() {
-				return new ExpMethodCallNode();
-			}
-		});
-		cParserMap.put(PARAMVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new ParamValueNode();
-			}
-		});
-		cParserMap.put(IPARAMVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new IParamValueNode();
-			}
-		});
-		cParserMap.put(EXPPARAMVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new ExpParamValueNode();
-			}
-		});
-		cParserMap.put(MULTIRSP, new FactoryEntry() {
-
-			public Node create() {
-				return new MultiRspNode();
-			}
-		});
-		cParserMap.put(MULTIEXPRSP, new FactoryEntry() {
-
-			public Node create() {
-				return new MultiExpRspNode();
-			}
-		});
-		cParserMap.put(SIMPLERSP, new FactoryEntry() {
-
-			public Node create() {
-				return new SimpleRspNode();
-			}
-		});
-		cParserMap.put(SIMPLEEXPRSP, new FactoryEntry() {
-
-			public Node create() {
-				return new SimpleExpRspNode();
-			}
-		});
-		cParserMap.put(METHODRESPONSE, new FactoryEntry() {
-
-			public Node create() {
-				return new MethodResponseNode();
-			}
-		});
-		cParserMap.put(EXPMETHODRESPONSE, new FactoryEntry() {
-
-			public Node create() {
-				return new ExpMethodResponseNode();
-			}
-		});
-		cParserMap.put(IMETHODRESPONSE, new FactoryEntry() {
-
-			public Node create() {
-				return new IMethodResponseNode();
-			}
-		});
-		cParserMap.put(ERROR, new FactoryEntry() {
-
-			public Node create() {
-				return new ErrorNode();
-			}
-		});
-		cParserMap.put(RETURNVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new ReturnValueNode();
-			}
-		});
-		cParserMap.put(IRETURNVALUE, new FactoryEntry() {
-
-			public Node create() {
-				return new IReturnValueNode();
-			}
-		});
-		cParserMap.put(CORRELATOR, new FactoryEntry() {
-
-			public Node create() {
-				return new CorrelatorNode();
-			}
-		});
+		cParserMap.put(
+			QUALIFIER_DECLARATION,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new QualiDeclNode();
+				}
+			}
+		);
+		cParserMap.put(
+			SCOPE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ScopeNode();
+				}
+			}
+		);
+		cParserMap.put(
+			VALUE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ValueNode();
+				}
+			}
+		);
+		cParserMap.put(
+			VALUE_ARRAY,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ValueArrayNode();
+				}
+			}
+		);
+		cParserMap.put(
+			VALUE_REFERENCE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ValueReferenceNode();
+				}
+			}
+		);
+		cParserMap.put(
+			VALUE_REFARRAY,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ValueRefArrayNode();
+				}
+			}
+		);
+		cParserMap.put(
+			VALUE_OBJECT,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ValueObjectNode();
+				}
+			}
+		);
+		cParserMap.put(
+			VALUE_NAMEDINSTANCE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ValueNamedInstanceNode();
+				}
+			}
+		);
+		cParserMap.put(
+			VALUE_OBJECTWITHLOCALPATH,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ValueObjectWithLocalPathNode();
+				}
+			}
+		);
+		cParserMap.put(
+			VALUE_OBJECTWITHPATH,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ValueObjectWithPathNode();
+				}
+			}
+		);
+		cParserMap.put(
+			VALUE_NULL,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ValueNullNode();
+				}
+			}
+		);
+		cParserMap.put(
+			VALUE_INSTANCEWITHPATH,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ValueInstanceWithPathNode();
+				}
+			}
+		);
+		cParserMap.put(
+			NAMESPACEPATH,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new NameSpacePathNode();
+				}
+			}
+		);
+		cParserMap.put(
+			LOCALNAMESPACEPATH,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new LocalNameSpacePathNode();
+				}
+			}
+		);
+		cParserMap.put(
+			HOST,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new HostNode();
+				}
+			}
+		);
+		cParserMap.put(
+			NAMESPACE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new NameSpaceNode();
+				}
+			}
+		);
+		cParserMap.put(
+			CLASSPATH,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ClassPathNode();
+				}
+			}
+		);
+		cParserMap.put(
+			LOCALCLASSPATH,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new LocalClassPathNode();
+				}
+			}
+		);
+		cParserMap.put(
+			CLASSNAME,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ClassNameNode();
+				}
+			}
+		);
+		cParserMap.put(
+			INSTANCEPATH,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new InstancePathNode();
+				}
+			}
+		);
+		cParserMap.put(
+			LOCALINSTANCEPATH,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new LocalInstancePathNode();
+				}
+			}
+		);
+		cParserMap.put(
+			INSTANCENAME,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new InstanceNameNode();
+				}
+			}
+		);
+		cParserMap.put(
+			OBJECTPATH,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ObjectPathNode();
+				}
+			}
+		);
+		cParserMap.put(
+			KEYBINDING,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new KeyBindingNode();
+				}
+			}
+		);
+		cParserMap.put(
+			KEYVALUE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new KeyValueNode();
+				}
+			}
+		);
+		cParserMap.put(
+			CLASS,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ClassNode();
+				}
+			}
+		);
+		cParserMap.put(
+			INSTANCE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new InstanceNode();
+				}
+			}
+		);
+		cParserMap.put(
+			QUALIFIER,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new QualifierNode();
+				}
+			}
+		);
+		cParserMap.put(
+			PROPERTY,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new PropertyNode();
+				}
+			}
+		);
+		cParserMap.put(
+			PROPERTY_ARRAY,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new PropertyArrayNode();
+				}
+			}
+		);
+		cParserMap.put(
+			PROPERTY_REFERENCE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new PropertyReferenceNode();
+				}
+			}
+		);
+		cParserMap.put(
+			METHOD,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new MethodNode();
+				}
+			}
+		);
+		cParserMap.put(
+			PARAMETER,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ParameterNode();
+				}
+			}
+		);
+		cParserMap.put(
+			PARAMETER_REFERENCE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ParameterReferenceNode();
+				}
+			}
+		);
+		cParserMap.put(
+			PARAMETER_ARRAY,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ParameterArrayNode();
+				}
+			}
+		);
+		cParserMap.put(
+			PARAMETER_REFARRAY,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ParameterRefArrayNode();
+				}
+			}
+		);
+		cParserMap.put(
+			MESSAGE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new MessageNode();
+				}
+			}
+		);
+		cParserMap.put(
+			MULTIREQ,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new MultiReqNode();
+				}
+			}
+		);
+		cParserMap.put(
+			MULTIEXPREQ,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new MultiExpReqNode();
+				}
+			}
+		);
+		cParserMap.put(
+			SIMPLEREQ,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new SimpleReqNode();
+				}
+			}
+		);
+		cParserMap.put(
+			SIMPLEEXPREQ,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new SimpleExpReqNode();
+				}
+			}
+		);
+		cParserMap.put(
+			IMETHODCALL,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new IMethodCallNode();
+				}
+			}
+		);
+		cParserMap.put(
+			METHODCALL,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new MethodCallNode();
+				}
+			}
+		);
+		cParserMap.put(
+			EXPMETHODCALL,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ExpMethodCallNode();
+				}
+			}
+		);
+		cParserMap.put(
+			PARAMVALUE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ParamValueNode();
+				}
+			}
+		);
+		cParserMap.put(
+			IPARAMVALUE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new IParamValueNode();
+				}
+			}
+		);
+		cParserMap.put(
+			EXPPARAMVALUE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ExpParamValueNode();
+				}
+			}
+		);
+		cParserMap.put(
+			MULTIRSP,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new MultiRspNode();
+				}
+			}
+		);
+		cParserMap.put(
+			MULTIEXPRSP,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new MultiExpRspNode();
+				}
+			}
+		);
+		cParserMap.put(
+			SIMPLERSP,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new SimpleRspNode();
+				}
+			}
+		);
+		cParserMap.put(
+			SIMPLEEXPRSP,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new SimpleExpRspNode();
+				}
+			}
+		);
+		cParserMap.put(
+			METHODRESPONSE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new MethodResponseNode();
+				}
+			}
+		);
+		cParserMap.put(
+			EXPMETHODRESPONSE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ExpMethodResponseNode();
+				}
+			}
+		);
+		cParserMap.put(
+			IMETHODRESPONSE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new IMethodResponseNode();
+				}
+			}
+		);
+		cParserMap.put(
+			ERROR,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ErrorNode();
+				}
+			}
+		);
+		cParserMap.put(
+			RETURNVALUE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new ReturnValueNode();
+				}
+			}
+		);
+		cParserMap.put(
+			IRETURNVALUE,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new IReturnValueNode();
+				}
+			}
+		);
+		cParserMap.put(
+			CORRELATOR,
+			new FactoryEntry() {
+
+				public Node create() {
+					return new CorrelatorNode();
+				}
+			}
+		);
 	}
 
 	private static final HashMap NODENAME_HASH = new HashMap();
 
 	private static void initNodeNameHash(String[] pEnumA) {
-		for (int i = 0; i < pEnumA.length; i++)
-			NODENAME_HASH.put(pEnumA[i], pEnumA[i]);
+		for (int i = 0; i < pEnumA.length; i++) NODENAME_HASH.put(pEnumA[i], pEnumA[i]);
 	}
 
 	static {
-		initNodeNameHash(new String[] { CIM, DECLARATION, DECLGROUP, DECLGROUP_WITHNAME,
-				DECLGROUP_WITHPATH, QUALIFIER_DECLARATION, SCOPE, VALUE, VALUE_ARRAY,
-				VALUE_REFERENCE, VALUE_REFARRAY, VALUE_OBJECT, VALUE_NAMEDINSTANCE,
-				VALUE_NAMEDOBJECT, VALUE_OBJECTWITHLOCALPATH, VALUE_OBJECTWITHPATH, VALUE_NULL,
+		initNodeNameHash(
+			new String[] {
+				CIM,
+				DECLARATION,
+				DECLGROUP,
+				DECLGROUP_WITHNAME,
+				DECLGROUP_WITHPATH,
+				QUALIFIER_DECLARATION,
+				SCOPE,
+				VALUE,
+				VALUE_ARRAY,
+				VALUE_REFERENCE,
+				VALUE_REFARRAY,
+				VALUE_OBJECT,
+				VALUE_NAMEDINSTANCE,
+				VALUE_NAMEDOBJECT,
+				VALUE_OBJECTWITHLOCALPATH,
+				VALUE_OBJECTWITHPATH,
+				VALUE_NULL,
 				VALUE_INSTANCEWITHPATH,
-
-				NAMESPACEPATH, LOCALNAMESPACEPATH, HOST, NAMESPACE, CLASSPATH, LOCALCLASSPATH,
-				CLASSNAME, INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME, OBJECTPATH, KEYBINDING,
+				NAMESPACEPATH,
+				LOCALNAMESPACEPATH,
+				HOST,
+				NAMESPACE,
+				CLASSPATH,
+				LOCALCLASSPATH,
+				CLASSNAME,
+				INSTANCEPATH,
+				LOCALINSTANCEPATH,
+				INSTANCENAME,
+				OBJECTPATH,
+				KEYBINDING,
 				KEYVALUE,
-
-				CLASS, INSTANCE, QUALIFIER, PROPERTY, PROPERTY_ARRAY, PROPERTY_REFERENCE, METHOD,
-				PARAMETER, PARAMETER_REFERENCE, PARAMETER_ARRAY, PARAMETER_REFARRAY,
-
+				CLASS,
+				INSTANCE,
+				QUALIFIER,
+				PROPERTY,
+				PROPERTY_ARRAY,
+				PROPERTY_REFERENCE,
+				METHOD,
+				PARAMETER,
+				PARAMETER_REFERENCE,
+				PARAMETER_ARRAY,
+				PARAMETER_REFARRAY,
 				/*
 				 * TABLE stuff is missing yet
 				 */
-				MESSAGE, MULTIREQ, MULTIEXPREQ, SIMPLEREQ, SIMPLEEXPREQ, IMETHODCALL, METHODCALL,
-				EXPMETHODCALL, PARAMVALUE, IPARAMVALUE, EXPPARAMVALUE, MULTIRSP, MULTIEXPRSP,
-				SIMPLERSP, SIMPLEEXPRSP, METHODRESPONSE, EXPMETHODRESPONSE, IMETHODRESPONSE, ERROR,
-				RETURNVALUE, IRETURNVALUE, CORRELATOR });
+				MESSAGE,
+				MULTIREQ,
+				MULTIEXPREQ,
+				SIMPLEREQ,
+				SIMPLEEXPREQ,
+				IMETHODCALL,
+				METHODCALL,
+				EXPMETHODCALL,
+				PARAMVALUE,
+				IPARAMVALUE,
+				EXPPARAMVALUE,
+				MULTIRSP,
+				MULTIEXPRSP,
+				SIMPLERSP,
+				SIMPLEEXPRSP,
+				METHODRESPONSE,
+				EXPMETHODRESPONSE,
+				IMETHODRESPONSE,
+				ERROR,
+				RETURNVALUE,
+				IRETURNVALUE,
+				CORRELATOR
+			}
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java
index 37724be..4263f02 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/NodePool.java
@@ -41,7 +41,6 @@
  */
 
 import java.util.HashMap;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
 
 /**
@@ -49,7 +48,6 @@
  * which can be reused later without instantiating new ones.
  */
 public class NodePool {
-
 	private HashMap iPoolMap = new HashMap(512);
 
 	private int iHitCnt = 0;
@@ -58,7 +56,7 @@ public class NodePool {
 
 	/**
 	 * addNode
-	 * 
+	 *
 	 * @param pNode
 	 */
 	public void addNode(Node pNode) {
@@ -72,7 +70,7 @@ public void addNode(Node pNode) {
 
 	/**
 	 * getNode
-	 * 
+	 *
 	 * @param pNodeName
 	 * @return Node
 	 */
@@ -83,14 +81,13 @@ public Node getNode(String pNodeName) {
 			return null;
 		}
 		Node node = ps.get();
-		if (node == null) ++this.iMissCnt;
-		else ++this.iHitCnt;
+		if (node == null) ++this.iMissCnt; else ++this.iHitCnt;
 		return node;
 	}
 
 	/**
 	 * getHitCnt
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getHitCnt() {
@@ -99,17 +96,15 @@ public int getHitCnt() {
 
 	/**
 	 * getMissCnt
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getMissCnt() {
 		return this.iMissCnt;
 	}
-
 }
 
 class PoolStack {
-
 	private static final int CAPACITY = 8, MAX_USECNT = CAPACITY - 1, MAX_IDX = MAX_USECNT;
 
 	private Node[] iNodeA = new Node[CAPACITY];
@@ -118,7 +113,7 @@ class PoolStack {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNode
 	 */
 	public PoolStack(Node pNode) {
@@ -127,7 +122,7 @@ public PoolStack(Node pNode) {
 
 	/**
 	 * put
-	 * 
+	 *
 	 * @param pNode
 	 */
 	public void put(Node pNode) {
@@ -138,7 +133,7 @@ public void put(Node pNode) {
 
 	/**
 	 * get
-	 * 
+	 *
 	 * @return Node
 	 */
 	public Node get() {
@@ -155,5 +150,4 @@ private void decIdx() {
 	private void incIdx() {
 		this.iIdx = (this.iIdx == MAX_IDX ? 0 : this.iIdx + 1);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java
index bc3c7e5..f1d8265 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXHelper.java
@@ -43,19 +43,17 @@
  */
 
 import java.io.InputStreamReader;
-
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractMessageNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.CIMNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.MessageNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.SimpleRspNode;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.TrailerException;
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractMessageNode;
 import org.xml.sax.InputSource;
 
 /**
@@ -66,15 +64,19 @@ public class SAXHelper {
 
 	/**
 	 * parseInvokeMethodResponse
-	 * 
+	 *
 	 * @param pIs
 	 * @param pOutArgs
 	 * @param pDefPath
 	 * @return Object, any kind of JSR48 value class
 	 * @throws Exception
 	 */
-	public static Object parseInvokeMethodResponse(InputStreamReader pIs,
-			CIMArgument[] pOutArgs, CIMObjectPath pDefPath) throws Exception {
+	public static Object parseInvokeMethodResponse(
+		InputStreamReader pIs,
+		CIMArgument[] pOutArgs,
+		CIMObjectPath pDefPath
+	)
+		throws Exception {
 		XMLDefaultHandlerImpl hndlr = new XMLDefaultHandlerImpl(pDefPath);
 		SAXParserFactory factory = SAXParserFactory.newInstance();
 		SAXParser saxParser = factory.newSAXParser();
@@ -89,15 +91,12 @@ public static Object parseInvokeMethodResponse(InputStreamReader pIs,
 		AbstractMessageNode absMsgNode = msgNode.getAbstractMessageNode();
 		SimpleRspNode simpRspNode = (SimpleRspNode) absMsgNode;
 		CIMError cimErr = simpRspNode.getCIMError();
-		if (cimErr != null) throw new WBEMException(cimErr.getCode(), cimErr.getDescription(),
-				cimErr.getCIMInstances());
+		if (cimErr != null) throw new WBEMException(cimErr.getCode(), cimErr.getDescription(), cimErr.getCIMInstances());
 		CIMArgument[] outArgs = simpRspNode.getCIMArguments();
 		if (pOutArgs != null && outArgs != null) {
 			int len = Math.min(pOutArgs.length, outArgs.length);
-			for (int i = 0; i < len; i++)
-				pOutArgs[i] = outArgs[i];
+			for (int i = 0; i < len; i++) pOutArgs[i] = outArgs[i];
 		}
 		return simpRspNode.getReturnValueCount() == 0 ? null : simpRspNode.readReturnValue();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java
index 547b3a1..6d2cb2e 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/SAXSession.java
@@ -48,15 +48,13 @@
  * CIM-XML SAX parsing session.
  */
 public class SAXSession {
-
 	private CIMObjectPath iDefLocalPath;
 
-	private boolean iStrictEmbObjParsing = WBEMConfiguration.getGlobalConfiguration()
-			.strictEmbObjTypes();
+	private boolean iStrictEmbObjParsing = WBEMConfiguration.getGlobalConfiguration().strictEmbObjTypes();
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pDefLocalPath
 	 */
 	public SAXSession(CIMObjectPath pDefLocalPath) {
@@ -65,7 +63,7 @@ public SAXSession(CIMObjectPath pDefLocalPath) {
 
 	/**
 	 * getDefLocalPath
-	 * 
+	 *
 	 * @return CIMObjectPath
 	 */
 	public CIMObjectPath getDefLocalPath() {
@@ -74,11 +72,10 @@ public CIMObjectPath getDefLocalPath() {
 
 	/**
 	 * strictEmbObjParsing
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean strictEmbObjParsing() {
 		return this.iStrictEmbObjParsing;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java
index 6677a78..6dddad2 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/XMLDefaultHandlerImpl.java
@@ -47,12 +47,11 @@
 
 import java.util.ArrayList;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.CIMNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.Node;
-import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.NonVolatileIf;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -62,7 +61,6 @@
  * for SAX and PULL style XML parsing.
  */
 public class XMLDefaultHandlerImpl extends DefaultHandler {
-
 	private Node iRootNode;
 
 	private NodeStack iNodeStack = new NodeStack();
@@ -79,12 +77,11 @@ public class XMLDefaultHandlerImpl extends DefaultHandler {
 	 * NodeStack
 	 */
 	static class NodeStack {
-
 		private ArrayList iAL = new ArrayList();
 
 		/**
 		 * push
-		 * 
+		 *
 		 * @param pNode
 		 */
 		public void push(Node pNode) {
@@ -93,7 +90,7 @@ public void push(Node pNode) {
 
 		/**
 		 * pop
-		 * 
+		 *
 		 * @return Node
 		 */
 		public Node pop() {
@@ -103,19 +100,18 @@ public Node pop() {
 
 		/**
 		 * peek
-		 * 
+		 *
 		 * @return Node
 		 */
 		public Node peek() {
 			if (this.iAL.size() == 0) return null;
 			return this.iAL.get(this.iAL.size() - 1);
 		}
-
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pSession
 	 *            - stores common variables for the whole parsing session
 	 * @param pAnyRoot
@@ -129,7 +125,7 @@ public XMLDefaultHandlerImpl(SAXSession pSession, boolean pAnyRoot) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLocalPath
 	 *            - CIMObjectPathes without local paths will be extended by this
 	 *            value
@@ -143,7 +139,7 @@ public XMLDefaultHandlerImpl(CIMObjectPath pLocalPath, boolean pAnyRoot) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLocalPath
 	 *            - CIMObjectPathes without local paths will be extended by this
 	 *            value
@@ -164,23 +160,21 @@ public XMLDefaultHandlerImpl() {
 	 * @param localName
 	 */
 	@Override
-	public void startElement(String uri, String localName, String qName, Attributes attributes)
-			throws SAXException {
+	public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
 		this.iStrBuf = null;
 		String nodeNameEnum = NodeFactory.getEnum(qName);
 		if (nodeNameEnum == null) {
-			LogAndTraceBroker.getBroker()
-					.trace(
-							Level.FINEST,
-							"Ignoring unrecognized starting CIM-XML element found during parsing: "
-									+ qName);
+			LogAndTraceBroker
+				.getBroker()
+				.trace(Level.FINEST, "Ignoring unrecognized starting CIM-XML element found during parsing: " + qName);
 			return;
 		}
 
 		Node parentNode = getPeekNode();
 		if (parentNode == null) {
 			if (!this.iAnyRoot && nodeNameEnum != NodeConstIf.CIM) throw new SAXException(
-					"First node of CIM-XML document must be CIM! " + nodeNameEnum + " is invalid!");
+				"First node of CIM-XML document must be CIM! " + nodeNameEnum + " is invalid!"
+			);
 		}
 		if (parentNode != null) parentNode.testChild(nodeNameEnum);
 		// let's look for a Node instance in the pool
@@ -217,8 +211,9 @@ public void characters(char ch[], int start, int length) {
 	public void endElement(String uri, String localName, String qName) throws SAXException {
 		String nodeNameEnum = NodeFactory.getEnum(qName);
 		if (nodeNameEnum == null) {
-			LogAndTraceBroker.getBroker().trace(Level.FINEST,
-					"Ignoring unrecognized ending CIM-XML element found during parsing: " + qName);
+			LogAndTraceBroker
+				.getBroker()
+				.trace(Level.FINEST, "Ignoring unrecognized ending CIM-XML element found during parsing: " + qName);
 			return;
 		}
 		Node peekNode = this.iNodeStack.pop();
@@ -253,7 +248,7 @@ public void endDocument() {
 
 	/**
 	 * getCIMNode
-	 * 
+	 *
 	 * @return CIMNode, the root Element of the parsed CIM-XML document
 	 */
 	public CIMNode getCIMNode() {
@@ -262,7 +257,7 @@ public CIMNode getCIMNode() {
 
 	/**
 	 * getRootNode
-	 * 
+	 *
 	 * @return Node, the root element of the parsed CIM-XML stream
 	 */
 	public Node getRootNode() {
@@ -271,7 +266,7 @@ public Node getRootNode() {
 
 	/**
 	 * getNodePoolHits
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getNodePoolHits() {
@@ -280,7 +275,7 @@ public int getNodePoolHits() {
 
 	/**
 	 * getNodePoolMisses
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getNodePoolMisses() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java
index adfada9..a368cce 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractArrayValueNode.java
@@ -48,11 +48,10 @@ public abstract class AbstractArrayValueNode extends AbstractValueNode implement
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractArrayValueNode(String pNameEnum) {
 		super(pNameEnum);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java
index f5bd86e..5e79fa0 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMessageNode.java
@@ -49,7 +49,7 @@ public abstract class AbstractMessageNode extends Node implements NonVolatileIf
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractMessageNode(String pNameEnum) {
@@ -61,7 +61,6 @@ public AbstractMessageNode(String pNameEnum) {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// not needed
+		// not needed
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java
index ce80e34..14499e4 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMethodCallNode.java
@@ -48,7 +48,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMElementSorter;
@@ -61,14 +60,13 @@
  * ELEMENT IMETHODCALL (LOCALNAMESPACEPATH, IPARAMVALUE*)
  * ATTLIST IMETHODCALL
  *   %CIMName;
- *   
+ *
  * ELEMENT METHODCALL ((LOCALINSTANCEPATH | LOCALCLASSPATH), PARAMVALUE*)
  * ATTLIST METHODCALL
  *   %CIMName;
  * 
  */
 public abstract class AbstractMethodCallNode extends Node implements NonVolatileIf, ObjectPathIf {
-
 	private String iName;
 
 	protected CIMObjectPath iPath;
@@ -85,7 +83,7 @@ public abstract class AbstractMethodCallNode extends Node implements NonVolatile
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractMethodCallNode(String pNameEnum) {
@@ -107,7 +105,7 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 * @param pChild
 	 */
 	public void addChild(Node pChild) {
-	// nothing to do
+		// nothing to do
 	}
 
 	@Override
@@ -125,7 +123,7 @@ public void childParsed(Node pChild) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	protected abstract void testSpecChild(String pNodeNameEnum) throws SAXException;
@@ -137,7 +135,7 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 
 	/**
 	 * getName
-	 * 
+	 *
 	 * @return String, name of the called method
 	 */
 	public String getName() {
@@ -152,7 +150,7 @@ public CIMObjectPath getCIMObjectPath() {
 
 	/**
 	 * getCIMArguments
-	 * 
+	 *
 	 * @return CIMArgument[]
 	 */
 	public CIMArgument[] getCIMArguments() {
@@ -163,7 +161,7 @@ public CIMArgument[] getCIMArguments() {
 
 	/**
 	 * getArgumentCount
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getArgumentCount() {
@@ -173,7 +171,7 @@ public int getArgumentCount() {
 
 	/**
 	 * getArgument
-	 * 
+	 *
 	 * @param pName
 	 * @return CIMArgument
 	 */
@@ -184,7 +182,7 @@ public CIMArgument getArgument(String pName) {
 
 	/**
 	 * getArgument
-	 * 
+	 *
 	 * @param pIdx
 	 * @return CIMArgument
 	 */
@@ -195,12 +193,10 @@ public CIMArgument getArgument(int pIdx) {
 
 	@Override
 	public String toString() {
-		StringBuffer buf = new StringBuffer("Name: " + getName() + "\nPath: " + getCIMObjectPath()
-				+ "\nParamValues:\n");
+		StringBuffer buf = new StringBuffer("Name: " + getName() + "\nPath: " + getCIMObjectPath() + "\nParamValues:\n");
 		for (int i = 0; i < getArgumentCount(); i++) {
 			buf.append("  " + getArgument(i) + "\n");
 		}
 		return buf.toString();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java
index 1a1d94e..4577636 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractMultiRspNode.java
@@ -48,7 +48,7 @@ public abstract class AbstractMultiRspNode extends AbstractResponseNode {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractMultiRspNode(String pNameEnum) {
@@ -57,16 +57,15 @@ public AbstractMultiRspNode(String pNameEnum) {
 
 	/**
 	 * getResponseCount
-	 * 
+	 *
 	 * @return the number of retrievable responses
 	 */
 	public abstract int getResponseCount();
 
 	/**
 	 * readResponse
-	 * 
+	 *
 	 * @return AbstractSimpleRspNode
 	 */
 	public abstract AbstractSimpleRspNode readResponse();
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java
index 3f744d7..88829f8 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectNode.java
@@ -47,16 +47,14 @@
  * classes.
  */
 public abstract class AbstractObjectNode extends Node implements ValueIf {
-
 	protected CIMObjectPath iLocalPath;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractObjectNode(String pNameEnum) {
 		super(pNameEnum);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java
index 896915a..31b1785 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractObjectPathNode.java
@@ -1,15 +1,15 @@
 /**
  * (C) Copyright IBM Corp. 2006, 2009
  *
- * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
- * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
+ * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+ * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
  * CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
  *
  * You can obtain a current copy of the Eclipse Public License from
  * http://www.opensource.org/licenses/eclipse-1.0.php
  *
- * @author : Endre Bak, ebak@de.ibm.com  
- * 
+ * @author : Endre Bak, ebak@de.ibm.com
+ *
  * Flag       Date        Prog         Description
  * -------------------------------------------------------------------------------
  * 1565892    2006-12-04  ebak         Make SBLIM client JSR48 compliant
@@ -47,11 +47,10 @@ public abstract class AbstractObjectPathNode extends AbstractPathNode {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractObjectPathNode(String pNameEnum) {
 		super(pNameEnum);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java
index 5fa88ef..74e96e5 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParamValueNode.java
@@ -51,7 +51,7 @@ public abstract class AbstractParamValueNode extends Node implements TypedIf, Va
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractParamValueNode(String pNameEnum) {
@@ -60,9 +60,8 @@ public AbstractParamValueNode(String pNameEnum) {
 
 	/**
 	 * getCIMArgument
-	 * 
+	 *
 	 * @return CIMArgument
 	 */
 	public abstract CIMArgument getCIMArgument();
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java
index 87140b2..a498461 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractParameterNode.java
@@ -55,7 +55,6 @@
  * ParameterNode, ParameterRefArrayNode and ParameterReferenceNode classes.
  */
 public abstract class AbstractParameterNode extends Node implements TypedIf {
-
 	private String iName;
 
 	protected QualifiedNodeHandler iQualiHandler;
@@ -64,7 +63,7 @@ public abstract class AbstractParameterNode extends Node implements TypedIf {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractParameterNode(String pNameEnum) {
@@ -83,8 +82,9 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != QUALIFIER) throw new SAXException(getNodeName() + " cannot have "
-				+ pNodeNameEnum + " child node!");
+		if (pNodeNameEnum != QUALIFIER) throw new SAXException(
+			getNodeName() + " cannot have " + pNodeNameEnum + " child node!"
+		);
 	}
 
 	@Override
@@ -97,27 +97,29 @@ public void childParsed(Node pChild) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	/**
 	 * getCIMParameter
-	 * 
+	 *
 	 * @return CIMParameter
 	 */
 	public CIMParameter getCIMParameter() {
 		/*
 		 * CIMParameter(String name, CIMDataType type, CIMQualifier[]
 		 * qualifiers)
-		 * 
+		 *
 		 * Not dealing with embedded object is faster. Here we don't have to do
 		 * anything with embedded object qualifier, since parameter doesn't have
 		 * value.
-		 * 
+		 *
 		 * Strict embObj type parsing requires different behavior.
 		 */
-		return new CIMParameter(this.iName, getType(), this.iQualiHandler
-				.getQualis(!this.iSession.strictEmbObjParsing()));
+		return new CIMParameter(
+			this.iName,
+			getType(),
+			this.iQualiHandler.getQualis(!this.iSession.strictEmbObjParsing())
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java
index 58dfb19..67979e0 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPathNode.java
@@ -47,7 +47,7 @@ public abstract class AbstractPathNode extends Node implements ObjectPathIf, Val
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractPathNode(String pNameEnum) {
@@ -61,5 +61,4 @@ public AbstractPathNode(String pNameEnum) {
 	public Object getValue() {
 		return getCIMObjectPath();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java
index 72e34e8..3aab3e1 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractPropertyNode.java
@@ -46,9 +46,9 @@
  */
 
 import org.metricshub.wbem.javax.cim.CIMClassProperty;
+import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.metricshub.wbem.javax.cim.CIMQualifier;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -57,7 +57,6 @@
  * PropertyReferenceNode classes.
  */
 public abstract class AbstractPropertyNode extends Node implements TypedIf, ValueIf {
-
 	// common attributes
 	private String iName;
 
@@ -69,7 +68,7 @@ public abstract class AbstractPropertyNode extends Node implements TypedIf, Valu
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractPropertyNode(String pNameEnum) {
@@ -78,15 +77,14 @@ public AbstractPropertyNode(String pNameEnum) {
 
 	/**
 	 * hasValue
-	 * 
+	 *
 	 * @return true if it has a value child node
 	 */
 	protected abstract boolean hasValueNode();
 
 	protected abstract void childValueNodeParsed(Node pChild) throws SAXException;
 
-	protected abstract void specificInit(Attributes pAttribs, SAXSession pSession)
-			throws SAXException;
+	protected abstract void specificInit(Attributes pAttribs, SAXSession pSession) throws SAXException;
 
 	protected abstract String getChildValueNodeNameEnum();
 
@@ -103,10 +101,12 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		String valueNodeNameEnum = getChildValueNodeNameEnum();
 		if (pNodeNameEnum == valueNodeNameEnum) {
-			if (hasValueNode()) throw new SAXException(getNodeName() + " node can have only one "
-					+ valueNodeNameEnum + " child node!");
-		} else if (pNodeNameEnum != QUALIFIER) throw new SAXException(getNodeName()
-				+ " node cannot have " + pNodeNameEnum + " child node!");
+			if (hasValueNode()) throw new SAXException(
+				getNodeName() + " node can have only one " + valueNodeNameEnum + " child node!"
+			);
+		} else if (pNodeNameEnum != QUALIFIER) throw new SAXException(
+			getNodeName() + " node cannot have " + pNodeNameEnum + " child node!"
+		);
 	}
 
 	/**
@@ -114,7 +114,7 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
@@ -131,7 +131,7 @@ protected CIMQualifier[] getQualis() {
 
 	/**
 	 * getCIMProperty
-	 * 
+	 *
 	 * @return CIMProperty
 	 */
 	public CIMProperty getCIMProperty() {
@@ -139,13 +139,19 @@ public CIMProperty getCIMProperty() {
 		 * CIMProperty( String name, CIMDataType type, Object value, boolean
 		 * key, boolean propagated, String originClass )
 		 */
-		return new CIMProperty(this.iName, getType(), getValue(), this.iQualiHandler
-				.isKeyed(), this.iPropagated, this.iClassOrigin);
+		return new CIMProperty(
+			this.iName,
+			getType(),
+			getValue(),
+			this.iQualiHandler.isKeyed(),
+			this.iPropagated,
+			this.iClassOrigin
+		);
 	}
 
 	/**
 	 * getCIMClassProperty
-	 * 
+	 *
 	 * @return CIMClassProperty
 	 */
 	public CIMClassProperty getCIMClassProperty() {
@@ -154,8 +160,14 @@ public CIMClassProperty getCIMClassProperty() {
 		 * CIMQualifier[] pQualifiers, boolean pKey, boolean propagated, String
 		 * originClass) );
 		 */
-		return new CIMClassProperty(this.iName, getType(), getValue(), getQualis(),
-				this.iQualiHandler.isKeyed(), this.iPropagated, this.iClassOrigin);
+		return new CIMClassProperty(
+			this.iName,
+			getType(),
+			getValue(),
+			getQualis(),
+			this.iQualiHandler.isKeyed(),
+			this.iPropagated,
+			this.iClassOrigin
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java
index d8ad8de..9573537 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractResponseNode.java
@@ -47,11 +47,10 @@ public abstract class AbstractResponseNode extends AbstractMessageNode {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractResponseNode(String pNameEnum) {
 		super(pNameEnum);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java
index 1ec4555..9ec5aeb 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractScalarValueNode.java
@@ -50,11 +50,10 @@ public abstract class AbstractScalarValueNode extends AbstractValueNode {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractScalarValueNode(String pNameEnum) {
 		super(pNameEnum);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java
index 93fccaf..66d0282 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractSimpleRspNode.java
@@ -47,12 +47,11 @@
  * Class AbstractSimpleRspNode is the superclass of SimpleExpRspNode and
  * SimpleRspNode classes.
  */
-public abstract class AbstractSimpleRspNode extends AbstractResponseNode implements ErrorIf,
-		RetValPipeIf {
+public abstract class AbstractSimpleRspNode extends AbstractResponseNode implements ErrorIf, RetValPipeIf {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractSimpleRspNode(String pNameEnum) {
@@ -63,9 +62,8 @@ public AbstractSimpleRspNode(String pNameEnum) {
 
 	/**
 	 * getCIMArguments
-	 * 
+	 *
 	 * @return CIMArgument[]
 	 */
 	public abstract CIMArgument[] getCIMArguments();
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java
index 5dd0b2b..5ed3995 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/AbstractValueNode.java
@@ -48,11 +48,10 @@ public abstract class AbstractValueNode extends Node implements TypedIf, ValueIf
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 */
 	public AbstractValueNode(String pNameEnum) {
 		super(pNameEnum);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java
index e6f84d9..7a6f2e3 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ArrayIf.java
@@ -43,20 +43,18 @@
  * It is implemented by the AbstractArrayValueNode class.
  */
 public interface ArrayIf {
-
 	/**
 	 * size
-	 * 
+	 *
 	 * @return int
 	 */
 	public int size();
 
 	/**
 	 * elementAt
-	 * 
+	 *
 	 * @param pIdx
 	 * @return Object
 	 */
 	public Object elementAt(int pIdx);
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java
index a3e7308..4be78ce 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java
@@ -80,11 +80,13 @@ public void addChild(Node pChild) {
 	@Override
 	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 		this.iCimVersion = pAttribs.getValue("CIMVERSION");
-		if (this.iCimVersion == null) { throw new SAXException(
-				"CIMVERSION attribute is mandatory for " + getNodeName() + " node!"); }
+		if (this.iCimVersion == null) {
+			throw new SAXException("CIMVERSION attribute is mandatory for " + getNodeName() + " node!");
+		}
 		this.iDtdVersion = pAttribs.getValue("DTDVERSION");
-		if (this.iDtdVersion == null) { throw new SAXException(
-				"DTDVERSION attribute is mandatory for " + getNodeName() + " node!"); }
+		if (this.iDtdVersion == null) {
+			throw new SAXException("DTDVERSION attribute is mandatory for " + getNodeName() + " node!");
+		}
 		this.iContent = null;
 	}
 
@@ -103,15 +105,15 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 			throw new SAXException(msg);
 		}
 		if (pNodeNameEnum == MESSAGE) return;
-		String msg = (pNodeNameEnum == DECLARATION) ? "DECLARATION child node not supported by CIM node!"
-				: pNodeNameEnum + " cannot be a child node of CIM node!";
+		String msg = (pNodeNameEnum == DECLARATION)
+			? "DECLARATION child node not supported by CIM node!"
+			: pNodeNameEnum + " cannot be a child node of CIM node!";
 		throw new SAXException(msg);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iContent == null) throw new SAXException(
-				"CIM node must have a MESSAGE or a DECLARATION child!");
+		if (this.iContent == null) throw new SAXException("CIM node must have a MESSAGE or a DECLARATION child!");
 	}
 
 	/**
@@ -119,12 +121,12 @@ public void testCompletness() throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// nothing to do here
+		// nothing to do here
 	}
 
 	/**
 	 * getCimVersion
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getCimVersion() {
@@ -133,7 +135,7 @@ public String getCimVersion() {
 
 	/**
 	 * getDtdVersion
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getDtdVersion() {
@@ -142,13 +144,12 @@ public String getDtdVersion() {
 
 	/**
 	 * getMessageNode
-	 * 
+	 *
 	 * @return MessageNode or null
 	 */
 	public MessageNode getMessageNode() {
 		return (this.iContent instanceof MessageNode) ? (MessageNode) this.iContent : null;
 	}
-
 	// not implemented yet
 	// public DeclarationNode getDeclarationNode() {}
 
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java
index 2de56ec..6913c93 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNameNode.java
@@ -56,7 +56,6 @@
  * 
  */
 public class ClassNameNode extends AbstractPathNode {
-
 	private String iClassName;
 
 	private CIMObjectPath iLocalPath;
@@ -79,7 +78,7 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	/**
@@ -92,7 +91,7 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 
 	@Override
 	public void testCompletness() {
-	// no child nodes to test
+		// no child nodes to test
 	}
 
 	/**
@@ -100,12 +99,12 @@ public void testCompletness() {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// nothing to do
+		// nothing to do
 	}
 
 	/**
 	 * getClassName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getClassName() {
@@ -115,5 +114,4 @@ public String getClassName() {
 	public CIMObjectPath getCIMObjectPath() {
 		return LocalPathBuilder.build(this.iLocalPath, this.iClassName, null);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java
index add4f08..b5c1f00 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassNode.java
@@ -47,7 +47,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMClassProperty;
 import org.metricshub.wbem.javax.cim.CIMMethod;
@@ -62,12 +61,11 @@
  * 
        * ELEMENT CLASS (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*, METHOD*)
  * ATTLIST CLASS
- * %CIMName; 
+ * %CIMName;
  * %SuperClass;
  * 
      
  */
 public class ClassNode extends AbstractObjectNode {
-
 	private String iName;
 
 	private String iSuperClass;
@@ -103,18 +101,15 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
-	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PROPERTY, PROPERTY_ARRAY,
-			PROPERTY_REFERENCE, METHOD };
+	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PROPERTY, PROPERTY_ARRAY, PROPERTY_REFERENCE, METHOD };
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) return;
-		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++) if (ALLOWED_CHILDREN[i] == pNodeNameEnum) return;
+		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	@Override
@@ -133,12 +128,12 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() {
-	// all child nodes are optional
+		// all child nodes are optional
 	}
 
 	/**
 	 * getCIMClass
-	 * 
+	 *
 	 * @return CIMClass
 	 */
 	public CIMClass getCIMClass() {
@@ -148,10 +143,15 @@ public CIMClass getCIMClass() {
 		 * CIMClassProperty[] props, CIMMethod[] pMethods, boolean
 		 * pIsAssociation, boolean pIsKeyed )
 		 */
-		return new CIMClass(LocalPathBuilder.build(this.iLocalPath, this.iName, null),
-				this.iSuperClass, this.iQualiHandler.getQualis(), this.iCIMClassPropAL
-						.toArray(EMPTY_PA), this.iCIMMethodAL.toArray(EMPTY_MA), this.iQualiHandler
-						.isAssociation(), this.iKeyed);
+		return new CIMClass(
+			LocalPathBuilder.build(this.iLocalPath, this.iName, null),
+			this.iSuperClass,
+			this.iQualiHandler.getQualis(),
+			this.iCIMClassPropAL.toArray(EMPTY_PA),
+			this.iCIMMethodAL.toArray(EMPTY_MA),
+			this.iQualiHandler.isAssociation(),
+			this.iKeyed
+		);
 	}
 
 	private static final CIMMethod[] EMPTY_MA = new CIMMethod[0];
@@ -160,14 +160,20 @@ public CIMClass getCIMClass() {
 
 	/**
 	 * getCIMClass
-	 * 
+	 *
 	 * @param pObjPath
 	 * @return CIMClass with the provided object path
 	 */
 	public CIMClass getCIMClass(CIMObjectPath pObjPath) {
-		return new CIMClass(pObjPath, this.iSuperClass, this.iQualiHandler.getQualis(),
-				this.iCIMClassPropAL.toArray(EMPTY_PA), this.iCIMMethodAL.toArray(EMPTY_MA),
-				this.iQualiHandler.isAssociation(), this.iKeyed);
+		return new CIMClass(
+			pObjPath,
+			this.iSuperClass,
+			this.iQualiHandler.getQualis(),
+			this.iCIMClassPropAL.toArray(EMPTY_PA),
+			this.iCIMMethodAL.toArray(EMPTY_MA),
+			this.iQualiHandler.isAssociation(),
+			this.iKeyed
+		);
 	}
 
 	/**
@@ -177,5 +183,4 @@ public CIMClass getCIMClass(CIMObjectPath pObjPath) {
 	public Object getValue() {
 		return getCIMClass();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java
index 060e9a5..3c4accf 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ClassPathNode.java
@@ -55,7 +55,6 @@
  * ELEMENT CLASSPATH (NAMESPACEPATH, CLASSNAME)
  */
 public class ClassPathNode extends AbstractObjectPathNode {
-
 	// child nodes:
 	private boolean iHasNameSpacePath, iHasClassName;
 
@@ -89,19 +88,21 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == NAMESPACEPATH) {
-			if (this.iHasNameSpacePath) throw new SAXException(
-					"CLASSPATH node already has a NAMESPACEPATH child node!");
+			if (this.iHasNameSpacePath) throw new SAXException("CLASSPATH node already has a NAMESPACEPATH child node!");
 		} else if (pNodeNameEnum == CLASSNAME) {
-			if (this.iHasClassName) throw new SAXException(
-					"CLASSPATH node already has a CLASSNAME child node!");
-		} else throw new SAXException("CLASSPATH node cannot have " + pNodeNameEnum
-				+ " child node!" + " It can have NAMESPACEPATH and CLASSNAME child nodes only!");
+			if (this.iHasClassName) throw new SAXException("CLASSPATH node already has a CLASSNAME child node!");
+		} else throw new SAXException(
+			"CLASSPATH node cannot have " +
+			pNodeNameEnum +
+			" child node!" +
+			" It can have NAMESPACEPATH and CLASSNAME child nodes only!"
+		);
 	}
 
 	@Override
@@ -119,10 +120,8 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (!this.iHasNameSpacePath) throw new SAXException(
-				"NAMESPACEPATH child node is mandatory for CLASSPATH node!");
-		if (!this.iHasClassName) throw new SAXException(
-				"CLASSNAME child node is mandatory for CLASSPATH node!");
+		if (!this.iHasNameSpacePath) throw new SAXException("NAMESPACEPATH child node is mandatory for CLASSPATH node!");
+		if (!this.iHasClassName) throw new SAXException("CLASSNAME child node is mandatory for CLASSPATH node!");
 	}
 
 	public CIMObjectPath getCIMObjectPath() {
@@ -130,8 +129,13 @@ public CIMObjectPath getCIMObjectPath() {
 		 * CIMObjectPath( String scheme, String host, String port, String
 		 * namespace, String objectName, CIMProperty[] keys )
 		 */
-		return new CIMObjectPath(this.iHostStr.getProtocol(), this.iHostStr.getHost(),
-				this.iHostStr.getPort(), this.iLocalNameSpacePathStr, this.iClassNameStr, null);
+		return new CIMObjectPath(
+			this.iHostStr.getProtocol(),
+			this.iHostStr.getHost(),
+			this.iHostStr.getPort(),
+			this.iLocalNameSpacePathStr,
+			this.iClassNameStr,
+			null
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java
index 361198a..3589d30 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/CorrelatorNode.java
@@ -51,7 +51,6 @@
  * 
  */
 public class CorrelatorNode extends Node implements TypedIf, ValueIf {
-
 	// private String iName;
 
 	private CIMDataType iType;
@@ -83,15 +82,15 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != VALUE) throw new SAXException(pNodeNameEnum
-				+ " cannot be the child node of " + getNodeName() + " node!");
-		if (this.iHasValue) throw new SAXException(getNodeName()
-				+ " node can have only one child node!");
+		if (pNodeNameEnum != VALUE) throw new SAXException(
+			pNodeNameEnum + " cannot be the child node of " + getNodeName() + " node!"
+		);
+		if (this.iHasValue) throw new SAXException(getNodeName() + " node can have only one child node!");
 	}
 
 	@Override
@@ -102,8 +101,7 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (!this.iHasValue) throw new SAXException(getNodeName()
-				+ " node must have one VALUE child node!");
+		if (!this.iHasValue) throw new SAXException(getNodeName() + " node must have one VALUE child node!");
 	}
 
 	public CIMDataType getType() {
@@ -113,5 +111,4 @@ public CIMDataType getType() {
 	public Object getValue() {
 		return this.iValue;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java
index 5906660..2ae221e 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorIf.java
@@ -45,12 +45,10 @@
  * This interface is implemented by Nodes which can provide CIMError info.
  */
 public interface ErrorIf {
-
 	/**
 	 * getCIMError
-	 * 
+	 *
 	 * @return CIMError
 	 */
 	public CIMError getCIMError();
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java
index cee89ba..35f50bf 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java
@@ -47,7 +47,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
@@ -63,7 +62,6 @@
  * 
  */
 public class ErrorNode extends Node implements ErrorIf {
-
 	private int iCode;
 
 	private String iDesc;
@@ -84,13 +82,11 @@ public ErrorNode() {
 	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 		this.iCIMInstAL = null;
 		String code = pAttribs.getValue("CODE");
-		if (code == null) throw new SAXException(getNodeName()
-				+ " node must have a CODE attribute!");
+		if (code == null) throw new SAXException(getNodeName() + " node must have a CODE attribute!");
 		try {
 			this.iCode = Integer.parseInt(code);
 		} catch (NumberFormatException e) {
-			throw new SAXException("Failed to parse CODE attribute in " + getNodeName() + " node!",
-					e);
+			throw new SAXException("Failed to parse CODE attribute in " + getNodeName() + " node!", e);
 		}
 		this.iDesc = pAttribs.getValue("DESCRIPTION");
 	}
@@ -100,13 +96,14 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != INSTANCE) throw new SAXException(getNodeName() + " node cannot have "
-				+ pNodeNameEnum + " child node!");
+		if (pNodeNameEnum != INSTANCE) throw new SAXException(
+			getNodeName() + " node cannot have " + pNodeNameEnum + " child node!"
+		);
 	}
 
 	@Override
@@ -117,15 +114,15 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() {
-	// no mandatory child nodes
+		// no mandatory child nodes
 	}
 
 	private static final CIMInstance[] EMPTY_IA = new CIMInstance[0];
 
 	public CIMError getCIMError() {
-		if (this.iCIMInstAL != null) { return new CIMError(this.iCode, this.iDesc, this.iCIMInstAL
-				.toArray(EMPTY_IA)); }
+		if (this.iCIMInstAL != null) {
+			return new CIMError(this.iCode, this.iDesc, this.iCIMInstAL.toArray(EMPTY_IA));
+		}
 		return new CIMError(this.iCode, this.iDesc);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java
index 2fd6cc3..a701e89 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodCallNode.java
@@ -45,7 +45,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -59,10 +58,9 @@
  */
 /**
  * Class ExpMethodCallNode is responsible for
- * 
+ *
  */
 public class ExpMethodCallNode extends Node implements NonVolatileIf {
-
 	private String iName;
 
 	private ArrayList iExpParamValNodeAList;
@@ -93,14 +91,14 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != EXPPARAMVALUE) throw new SAXException(getNodeName()
-				+ " node can have " + EXPPARAMVALUE + " child only! " + pNodeNameEnum
-				+ " is invalid!");
+		if (pNodeNameEnum != EXPPARAMVALUE) throw new SAXException(
+			getNodeName() + " node can have " + EXPPARAMVALUE + " child only! " + pNodeNameEnum + " is invalid!"
+		);
 	}
 
 	/**
@@ -108,22 +106,21 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// nothing to do yet
+		// nothing to do yet
 
 	}
 
 	@Override
 	public void testCompletness() {
-	// no mandatory child
+		// no mandatory child
 	}
 
 	/**
 	 * getName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getName() {
 		return this.iName;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java
index 27bef4d..a0af686 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpMethodResponseNode.java
@@ -57,7 +57,6 @@
  * 
  */
 public class ExpMethodResponseNode extends Node implements ErrorIf, RetValPipeIf, NonVolatileIf {
-
 	private String iName;
 
 	private ErrorNode iErrorNode;
@@ -72,8 +71,8 @@ public ExpMethodResponseNode() {
 	}
 
 	public void addChild(Node pChild) {
-		if (pChild instanceof ErrorNode) this.iErrorNode = (ErrorNode) pChild;
-		else this.iRetValNode = (IReturnValueNode) pChild;
+		if (pChild instanceof ErrorNode) this.iErrorNode = (ErrorNode) pChild; else this.iRetValNode =
+			(IReturnValueNode) pChild;
 	}
 
 	/**
@@ -91,21 +90,24 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == ERROR || pNodeNameEnum == IRETURNVALUE) {
 			Node node;
-			if (this.iErrorNode != null) node = this.iErrorNode;
-			else if (this.iRetValNode != null) node = this.iRetValNode;
-			else node = null;
-			if (node != null) throw new SAXException(pNodeNameEnum + " child node is invalid for "
-					+ getNodeName() + " node, since it already has a " + node.getNodeName()
-					+ " child node!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+			if (this.iErrorNode != null) node = this.iErrorNode; else if (this.iRetValNode != null) node =
+				this.iRetValNode; else node = null;
+			if (node != null) throw new SAXException(
+				pNodeNameEnum +
+				" child node is invalid for " +
+				getNodeName() +
+				" node, since it already has a " +
+				node.getNodeName() +
+				" child node!"
+			);
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	/**
@@ -113,12 +115,12 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// nothing to do yet
+		// nothing to do yet
 	}
 
 	@Override
 	public void testCompletness() {
-	// no mandatory child nodes
+		// no mandatory child nodes
 	}
 
 	public CIMError getCIMError() {
@@ -135,7 +137,7 @@ public Object readReturnValue() {
 
 	/**
 	 * getName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getName() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java
index 0204136..10d703d 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ExpParamValueNode.java
@@ -56,7 +56,6 @@
  * 
  */
 public class ExpParamValueNode extends Node implements NonVolatileIf {
-
 	private String iName;
 
 	private Node iChildNode;
@@ -86,15 +85,15 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iChildNode != null) throw new SAXException(getNodeName()
-				+ " node can have only one child node!");
-		if (pNodeNameEnum != INSTANCE) throw new SAXException(getNodeName() + " node cannot have "
-				+ pNodeNameEnum + " child node!");
+		if (this.iChildNode != null) throw new SAXException(getNodeName() + " node can have only one child node!");
+		if (pNodeNameEnum != INSTANCE) throw new SAXException(
+			getNodeName() + " node cannot have " + pNodeNameEnum + " child node!"
+		);
 	}
 
 	/**
@@ -102,21 +101,20 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// nothing to do yet
+		// nothing to do yet
 	}
 
 	@Override
 	public void testCompletness() {
-	// child node is optional
+		// child node is optional
 	}
 
 	/**
 	 * getName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getName() {
 		return this.iName;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java
index 58adab7..e19ecc0 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/HostNode.java
@@ -51,7 +51,6 @@
  * ELEMENT HOST (#PCDATA)
  */
 public class HostNode extends Node {
-
 	private String iHost;
 
 	/**
@@ -89,23 +88,21 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// no child node
+		// no child node
 
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iHost == null) throw new SAXException(
-				"HOST node must contain the host name as #PCDATA!");
+		if (this.iHost == null) throw new SAXException("HOST node must contain the host name as #PCDATA!");
 	}
 
 	/**
 	 * getHostStr
-	 * 
+	 *
 	 * @return String which may contain the protocol, host and port
 	 */
 	public String getHostStr() {
 		return this.iHost;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java
index 7fc0f18..ca11707 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodCallNode.java
@@ -62,16 +62,16 @@ public IMethodCallNode() {
 	@Override
 	protected void testSpecChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == LOCALNAMESPACEPATH) {
-			if (this.iPath != null) throw new SAXException(getNodeName()
-					+ " node can have only one " + pNodeNameEnum + " child node!");
-		} else if (pNodeNameEnum != IPARAMVALUE) throw new SAXException(getNodeName()
-				+ " node cannot have " + pNodeNameEnum + " child node!");
+			if (this.iPath != null) throw new SAXException(
+				getNodeName() + " node can have only one " + pNodeNameEnum + " child node!"
+			);
+		} else if (pNodeNameEnum != IPARAMVALUE) throw new SAXException(
+			getNodeName() + " node cannot have " + pNodeNameEnum + " child node!"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iPath == null) throw new SAXException(
-				"IMETHODCALL node must have a LOCALNAMESPACEPATH child node!");
+		if (this.iPath == null) throw new SAXException("IMETHODCALL node must have a LOCALNAMESPACEPATH child node!");
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java
index b671249..d9f22c6 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IMethodResponseNode.java
@@ -47,7 +47,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
@@ -58,15 +57,14 @@
  * 
        * ELEMENT IMETHODRESPONSE (ERROR|IRETURNVALUE?)
  * ATTLIST IMETHODRESPONSE
- *   %CIMName; 
+ *   %CIMName;
  * 
      
  */
 /**
  * Class IMethodResponseNode is responsible for
- * 
+ *
  */
 public class IMethodResponseNode extends Node implements ErrorIf, RetValPipeIf, NonVolatileIf {
-
 	private String iName;
 
 	private ErrorNode iErrorNode;
@@ -114,34 +112,44 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == ERROR) {
 			String ownedNodeName;
-			if (this.iHasRetVal) ownedNodeName = IRETURNVALUE;
-			else if (this.iHasError) ownedNodeName = ERROR;
-			else if (this.iCIMArgAL != null && this.iCIMArgAL.size() > 0) ownedNodeName = PARAMVALUE;
-			else ownedNodeName = null;
-			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has a " + ownedNodeName + " child node!");
+			if (this.iHasRetVal) ownedNodeName = IRETURNVALUE; else if (this.iHasError) ownedNodeName = ERROR; else if (
+				this.iCIMArgAL != null && this.iCIMArgAL.size() > 0
+			) ownedNodeName = PARAMVALUE; else ownedNodeName = null;
+			if (ownedNodeName != null) throw new SAXException(
+				pNodeNameEnum +
+				" child node is invalid for " +
+				getNodeName() +
+				" node, since it already has a " +
+				ownedNodeName +
+				" child node!"
+			);
 		} else if (pNodeNameEnum == IRETURNVALUE) {
 			String ownedNodeName;
-			if (this.iHasRetVal) ownedNodeName = IRETURNVALUE;
-			else if (this.iHasError) ownedNodeName = ERROR;
-			else ownedNodeName = null;
-			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has a " + ownedNodeName + " child node!");
+			if (this.iHasRetVal) ownedNodeName = IRETURNVALUE; else if (this.iHasError) ownedNodeName =
+				ERROR; else ownedNodeName = null;
+			if (ownedNodeName != null) throw new SAXException(
+				pNodeNameEnum +
+				" child node is invalid for " +
+				getNodeName() +
+				" node, since it already has a " +
+				ownedNodeName +
+				" child node!"
+			);
 		} else if (pNodeNameEnum == PARAMVALUE) {
-			if (this.iHasError) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has an ERROR child node!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+			if (this.iHasError) throw new SAXException(
+				pNodeNameEnum +
+				" child node is invalid for " +
+				getNodeName() +
+				" node, since it already has an ERROR child node!"
+			);
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	/**
@@ -155,8 +163,7 @@ public void childParsed(Node pChild) {
 		} else if (pChild instanceof IReturnValueNode) {
 			this.iHasRetVal = true;
 			this.iRetValNode = (IReturnValueNode) pChild;
-		} else
-		// Values of parameters should be stored in array
+		} else // Values of parameters should be stored in array
 		if (pChild instanceof ParamValueNode) {
 			if (this.iCIMArgAL == null) this.iCIMArgAL = new ArrayList>();
 			this.iCIMArgAL.add(((ParamValueNode) pChild).getCIMArgument());
@@ -165,7 +172,7 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() {
-	// no mandatory child nodes
+		// no mandatory child nodes
 	}
 
 	public CIMError getCIMError() {
@@ -182,7 +189,7 @@ public Object readReturnValue() {
 
 	/**
 	 * getName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getName() {
@@ -192,12 +199,11 @@ public String getName() {
 	/**
 	 * getCIMArguments : returns the array of parsed parameters and their values
 	 * : String name, CIMDataType type, Object value
-	 * 
+	 *
 	 * @return CIMArgument<?>[]
 	 */
 	public CIMArgument[] getCIMArguments() {
 		if (this.iCIMArgAL == null || this.iCIMArgAL.size() == 0) return null;
 		return this.iCIMArgAL.toArray(EMPTY_ARG_A);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java
index 553ee7d..f7865fe 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IParamValueNode.java
@@ -54,9 +54,9 @@
 /**
  * FIXME: Why hasn't it got TYPE attribute? For VALUE and VALUE.ARRAY it would
  * be necessary.
- * 
+ *
  * 
      - * 
+ *
  * ELEMENT IPARAMVALUE (VALUE | VALUE.ARRAY | VALUE.REFERENCE | INSTANCENAME | CLASSNAME |
  *   QUALIFIER.DECLARATION | CLASS | INSTANCE | VALUE.NAMEDINSTANCE)?
  * ATTLIST IPARAMVALUE
@@ -64,7 +64,6 @@
  * 
      
  */
 public class IParamValueNode extends AbstractParamValueNode {
-
 	private String iName;
 
 	/**
@@ -98,11 +97,20 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
-	private static final String[] ALLOWED_CHILDREN = { VALUE, VALUE_ARRAY, VALUE_REFERENCE,
-			INSTANCENAME, CLASSNAME, QUALIFIER_DECLARATION, CLASS, INSTANCE, VALUE_NAMEDINSTANCE };
+	private static final String[] ALLOWED_CHILDREN = {
+		VALUE,
+		VALUE_ARRAY,
+		VALUE_REFERENCE,
+		INSTANCENAME,
+		CLASSNAME,
+		QUALIFIER_DECLARATION,
+		CLASS,
+		INSTANCE,
+		VALUE_NAMEDINSTANCE
+	};
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
@@ -113,31 +121,28 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 				break;
 			}
 		}
-		if (!allowed) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+		if (!allowed) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 		/*
 		 * this kind of check is not so strict (ValueNode.getValue() can return
 		 * null)
 		 */
-		if (this.iValue != null) throw new SAXException(getNodeName()
-				+ " node cannot have more than one child node!");
-
+		if (this.iValue != null) throw new SAXException(getNodeName() + " node cannot have more than one child node!");
 	}
 
 	@Override
 	public void childParsed(Node pChild) {
 		this.iValue = ((ValueIf) pChild).getValue();
 		this.iIsArray = pChild instanceof ArrayIf;
-		if (pChild instanceof TypedIf) this.iType = ((TypedIf) pChild).getType();
-		else if (pChild instanceof ObjectPathIf) this.iType = CIMDataType
-				.getDataType(((ObjectPathIf) pChild).getCIMObjectPath());
-		else if (pChild instanceof ValueIf) this.iType = CIMDataType.getDataType(((ValueIf) pChild)
-				.getValue());
+		if (pChild instanceof TypedIf) this.iType = ((TypedIf) pChild).getType(); else if (
+			pChild instanceof ObjectPathIf
+		) this.iType = CIMDataType.getDataType(((ObjectPathIf) pChild).getCIMObjectPath()); else if (
+			pChild instanceof ValueIf
+		) this.iType = CIMDataType.getDataType(((ValueIf) pChild).getValue());
 	}
 
 	@Override
 	public void testCompletness() {
-	// child node is optional
+		// child node is optional
 	}
 
 	@Override
@@ -147,7 +152,7 @@ public CIMArgument getCIMArgument() {
 
 	/**
 	 * getName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getName() {
@@ -155,12 +160,10 @@ public String getName() {
 	}
 
 	public CIMDataType getType() {
-		return this.iType == null ? (this.iIsArray ? CIMDataType.STRING_ARRAY_T
-				: CIMDataType.STRING_T) : this.iType;
+		return this.iType == null ? (this.iIsArray ? CIMDataType.STRING_ARRAY_T : CIMDataType.STRING_T) : this.iType;
 	}
 
 	public Object getValue() {
 		return this.iValue;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java
index 3760369..4e41fbd 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/IReturnValueNode.java
@@ -46,14 +46,13 @@
  */
 
 import java.util.LinkedList;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
 /**
  * 
      - * 
+ *
  * ELEMENT IRETURNVALUE (
  *   CLASSNAME* | INSTANCENAME* | VALUE* | VALUE.OBJECTWITHPATH* | VALUE.OBJECTWITHLOCALPATH* |
  *   VALUE.OBJECT* | OBJECTPATH* | QUALIFIER.DECLARATION* | VALUE.ARRAY? | VALUE.REFERENCE? |
@@ -62,7 +61,6 @@
  * 
      
  */
 public class IReturnValueNode extends Node implements RetValPipeIf, NonVolatileIf {
-
 	private String iChildNameEnum;
 
 	private LinkedList iChildValueLL;
@@ -77,7 +75,9 @@ public IReturnValueNode() {
 	/**
 	 * @param pChild
 	 */
-	public void addChild(Node pChild) { /* we don't need it here */}
+	public void addChild(Node pChild) {
+		/* we don't need it here */
+	}
 
 	/**
 	 * @param pAttribs
@@ -97,13 +97,26 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
-	private static final String[] ALLOWED_CHILDREN = { CLASSNAME, INSTANCENAME, INSTANCEPATH,
-			VALUE, VALUE_OBJECTWITHPATH, VALUE_OBJECTWITHLOCALPATH, VALUE_OBJECT, OBJECTPATH,
-			QUALIFIER_DECLARATION, VALUE_ARRAY, VALUE_REFERENCE, CLASS, INSTANCE,
-			VALUE_NAMEDINSTANCE, VALUE_INSTANCEWITHPATH };
+	private static final String[] ALLOWED_CHILDREN = {
+		CLASSNAME,
+		INSTANCENAME,
+		INSTANCEPATH,
+		VALUE,
+		VALUE_OBJECTWITHPATH,
+		VALUE_OBJECTWITHLOCALPATH,
+		VALUE_OBJECT,
+		OBJECTPATH,
+		QUALIFIER_DECLARATION,
+		VALUE_ARRAY,
+		VALUE_REFERENCE,
+		CLASS,
+		INSTANCE,
+		VALUE_NAMEDINSTANCE,
+		VALUE_INSTANCEWITHPATH
+	};
 
 	// private static final String[] SINGLE_CHILDREN = { VALUE_ARRAY,
 	// VALUE_REFERENCE };
@@ -114,19 +127,23 @@ public void parseData(String pData) {
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (this.iChildNameEnum != null) {
-			if (pNodeNameEnum != this.iChildNameEnum) throw new SAXException(getNodeName()
-					+ " node cannot have " + pNodeNameEnum + " child node, since it already has "
-					+ this.iChildNameEnum + " child node(s)!");
+			if (pNodeNameEnum != this.iChildNameEnum) throw new SAXException(
+				getNodeName() +
+				" node cannot have " +
+				pNodeNameEnum +
+				" child node, since it already has " +
+				this.iChildNameEnum +
+				" child node(s)!"
+			);
 			if (this.iChildNameEnum == VALUE_ARRAY || this.iChildNameEnum == VALUE_REFERENCE) throw new SAXException(
-					getNodeName() + " node can have only one " + this.iChildNameEnum
-							+ " child node!");
+				getNodeName() + " node can have only one " + this.iChildNameEnum + " child node!"
+			);
 		} else {
 			boolean found = false;
 			for (int i = 0; i < ALLOWED_CHILDREN.length; i++) {
 				if ((found = (pNodeNameEnum == ALLOWED_CHILDREN[i])) == true) break;
 			}
-			if (!found) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-					+ " child node!");
+			if (!found) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 		}
 	}
 
@@ -141,7 +158,7 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() {
-	// child nodes are optional
+		// child nodes are optional
 	}
 
 	public int getReturnValueCount() {
@@ -151,5 +168,4 @@ public int getReturnValueCount() {
 	public Object readReturnValue() {
 		return this.iChildValueLL == null ? null : this.iChildValueLL.removeFirst();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java
index 8de2296..476915e 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNameNode.java
@@ -46,11 +46,10 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -63,7 +62,6 @@
  * 
  */
 public class InstanceNameNode extends AbstractPathNode {
-
 	private String iClassName;
 
 	private ArrayList> iCIMPropAL;
@@ -92,46 +90,53 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	private static final String[] ALLOWED_CHILDREN = { KEYBINDING, KEYVALUE, VALUE_REFERENCE };
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
-				if (this.iNodeName != null && this.iNodeName != pNodeNameEnum) throw new SAXException(
-						getNodeName() + " node cannot have " + pNodeNameEnum
-								+ " child node, it already has a " + this.iNodeName + "!");
-				if (pNodeNameEnum != KEYBINDING) {
-					if (this.iNodeName != null) throw new SAXException(getNodeName()
-							+ " node can have only one " + pNodeNameEnum + " child node!");
-				}
-				this.iNodeName = pNodeNameEnum;
-				return;
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++) if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
+			if (this.iNodeName != null && this.iNodeName != pNodeNameEnum) throw new SAXException(
+				getNodeName() + " node cannot have " + pNodeNameEnum + " child node, it already has a " + this.iNodeName + "!"
+			);
+			if (pNodeNameEnum != KEYBINDING) {
+				if (this.iNodeName != null) throw new SAXException(
+					getNodeName() + " node can have only one " + pNodeNameEnum + " child node!"
+				);
 			}
-		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+			this.iNodeName = pNodeNameEnum;
+			return;
+		}
+		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	@Override
 	public void childParsed(Node pChild) {
 		if (this.iCIMPropAL == null) this.iCIMPropAL = new ArrayList>();
-		if (pChild instanceof KeyBindingNode) this.iCIMPropAL.add(((KeyBindingNode) pChild)
-				.getCIMProperty());
-		else this.iCIMPropAL.add(new CIMProperty("", ((AbstractScalarValueNode) pChild)
-				.getType(), ((AbstractScalarValueNode) pChild).getValue(), true, false, null));
+		if (pChild instanceof KeyBindingNode) this.iCIMPropAL.add(
+				((KeyBindingNode) pChild).getCIMProperty()
+			); else this.iCIMPropAL.add(
+				new CIMProperty(
+					"",
+					((AbstractScalarValueNode) pChild).getType(),
+					((AbstractScalarValueNode) pChild).getValue(),
+					true,
+					false,
+					null
+				)
+			);
 	}
 
 	@Override
 	public void testCompletness() {
-	// no mandatory child nodes
+		// no mandatory child nodes
 	}
 
 	/**
 	 * getClassName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getClassName() {
@@ -142,7 +147,7 @@ public String getClassName() {
 
 	/**
 	 * getKeys
-	 * 
+	 *
 	 * @return CIMProperty[]
 	 */
 	public CIMProperty[] getKeys() {
@@ -157,5 +162,4 @@ public CIMObjectPath getCIMObjectPath() {
 		 */
 		return LocalPathBuilder.build(this.iLocalPath, this.iClassName, null, getKeys());
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java
index aa603f9..a2b33f6 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstanceNode.java
@@ -46,14 +46,13 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -66,7 +65,6 @@
  * 
  */
 public class InstanceNode extends AbstractObjectNode {
-
 	private String iClassName;
 
 	/**
@@ -97,18 +95,15 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
-	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PROPERTY, PROPERTY_ARRAY,
-			PROPERTY_REFERENCE };
+	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PROPERTY, PROPERTY_ARRAY, PROPERTY_REFERENCE };
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) return;
-		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++) if (ALLOWED_CHILDREN[i] == pNodeNameEnum) return;
+		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	@Override
@@ -120,28 +115,28 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() {
-	// all child nodes are optional
+		// all child nodes are optional
 	}
 
 	/**
 	 * getCIMInstance
-	 * 
+	 *
 	 * @return CIMInstance
 	 */
 	public CIMInstance getCIMInstance() {
-		return new CIMInstance(LocalPathBuilder.build(this.iLocalPath, this.iClassName, null),
-				getProps());
+		return new CIMInstance(LocalPathBuilder.build(this.iLocalPath, this.iClassName, null), getProps());
 	}
 
 	/**
 	 * getCIMInstance
-	 * 
+	 *
 	 * @param pObjPath
 	 * @return CIMInstance with the provided object path
 	 */
 	public CIMInstance getCIMInstance(CIMObjectPath pObjPath) {
-		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
-				.CIMInstanceWithSynchonizedNumericKeyDataTypes(pObjPath, getProps());
+		if (
+			WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()
+		) return CIMHelper.CIMInstanceWithSynchonizedNumericKeyDataTypes(pObjPath, getProps());
 		return new CIMInstance(pObjPath, getProps());
 	}
 
@@ -159,5 +154,4 @@ private CIMProperty[] getProps() {
 		if (this.iCIMPropAL == null) return null;
 		return this.iCIMPropAL.toArray(EMPTY_PA);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java
index 3f34d17..b911b7a 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/InstancePathNode.java
@@ -46,9 +46,9 @@
  */
 
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.metricshub.wbem.sblim.cimclient.internal.util.XMLHostStr;
-import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -56,7 +56,6 @@
  * ELEMENT INSTANCEPATH (NAMESPACEPATH, INSTANCENAME)
  */
 public class InstancePathNode extends AbstractObjectPathNode {
-
 	// INSTANCEPATH
 	private boolean iHasInstancePath;
 
@@ -94,12 +93,11 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == NAMESPACEPATH) {
 			if (this.iHasInstancePath) throw new SAXException(
-					"INSTANCEPATH node can have only one NAMESPACEPATH child node!");
+				"INSTANCEPATH node can have only one NAMESPACEPATH child node!"
+			);
 		} else if (pNodeNameEnum == INSTANCENAME) {
-			if (this.iHasInstanceName) throw new SAXException(
-					"INSTANCEPATH node can have only one INSTANCENAME child node!");
-		} else throw new SAXException("INSTANCEPATH node cannot have " + pNodeNameEnum
-				+ " child node!");
+			if (this.iHasInstanceName) throw new SAXException("INSTANCEPATH node can have only one INSTANCENAME child node!");
+		} else throw new SAXException("INSTANCEPATH node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	/**
@@ -107,7 +105,7 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
@@ -127,10 +125,8 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (!this.iHasInstancePath) throw new SAXException(
-				"INSTANCEPATH node must have a NAMESPACEPATH child node!");
-		if (!this.iHasInstanceName) throw new SAXException(
-				"INSTANCEPATH node must have an INSTANCENAME child node!");
+		if (!this.iHasInstancePath) throw new SAXException("INSTANCEPATH node must have a NAMESPACEPATH child node!");
+		if (!this.iHasInstanceName) throw new SAXException("INSTANCEPATH node must have an INSTANCENAME child node!");
 	}
 
 	public CIMObjectPath getCIMObjectPath() {
@@ -138,9 +134,13 @@ public CIMObjectPath getCIMObjectPath() {
 		 * CIMObjectPath( String scheme, String host, String port, String
 		 * namespace, String objectName, CIMProperty[] keys )
 		 */
-		return new CIMObjectPath(this.iHostStr.getProtocol(), this.iHostStr.getHost(),
-				this.iHostStr.getPort(), this.iLocalNameSpacePathStr, this.iClassNameStr,
-				this.iKeys);
+		return new CIMObjectPath(
+			this.iHostStr.getProtocol(),
+			this.iHostStr.getHost(),
+			this.iHostStr.getPort(),
+			this.iLocalNameSpacePathStr,
+			this.iClassNameStr,
+			this.iKeys
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java
index d4da725..1fc4c54 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyBindingNode.java
@@ -45,8 +45,8 @@
  */
 
 import org.metricshub.wbem.javax.cim.CIMDataType;
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -54,7 +54,6 @@
  * ELEMENT KEYBINDING (KEYVALUE | VALUE.REFERENCE) ATTLIST KEYBINDING %CIMName;
  */
 public class KeyBindingNode extends Node {
-
 	private String iName;
 
 	// child element
@@ -86,15 +85,15 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (this.iHasChild) throw new SAXException("KEYBINDING node can only have one child node!");
 		if (pNodeNameEnum != KEYVALUE && pNodeNameEnum != VALUE_REFERENCE) throw new SAXException(
-				"KEYBINDING node's child node can be KEYVALUE or VALUE_REFERENCE but not "
-						+ pNodeNameEnum);
+			"KEYBINDING node's child node can be KEYVALUE or VALUE_REFERENCE but not " + pNodeNameEnum
+		);
 	}
 
 	@Override
@@ -107,13 +106,12 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (!this.iHasChild) throw new SAXException(
-				"KEYBINDING node must have a KEYVALUE or VALUE_REFERENCE child node!");
+		if (!this.iHasChild) throw new SAXException("KEYBINDING node must have a KEYVALUE or VALUE_REFERENCE child node!");
 	}
 
 	/**
 	 * getCIMProperty
-	 * 
+	 *
 	 * @return CIMProperty
 	 */
 	public CIMProperty getCIMProperty() {
@@ -123,5 +121,4 @@ public CIMProperty getCIMProperty() {
 		// )
 		return new CIMProperty(this.iName, this.iType, this.iValue, true, false, null);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java
index f323511..e075e32 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java
@@ -53,12 +53,12 @@
 import org.metricshub.wbem.javax.cim.CIMDataType;
 import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
 import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
+import org.metricshub.wbem.javax.cim.UnsignedInteger64;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
 import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
-import org.metricshub.wbem.javax.cim.UnsignedInteger64;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -67,7 +67,6 @@
  * numeric) "string" %CIMType; #IMPLIED
  */
 public class KeyValueNode extends AbstractScalarValueNode {
-
 	private CIMDataType iType;
 
 	private String iValueTypeStr;
@@ -119,12 +118,12 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// no child
+		// no child
 	}
 
 	@Override
 	public void testCompletness() {
-	// nothing to do
+		// nothing to do
 	}
 
 	public Object getValue() {
@@ -144,18 +143,27 @@ private void setTypeAndValue(String pValue) throws SAXException {
 
 		if (this.iValueTypeStr.equals("numeric")) {
 			if (!setUInt64(pValue) && !setSInt64(pValue) && !setReal64(pValue)) throw new SAXException(
-					"Unparseable \"number\" value in " + getNodeName() + " node: " + pValue + "!");
+				"Unparseable \"number\" value in " + getNodeName() + " node: " + pValue + "!"
+			);
 		} else if (this.iValueTypeStr.equals(MOF.DT_STR)) {
 			if (!setDTAbsolute(pValue) && !setDTInterval(pValue)) {
 				this.iValue = pValue;
 				this.iType = CIMDataType.STRING_T;
 			}
 		} else if (this.iValueTypeStr.equals(MOF.DT_BOOL)) {
-			if (!setBoolean(pValue)) throw new SAXException("Unparseable \"boolean\" value in "
-					+ getNodeName() + " node: " + pValue + "!");
+			if (!setBoolean(pValue)) throw new SAXException(
+				"Unparseable \"boolean\" value in " + getNodeName() + " node: " + pValue + "!"
+			);
 		} else {
-			throw new SAXException("KEYVALUE node's VALUETYPE attribute must be " + MOF.DT_STR
-					+ ", " + MOF.DT_BOOL + " or numeric! " + pValue + " is not allowed!");
+			throw new SAXException(
+				"KEYVALUE node's VALUETYPE attribute must be " +
+				MOF.DT_STR +
+				", " +
+				MOF.DT_BOOL +
+				" or numeric! " +
+				pValue +
+				" is not allowed!"
+			);
 		}
 	}
 
@@ -217,5 +225,4 @@ private boolean setDTInterval(String pValue) {
 		this.iType = CIMDataType.DATETIME_T;
 		return true;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java
index bf0fbb3..9cacb6e 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalClassPathNode.java
@@ -56,7 +56,6 @@
  * ELEMENT LOCALCLASSPATH (LOCALNAMESPACEPATH, CLASSNAME)
  */
 public class LocalClassPathNode extends AbstractObjectPathNode {
-
 	// LOCALNAMESPACEPATH
 	private boolean iHasLocalNameSpacePath, iHasClassName;
 
@@ -91,20 +90,23 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == LOCALNAMESPACEPATH) {
 			if (this.iHasLocalNameSpacePath) throw new SAXException(
-					"LOCALCLASSPATH node already has a LOCALNAMESPACEPATH child node!");
+				"LOCALCLASSPATH node already has a LOCALNAMESPACEPATH child node!"
+			);
 		} else if (pNodeNameEnum == CLASSNAME) {
-			if (this.iHasClassName) throw new SAXException(
-					"LOCALCLASSPATH node already has a CLASSNAME child node!");
-		} else throw new SAXException("LOCALCLASSPATH node cannot have " + pNodeNameEnum
-				+ " child node!"
-				+ " It can have LOCALNAMESPACEPATH and CLASSNAME child nodes only!");
+			if (this.iHasClassName) throw new SAXException("LOCALCLASSPATH node already has a CLASSNAME child node!");
+		} else throw new SAXException(
+			"LOCALCLASSPATH node cannot have " +
+			pNodeNameEnum +
+			" child node!" +
+			" It can have LOCALNAMESPACEPATH and CLASSNAME child nodes only!"
+		);
 	}
 
 	@Override
@@ -121,13 +123,12 @@ public void childParsed(Node pChild) {
 	@Override
 	public void testCompletness() throws SAXException {
 		if (!this.iHasLocalNameSpacePath) throw new SAXException(
-				"LOCALNAMESPACE child node is mandatory for LOCALCLASSPATH node!");
-		if (!this.iHasClassName) throw new SAXException(
-				"CLASSNAME child node is mandatory for LOCALCLASSPATH node!");
+			"LOCALNAMESPACE child node is mandatory for LOCALCLASSPATH node!"
+		);
+		if (!this.iHasClassName) throw new SAXException("CLASSNAME child node is mandatory for LOCALCLASSPATH node!");
 	}
 
 	public CIMObjectPath getCIMObjectPath() {
 		return LocalPathBuilder.build(this.iLocalPath, this.iClassNameStr, this.iNameSpaceStr);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java
index f4eb1d4..74b4c91 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalInstancePathNode.java
@@ -46,9 +46,9 @@
  */
 
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
+import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.LocalPathBuilder;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -56,7 +56,6 @@
  * ELEMENT LOCALINSTANCEPATH (LOCALNAMESPACEPATH, INSTANCENAME)
  */
 public class LocalInstancePathNode extends AbstractObjectPathNode {
-
 	// LOCALNAMESPACEPATH
 	private boolean iHasLocalNameSpacePath;
 
@@ -96,19 +95,20 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == LOCALNAMESPACEPATH) {
-			if (this.iHasLocalNameSpacePath) throw new SAXException(getNodeName()
-					+ " node can have only one LOCALNAMESPACEPATH child node!");
+			if (this.iHasLocalNameSpacePath) throw new SAXException(
+				getNodeName() + " node can have only one LOCALNAMESPACEPATH child node!"
+			);
 		} else if (pNodeNameEnum == INSTANCENAME) {
-			if (this.iHasInstanceName) throw new SAXException(getNodeName()
-					+ " node can have only one INSTANCENAME child node!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+			if (this.iHasInstanceName) throw new SAXException(
+				getNodeName() + " node can have only one INSTANCENAME child node!"
+			);
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	@Override
@@ -126,17 +126,15 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (!this.iHasLocalNameSpacePath) throw new SAXException(getNodeName()
-				+ " node must have a LOCALNAMESPACEPATH child node!");
-		if (!this.iHasInstanceName) throw new SAXException(getNodeName()
-				+ " node must have a INSTANCENAME child node!");
+		if (!this.iHasLocalNameSpacePath) throw new SAXException(
+			getNodeName() + " node must have a LOCALNAMESPACEPATH child node!"
+		);
+		if (!this.iHasInstanceName) throw new SAXException(getNodeName() + " node must have a INSTANCENAME child node!");
 	}
 
 	public CIMObjectPath getCIMObjectPath() {
 		// CIMObjectPath(String objectName, String namespace, CIMProperty[]
 		// keys)
-		return LocalPathBuilder.build(this.iLocalPath, this.iClassNameStr, this.iNameSpaceStr,
-				this.iKeys);
+		return LocalPathBuilder.build(this.iLocalPath, this.iClassNameStr, this.iNameSpaceStr, this.iKeys);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java
index 4948b9d..dd12394 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/LocalNameSpacePathNode.java
@@ -56,7 +56,6 @@
  * ELEMENT LOCALNAMESPACEPATH (NAMESPACE+)
  */
 public class LocalNameSpacePathNode extends AbstractPathNode {
-
 	private StringBuffer iNameSpaceStrBuf;
 
 	private String iNameSpaceStr;
@@ -89,14 +88,14 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != NAMESPACE) throw new SAXException(getNodeName()
-				+ " node can have NAMESPACE child node only! " + pNodeNameEnum
-				+ " child node is invalid!");
+		if (pNodeNameEnum != NAMESPACE) throw new SAXException(
+			getNodeName() + " node can have NAMESPACE child node only! " + pNodeNameEnum + " child node is invalid!"
+		);
 	}
 
 	@Override
@@ -112,27 +111,30 @@ public void childParsed(Node pChild) {
 	@Override
 	public void testCompletness() throws SAXException {
 		if (this.iNameSpaceStrBuf == null) {
-			if (WBEMConfiguration.getGlobalConfiguration().allowEmptyLocalNameSpacePath()
-					&& this.iLocalPath != null && this.iLocalPath.getNamespace() != null) return;
-			throw new SAXException(getNodeName()
-					+ " node must have at least one NAMESPACE child node!");
+			if (
+				WBEMConfiguration.getGlobalConfiguration().allowEmptyLocalNameSpacePath() &&
+				this.iLocalPath != null &&
+				this.iLocalPath.getNamespace() != null
+			) return;
+			throw new SAXException(getNodeName() + " node must have at least one NAMESPACE child node!");
 		}
 	}
 
 	/**
 	 * getNameSpace
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getNameSpace() {
 		if (this.iNameSpaceStr != null) return this.iNameSpaceStr;
-		return this.iNameSpaceStr = (this.iNameSpaceStrBuf == null ? this.iLocalPath.getNamespace()
-				: this.iNameSpaceStrBuf.toString());
+		return (
+			this.iNameSpaceStr =
+				(this.iNameSpaceStrBuf == null ? this.iLocalPath.getNamespace() : this.iNameSpaceStrBuf.toString())
+		);
 	}
 
 	public CIMObjectPath getCIMObjectPath() {
 		if (this.iNameSpacePath != null) return this.iNameSpacePath;
 		return this.iNameSpacePath = new CIMObjectPath(null, null, null, getNameSpace(), null, null);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java
index 94ea368..6b297da 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MessageNode.java
@@ -57,7 +57,6 @@
  * 
  */
 public class MessageNode extends Node implements NonVolatileIf {
-
 	private String iID;
 
 	private String iProtocolVersion;
@@ -84,7 +83,8 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 		if (this.iID == null) throw new SAXException("ID attribute is mandatory for MESSAGE node!");
 		this.iProtocolVersion = pAttribs.getValue("PROTOCOLVERSION");
 		if (this.iProtocolVersion == null) throw new SAXException(
-				"PROTOCOLVERSION attribute is mandatory for MESSAGE node!");
+			"PROTOCOLVERSION attribute is mandatory for MESSAGE node!"
+		);
 		this.iAbstractMsgNode = null;
 	}
 
@@ -93,18 +93,24 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
-	private static final String[] ALLOWED_CHILDREN = { SIMPLEREQ, MULTIREQ, SIMPLERSP, MULTIRSP,
-			SIMPLEEXPREQ, MULTIEXPREQ, SIMPLEEXPRSP, MULTIEXPRSP };
+	private static final String[] ALLOWED_CHILDREN = {
+		SIMPLEREQ,
+		MULTIREQ,
+		SIMPLERSP,
+		MULTIRSP,
+		SIMPLEEXPREQ,
+		MULTIEXPREQ,
+		SIMPLEEXPRSP,
+		MULTIEXPRSP
+	};
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iAbstractMsgNode != null) throw new SAXException(
-				"MESSAGE node can have only one child node!");
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (pNodeNameEnum == ALLOWED_CHILDREN[i]) return;
+		if (this.iAbstractMsgNode != null) throw new SAXException("MESSAGE node can have only one child node!");
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++) if (pNodeNameEnum == ALLOWED_CHILDREN[i]) return;
 		throw new SAXException("MESSAGE node cannot have " + pNodeNameEnum + " child node!");
 	}
 
@@ -113,22 +119,20 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// nothing to do
+		// nothing to do
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iAbstractMsgNode == null) throw new SAXException(
-				"MESSAGE node must have a child node!");
+		if (this.iAbstractMsgNode == null) throw new SAXException("MESSAGE node must have a child node!");
 	}
 
 	/**
 	 * getAbstractMessageNode
-	 * 
+	 *
 	 * @return AbstractMessageNode
 	 */
 	public AbstractMessageNode getAbstractMessageNode() {
 		return this.iAbstractMsgNode;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java
index cdae094..ec3d8d6 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodCallNode.java
@@ -62,16 +62,18 @@ public MethodCallNode() {
 	@Override
 	protected void testSpecChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == LOCALCLASSPATH || pNodeNameEnum == LOCALINSTANCEPATH) {
-			if (this.iPath != null) throw new SAXException(getNodeName()
-					+ " node can have only one LOCALINSTANCEPATH or LOCALCLASSPATH child node!");
-		} else if (pNodeNameEnum != PARAMVALUE) throw new SAXException(getNodeName()
-				+ " node cannot have " + pNodeNameEnum + " child node!");
+			if (this.iPath != null) throw new SAXException(
+				getNodeName() + " node can have only one LOCALINSTANCEPATH or LOCALCLASSPATH child node!"
+			);
+		} else if (pNodeNameEnum != PARAMVALUE) throw new SAXException(
+			getNodeName() + " node cannot have " + pNodeNameEnum + " child node!"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
 		if (this.iPath == null) throw new SAXException(
-				"METHODCALL node must have a LOCALINSTANCEPATH or LOCALCLASSPATH child node!");
+			"METHODCALL node must have a LOCALINSTANCEPATH or LOCALCLASSPATH child node!"
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java
index bb07d2d..2914ee6 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodNode.java
@@ -49,7 +49,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMDataType;
 import org.metricshub.wbem.javax.cim.CIMMethod;
 import org.metricshub.wbem.javax.cim.CIMParameter;
@@ -60,7 +59,7 @@
 
 /**
  * 
      - * 
+ *
  * ELEMENT METHOD (QUALIFIER*, (PARAMETER | PARAMETER.REFERENCE | PARAMETER.ARRAY | PARAMETER.REFARRAY)*)
  * ATTLIST METHOD
  *   %CIMName;
@@ -70,7 +69,6 @@
  * 
      
  */
 public class MethodNode extends Node {
-
 	private String iName;
 
 	private CIMDataType iType;
@@ -101,16 +99,15 @@ public MethodNode() {
 	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 		this.iSession = pSession;
 		this.iQualiHandler = QualifiedNodeHandler.init(this.iQualiHandler);
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				this.iSession, this.iQualiHandler, true);
+		this.iEmbObjHandler =
+			EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs, this.iSession, this.iQualiHandler, true);
 
 		if (this.iCIMParamAL != null) this.iCIMParamAL.clear();
 
 		this.iName = getCIMName(pAttribs);
 
 		this.iType = getCIMType(pAttribs, true);
-		if (this.iType != null && this.iType.isArray()) throw new SAXException(
-				"METHOD node's TYPE cannot be an array!");
+		if (this.iType != null && this.iType.isArray()) throw new SAXException("METHOD node's TYPE cannot be an array!");
 		this.iClassOrigin = getClassOrigin(pAttribs);
 		this.iPropagated = getPropagated(pAttribs);
 	}
@@ -120,18 +117,21 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
-	private static final String[] ALLOWED_CHILDREN = { QUALIFIER, PARAMETER, PARAMETER_REFERENCE,
-			PARAMETER_ARRAY, PARAMETER_REFARRAY };
+	private static final String[] ALLOWED_CHILDREN = {
+		QUALIFIER,
+		PARAMETER,
+		PARAMETER_REFERENCE,
+		PARAMETER_ARRAY,
+		PARAMETER_REFARRAY
+	};
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (pNodeNameEnum.equalsIgnoreCase(ALLOWED_CHILDREN[i])) return;
-		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++) if (pNodeNameEnum.equalsIgnoreCase(ALLOWED_CHILDREN[i])) return;
+		throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	@Override
@@ -145,31 +145,35 @@ public void childParsed(Node pChild) {
 	public void testCompletness() throws SAXException {
 		this.iType = this.iEmbObjHandler.getType();
 		if (this.iType != null && this.iType.isArray()) throw new SAXException(
-				"METHOD node's TYPE attribute cannot be an array!");
+			"METHOD node's TYPE attribute cannot be an array!"
+		);
 	}
 
 	/**
 	 * getCIMMethod
-	 * 
+	 *
 	 * @return CIMMethod
 	 */
 	public CIMMethod getCIMMethod() {
 		/*
 		 * CIMMethod( String name, CIMDataType type, CIMQualifier[] qualifiers,
 		 * CIMParameter[] parameters, boolean propagated, String originClass );
-		 * 
+		 *
 		 * EmbeddedObject qualifier mustn't be removed. Return type cannot be
 		 * changed.
-		 * 
+		 *
 		 * The situation changed by the introduction of the strict embedded
 		 * object type parsing.
 		 */
-		return new CIMMethod(this.iName, this.iType, this.iQualiHandler
-				.getQualis(!this.iSession.strictEmbObjParsing()), this.iCIMParamAL == null ? null
-				: (CIMParameter[]) this.iCIMParamAL.toArray(EMPTY_PA), this.iPropagated,
-				this.iClassOrigin);
+		return new CIMMethod(
+			this.iName,
+			this.iType,
+			this.iQualiHandler.getQualis(!this.iSession.strictEmbObjParsing()),
+			this.iCIMParamAL == null ? null : (CIMParameter[]) this.iCIMParamAL.toArray(EMPTY_PA),
+			this.iPropagated,
+			this.iClassOrigin
+		);
 	}
 
 	private static final CIMParameter[] EMPTY_PA = new CIMParameter[0];
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java
index b74a306..8d23e10 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MethodResponseNode.java
@@ -49,7 +49,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
@@ -64,7 +63,6 @@
  * 
  */
 public class MethodResponseNode extends Node implements ErrorIf, RetValPipeIf, NonVolatileIf {
-
 	private String iName;
 
 	private CIMError iError;
@@ -88,7 +86,7 @@ public MethodResponseNode() {
 	 * @param pChild
 	 */
 	public void addChild(Node pChild) {
-	// nothing to do
+		// nothing to do
 	}
 
 	/**
@@ -109,34 +107,44 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == ERROR) {
 			String ownedNodeName;
-			if (this.iHasRetVal) ownedNodeName = RETURNVALUE;
-			else if (this.iHasError) ownedNodeName = ERROR;
-			else if (this.iCIMArgAL != null && this.iCIMArgAL.size() > 0) ownedNodeName = PARAMVALUE;
-			else ownedNodeName = null;
-			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has a " + ownedNodeName + " child node!");
+			if (this.iHasRetVal) ownedNodeName = RETURNVALUE; else if (this.iHasError) ownedNodeName = ERROR; else if (
+				this.iCIMArgAL != null && this.iCIMArgAL.size() > 0
+			) ownedNodeName = PARAMVALUE; else ownedNodeName = null;
+			if (ownedNodeName != null) throw new SAXException(
+				pNodeNameEnum +
+				" child node is invalid for " +
+				getNodeName() +
+				" node, since it already has a " +
+				ownedNodeName +
+				" child node!"
+			);
 		} else if (pNodeNameEnum == RETURNVALUE) {
 			String ownedNodeName;
-			if (this.iHasRetVal) ownedNodeName = RETURNVALUE;
-			else if (this.iHasError) ownedNodeName = ERROR;
-			else ownedNodeName = null;
-			if (ownedNodeName != null) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has a " + ownedNodeName + " child node!");
+			if (this.iHasRetVal) ownedNodeName = RETURNVALUE; else if (this.iHasError) ownedNodeName =
+				ERROR; else ownedNodeName = null;
+			if (ownedNodeName != null) throw new SAXException(
+				pNodeNameEnum +
+				" child node is invalid for " +
+				getNodeName() +
+				" node, since it already has a " +
+				ownedNodeName +
+				" child node!"
+			);
 		} else if (pNodeNameEnum == PARAMVALUE) {
-			if (this.iHasError) throw new SAXException(pNodeNameEnum
-					+ " child node is invalid for " + getNodeName()
-					+ " node, since it already has an ERROR child node!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+			if (this.iHasError) throw new SAXException(
+				pNodeNameEnum +
+				" child node is invalid for " +
+				getNodeName() +
+				" node, since it already has an ERROR child node!"
+			);
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	@Override
@@ -155,7 +163,7 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() {
-	// no mandatory child
+		// no mandatory child
 	}
 
 	public CIMError getCIMError() {
@@ -167,7 +175,7 @@ public CIMError getCIMError() {
 	/**
 	 * getCIMArguments : returns the array of parsed parameters and their values
 	 * : String name, CIMDataType type, Object value
-	 * 
+	 *
 	 * @return CIMArgument<?>[]
 	 */
 	public CIMArgument[] getCIMArguments() {
@@ -187,11 +195,10 @@ public Object readReturnValue() {
 
 	/**
 	 * getName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getName() {
 		return this.iName;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java
index c9087f9..bd522a5 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpReqNode.java
@@ -45,7 +45,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -54,7 +53,6 @@
  * ELEMENT MULTIEXPREQ (SIMPLEEXPREQ, SIMPLEEXPREQ+)
  */
 public class MultiExpReqNode extends AbstractMessageNode {
-
 	private ArrayList iSimpleExpReqAList;
 
 	/**
@@ -84,20 +82,20 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum != SIMPLEEXPREQ) throw new SAXException(
-				"MULTIEXPREQ node can have SIMPLEEXPREQ child nodes only! " + pNodeNameEnum
-						+ " child node is invalid!");
+			"MULTIEXPREQ node can have SIMPLEEXPREQ child nodes only! " + pNodeNameEnum + " child node is invalid!"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
 		if (this.iSimpleExpReqAList == null || this.iSimpleExpReqAList.size() < 2) throw new SAXException(
-				"MULTIEXPREQ node must have at least two SIMPLEEXPREQ child nodes!");
+			"MULTIEXPREQ node must have at least two SIMPLEEXPREQ child nodes!"
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java
index 8a08d4e..5d5450b 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiExpRspNode.java
@@ -46,7 +46,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -55,7 +54,6 @@
  * ELEMENT MULTIEXPRSP (SIMPLEEXPRSP, SIMPLEEXPRSP+)
  */
 public class MultiExpRspNode extends AbstractMessageNode {
-
 	private ArrayList iSimpleExpRspAList;
 
 	/**
@@ -85,20 +83,20 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != SIMPLEEXPRSP) throw new SAXException(getNodeName()
-				+ " node can have SIMPLEEXPRSP child node only! " + pNodeNameEnum
-				+ " child node is invalid!");
+		if (pNodeNameEnum != SIMPLEEXPRSP) throw new SAXException(
+			getNodeName() + " node can have SIMPLEEXPRSP child node only! " + pNodeNameEnum + " child node is invalid!"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
 		if (this.iSimpleExpRspAList == null || this.iSimpleExpRspAList.size() < 2) throw new SAXException(
-				getNodeName() + " node must have at least two SIMPLEEXPRSP child nodes!");
+			getNodeName() + " node must have at least two SIMPLEEXPRSP child nodes!"
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java
index 960d1c6..e82fd9b 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiReqNode.java
@@ -45,7 +45,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -54,7 +53,6 @@
  * ELEMENT MULTIREQ (SIMPLEREQ, SIMPLEREQ+)
  */
 public class MultiReqNode extends AbstractMessageNode {
-
 	private ArrayList iSimpleReqAList;
 
 	/**
@@ -84,29 +82,29 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum != SIMPLEREQ) throw new SAXException(
-				"MULTIREQ node can have SIMPLEREQ child nodes only! " + pNodeNameEnum
-						+ " child node is invalid!");
+			"MULTIREQ node can have SIMPLEREQ child nodes only! " + pNodeNameEnum + " child node is invalid!"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
 		if (this.iSimpleReqAList == null || this.iSimpleReqAList.size() < 2) throw new SAXException(
-				"MULTIREQ node must have at least 2 SIMPLEREQ child nodes!");
+			"MULTIREQ node must have at least 2 SIMPLEREQ child nodes!"
+		);
 	}
 
 	/**
 	 * size
-	 * 
+	 *
 	 * @return int
 	 */
 	public int size() {
 		return this.iSimpleReqAList == null ? 0 : this.iSimpleReqAList.size();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java
index 441a2a6..be11eae 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/MultiRspNode.java
@@ -45,7 +45,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -54,7 +53,6 @@
  * ELEMENT MULTIRSP (SIMPLERSP, SIMPLERSP+)
  */
 public class MultiRspNode extends AbstractMessageNode {
-
 	private ArrayList iSimpleRspAList;
 
 	/**
@@ -84,20 +82,21 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != SIMPLERSP) throw new SAXException(getNodeName() + " node cannot have "
-				+ pNodeNameEnum + " child node!");
+		if (pNodeNameEnum != SIMPLERSP) throw new SAXException(
+			getNodeName() + " node cannot have " + pNodeNameEnum + " child node!"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
 		if (this.iSimpleRspAList == null || this.iSimpleRspAList.size() < 2) throw new SAXException(
-				getNodeName() + " node must have at least two SIMPLERSP child nodes!");
+			getNodeName() + " node must have at least two SIMPLERSP child nodes!"
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java
index 2289772..48bf4f2 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java
@@ -50,10 +50,9 @@
 
 /**
  * ELEMENT NAMESPACE EMPTY ATTRLIST NAMESPACE %CIMName;
- * 
+ *
  */
 public class NameSpaceNode extends Node {
-
 	private String iNameSpaceValue;
 
 	/**
@@ -76,7 +75,7 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	/**
@@ -92,21 +91,20 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// no child
+		// no child
 	}
 
 	@Override
 	public void testCompletness() {
-	// no child
+		// no child
 	}
 
 	/**
 	 * getNameSpace
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getNameSpace() {
 		return this.iNameSpaceValue;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java
index 344e5d9..bf83b8d 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NameSpacePathNode.java
@@ -53,7 +53,6 @@
  * ELEMENT NAMESPACEPATH (HOST, LOCALNAMESPACEPATH)
  */
 public class NameSpacePathNode extends Node {
-
 	// HOST
 	private boolean iHasHost;
 
@@ -87,19 +86,18 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == HOST) {
-			if (this.iHasHost) throw new SAXException(getNodeName()
-					+ " node can have only one HOST child node!");
+			if (this.iHasHost) throw new SAXException(getNodeName() + " node can have only one HOST child node!");
 		} else if (pNodeNameEnum == LOCALNAMESPACEPATH) {
-			if (this.iHasLocalNameSpacePath) throw new SAXException(getNodeName()
-					+ " node can have only one LOCALNAMESPACEPATH child node!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+			if (this.iHasLocalNameSpacePath) throw new SAXException(
+				getNodeName() + " node can have only one LOCALNAMESPACEPATH child node!"
+			);
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	@Override
@@ -115,15 +113,15 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (!this.iHasHost) throw new SAXException("HOST child node is mandatory for "
-				+ getNodeName() + " node!");
+		if (!this.iHasHost) throw new SAXException("HOST child node is mandatory for " + getNodeName() + " node!");
 		if (!this.iHasLocalNameSpacePath) throw new SAXException(
-				"LOCALNAMESPACEPATH child node is mandatory for " + getNodeName() + " node!");
+			"LOCALNAMESPACEPATH child node is mandatory for " + getNodeName() + " node!"
+		);
 	}
 
 	/**
 	 * getHostStr
-	 * 
+	 *
 	 * @return String which may contain the protocol, host and port
 	 */
 	public String getHostStr() {
@@ -132,11 +130,10 @@ public String getHostStr() {
 
 	/**
 	 * getLocalNameSpacePath
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getLocalNameSpacePath() {
 		return this.iLocalNameSpacePathStr;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java
index c7d541a..a7f9d9c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/Node.java
@@ -53,12 +53,12 @@
  */
 
 import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMFlavor;
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.NodeConstIf;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
-import org.metricshub.wbem.javax.cim.CIMFlavor;
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.NodeConstIf;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -67,14 +67,13 @@
  * contains helper functions for the implementations.
  */
 public abstract class Node implements NodeConstIf {
-
 	private String iNameEnum;
 
 	private boolean iCompleted;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNameEnum
 	 *            The name of the node which must be a String constant which is
 	 *            defined inside this class (because the implementation compares
@@ -86,7 +85,7 @@ public Node(String pNameEnum) {
 
 	/**
 	 * getNodeName
-	 * 
+	 *
 	 * @return The name of the node. This name have to be one of the String
 	 *         constant defined in the class.
 	 */
@@ -98,7 +97,7 @@ public String getNodeName() {
 	 * The SAX ContentHandler implementation calls this method after testChild()
 	 * and addChild() calls. The implementation must reset it's instance unless
 	 * it implements NonVolatileIf
-	 * 
+	 *
 	 * @param pAttribs
 	 * @param pSession
 	 *            - stores variables which are common for the whole SAX parsing
@@ -109,7 +108,7 @@ public String getNodeName() {
 
 	/**
 	 * XML element's data have to be passed
-	 * 
+	 *
 	 * @param pData
 	 *            - String which is concatenated in SAX's
 	 *            DefaultHandler.characters() implementation.
@@ -120,7 +119,7 @@ public String getNodeName() {
 	/**
 	 * It have to be called by SAX's DefaultHandler implementation when it
 	 * detects a new child element (startElement()).
-	 * 
+	 *
 	 * @param pNodeNameEnum
 	 *            - the name of the child element, it must be one of the String
 	 *            constant defined in class Node, because the implementer
@@ -135,7 +134,7 @@ public String getNodeName() {
 	 * It have to be called by SAX's DefaultHandler.endElement(). It's task is
 	 * to check that the Element is built up correctly. The implementer function
 	 * can do some post processing here. testCompletness
-	 * 
+	 *
 	 * @throws SAXException
 	 *             It must be thrown when the Node is not valid.
 	 */
@@ -143,7 +142,7 @@ public String getNodeName() {
 
 	/**
 	 * Have to be called by SAX's DefaultHandler.endElement()
-	 * 
+	 *
 	 * @param pChild
 	 * @throws SAXException
 	 *             - parent Nodes can make conversions here (e.g. type string
@@ -154,7 +153,7 @@ public String getNodeName() {
 
 	/**
 	 * completed
-	 * 
+	 *
 	 * @return true if the parsing of the node is completed
 	 */
 	public boolean isCompleted() {
@@ -179,7 +178,7 @@ public void clearCompleted() {
 
 	/**
 	 * ENTITY % CIMName "NAME CDATA #REQUIRED"
-	 * 
+	 *
 	 * @param pAttribs
 	 * @return String
 	 * @throws SAXException
@@ -192,7 +191,7 @@ public static String getCIMName(Attributes pAttribs) throws SAXException {
 
 	/**
 	 * ENTITY % ClassName "CLASSNAME CDATA #REQUIRED"
-	 * 
+	 *
 	 * @param pAttribs
 	 * @return String
 	 * @throws SAXException
@@ -205,7 +204,7 @@ public static String getClassName(Attributes pAttribs) throws SAXException {
 
 	/**
 	 * ENTITY % ReferenceClass "REFERENCECLASS CDATA #IMPLIED"
-	 * 
+	 *
 	 * @param pAttribs
 	 * @return String
 	 */
@@ -215,7 +214,7 @@ public static String getReferenceClass(Attributes pAttribs) {
 
 	/**
 	 * ENTITY % ClassOrigin "CLASSORIGIN CDATA #IMPLIED
-	 * 
+	 *
 	 * @param pAttribs
 	 * @return String
 	 */
@@ -225,7 +224,7 @@ public static String getClassOrigin(Attributes pAttribs) {
 
 	/**
 	 * ENTITY % Propagated "PROPAGATED (true|false) 'false'" getPropagated
-	 * 
+	 *
 	 * @param pAttribs
 	 * @return boolean
 	 */
@@ -236,7 +235,7 @@ public static boolean getPropagated(Attributes pAttribs) {
 
 	/**
 	 * ENTITY % ArraySize "ARRAYSIZE CDATA #IMPLIED"
-	 * 
+	 *
 	 * @param pAttribs
 	 * @return int
 	 * @throws SAXException
@@ -246,8 +245,7 @@ public static int getArraySize(Attributes pAttribs) throws SAXException {
 		// 0 - unbounded size
 		int size = 0;
 		try {
-			size = arraySizeStr == null || arraySizeStr.length() == 0 ? 0 : Integer
-					.parseInt(arraySizeStr);
+			size = arraySizeStr == null || arraySizeStr.length() == 0 ? 0 : Integer.parseInt(arraySizeStr);
 		} catch (NumberFormatException e) {
 			throw new SAXException(arraySizeStr + " is not a valid ARRAYSIZE attribute!");
 		}
@@ -259,14 +257,13 @@ public static int getArraySize(Attributes pAttribs) throws SAXException {
 	 * ENTITY % CIMType "TYPE
 	 * (boolean|string|char16|uint8|sint8|uint16|sint16|uint32
 	 * |sint32|uint64|sint64|datetime|real32|real64)" getCIMType
-	 * 
+	 *
 	 * @param pAttribs
 	 * @param pOptional
 	 * @return CIMDataType
 	 * @throws SAXException
 	 */
-	public static CIMDataType getCIMType(Attributes pAttribs, boolean pOptional)
-			throws SAXException {
+	public static CIMDataType getCIMType(Attributes pAttribs, boolean pOptional) throws SAXException {
 		String typeStr = pAttribs.getValue("TYPE");
 		if (typeStr == null) {
 			if (pOptional) return null;
@@ -274,16 +271,15 @@ public static CIMDataType getCIMType(Attributes pAttribs, boolean pOptional)
 		}
 		CIMDataType type = CIMObjectFactory.getType(typeStr);
 		if (type == null) throw new SAXException(typeStr + " is not a valid TYPE attribute!");
-		if (type.getType() == CIMDataType.REFERENCE) throw new SAXException(
-				"TYPE attribute cannot be \"reference\"!");
+		if (type.getType() == CIMDataType.REFERENCE) throw new SAXException("TYPE attribute cannot be \"reference\"!");
 		// Is it array?
 		// Yes if ISARRAY is true or ARRAYSIZE>-1.
 		boolean isArray = hasTrueAttribute(pAttribs, "ISARRAY");
 		String arraySizeStr = pAttribs.getValue("ARRAYSIZE");
 		int arraySize;
 		try {
-			arraySize = (arraySizeStr == null || arraySizeStr.length() == 0 ? (isArray ? 0 : -1)
-					: Integer.parseInt(arraySizeStr));
+			arraySize =
+				(arraySizeStr == null || arraySizeStr.length() == 0 ? (isArray ? 0 : -1) : Integer.parseInt(arraySizeStr));
 		} catch (NumberFormatException e) {
 			throw new SAXException(arraySizeStr + " is not a valid ARRAYSIZE attribute!");
 		}
@@ -296,7 +292,7 @@ public static CIMDataType getCIMType(Attributes pAttribs, boolean pOptional)
 
 	/**
 	 * getCIMType(pAttribs, pOptional=false);
-	 * 
+	 *
 	 * @param pAttribs
 	 * @return CIMDataType
 	 * @throws SAXException
@@ -309,7 +305,7 @@ public static CIMDataType getCIMType(Attributes pAttribs) throws SAXException {
 	 * ENTITY % ParamType "PARAMTYPE (
 	 * boolean|string|char16|uint8|sint8|uint16|sint16
 	 * |uint32|sint32|uint64|sint64|datetime| real32|real64|reference)
-	 * 
+	 *
 	 * @param pAttribs
 	 * @return CIMDataType
 	 * @throws SAXException
@@ -327,7 +323,7 @@ public static CIMDataType getParamType(Attributes pAttribs) throws SAXException
 	 * TOINSTANCE     (true|false)  'false'
 	 * TRANSLATABLE   (true|false)  'false'"
 	 * 
-	 * 
+	 *
 	 * @param pAttribs
 	 * @return int - CIMFlavor bit mixture
 	 */
@@ -341,7 +337,7 @@ public int getQualifierFlavor(Attributes pAttribs) {
 
 	/**
 	 * hasTrueAttribute
-	 * 
+	 *
 	 * @param pAttribs
 	 * @param pName
 	 * @return boolean
@@ -352,7 +348,7 @@ public static boolean hasTrueAttribute(Attributes pAttribs, String pName) {
 
 	/**
 	 * getBoolAttribute
-	 * 
+	 *
 	 * @param pAttribs
 	 * @param pName
 	 * @param pDefVal
@@ -367,26 +363,32 @@ public static boolean getBoolAttribute(Attributes pAttribs, String pName, boolea
 
 	/**
 	 * duplicatedNode
-	 * 
+	 *
 	 * @param pParsedNodeName
 	 * @param pNewNodeName
 	 * @throws SAXException
 	 */
 	public void duplicatedNode(String pParsedNodeName, String pNewNodeName) throws SAXException {
-		throw new SAXException(getNodeName() + " has a " + pParsedNodeName
-				+ " child node which disallows an additional " + pNewNodeName + " child node!");
+		throw new SAXException(
+			getNodeName() +
+			" has a " +
+			pParsedNodeName +
+			" child node which disallows an additional " +
+			pNewNodeName +
+			" child node!"
+		);
 	}
 
 	/**
 	 * illegalChildNodePair
-	 * 
+	 *
 	 * @param pNodeName0
 	 * @param pNodeName1
 	 * @throws SAXException
 	 */
 	public void illegalChildNodePair(String pNodeName0, String pNodeName1) throws SAXException {
-		throw new SAXException(pNodeName0 + ", " + pNodeName1 + " child node pair is illegal for "
-				+ getNodeName() + " node!");
+		throw new SAXException(
+			pNodeName0 + ", " + pNodeName1 + " child node pair is illegal for " + getNodeName() + " node!"
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java
index d99dd16..1c597a5 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/NonVolatileIf.java
@@ -45,13 +45,11 @@
  * IRETURNVALUE)
  */
 public interface NonVolatileIf {
-
 	/**
 	 * Have to be called by SAX's DefaultHandler.startElement() after
 	 * testChild() call.
-	 * 
+	 *
 	 * @param pChild
 	 */
 	public abstract void addChild(Node pChild);
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java
index 6eaef1a..9a3e8a4 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathIf.java
@@ -45,10 +45,9 @@
  * It's implemented by Nodes which can construct a CIMObjectPath.
  */
 public interface ObjectPathIf {
-
 	/**
 	 * getCIMObjectPath
-	 * 
+	 *
 	 * @return CIMObjectPath
 	 */
 	CIMObjectPath getCIMObjectPath();
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java
index 4bdb6ce..3ab39c4 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ObjectPathNode.java
@@ -52,7 +52,6 @@
  * ELEMENT OBJECTPATH (INSTANCEPATH | CLASSPATH)
  */
 public class ObjectPathNode extends AbstractPathNode {
-
 	// (INSTANCEPATH | CLASSPATH)
 	private CIMObjectPath iObjPath;
 
@@ -80,17 +79,21 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iObjPath != null) throw new SAXException(getNodeName()
-				+ " node can have only one INSTANCEPATH or CLASSPATH child node!" + " Additional "
-				+ pNodeNameEnum + " child node is invalid!");
+		if (this.iObjPath != null) throw new SAXException(
+			getNodeName() +
+			" node can have only one INSTANCEPATH or CLASSPATH child node!" +
+			" Additional " +
+			pNodeNameEnum +
+			" child node is invalid!"
+		);
 		if (pNodeNameEnum != CLASSPATH && pNodeNameEnum != INSTANCEPATH) throw new SAXException(
-				getNodeName() + " node child node can be CLASSPATH or INSTANCEPATH but a "
-						+ pNodeNameEnum + " node was found!");
+			getNodeName() + " node child node can be CLASSPATH or INSTANCEPATH but a " + pNodeNameEnum + " node was found!"
+		);
 	}
 
 	@Override
@@ -100,12 +103,12 @@ public void childParsed(Node pChild) {
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iObjPath == null) throw new SAXException(getNodeName()
-				+ " node must have a INSTANCEPATH or CLASSPATH child node!");
+		if (this.iObjPath == null) throw new SAXException(
+			getNodeName() + " node must have a INSTANCEPATH or CLASSPATH child node!"
+		);
 	}
 
 	public CIMObjectPath getCIMObjectPath() {
 		return this.iObjPath;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java
index 883e421..e890107 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java
@@ -60,7 +60,6 @@
  * PARAMVALUE %CIMName; %ParamType; #IMPLIED %EmbeddedObject; #IMPLIED - new
  */
 public class ParamValueNode extends AbstractParamValueNode {
-
 	private String iName;
 
 	private EmbObjHandler iEmbObjHandler;
@@ -83,8 +82,7 @@ public ParamValueNode() {
 
 	@Override
 	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				pSession, null, true);
+		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs, pSession, null, true);
 		this.iHasChild = false;
 		this.iHasTypeValue = false;
 		this.iName = getCIMName(pAttribs);
@@ -97,11 +95,20 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
-	private static final String[] ALLOWED_CHILDREN = { VALUE, VALUE_REFERENCE, VALUE_ARRAY,
-			VALUE_REFARRAY, CLASSNAME, INSTANCENAME, CLASS, INSTANCE, VALUE_NAMEDINSTANCE };
+	private static final String[] ALLOWED_CHILDREN = {
+		VALUE,
+		VALUE_REFERENCE,
+		VALUE_ARRAY,
+		VALUE_REFARRAY,
+		CLASSNAME,
+		INSTANCENAME,
+		CLASS,
+		INSTANCE,
+		VALUE_NAMEDINSTANCE
+	};
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
@@ -112,17 +119,19 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 				break;
 			}
 		}
-		if (!allowed) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
-		if (this.iHasChild) throw new SAXException(getNodeName()
-				+ " node cannot have more than one child node!");
+		if (!allowed) throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
+		if (this.iHasChild) throw new SAXException(getNodeName() + " node cannot have more than one child node!");
 		// type check
 		CIMDataType rawType = this.iEmbObjHandler.getRawType();
 		if (rawType != null) {
 			if (pNodeNameEnum == VALUE_REFERENCE || pNodeNameEnum == VALUE_REFARRAY) {
 				if (rawType.getType() != CIMDataType.REFERENCE) throw new SAXException(
-						"PARAMVALUE node's PARAMTYPE attribute is not reference (" + rawType
-								+ "), but a " + pNodeNameEnum + " child node is found!");
+					"PARAMVALUE node's PARAMTYPE attribute is not reference (" +
+					rawType +
+					"), but a " +
+					pNodeNameEnum +
+					" child node is found!"
+				);
 			}
 		}
 	}
@@ -133,11 +142,11 @@ public void childParsed(Node pChild) {
 			this.iEmbObjHandler.addValueNode((AbstractValueNode) pChild);
 		} else {
 			this.iValue = ((ValueIf) pChild).getValue();
-			if (pChild instanceof TypedIf) this.iType = ((TypedIf) pChild).getType();
-			else if (pChild instanceof ObjectPathIf) this.iType = CIMDataType
-					.getDataType(((ObjectPathIf) pChild).getCIMObjectPath());
-			else if (pChild instanceof ValueIf) this.iType = CIMDataType
-					.getDataType(((ValueIf) pChild).getValue());
+			if (pChild instanceof TypedIf) this.iType = ((TypedIf) pChild).getType(); else if (
+				pChild instanceof ObjectPathIf
+			) this.iType = CIMDataType.getDataType(((ObjectPathIf) pChild).getCIMObjectPath()); else if (
+				pChild instanceof ValueIf
+			) this.iType = CIMDataType.getDataType(((ValueIf) pChild).getValue());
 			this.iHasTypeValue = true;
 		}
 		this.iHasChild = true;
@@ -158,7 +167,7 @@ public CIMDataType getType() {
 
 	/**
 	 * getCIMArgument
-	 * 
+	 *
 	 * @return CIMArgument
 	 */
 	@Override
@@ -175,5 +184,4 @@ public CIMArgument getCIMArgument() {
 	public Object getValue() {
 		return this.iValue;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java
index 2c80f8c..7837af3 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterArrayNode.java
@@ -57,7 +57,6 @@
  * 
  */
 public class ParameterArrayNode extends AbstractParameterNode {
-
 	private CIMDataType iType;
 
 	private EmbObjHandler iEmbObjHandler;
@@ -71,10 +70,9 @@ public ParameterArrayNode() {
 
 	@Override
 	protected void specificInit(Attributes pAttribs) throws SAXException {
-		if (getCIMType(pAttribs, true) == null) throw new SAXException(
-				"PARAMETER.ARRAY element missing TYPE attribute!");
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				this.iSession, this.iQualiHandler, true);
+		if (getCIMType(pAttribs, true) == null) throw new SAXException("PARAMETER.ARRAY element missing TYPE attribute!");
+		this.iEmbObjHandler =
+			EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs, this.iSession, this.iQualiHandler, true);
 	}
 
 	@Override
@@ -85,5 +83,4 @@ public void testCompletness() throws SAXException {
 	public CIMDataType getType() {
 		return this.iType;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java
index 7f2239e..2b98633 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterNode.java
@@ -51,7 +51,6 @@
  * ELEMENT PARAMETER (QUALIFIER*) ATTLIST PARAMETER %CIMName; %CIMType;
  */
 public class ParameterNode extends AbstractParameterNode {
-
 	private CIMDataType iType;
 
 	private EmbObjHandler iEmbObjHandler;
@@ -65,21 +64,18 @@ public ParameterNode() {
 
 	@Override
 	protected void specificInit(Attributes pAttribs) throws SAXException {
-		if (getCIMType(pAttribs, true) == null) throw new SAXException(
-				"PARAMETER element missing TYPE attribute!");
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				this.iSession, this.iQualiHandler, true);
+		if (getCIMType(pAttribs, true) == null) throw new SAXException("PARAMETER element missing TYPE attribute!");
+		this.iEmbObjHandler =
+			EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs, this.iSession, this.iQualiHandler, true);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
 		this.iType = this.iEmbObjHandler.getType();
-		if (this.iType.isArray()) throw new SAXException(
-				"PARAMETER node's TYPE attribute cannot be an array!");
+		if (this.iType.isArray()) throw new SAXException("PARAMETER node's TYPE attribute cannot be an array!");
 	}
 
 	public CIMDataType getType() {
 		return this.iType;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java
index 6d8d383..9a3add4 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java
@@ -59,7 +59,6 @@
  * 
  */
 public class ParameterRefArrayNode extends AbstractParameterNode {
-
 	private CIMDataType iType;
 
 	/**
@@ -73,14 +72,14 @@ public ParameterRefArrayNode() {
 	protected void specificInit(Attributes pAttribs) throws SAXException {
 		String refClass = getReferenceClass(pAttribs);
 		this.iType = new CIMDataType(refClass != null ? refClass : "", getArraySize(pAttribs));
-
 	}
 
 	@Override
-	public void testCompletness() { /* */}
+	public void testCompletness() {
+		/* */
+	}
 
 	public CIMDataType getType() {
 		return this.iType;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java
index 20bd71a..37603db 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ParameterReferenceNode.java
@@ -54,7 +54,6 @@
  * 
  */
 public class ParameterReferenceNode extends AbstractParameterNode {
-
 	private CIMDataType iType;
 
 	/**
@@ -71,10 +70,11 @@ protected void specificInit(Attributes pAttribs) {
 	}
 
 	@Override
-	public void testCompletness() { /* */}
+	public void testCompletness() {
+		/* */
+	}
 
 	public CIMDataType getType() {
 		return this.iType;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java
index 07147ba..ffcb26c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyArrayNode.java
@@ -56,7 +56,7 @@
 /**
  * 
        * ELEMENT PROPERTY.ARRAY (QUALIFIER*, VALUE.ARRAY?)
- * ATTLIST PROPERTY.ARRAY 
+ * ATTLIST PROPERTY.ARRAY
  *   %CIMName;
  *   %CIMType;              #REQUIRED
  *   %ArraySize;
@@ -67,7 +67,6 @@
  * 
      
  */
 public class PropertyArrayNode extends AbstractPropertyNode {
-
 	// VALUE.ARRAY
 	// required for super.testChild()
 	private boolean iHasValueArray;
@@ -90,15 +89,16 @@ public PropertyArrayNode() {
 	@Override
 	protected void specificInit(Attributes pAttribs, SAXSession pSession) throws SAXException {
 		this.iHasTypeAttribute = (getCIMType(pAttribs, true) != null);
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				pSession, this.iQualiHandler, true);
+		this.iEmbObjHandler =
+			EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs, pSession, this.iQualiHandler, true);
 		this.iHasValueArray = false;
 	}
 
 	@Override
 	protected void childValueNodeParsed(Node pChild) throws SAXException {
 		if (!this.iHasTypeAttribute && ((ValueArrayNode) pChild).getType() == null) throw new SAXException(
-				"PROPERTY.ARRAY element missing TYPE attribute!");
+			"PROPERTY.ARRAY element missing TYPE attribute!"
+		);
 		this.iEmbObjHandler.addValueNode((ValueArrayNode) pChild);
 		this.iHasValueArray = true;
 	}
@@ -135,5 +135,4 @@ protected boolean hasValueNode() {
 	protected CIMQualifier[] getQualis() {
 		return this.iQualiHandler.getQualis(this.iType == CIMDataType.STRING_ARRAY_T);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java
index 2887239..092158c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyNode.java
@@ -56,7 +56,7 @@
 /**
  * 
        * ELEMENT PROPERTY (QUALIFIER*, VALUE?)
- * ATTLIST PROPERTY 
+ * ATTLIST PROPERTY
  *   %CIMName;
  *   %ClassOrigin;
  *   %Propagated;
@@ -66,7 +66,6 @@
  * 
      
  */
 public class PropertyNode extends AbstractPropertyNode {
-
 	private CIMDataType iType;
 
 	// VALUE element
@@ -88,8 +87,8 @@ public PropertyNode() {
 	@Override
 	protected void specificInit(Attributes pAttribs, SAXSession pSession) throws SAXException {
 		this.iHasTypeAttribute = (getCIMType(pAttribs, true) != null);
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				pSession, this.iQualiHandler, true);
+		this.iEmbObjHandler =
+			EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs, pSession, this.iQualiHandler, true);
 		this.iHasValue = false;
 	}
 
@@ -97,7 +96,8 @@ protected void specificInit(Attributes pAttribs, SAXSession pSession) throws SAX
 	public void childValueNodeParsed(Node pChild) throws SAXException {
 		this.iHasValue = true;
 		if (!this.iHasTypeAttribute && ((ValueNode) pChild).getType() == null) throw new SAXException(
-				"PROPERTY element missing TYPE attribute!");
+			"PROPERTY element missing TYPE attribute!"
+		);
 		this.iEmbObjHandler.addValueNode((ValueNode) pChild);
 	}
 
@@ -132,5 +132,4 @@ public CIMDataType getType() {
 	public Object getValue() {
 		return this.iValue;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java
index 027e1ca..95f2844 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/PropertyReferenceNode.java
@@ -52,17 +52,16 @@
 
 /**
  * 
      - * 
+ *
  * ELEMENT PROPERTY.REFERENCE (QUALIFIER*, (VALUE.REFERENCE)?)
  * ATTLIST PROPERTY.REFERENCE
- *   %CIMName; 
- *   %ReferenceClass; 
+ *   %CIMName;
+ *   %ReferenceClass;
  *   %ClassOrigin;
  *   %Propagated;
  * 
      
  */
 public class PropertyReferenceNode extends AbstractPropertyNode {
-
 	private String iRefClassName;
 
 	// VALUE.REFERENCE
@@ -108,11 +107,10 @@ protected void specificInit(Attributes pAttribs, SAXSession pSession) {
 
 	@Override
 	public void testCompletness() {
-	//
+		//
 	}
 
 	public CIMDataType getType() {
 		return new CIMDataType(this.iRefClassName != null ? this.iRefClassName : "");
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java
index 4858f34..dafadd8 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java
@@ -61,8 +61,8 @@
 /**
  * 
        * ELEMENT QUALIFIER.DECLARATION (SCOPE?, (VALUE | VALUE.ARRAY)?)
- * ATTLIST QUALIFIER.DECLARATION 
- * 	%CIMName;               
+ * ATTLIST QUALIFIER.DECLARATION
+ * 	%CIMName;
  * 	%CIMType;               #REQUIRED
  * 	ISARRAY    (true|false) #IMPLIED
  * 	%ArraySize;
@@ -70,7 +70,6 @@
  * 
      
  */
 public class QualiDeclNode extends Node implements TypedIf, ValueIf {
-
 	// child nodes
 	// SCOPE
 	private boolean iHasScope;
@@ -98,7 +97,7 @@ public QualiDeclNode() {
 
 	/**
 	 * getName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getName() {
@@ -111,7 +110,7 @@ public CIMDataType getType() {
 
 	/**
 	 * getFlavor
-	 * 
+	 *
 	 * @return int - CIMFlavor bitset
 	 */
 	public int getFlavor() {
@@ -137,35 +136,42 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == VALUE || pNodeNameEnum == VALUE_ARRAY) {
-			if (this.iValueNodeName != null) throw new SAXException("Cannot add " + pNodeNameEnum
-					+ " node, this " + getNodeName() + " node has already got a "
-					+ this.iValueNodeName + " node!");
+			if (this.iValueNodeName != null) throw new SAXException(
+				"Cannot add " +
+				pNodeNameEnum +
+				" node, this " +
+				getNodeName() +
+				" node has already got a " +
+				this.iValueNodeName +
+				" node!"
+			);
 		} else if (pNodeNameEnum == SCOPE) {
-			if (this.iHasScope) throw new SAXException("Cannot add " + pNodeNameEnum
-					+ " node, this " + getNodeName() + " node has already got one!");
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child node!");
+			if (this.iHasScope) throw new SAXException(
+				"Cannot add " + pNodeNameEnum + " node, this " + getNodeName() + " node has already got one!"
+			);
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
 	}
 
 	/**
 	 * Required to handle the output XML of some non-standard CIMOMs like SVC
 	 * which adds the TYPE attribute to the sub VALUE or VALUE.ARRAY XML
 	 * element.
-	 * 
+	 *
 	 * @param pTypedIf
 	 * @throws SAXException
 	 */
 	private void setType(TypedIf pTypedIf) throws SAXException {
 		if (this.iType != null) return;
 		this.iType = pTypedIf.getType();
-		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
-				+ getNodeName() + " node!");
+		if (this.iType == null) throw new SAXException(
+			"Unknown type for Qualifier declaration in " + getNodeName() + " node!"
+		);
 	}
 
 	@Override
@@ -180,8 +186,7 @@ public void childParsed(Node pChild) throws SAXException {
 				setType(valAChild);
 				this.iValue = CIMObjectFactory.getObject(this.iType, valAChild);
 				// making array type
-				if (!this.iType.isArray()) this.iType = CIMHelper.UnboundedArrayDataType(this.iType
-						.getType());
+				if (!this.iType.isArray()) this.iType = CIMHelper.UnboundedArrayDataType(this.iType.getType());
 			} else if (pChild instanceof ValueNode) {
 				ValueNode valChild = (ValueNode) pChild;
 				setType(valChild);
@@ -190,18 +195,18 @@ public void childParsed(Node pChild) throws SAXException {
 				this.iValue = null;
 			}
 		}
-
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
-				+ getNodeName() + " node!");
+		if (this.iType == null) throw new SAXException(
+			"Unknown type for Qualifier declaration in " + getNodeName() + " node!"
+		);
 	}
 
 	/**
 	 * getCIMQualifierType
-	 * 
+	 *
 	 * @return CIMQualifierType
 	 */
 	public CIMQualifierType getCIMQualifierType() {
@@ -209,12 +214,16 @@ public CIMQualifierType getCIMQualifierType() {
 		 * CIMQualifierType( CIMObjectPath pPath, CIMDataType pType, Object
 		 * pValue, int pScope, int pFlavor )
 		 */
-		return new CIMQualifierType(new CIMObjectPath(null, null, null, null, this.iName,
-				null), this.iType, this.iValue, this.iScope, this.iFlavor);
+		return new CIMQualifierType(
+			new CIMObjectPath(null, null, null, null, this.iName, null),
+			this.iType,
+			this.iValue,
+			this.iScope,
+			this.iFlavor
+		);
 	}
 
 	public Object getValue() {
 		return getCIMQualifierType();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java
index db2dc73..3c94404 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifiedNodeHandler.java
@@ -50,7 +50,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMDataType;
 import org.metricshub.wbem.javax.cim.CIMQualifier;
 import org.metricshub.wbem.sblim.cimclient.GenericExts;
@@ -61,7 +60,6 @@
  * elements.
  */
 public class QualifiedNodeHandler {
-
 	private static final Boolean TRUE = Boolean.TRUE;
 
 	private ArrayList> iQualiAL;
@@ -74,7 +72,7 @@ public class QualifiedNodeHandler {
 
 	/**
 	 * init
-	 * 
+	 *
 	 * @param pQNH
 	 *            - if it's null it returns with a new instance otherwise it
 	 *            inits and returns pQNH
@@ -97,7 +95,7 @@ public void init() {
 
 	/**
 	 * addQualifierNode
-	 * 
+	 *
 	 * @param pNode
 	 * @return false if pNode is not instance of QualifierNode
 	 */
@@ -116,8 +114,9 @@ public boolean addQualifierNode(Node pNode) {
 				} else if ("ASSOCIATION".equalsIgnoreCase(quali.getName())) {
 					this.iHasAssocQuali = true;
 				}
-			} else if (CIMDataType.STRING_T.equals(quali.getDataType())
-					&& "EMBEDDEDINSTANCE".equalsIgnoreCase(quali.getName())) {
+			} else if (
+				CIMDataType.STRING_T.equals(quali.getDataType()) && "EMBEDDEDINSTANCE".equalsIgnoreCase(quali.getName())
+			) {
 				this.iHasEmbInstQuali = true;
 			}
 			this.iQualiAL.add(quali);
@@ -127,7 +126,7 @@ public boolean addQualifierNode(Node pNode) {
 
 	/**
 	 * getQualis
-	 * 
+	 *
 	 * @return CIMQualifier[]
 	 */
 	public CIMQualifier[] getQualis() {
@@ -136,7 +135,7 @@ public CIMQualifier[] getQualis() {
 
 	/**
 	 * getQualis
-	 * 
+	 *
 	 * @param pIncludeEmbObj
 	 * @return CIMQualifier[]
 	 */
@@ -147,7 +146,7 @@ public CIMQualifier[] getQualis(boolean pIncludeEmbObj) {
 
 	/**
 	 * isKeyed
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isKeyed() {
@@ -156,7 +155,7 @@ public boolean isKeyed() {
 
 	/**
 	 * isAssociation
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isAssociation() {
@@ -165,7 +164,7 @@ public boolean isAssociation() {
 
 	/**
 	 * isEmbeddedObject
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isEmbeddedObject() {
@@ -174,7 +173,7 @@ public boolean isEmbeddedObject() {
 
 	/**
 	 * isEmbeddedInstance
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isEmbeddedInstance() {
@@ -189,9 +188,8 @@ private void makeQualiImpl(boolean pIncludeEmbObj) {
 			this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(null);
 			return;
 		}
-		this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(this.iQualiAL.toArray(EMPTY_QA),
-				this.iHasKeyQuali, pIncludeEmbObj);
+		this.iQualiImpl =
+			new CIMQualifiedElementInterfaceImpl(this.iQualiAL.toArray(EMPTY_QA), this.iHasKeyQuali, pIncludeEmbObj);
 		this.iQualiAL = null;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java
index 7090da9..0e91c22 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java
@@ -61,7 +61,7 @@
 /**
  * 
        * ELEMENT QUALIFIER ((VALUE | VALUE.ARRAY)?)
- * ATTLIST QUALIFIER 
+ * ATTLIST QUALIFIER
  *  %CIMName;
  *  %CIMType;              #REQUIRED
  *  %Propagated;
@@ -70,7 +70,6 @@
  * 
      
  */
 public class QualifierNode extends Node {
-
 	private String iName;
 
 	private CIMDataType iType;
@@ -111,15 +110,17 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iQuali != null) throw new SAXException(getNodeName()
-				+ " node can have only one VALUE or VALUE.ARRAY child node!");
+		if (this.iQuali != null) throw new SAXException(
+			getNodeName() + " node can have only one VALUE or VALUE.ARRAY child node!"
+		);
 		if (pNodeNameEnum != VALUE && pNodeNameEnum != VALUE_ARRAY) throw new SAXException(
-				pNodeNameEnum + " child node is not valid for " + getNodeName() + " node!");
+			pNodeNameEnum + " child node is not valid for " + getNodeName() + " node!"
+		);
 	}
 
 	@Override
@@ -133,8 +134,7 @@ public void childParsed(Node pChild) throws SAXException {
 			// create array value
 			value = CIMObjectFactory.getObject(this.iType, valANode);
 			// constructs array type
-			type = this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
-					.getType());
+			type = this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType.getType());
 		} else if (absValNode instanceof ValueNode) {
 			ValueNode valNode = (ValueNode) absValNode;
 			setType(valNode);
@@ -145,23 +145,22 @@ public void childParsed(Node pChild) throws SAXException {
 			type = CIMDataType.STRING_T;
 			value = null;
 		}
-		this.iQuali = new CIMQualifier(this.iName, type, value, this.iFlavor,
-				this.iPropagated);
+		this.iQuali = new CIMQualifier(this.iName, type, value, this.iFlavor, this.iPropagated);
 	}
 
 	@Override
 	public void testCompletness() {
-	// child node is optional, hence commented to support
-	// servers that do not implement default value to qualifier node
-	/*
-	 * if (iQuali == null) throw new SAXException(getNodeName() + " must have a
-	 * VALUE or VALUE.ARRAY child node!");
-	 */
+		// child node is optional, hence commented to support
+		// servers that do not implement default value to qualifier node
+		/*
+		 * if (iQuali == null) throw new SAXException(getNodeName() + " must have a
+		 * VALUE or VALUE.ARRAY child node!");
+		 */
 	}
 
 	/**
 	 * getQualifier
-	 * 
+	 *
 	 * @return CIMQualifier
 	 */
 	public CIMQualifier getQualifier() {
@@ -172,15 +171,15 @@ public CIMQualifier getQualifier() {
 	 * Required to handle the output XML of some non-standard CIMOMs like SVC
 	 * which adds the TYPE attribute to the sub VALUE or VALUE.ARRAY XML
 	 * element.
-	 * 
+	 *
 	 * @param pTypedIf
 	 * @throws SAXException
 	 */
 	private void setType(TypedIf pTypedIf) throws SAXException {
 		if (this.iType != null) return;
 		this.iType = pTypedIf.getType();
-		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
-				+ getNodeName() + " node!");
+		if (this.iType == null) throw new SAXException(
+			"Unknown type for Qualifier declaration in " + getNodeName() + " node!"
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java
index d7e1d98..6dbfdce 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/RetValPipeIf.java
@@ -43,19 +43,17 @@
  * RetValPipeIf is a FIFO interface which helps PULL parsing.
  */
 public interface RetValPipeIf {
-
 	/**
 	 * getReturnValueCount
-	 * 
+	 *
 	 * @return the currently available return values
 	 */
 	public abstract int getReturnValueCount();
 
 	/**
 	 * readReturnValue
-	 * 
+	 *
 	 * @return a return value Object from a FIFO
 	 */
 	public abstract Object readReturnValue();
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java
index 2dc244f..e5aa07c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ReturnValueNode.java
@@ -61,7 +61,6 @@
  * 
  */
 public class ReturnValueNode extends Node implements TypedIf, ValueIf {
-
 	private EmbObjHandler iEmbObjHandler;
 
 	private CIMDataType iType;
@@ -82,8 +81,7 @@ public ReturnValueNode() {
 	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 		this.iType = null;
 		this.iValue = null;
-		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs,
-				pSession, null, true);
+		this.iEmbObjHandler = EmbObjHandler.init(this.iEmbObjHandler, getNodeName(), pAttribs, pSession, null, true);
 		this.iHasValue = false;
 	}
 
@@ -92,16 +90,14 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == VALUE || pNodeNameEnum == VALUE_REFERENCE) {
-			if (this.iHasValue) throw new SAXException(getNodeName()
-					+ " node can have only one child node!");
-		} else throw new SAXException(pNodeNameEnum + " cannot be the child node of "
-				+ getNodeName() + " node!");
+			if (this.iHasValue) throw new SAXException(getNodeName() + " node can have only one child node!");
+		} else throw new SAXException(pNodeNameEnum + " cannot be the child node of " + getNodeName() + " node!");
 	}
 
 	@Override
@@ -109,8 +105,12 @@ public void childParsed(Node pChild) throws SAXException {
 		AbstractValueNode valNode = (AbstractValueNode) pChild;
 		if (valNode instanceof ValueReferenceNode) {
 			if (this.iType != null && this.iType.getType() != CIMDataType.REFERENCE) throw new SAXException(
-					getNodeName() + " node's child node is VALUE.REFERENCE "
-							+ "but its type based on PARAMTYPE attribute is " + this.iType + "!");
+				getNodeName() +
+				" node's child node is VALUE.REFERENCE " +
+				"but its type based on PARAMTYPE attribute is " +
+				this.iType +
+				"!"
+			);
 			ValueReferenceNode valRefNode = (ValueReferenceNode) valNode;
 			this.iValue = valRefNode.getCIMObjectPath();
 			this.iType = valRefNode.getType();
@@ -138,5 +138,4 @@ public CIMDataType getType() {
 	public Object getValue() {
 		return this.iValue;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java
index 465b28c..a505987 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ScopeNode.java
@@ -22,8 +22,6 @@
 
 package org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node;
 
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-
 /*-
  * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
  * WBEM Java Client
@@ -45,6 +43,7 @@
  */
 
 import org.metricshub.wbem.javax.cim.CIMScope;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -62,7 +61,6 @@
  * 
  */
 public class ScopeNode extends Node {
-
 	private int iScope;
 
 	/**
@@ -74,7 +72,7 @@ public ScopeNode() {
 
 	/**
 	 * getScope
-	 * 
+	 *
 	 * @return int - set of CIMScope bits
 	 */
 	public int getScope() {
@@ -101,7 +99,7 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	/**
@@ -117,12 +115,11 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// no child
+		// no child
 	}
 
 	@Override
 	public void testCompletness() {
-	// Nothing to test, since it doesn't have any child node.
+		// Nothing to test, since it doesn't have any child node.
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java
index 2c99bb2..97b47d2 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpReqNode.java
@@ -52,7 +52,6 @@
  * ELEMENT SIMPLEEXPREQ (CORRELATOR*, EXPMETHODCALL)
  */
 public class SimpleExpReqNode extends AbstractMessageNode {
-
 	private ExpMethodCallNode iMethodCallNode;
 
 	/**
@@ -85,22 +84,20 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == EXPMETHODCALL) {
-			if (this.iMethodCallNode != null) throw new SAXException(getNodeName()
-					+ " node can have only one child node!");
-		} else if (pNodeNameEnum != CORRELATOR) throw new SAXException(getNodeName()
-				+ " node cannot have " + pNodeNameEnum + " child node!");
+			if (this.iMethodCallNode != null) throw new SAXException(getNodeName() + " node can have only one child node!");
+		} else if (pNodeNameEnum != CORRELATOR) throw new SAXException(
+			getNodeName() + " node cannot have " + pNodeNameEnum + " child node!"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iMethodCallNode == null) throw new SAXException(getNodeName()
-				+ " node must have a child node!");
+		if (this.iMethodCallNode == null) throw new SAXException(getNodeName() + " node must have a child node!");
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java
index 15f3724..c7a366d 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleExpRspNode.java
@@ -58,7 +58,6 @@
  * 
  */
 public class SimpleExpRspNode extends AbstractSimpleRspNode {
-
 	private ExpMethodResponseNode iExpMethodRspNode;
 
 	/**
@@ -87,22 +86,22 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iExpMethodRspNode != null) throw new SAXException(getNodeName()
-				+ " node can have only one child node!");
-		if (pNodeNameEnum != EXPMETHODRESPONSE) throw new SAXException(getNodeName()
-				+ " node's child node can be EXPMETHODRESPONSE only! " + pNodeNameEnum
-				+ " is invalid!");
+		if (this.iExpMethodRspNode != null) throw new SAXException(getNodeName() + " node can have only one child node!");
+		if (pNodeNameEnum != EXPMETHODRESPONSE) throw new SAXException(
+			getNodeName() + " node's child node can be EXPMETHODRESPONSE only! " + pNodeNameEnum + " is invalid!"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iExpMethodRspNode == null) throw new SAXException(getNodeName()
-				+ " node must have an EXPMETHODRESPONSE child node!");
+		if (this.iExpMethodRspNode == null) throw new SAXException(
+			getNodeName() + " node must have an EXPMETHODRESPONSE child node!"
+		);
 	}
 
 	@Override
@@ -125,5 +124,4 @@ public int getReturnValueCount() {
 	public Object readReturnValue() {
 		return this.iExpMethodRspNode == null ? null : this.iExpMethodRspNode.readReturnValue();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java
index 442fcf9..bc25437 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleReqNode.java
@@ -54,7 +54,6 @@
  * ELEMENT SIMPLEREQ (CORRELATOR*, (METHODCALL | IMETHODCALL))
  */
 public class SimpleReqNode extends AbstractMessageNode {
-
 	private AbstractMethodCallNode iMethodCallNode;
 
 	/**
@@ -87,7 +86,7 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	/**
@@ -96,25 +95,23 @@ public void parseData(String pData) {
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == IMETHODCALL || pNodeNameEnum == METHODCALL) {
-			if (this.iMethodCallNode != null) throw new SAXException(
-					"SIMPLEREQ node can have only one child node!");
+			if (this.iMethodCallNode != null) throw new SAXException("SIMPLEREQ node can have only one child node!");
 		} else if (pNodeNameEnum != CORRELATOR) throw new SAXException(
-				"SIMPLEREQ node cannot have " + pNodeNameEnum + " child node!");
+			"SIMPLEREQ node cannot have " + pNodeNameEnum + " child node!"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iMethodCallNode == null) throw new SAXException(
-				"SIMPLEREQ node must have a child node!");
+		if (this.iMethodCallNode == null) throw new SAXException("SIMPLEREQ node must have a child node!");
 	}
 
 	/**
 	 * getAbstractMethodCallNode
-	 * 
+	 *
 	 * @return AbstractMethodCallNode
 	 */
 	public AbstractMethodCallNode getAbstractMethodCallNode() {
 		return this.iMethodCallNode;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java
index 4218e61..2feccaf 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/SimpleRspNode.java
@@ -55,13 +55,12 @@
 /**
  * 
        * ELEMENT SIMPLERSP (METHODRESPONSE | IMETHODRESPONSE)
- * 
+ *
  * ELEMENT METHODRESPONSE (ERROR|(RETURNVALUE?,PARAMVALUE*))
  * ELEMENT IMETHODRESPONSE (ERROR|IRETURNVALUE?) *
  * 
      
  */
 public class SimpleRspNode extends AbstractSimpleRspNode {
-
 	private Node iChildNode;
 
 	/**
@@ -90,52 +89,54 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iChildNode != null) throw new SAXException(getNodeName()
-				+ " node can have only one child node!");
+		if (this.iChildNode != null) throw new SAXException(getNodeName() + " node can have only one child node!");
 		if (pNodeNameEnum != METHODRESPONSE && pNodeNameEnum != IMETHODRESPONSE) throw new SAXException(
-				getNodeName() + " node cannot have " + pNodeNameEnum + " child node!");
+			getNodeName() + " node cannot have " + pNodeNameEnum + " child node!"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iChildNode == null) throw new SAXException(getNodeName()
-				+ " node must have a child node!");
+		if (this.iChildNode == null) throw new SAXException(getNodeName() + " node must have a child node!");
 	}
 
 	@Override
 	public CIMError getCIMError() {
-		if (this.iChildNode instanceof ErrorIf) { return ((ErrorIf) this.iChildNode).getCIMError(); }
+		if (this.iChildNode instanceof ErrorIf) {
+			return ((ErrorIf) this.iChildNode).getCIMError();
+		}
 		return null;
 	}
 
 	/**
 	 * getCIMArguments : returns the array of parsed parameters and their values
 	 * : String name, CIMDataType type, Object value
-	 * 
+	 *
 	 * @return CIMArgument<?>[]
 	 */
 	@Override
 	public CIMArgument[] getCIMArguments() {
-		if (this.iChildNode instanceof MethodResponseNode) return ((MethodResponseNode) this.iChildNode)
-				.getCIMArguments();
-		else if (this.iChildNode instanceof IMethodResponseNode) return ((IMethodResponseNode) this.iChildNode)
-				.getCIMArguments();
+		if (this.iChildNode instanceof MethodResponseNode) return (
+			(MethodResponseNode) this.iChildNode
+		).getCIMArguments(); else if (this.iChildNode instanceof IMethodResponseNode) return (
+			(IMethodResponseNode) this.iChildNode
+		).getCIMArguments();
 		return null;
 	}
 
 	public int getReturnValueCount() {
-		if (this.iChildNode instanceof RetValPipeIf) { return ((RetValPipeIf) this.iChildNode)
-				.getReturnValueCount(); }
+		if (this.iChildNode instanceof RetValPipeIf) {
+			return ((RetValPipeIf) this.iChildNode).getReturnValueCount();
+		}
 		return 0;
 	}
 
 	public Object readReturnValue() {
 		return ((RetValPipeIf) this.iChildNode).readReturnValue();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java
index 88d3487..a32d70e 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/TypedIf.java
@@ -45,10 +45,9 @@
  * TypedIf is implemented by those classes which can provide a CIMDataType.
  */
 public interface TypedIf {
-
 	/**
 	 * getType
-	 * 
+	 *
 	 * @return null if the type is unknown
 	 */
 	public CIMDataType getType();
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java
index 8c5dcf9..0dbd832 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java
@@ -48,7 +48,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMDataType;
 import org.metricshub.wbem.sblim.cimclient.GenericExts;
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
@@ -61,7 +60,6 @@
  * For non-standard CIMOMs the TYPE and PARAMTYPE attributes are handled.
  */
 public class ValueArrayNode extends AbstractArrayValueNode {
-
 	// VALUE *
 	private ArrayList iValueAL;
 
@@ -87,8 +85,7 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 		CIMDataType scalarType = getCIMType(pAttribs, true);
 		if (scalarType == null) scalarType = getParamType(pAttribs);
 		// make array type
-		this.iType = scalarType == null ? null : CIMHelper.UnboundedArrayDataType(scalarType
-				.getType());
+		this.iType = scalarType == null ? null : CIMHelper.UnboundedArrayDataType(scalarType.getType());
 	}
 
 	/**
@@ -96,26 +93,27 @@ public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum != VALUE && pNodeNameEnum != VALUE_NULL) throw new SAXException(
-				"Only VALUE and VALUE.NULL nodes can be added to VALUE.ARRAY nodes but "
-						+ pNodeNameEnum + " found!");
+			"Only VALUE and VALUE.NULL nodes can be added to VALUE.ARRAY nodes but " + pNodeNameEnum + " found!"
+		);
 	}
 
 	@Override
 	public void childParsed(Node pChild) {
 		if (this.iValueAL == null) this.iValueAL = new ArrayList();
-		if (pChild instanceof ValueNode) this.iValueAL.add(((ValueNode) pChild).getValue());
-		else if (pChild instanceof ValueNullNode) this.iValueAL.add(null);
+		if (pChild instanceof ValueNode) this.iValueAL.add(((ValueNode) pChild).getValue()); else if (
+			pChild instanceof ValueNullNode
+		) this.iValueAL.add(null);
 	}
 
 	@Override
 	public void testCompletness() {
-	// Nothing to test, since it is OK if it doesn't have child node.
+		// Nothing to test, since it is OK if it doesn't have child node.
 	}
 
 	/**
@@ -150,5 +148,4 @@ public CIMDataType getType() {
 	public Object getValue() {
 		return this.iValueAL == null ? EMPTY_SA : this.iValueAL.toArray(EMPTY_SA);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java
index 0fc079c..2bc89e8 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueIf.java
@@ -43,13 +43,12 @@
  * ValueIf should be implemented by Nodes which are able to return JSR48 value
  * objects. (like: CIMDataTime, Integer, String, CIMClass, CIMInstance,
  * UnsignetInteger8, ...)
- * 
+ *
  */
 public interface ValueIf {
-
 	/**
 	 * getValue
-	 * 
+	 *
 	 * @return if type is unknown it returns a String
 	 */
 	public Object getValue();
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java
index 3f7d858..5339d5f 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueInstanceWithPathNode.java
@@ -50,9 +50,9 @@
 /**
  * 
        * ELEMENT VALUE.INSTANCEWITHPATH (INSTANCEPATH, INSTANCE)
- * 
+ *
  * ELEMENT INSTANCEPATH (NAMESPACEPATH,INSTANCENAME)
- *    
+ *
  * ELEMENT INSTANCE (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*)
  * ATTLIST INSTANCE
  *   %ClassName;
@@ -60,7 +60,6 @@
  * 
      
  */
 public class ValueInstanceWithPathNode extends AbstractScalarValueNode {
-
 	// INSTANCEPATH
 	private CIMObjectPath iCIMInstPath;
 
@@ -90,20 +89,21 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == INSTANCEPATH) {
 			if (this.iCIMInstPath != null) throw new SAXException(
-					"VALUE.INSTANCEWITHPATH node can have only one INSTANCEPATH node, but another one was found!");
+				"VALUE.INSTANCEWITHPATH node can have only one INSTANCEPATH node, but another one was found!"
+			);
 		} else if (pNodeNameEnum == INSTANCE) {
 			if (this.iCIMInstance != null) throw new SAXException(
-					"VALUE.INSTANCEWITHPATH node can have only one INSTANCE node, but another one was found!");
+				"VALUE.INSTANCEWITHPATH node can have only one INSTANCE node, but another one was found!"
+			);
 		} else {
-			throw new SAXException("VALUE.INSTANCEWITHPATH node cannot have " + pNodeNameEnum
-					+ " child node!");
+			throw new SAXException("VALUE.INSTANCEWITHPATH node cannot have " + pNodeNameEnum + " child node!");
 		}
 	}
 
@@ -119,9 +119,11 @@ public void childParsed(Node pChild) {
 	@Override
 	public void testCompletness() throws SAXException {
 		if (this.iCIMInstPath == null) throw new SAXException(
-				"VALUE.INSTANCEWITHPATH node must have an INSTANCEPATH child node!");
+			"VALUE.INSTANCEWITHPATH node must have an INSTANCEPATH child node!"
+		);
 		if (this.iCIMInstance == null) throw new SAXException(
-				"VALUE.INSTANCEWITHPATH node must have an INSTANCE child node!");
+			"VALUE.INSTANCEWITHPATH node must have an INSTANCE child node!"
+		);
 	}
 
 	/**
@@ -133,14 +135,16 @@ public Object getValue() {
 		 * INSTANCENAME contains the key properties only, INSTANCE contains
 		 * non-key properties too.
 		 */
-		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
-				.CIMInstanceWithSynchonizedNumericKeyDataTypes(this.iCIMInstPath, this.iCIMInstance
-						.getProperties());
+		if (
+			WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()
+		) return CIMHelper.CIMInstanceWithSynchonizedNumericKeyDataTypes(
+			this.iCIMInstPath,
+			this.iCIMInstance.getProperties()
+		);
 		return new CIMInstance(this.iCIMInstPath, this.iCIMInstance.getProperties());
 	}
 
 	public CIMDataType getType() {
 		return CIMDataType.OBJECT_T;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java
index dd774be..1026448 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNamedInstanceNode.java
@@ -57,21 +57,20 @@
 /**
  * 
        * ELEMENT VALUE.NAMEDINSTANCE (INSTANCENAME, INSTANCE)
- * 
+ *
  * ELEMENT INSTANCENAME (KEYBINDING* | KEYVALUE? | VALUE.REFERENCE?)
  * ATTLIST INSTANCENAME
  *   %ClassName;
- *   
+ *
  * ELEMENT INSTANCE (QUALIFIER*, (PROPERTY | PROPERTY.ARRAY | PROPERTY.REFERENCE)*)
  * ATTLIST INSTANCE
  *   %ClassName;
- *   xml:lang   NMTOKEN      #IMPLIED 
+ *   xml:lang   NMTOKEN      #IMPLIED
  * FIXME: Why INSTANCE has qualifiers? CIMInstance doesn't have!
  * FIXME: InstanceName and instance provides redundant information. Why?
  * 
      
  */
 public class ValueNamedInstanceNode extends AbstractScalarValueNode {
-
 	// INSTANCENAME
 	private CIMObjectPath iCIMInstPath;
 
@@ -101,20 +100,21 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == INSTANCENAME) {
 			if (this.iCIMInstPath != null) throw new SAXException(
-					"VALUE.NAMEDINSTANCE node can have only one INSTANCENAME node, but another one was found!");
+				"VALUE.NAMEDINSTANCE node can have only one INSTANCENAME node, but another one was found!"
+			);
 		} else if (pNodeNameEnum == INSTANCE) {
 			if (this.iCIMInstance != null) throw new SAXException(
-					"VALUE.NAMEDINSTANCE node can have only one INSTANCE node, but another one was found!");
+				"VALUE.NAMEDINSTANCE node can have only one INSTANCE node, but another one was found!"
+			);
 		} else {
-			throw new SAXException("VALUE.NAMEDINSTANCE node cannot have " + pNodeNameEnum
-					+ " child node!");
+			throw new SAXException("VALUE.NAMEDINSTANCE node cannot have " + pNodeNameEnum + " child node!");
 		}
 	}
 
@@ -130,9 +130,9 @@ public void childParsed(Node pChild) {
 	@Override
 	public void testCompletness() throws SAXException {
 		if (this.iCIMInstPath == null) throw new SAXException(
-				"VALUE.NAMEDINSTANCE node must have an INSTANCENAME child node!");
-		if (this.iCIMInstance == null) throw new SAXException(
-				"VALUE.NAMEDINSTANCE node must have an INSTANCE child node!");
+			"VALUE.NAMEDINSTANCE node must have an INSTANCENAME child node!"
+		);
+		if (this.iCIMInstance == null) throw new SAXException("VALUE.NAMEDINSTANCE node must have an INSTANCE child node!");
 	}
 
 	/**
@@ -145,14 +145,16 @@ public Object getValue() {
 		 * INSTANCENAME contains the key properties only, INSTANCE contains the
 		 * non-key properties too.
 		 */
-		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
-				.CIMInstanceWithSynchonizedNumericKeyDataTypes(this.iCIMInstPath, this.iCIMInstance
-						.getProperties());
+		if (
+			WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()
+		) return CIMHelper.CIMInstanceWithSynchonizedNumericKeyDataTypes(
+			this.iCIMInstPath,
+			this.iCIMInstance.getProperties()
+		);
 		return new CIMInstance(this.iCIMInstPath, this.iCIMInstance.getProperties());
 	}
 
 	public CIMDataType getType() {
 		return CIMDataType.OBJECT_T;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java
index ca92305..3f3be50 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNode.java
@@ -55,7 +55,6 @@
  * For non-standard CIMOMs the TYPE and PARAMTYPE attributes are supported.
  */
 public class ValueNode extends AbstractScalarValueNode {
-
 	private CIMDataType iType;
 
 	private String iData;
@@ -96,12 +95,12 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// no child
+		// no child
 	}
 
 	@Override
 	public void testCompletness() {
-	// no child nodes
+		// no child nodes
 	}
 
 	/**
@@ -127,5 +126,4 @@ public Object getValue() {
 	public CIMDataType getType() {
 		return this.iType;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java
index 32f5069..3e1217b 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueNullNode.java
@@ -65,7 +65,7 @@ public ValueNullNode() {
 	 */
 	@Override
 	public void init(Attributes pAttribs, SAXSession pSession) {
-	// no attributes
+		// no attributes
 	}
 
 	/**
@@ -73,7 +73,7 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	/**
@@ -89,12 +89,12 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 	 */
 	@Override
 	public void childParsed(Node pChild) {
-	// no child
+		// no child
 	}
 
 	@Override
 	public void testCompletness() {
-	// nothing to test
+		// nothing to test
 	}
 
 	/**
@@ -109,5 +109,4 @@ public CIMDataType getType() {
 		// type is unknown
 		return null;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java
index 7f820eb..28412ec 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java
@@ -48,8 +48,8 @@
 
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMDataType;
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -57,7 +57,6 @@
  * ELEMENT VALUE.OBJECT (CLASS | INSTANCE)
  */
 public class ValueObjectNode extends AbstractScalarValueNode {
-
 	private CIMNamedElementInterface iCIMObject;
 
 	/**
@@ -82,30 +81,29 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iCIMObject != null) throw new SAXException("This " + getNodeName()
-				+ " node can have only one child but an additional " + pNodeNameEnum
-				+ " node found!");
+		if (this.iCIMObject != null) throw new SAXException(
+			"This " + getNodeName() + " node can have only one child but an additional " + pNodeNameEnum + " node found!"
+		);
 		if (pNodeNameEnum != CLASS && pNodeNameEnum != INSTANCE) throw new SAXException(
-				getNodeName() + " node child node can be CLASS or INSTANCE but a " + pNodeNameEnum
-						+ " node was found!");
+			getNodeName() + " node child node can be CLASS or INSTANCE but a " + pNodeNameEnum + " node was found!"
+		);
 	}
 
 	@Override
 	public void childParsed(Node pChild) {
 		AbstractObjectNode objNode = (AbstractObjectNode) pChild;
-		if (objNode instanceof ClassNode) this.iCIMObject = ((ClassNode) objNode).getCIMClass();
-		else this.iCIMObject = ((InstanceNode) objNode).getCIMInstance();
+		if (objNode instanceof ClassNode) this.iCIMObject = ((ClassNode) objNode).getCIMClass(); else this.iCIMObject =
+			((InstanceNode) objNode).getCIMInstance();
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iCIMObject == null) throw new SAXException(
-				"VALUE.OBJECT node must have a CLASS or INSTANCE child node!");
+		if (this.iCIMObject == null) throw new SAXException("VALUE.OBJECT node must have a CLASS or INSTANCE child node!");
 	}
 
 	/**
@@ -120,5 +118,4 @@ public CIMDataType getType() {
 		if (this.iCIMObject instanceof CIMClass) return CIMDataType.CLASS_T;
 		return CIMDataType.OBJECT_T;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java
index 91f5ff0..ec9fc4c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithLocalPathNode.java
@@ -46,9 +46,9 @@
 
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -57,7 +57,6 @@
  * (LOCALINSTANCEPATH, INSTANCE))
  */
 public class ValueObjectWithLocalPathNode extends AbstractScalarValueNode {
-
 	// ObjectPath element
 	private String iPathNodeNameEnum;
 
@@ -92,29 +91,24 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == LOCALCLASSPATH) {
-			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum,
-					LOCALCLASSPATH);
+			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum, LOCALCLASSPATH);
 			if (this.iObjNodeNameEnum == INSTANCE) illegalChildNodePair(LOCALCLASSPATH, INSTANCE);
 		} else if (pNodeNameEnum == CLASS) {
 			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, CLASS);
-			if (this.iPathNodeNameEnum == LOCALINSTANCEPATH) illegalChildNodePair(
-					LOCALINSTANCEPATH, CLASS);
+			if (this.iPathNodeNameEnum == LOCALINSTANCEPATH) illegalChildNodePair(LOCALINSTANCEPATH, CLASS);
 		} else if (pNodeNameEnum == LOCALINSTANCEPATH) {
-			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum,
-					LOCALINSTANCEPATH);
+			if (this.iPathNodeNameEnum != null) duplicatedNode(this.iPathNodeNameEnum, LOCALINSTANCEPATH);
 			if (this.iObjNodeNameEnum == CLASS) illegalChildNodePair(LOCALINSTANCEPATH, CLASS);
 		} else if (pNodeNameEnum == INSTANCE) {
 			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, INSTANCE);
-			if (this.iPathNodeNameEnum == LOCALCLASSPATH) illegalChildNodePair(LOCALCLASSPATH,
-					INSTANCE);
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child!");
+			if (this.iPathNodeNameEnum == LOCALCLASSPATH) illegalChildNodePair(LOCALCLASSPATH, INSTANCE);
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child!");
 	}
 
 	@Override
@@ -125,8 +119,9 @@ public void childParsed(Node pChild) throws SAXException {
 		} else { // ClassNode or InstanceNode, iObjPath must be available
 			// here
 			this.iObjNodeNameEnum = pChild.getNodeName();
-			if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
-					+ " first child should contain an object path!");
+			if (this.iPathNodeNameEnum == null) throw new SAXException(
+				getNodeName() + " first child should contain an object path!"
+			);
 			if (pChild instanceof ClassNode) {
 				this.iCIMObj = ((ClassNode) pChild).getCIMClass(this.iObjPath);
 			} else {
@@ -137,10 +132,12 @@ public void childParsed(Node pChild) throws SAXException {
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
-				+ " node must have a LOCALCLASSPATH or a LOCALINSTANCEPATH child node!");
-		if (this.iObjNodeNameEnum == null) throw new SAXException(getNodeName()
-				+ " node must have a CLASS or INSTANCE child node!");
+		if (this.iPathNodeNameEnum == null) throw new SAXException(
+			getNodeName() + " node must have a LOCALCLASSPATH or a LOCALINSTANCEPATH child node!"
+		);
+		if (this.iObjNodeNameEnum == null) throw new SAXException(
+			getNodeName() + " node must have a CLASS or INSTANCE child node!"
+		);
 	}
 
 	/**
@@ -155,5 +152,4 @@ public CIMDataType getType() {
 		if (this.iCIMObj instanceof CIMClass) return CIMDataType.CLASS_T;
 		return CIMDataType.OBJECT_T;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java
index 4f876fd..48fdfe6 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueObjectWithPathNode.java
@@ -46,9 +46,9 @@
 
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXSession;
-import org.metricshub.wbem.javax.cim.CIMNamedElementInterface;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
@@ -56,7 +56,6 @@
  * ELEMENT VALUE.OBJECTWITHPATH ((CLASSPATH, CLASS) | (INSTANCEPATH, INSTANCE))
  */
 public class ValueObjectWithPathNode extends AbstractScalarValueNode {
-
 	// ObjectPath element
 	private String iPathNodeNameEnum;
 
@@ -91,7 +90,7 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
@@ -108,9 +107,7 @@ public void testChild(String pNodeNameEnum) throws SAXException {
 		} else if (pNodeNameEnum == INSTANCE) {
 			if (this.iObjNodeNameEnum != null) duplicatedNode(this.iObjNodeNameEnum, INSTANCE);
 			if (this.iPathNodeNameEnum == CLASSPATH) illegalChildNodePair(CLASSPATH, INSTANCE);
-		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
-				+ " child!");
-
+		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum + " child!");
 	}
 
 	@Override
@@ -121,8 +118,9 @@ public void childParsed(Node pChild) throws SAXException {
 		} else { // ClassNode or InstanceNode, iObjPath must be available
 			// here
 			this.iObjNodeNameEnum = pChild.getNodeName();
-			if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
-					+ " first child should contain an object path!");
+			if (this.iPathNodeNameEnum == null) throw new SAXException(
+				getNodeName() + " first child should contain an object path!"
+			);
 			if (pChild instanceof ClassNode) {
 				this.iCIMObj = ((ClassNode) pChild).getCIMClass(this.iObjPath);
 			} else {
@@ -133,10 +131,12 @@ public void childParsed(Node pChild) throws SAXException {
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iPathNodeNameEnum == null) throw new SAXException(getNodeName()
-				+ " node must have a CLASSPATH or a INSTANCEPATH child node!");
-		if (this.iObjNodeNameEnum == null) throw new SAXException(getNodeName()
-				+ " node must have a CLASS or INSTANCE child node!");
+		if (this.iPathNodeNameEnum == null) throw new SAXException(
+			getNodeName() + " node must have a CLASSPATH or a INSTANCEPATH child node!"
+		);
+		if (this.iObjNodeNameEnum == null) throw new SAXException(
+			getNodeName() + " node must have a CLASS or INSTANCE child node!"
+		);
 	}
 
 	/**
@@ -151,5 +151,4 @@ public CIMDataType getType() {
 		if (this.iCIMObj instanceof CIMClass) return CIMDataType.CLASS_T;
 		return CIMDataType.OBJECT_T;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java
index 2601e9c..509f9e7 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.java
@@ -50,7 +50,6 @@
  */
 
 import java.util.ArrayList;
-
 import org.metricshub.wbem.javax.cim.CIMDataType;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.sblim.cimclient.GenericExts;
@@ -62,7 +61,6 @@
  * ELEMENT VALUE.REFARRAY (VALUE.REFERENCE|VALUE.NULL)*
  */
 public class ValueRefArrayNode extends AbstractArrayValueNode {
-
 	private ArrayList iCIMObjPathAL;
 
 	/**
@@ -87,28 +85,27 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// no data
+		// no data
 	}
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum != VALUE_REFERENCE && pNodeNameEnum != VALUE_NULL) throw new SAXException(
-				getNodeName()
-						+ " node child node can be VALUE.REFERENCE or VALUE.NULL only while it is "
-						+ pNodeNameEnum + "!");
+			getNodeName() + " node child node can be VALUE.REFERENCE or VALUE.NULL only while it is " + pNodeNameEnum + "!"
+		);
 	}
 
 	@Override
 	public void childParsed(Node pChild) {
 		if (this.iCIMObjPathAL == null) this.iCIMObjPathAL = new ArrayList();
-		if (pChild instanceof ValueReferenceNode) this.iCIMObjPathAL
-				.add(((ValueReferenceNode) pChild).getCIMObjectPath());
-		else if (pChild instanceof ValueNullNode) this.iCIMObjPathAL.add(null);
+		if (pChild instanceof ValueReferenceNode) this.iCIMObjPathAL.add(
+				((ValueReferenceNode) pChild).getCIMObjectPath()
+			); else if (pChild instanceof ValueNullNode) this.iCIMObjPathAL.add(null);
 	}
 
 	@Override
 	public void testCompletness() {
-	// child nodes are not mandatory
+		// child nodes are not mandatory
 	}
 
 	/**
@@ -136,5 +133,4 @@ public CIMDataType getType() {
 	public Object getValue() {
 		return size() == 0 ? null : this.iCIMObjPathAL.toArray(EMPTY_OPA);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java
index 05c1f65..139ba0f 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java
@@ -57,7 +57,6 @@
  * INSTANCEPATH | LOCALINSTANCEPATH | INSTANCENAME)
  */
 public class ValueReferenceNode extends AbstractScalarValueNode implements ObjectPathIf {
-
 	private CIMObjectPath iCIMObjPath;
 
 	private String iChildNodeName = null;
@@ -72,14 +71,22 @@ public ValueReferenceNode() {
 	@Override
 	public void childParsed(Node pChild) {
 		this.iCIMObjPath = ((AbstractPathNode) pChild).getCIMObjectPath();
-		if ((CLASSNAME.equalsIgnoreCase(this.iChildNodeName) || INSTANCENAME
-				.equalsIgnoreCase(this.iChildNodeName))
-				&& this.iCIMObjPath.getNamespace() != null) {
+		if (
+			(CLASSNAME.equalsIgnoreCase(this.iChildNodeName) || INSTANCENAME.equalsIgnoreCase(this.iChildNodeName)) &&
+			this.iCIMObjPath.getNamespace() != null
+		) {
 			// LocalPathBuilder includes default namespace in CLASSNAME and
 			// INSTANCENAME elements, needs to be stripped
-			this.iCIMObjPath = new CIMObjectPath(this.iCIMObjPath.getScheme(), this.iCIMObjPath
-					.getHost(), this.iCIMObjPath.getPort(), null, this.iCIMObjPath.getObjectName(),
-					this.iCIMObjPath.getKeys(), this.iCIMObjPath.getXmlSchemaName());
+			this.iCIMObjPath =
+				new CIMObjectPath(
+					this.iCIMObjPath.getScheme(),
+					this.iCIMObjPath.getHost(),
+					this.iCIMObjPath.getPort(),
+					null,
+					this.iCIMObjPath.getObjectName(),
+					this.iCIMObjPath.getKeys(),
+					this.iCIMObjPath.getXmlSchemaName()
+				);
 		}
 	}
 
@@ -99,30 +106,40 @@ public void init(Attributes pAttribs, SAXSession pSession) {
 	 */
 	@Override
 	public void parseData(String pData) {
-	// there is no data
+		// there is no data
 	}
 
-	private static final String[] ALLOWED_CHILDREN = { CLASSPATH, LOCALCLASSPATH, CLASSNAME,
-			INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME };
+	private static final String[] ALLOWED_CHILDREN = {
+		CLASSPATH,
+		LOCALCLASSPATH,
+		CLASSNAME,
+		INSTANCEPATH,
+		LOCALINSTANCEPATH,
+		INSTANCENAME
+	};
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iCIMObjPath != null) throw new SAXException("Child node " + pNodeNameEnum
-				+ " is illegal, since VALUE.REFERENCE already has a child!");
-		for (int i = 0; i < ALLOWED_CHILDREN.length; i++)
-			if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
-				this.iChildNodeName = pNodeNameEnum;
-				return;
-			}
-		throw new SAXException("Invalid child node in " + getNodeName() + " node: " + pNodeNameEnum
-				+ "! Valid nodes are CLASSPATH, LOCALCLASSPATH, CLASSNAME, "
-				+ "INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME");
+		if (this.iCIMObjPath != null) throw new SAXException(
+			"Child node " + pNodeNameEnum + " is illegal, since VALUE.REFERENCE already has a child!"
+		);
+		for (int i = 0; i < ALLOWED_CHILDREN.length; i++) if (ALLOWED_CHILDREN[i] == pNodeNameEnum) {
+			this.iChildNodeName = pNodeNameEnum;
+			return;
+		}
+		throw new SAXException(
+			"Invalid child node in " +
+			getNodeName() +
+			" node: " +
+			pNodeNameEnum +
+			"! Valid nodes are CLASSPATH, LOCALCLASSPATH, CLASSNAME, " +
+			"INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME"
+		);
 	}
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iCIMObjPath == null) throw new SAXException(
-				"VALUE.REFERENCE node must have a child node!");
+		if (this.iCIMObjPath == null) throw new SAXException("VALUE.REFERENCE node must have a child node!");
 	}
 
 	/**
@@ -140,5 +157,4 @@ public CIMDataType getType() {
 	public CIMObjectPath getCIMObjectPath() {
 		return this.iCIMObjPath;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
index 27c97b3..52a3a74 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
@@ -53,7 +53,7 @@
 import java.util.Locale;
 import java.util.Vector;
 import java.util.logging.Level;
-
+import org.metricshub.wbem.sblim.cimclient.discovery.Discoverer;
 import org.metricshub.wbem.sblim.cimclient.discovery.WBEMServiceAdvertisement;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.slp.Locator;
@@ -62,16 +62,14 @@
 import org.metricshub.wbem.sblim.slp.ServiceType;
 import org.metricshub.wbem.sblim.slp.ServiceURL;
 import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
-import org.metricshub.wbem.sblim.cimclient.discovery.Discoverer;
 
 /**
  * Class DiscovererSLP is the SLP specific implementation of the Discoverer
  * interface.
- * 
+ *
  * @since 2.0.2
  */
 public class DiscovererSLP extends Object implements Discoverer {
-
 	private static final String SERVICE_WBEM = "service:wbem";
 
 	private static final ServiceType SERVICE_TYPE = new ServiceType(SERVICE_WBEM);
@@ -84,7 +82,7 @@ public class DiscovererSLP extends Object implements Discoverer {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLocale
 	 *            The locale setting to use for the Locator
 	 */
@@ -96,7 +94,7 @@ public DiscovererSLP(Locale pLocale) {
 
 	/**
 	 * Returns locale
-	 * 
+	 *
 	 * @return The value of locale.
 	 */
 	public Locale getLocale() {
@@ -105,7 +103,7 @@ public Locale getLocale() {
 
 	/**
 	 * Sets locale
-	 * 
+	 *
 	 * @param pLocale
 	 *            The new value of locale.
 	 */
@@ -115,7 +113,7 @@ public void setLocale(Locale pLocale) {
 
 	/**
 	 * Returns scopes
-	 * 
+	 *
 	 * @return The value of scopes.
 	 */
 	public Vector getScopes() {
@@ -124,7 +122,7 @@ public Vector getScopes() {
 
 	/**
 	 * Sets scopes
-	 * 
+	 *
 	 * @param pScopes
 	 *            The new value of scopes.
 	 */
@@ -134,11 +132,10 @@ public void setScopes(Vector pScopes) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.sblim.cimclient.discovery.Discoverer#findWbemServices(String[])
 	 */
 	public WBEMServiceAdvertisement[] findWbemServices(final String[] pDirectoryUrls) {
-
 		List advertisements = new ArrayList();
 
 		if (pDirectoryUrls != null && pDirectoryUrls.length > 0) {
@@ -157,12 +154,13 @@ private List findWbemServices(final String pDA) {
 		logger.entry();
 		logger.trace(Level.FINEST, "SLP discovery started on DA " + pDA);
 		try {
-
 			Vector agents;
 			if (pDA != null) {
 				agents = new Vector();
 				InetAddress address = InetAddress.getByName(pDA);
-				if (address == null) { return new LinkedList(); }
+				if (address == null) {
+					return new LinkedList();
+				}
 				agents.add(address);
 			} else {
 				agents = null;
@@ -171,8 +169,7 @@ private List findWbemServices(final String pDA) {
 			final Locator locator = ServiceLocationManager.getLocator(this.iLocale);
 
 			List advertisements = new ArrayList();
-			Enumeration serviceEnum = locator.findServices(SERVICE_TYPE, this.iScopes, "",
-					agents);
+			Enumeration serviceEnum = locator.findServices(SERVICE_TYPE, this.iScopes, "", agents);
 
 			while (serviceEnum != null && serviceEnum.hasMoreElements()) {
 				ServiceURL url;
@@ -182,8 +179,7 @@ private List findWbemServices(final String pDA) {
 					logger.trace(Level.FINE, e.getMessage(), e);
 					continue;
 				}
-				Enumeration attributeEnum = locator.findAttributes(url, this.iScopes,
-						ATTRIBUTES, agents);
+				Enumeration attributeEnum = locator.findAttributes(url, this.iScopes, ATTRIBUTES, agents);
 				List attributes = new ArrayList();
 				while (attributeEnum != null && attributeEnum.hasMoreElements()) {
 					try {
@@ -195,16 +191,16 @@ private List findWbemServices(final String pDA) {
 				}
 				advertisements.add(new WBEMServiceAdvertisementSLP(pDA, url, attributes));
 			}
-			logger.trace(Level.FINEST, "SLP discovery completed on DA " + pDA + ". "
-					+ advertisements.size() + " WBEM services found");
+			logger.trace(
+				Level.FINEST,
+				"SLP discovery completed on DA " + pDA + ". " + advertisements.size() + " WBEM services found"
+			);
 			logger.exit();
 			return advertisements;
-
 		} catch (ServiceLocationException e) {
 			LogAndTraceBroker.getBroker().trace(Level.FINE, "SLP discovery failed with error", e);
 		} catch (Exception e) {
-			LogAndTraceBroker.getBroker()
-					.trace(Level.FINE, "Exception during service discovery", e);
+			LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception during service discovery", e);
 		}
 		logger.exit();
 		return new LinkedList();
@@ -218,16 +214,17 @@ public String[] findDirectoryServices() {
 
 			final Locator locator = ServiceLocationManager.getLocator(this.iLocale);
 
-			Enumeration serviceEnum = locator.findServices(SLPDefaults.DA_SERVICE_TYPE,
-					this.iScopes, "");
+			Enumeration serviceEnum = locator.findServices(SLPDefaults.DA_SERVICE_TYPE, this.iScopes, "");
 
 			while (serviceEnum != null && serviceEnum.hasMoreElements()) {
 				ServiceURL url = (ServiceURL) serviceEnum.nextElement();
 				agents.add(url.getHost());
 			}
 
-			logger.trace(Level.FINER, "SLP DA discovery completed in local subnet. "
-					+ agents.size() + " DAs found:" + agents.toString());
+			logger.trace(
+				Level.FINER,
+				"SLP DA discovery completed in local subnet. " + agents.size() + " DAs found:" + agents.toString()
+			);
 			if (agents.size() == 0) {
 				serviceEnum = locator.findServices(SLPDefaults.SA_SERVICE_TYPE, this.iScopes, "");
 
@@ -235,18 +232,18 @@ public String[] findDirectoryServices() {
 					ServiceURL url = (ServiceURL) serviceEnum.nextElement();
 					agents.add(url.getHost());
 				}
-				logger.trace(Level.FINER, "SLP SA discovery completed in local subnet. "
-						+ agents.size() + " SAs found:" + agents.toString());
+				logger.trace(
+					Level.FINER,
+					"SLP SA discovery completed in local subnet. " + agents.size() + " SAs found:" + agents.toString()
+				);
 			}
 
 			logger.exit();
 			return agents.toArray(new String[agents.size()]);
-
 		} catch (ServiceLocationException e) {
 			LogAndTraceBroker.getBroker().trace(Level.FINE, "SLP discovery failed with error", e);
 		} catch (Exception e) {
-			LogAndTraceBroker.getBroker()
-					.trace(Level.FINE, "Exception during service discovery", e);
+			LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception during service discovery", e);
 		}
 		logger.exit();
 		return new String[0];
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java
index 887a6bc..a7d3916 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/WBEMServiceAdvertisementSLP.java
@@ -46,14 +46,12 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.security.auth.Subject;
-
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.wbem.client.WBEMClient;
 import org.metricshub.wbem.javax.wbem.client.WBEMClientFactory;
@@ -64,12 +62,11 @@
 /**
  * Class WBEMServiceAdvertisementSLP is the SLP specific implementation if the
  * WBEMServiceAdvertisement interface.
- * 
- * 
+ *
+ *
  * @since 2.0.2
  */
 public class WBEMServiceAdvertisementSLP implements WBEMServiceAdvertisement {
-
 	private static final Pattern ATTR_PATTERN = Pattern.compile("[(]?(.+)=([^)]+)[)]?");
 
 	private String iDA;
@@ -82,7 +79,7 @@ public class WBEMServiceAdvertisementSLP implements WBEMServiceAdvertisement {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pDA
 	 *            The Directory Agent from which this advertisement was received
 	 * @param pUrl
@@ -93,12 +90,10 @@ public class WBEMServiceAdvertisementSLP implements WBEMServiceAdvertisement {
 	 *            (key=value).
 	 */
 	public WBEMServiceAdvertisementSLP(String pDA, ServiceURL pUrl, List pAttributes) {
-		if (pDA == null || pUrl == null) throw new IllegalArgumentException(
-				"Directory and URL must not be null");
+		if (pDA == null || pUrl == null) throw new IllegalArgumentException("Directory and URL must not be null");
 		this.iDA = pDA;
 		this.iServiceUrl = pUrl;
 		parseAttributes(pAttributes);
-
 	}
 
 	private void parseAttributes(List pAttributes) {
@@ -112,15 +107,14 @@ private void parseAttributes(List pAttributes) {
 				String value = matcher.group(2).trim();
 				this.iAttributeMap.put(key, value);
 			} else {
-				LogAndTraceBroker.getBroker().trace(Level.FINE,
-						"SLP discovery returned invalid attribute: " + attribute);
+				LogAndTraceBroker.getBroker().trace(Level.FINE, "SLP discovery returned invalid attribute: " + attribute);
 			}
 		}
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.sblim.cimclient.discovery.WbemService#getAttribute(java.lang.String)
 	 */
@@ -130,7 +124,7 @@ public String getAttribute(String pAttributeName) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.sblim.cimclient.discovery.WbemService#getAttributes()
 	 */
 	public Set> getAttributes() {
@@ -139,7 +133,7 @@ public Set> getAttributes() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.sblim.cimclient.discovery.WbemService#getConcreteServiceType()
 	 */
 	public String getConcreteServiceType() {
@@ -148,17 +142,18 @@ public String getConcreteServiceType() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.sblim.cimclient.discovery.WbemService#getServiceUrl()
 	 */
 	public String getServiceUrl() {
-		return getConcreteServiceType() + "://" + this.iServiceUrl.getHost() + ":"
-				+ String.valueOf(this.iServiceUrl.getPort());
+		return (
+			getConcreteServiceType() + "://" + this.iServiceUrl.getHost() + ":" + String.valueOf(this.iServiceUrl.getPort())
+		);
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.sblim.cimclient.discovery.WBEMServiceAdvertisement#createClient(javax
 	 * .security.auth.Subject, java.util.Locale[])
@@ -169,9 +164,14 @@ public WBEMClient createClient(Subject pSubject, Locale[] pLocales) throws Excep
 			communication = getAttribute(OTHER_COMM_MECHN_DESC);
 		}
 		WBEMClient client = WBEMClientFactory.getClient(communication);
-		CIMObjectPath path = new CIMObjectPath(this.iServiceUrl.getServiceType()
-				.getConcreteTypeName(), this.iServiceUrl.getHost(), String.valueOf(this.iServiceUrl
-				.getPort()), null, null, null);
+		CIMObjectPath path = new CIMObjectPath(
+			this.iServiceUrl.getServiceType().getConcreteTypeName(),
+			this.iServiceUrl.getHost(),
+			String.valueOf(this.iServiceUrl.getPort()),
+			null,
+			null,
+			null
+		);
 		client.initialize(path, pSubject, pLocales);
 		return client;
 	}
@@ -182,7 +182,7 @@ public String getDirectory() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
@@ -237,7 +237,7 @@ private String[] parseCommaSeparatedList(String pAttribute) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.sblim.cimclient.discovery.WBEMServiceAdvertisement#getServiceId()
 	 */
@@ -247,7 +247,7 @@ public String getServiceId() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.sblim.cimclient.discovery.WBEMServiceAdvertisement#isExpired()
 	 */
 	public boolean isExpired() {
@@ -256,7 +256,7 @@ public boolean isExpired() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.sblim.cimclient.discovery.WBEMServiceAdvertisement#setExpired(boolean
 	 * )
@@ -267,23 +267,24 @@ public void setExpired(boolean pExpired) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	@Override
 	public boolean equals(Object pObj) {
-		if (pObj == this) { return true; }
+		if (pObj == this) {
+			return true;
+		}
 		if (pObj != null && pObj instanceof WBEMServiceAdvertisement) {
 			WBEMServiceAdvertisement that = (WBEMServiceAdvertisement) pObj;
-			return getServiceUrl().equals(that.getServiceUrl())
-					&& getDirectory().equals(that.getDirectory());
+			return getServiceUrl().equals(that.getServiceUrl()) && getDirectory().equals(that.getDirectory());
 		}
 		return false;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#hashCode()
 	 */
 	@Override
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java
index 884ab88..50a417c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationHandler.java
@@ -50,15 +50,14 @@
 
 /**
  * Class AuthorizationHandler manages AdAuthorizationInfo instances
- * 
+ *
  */
 public class AuthorizationHandler {
-
 	private ArrayList iAuthList = new ArrayList();
 
 	/**
 	 * Adds an AuthorizationInfo to the handler
-	 * 
+	 *
 	 * @param pAuthorizationInfo
 	 *            The AuthorizationInfo to add
 	 */
@@ -68,7 +67,7 @@ public synchronized void addAuthorizationInfo(AuthorizationInfo pAuthorizationIn
 
 	/**
 	 * Returns the corresponding AuthorizationInfo for a given set of parameters
-	 * 
+	 *
 	 * @param pAuthorizationModule
 	 *            The authorization module
 	 * @param pProxy
@@ -85,25 +84,37 @@ public synchronized void addAuthorizationInfo(AuthorizationInfo pAuthorizationIn
 	 *            Scheme
 	 * @return The AuthorizationInfo or null if none fits
 	 */
-	public synchronized AuthorizationInfo getAuthorizationInfo(String pAuthorizationModule,
-			Boolean pProxy, String pAddr, int pPort, String pProtocol, String pRealm, String pScheme) {
-
-		AuthorizationInfo request = AuthorizationInfo.createAuthorizationInfo(pAuthorizationModule,
-				pProxy, pAddr, pPort, pProtocol, pRealm, pScheme);
+	public synchronized AuthorizationInfo getAuthorizationInfo(
+		String pAuthorizationModule,
+		Boolean pProxy,
+		String pAddr,
+		int pPort,
+		String pProtocol,
+		String pRealm,
+		String pScheme
+	) {
+		AuthorizationInfo request = AuthorizationInfo.createAuthorizationInfo(
+			pAuthorizationModule,
+			pProxy,
+			pAddr,
+			pPort,
+			pProtocol,
+			pRealm,
+			pScheme
+		);
 
 		Iterator iter = this.iAuthList.iterator();
 		while (iter.hasNext()) {
 			AuthorizationInfo authInfo = iter.next();
 
 			if (authInfo.match(request)) return authInfo;
-
 		}
 		return null;
 	}
 
 	/**
 	 * Returns the AuthorizationInfo at a given index
-	 * 
+	 *
 	 * @param pIndex
 	 *            The index
 	 * @return The AuthorizationInfo
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java
index 3a9691c..eb4fdb0 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/AuthorizationInfo.java
@@ -50,19 +50,17 @@
 import java.net.URI;
 import java.security.NoSuchAlgorithmException;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
 
 /**
  * Abstract superclass for HTTP authorization information.
- * 
+ *
  * @see WwwAuthInfo
  * @see PegasusLocalAuthInfo
  */
 public abstract class AuthorizationInfo {
-
 	protected String iAddr;
 
 	protected int iPort;
@@ -97,7 +95,7 @@ public abstract class AuthorizationInfo {
 
 	/**
 	 * Initialize
-	 * 
+	 *
 	 * @param pProxy
 	 *            Proxy authentication ?
 	 * @param pAddress
@@ -111,8 +109,7 @@ public abstract class AuthorizationInfo {
 	 * @param pScheme
 	 *            Scheme
 	 */
-	public void init(Boolean pProxy, String pAddress, int pPort, String pProtocol, String pRealm,
-			String pScheme) {
+	public void init(Boolean pProxy, String pAddress, int pPort, String pProtocol, String pRealm, String pScheme) {
 		this.iAddr = pAddress;
 		this.iPort = pPort;
 		this.iProtocol = pProtocol;
@@ -122,7 +119,7 @@ public void init(Boolean pProxy, String pAddress, int pPort, String pProtocol, S
 
 	/**
 	 * Sets opaque
-	 * 
+	 *
 	 * @param opaque
 	 *            new Value
 	 */
@@ -132,7 +129,7 @@ public void setOpaque(String opaque) {
 
 	/**
 	 * Returns opaque
-	 * 
+	 *
 	 * @return Opaque
 	 */
 	public String getOpaque() {
@@ -141,7 +138,7 @@ public String getOpaque() {
 
 	/**
 	 * Returns Qop
-	 * 
+	 *
 	 * @return Qop
 	 */
 	public String getQop() {
@@ -150,7 +147,7 @@ public String getQop() {
 
 	/**
 	 * Sets Qop
-	 * 
+	 *
 	 * @param qop
 	 *            New value
 	 */
@@ -160,7 +157,7 @@ public void setQop(String qop) {
 
 	/**
 	 * Returns nc
-	 * 
+	 *
 	 * @return nc
 	 */
 	public long getNc() {
@@ -169,7 +166,7 @@ public long getNc() {
 
 	/**
 	 * Sets nc
-	 * 
+	 *
 	 * @param nc
 	 *            New value
 	 */
@@ -179,7 +176,7 @@ public void setNc(long nc) {
 
 	/**
 	 * Sets nonce
-	 * 
+	 *
 	 * @param nonce
 	 *            New Value
 	 */
@@ -189,7 +186,7 @@ public void setNonce(String nonce) {
 
 	/**
 	 * Returns nonce
-	 * 
+	 *
 	 * @return nonce
 	 */
 	public String getNonce() {
@@ -198,7 +195,7 @@ public String getNonce() {
 
 	/**
 	 * Set cnonce
-	 * 
+	 *
 	 * @param cnonce
 	 *            New value
 	 */
@@ -208,7 +205,7 @@ public void setCnonce(String cnonce) {
 
 	/**
 	 * Returns cnonce
-	 * 
+	 *
 	 * @return cnonce
 	 */
 	public String getCnonce() {
@@ -217,7 +214,7 @@ public String getCnonce() {
 
 	/**
 	 * Set algorithm
-	 * 
+	 *
 	 * @param algorithm
 	 *            New value
 	 */
@@ -227,7 +224,7 @@ public void setAlgorithm(String algorithm) {
 
 	/**
 	 * Returns algorithm
-	 * 
+	 *
 	 * @return algorithm
 	 */
 	public String getAlgorithm() {
@@ -236,7 +233,7 @@ public String getAlgorithm() {
 
 	/**
 	 * Returns A1
-	 * 
+	 *
 	 * @return A1
 	 */
 	public String getA1() {
@@ -245,7 +242,7 @@ public String getA1() {
 
 	/**
 	 * Sets A1
-	 * 
+	 *
 	 * @param A1
 	 *            New value
 	 */
@@ -255,7 +252,7 @@ public void setA1(String A1) {
 
 	/**
 	 * Sets response
-	 * 
+	 *
 	 * @param response
 	 *            New value
 	 */
@@ -265,7 +262,7 @@ public void setResponse(String response) {
 
 	/**
 	 * Returns response
-	 * 
+	 *
 	 * @return New value
 	 */
 	public String getResponse() {
@@ -274,7 +271,7 @@ public String getResponse() {
 
 	/**
 	 * Returns URI
-	 * 
+	 *
 	 * @return URI
 	 */
 	public String getURI() {
@@ -283,7 +280,7 @@ public String getURI() {
 
 	/**
 	 * Sets URI
-	 * 
+	 *
 	 * @param uri
 	 *            New value
 	 */
@@ -293,7 +290,7 @@ public void setURI(String uri) {
 
 	/**
 	 * Sets credentials
-	 * 
+	 *
 	 * @param credentials
 	 *            New value
 	 */
@@ -303,7 +300,7 @@ public void setCredentials(PasswordAuthentication credentials) {
 
 	/**
 	 * Returns the address
-	 * 
+	 *
 	 * @return The server address
 	 */
 	public String getAddr() {
@@ -312,7 +309,7 @@ public String getAddr() {
 
 	/**
 	 * Returns the port
-	 * 
+	 *
 	 * @return The server port
 	 */
 	public int getPort() {
@@ -321,7 +318,7 @@ public int getPort() {
 
 	/**
 	 * Returns the protocol
-	 * 
+	 *
 	 * @return The protocol
 	 */
 	public String getProtocol() {
@@ -330,7 +327,7 @@ public String getProtocol() {
 
 	/**
 	 * Returns the realm
-	 * 
+	 *
 	 * @return The realm
 	 */
 	public String getRealm() {
@@ -339,7 +336,7 @@ public String getRealm() {
 
 	/**
 	 * Sets the realm
-	 * 
+	 *
 	 * @param realm
 	 *            New value
 	 */
@@ -349,7 +346,7 @@ public void setRealm(String realm) {
 
 	/**
 	 * Returns the scheme
-	 * 
+	 *
 	 * @return The scheme
 	 */
 	public String getScheme() {
@@ -358,7 +355,7 @@ public String getScheme() {
 
 	/**
 	 * Sets the scheme
-	 * 
+	 *
 	 * @param scheme
 	 *            New value
 	 */
@@ -368,7 +365,7 @@ public void setScheme(String scheme) {
 
 	/**
 	 * Returns the credentials
-	 * 
+	 *
 	 * @return The credentials
 	 */
 	public PasswordAuthentication getCredentials() {
@@ -377,7 +374,7 @@ public PasswordAuthentication getCredentials() {
 
 	/**
 	 * Compares two authorization informations.
-	 * 
+	 *
 	 * @param obj
 	 *            The other authorization information
 	 * @return true if type, realm, scheme, address, protocol and
@@ -391,21 +388,17 @@ public boolean match(Object obj) {
 		boolean type = getClass().equals(that.getClass());
 		// boolean prxt = (iProxy == null || that.iProxy == null)?
 		// true:iProxy.equals(that.iProxy);
-		boolean prmpt = (this.iRealm == null || that.iRealm == null) ? true : this.iRealm
-				.equals(that.iRealm);
-		boolean schm = (this.iScheme == null || that.iScheme == null) ? true : this.iScheme
-				.equals(that.iScheme);
-		boolean adr = (this.iAddr == null || that.iAddr == null) ? true : this.iAddr
-				.equals(that.iAddr);
-		boolean prot = (this.iProtocol == null || that.iProtocol == null) ? true : this.iProtocol
-				.equals(that.iProtocol);
+		boolean prmpt = (this.iRealm == null || that.iRealm == null) ? true : this.iRealm.equals(that.iRealm);
+		boolean schm = (this.iScheme == null || that.iScheme == null) ? true : this.iScheme.equals(that.iScheme);
+		boolean adr = (this.iAddr == null || that.iAddr == null) ? true : this.iAddr.equals(that.iAddr);
+		boolean prot = (this.iProtocol == null || that.iProtocol == null) ? true : this.iProtocol.equals(that.iProtocol);
 		boolean prt = (this.iPort <= 0 || that.iPort <= 0) ? true : (this.iPort == that.iPort);
 		return (type && prmpt && schm && adr && prot && prt);
 	}
 
 	/**
 	 * Updates the authorization information according to a received challenge.
-	 * 
+	 *
 	 * @param challenge
 	 *            The received challenge
 	 * @param authenticate
@@ -416,12 +409,17 @@ public boolean match(Object obj) {
 	 *            The HTTP request method (POST or MPOST)
 	 * @throws NoSuchAlgorithmException
 	 */
-	public abstract void updateAuthenticationInfo(Challenge challenge, String authenticate,
-			URI url, String requestMethod) throws NoSuchAlgorithmException;
+	public abstract void updateAuthenticationInfo(
+		Challenge challenge,
+		String authenticate,
+		URI url,
+		String requestMethod
+	)
+		throws NoSuchAlgorithmException;
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
@@ -429,7 +427,7 @@ public abstract void updateAuthenticationInfo(Challenge challenge, String authen
 
 	/**
 	 * Gets the HTTP header field name for this authentication information
-	 * 
+	 *
 	 * @return The field name
 	 */
 	public abstract String getHeaderFieldName();
@@ -437,7 +435,7 @@ public abstract void updateAuthenticationInfo(Challenge challenge, String authen
 	/**
 	 * Determines if the authorization information is already sent on the very
 	 * first http request or after the "401 Unauthorized" response
-	 * 
+	 *
 	 * @return true or false
 	 */
 	public abstract boolean isSentOnFirstRequest();
@@ -445,7 +443,7 @@ public abstract void updateAuthenticationInfo(Challenge challenge, String authen
 	/**
 	 * Determines if the connection is kept alive after the "401 Unauthorized"
 	 * response
-	 * 
+	 *
 	 * @return true or false
 	 */
 	public abstract boolean isKeptAlive();
@@ -453,7 +451,7 @@ public abstract void updateAuthenticationInfo(Challenge challenge, String authen
 	/**
 	 * Factory method for AuthorizationInfo objects. Returns an instance of a
 	 * subclass according to the requested type.
-	 * 
+	 *
 	 * @param pModule
 	 *            The authorization info type to be constructed
 	 * @param pProxy
@@ -473,9 +471,15 @@ public abstract void updateAuthenticationInfo(Challenge challenge, String authen
 	 * @see WwwAuthInfo
 	 * @see PegasusLocalAuthInfo
 	 */
-	public static AuthorizationInfo createAuthorizationInfo(String pModule, Boolean pProxy,
-			String pAddress, int pPort, String pProtocol, String pRealm, String pScheme) {
-
+	public static AuthorizationInfo createAuthorizationInfo(
+		String pModule,
+		Boolean pProxy,
+		String pAddress,
+		int pPort,
+		String pProtocol,
+		String pRealm,
+		String pScheme
+	) {
 		AuthorizationInfo info = createAuthorizationInfo(pModule);
 
 		if (info != null) {
@@ -483,29 +487,30 @@ public static AuthorizationInfo createAuthorizationInfo(String pModule, Boolean
 		}
 
 		return info;
-
 	}
 
 	/**
 	 * Factory method for AuthorizationInfo objects. Returns an instance of a
 	 * subclass according to the requested type.
-	 * 
+	 *
 	 * @param pModule
 	 *            The authorization info type to be constructed
 	 * @return An instance of a AuthorizationInfo subclass or null
 	 */
 	public static AuthorizationInfo createAuthorizationInfo(String pModule) {
-
-		if (WwwAuthInfo.class.getName().equals(pModule)) { return new WwwAuthInfo(); }
-		if (PegasusLocalAuthInfo.class.getName().equals(pModule)) { return new PegasusLocalAuthInfo(); }
+		if (WwwAuthInfo.class.getName().equals(pModule)) {
+			return new WwwAuthInfo();
+		}
+		if (PegasusLocalAuthInfo.class.getName().equals(pModule)) {
+			return new PegasusLocalAuthInfo();
+		}
 
 		try {
 			Class module = Class.forName(pModule);
 			AuthorizationInfo info = (AuthorizationInfo) module.newInstance();
 			return info;
 		} catch (Exception e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"Exception while loading authentication module", e);
+			LogAndTraceBroker.getBroker().trace(Level.FINER, "Exception while loading authentication module", e);
 			LogAndTraceBroker.getBroker().message(Messages.HTTP_AUTH_MODULE_INVALID, pModule);
 		}
 		return null;
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/BASE64Encoder.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/BASE64Encoder.java
index d907f98..2bed79c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/BASE64Encoder.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/BASE64Encoder.java
@@ -47,22 +47,83 @@
 
 /**
  * Class BASE64Encoder implements the BASE64 encoding algorithm
- * 
+ *
  */
 public final class BASE64Encoder {
-
-	private static byte BASE64_ALPHABET[] = { 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
-			78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103,
-			104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
-			121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 43, 47 };
+	private static byte BASE64_ALPHABET[] = {
+		65,
+		66,
+		67,
+		68,
+		69,
+		70,
+		71,
+		72,
+		73,
+		74,
+		75,
+		76,
+		77,
+		78,
+		79,
+		80,
+		81,
+		82,
+		83,
+		84,
+		85,
+		86,
+		87,
+		88,
+		89,
+		90,
+		97,
+		98,
+		99,
+		100,
+		101,
+		102,
+		103,
+		104,
+		105,
+		106,
+		107,
+		108,
+		109,
+		110,
+		111,
+		112,
+		113,
+		114,
+		115,
+		116,
+		117,
+		118,
+		119,
+		120,
+		121,
+		122,
+		48,
+		49,
+		50,
+		51,
+		52,
+		53,
+		54,
+		55,
+		56,
+		57,
+		43,
+		47
+	};
 
 	private BASE64Encoder() {
-	// no instances
+		// no instances
 	}
 
 	/**
 	 * Encodes a given byte array
-	 * 
+	 *
 	 * @param pPlain
 	 *            The raw bytes
 	 * @return The encoded bytes
@@ -137,5 +198,4 @@ public static String encode(byte[] pPlain) {
 		}
 		return res;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/Challenge.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/Challenge.java
index e41d1b2..3d1df69 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/Challenge.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/Challenge.java
@@ -48,21 +48,20 @@
 
 /**
  * Class Challenge holds a http authentication challenge
- * 
+ *
  */
 public class Challenge {
-
 	private String iScheme;
 
 	private HttpHeader iParams;
 
 	private Challenge() {
-	// hidden ctor
+		// hidden ctor
 	}
 
 	/**
 	 * Returns the parameters
-	 * 
+	 *
 	 * @return The parameters
 	 */
 	public HttpHeader getParams() {
@@ -71,7 +70,7 @@ public HttpHeader getParams() {
 
 	/**
 	 * Returns the scheme
-	 * 
+	 *
 	 * @return The scheme
 	 */
 	public String getScheme() {
@@ -80,7 +79,7 @@ public String getScheme() {
 
 	/**
 	 * Returns the realm
-	 * 
+	 *
 	 * @return The realm
 	 */
 	public String getRealm() {
@@ -90,13 +89,13 @@ public String getRealm() {
 	/**
 	 * Parses the challenge as received from the host. RFC 2617 defines the
 	 * following syntax for a challenge:
-	 * 
+	 *
 	 * 
      -	 * challenge = auth-scheme 1*SP 1#auth-param 
-	 * auth-scheme = token 
+	 * challenge = auth-scheme 1*SP 1#auth-param
+	 * auth-scheme = token
 	 * auth-param = token "=" ( token | quoted-string )
 	 * 
      
-	 * 
+	 *
 	 * @param pLine
 	 *            The challenge string
 	 * @return The parsed challenge
@@ -104,8 +103,7 @@ public String getRealm() {
 	 *             If the challenge string is ill-formed
 	 */
 	public static Challenge[] parseChallenge(String pLine) throws HttpParseException {
-		if (pLine == null || pLine.length() == 0) throw new IllegalArgumentException(
-				"Invalid challenge, empty");
+		if (pLine == null || pLine.length() == 0) throw new IllegalArgumentException("Invalid challenge, empty");
 		pLine = pLine.trim();
 		if (pLine.length() == 0) throw new IllegalArgumentException("Invalid challenge, empty");
 
@@ -120,8 +118,7 @@ public static Challenge[] parseChallenge(String pLine) throws HttpParseException
 				tokensBetweenCommas.add(removeWhitespace(pLine.substring(start, end)));
 				start = end + 1;
 			}
-			if (start < pLine.length()) tokensBetweenCommas.add(removeWhitespace(pLine
-					.substring(start)));
+			if (start < pLine.length()) tokensBetweenCommas.add(removeWhitespace(pLine.substring(start)));
 
 			// Break up tokens into auth-scheme and auth-param
 			Vector tokens = new Vector();
@@ -154,8 +151,7 @@ public static Challenge[] parseChallenge(String pLine) throws HttpParseException
 							tokens.add(token.substring(start));
 						}
 					} else {
-						throw new HttpParseException("Invalid challenge, too many tokens in "
-								+ token);
+						throw new HttpParseException("Invalid challenge, too many tokens in " + token);
 					}
 				}
 			}
@@ -169,17 +165,14 @@ public static Challenge[] parseChallenge(String pLine) throws HttpParseException
 
 				int equalSign = indexOfOutsideQuotedString(token, '=', 0);
 				if (equalSign == 0) {
-					throw new HttpParseException(
-							"Invalid challenge, no token before equal sign in " + token);
+					throw new HttpParseException("Invalid challenge, no token before equal sign in " + token);
 				} else if (equalSign > 0) {
 					// param
-					if (challenge.iScheme == null) throw new HttpParseException(
-							"Invalid challenge, param without scheme");
+					if (challenge.iScheme == null) throw new HttpParseException("Invalid challenge, param without scheme");
 					String name = token.substring(0, equalSign);
 					String value = token.substring(equalSign + 1);
 					if (value.length() == 0) {
-						throw new HttpParseException(
-								"Invalid challenge, no token after equal sign in " + token);
+						throw new HttpParseException("Invalid challenge, no token after equal sign in " + token);
 					} else if (value.startsWith("\"") && value.endsWith("\"") && value.length() > 1) {
 						challenge.iParams.addField(name, value.substring(1, value.length() - 1));
 					} else {
@@ -208,7 +201,6 @@ public static Challenge[] parseChallenge(String pLine) throws HttpParseException
 		}
 
 		return challenges.toArray(new Challenge[challenges.size()]);
-
 	}
 
 	/*
@@ -223,20 +215,19 @@ private static String removeWhitespace(String str) throws HttpParseException {
 		for (int inIdx = 0; inIdx < inBuf.length; inIdx++) {
 			if (inQuotes || !Character.isSpaceChar(inBuf[inIdx])) {
 				if (inBuf[inIdx] == '=' && outStr.length() == 0) throw new HttpParseException(
-						"Invalid challenge, no token before equal sign in " + str);
+					"Invalid challenge, no token before equal sign in " + str
+				);
 
 				outStr.append(inBuf[inIdx]);
 			} else {
 				// Whitespace not within quoted string
 				int i = skipSpaces(inBuf, inIdx + 1);
-				if (i >= inBuf.length) throw new HttpParseException(
-						"Invalid challenge, no token after space in " + str);
+				if (i >= inBuf.length) throw new HttpParseException("Invalid challenge, no token after space in " + str);
 
 				if (inBuf[i] == '=') {
 					// auth-param, remove all whitespace up to next token
 					i = skipSpaces(inBuf, i + 1);
-					if (i >= inBuf.length) throw new HttpParseException(
-							"Invalid challenge, no token after equal sign in " + str);
+					if (i >= inBuf.length) throw new HttpParseException("Invalid challenge, no token after equal sign in " + str);
 					outStr.append('=');
 				} else {
 					// another token, combine all whitespace up to next token
@@ -248,19 +239,16 @@ private static String removeWhitespace(String str) throws HttpParseException {
 			}
 			if (inBuf[inIdx] == '\"') inQuotes = !inQuotes;
 		}
-		if (inQuotes) throw new HttpParseException(
-				"Invalid challenge, quoted string not terminated in " + str);
+		if (inQuotes) throw new HttpParseException("Invalid challenge, quoted string not terminated in " + str);
 		return outStr.toString();
 	}
 
 	private static int skipSpaces(char[] buf, int pos) {
-		while (pos < buf.length && Character.isSpaceChar(buf[pos]))
-			pos++;
+		while (pos < buf.length && Character.isSpaceChar(buf[pos])) pos++;
 		return pos;
 	}
 
-	private static int indexOfOutsideQuotedString(String str, int ch, int pos)
-			throws HttpParseException {
+	private static int indexOfOutsideQuotedString(String str, int ch, int pos) throws HttpParseException {
 		int len = str.length();
 		boolean inQuotes = false;
 
@@ -272,9 +260,7 @@ private static int indexOfOutsideQuotedString(String str, int ch, int pos)
 			}
 			pos++;
 		}
-		if (inQuotes) throw new HttpParseException(
-				"Invalid callenge, quoted string not terminated in " + str);
+		if (inQuotes) throw new HttpParseException("Invalid callenge, quoted string not terminated in " + str);
 		return -1;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClient.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClient.java
index c324b87..a28b673 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClient.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClient.java
@@ -115,19 +115,17 @@
 import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.Map.Entry;
 import java.util.StringTokenizer;
 import java.util.Vector;
-import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.zip.GZIPInputStream;
-
 import javax.net.SocketFactory;
 import javax.net.ssl.HandshakeCompletedEvent;
 import javax.net.ssl.HandshakeCompletedListener;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
-
 import org.metricshub.wbem.sblim.cimclient.WBEMConfigurationProperties;
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader.HeaderEntry;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
@@ -141,23 +139,21 @@
 
 /**
  * Class HttpClient implements a HTTP client
- * 
+ *
  */
 public class HttpClient implements HandshakeCompletedListener {
 
 	private static class HostPortPair {
-
 		String iHost;
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param url
 		 *            The url
 		 */
 		public HostPortPair(URI url) {
-			this.iHost = url.getScheme().toLowerCase() + ':' + url.getHost().toLowerCase() + ':'
-					+ url.getPort();
+			this.iHost = url.getScheme().toLowerCase() + ':' + url.getHost().toLowerCase() + ':' + url.getPort();
 		}
 
 		@Override
@@ -179,7 +175,6 @@ public String toString() {
 	}
 
 	private static class GetProperty implements PrivilegedAction {
-
 		String iPropertyName;
 
 		GetProperty(String propertyName) {
@@ -195,12 +190,15 @@ public Object run() {
 
 	static {
 		try {
-			iEncoding = (String) AccessController.doPrivileged(new PrivilegedAction() {
+			iEncoding =
+				(String) AccessController.doPrivileged(
+					new PrivilegedAction() {
 
-				public Object run() {
-					return System.getProperty("file.encoding", "ISO8859_1");
-				}
-			});
+						public Object run() {
+							return System.getProperty("file.encoding", "ISO8859_1");
+						}
+					}
+				);
 			if (!isASCIISuperset(iEncoding)) iEncoding = "ISO8859_1";
 		} catch (Exception exception) {
 			iEncoding = "ISO8859_1";
@@ -209,7 +207,7 @@ public Object run() {
 
 	/**
 	 * Converts a byte array to a String of hex digits
-	 * 
+	 *
 	 * @param digest
 	 *            The byte array
 	 * @return The hex string
@@ -228,7 +226,7 @@ public static String convertToHexString(byte[] digest) {
 
 	/**
 	 * Returns a client from a http client pool
-	 * 
+	 *
 	 * @param url
 	 *            The url to connect to
 	 * @param clientPool
@@ -237,21 +235,17 @@ public static String convertToHexString(byte[] digest) {
 	 *            The authentication handler to use
 	 * @return A http client from the pool
 	 */
-	public static HttpClient getClient(URI url, HttpClientPool clientPool,
-			AuthorizationHandler auth_handler) {
-
+	public static HttpClient getClient(URI url, HttpClientPool clientPool, AuthorizationHandler auth_handler) {
 		return clientPool.retrieveAvailableConnectionFromPool(url, auth_handler);
 	}
 
 	protected static String dequote(String str) {
 		int len = str.length();
-		if (len > 1 && str.charAt(0) == '\"' && str.charAt(len - 1) == '\"') return str.substring(
-				1, len - 1);
+		if (len > 1 && str.charAt(0) == '\"' && str.charAt(len - 1) == '\"') return str.substring(1, len - 1);
 		return str;
 	}
 
-	protected static void handleRsp(String authInfo, AuthorizationInfo prevAuthInfo)
-			throws IOException {
+	protected static void handleRsp(String authInfo, AuthorizationInfo prevAuthInfo) throws IOException {
 		if (authInfo != null) {
 			HttpHeader params = HttpHeader.parse(authInfo);
 
@@ -266,8 +260,7 @@ protected static void handleRsp(String authInfo, AuthorizationInfo prevAuthInfo)
 			if (qop != null) {
 				if (!"auth".equalsIgnoreCase(qop) && !"auth-int".equalsIgnoreCase(qop)) {
 					// TODO
-					throw new IOException(
-							"Authentication Digest with integrity check not supported");
+					throw new IOException("Authentication Digest with integrity check not supported");
 				}
 				byte[] rspauth;
 				String rspauthStr = dequote(params.getField("rspauth"));
@@ -275,13 +268,16 @@ protected static void handleRsp(String authInfo, AuthorizationInfo prevAuthInfo)
 					rspauth = parseHex(rspauthStr);
 
 					String cnonce = dequote(params.getField("cnonce"));
-					if (cnonce != null && !cnonce.equals(prevAuthInfo.getCnonce())) { throw new IOException(
-							"Digest authentication: Invalid nonce counter"); }
+					if (cnonce != null && !cnonce.equals(prevAuthInfo.getCnonce())) {
+						throw new IOException("Digest authentication: Invalid nonce counter");
+					}
 					String ncStr = params.getField("nc");
 					if (ncStr != null) {
 						try {
 							long nc = Long.parseLong(ncStr, 16);
-							if (nc != prevAuthInfo.getNc()) { throw new IOException(); }
+							if (nc != prevAuthInfo.getNc()) {
+								throw new IOException();
+							}
 						} catch (Exception e) {
 							throw new IOException("Digest authentication: Invalid nonce counter");
 						}
@@ -312,17 +308,13 @@ protected static void handleRsp(String authInfo, AuthorizationInfo prevAuthInfo)
 						HA2 = convertToHexString(md5.digest());
 
 						md5.reset();
-						md5.update((HA1 + ":" + nonce + ":" + ncStr + ":" + cnonce + ":" + qop
-								+ ":" + HA2).getBytes("UTF-8"));
+						md5.update((HA1 + ":" + nonce + ":" + ncStr + ":" + cnonce + ":" + qop + ":" + HA2).getBytes("UTF-8"));
 						String hsh = convertToHexString(md5.digest());
 						byte[] hash = parseHex(hsh);
 
-						if (!Arrays.equals(hash, rspauth)) throw new IOException(
-								"Digest Authentication failed!");
-
+						if (!Arrays.equals(hash, rspauth)) throw new IOException("Digest Authentication failed!");
 					} catch (NoSuchAlgorithmException e1) {
-						throw new IOException(
-								"Unable to validate Authentication response: NoSuchAlgorithmException");
+						throw new IOException("Unable to validate Authentication response: NoSuchAlgorithmException");
 					}
 				}
 			} else {
@@ -343,11 +335,89 @@ protected static byte[] parseHex(String hex) {
 
 	private static boolean isASCIISuperset(String charset) throws Exception {
 		String asciiSuperSet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_.!~*'();/?:@&=+$,";
-		byte abyte0[] = { 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70, 71, 72,
-				73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99,
-				100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
-				116, 117, 118, 119, 120, 121, 122, 45, 95, 46, 33, 126, 42, 39, 40, 41, 59, 47, 63,
-				58, 64, 38, 61, 43, 36, 44 };
+		byte abyte0[] = {
+			48,
+			49,
+			50,
+			51,
+			52,
+			53,
+			54,
+			55,
+			56,
+			57,
+			65,
+			66,
+			67,
+			68,
+			69,
+			70,
+			71,
+			72,
+			73,
+			74,
+			75,
+			76,
+			77,
+			78,
+			79,
+			80,
+			81,
+			82,
+			83,
+			84,
+			85,
+			86,
+			87,
+			88,
+			89,
+			90,
+			97,
+			98,
+			99,
+			100,
+			101,
+			102,
+			103,
+			104,
+			105,
+			106,
+			107,
+			108,
+			109,
+			110,
+			111,
+			112,
+			113,
+			114,
+			115,
+			116,
+			117,
+			118,
+			119,
+			120,
+			121,
+			122,
+			45,
+			95,
+			46,
+			33,
+			126,
+			42,
+			39,
+			40,
+			41,
+			59,
+			47,
+			63,
+			58,
+			64,
+			38,
+			61,
+			43,
+			36,
+			44
+		};
 		byte convertedArray[] = asciiSuperSet.getBytes(charset);
 		return Arrays.equals(convertedArray, abyte0);
 	}
@@ -396,7 +466,7 @@ private static boolean isASCIISuperset(String charset) throws Exception {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param url
 	 *            The url to connect to
 	 * @param clientPool
@@ -412,7 +482,7 @@ public HttpClient(URI url, HttpClientPool clientPool, AuthorizationHandler auth_
 
 	/**
 	 * Connects to the http server
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	public void connect() throws IOException {
@@ -463,13 +533,12 @@ protected void finalize() throws Throwable {
 
 	/**
 	 * Returns the http header field value for a given index
-	 * 
+	 *
 	 * @param index
 	 *            The index
 	 * @return The header field value
 	 */
 	public synchronized String getHeaderFieldValue(int index) {
-
 		if (index < 0) throw new IllegalArgumentException();
 		if (index == 0) return this.iResponse.toString();
 
@@ -483,7 +552,7 @@ public synchronized String getHeaderFieldValue(int index) {
 
 	/**
 	 * Returns the http header field for a given name
-	 * 
+	 *
 	 * @param name
 	 *            The name
 	 * @return The header field
@@ -494,7 +563,7 @@ public synchronized String getHeaderField(String name) {
 
 	/**
 	 * Return the http header field name for a given index
-	 * 
+	 *
 	 * @param index
 	 *            The index
 	 * @return The name
@@ -513,20 +582,19 @@ public synchronized String getHeaderFieldName(int index) {
 
 	/**
 	 * Returns the input stream of this http connection
-	 * 
+	 *
 	 * @return The input stream
 	 * @throws IOException
 	 */
 	public synchronized InputStream getInputStream() throws IOException {
 		if (getResponseCode() < 500 && this.iResponse != null && this.iServerInput != null) return this.iServerInput;
 
-		throw new IOException("Failed to open an input stream from server: HTTPResponse "
-				+ getResponseCode());
+		throw new IOException("Failed to open an input stream from server: HTTPResponse " + getResponseCode());
 	}
 
 	/**
 	 * Returns the output stream of this http connection
-	 * 
+	 *
 	 * @return The output stream
 	 */
 	public synchronized OutputStream getOutputStream() {
@@ -538,7 +606,7 @@ public synchronized OutputStream getOutputStream() {
 
 	/**
 	 * Returns the request method
-	 * 
+	 *
 	 * @return The request method
 	 */
 	public String getRequestMethod() {
@@ -547,7 +615,7 @@ public String getRequestMethod() {
 
 	/**
 	 * Returns the request property for a given key
-	 * 
+	 *
 	 * @param key
 	 *            The key
 	 * @return The property
@@ -558,7 +626,7 @@ public String getRequestProperty(String key) {
 
 	/**
 	 * Returns the response code
-	 * 
+	 *
 	 * @return The response code
 	 * @throws IOException
 	 */
@@ -573,24 +641,23 @@ public synchronized int getResponseCode() throws IOException {
 				int IoRetry = 1;
 				int AuthentificationRetry = 1;
 				do {
-					logger.trace(Level.FINER, "Attempting http request (retry counters:" + IoRetry
-							+ "/" + AuthentificationRetry + ")");
+					logger.trace(
+						Level.FINER,
+						"Attempting http request (retry counters:" + IoRetry + "/" + AuthentificationRetry + ")"
+					);
 					long RequestTime = System.currentTimeMillis();
 
 					if (this.iPreviousResponseTime != -1) {
 						long time = RequestTime - this.iPreviousResponseTime;
-						long maxTime = this.iHttpClientPool.getConfigurationContext()
-								.getSocketIdleTimeout();
+						long maxTime = this.iHttpClientPool.getConfigurationContext().getSocketIdleTimeout();
 						if (maxTime > 0 && time > maxTime) {
-							logger.trace(Level.FINER, "Closing socket after " + time
-									+ "ms of idle time");
+							logger.trace(Level.FINER, "Closing socket after " + time + "ms of idle time");
 
 							if (this.iSocket != null && !this.iSocket.isClosed()) {
 								try {
 									this.iSocket.close();
 								} catch (IOException e) {
-									logger.trace(Level.FINER,
-											"Exception caught while closing socket", e);
+									logger.trace(Level.FINER, "Exception caught while closing socket", e);
 								}
 							}
 							this.iSocket = null;
@@ -611,26 +678,34 @@ public synchronized int getResponseCode() throws IOException {
 						String query = this.iUrl.getQuery();
 						if (query != null) file = file + '?' + query;
 
-						this.iMethod = new HttpClientMethod(this.iRequestMethod, this.iUrl
-								.getPath(), 1, this.iUseHttp11 ? 1 : 0);
+						this.iMethod = new HttpClientMethod(this.iRequestMethod, this.iUrl.getPath(), 1, this.iUseHttp11 ? 1 : 0);
 						logger.trace(Level.FINER, "HTTP Operation= " + this.iMethod);
 
 						this.iMethod.write(out);
 
 						StringBuilder hostField = new StringBuilder(this.iUrl.getHost());
-						if (this.iUrl.getPort() > 0
-								&& ((WBEMConstants.HTTPS.equalsIgnoreCase(this.iUrl.getScheme()) && this.iUrl
-										.getPort() != WBEMConstants.DEFAULT_WBEM_SECURE_PORT) || (WBEMConstants.HTTP
-										.equalsIgnoreCase(this.iUrl.getScheme()) && this.iUrl
-										.getPort() != WBEMConstants.DEFAULT_WBEM_PORT))) {
+						if (
+							this.iUrl.getPort() > 0 &&
+							(
+								(
+									WBEMConstants.HTTPS.equalsIgnoreCase(this.iUrl.getScheme()) &&
+									this.iUrl.getPort() != WBEMConstants.DEFAULT_WBEM_SECURE_PORT
+								) ||
+								(
+									WBEMConstants.HTTP.equalsIgnoreCase(this.iUrl.getScheme()) &&
+									this.iUrl.getPort() != WBEMConstants.DEFAULT_WBEM_PORT
+								)
+							)
+						) {
 							hostField.append(':');
 							hostField.append(this.iUrl.getPort());
 						}
 						this.iRequestHeaders.addField("Host", hostField.toString());
 
 						if (this.iServerOutput != null) this.iRequestHeaders.addField(
-								"Content-length", "" + this.iServerOutput.size());
-						else this.iRequestHeaders.addField("Content-length", "0");
+								"Content-length",
+								"" + this.iServerOutput.size()
+							); else this.iRequestHeaders.addField("Content-length", "0");
 						if (this.iHttpClientPool.getConfigurationContext().isHttpChunked()) {
 							this.iRequestHeaders.addField("TE", "trailers");
 						}
@@ -641,53 +716,54 @@ public synchronized int getResponseCode() throws IOException {
 							// And may cause issues with EMC's VAPP appliances
 							// so we made the header available only when
 							// new strict mode is disabled
-							logger.trace(Level.INFO,
-							             "HTTP 1.1 protocol and 'Connection=Keep-alive' strict mode disabled, we add the header");
+							logger.trace(
+								Level.INFO,
+								"HTTP 1.1 protocol and 'Connection=Keep-alive' strict mode disabled, we add the header"
+							);
 							iRequestHeaders.addField("Connection", "Keep-alive");
 						}
 
 						if (this.iPrevAuthInfo == null) {
 							AuthorizationInfo authInfo = this.iAuth_handler.getAuthorizationInfo(0);
-							String authenticate = this.iHttpClientPool.getConfigurationContext()
-									.getHttpWwwAuthenticateInfo();
+							String authenticate = this.iHttpClientPool.getConfigurationContext().getHttpWwwAuthenticateInfo();
 
 							if (authInfo.isSentOnFirstRequest()) {
-								this.iRequestHeaders.addField(authInfo.getHeaderFieldName(),
-										authInfo.toString());
+								this.iRequestHeaders.addField(authInfo.getHeaderFieldName(), authInfo.toString());
 							} else if (authenticate != null) {
 								try {
-									this.iPrevAuthInfo = getAuthentication(false,
-											this.iPrevAuthInfo, authenticate);
+									this.iPrevAuthInfo = getAuthentication(false, this.iPrevAuthInfo, authenticate);
 									if (this.iPrevAuthInfo != null) {
-										this.iRequestHeaders.addField(this.iPrevAuthInfo
-												.getHeaderFieldName(), this.iPrevAuthInfo
-												.toString());
+										this.iRequestHeaders.addField(
+												this.iPrevAuthInfo.getHeaderFieldName(),
+												this.iPrevAuthInfo.toString()
+											);
 									}
 								} catch (NoSuchAlgorithmException e) {
 									logger.trace(Level.FINER, "Unable to find digest algorithm", e);
 								} catch (IllegalArgumentException e) {
-									logger
-											.trace(
-													Level.FINER,
-													WBEMConfigurationProperties.HTTP_WWW_AUTHENTICATE_INFO
-															+ " did not contain WWW-Authenticate information",
-													e);
+									logger.trace(
+										Level.FINER,
+										WBEMConfigurationProperties.HTTP_WWW_AUTHENTICATE_INFO +
+										" did not contain WWW-Authenticate information",
+										e
+									);
 								} catch (HttpParseException e) {
-									logger
-											.trace(
-													Level.FINER,
-													WBEMConfigurationProperties.HTTP_WWW_AUTHENTICATE_INFO
-															+ " did not contain valid WWW-Authenticate information",
-													e);
+									logger.trace(
+										Level.FINER,
+										WBEMConfigurationProperties.HTTP_WWW_AUTHENTICATE_INFO +
+										" did not contain valid WWW-Authenticate information",
+										e
+									);
 								}
 							}
 						} else {
-							this.iRequestHeaders.addField(this.iPrevAuthInfo.getHeaderFieldName(),
-									this.iPrevAuthInfo.toString());
+							this.iRequestHeaders.addField(this.iPrevAuthInfo.getHeaderFieldName(), this.iPrevAuthInfo.toString());
 						}
 
 						if (this.iPrevProxy != null) this.iRequestHeaders.addField(
-								"Proxy-authorization", this.iPrevProxy.toString());
+								"Proxy-authorization",
+								this.iPrevProxy.toString()
+							);
 
 						boolean isGzipped = false;
 						if (this.iHttpClientPool.getConfigurationContext().isGzipEncodingEnabled()) {
@@ -701,15 +777,12 @@ public synchronized int getResponseCode() throws IOException {
 
 						if (out.checkError() != null) {
 							delayedException = out.checkError();
-							logger.trace(Level.FINER,
-									"Exception caught while writing to the http output stream.",
-									delayedException);
+							logger.trace(Level.FINER, "Exception caught while writing to the http output stream.", delayedException);
 							if (this.iSocket != null && !this.iSocket.isClosed()) {
 								try {
 									this.iSocket.close();
 								} catch (IOException e) {
-									logger.trace(Level.FINER,
-											"Exception caught while closing socket", e);
+									logger.trace(Level.FINER, "Exception caught while closing socket", e);
 								}
 							}
 							this.iSocket = null;
@@ -732,7 +805,7 @@ public synchronized int getResponseCode() throws IOException {
 						// if (k < 0)
 						// break;
 						// }
-						//				
+						//
 						// if (header[0] != 72 // HTTP1.
 						// || header[1] != 84
 						// || header[2] != 84
@@ -746,7 +819,7 @@ public synchronized int getResponseCode() throws IOException {
 						// server. Header does not match HTTP header: "+new
 						// String(header));
 						// }
-						//						
+						//
 						// istream.reset();
 
 						this.iResponse = new HttpClientMethod(this.iIStream);
@@ -754,14 +827,13 @@ public synchronized int getResponseCode() throws IOException {
 						ResponseTime = System.currentTimeMillis();
 
 						this.iResponseHeaders = new HttpHeader(this.iIStream);
-						logger.trace(Level.FINER, "Response HTTP Headers= "
-								+ this.iResponseHeaders.toString());
+						logger.trace(Level.FINER, "Response HTTP Headers= " + this.iResponseHeaders.toString());
 						this.iKeepAlive = false;
-						if ("Keep-alive".equalsIgnoreCase(this.iResponseHeaders
-								.getField("Connection"))
-								|| (this.iResponse.getMajorVersion() == 1 && this.iResponse
-										.getMinorVersion() == 1)
-								|| this.iResponseHeaders.getField("Keep-alive") != null) {
+						if (
+							"Keep-alive".equalsIgnoreCase(this.iResponseHeaders.getField("Connection")) ||
+							(this.iResponse.getMajorVersion() == 1 && this.iResponse.getMinorVersion() == 1) ||
+							this.iResponseHeaders.getField("Keep-alive") != null
+						) {
 							this.iKeepAlive = true;
 						}
 
@@ -772,42 +844,33 @@ public synchronized int getResponseCode() throws IOException {
 						String contentLength = this.iResponseHeaders.getField("Content-length");
 						long length = -1;
 						try {
-							if (contentLength != null && contentLength.length() > 0) length = Long
-									.parseLong(contentLength);
+							if (contentLength != null && contentLength.length() > 0) length = Long.parseLong(contentLength);
 						} catch (Exception e) {
-							logger.trace(Level.FINER,
-									"Exception while parsing the content length of http response",
-									e);
+							logger.trace(Level.FINER, "Exception while parsing the content length of http response", e);
 						}
-						this.iKeepAlive = (length >= 0 || this.iResponse.getStatus() == 304 || this.iResponse
-								.getStatus() == 204);
+						this.iKeepAlive = (length >= 0 || this.iResponse.getStatus() == 304 || this.iResponse.getStatus() == 204);
 
 						if (isGzipped) {
-							String contentEncoding = this.iResponseHeaders
-									.getField("Content-Encoding");
-							if (contentEncoding != null
-									&& contentEncoding.toLowerCase().contains("gzip")) {
+							String contentEncoding = this.iResponseHeaders.getField("Content-Encoding");
+							if (contentEncoding != null && contentEncoding.toLowerCase().contains("gzip")) {
 								length = -1; // ignore Content-length
 								this.iServerInput = new GZIPInputStream(this.iServerInput);
 							}
 						}
 
-						String transferEncoding = this.iResponseHeaders
-								.getField("Transfer-encoding");
+						String transferEncoding = this.iResponseHeaders.getField("Transfer-encoding");
 						if (transferEncoding != null) {
 							length = -1; // ignore Content-length
 							if (transferEncoding.toLowerCase().endsWith("chunked")) {
-								this.iServerInput = new ChunkedInputStream(this.iServerInput,
-										this.iResponseHeaders.getField("Trailer"), "Response");
+								this.iServerInput =
+									new ChunkedInputStream(this.iServerInput, this.iResponseHeaders.getField("Trailer"), "Response");
 								this.iKeepAlive = true;
 							}
 						}
 
-						if (length >= 0) this.iServerInput = new BoundedInputStream(
-								this.iServerInput, length);
+						if (length >= 0) this.iServerInput = new BoundedInputStream(this.iServerInput, length);
 
-						logger.trace(Level.FINER, "KeepAlive="
-								+ (this.iKeepAlive ? "true" : "false"));
+						logger.trace(Level.FINER, "KeepAlive=" + (this.iKeepAlive ? "true" : "false"));
 
 						if (this.iKeepAlive) {
 							this.iServerInput = new KeepAliveInputStream(this.iServerInput, this);
@@ -815,11 +878,10 @@ public synchronized int getResponseCode() throws IOException {
 
 						switch (this.iResponse.getStatus()) {
 							case 100: {
-								continue;
-							}
+									continue;
+								}
 							case HttpURLConnection.HTTP_OK:
-								String authInfo = this.iResponseHeaders
-										.getField("Authentication-Info");
+								String authInfo = this.iResponseHeaders.getField("Authentication-Info");
 								handleRsp(authInfo, this.iPrevAuthInfo);
 
 								authInfo = this.iResponseHeaders.getField("Authentication-Proxy");
@@ -829,40 +891,28 @@ public synchronized int getResponseCode() throws IOException {
 
 								this.iPreviousResponseTime = ResponseTime;
 								return HttpURLConnection.HTTP_OK;
-
 							case HttpURLConnection.HTTP_UNAUTHORIZED:
 								--AuthentificationRetry;
-								String authenticate = this.iResponseHeaders
-										.getField("WWW-Authenticate");
+								String authenticate = this.iResponseHeaders.getField("WWW-Authenticate");
 								try {
-									this.iPrevAuthInfo = getAuthentication(false,
-											this.iPrevAuthInfo, authenticate);
+									this.iPrevAuthInfo = getAuthentication(false, this.iPrevAuthInfo, authenticate);
 									if (this.iPrevAuthInfo != null) {
-										this.iRequestHeaders.addField(this.iPrevAuthInfo
-												.getHeaderFieldName(), this.iPrevAuthInfo
-												.toString());
+										this.iRequestHeaders.addField(
+												this.iPrevAuthInfo.getHeaderFieldName(),
+												this.iPrevAuthInfo.toString()
+											);
 									}
 								} catch (NoSuchAlgorithmException e) {
 									logger.trace(Level.FINER, "Unable to find digest algorithm", e);
 								} catch (IllegalArgumentException e) {
-									logger
-											.trace(
-													Level.FINER,
-													"HTTP 401 response did not contain WWW-Authenticate information",
-													e);
+									logger.trace(Level.FINER, "HTTP 401 response did not contain WWW-Authenticate information", e);
 								} catch (HttpParseException e) {
-									logger
-											.trace(
-													Level.FINER,
-													"HTTP 401 response did not contain valid WWW-Authenticate information",
-													e);
+									logger.trace(Level.FINER, "HTTP 401 response did not contain valid WWW-Authenticate information", e);
 								}
 
 								if (!authFailed) {
 									authFailed = true;
-									logger
-											.trace(Level.FINER,
-													"Authorization failed, retrying with authorization info.");
+									logger.trace(Level.FINER, "Authorization failed, retrying with authorization info.");
 								}
 								if (this.iPrevAuthInfo != null && this.iPrevAuthInfo.isKeptAlive()) {
 									this.iKeepAlive = true;
@@ -882,23 +932,21 @@ public synchronized int getResponseCode() throws IOException {
 								 * requestHeaders.addField
 								 * ("Proxy-Authorization",
 								 * prevProxy.toString());
-								 * 
+								 *
 								 * while ((total = serverInput.available()) > 0)
 								 * { serverInput.skip(total); } break;
 								 */
 								break;
 							default:
 								int status = this.iResponse.getStatus();
-								if (!this.iKeepAlive) closeConnection();
-								else this.iServerInput.close();
+								if (!this.iKeepAlive) closeConnection(); else this.iServerInput.close();
 								this.iPreviousResponseTime = ResponseTime;
 								return status;
 						}
 					} catch (SocketTimeoutException e) {
 						throw e;
 					} catch (IOException e) {
-						logger.message(Messages.HTTP_CONNECTION_FAILED, new Object[] { this.iUrl,
-								e.getMessage() });
+						logger.message(Messages.HTTP_CONNECTION_FAILED, new Object[] { this.iUrl, e.getMessage() });
 						StringBuilder msg = new StringBuilder("Http connection failed ");
 						if (ResponseTime != -1) {
 							msg.append("after");
@@ -918,8 +966,7 @@ public synchronized int getResponseCode() throws IOException {
 							try {
 								this.iSocket.close();
 							} catch (IOException e2) {
-								logger.trace(Level.FINER, "Exception caught while closing socket",
-										e2);
+								logger.trace(Level.FINER, "Exception caught while closing socket", e2);
 							}
 						}
 						this.iSocket = null;
@@ -927,7 +974,6 @@ public synchronized int getResponseCode() throws IOException {
 						this.iResponse = null;
 						--IoRetry;
 					}
-
 				} while (AuthentificationRetry >= 0 && IoRetry >= 0);
 			}
 
@@ -936,8 +982,9 @@ public synchronized int getResponseCode() throws IOException {
 				if (ResponseTime != -1) this.iPreviousResponseTime = ResponseTime;
 				return this.iResponse.getStatus();
 			}
-			throw (IOException) (delayedException != null ? delayedException : new Exception(
-					"Unable to get response after maximum retries"));
+			throw (IOException) (
+				delayedException != null ? delayedException : new Exception("Unable to get response after maximum retries")
+			);
 		} finally {
 			logger.exit();
 		}
@@ -945,7 +992,7 @@ public synchronized int getResponseCode() throws IOException {
 
 	/**
 	 * Returns the response message
-	 * 
+	 *
 	 * @return The response message
 	 */
 	public String getResponseMessage() {
@@ -970,7 +1017,7 @@ public void reset() {
 
 	/**
 	 * Sets the request method
-	 * 
+	 *
 	 * @param method
 	 *            The request method
 	 */
@@ -980,7 +1027,7 @@ public void setRequestMethod(String method) {
 
 	/**
 	 * Sets the request property
-	 * 
+	 *
 	 * @param key
 	 *            The property name
 	 * @param value
@@ -999,13 +1046,12 @@ public void streamFinished() {
 
 	/**
 	 * Releases the client and returns it to the pool
-	 * 
+	 *
 	 * @param keep
 	 *            if true return to the pool, if false
 	 *            drop.
 	 */
 	public void streamFinished(boolean keep) {
-
 		LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
 
@@ -1023,7 +1069,7 @@ public void streamFinished(boolean keep) {
 
 	/**
 	 * Enables/Disables use of http 1.1
-	 * 
+	 *
 	 * @param bool
 	 *            if true http 1.1 is enabled.
 	 */
@@ -1033,7 +1079,7 @@ public void useHttp11(boolean bool) {
 
 	/**
 	 * Returns if a proxy is used
-	 * 
+	 *
 	 * @return true if a proxy is used
 	 */
 	public boolean usingProxy() {
@@ -1041,8 +1087,8 @@ public boolean usingProxy() {
 		return false;
 	}
 
-	protected AuthorizationInfo getAuthentication(boolean proxy, AuthorizationInfo prevAuthInfo,
-			String authenticate) throws HttpParseException, NoSuchAlgorithmException {
+	protected AuthorizationInfo getAuthentication(boolean proxy, AuthorizationInfo prevAuthInfo, String authenticate)
+		throws HttpParseException, NoSuchAlgorithmException {
 		Challenge[] challenges = Challenge.parseChallenge(authenticate);
 
 		// AuthorizationHandler auth_handler =
@@ -1056,14 +1102,19 @@ protected AuthorizationInfo getAuthentication(boolean proxy, AuthorizationInfo p
 			// HttpHeader headers = challenge.getParams();
 			// String stale = headers.getField("stale");
 			// }
-			prevAuthInfo = this.iAuth_handler.getAuthorizationInfo(this.iHttpClientPool
-					.getConfigurationContext().getHttpAuthenticationModule(), proxy ? Boolean.TRUE
-					: Boolean.FALSE, this.iUrl.getHost(), this.iUrl.getPort(), this.iUrl
-					.getScheme(), challenge.getRealm(), challenge.getScheme());
+			prevAuthInfo =
+				this.iAuth_handler.getAuthorizationInfo(
+						this.iHttpClientPool.getConfigurationContext().getHttpAuthenticationModule(),
+						proxy ? Boolean.TRUE : Boolean.FALSE,
+						this.iUrl.getHost(),
+						this.iUrl.getPort(),
+						this.iUrl.getScheme(),
+						challenge.getRealm(),
+						challenge.getScheme()
+					);
 
 			if (prevAuthInfo != null) {
-				prevAuthInfo.updateAuthenticationInfo(challenge, authenticate, this.iUrl,
-						this.iRequestMethod);
+				prevAuthInfo.updateAuthenticationInfo(challenge, authenticate, this.iUrl, this.iRequestMethod);
 				return prevAuthInfo;
 			}
 		}
@@ -1093,13 +1144,15 @@ private String[] parseProperty(String propertyName) {
 			as = null;
 		} else {
 			Vector vector = new Vector();
-			for (StringTokenizer stringtokenizer = new StringTokenizer(s, ","); stringtokenizer
-					.hasMoreElements(); vector.addElement(stringtokenizer.nextElement())) {
+			for (
+				StringTokenizer stringtokenizer = new StringTokenizer(s, ",");
+				stringtokenizer.hasMoreElements();
+				vector.addElement(stringtokenizer.nextElement())
+			) {
 				// add each token to vector
 			}
 			as = new String[vector.size()];
-			for (int i1 = 0; i1 < as.length; i1++)
-				as[i1] = (String) vector.elementAt(i1);
+			for (int i1 = 0; i1 < as.length; i1++) as[i1] = (String) vector.elementAt(i1);
 		}
 		return as;
 	}
@@ -1117,10 +1170,11 @@ private void resetSocket() throws IOException {
 
 		if (this.iSocket == null) {
 			// Determine whether we need to connect with a timeout or not
-			boolean socketConnectWithTimeout = this.iHttpClientPool.getConfigurationContext()
-					.socketConnectWithTimeout();
-			logger.trace(Level.FINER, "Socket=null, creating http socket "
-					+ (socketConnectWithTimeout ? "with" : "without") + " timeout.");
+			boolean socketConnectWithTimeout = this.iHttpClientPool.getConfigurationContext().socketConnectWithTimeout();
+			logger.trace(
+				Level.FINER,
+				"Socket=null, creating http socket " + (socketConnectWithTimeout ? "with" : "without") + " timeout."
+			);
 
 			// On Java 5+ InetSocketAddress(String,int) constructor will call
 			// any security manager's checkConnect method
@@ -1131,45 +1185,41 @@ private void resetSocket() throws IOException {
 				}
 			}
 
-			SocketFactory factory = this.iHttpClientPool.getConfigurationContext()
-					.getCustomSocketFactory();
+			SocketFactory factory = this.iHttpClientPool.getConfigurationContext().getCustomSocketFactory();
 			if (factory == null) {
-				factory = HttpSocketFactory
+				factory =
+					HttpSocketFactory
 						.getInstance()
 						.getClientSocketFactory(
-								WBEMConstants.HTTPS.equalsIgnoreCase(this.iUrl.getScheme()) ? this.iHttpClientPool
-										.getSslContext()
-										: null);
+							WBEMConstants.HTTPS.equalsIgnoreCase(this.iUrl.getScheme()) ? this.iHttpClientPool.getSslContext() : null
+						);
 				if (factory == null) {
 					logger.message(Messages.HTTP_NO_SOCKET_FACTORY, this.iUrl.getScheme());
-					throw new IllegalStateException("Unable to load socket factory:"
-							+ this.iUrl.getScheme());
+					throw new IllegalStateException("Unable to load socket factory:" + this.iUrl.getScheme());
 				}
 			}
 			logger.trace(Level.FINER, "Creating new http for url " + this.iUrl.toString());
 			if (socketConnectWithTimeout) {
-				int connectTimeout = this.iHttpClientPool.getConfigurationContext()
-						.getSocketConnectTimeout();
+				int connectTimeout = this.iHttpClientPool.getConfigurationContext().getSocketConnectTimeout();
 				logger.trace(Level.FINER, "Setting socket connect timeout=" + connectTimeout);
 
 				if (factory instanceof SSLSocketFactory) {
 					Socket sock = new Socket();
-					sock.connect(new InetSocketAddress(this.iUrl.getHost(), this.iUrl.getPort()),
-							connectTimeout);
-					this.iSocket = ((SSLSocketFactory) factory).createSocket(sock, this.iUrl
-							.getHost(), this.iUrl.getPort(), true);
-
+					sock.connect(new InetSocketAddress(this.iUrl.getHost(), this.iUrl.getPort()), connectTimeout);
+					this.iSocket =
+						((SSLSocketFactory) factory).createSocket(sock, this.iUrl.getHost(), this.iUrl.getPort(), true);
 				} else {
 					this.iSocket = factory.createSocket();
-					if (this.iSocket != null) this.iSocket.connect(new InetSocketAddress(this.iUrl
-							.getHost(), this.iUrl.getPort()), connectTimeout);
+					if (this.iSocket != null) this.iSocket.connect(
+							new InetSocketAddress(this.iUrl.getHost(), this.iUrl.getPort()),
+							connectTimeout
+						);
 				}
 			} else {
 				this.iSocket = factory.createSocket(this.iUrl.getHost(), this.iUrl.getPort());
 			}
 			if (this.iSocket == null) {
-				logger.trace(Level.WARNING, "Socket factory " + factory.getClass().getName()
-						+ " returned null socket");
+				logger.trace(Level.WARNING, "Socket factory " + factory.getClass().getName() + " returned null socket");
 				throw new IOException("Socket factory did not create socket");
 			}
 
@@ -1180,44 +1230,50 @@ private void resetSocket() throws IOException {
 
 			if (this.iSocket instanceof SSLSocket) {
 				// Determine whether we need to perform SSL handshake or not
-				boolean performHandshake = this.iHttpClientPool.getConfigurationContext()
-						.performSslHandshake();
-				logger.trace(Level.FINER, "SSL socket created, handshake "
-						+ (performHandshake ? "will" : "will not") + " be performed.");
+				boolean performHandshake = this.iHttpClientPool.getConfigurationContext().performSslHandshake();
+				logger.trace(
+					Level.FINER,
+					"SSL socket created, handshake " + (performHandshake ? "will" : "will not") + " be performed."
+				);
 
 				if (performHandshake) {
 					SSLSocket sk = (SSLSocket) this.iSocket;
 
 					String protocols[] = parseProperty("https.protocols");
 					if (protocols != null) {
-						logger.trace(Level.FINER,
-								"Setting SSLSocket.setEnabledProtocols() from \"https.protocols\"="
-										+ String.valueOf(Arrays.asList(protocols)));
+						logger.trace(
+							Level.FINER,
+							"Setting SSLSocket.setEnabledProtocols() from \"https.protocols\"=" +
+							String.valueOf(Arrays.asList(protocols))
+						);
 						sk.setEnabledProtocols(protocols);
 					}
 
 					String ciphersuites[] = parseProperty("https.cipherSuites");
 					if (ciphersuites != null) {
-						logger.trace(Level.FINER,
-								"Setting SSLSocket.setEnableCipheSuites() from \"https.cipherSuites\"="
-										+ String.valueOf(Arrays.asList(ciphersuites)));
+						logger.trace(
+							Level.FINER,
+							"Setting SSLSocket.setEnableCipheSuites() from \"https.cipherSuites\"=" +
+							String.valueOf(Arrays.asList(ciphersuites))
+						);
 						sk.setEnabledCipherSuites(ciphersuites);
 					}
 
-					String disableCipherSuites = this.iHttpClientPool.getConfigurationContext()
-							.getSslClientCipherSuitesToDisable();
+					String disableCipherSuites =
+						this.iHttpClientPool.getConfigurationContext().getSslClientCipherSuitesToDisable();
 					if (disableCipherSuites != null) {
-						sk.setEnabledCipherSuites(this.iHttpClientPool.getUpdatedCipherSuites(sk
-								.getEnabledCipherSuites(), disableCipherSuites));
+						sk.setEnabledCipherSuites(
+							this.iHttpClientPool.getUpdatedCipherSuites(sk.getEnabledCipherSuites(), disableCipherSuites)
+						);
 					}
 
 					// Determine whether we need to perform synchronized SSL
 					// handshake or not
-					boolean synchronizedHandshake = this.iHttpClientPool.getConfigurationContext()
-							.synchronizedSslHandshake();
-					logger.trace(Level.FINER, "Starting "
-							+ (synchronizedHandshake ? "synchronized" : "unsynchronized")
-							+ " http handshake.");
+					boolean synchronizedHandshake = this.iHttpClientPool.getConfigurationContext().synchronizedSslHandshake();
+					logger.trace(
+						Level.FINER,
+						"Starting " + (synchronizedHandshake ? "synchronized" : "unsynchronized") + " http handshake."
+					);
 
 					sk.addHandshakeCompletedListener(this);
 					if (synchronizedHandshake) {
@@ -1231,8 +1287,8 @@ private void resetSocket() throws IOException {
 			}
 
 			this.iIStream = new BufferedInputStream(this.iSocket.getInputStream());
-			this.iOStream = new ASCIIPrintStream(new BufferedOutputStream(this.iSocket
-					.getOutputStream(), 1024), false, iEncoding);
+			this.iOStream =
+				new ASCIIPrintStream(new BufferedOutputStream(this.iSocket.getOutputStream(), 1024), false, iEncoding);
 			this.iServerInput = null;
 		} else {
 			if (this.iServerInput != null && !(this.iServerInput instanceof KeepAliveInputStream)) {
@@ -1251,7 +1307,7 @@ private void resetSocket() throws IOException {
 
 	/**
 	 * Returns connected
-	 * 
+	 *
 	 * @return The value of connected.
 	 */
 	public boolean isConnected() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientMethod.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientMethod.java
index c6e5e6f..1275ff0 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientMethod.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientMethod.java
@@ -48,15 +48,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
-
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
 
 /**
  * Class HttpClientMethod encapsulates a http client method
- * 
+ *
  */
 public class HttpClientMethod extends HttpMethod {
-
 	private boolean iIncomming = true;
 
 	private String iHttpHeader;
@@ -73,7 +71,7 @@ public class HttpClientMethod extends HttpMethod {
 
 	/**
 	 * Ctor. Creates an outgoing http method
-	 * 
+	 *
 	 * @param pMethod
 	 *            The method
 	 * @param pRequest
@@ -93,7 +91,7 @@ public HttpClientMethod(String pMethod, String pRequest, int pMajor, int pMinor)
 
 	/**
 	 * Ctor. Parses an incoming http method from a given input stream
-	 * 
+	 *
 	 * @param pReader
 	 *            The input stream
 	 * @throws IOException
@@ -137,7 +135,7 @@ public HttpClientMethod(InputStream pReader) throws IOException {
 
 	/**
 	 * Returns the major version
-	 * 
+	 *
 	 * @return The major version
 	 */
 	public int getMajorVersion() {
@@ -146,7 +144,7 @@ public int getMajorVersion() {
 
 	/**
 	 * Returns the minor version
-	 * 
+	 *
 	 * @return The minor version
 	 */
 	public int getMinorVersion() {
@@ -155,7 +153,7 @@ public int getMinorVersion() {
 
 	/**
 	 * Returns the method name
-	 * 
+	 *
 	 * @return The method name
 	 */
 	public String getMethodName() {
@@ -164,7 +162,7 @@ public String getMethodName() {
 
 	/**
 	 * Return the status
-	 * 
+	 *
 	 * @return The status
 	 */
 	public int getStatus() {
@@ -173,18 +171,17 @@ public int getStatus() {
 
 	/**
 	 * Writes the method to a given stream
-	 * 
+	 *
 	 * @param pStream
 	 *            The stream
 	 */
 	public void write(ASCIIPrintStream pStream) {
-		pStream.print(this.iMethod + " " + this.iRequest + " HTTP/" + this.iMajor + "."
-				+ this.iMinor + "\r\n");
+		pStream.print(this.iMethod + " " + this.iRequest + " HTTP/" + this.iMajor + "." + this.iMinor + "\r\n");
 	}
 
 	/**
 	 * Returns the response message
-	 * 
+	 *
 	 * @return The response message
 	 */
 	public String getResponseMessage() {
@@ -193,7 +190,9 @@ public String getResponseMessage() {
 
 	@Override
 	public String toString() {
-		if (this.iIncomming) { return this.iHttpHeader + " " + this.iStatus + " " + this.iResponse; }
+		if (this.iIncomming) {
+			return this.iHttpHeader + " " + this.iStatus + " " + this.iResponse;
+		}
 		return this.iMethod + " " + this.iRequest + " HTTP/" + this.iMajor + "." + this.iMinor;
 	}
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientPool.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientPool.java
index 06b7f4f..a94aa88 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientPool.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpClientPool.java
@@ -58,19 +58,16 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
-
 import javax.net.ssl.SSLContext;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
 
 /**
  * Class HttpClientPool implements a pool for http client connections
- * 
+ *
  */
 public class HttpClientPool {
-
 	/**
 	 * Guarded by "this"
 	 */
@@ -99,7 +96,7 @@ public class HttpClientPool {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pConfiguration
 	 *            The configuration for this session. Must be non-null.
 	 */
@@ -116,7 +113,7 @@ public HttpClientPool(WBEMConfiguration pConfiguration) {
 	/**
 	 * Returns the number of connections in this pool that are available/free
 	 * for (re-)use.
-	 * 
+	 *
 	 * @return number of available/free connections in pool
 	 */
 	public synchronized int getNumberOfAllConnections() {
@@ -125,7 +122,7 @@ public synchronized int getNumberOfAllConnections() {
 
 	/**
 	 * Returns the number of all connections in this pool.
-	 * 
+	 *
 	 * @return number of all connections in pool
 	 */
 	public synchronized int getNumberOfAvailableConnections() {
@@ -134,7 +131,7 @@ public synchronized int getNumberOfAvailableConnections() {
 
 	/**
 	 * Returns the configuration context of this pool
-	 * 
+	 *
 	 * @return The configuration
 	 */
 	public WBEMConfiguration getConfigurationContext() {
@@ -144,13 +141,12 @@ public WBEMConfiguration getConfigurationContext() {
 	/**
 	 * Returns the SSL context for the clients in this pool. The context is
 	 * initialized on the first call of this method (lazy initialization).
-	 * 
+	 *
 	 * @return The SSL context
 	 */
 	public synchronized SSLContext getSslContext() {
 		if (this.iSslContext == null) {
-			this.iSslContext = HttpSocketFactory.getInstance().getClientSSLContext(
-					this.iConfiguration);
+			this.iSslContext = HttpSocketFactory.getInstance().getClientSSLContext(this.iConfiguration);
 		}
 		return this.iSslContext;
 	}
@@ -158,33 +154,40 @@ public synchronized SSLContext getSslContext() {
 	/**
 	 * Returns the available connections of this pool for a given
 	 * URI&AuthorizationHandler
-	 * 
+	 *
 	 * @param pUri
 	 *            The uri
 	 * @param pHandler
 	 *            The authorization handler
 	 * @return A connection if one is available, null otherwise
 	 */
-	public synchronized HttpClient retrieveAvailableConnectionFromPool(URI pUri,
-			AuthorizationHandler pHandler) {
+	public synchronized HttpClient retrieveAvailableConnectionFromPool(URI pUri, AuthorizationHandler pHandler) {
 		if (this.iClosed) {
-			LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Attempt to get client from closed http client pool,");
+			LogAndTraceBroker.getBroker().trace(Level.FINE, "Attempt to get client from closed http client pool,");
 			throw new IllegalStateException("HttpClientPool is closed. Retrieve connection failed.");
 		}
 		if (getNumberOfAvailableConnections() > 0) {
-			LogAndTraceBroker.getBroker().trace(
+			LogAndTraceBroker
+				.getBroker()
+				.trace(
 					Level.FINE,
-					"Reusing client (" + pUri.toString() + ", max: " + getPoolSize() + ", current:"
-							+ getNumberOfAvailableConnections());
+					"Reusing client (" +
+					pUri.toString() +
+					", max: " +
+					getPoolSize() +
+					", current:" +
+					getNumberOfAvailableConnections()
+				);
 
 			return this.iAvailableConnections.remove(0);
 		}
 
-		LogAndTraceBroker.getBroker().trace(
+		LogAndTraceBroker
+			.getBroker()
+			.trace(
 				Level.FINE,
-				"New client (" + pUri.toString() + ", max: " + getPoolSize() + ", current:"
-						+ getNumberOfAvailableConnections());
+				"New client (" + pUri.toString() + ", max: " + getPoolSize() + ", current:" + getNumberOfAvailableConnections()
+			);
 		HttpClient client = new HttpClient(pUri, this, pHandler);
 		addConnectionToPool(client);
 		return client;
@@ -194,13 +197,15 @@ public synchronized HttpClient retrieveAvailableConnectionFromPool(URI pUri,
 	 * Add the connection to the pool. Connection is added as available
 	 * connection. Use method {@link #addConnectionToPool(HttpClient)} to add
 	 * the connection without being available for reuse.
-	 * 
+	 *
 	 * @param httpClient
 	 *            connection that is to be added to the pool
 	 * @return true if connection was added otherwise false
 	 */
 	public synchronized boolean returnAvailableConnectionToPool(HttpClient httpClient) {
-		if (httpClient == null) { return false; }
+		if (httpClient == null) {
+			return false;
+		}
 
 		if (this.iClosed) {
 			this.iAllConnections.remove(httpClient);
@@ -217,8 +222,7 @@ public synchronized boolean returnAvailableConnectionToPool(HttpClient httpClien
 				return true;
 			}
 		} else {
-			LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Http pool size reached, discarding client.");
+			LogAndTraceBroker.getBroker().trace(Level.FINE, "Http pool size reached, discarding client.");
 			this.iAllConnections.remove(httpClient);
 			this.iAvailableConnections.remove(httpClient);
 			httpClient.disconnect();
@@ -231,15 +235,14 @@ public synchronized boolean returnAvailableConnectionToPool(HttpClient httpClien
 	 * connection. Use method
 	 * {@link #returnAvailableConnectionToPool(HttpClient)} to also add the
 	 * connection to the available connections.
-	 * 
+	 *
 	 * @param httpClient
 	 *            connection that is to be added to the pool
 	 * @return true if connection was added otherwise false
 	 */
 	public synchronized boolean addConnectionToPool(HttpClient httpClient) {
 		if (this.iClosed) {
-			LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Attempt to add client to closed http client pool,");
+			LogAndTraceBroker.getBroker().trace(Level.FINE, "Attempt to add client to closed http client pool,");
 			throw new IllegalStateException("HttpClientPool is closed. Add connection failed.");
 		}
 		if (httpClient != null && !this.iAllConnections.contains(httpClient)) {
@@ -252,7 +255,7 @@ public synchronized boolean addConnectionToPool(HttpClient httpClient) {
 
 	/**
 	 * Removes a connection completely from the pool.
-	 * 
+	 *
 	 * @param httpClient
 	 *            connection that is to be removed from the pool
 	 * @return true if connection was removed otherwise false
@@ -260,7 +263,9 @@ public synchronized boolean addConnectionToPool(HttpClient httpClient) {
 	public synchronized boolean removeConnectionFromPool(HttpClient httpClient) {
 		if (httpClient != null) {
 			this.iAvailableConnections.remove(httpClient);
-			if (this.iAllConnections.remove(httpClient)) { return true; }
+			if (this.iAllConnections.remove(httpClient)) {
+				return true;
+			}
 			return false; // connection was not in pool!
 		}
 		return false; // no connection given
@@ -288,7 +293,7 @@ protected void finalize() throws Throwable {
 
 	/**
 	 * Returns poolSize
-	 * 
+	 *
 	 * @return The value of poolSize.
 	 */
 	public int getPoolSize() {
@@ -298,32 +303,31 @@ public int getPoolSize() {
 	/**
 	 * Returns updated array of cipher suites which is current cipher suites
 	 * less any cipher suites listed to be disabled
-	 * 
+	 *
 	 * NOTE: The updated array is generated only upon first invocation and then
 	 * saved, effectively making this a lazy initialization of the cipher suites
 	 * on a HttpClientPool basis - it has to be done here and not in WBEMClient
 	 * where it belongs because socket characteristics are not known to
 	 * WBEMClient
-	 * 
+	 *
 	 * @param pCurrentCipherSuites
 	 *            The currently enabled cipher suites
 	 * @param pDisableCipherSuites
 	 *            The list of cipher suites to be disabled
 	 * @return The updated enabled cipher suites
 	 */
-	public synchronized String[] getUpdatedCipherSuites(String[] pCurrentCipherSuites,
-			String pDisableCipherSuites) {
+	public synchronized String[] getUpdatedCipherSuites(String[] pCurrentCipherSuites, String pDisableCipherSuites) {
 		if (this.iEnabledCipherSuites == null) {
-			this.iEnabledCipherSuites = Util.getFilteredStringArray(pCurrentCipherSuites,
-					pDisableCipherSuites);
+			this.iEnabledCipherSuites = Util.getFilteredStringArray(pCurrentCipherSuites, pDisableCipherSuites);
 			int before = pCurrentCipherSuites.length;
 			int after = this.iEnabledCipherSuites.length;
-			if (before > 0 && after == 0) LogAndTraceBroker.getBroker().trace(Level.WARNING,
-					"All cipher suites disabled for client!");
-			else if (before > after) LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Some (" + (before - after) + ") cipher suites disabled for client");
-			else if (before == after) LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"No cipher suites disabled for client");
+			if (before > 0 && after == 0) LogAndTraceBroker
+				.getBroker()
+				.trace(Level.WARNING, "All cipher suites disabled for client!"); else if (before > after) LogAndTraceBroker
+				.getBroker()
+				.trace(Level.FINE, "Some (" + (before - after) + ") cipher suites disabled for client"); else if (
+				before == after
+			) LogAndTraceBroker.getBroker().trace(Level.FINER, "No cipher suites disabled for client");
 		}
 		return this.iEnabledCipherSuites;
 	}
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java
index d13b10c..7a81a0c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpConnectionHandler.java
@@ -58,9 +58,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
-
 import javax.net.ssl.SSLSocket;
-
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
@@ -69,10 +67,9 @@
 /**
  * Class HttpConnectionHandler is responsible for handling an incoming
  * connection
- * 
+ *
  */
 public class HttpConnectionHandler {
-
 	/**
 	 * MAJOR_VERSION
 	 */
@@ -95,7 +92,7 @@ public class HttpConnectionHandler {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHandler
 	 *            The content handler
 	 * @param pProperties
@@ -126,22 +123,23 @@ private synchronized void addSuspectIP(String pSuspectIP) {
 					this.iBlockedIPs.append(pSuspectIP);
 					newIP = true;
 				}
-				if (newIP) LogAndTraceBroker.getBroker().trace(
+				if (newIP) LogAndTraceBroker
+					.getBroker()
+					.trace(
 						Level.WARNING,
-						"Maximum allowable timeouts exceeded, all future connections ignored from "
-								+ pSuspectIP);
+						"Maximum allowable timeouts exceeded, all future connections ignored from " + pSuspectIP
+					);
 			}
 		}
 	}
 
 	private synchronized boolean isBlockedIP(Socket socket) {
-		return (this.iBlockedIPs != null && this.iBlockedIPs.indexOf(socket.getInetAddress()
-				.getHostAddress()) != -1);
+		return (this.iBlockedIPs != null && this.iBlockedIPs.indexOf(socket.getInetAddress().getHostAddress()) != -1);
 	}
 
 	/**
 	 * Handles the incoming connection and forwards to the content handler
-	 * 
+	 *
 	 * @param socket
 	 *            The socket of the connection
 	 */
@@ -149,10 +147,9 @@ public void handleConnection(Socket socket) {
 		InputStream is = null;
 		OutputStream os = null;
 		if (isBlockedIP(socket)) {
-			LogAndTraceBroker.getBroker().trace(
-					Level.FINEST,
-					"Incoming connection ignored from blocked IP "
-							+ socket.getInetAddress().getHostAddress());
+			LogAndTraceBroker
+				.getBroker()
+				.trace(Level.FINEST, "Incoming connection ignored from blocked IP " + socket.getInetAddress().getHostAddress());
 		} else try {
 			is = socket.getInputStream();
 			os = socket.getOutputStream();
@@ -163,14 +160,12 @@ public void handleConnection(Socket socket) {
 				boolean chunk = reader.isChunkSupported();
 
 				HttpServerMethod readerMethod = reader.getMethod();
-				if (readerMethod.getMethodName().equals("POST")
-						|| readerMethod.getMethodName().equals("M-POST")) {
+				if (readerMethod.getMethodName().equals("POST") || readerMethod.getMethodName().equals("M-POST")) {
 					// TODO: validate authorization
 
 					MessageWriter writer = new MessageWriter(os, persistent, chunk);
 					try {
-						StringBuilder localURL = new StringBuilder(
-								socket instanceof SSLSocket ? "https://" : "http://");
+						StringBuilder localURL = new StringBuilder(socket instanceof SSLSocket ? "https://" : "http://");
 						InetAddress localAddress = socket.getLocalAddress();
 						if (localAddress != null) {
 							localURL.append(localAddress.getHostAddress());
@@ -182,16 +177,28 @@ public void handleConnection(Socket socket) {
 						}
 
 						// 17931
-						this.iHandler.handleContent(reader, writer, socket.getInetAddress(),
-								localURL.toString());
-						writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
-								readerMethod.getMinorVersion(), 200, "OK"));
+						this.iHandler.handleContent(reader, writer, socket.getInetAddress(), localURL.toString());
+						writer.setMethod(
+							new HttpServerMethod(readerMethod.getMajorVersion(), readerMethod.getMinorVersion(), 200, "OK")
+						);
 					} catch (HttpException e) {
-						writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
-								readerMethod.getMinorVersion(), e.getStatus(), e.getMessage()));
+						writer.setMethod(
+							new HttpServerMethod(
+								readerMethod.getMajorVersion(),
+								readerMethod.getMinorVersion(),
+								e.getStatus(),
+								e.getMessage()
+							)
+						);
 					} catch (Throwable t) {
-						writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
-								readerMethod.getMinorVersion(), 501, "Not Implemented"));
+						writer.setMethod(
+							new HttpServerMethod(
+								readerMethod.getMajorVersion(),
+								readerMethod.getMinorVersion(),
+								501,
+								"Not Implemented"
+							)
+						);
 						// TODO: define the correct error description
 						writer.reset();
 						// TODO: report an specific error
@@ -200,8 +207,9 @@ public void handleConnection(Socket socket) {
 						try {
 							writer.close();
 						} catch (IOException e) {
-							LogAndTraceBroker.getBroker().trace(Level.FINER,
-									"Exception while closing output stream from server socket", e);
+							LogAndTraceBroker
+								.getBroker()
+								.trace(Level.FINER, "Exception while closing output stream from server socket", e);
 						}
 					}
 				} else {
@@ -211,14 +219,16 @@ public void handleConnection(Socket socket) {
 					writer.setHeader(header);
 					// header.addField("Connection", persistent?
 					// "Keep-Alive","close");
-					writer.setMethod(new HttpServerMethod(readerMethod.getMajorVersion(),
-							readerMethod.getMinorVersion(), 501, "Not Implemented"));
+					writer.setMethod(
+						new HttpServerMethod(readerMethod.getMajorVersion(), readerMethod.getMinorVersion(), 501, "Not Implemented")
+					);
 					writeError(writer.getOutputStream(), "", "");
 					try {
 						writer.close();
 					} catch (IOException e) {
-						LogAndTraceBroker.getBroker().trace(Level.FINER,
-								"Exception while closing output stream from server socket", e);
+						LogAndTraceBroker
+							.getBroker()
+							.trace(Level.FINER, "Exception while closing output stream from server socket", e);
 					}
 				}
 
@@ -226,25 +236,25 @@ public void handleConnection(Socket socket) {
 				try {
 					reader.close();
 				} catch (IOException e) {
-					LogAndTraceBroker.getBroker().trace(Level.FINER,
-							"Exception while closing input stream from server socket", e);
+					LogAndTraceBroker
+						.getBroker()
+						.trace(Level.FINER, "Exception while closing input stream from server socket", e);
 				}
 			} while (true);
 		} catch (IOException e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"Exception while reading from server socket", e);
+			LogAndTraceBroker.getBroker().trace(Level.FINER, "Exception while reading from server socket", e);
 
-			if (e instanceof SocketTimeoutException
-					|| WBEMConstants.INDICATION_DOS_EXCEPTION_MESSAGE.equalsIgnoreCase(e
-							.getMessage())) {
+			if (
+				e instanceof SocketTimeoutException ||
+				WBEMConstants.INDICATION_DOS_EXCEPTION_MESSAGE.equalsIgnoreCase(e.getMessage())
+			) {
 				addSuspectIP(socket.getInetAddress().getHostAddress());
 			}
 		}
 		try {
 			socket.close();
 		} catch (IOException e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"Exception while closing server socket", e);
+			LogAndTraceBroker.getBroker().trace(Level.FINER, "Exception while closing server socket", e);
 		}
 	}
 
@@ -256,14 +266,12 @@ public void close() {
 	}
 
 	private void writeError(ASCIIPrintStream dos, String title, String body) {
-		dos.print("  " + title + "" + body
-				+ "");
-
+		dos.print("  " + title + "" + body + "");
 	}
 
 	/**
 	 * Get the IPs blocked by the listener associated with the specified port.
-	 * 
+	 *
 	 * @return The comma-separated list of blocked IPs.
 	 */
 	public synchronized String getBlockedIPs() {
@@ -273,12 +281,11 @@ public synchronized String getBlockedIPs() {
 	/**
 	 * Set the IPs to be blocked by the listener associated with the specified
 	 * port.
-	 * 
+	 *
 	 * @param pIPs
 	 *            The comma-separated list of blocked IPs.
 	 */
 	public synchronized void setBlockedIPs(String pIPs) {
-		this.iBlockedIPs = (pIPs == null || pIPs.trim().length() == 0) ? null : new StringBuilder(
-				pIPs);
+		this.iBlockedIPs = (pIPs == null || pIPs.trim().length() == 0) ? null : new StringBuilder(pIPs);
 	}
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpContentHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpContentHandler.java
index 3a9d6e8..76b571d 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpContentHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpContentHandler.java
@@ -50,13 +50,13 @@
 /**
  * Class HttpContentHandler is responsible for handling the content of an http
  * connection.
- * 
+ *
  */
 public abstract class HttpContentHandler {
 
 	/**
 	 * Handles the content of a given connection
-	 * 
+	 *
 	 * @param pMessageReader
 	 *            The reader of the connection
 	 * @param pMessageWriter
@@ -68,8 +68,13 @@ public abstract class HttpContentHandler {
 	 * @throws HttpException
 	 * @throws IOException
 	 */
-	public abstract void handleContent(MessageReader pMessageReader, MessageWriter pMessageWriter,
-			InetAddress pInetAddress, String pLocalAddress) throws HttpException, IOException;
+	public abstract void handleContent(
+		MessageReader pMessageReader,
+		MessageWriter pMessageWriter,
+		InetAddress pInetAddress,
+		String pLocalAddress
+	)
+		throws HttpException, IOException;
 
 	/**
 	 * Closes the handler
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpException.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpException.java
index 1021a10..f371c5d 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpException.java
@@ -47,10 +47,9 @@
 
 /**
  * Class HttpException represents HTTP related problems
- * 
+ *
  */
 public class HttpException extends IOException {
-
 	private static final long serialVersionUID = 934925248736106630L;
 
 	int iStatus;
@@ -64,7 +63,7 @@ public HttpException() {
 
 	/**
 	 * Ctor. Equivalent to HttpException(-1, reason, null)
-	 * 
+	 *
 	 * @param reason
 	 *            The reason
 	 */
@@ -74,7 +73,7 @@ public HttpException(String reason) {
 
 	/**
 	 * Ctor. Equivalent to HttpException(-1, reason, null)
-	 * 
+	 *
 	 * @param status
 	 *            The status
 	 * @param reason
@@ -86,7 +85,7 @@ public HttpException(int status, String reason) {
 
 	/**
 	 * Ctor. Equivalent to HttpException(-1, reason, null)
-	 * 
+	 *
 	 * @param status
 	 *            The status
 	 * @param reason
@@ -101,7 +100,7 @@ public HttpException(int status, String reason, String cimError) {
 
 	/**
 	 * Returns the status
-	 * 
+	 *
 	 * @return The status
 	 */
 	public int getStatus() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeader.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeader.java
index 493d56d..c3db780 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeader.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeader.java
@@ -70,7 +70,6 @@
 import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.javax.wbem.WBEMException;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.TrailerException;
@@ -80,10 +79,9 @@
 
 /**
  * Class HttpHeader represents a http header block
- * 
+ *
  */
 public class HttpHeader {
-
 	private static BitSet cDontNeedEncoding;
 
 	private static final String HEX_STR = "0123456789ABCDEF";
@@ -108,7 +106,6 @@ public class HttpHeader {
 		cDontNeedEncoding.set('/');
 		cDontNeedEncoding.set('.');
 		cDontNeedEncoding.set('*');
-
 	}
 
 	private Hashtable iFields = new Hashtable();
@@ -117,12 +114,12 @@ public class HttpHeader {
 	 * Ctor.
 	 */
 	public HttpHeader() {
-	// empty
+		// empty
 	}
 
 	/**
 	 * Ctor. Parses the header from an input stream
-	 * 
+	 *
 	 * @param pReader
 	 *            The input stream
 	 * @throws IOException
@@ -133,7 +130,7 @@ public HttpHeader(InputStream pReader) throws IOException {
 
 	/**
 	 * Ctor. Parses the header from an input stream
-	 * 
+	 *
 	 * @param pReader
 	 *            The input stream
 	 * @param pTimeout
@@ -146,8 +143,9 @@ public HttpHeader(InputStream pReader, long pTimeout) throws IOException {
 		// TODO: this needs to be optimized!!!
 		while (((line = HttpMethod.readLine(pReader)) != null) && (line.length() > 0)) {
 			// get the header
-			if (pTimeout > 0 && (System.currentTimeMillis() - timeStart > pTimeout)) { throw new IOException(
-					WBEMConstants.INDICATION_DOS_EXCEPTION_MESSAGE); }
+			if (pTimeout > 0 && (System.currentTimeMillis() - timeStart > pTimeout)) {
+				throw new IOException(WBEMConstants.INDICATION_DOS_EXCEPTION_MESSAGE);
+			}
 			try {
 				int separator;
 				if ((separator = line.indexOf(':')) > -1) {
@@ -157,8 +155,7 @@ public HttpHeader(InputStream pReader, long pTimeout) throws IOException {
 
 					// Ignore prefix-match from HTTP extension (RFC 2774), it'll
 					// look like "nn-"
-					if (line.indexOf('-') == 2 && Character.isDigit(line.charAt(0))
-							&& Character.isDigit(line.charAt(1))) {
+					if (line.indexOf('-') == 2 && Character.isDigit(line.charAt(0)) && Character.isDigit(line.charAt(1))) {
 						headerStartIndex = 3;
 					}
 
@@ -166,15 +163,15 @@ public HttpHeader(InputStream pReader, long pTimeout) throws IOException {
 					value = line.substring(separator + 1);
 					// TODO validate header and value, they must not be empty
 					// entries
-					if (value.length() > 0 && value.startsWith(" ")) addParsedField(header, value
-							.substring(1));
-					else addParsedField(header, value);
+					if (value.length() > 0 && value.startsWith(" ")) addParsedField(
+						header,
+						value.substring(1)
+					); else addParsedField(header, value);
 				} else {
 					LogAndTraceBroker.getBroker().message(Messages.HTTP_INVALID_HEADER, line);
 				}
 			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINER,
-						"Exception while parsing http header", e);
+				LogAndTraceBroker.getBroker().trace(Level.FINER, "Exception while parsing http header", e);
 				LogAndTraceBroker.getBroker().message(Messages.HTTP_INVALID_HEADER, line);
 			}
 		}
@@ -184,7 +181,7 @@ public HttpHeader(InputStream pReader, long pTimeout) throws IOException {
 	/**
 	 * Adds a header field for client output (this means duplicate header
 	 * entries are replaced)
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the header field
 	 * @param pValue
@@ -203,7 +200,7 @@ public void addField(String pName, String pValue) {
 	/**
 	 * Adds a header field from parsed server input (this means duplicate header
 	 * entries are appended in comma-separated list as defined by RFC 2616)
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the header field
 	 * @param pValue
@@ -238,7 +235,7 @@ public void clear() {
 
 	/**
 	 * Return an iterator over the header fields
-	 * 
+	 *
 	 * @return The iterator
 	 */
 	public Iterator> iterator() {
@@ -247,7 +244,7 @@ public Iterator> iterator() {
 
 	/**
 	 * Parses a line from a header block
-	 * 
+	 *
 	 * @param pLine
 	 *            The line
 	 * @return The http header
@@ -272,8 +269,7 @@ public static HttpHeader parse(String pLine) {
 					// something goes wrong. no separator found
 				}
 				prev = next + 1;
-				while (Character.isSpaceChar(pLine.charAt(prev)))
-					prev++;
+				while (Character.isSpaceChar(pLine.charAt(prev))) prev++;
 				next = pLine.indexOf(',', prev);
 			}
 			String hdr = pLine.substring(prev);
@@ -303,7 +299,7 @@ public String toString() {
 
 	/**
 	 * Removes a field from the header
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the field
 	 */
@@ -313,7 +309,7 @@ public void removeField(String pName) {
 
 	/**
 	 * Returns a field from the header
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the field
 	 * @return The value
@@ -324,12 +320,11 @@ public String getField(String pName) {
 
 	/**
 	 * Writes a header block to a stream
-	 * 
+	 *
 	 * @param pWriter
 	 *            The stream
 	 */
 	public void write(ASCIIPrintStream pWriter) {
-
 		Iterator> iterator = this.iFields.entrySet().iterator();
 		while (iterator.hasNext()) {
 			Entry entry = iterator.next();
@@ -343,7 +338,7 @@ public void write(ASCIIPrintStream pWriter) {
 
 	/**
 	 * Encodes raw data
-	 * 
+	 *
 	 * @param pData
 	 *            The raw data
 	 * @return The encoded data
@@ -351,19 +346,17 @@ public void write(ASCIIPrintStream pWriter) {
 	public static synchronized String encode(byte[] pData) {
 		String str = null;
 		try {
-			if (cDfltEncName == null) cDfltEncName = (String) AccessController
-					.doPrivileged(new GetProperty("file.encoding"));
+			if (cDfltEncName == null) cDfltEncName = (String) AccessController.doPrivileged(new GetProperty("file.encoding"));
 			str = encode(pData, cDfltEncName);
 		} catch (UnsupportedEncodingException e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"Exception while encoding http header data", e);
+			LogAndTraceBroker.getBroker().trace(Level.FINER, "Exception while encoding http header data", e);
 		}
 		return str;
 	}
 
 	/**
 	 * Encodes raw data for a given character set
-	 * 
+	 *
 	 * @param pData
 	 *            The raw data
 	 * @param pEnc
@@ -372,7 +365,6 @@ public static synchronized String encode(byte[] pData) {
 	 * @throws UnsupportedEncodingException
 	 */
 	public static String encode(byte[] pData, String pEnc) throws UnsupportedEncodingException {
-
 		int maxBytesPerChar = 10;
 		// BufferedWriter validates encoding
 		ByteArrayOutputStream buf = new ByteArrayOutputStream(maxBytesPerChar);
@@ -399,7 +391,7 @@ public static String encode(byte[] pData, String pEnc) throws UnsupportedEncodin
 
 	/**
 	 * Encodes a given string for a given character set
-	 * 
+	 *
 	 * @param pData
 	 *            The source string
 	 * @param pSourceEnc
@@ -409,25 +401,22 @@ public static String encode(byte[] pData, String pEnc) throws UnsupportedEncodin
 	 * @return The encoded string
 	 * @throws UnsupportedEncodingException
 	 */
-	public static String encode(String pData, String pSourceEnc, String pTargetEnc)
-			throws UnsupportedEncodingException {
-
+	public static String encode(String pData, String pSourceEnc, String pTargetEnc) throws UnsupportedEncodingException {
 		return encode(pData.getBytes(pSourceEnc), pTargetEnc);
 	}
 
 	/**
 	 * Class HeaderEntry represents a single header field
-	 * 
+	 *
 	 */
 	public static class HeaderEntry {
-
 		String iHeader;
 
 		int iHashcode;
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pName
 		 *            The name of the header field
 		 */
@@ -455,10 +444,9 @@ public int hashCode() {
 
 	/**
 	 * Class GetProperty implements privileged access to system properties
-	 * 
+	 *
 	 */
 	private static class GetProperty implements PrivilegedAction {
-
 		String iPropertyName;
 
 		GetProperty(String propertyName) {
@@ -473,7 +461,7 @@ public Object run() {
 	/**
 	 * Throws a TrailerException if it contains recognized CIM errors in http
 	 * trailer entries.
-	 * 
+	 *
 	 * @throws TrailerException
 	 */
 	public void examineTrailer() throws TrailerException {
@@ -483,7 +471,7 @@ public void examineTrailer() throws TrailerException {
 	/**
 	 * Throws a TrailerException if it contains recognized CIM errors in http
 	 * trailer entries.
-	 * 
+	 *
 	 * @param pOrigin
 	 *            The origin of the trailer (response, request, etc.)
 	 * @throws TrailerException
@@ -509,8 +497,9 @@ public void examineTrailer(String pOrigin) throws TrailerException {
 					try {
 						code = Integer.parseInt(valStr);
 					} catch (NumberFormatException e) {
-						String msg = new String(WBEMConstants.HTTP_TRAILER_STATUS_CODE + " \""
-								+ valStr + "\" invalid, setting to CIM_ERR_FAILED");
+						String msg = new String(
+							WBEMConstants.HTTP_TRAILER_STATUS_CODE + " \"" + valStr + "\" invalid, setting to CIM_ERR_FAILED"
+						);
 						LogAndTraceBroker.getBroker().trace(Level.FINER, msg, e);
 						code = WBEMException.CIM_ERR_FAILED;
 						if (desc == null) desc = msg;
@@ -523,12 +512,13 @@ public void examineTrailer(String pOrigin) throws TrailerException {
 				throw new Error(e);
 			}
 		}
-		if (hdrs != null && hdrs.length() > 0) LogAndTraceBroker.getBroker().trace(
-				Level.FINER,
-				(pOrigin == null ? "Unknown" : pOrigin) + " HTTP Trailer Headers= "
-						+ hdrs.toString());
+		if (hdrs != null && hdrs.length() > 0) LogAndTraceBroker
+			.getBroker()
+			.trace(Level.FINER, (pOrigin == null ? "Unknown" : pOrigin) + " HTTP Trailer Headers= " + hdrs.toString());
 		if (code > 0) {
-			if (desc != null) { throw new TrailerException(new WBEMException(code, desc)); }
+			if (desc != null) {
+				throw new TrailerException(new WBEMException(code, desc));
+			}
 			throw new TrailerException(new WBEMException(code));
 		}
 	}
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java
index 05cbdae..86949b9 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpHeaderParser.java
@@ -50,17 +50,16 @@
 
 /**
  * Class HttpHeaderParser parses http headers
- * 
+ *
  */
 public class HttpHeaderParser {
-
 	String iRaw;
 
 	Vector iNameValuePair;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 *            The header block
 	 */
@@ -79,8 +78,7 @@ public HttpHeaderParser(String pHeader) {
 			do {
 				char c = charArray[currentPos];
 				if (c == '=') {
-					nvp[0] = (new String(charArray, startPosValue, currentPos - startPosValue))
-							.toLowerCase();
+					nvp[0] = (new String(charArray, startPosValue, currentPos - startPosValue)).toLowerCase();
 					isName = false;
 					startPosValue = ++currentPos;
 				} else if (c == '"') {
@@ -89,8 +87,10 @@ public HttpHeaderParser(String pHeader) {
 						this.iNameValuePair.add(nvp);
 						nvp = new String[2];
 						withinQuote = false;
-						while (++currentPos < len
-								&& (charArray[currentPos] == ' ' || charArray[currentPos] == ',' || charArray[currentPos] == ';')) {
+						while (
+							++currentPos < len &&
+							(charArray[currentPos] == ' ' || charArray[currentPos] == ',' || charArray[currentPos] == ';')
+						) {
 							// ignore spaces and preceding comma
 						}
 						isName = true;
@@ -104,19 +104,19 @@ public HttpHeaderParser(String pHeader) {
 						currentPos++;
 					} else {
 						if (isName) {
-							nvp[0] = (new String(charArray, startPosValue, currentPos
-									- startPosValue)).toLowerCase();
+							nvp[0] = (new String(charArray, startPosValue, currentPos - startPosValue)).toLowerCase();
 							this.iNameValuePair.add(nvp);
 							nvp = new String[2];
 						} else {
-							nvp[1] = new String(charArray, startPosValue, currentPos
-									- startPosValue);
+							nvp[1] = new String(charArray, startPosValue, currentPos - startPosValue);
 							this.iNameValuePair.add(nvp);
 							nvp = new String[2];
 						}
 
-						while (++currentPos < len
-								&& (charArray[currentPos] == ' ' || charArray[currentPos] == ',' || charArray[currentPos] == ';')) {
+						while (
+							++currentPos < len &&
+							(charArray[currentPos] == ' ' || charArray[currentPos] == ',' || charArray[currentPos] == ';')
+						) {
 							// ignore spaces and preceding comma
 						}
 						isName = true;
@@ -134,14 +134,12 @@ public HttpHeaderParser(String pHeader) {
 						this.iNameValuePair.add(nvp);
 						nvp = new String[2];
 					} else {
-						nvp[1] = new String(charArray, startPosValue,
-								(currentPos - startPosValue) + 1);
+						nvp[1] = new String(charArray, startPosValue, (currentPos - startPosValue) + 1);
 						this.iNameValuePair.add(nvp);
 						nvp = new String[2];
 					}
 				} else {
-					nvp[0] = (new String(charArray, startPosValue, (currentPos - startPosValue) + 1))
-							.toLowerCase();
+					nvp[0] = (new String(charArray, startPosValue, (currentPos - startPosValue) + 1)).toLowerCase();
 				}
 				this.iNameValuePair.add(nvp);
 			} else if (currentPos == startPosValue) {
@@ -165,7 +163,7 @@ public HttpHeaderParser(String pHeader) {
 
 	/**
 	 * Returns the header field at a given index
-	 * 
+	 *
 	 * @param pIndex
 	 *            The index
 	 * @return The field name
@@ -177,7 +175,7 @@ public String getField(int pIndex) {
 
 	/**
 	 * Returns the value of a header field at a given index
-	 * 
+	 *
 	 * @param pIndex
 	 * @return The value
 	 */
@@ -188,7 +186,7 @@ public String getValue(int pIndex) {
 
 	/**
 	 * Returns the value of a header field for a given name
-	 * 
+	 *
 	 * @param pName
 	 *            The name
 	 * @return The value
@@ -200,7 +198,7 @@ public String getValue(String pName) {
 	/**
 	 * Returns the value of a header field for a given name specifying a
 	 * default.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the header field
 	 * @param pDefault
@@ -212,8 +210,7 @@ public String getValue(String pName, String pDefault) {
 		pName = pName.toLowerCase();
 		for (int i = 0; i < this.iNameValuePair.size(); i++) {
 			if (this.iNameValuePair.elementAt(i)[0] == null) return pDefault;
-			if (pName.equals(this.iNameValuePair.elementAt(i)[0])) return this.iNameValuePair
-					.elementAt(i)[1];
+			if (pName.equals(this.iNameValuePair.elementAt(i)[0])) return this.iNameValuePair.elementAt(i)[1];
 		}
 		return pDefault;
 	}
@@ -221,7 +218,7 @@ public String getValue(String pName, String pDefault) {
 	/**
 	 * Returns the value of a numeric header field for a given name specifying a
 	 * default.
-	 * 
+	 *
 	 * @param pName
 	 *            The name of the header field
 	 * @param pDefault
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpMethod.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpMethod.java
index f5e63b4..6525315 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpMethod.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpMethod.java
@@ -51,25 +51,23 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 
 /**
  * Class HttpMethod provides a method to read a line from a given input stream
- * 
+ *
  */
 public abstract class HttpMethod {
 
 	/**
 	 * Reads a line from a given input stream
-	 * 
+	 *
 	 * @param pStream
 	 *            The input stream
 	 * @return The line
 	 * @throws IOException
 	 */
 	public static String readLine(InputStream pStream) throws IOException {
-
 		if (pStream == null) return null;
 
 		char buffer[] = new char[16];
@@ -78,7 +76,6 @@ public static String readLine(InputStream pStream) throws IOException {
 		boolean flag = true;
 
 		for (; (prevChar = pStream.read()) >= 0; buffer[used++] = (char) prevChar) {
-
 			flag = false;
 
 			// @12917 - thschaef
@@ -102,10 +99,11 @@ public static String readLine(InputStream pStream) throws IOException {
 		}
 		if (flag) {
 			LogAndTraceBroker
-					.getBroker()
-					.trace(
-							Level.FINE,
-							"Unexpected EOF trying to read line from input stream - CIMOM closed its end of socket, check it for connection issues");
+				.getBroker()
+				.trace(
+					Level.FINE,
+					"Unexpected EOF trying to read line from input stream - CIMOM closed its end of socket, check it for connection issues"
+				);
 			throw new IOException("Unexpected EOF");
 		}
 
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpParseException.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpParseException.java
index 9735f00..b10d459 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpParseException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpParseException.java
@@ -45,10 +45,9 @@
 
 /**
  * Class HttpParseException represents problems parsing http challenges
- * 
+ *
  */
 public class HttpParseException extends HttpException {
-
 	private static final long serialVersionUID = -6546559439537187479L;
 
 	/**
@@ -60,7 +59,7 @@ public HttpParseException() {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pReason
 	 *            The reason
 	 */
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerConnection.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerConnection.java
index f60ff10..45d3c53 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerConnection.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerConnection.java
@@ -66,10 +66,8 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
-
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLServerSocket;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.util.ThreadPool;
 import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
@@ -79,10 +77,9 @@
  * Class HttpServerConnection implements the outer shell of a HTTP server. It
  * accepts incoming connections and puts them in a queue to be serviced by an
  * independent thread
- * 
+ *
  */
 public class HttpServerConnection implements Runnable {
-
 	private int iPort;
 
 	private ServerSocket iServerSocket;
@@ -105,7 +102,7 @@ public class HttpServerConnection implements Runnable {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHandler
 	 *            The connection handler
 	 * @param pLocalAddress
@@ -119,9 +116,14 @@ public class HttpServerConnection implements Runnable {
 	 *            The configuration context
 	 * @throws IOException
 	 */
-	public HttpServerConnection(HttpConnectionHandler pHandler, String pLocalAddress, int pPort,
-			boolean pSsl, WBEMConfiguration pProperties) throws IOException {
-
+	public HttpServerConnection(
+		HttpConnectionHandler pHandler,
+		String pLocalAddress,
+		int pPort,
+		boolean pSsl,
+		WBEMConfiguration pProperties
+	)
+		throws IOException {
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
 
@@ -129,21 +131,20 @@ public HttpServerConnection(HttpConnectionHandler pHandler, String pLocalAddress
 		this.iHandler = pHandler;
 		this.iSsl = pSsl;
 		this.iServerName = pSsl ? "HTTPS Server" : "HTTP Server";
-		this.iSessionProperties = (pProperties != null) ? pProperties : WBEMConfiguration
-				.getGlobalConfiguration();
-		SSLContext sslContext = pSsl ? HttpSocketFactory.getInstance().getServerSSLContext(
-				this.iSessionProperties) : null;
-		this.iServerSocket = (pLocalAddress != null && pLocalAddress.length() > 0) ? HttpSocketFactory
-				.getInstance().getServerSocketFactory(sslContext).createServerSocket(pPort, 50,
-						InetAddress.getByName(pLocalAddress))
-				: HttpSocketFactory.getInstance().getServerSocketFactory(sslContext)
-						.createServerSocket(pPort);
+		this.iSessionProperties = (pProperties != null) ? pProperties : WBEMConfiguration.getGlobalConfiguration();
+		SSLContext sslContext = pSsl ? HttpSocketFactory.getInstance().getServerSSLContext(this.iSessionProperties) : null;
+		this.iServerSocket =
+			(pLocalAddress != null && pLocalAddress.length() > 0)
+				? HttpSocketFactory
+					.getInstance()
+					.getServerSocketFactory(sslContext)
+					.createServerSocket(pPort, 50, InetAddress.getByName(pLocalAddress))
+				: HttpSocketFactory.getInstance().getServerSocketFactory(sslContext).createServerSocket(pPort);
 		if (this.iServerSocket instanceof SSLServerSocket) {
 			if (this.iSessionProperties.getSslListenerPeerVerification().equalsIgnoreCase("ignore")) {
 				logger.trace(Level.FINER, "Listener peer verification: ignore");
 				((SSLServerSocket) this.iServerSocket).setNeedClientAuth(false);
-			} else if (this.iSessionProperties.getSslListenerPeerVerification().equalsIgnoreCase(
-					"accept")) {
+			} else if (this.iSessionProperties.getSslListenerPeerVerification().equalsIgnoreCase("accept")) {
 				logger.trace(Level.FINER, "Listener peer verification: accept");
 				((SSLServerSocket) this.iServerSocket).setWantClientAuth(true);
 			} else {
@@ -151,22 +152,19 @@ public HttpServerConnection(HttpConnectionHandler pHandler, String pLocalAddress
 				((SSLServerSocket) this.iServerSocket).setNeedClientAuth(true);
 			}
 
-			String disableCipherSuites = this.iSessionProperties
-					.getSslListenerCipherSuitesToDisable();
+			String disableCipherSuites = this.iSessionProperties.getSslListenerCipherSuitesToDisable();
 			if (disableCipherSuites != null) {
 				SSLServerSocket sslSock = (SSLServerSocket) this.iServerSocket;
 				String[] currentCipherSuites = sslSock.getEnabledCipherSuites();
-				String[] updatedCipherSuites = Util.getFilteredStringArray(currentCipherSuites,
-						disableCipherSuites);
+				String[] updatedCipherSuites = Util.getFilteredStringArray(currentCipherSuites, disableCipherSuites);
 				sslSock.setEnabledCipherSuites(updatedCipherSuites);
 				int before = currentCipherSuites.length;
 				int after = updatedCipherSuites.length;
-				if (before > 0 && after == 0) logger.trace(Level.WARNING,
-						"All cipher suites disabled for listener!");
-				else if (before > after) logger.trace(Level.FINE, "Some (" + (before - after)
-						+ ") cipher suites disabled for listener");
-				else if (before == after) logger.trace(Level.FINER,
-						"No cipher suites disabled for listener");
+				if (before > 0 && after == 0) logger.trace(Level.WARNING, "All cipher suites disabled for listener!"); else if (
+					before > after
+				) logger.trace(Level.FINE, "Some (" + (before - after) + ") cipher suites disabled for listener"); else if (
+					before == after
+				) logger.trace(Level.FINER, "No cipher suites disabled for listener");
 			}
 		}
 		this.iTimeout = this.iSessionProperties.getListenerHttpTimeout();
@@ -175,7 +173,7 @@ else if (before == after) logger.trace(Level.FINER,
 
 	/**
 	 * Set the name of the thread
-	 * 
+	 *
 	 * @param pName
 	 *            The new value
 	 */
@@ -185,7 +183,7 @@ public void setName(String pName) {
 
 	/**
 	 * Returns the port
-	 * 
+	 *
 	 * @return The port
 	 */
 	public int getPort() {
@@ -194,7 +192,7 @@ public int getPort() {
 
 	/**
 	 * Returns the local ip address the socket is bound to
-	 * 
+	 *
 	 * @return The ip address
 	 * @throws UnknownHostException
 	 */
@@ -206,7 +204,7 @@ public String getLocalIp() throws UnknownHostException {
 
 	/**
 	 * Returns the local hostname the socket is bound to
-	 * 
+	 *
 	 * @return The host name
 	 * @throws UnknownHostException
 	 */
@@ -218,7 +216,7 @@ public String getLocalHostName() throws UnknownHostException {
 
 	/**
 	 * Return whether this connection is SSL secured
-	 * 
+	 *
 	 * @return true if SSL is enabled, false otherwise
 	 */
 	public boolean isSSL() {
@@ -232,12 +230,20 @@ public void start() {
 		if (this.iClose) {
 			this.iClose = false;
 			ThreadGroup group = new ThreadGroup("CIMListener on port " + String.valueOf(this.iPort));
-			this.iDispatcher = new HttpConnectionDispatcher(group, this.iHandler, new ThreadPool(
-					this.iSessionProperties.getListenerMinPoolSize(), this.iSessionProperties
-							.getListenerMaxPoolSize(),
-					this.iSessionProperties.getListenerBacklog(), this.iSessionProperties
-							.getListenerMaxIdle(), group, "Handler "), this.iSessionProperties
-					.getListenerMaxQueueSize());
+			this.iDispatcher =
+				new HttpConnectionDispatcher(
+					group,
+					this.iHandler,
+					new ThreadPool(
+						this.iSessionProperties.getListenerMinPoolSize(),
+						this.iSessionProperties.getListenerMaxPoolSize(),
+						this.iSessionProperties.getListenerBacklog(),
+						this.iSessionProperties.getListenerMaxIdle(),
+						group,
+						"Handler "
+					),
+					this.iSessionProperties.getListenerMaxQueueSize()
+				);
 			this.iDispatcher.start();
 			this.iRunner = new Thread(group, this, this.iServerName);
 			this.iRunner.setDaemon(true);
@@ -254,38 +260,32 @@ public void run() {
 					socket.setTcpNoDelay(true);
 					socket.setSoTimeout(this.iTimeout);
 				} catch (IOException e) {
-					LogAndTraceBroker.getBroker().trace(Level.FINE,
-							"Exception while adjusting socket options", e);
+					LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception while adjusting socket options", e);
 				}
 				boolean dispatched = this.iDispatcher.dispatch(socket);
 				if (!dispatched) {
 					MessageWriter writer = new MessageWriter(socket.getOutputStream(), false, false);
 					try {
-						writer.setMethod(new HttpServerMethod(1, 1, 503,
-								"Service temporarily overloaded"));
+						writer.setMethod(new HttpServerMethod(1, 1, 503, "Service temporarily overloaded"));
 						writer.getHeader().addField("Retry-After", "10");
 						writer.close();
 					} catch (IOException e) {
-						LogAndTraceBroker.getBroker().trace(Level.FINE,
-								"Exception while sending HTTP 503", e);
+						LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception while sending HTTP 503", e);
 					} finally {
 						socket.close();
 					}
 					LogAndTraceBroker
-							.getBroker()
-							.trace(Level.FINE,
-									"HttpServerConnection failed to dispatch incoming connection, sent 503");
+						.getBroker()
+						.trace(Level.FINE, "HttpServerConnection failed to dispatch incoming connection, sent 503");
 				} else {
-					LogAndTraceBroker.getBroker().trace(Level.FINE,
-							"HttpServerConnection dispatched incoming connection");
+					LogAndTraceBroker.getBroker().trace(Level.FINE, "HttpServerConnection dispatched incoming connection");
 				}
 			} catch (Throwable t) {
 				if (t instanceof SocketException && this.iClose) {
 					break;
 				}
 				try {
-					LogAndTraceBroker.getBroker().trace(Level.FINE,
-							"Exception while waiting for incoming http connections");
+					LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception while waiting for incoming http connections");
 				} catch (Throwable t2) {
 					// just give up
 				}
@@ -295,8 +295,7 @@ public void run() {
 		// shutdown
 
 		try {
-			LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Shutting down CIMListener on port " + this.iPort);
+			LogAndTraceBroker.getBroker().trace(Level.FINE, "Shutting down CIMListener on port " + this.iPort);
 		} catch (Throwable t) {
 			// do nothing
 		}
@@ -310,8 +309,7 @@ public void run() {
 		try {
 			this.iDispatcher.close();
 		} catch (Exception e) {
-			LogAndTraceBroker.getBroker().trace(Level.FINE,
-					"Exception while closing http connection dispatcher", e);
+			LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception while closing http connection dispatcher", e);
 		}
 		this.iDispatcher = null;
 		this.iRunner = null;
@@ -327,8 +325,7 @@ public void close() {
 				this.iServerSocket.close();
 				this.iServerSocket = null;
 			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINE,
-						"Exception while closing server socket", e);
+				LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception while closing server socket", e);
 			}
 		}
 	}
@@ -338,10 +335,9 @@ public void close() {
 	 * incoming connections to the handlers. It doesn't execute the handler
 	 * directly but creates a runnable that is submitted to a thread pool which
 	 * takes care of execution.
-	 * 
+	 *
 	 */
 	private static class HttpConnectionDispatcher extends Thread {
-
 		private BlockingQueue iConnectionPool;
 
 		private volatile boolean iAlive = true;
@@ -352,7 +348,7 @@ private static class HttpConnectionDispatcher extends Thread {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pGroup
 		 *            The thread group to use for this thread and it's children
 		 * @param pHandler
@@ -362,8 +358,12 @@ private static class HttpConnectionDispatcher extends Thread {
 		 * @param pQueueSize
 		 *            The fixed capacity for the queue of pending connections
 		 */
-		public HttpConnectionDispatcher(ThreadGroup pGroup, HttpConnectionHandler pHandler,
-				ThreadPool pPool, int pQueueSize) {
+		public HttpConnectionDispatcher(
+			ThreadGroup pGroup,
+			HttpConnectionHandler pHandler,
+			ThreadPool pPool,
+			int pQueueSize
+		) {
 			super(pGroup, "Connection Dispatcher");
 			setDaemon(true);
 			this.iConnectionPool = new ArrayBlockingQueue(pQueueSize > 0 ? pQueueSize : 1);
@@ -373,7 +373,7 @@ public HttpConnectionDispatcher(ThreadGroup pGroup, HttpConnectionHandler pHandl
 
 		/**
 		 * Dispatches a connection
-		 * 
+		 *
 		 * @param pSocket
 		 *            The socket of the connection
 		 * @return true if dispatch was successful
@@ -389,7 +389,7 @@ public boolean dispatch(Socket pSocket) {
 
 		/**
 		 * Gets the next pending connection
-		 * 
+		 *
 		 * @return The socket of the connection
 		 */
 		public Socket getConnection() {
@@ -411,8 +411,7 @@ public void run() {
 					}
 				} catch (Throwable t) {
 					try {
-						LogAndTraceBroker.getBroker().trace(Level.FINE,
-								"Exception while submitting worker to thread pool", t);
+						LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception while submitting worker to thread pool", t);
 					} catch (Throwable t1) {
 						// forget it
 					}
@@ -421,14 +420,12 @@ public void run() {
 			try {
 				this.iHandler.close();
 			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINE,
-						"Exception while closing http connection handler", e);
+				LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception while closing http connection handler", e);
 			}
 			try {
 				this.iThreadPool.shutdown();
 			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINE,
-						"Exception during shut down of thread pool", e);
+				LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception during shut down of thread pool", e);
 			}
 		}
 
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerMethod.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerMethod.java
index 7ebf745..c6fce4b 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerMethod.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerMethod.java
@@ -47,15 +47,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
-
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
 
 /**
  * Class HttpServerMethod is responsible for
- * 
+ *
  */
 public class HttpServerMethod extends HttpMethod {
-
 	private String iMethodName;
 
 	private String iFile;
@@ -70,7 +68,7 @@ public class HttpServerMethod extends HttpMethod {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pMajor
 	 *            Major version
 	 * @param pMinor
@@ -89,7 +87,7 @@ public HttpServerMethod(int pMajor, int pMinor, int pStatus, String pReason) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pReader
 	 *            Inputstream
 	 * @throws IOException
@@ -130,7 +128,7 @@ public HttpServerMethod(InputStream pReader) throws IOException, HttpException {
 
 	/**
 	 * Returns the major version
-	 * 
+	 *
 	 * @return The major version
 	 */
 	public int getMajorVersion() {
@@ -139,7 +137,7 @@ public int getMajorVersion() {
 
 	/**
 	 * Returns the minor version
-	 * 
+	 *
 	 * @return The minor version
 	 */
 	public int getMinorVersion() {
@@ -148,7 +146,7 @@ public int getMinorVersion() {
 
 	/**
 	 * Returns the method name
-	 * 
+	 *
 	 * @return The method name
 	 */
 	public String getMethodName() {
@@ -157,7 +155,7 @@ public String getMethodName() {
 
 	/**
 	 * Returns the file
-	 * 
+	 *
 	 * @return The file
 	 */
 	public String getFile() {
@@ -166,12 +164,11 @@ public String getFile() {
 
 	/**
 	 * Write to a given output stream
-	 * 
+	 *
 	 * @param pStream
 	 *            the output stream
 	 */
 	public void write(ASCIIPrintStream pStream) {
-		pStream.print("HTTP/" + this.iMajor + "." + this.iMinor + " " + this.iStatus + " "
-				+ this.iReason + "\r\n");
+		pStream.print("HTTP/" + this.iMajor + "." + this.iMinor + " " + this.iStatus + " " + this.iReason + "\r\n");
 	}
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerWorker.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerWorker.java
index b9a73ce..7eead34 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerWorker.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpServerWorker.java
@@ -45,23 +45,21 @@
  */
 
 import java.net.Socket;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
 
 /**
  * Class HttpServerWorker forwards incoming connections to a handler
- * 
+ *
  */
 public class HttpServerWorker implements Runnable {
-
 	HttpConnectionHandler iHandler;
 
 	Socket iSocket;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHandler
 	 *            The handler
 	 * @param pSocket
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java
index 1cda5a7..9b1510f 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpSocketFactory.java
@@ -73,7 +73,6 @@
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.logging.Level;
-
 import javax.net.ServerSocketFactory;
 import javax.net.SocketFactory;
 import javax.net.ssl.KeyManager;
@@ -83,26 +82,24 @@
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509KeyManager;
 import javax.net.ssl.X509TrustManager;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
 
 /**
  * Class HttpSocketFactory manages socket factories
- * 
+ *
  */
 public class HttpSocketFactory {
-
 	private static HttpSocketFactory cInstance = new HttpSocketFactory();
 
 	private HttpSocketFactory() {
-	// empty
+		// empty
 	}
 
 	/**
 	 * Returns the singleton instance
-	 * 
+	 *
 	 * @return The instance
 	 */
 	public static HttpSocketFactory getInstance() {
@@ -111,21 +108,20 @@ public static HttpSocketFactory getInstance() {
 
 	/**
 	 * Returns a server socket factory
-	 * 
+	 *
 	 * @param pContext
 	 *            The corresponding SSL context or null for
 	 *            insecure connections
-	 * 
+	 *
 	 * @return The factory
 	 */
 	public ServerSocketFactory getServerSocketFactory(SSLContext pContext) {
-		return pContext != null ? pContext.getServerSocketFactory() : ServerSocketFactory
-				.getDefault();
+		return pContext != null ? pContext.getServerSocketFactory() : ServerSocketFactory.getDefault();
 	}
 
 	/**
 	 * Returns a client socket factory
-	 * 
+	 *
 	 * @param pContext
 	 *            The SSL context or null for insecure connections
 	 * @return The factory
@@ -137,7 +133,7 @@ public SocketFactory getClientSocketFactory(SSLContext pContext) {
 	/**
 	 * Returns a SSLContext for client sockets corresponding to a given set of
 	 * configuration properties
-	 * 
+	 *
 	 * @param pProperties
 	 *            The configuration to apply
 	 * @return The SSL context
@@ -149,7 +145,7 @@ public SSLContext getClientSSLContext(final WBEMConfiguration pProperties) {
 	/**
 	 * Returns a SSLContext for server sockets corresponding to a given set of
 	 * configuration properties
-	 * 
+	 *
 	 * @param pProperties
 	 *            The configuration to apply
 	 * @return The SSL context
@@ -161,7 +157,7 @@ public SSLContext getServerSSLContext(final WBEMConfiguration pProperties) {
 	/**
 	 * Returns a SSLContext corresponding to a given set of configuration
 	 * properties
-	 * 
+	 *
 	 * @param pProperties
 	 *            The configuration to apply
 	 * @param pIsServer
@@ -170,12 +166,10 @@ public SSLContext getServerSSLContext(final WBEMConfiguration pProperties) {
 	 * @return The SSL context
 	 */
 	private SSLContext getSSLContext(final WBEMConfiguration pProperties, boolean pIsServer) {
-
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
 
-		final String provider = pIsServer ? pProperties.getSslServerSocketProvider() : pProperties
-				.getSslSocketProvider();
+		final String provider = pIsServer ? pProperties.getSslServerSocketProvider() : pProperties.getSslSocketProvider();
 		logger.trace(Level.FINER, "Loading JSSE provider:" + provider);
 
 		final Provider securityProvider;
@@ -198,30 +192,31 @@ private SSLContext getSSLContext(final WBEMConfiguration pProperties, boolean pI
 
 			TrustManager[] trustManager = loadTruststore(pProperties, securityProvider, pIsServer);
 
-			String sslProtocol = pIsServer ? pProperties.getSslListenerProtocol() : pProperties
-					.getSslClientProtocol();
+			String sslProtocol = pIsServer ? pProperties.getSslListenerProtocol() : pProperties.getSslClientProtocol();
 
-			SSLContext sslContext = SSLContext.getInstance(sslProtocol != null ? sslProtocol
-					: pProperties.getSslProtocol(), securityProvider);
+			SSLContext sslContext = SSLContext.getInstance(
+				sslProtocol != null ? sslProtocol : pProperties.getSslProtocol(),
+				securityProvider
+			);
 
 			sslContext.init(keyManager, trustManager, null);
 
 			logger.exit();
 
 			return sslContext;
-
 		} catch (Exception e) {
-			logger.trace(Level.FINER, "Exception while initializing SSL context (provider:"
-					+ provider + ")", e);
+			logger.trace(Level.FINER, "Exception while initializing SSL context (provider:" + provider + ")", e);
 			logger.message(Messages.SSL_CONTEXT_INIT_FAILED);
 			logger.exit();
 			return null;
 		}
 	}
 
-	private TrustManager[] loadTruststore(final WBEMConfiguration pProperties,
-			final Provider pSecurityProvider, boolean pIsServer) {
-
+	private TrustManager[] loadTruststore(
+		final WBEMConfiguration pProperties,
+		final Provider pSecurityProvider,
+		boolean pIsServer
+	) {
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
 
@@ -236,37 +231,39 @@ private TrustManager[] loadTruststore(final WBEMConfiguration pProperties,
 		final boolean clientPeerVerification = pProperties.getSslClientPeerVerification();
 		final String listenerPeerVerification = pProperties.getSslListenerPeerVerification();
 
-		logger.trace(Level.FINER, "Using SSL truststore \"" + truststorePath + "\" ("
-				+ truststoreType + "/" + trustManagerAlgorithm + ")");
+		logger.trace(
+			Level.FINER,
+			"Using SSL truststore \"" + truststorePath + "\" (" + truststoreType + "/" + trustManagerAlgorithm + ")"
+		);
 
-		if (pIsServer && listenerPeerVerification.equalsIgnoreCase("ignore")
-				|| (!pIsServer && !clientPeerVerification)) {
+		if (pIsServer && listenerPeerVerification.equalsIgnoreCase("ignore") || (!pIsServer && !clientPeerVerification)) {
 			trustManager = trustAll;
 			if (truststorePath == null || truststorePath.trim().length() == 0) {
-				logger.trace(Level.FINER, "Peer verification disabled for "
-						+ (pIsServer ? "Listener" : "Client"));
+				logger.trace(Level.FINER, "Peer verification disabled for " + (pIsServer ? "Listener" : "Client"));
 			} else {
 				logger.message(Messages.SSL_TRUSTSTORE_INACTIVE);
 			}
 		} else {
 			if (truststorePath == null || truststorePath.trim().length() == 0) {
-				logger.trace(Level.FINER, "Peer verification enabled for "
-						+ (pIsServer ? "Listener" : "Client") + " but no truststore specified!");
+				logger.trace(
+					Level.FINER,
+					"Peer verification enabled for " + (pIsServer ? "Listener" : "Client") + " but no truststore specified!"
+				);
 				logger.message(Messages.SSL_TRUSTSTORE_NULL);
 			} else {
-				logger.trace(Level.FINER, "Peer verification enabled for "
-						+ (pIsServer ? "Listener" : "Client"));
+				logger.trace(Level.FINER, "Peer verification enabled for " + (pIsServer ? "Listener" : "Client"));
 				FileInputStream fis = null;
 				try {
 					final KeyStore trustStore = KeyStore.getInstance(truststoreType);
 					fis = new FileInputStream(truststorePath);
 					trustStore.load(fis, truststorePassword);
-					final TrustManagerFactory trustManagerFactory = TrustManagerFactory
-							.getInstance(trustManagerAlgorithm, pSecurityProvider);
+					final TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
+						trustManagerAlgorithm,
+						pSecurityProvider
+					);
 					trustManagerFactory.init(trustStore);
 					trustManager = trustManagerFactory.getTrustManagers();
-					logger.trace(Level.FINER, "Truststore successfully loaded for "
-							+ (pIsServer ? "Listener" : "Client"));
+					logger.trace(Level.FINER, "Truststore successfully loaded for " + (pIsServer ? "Listener" : "Client"));
 				} catch (FileNotFoundException e) {
 					logger.trace(Level.FINER, "Exception while loading truststore", e);
 					logger.message(Messages.SSL_TRUSTSTORE_NOT_FOUND, truststorePath);
@@ -275,9 +272,7 @@ private TrustManager[] loadTruststore(final WBEMConfiguration pProperties,
 					logger.message(Messages.SSL_TRUSTSTORE_NOT_READABLE, truststorePath);
 				} catch (NoSuchAlgorithmException e) {
 					logger.trace(Level.FINER, "Exception while loading truststore", e);
-					logger
-							.message(Messages.SSL_TRUSTSTORE_INVALID_ALGORITHM,
-									trustManagerAlgorithm);
+					logger.message(Messages.SSL_TRUSTSTORE_INVALID_ALGORITHM, trustManagerAlgorithm);
 				} catch (CertificateException e) {
 					logger.trace(Level.FINER, "Exception while loading truststore", e);
 					logger.message(Messages.SSL_TRUSTSTORE_INVALID_CERT, truststorePath);
@@ -311,9 +306,11 @@ private TrustManager[] loadTruststore(final WBEMConfiguration pProperties,
 		return trustManager;
 	}
 
-	private KeyManager[] loadKeystore(final WBEMConfiguration pProperties,
-			final Provider pSecurityProvider, boolean pIsServer) {
-
+	private KeyManager[] loadKeystore(
+		final WBEMConfiguration pProperties,
+		final Provider pSecurityProvider,
+		boolean pIsServer
+	) {
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
 
@@ -325,16 +322,16 @@ private KeyManager[] loadKeystore(final WBEMConfiguration pProperties,
 		final String keystoreType = pProperties.getSslKeyStoreType();
 		final String keyManagerAlgorithm = pProperties.getSslKeyManagerAlgorithm();
 
-		logger.trace(Level.FINER, "Using SSL keystore \"" + keystorePath + "\" (" + keystoreType
-				+ "/" + keyManagerAlgorithm + ")");
+		logger.trace(
+			Level.FINER,
+			"Using SSL keystore \"" + keystorePath + "\" (" + keystoreType + "/" + keyManagerAlgorithm + ")"
+		);
 
 		if (keystorePath == null || keystorePath.trim().length() == 0) {
-			logger.trace(Level.FINER, "Keystore not specified for "
-					+ (pIsServer ? "Listener" : "Client"));
+			logger.trace(Level.FINER, "Keystore not specified for " + (pIsServer ? "Listener" : "Client"));
 			logger.message(Messages.SSL_KEYSTORE_NULL);
 		} else {
-			logger.trace(Level.FINER, "Keystore specified and activated for "
-					+ (pIsServer ? "Listener" : "Client"));
+			logger.trace(Level.FINER, "Keystore specified and activated for " + (pIsServer ? "Listener" : "Client"));
 			FileInputStream fis = null;
 			try {
 				final KeyStore keystore = KeyStore.getInstance(keystoreType);
@@ -342,11 +339,12 @@ private KeyManager[] loadKeystore(final WBEMConfiguration pProperties,
 				keystore.load(fis, keystorePassword);
 
 				final KeyManagerFactory keymanagerfactory = KeyManagerFactory.getInstance(
-						keyManagerAlgorithm, pSecurityProvider);
+					keyManagerAlgorithm,
+					pSecurityProvider
+				);
 				keymanagerfactory.init(keystore, keystorePassword);
 				keyManager = keymanagerfactory.getKeyManagers();
-				logger.trace(Level.FINER, "Keystore successfully loaded for "
-						+ (pIsServer ? "Listener" : "Client"));
+				logger.trace(Level.FINER, "Keystore successfully loaded for " + (pIsServer ? "Listener" : "Client"));
 			} catch (FileNotFoundException e) {
 				logger.trace(Level.FINER, "Exception while loading keystore", e);
 				logger.message(Messages.SSL_KEYSTORE_NOT_FOUND, keystorePath);
@@ -386,7 +384,6 @@ private KeyManager[] loadKeystore(final WBEMConfiguration pProperties,
 		logger.exit();
 		return keyManager;
 	}
-
 }
 
 class AllTrustManager implements X509TrustManager {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java
index b18b6e2..9068487 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/HttpUrlConnection.java
@@ -53,15 +53,13 @@
 import java.net.SocketPermission;
 import java.net.URI;
 import java.security.Permission;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 
 /**
  * Class HttpUrlConnection encapsulates a http connection
- * 
+ *
  */
 public class HttpUrlConnection extends HttpURLConnection {
-
 	private boolean iConnected;
 
 	private HttpClient iHttpClient;
@@ -74,7 +72,7 @@ public class HttpUrlConnection extends HttpURLConnection {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pUri
 	 *            The host URI
 	 * @param pHttpClientPool
@@ -82,8 +80,7 @@ public class HttpUrlConnection extends HttpURLConnection {
 	 * @param pAuthHandler
 	 *            The authentication handler
 	 */
-	public HttpUrlConnection(URI pUri, HttpClientPool pHttpClientPool,
-			AuthorizationHandler pAuthHandler) {
+	public HttpUrlConnection(URI pUri, HttpClientPool pHttpClientPool, AuthorizationHandler pAuthHandler) {
 		super(null);
 		this.iUrl = pUri;
 		this.iHttpClientPool = pHttpClientPool;
@@ -93,9 +90,15 @@ public HttpUrlConnection(URI pUri, HttpClientPool pHttpClientPool,
 
 	@Override
 	public String toString() {
-		return "HttpUrlConnection=[url=" + this.iUrl + ",PoolSize="
-				+ this.iHttpClientPool.getNumberOfAvailableConnections() + "," + this.iAuthHandler
-				+ "]";
+		return (
+			"HttpUrlConnection=[url=" +
+			this.iUrl +
+			",PoolSize=" +
+			this.iHttpClientPool.getNumberOfAvailableConnections() +
+			"," +
+			this.iAuthHandler +
+			"]"
+		);
 	}
 
 	@Override
@@ -198,7 +201,7 @@ public boolean usingProxy() {
 
 	/**
 	 * Returns the http client
-	 * 
+	 *
 	 * @return The http client
 	 */
 	public synchronized HttpClient getHttpClient() {
@@ -258,7 +261,7 @@ public synchronized String getResponseMessage() {
 
 	/**
 	 * Enables/Disables the use of http 1.1
-	 * 
+	 *
 	 * @param pUse11
 	 *            If true http 1.1 is enabled.
 	 */
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageReader.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageReader.java
index 170e606..1134f6c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageReader.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageReader.java
@@ -51,7 +51,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.BoundedInputStream;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.ChunkedInputStream;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.PersistentInputStream;
@@ -59,10 +58,9 @@
 
 /**
  * Class MessageReader is responsible for reading http messages
- * 
+ *
  */
 public class MessageReader {
-
 	HttpHeader iHeader;
 
 	HttpServerMethod iMethod;
@@ -75,7 +73,7 @@ public class MessageReader {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The input stream
 	 * @param pTimeout
@@ -97,8 +95,7 @@ public MessageReader(InputStream pStream, int pTimeout) throws IOException, Http
 			try {
 				contentLength = Integer.parseInt(length);
 			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINER,
-						"Exception while parsing http content-length", e);
+				LogAndTraceBroker.getBroker().trace(Level.FINER, "Exception while parsing http content-length", e);
 			}
 		}
 		String contentType = this.iHeader.getField("Content-Type");
@@ -109,16 +106,14 @@ public MessageReader(InputStream pStream, int pTimeout) throws IOException, Http
 			} catch (Exception e) {
 				encoding = "UTF-8"; // TODO is this the default character
 				// encoding?
-				LogAndTraceBroker.getBroker().trace(Level.FINER,
-						"Exception while parsing http content-type", e);
+				LogAndTraceBroker.getBroker().trace(Level.FINER, "Exception while parsing http content-type", e);
 			}
 			this.iEncoding = encoding;
 		}
 
 		this.iContent = new PersistentInputStream(pStream, isPersistentConnectionSupported());
 		if (this.iChunked) {
-			this.iContent = new ChunkedInputStream(this.iContent, this.iHeader.getField("Trailer"),
-					"Indication Request");
+			this.iContent = new ChunkedInputStream(this.iContent, this.iHeader.getField("Trailer"), "Indication Request");
 		} else if (contentLength >= 0) {
 			this.iContent = new BoundedInputStream(this.iContent, contentLength);
 		}
@@ -126,7 +121,7 @@ public MessageReader(InputStream pStream, int pTimeout) throws IOException, Http
 
 	/**
 	 * Returns the character encoding
-	 * 
+	 *
 	 * @return The character encoding
 	 */
 	public String getCharacterEncoding() {
@@ -135,7 +130,7 @@ public String getCharacterEncoding() {
 
 	/**
 	 * Returns the http header
-	 * 
+	 *
 	 * @return The http header
 	 */
 	public HttpHeader getHeader() {
@@ -144,7 +139,7 @@ public HttpHeader getHeader() {
 
 	/**
 	 * Returns the http server method
-	 * 
+	 *
 	 * @return The http server method
 	 */
 	public HttpServerMethod getMethod() {
@@ -153,7 +148,7 @@ public HttpServerMethod getMethod() {
 
 	/**
 	 * Returns the input stream
-	 * 
+	 *
 	 * @return The input stream
 	 */
 	public InputStream getInputStream() {
@@ -162,7 +157,7 @@ public InputStream getInputStream() {
 
 	/**
 	 * Returns the persistent connection support state
-	 * 
+	 *
 	 * @return true if persistent connection is supported
 	 */
 	public boolean isPersistentConnectionSupported() {
@@ -177,21 +172,23 @@ public boolean isPersistentConnectionSupported() {
 
 	/**
 	 * Returns the chunking support state
-	 * 
+	 *
 	 * @return true if chunking is supported
 	 */
 	public boolean isChunkSupported() {
 		// TODO: make sure this is the correct way to test for chunk support
 		if ((this.iMethod.getMajorVersion() >= 1) && (this.iMethod.getMinorVersion() >= 1)) {
 			String TE;
-			if ((TE = this.iHeader.getField("TE")) != null && (TE.equalsIgnoreCase("trailers"))) { return true; }
+			if ((TE = this.iHeader.getField("TE")) != null && (TE.equalsIgnoreCase("trailers"))) {
+				return true;
+			}
 		}
 		return false;
 	}
 
 	/**
 	 * Closes the stream
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	public void close() throws IOException {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageWriter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageWriter.java
index f9c344a..08fb514 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageWriter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/MessageWriter.java
@@ -51,7 +51,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.ASCIIPrintStream;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.ChunkedOutputStream;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.PersistentOutputStream;
@@ -59,10 +58,9 @@
 
 /**
  * Class MessageWriter is responsible for creating http messages
- * 
+ *
  */
 public class MessageWriter {
-
 	HttpHeader iHeader = null;
 
 	HttpServerMethod iMethod = null;
@@ -81,7 +79,7 @@ public class MessageWriter {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 * @param pPersistent
 	 * @param pChunked
@@ -92,15 +90,14 @@ public MessageWriter(OutputStream pStream, boolean pPersistent, boolean pChunked
 		this.iPersistent = pPersistent;
 		this.iBufferedOS = new ByteArrayOutputStream();
 		if (pChunked) {
-			this.iClientOS = new ASCIIPrintStream(new ChunkedOutputStream(
-					new PersistentOutputStream(this.iBufferedOS, pPersistent), 512));
+			this.iClientOS =
+				new ASCIIPrintStream(new ChunkedOutputStream(new PersistentOutputStream(this.iBufferedOS, pPersistent), 512));
 		} else {
-			this.iClientOS = new ASCIIPrintStream(new PersistentOutputStream(this.iBufferedOS,
-					pPersistent));
+			this.iClientOS = new ASCIIPrintStream(new PersistentOutputStream(this.iBufferedOS, pPersistent));
 		}
 		this.iHeader = new HttpHeader();
-		this.iMethod = new HttpServerMethod(HttpConnectionHandler.MAJOR_VERSION,
-				HttpConnectionHandler.MINOR_VERSION, 200, "OK");
+		this.iMethod =
+			new HttpServerMethod(HttpConnectionHandler.MAJOR_VERSION, HttpConnectionHandler.MINOR_VERSION, 200, "OK");
 	}
 
 	/**
@@ -112,7 +109,7 @@ public void reset() {
 
 	/**
 	 * Sets the http header
-	 * 
+	 *
 	 * @param header
 	 *            The new value
 	 */
@@ -122,7 +119,7 @@ public void setHeader(HttpHeader header) {
 
 	/**
 	 * Sets the http server method
-	 * 
+	 *
 	 * @param method
 	 *            The new value
 	 */
@@ -132,7 +129,7 @@ public void setMethod(HttpServerMethod method) {
 
 	/**
 	 * Returns the http header
-	 * 
+	 *
 	 * @return The http header
 	 */
 	public HttpHeader getHeader() {
@@ -141,7 +138,7 @@ public HttpHeader getHeader() {
 
 	/**
 	 * Returns the http server method
-	 * 
+	 *
 	 * @return The http server method
 	 */
 	public HttpServerMethod getMethod() {
@@ -150,7 +147,7 @@ public HttpServerMethod getMethod() {
 
 	/**
 	 * Returns the output stream
-	 * 
+	 *
 	 * @return The output stream
 	 */
 	public ASCIIPrintStream getOutputStream() {
@@ -159,29 +156,32 @@ public ASCIIPrintStream getOutputStream() {
 
 	/**
 	 * Write the message and flushes the streams
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	public void close() throws IOException {
 		this.iMethod.write(this.iRealOS);
 		this.iRealOS.flush();
-		if (!this.iChunked) this.iHeader.removeField("Transfer-Encoding");
-		else this.iHeader.addField("Transfer-Encoding", "chunked");
-		if (this.iPersistent) this.iHeader.addField("Connection", "Keep-iAlive");
-		else this.iHeader.addField("Connection", "close");
+		if (!this.iChunked) this.iHeader.removeField("Transfer-Encoding"); else this.iHeader.addField(
+				"Transfer-Encoding",
+				"chunked"
+			);
+		if (this.iPersistent) this.iHeader.addField("Connection", "Keep-iAlive"); else this.iHeader.addField(
+				"Connection",
+				"close"
+			);
 
 		this.iHeader.addField("Content-Type", "application/xml;charset=\"utf-8\"");
-		if (!this.iChunked) this.iHeader.addField("Content-length", Integer
-				.toString(this.iBufferedOS.size()));
-		LogAndTraceBroker.getBroker().trace(Level.FINER,
-				"Indication Response HTTP Headers= " + this.iHeader.toString());
+		if (!this.iChunked) this.iHeader.addField("Content-length", Integer.toString(this.iBufferedOS.size()));
+		LogAndTraceBroker.getBroker().trace(Level.FINER, "Indication Response HTTP Headers= " + this.iHeader.toString());
 		this.iHeader.write(this.iRealOS);
 		this.iRealOS.flush();
 		if (this.iChunked) this.iClientOS.close();
 		this.iBufferedOS.writeTo(this.iRealOS);
 		if (this.iChunked && (this.iTrailer != null)) {
-			LogAndTraceBroker.getBroker().trace(Level.FINER,
-					"Indication Response HTTP Trailer Headers= " + this.iTrailer.toString());
+			LogAndTraceBroker
+				.getBroker()
+				.trace(Level.FINER, "Indication Response HTTP Trailer Headers= " + this.iTrailer.toString());
 			this.iTrailer.write(this.iRealOS);
 		}
 		this.iRealOS.flush();
@@ -189,7 +189,7 @@ public void close() throws IOException {
 
 	/**
 	 * Sets the trailer
-	 * 
+	 *
 	 * @param pTrailer
 	 *            The new value
 	 */
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java
index 408539a..4fb7662 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/PegasusLocalAuthInfo.java
@@ -52,7 +52,6 @@
 import java.io.InputStreamReader;
 import java.net.URI;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.Messages;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
@@ -61,7 +60,6 @@
  * Implements OpenPegasus local authentication
  */
 public class PegasusLocalAuthInfo extends AuthorizationInfo {
-
 	private boolean iChallenged = false;
 
 	/**
@@ -73,7 +71,7 @@ public PegasusLocalAuthInfo() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.sblim.cimclient.internal.http.AuthorizationInfo#updateAuthenticationInfo
 	 * (org.sblim.cimclient.internal.http.Challenge, java.net.URI,
@@ -86,40 +84,36 @@ public PegasusLocalAuthInfo() {
 	 * @param requestMethod
 	 */
 	@Override
-	public void updateAuthenticationInfo(Challenge challenge, String authenticate, URI url,
-			String requestMethod) {
+	public void updateAuthenticationInfo(Challenge challenge, String authenticate, URI url, String requestMethod) {
 		this.iChallenged = true;
 		this.iResponse = authenticate;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
 	public String toString() {
-
 		if (this.iChallenged && this.iResponse != null && this.iResponse.startsWith("Local ")) {
-
 			String fileName = "";
 			BufferedReader in = null;
 
 			try {
-
 				fileName = this.iResponse.substring(7, this.iResponse.length() - 1);
 
-				if (fileName.length() == 0) throw new IOException(
-						"No local authorization file specified");
+				if (fileName.length() == 0) throw new IOException("No local authorization file specified");
 
 				File authorizationFile = new File(fileName);
 
-				if (!authorizationFile.canRead()) throw new IOException(
-						"Local authorization file not accessible");
+				if (!authorizationFile.canRead()) throw new IOException("Local authorization file not accessible");
 
-				in = WBEMConstants.Z_OS.equals(System.getProperty(WBEMConstants.OS_NAME)) ? new BufferedReader(
-						new InputStreamReader(new FileInputStream(authorizationFile),
-								WBEMConstants.ISO_8859_1))
+				in =
+					WBEMConstants.Z_OS.equals(System.getProperty(WBEMConstants.OS_NAME))
+						? new BufferedReader(
+							new InputStreamReader(new FileInputStream(authorizationFile), WBEMConstants.ISO_8859_1)
+						)
 						: new BufferedReader(new FileReader(authorizationFile));
 
 				StringBuffer buffer = new StringBuffer();
@@ -141,19 +135,18 @@ public String toString() {
 				header.append('"');
 
 				return header.toString();
-
 			} catch (IOException e) {
 				LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
-				logger.trace(Level.FINER,
-						"Exception while reading OpenPegasus local authorization file", e);
+				logger.trace(Level.FINER, "Exception while reading OpenPegasus local authorization file", e);
 				logger.message(Messages.HTTP_PEGASUS_LOCAL_AUTH_READ, fileName);
 			} finally {
 				if (in != null) {
 					try {
 						in.close();
 					} catch (IOException e) {
-						LogAndTraceBroker.getBroker().trace(Level.FINER,
-								"Exception while closing OpenPegasus local authorization file", e);
+						LogAndTraceBroker
+							.getBroker()
+							.trace(Level.FINER, "Exception while closing OpenPegasus local authorization file", e);
 					}
 				}
 			}
@@ -176,5 +169,4 @@ public boolean isSentOnFirstRequest() {
 	public boolean isKeptAlive() {
 		return true;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java
index b9dd392..30d50b1 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/WwwAuthInfo.java
@@ -66,7 +66,7 @@ public WwwAuthInfo() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
@@ -76,21 +76,31 @@ public String toString() {
 		String _nc = Long.toHexString(this.iNc);
 
 		if (this.iScheme.equalsIgnoreCase("Digest")) {
-
 			if (this.iRealm == null) { // support for some ICAT CIMOMs buggy
 				// Digest authentication
 				try {
 					MessageDigest messageDigest = null;
 					messageDigest = MessageDigest.getInstance("MD5");
 
-					messageDigest.update(getBytes((this.iCredentials != null && this.iCredentials
-							.getUserName() != null) ? String.valueOf(this.iCredentials
-							.getPassword()) : "null", "UTF-8"));
+					messageDigest.update(
+						getBytes(
+							(this.iCredentials != null && this.iCredentials.getUserName() != null)
+								? String.valueOf(this.iCredentials.getPassword())
+								: "null",
+							"UTF-8"
+						)
+					);
 					String pass = HttpClient.convertToHexString(messageDigest.digest());
-					return "Digest username="
-							+ ((this.iCredentials != null && this.iCredentials.getUserName() != null) ? this.iCredentials
-									.getUserName()
-									: "null") + ", response=" + pass;
+					return (
+						"Digest username=" +
+						(
+							(this.iCredentials != null && this.iCredentials.getUserName() != null)
+								? this.iCredentials.getUserName()
+								: "null"
+						) +
+						", response=" +
+						pass
+					);
 				} catch (NoSuchAlgorithmException e) {
 					// TODO log
 					e.printStackTrace();
@@ -99,10 +109,11 @@ public String toString() {
 
 			result.append(this.iScheme);
 			result.append(" username=\"");
-			result
-					.append((this.iCredentials != null && this.iCredentials.getUserName() != null) ? this.iCredentials
-							.getUserName()
-							: "null");
+			result.append(
+				(this.iCredentials != null && this.iCredentials.getUserName() != null)
+					? this.iCredentials.getUserName()
+					: "null"
+			);
 			result.append("\"");
 			if (this.iRealm != null) {
 				result.append(", realm=\"");
@@ -143,19 +154,20 @@ public String toString() {
 				result.append(_nc);
 			}
 		} else if (this.iScheme.equalsIgnoreCase("Basic")) {
-
 			result.append("Basic ");
 
 			StringBuffer tmp = new StringBuffer();
-			tmp
-					.append((this.iCredentials != null && this.iCredentials.getUserName() != null) ? this.iCredentials
-							.getUserName()
-							: "null");
+			tmp.append(
+				(this.iCredentials != null && this.iCredentials.getUserName() != null)
+					? this.iCredentials.getUserName()
+					: "null"
+			);
 			tmp.append(':');
-			tmp
-					.append((this.iCredentials != null && this.iCredentials.getPassword() != null) ? String
-							.valueOf(this.iCredentials.getPassword())
-							: "null");
+			tmp.append(
+				(this.iCredentials != null && this.iCredentials.getPassword() != null)
+					? String.valueOf(this.iCredentials.getPassword())
+					: "null"
+			);
 
 			result.append(BASE64Encoder.encode(getBytes(tmp.toString(), "UTF-8")));
 		}
@@ -164,7 +176,7 @@ public String toString() {
 
 	/**
 	 * Splits a comma-separated string into multiple substrings
-	 * 
+	 *
 	 * @param pLine
 	 *            The comma-separated string
 	 * @return The array of substrings (excluding commas)
@@ -195,7 +207,7 @@ private static byte[] getBytes(String str, String encoding) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.sblim.cimclient.internal.http.AuthorizationInfo#updateAuthenticationInfo
 	 * (org.sblim.cimclient.internal.http.Challenge, java.net.URI,
@@ -205,15 +217,16 @@ private static byte[] getBytes(String str, String encoding) {
 	 * @param authenticate
 	 */
 	@Override
-	public void updateAuthenticationInfo(Challenge challenge, String authenticate, URI url,
-			String requestMethod) throws NoSuchAlgorithmException {
-
+	public void updateAuthenticationInfo(Challenge challenge, String authenticate, URI url, String requestMethod)
+		throws NoSuchAlgorithmException {
 		setURI(url.getPath());
 		HttpHeader params = challenge.getParams();
 
 		this.iScheme = challenge.getScheme();
 
-		if (!this.iScheme.equalsIgnoreCase("Digest")) { return; }
+		if (!this.iScheme.equalsIgnoreCase("Digest")) {
+			return;
+		}
 
 		this.iRealm = params.getField("realm");
 
@@ -282,14 +295,12 @@ public void updateAuthenticationInfo(Challenge challenge, String authenticate, U
 
 		messageDigest.reset();
 		PasswordAuthentication credentials1 = getCredentials();
-		this.iA1 = credentials1.getUserName() + ":" + getRealm() + ":"
-				+ String.valueOf(credentials1.getPassword());
+		this.iA1 = credentials1.getUserName() + ":" + getRealm() + ":" + String.valueOf(credentials1.getPassword());
 		// System.out.println("Base:"+A1);
 		messageDigest.update(getBytes(this.iA1, "UTF-8"));
 
 		if ("md5-sess".equalsIgnoreCase(algorithm)) {
 			messageDigest.update(getBytes((":" + getNonce() + ":" + getCnonce()), "UTF-8"));
-
 		}
 
 		byte[] digest1 = messageDigest.digest();
@@ -320,18 +331,33 @@ public void updateAuthenticationInfo(Challenge challenge, String authenticate, U
 			messageDigest.update(getBytes((sessionKey + ":" + nonce + ":" + A2), "UTF-8"));
 		} else {
 			String _nc = Long.toHexString(challengeNc);
-			messageDigest.update(getBytes((sessionKey + ":" + nonce + ":"
-					+ "00000000".substring(_nc.length()) + _nc + ":" + getCnonce() + ":" + qop
-					+ ":" + A2), "UTF-8"));
+			messageDigest.update(
+				getBytes(
+					(
+						sessionKey +
+						":" +
+						nonce +
+						":" +
+						"00000000".substring(_nc.length()) +
+						_nc +
+						":" +
+						getCnonce() +
+						":" +
+						qop +
+						":" +
+						A2
+					),
+					"UTF-8"
+				)
+			);
 		}
 		this.iResponse = HttpClient.convertToHexString(messageDigest.digest());
-
 		// TODO handle digest-required header
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.sblim.cimclient.internal.http.AuthorizationInfo#getHeaderFieldName()
 	 */
@@ -342,7 +368,7 @@ public String getHeaderFieldName() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.sblim.cimclient.internal.http.AuthorizationInfo#isSentOnFirstRequest
 	 * ()
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java
index b384ecd..6b4c495 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ASCIIPrintStream.java
@@ -53,10 +53,9 @@
 
 /**
  * Class ASCIIPrintStream implement a stream with ASCII charset
- * 
+ *
  */
 public class ASCIIPrintStream extends FilterOutputStream {
-
 	private boolean iAutoFlush = false;
 
 	private Exception iTrouble = null;
@@ -71,7 +70,7 @@ private ASCIIPrintStream(boolean autoFlush, OutputStream pOut) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The underlying stream
 	 */
@@ -82,7 +81,7 @@ public ASCIIPrintStream(OutputStream pStream) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The underlying stream
 	 * @param pAutoFlush
@@ -96,7 +95,7 @@ public ASCIIPrintStream(OutputStream pStream, boolean pAutoFlush) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The underlying stream
 	 * @param pAutoFlush
@@ -118,15 +117,14 @@ private void write(String str) {
 		char charArray[] = new char[stringLength];
 		byte asciiArray[] = new byte[stringLength];
 		str.getChars(0, stringLength, charArray, 0);
-		for (int i = 0; i < stringLength; i++)
-			asciiArray[i] = charArray[i] >= '\u0100' ? 63 : (byte) charArray[i];
+		for (int i = 0; i < stringLength; i++) asciiArray[i] = charArray[i] >= '\u0100' ? 63 : (byte) charArray[i];
 
 		write(asciiArray, 0, stringLength);
 	}
 
 	/**
 	 * Prints a boolean value
-	 * 
+	 *
 	 * @param pValue
 	 *            The value
 	 */
@@ -136,7 +134,7 @@ public void print(boolean pValue) {
 
 	/**
 	 * Prints a single character
-	 * 
+	 *
 	 * @param c
 	 *            The character
 	 */
@@ -146,7 +144,7 @@ public void print(char c) {
 
 	/**
 	 * Prints an integer value
-	 * 
+	 *
 	 * @param i
 	 *            The value
 	 */
@@ -156,7 +154,7 @@ public void print(int i) {
 
 	/**
 	 * Prints a long value
-	 * 
+	 *
 	 * @param l
 	 *            The value
 	 */
@@ -166,7 +164,7 @@ public void print(long l) {
 
 	/**
 	 * Prints a float value
-	 * 
+	 *
 	 * @param f
 	 *            The value
 	 */
@@ -176,7 +174,7 @@ public void print(float f) {
 
 	/**
 	 * Prints a double value
-	 * 
+	 *
 	 * @param d
 	 *            The value
 	 */
@@ -186,7 +184,7 @@ public void print(double d) {
 
 	/**
 	 * Prints a character array
-	 * 
+	 *
 	 * @param pArray
 	 *            The array
 	 */
@@ -196,7 +194,7 @@ public void print(char pArray[]) {
 
 	/**
 	 * Prints a string
-	 * 
+	 *
 	 * @param s
 	 *            The string
 	 */
@@ -206,7 +204,7 @@ public void print(String s) {
 
 	/**
 	 * Prints an object
-	 * 
+	 *
 	 * @param pObj
 	 *            The object
 	 */
@@ -223,7 +221,7 @@ public void println() {
 
 	/**
 	 * println
-	 * 
+	 *
 	 * @param flag
 	 */
 	public void println(boolean flag) {
@@ -235,7 +233,7 @@ public void println(boolean flag) {
 
 	/**
 	 * println
-	 * 
+	 *
 	 * @param c
 	 */
 	public void println(char c) {
@@ -247,7 +245,7 @@ public void println(char c) {
 
 	/**
 	 * println
-	 * 
+	 *
 	 * @param i
 	 */
 	public void println(int i) {
@@ -259,7 +257,7 @@ public void println(int i) {
 
 	/**
 	 * println
-	 * 
+	 *
 	 * @param l
 	 */
 	public void println(long l) {
@@ -271,7 +269,7 @@ public void println(long l) {
 
 	/**
 	 * println
-	 * 
+	 *
 	 * @param f
 	 */
 	public void println(float f) {
@@ -283,7 +281,7 @@ public void println(float f) {
 
 	/**
 	 * println
-	 * 
+	 *
 	 * @param d
 	 */
 	public void println(double d) {
@@ -295,7 +293,7 @@ public void println(double d) {
 
 	/**
 	 * println
-	 * 
+	 *
 	 * @param ac
 	 */
 	public void println(char ac[]) {
@@ -307,7 +305,7 @@ public void println(char ac[]) {
 
 	/**
 	 * println
-	 * 
+	 *
 	 * @param s
 	 */
 	public void println(String s) {
@@ -319,7 +317,7 @@ public void println(String s) {
 
 	/**
 	 * println
-	 * 
+	 *
 	 * @param obj
 	 */
 	public void println(Object obj) {
@@ -376,12 +374,12 @@ public void write(int b) {
 	}
 
 	protected void setError() {
-	// trouble = x;
+		// trouble = x;
 	}
 
 	/**
 	 * Returns the last exception caught
-	 * 
+	 *
 	 * @return The exception
 	 */
 	public Exception checkError() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java
index e066d22..b6c2615 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/BoundedInputStream.java
@@ -47,17 +47,16 @@
 /**
  * Class BoundedInputStream implements an input stream with a maximum byte
  * count.
- * 
+ *
  */
 public class BoundedInputStream extends FilterInputStream {
-
 	private long maxLen, used;
 
 	private boolean closed = false;
 
 	/**
 	 * Ctor. Creates the stream with unlimited length.
-	 * 
+	 *
 	 * @param pStream
 	 *            The stream this one is build upon
 	 */
@@ -67,7 +66,7 @@ public BoundedInputStream(InputStream pStream) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The stream this one is build upon
 	 * @param pMaximumLength
@@ -131,7 +130,9 @@ public long skip(long len) throws IOException {
 
 	@Override
 	public int available() throws IOException {
-		if (this.maxLen > -1) { return (int) (this.maxLen - this.used); }
+		if (this.maxLen > -1) {
+			return (int) (this.maxLen - this.used);
+		}
 		return this.in.available();
 	}
 
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java
index 87b36c4..942b1fb 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedInputStream.java
@@ -54,17 +54,15 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader;
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpMethod;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 
 /**
  * Class ChunkedInputStream implements an input stream for chunked messages
- * 
+ *
  */
 public class ChunkedInputStream extends InputStream {
-
 	private InputStream iIn;
 
 	private String iTrailerFields;
@@ -83,7 +81,7 @@ public class ChunkedInputStream extends InputStream {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The stream to create this one upon
 	 * @param pTrailerFields
@@ -95,7 +93,7 @@ public ChunkedInputStream(InputStream pStream, String pTrailerFields) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The stream to create this one upon
 	 * @param pTrailerFields
@@ -136,25 +134,26 @@ public synchronized int read(byte[] buf, int off, int len) throws IOException {
 			try {
 				this.iChunkSize = Long.parseLong(line, 16);
 			} catch (Exception e) {
-				LogAndTraceBroker.getBroker().trace(Level.FINER,
-						"Invalid chunk size on HTTP stream", e);
+				LogAndTraceBroker.getBroker().trace(Level.FINER, "Invalid chunk size on HTTP stream", e);
 				this.iEof = true;
 				throw new IOException("Invalid chunk size");
 			}
 		}
 		if (this.iChunkSize > 0) {
-			total = this.iIn.read(buf, off, (this.iChunkSize < len) ? (int) this.iChunkSize
-					: (int) len);
+			total = this.iIn.read(buf, off, (this.iChunkSize < len) ? (int) this.iChunkSize : (int) len);
 			if (total > 0) {
 				this.iChunkSize -= total;
 			}
 			if (total == -1) {
-				LogAndTraceBroker.getBroker().trace(
+				LogAndTraceBroker
+					.getBroker()
+					.trace(
 						Level.FINE,
-						"Unexpected EOF trying to read "
-								+ (this.iChunkSize < len ? this.iChunkSize : len)
-								+ " bytes from HTTP chunk with remaining length of "
-								+ this.iChunkSize);
+						"Unexpected EOF trying to read " +
+						(this.iChunkSize < len ? this.iChunkSize : len) +
+						" bytes from HTTP chunk with remaining length of " +
+						this.iChunkSize
+					);
 				throw new EOFException("Unexpected EOF reading chunk");
 			}
 		} else {
@@ -166,10 +165,9 @@ public synchronized int read(byte[] buf, int off, int len) throws IOException {
 					// ebak: http trailers
 					this.iTrailers.examineTrailer(this.iOrigin);
 				} catch (IOException e) {
-					LogAndTraceBroker.getBroker().trace(
-							Level.FINE,
-							"Unexpected EOF reading trailer, expected fields were "
-									+ this.iTrailerFields);
+					LogAndTraceBroker
+						.getBroker()
+						.trace(Level.FINE, "Unexpected EOF reading trailer, expected fields were " + this.iTrailerFields);
 					throw new EOFException("Unexpected EOF reading trailer");
 				}
 			}
@@ -179,7 +177,7 @@ public synchronized int read(byte[] buf, int off, int len) throws IOException {
 
 	/**
 	 * Return the http header trailers
-	 * 
+	 *
 	 * @return The trailers
 	 */
 	public synchronized HttpHeader getTrailers() {
@@ -194,7 +192,7 @@ public synchronized long skip(long total) throws IOException {
 
 	/**
 	 * @return int
-	 * 
+	 *
 	 */
 	@Override
 	public synchronized int available() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java
index 76fba9c..e30138a 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/ChunkedOutputStream.java
@@ -50,10 +50,9 @@
 
 /**
  * Class ChunkedOutputStream implements an output stream for chunked messages
- * 
+ *
  */
 public class ChunkedOutputStream extends OutputStream {
-
 	DataOutputStream iOs;
 
 	byte[] iBuffer;
@@ -62,7 +61,7 @@ public class ChunkedOutputStream extends OutputStream {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The stream to create this one upon
 	 * @param pBufferLength
@@ -100,8 +99,7 @@ public void flush() throws IOException {
 	public void write(byte source[], int offset, int len) throws IOException {
 		int copied = 0;
 		while (len > 0) {
-			int total = (this.iBuffer.length - this.iUsed < len) ? (this.iBuffer.length - this.iUsed)
-					: len;
+			int total = (this.iBuffer.length - this.iUsed < len) ? (this.iBuffer.length - this.iUsed) : len;
 			if (total > 0) {
 				System.arraycopy(source, copied, this.iBuffer, this.iUsed, total);
 				len -= total;
@@ -117,5 +115,4 @@ public void write(int i) throws IOException {
 		if (this.iBuffer.length == this.iUsed) flush();
 		this.iBuffer[this.iUsed++] = (byte) (0xFF & i);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java
index bbc3dec..2578038 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/DebugInputStream.java
@@ -51,16 +51,14 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.TimeStamp;
 
 /**
  * Class DebugInputStream is for debugging purposes
- * 
+ *
  */
 public class DebugInputStream extends FilterInputStream {
-
 	private byte[] iBuf;
 
 	private boolean iBuffered;
@@ -75,7 +73,7 @@ public class DebugInputStream extends FilterInputStream {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param is
 	 * @param os
 	 */
@@ -85,7 +83,7 @@ public DebugInputStream(InputStream is, OutputStream os) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param is
 	 * @param os
 	 * @param pOrigin
@@ -131,7 +129,8 @@ private void writeBuffer(String header) throws IOException {
 		outStr.append(" end ----->\n");
 		if (this.iStream != null) this.iStream.write(outStr.toString().getBytes());
 		if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) LogAndTraceBroker
-				.getBroker().traceCIMXML(Level.FINEST, outStr.toString(), false);
+			.getBroker()
+			.traceCIMXML(Level.FINEST, outStr.toString(), false);
 	}
 
 	@Override
@@ -146,13 +145,16 @@ public synchronized int read() throws IOException {
 	public synchronized int read(byte b[], int off, int len) throws IOException {
 		if (b == null) {
 			throw new NullPointerException();
-		} else if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length)
-				|| ((off + len) < 0)) {
+		} else if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0)) {
 			throw new IndexOutOfBoundsException();
-		} else if (len == 0) { return 0; }
+		} else if (len == 0) {
+			return 0;
+		}
 
 		int c = read();
-		if (c == -1) { return -1; }
+		if (c == -1) {
+			return -1;
+		}
 		b[off] = (byte) c;
 
 		int i = 1;
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java
index ff7ff91..1da5a52 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/KeepAliveInputStream.java
@@ -45,21 +45,19 @@
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpClient;
 
 /**
  * Class KeepAliveInputStream implements an input stream for connections that
  * keep iAlive after a request is completed
- * 
+ *
  */
 public class KeepAliveInputStream extends FilterInputStream {
-
 	private HttpClient iClient;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The underlying stream
 	 * @param pClient
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java
index ebff1d6..01dbdca 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentInputStream.java
@@ -49,17 +49,16 @@
 /**
  * Class PersistentInputStream implements an input stream for which close() can
  * be disabled.
- * 
+ *
  */
 public class PersistentInputStream extends FilterInputStream {
-
 	boolean iClosable = false;
 
 	boolean iClosed = false;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The underlying stream
 	 */
@@ -69,7 +68,7 @@ public PersistentInputStream(InputStream pStream) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The underlying stream
 	 * @param pClosable
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java
index 16fe80b..1c9450f 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/PersistentOutputStream.java
@@ -51,14 +51,13 @@
  * can be disabled.
  */
 public class PersistentOutputStream extends FilterOutputStream {
-
 	boolean iClosable = false;
 
 	boolean iClosed = false;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The underlying stream
 	 */
@@ -68,7 +67,7 @@ public PersistentOutputStream(OutputStream pStream) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            The underlying stream
 	 * @param pClosable
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/TrailerException.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/TrailerException.java
index 8c606f3..b01ce75 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/TrailerException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/http/io/TrailerException.java
@@ -49,30 +49,35 @@
  * Pegasus CIMOM.
  */
 public class TrailerException extends RuntimeException {
-
 	private static final long serialVersionUID = 4355341648542585509L;
 
 	private WBEMException iWBEMException;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pException
 	 *            The contained WBEMException
 	 */
 	public TrailerException(WBEMException pException) {
-		super(WBEMConstants.HTTP_TRAILER_STATUS_CODE + ":" + pException.getID() + " "
-				+ WBEMConstants.HTTP_TRAILER_STATUS_DESCRIPTION + ":" + pException.getMessage());
+		super(
+			WBEMConstants.HTTP_TRAILER_STATUS_CODE +
+			":" +
+			pException.getID() +
+			" " +
+			WBEMConstants.HTTP_TRAILER_STATUS_DESCRIPTION +
+			":" +
+			pException.getMessage()
+		);
 		this.iWBEMException = pException;
 	}
 
 	/**
 	 * getWBEMException
-	 * 
+	 *
 	 * @return WBEMException
 	 */
 	public WBEMException getWBEMException() {
 		return this.iWBEMException;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java
index 470b218..96d8f03 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogAndTraceBroker.java
@@ -71,14 +71,13 @@
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
-
+import org.metricshub.wbem.sblim.cimclient.CIMXMLTraceListener;
 import org.metricshub.wbem.sblim.cimclient.LogAndTraceManager;
+import org.metricshub.wbem.sblim.cimclient.LogListener;
+import org.metricshub.wbem.sblim.cimclient.TraceListener;
 import org.metricshub.wbem.sblim.cimclient.WBEMConfigurationProperties;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
-import org.metricshub.wbem.sblim.cimclient.CIMXMLTraceListener;
-import org.metricshub.wbem.sblim.cimclient.LogListener;
-import org.metricshub.wbem.sblim.cimclient.TraceListener;
 
 /**
  * Class LogAndTraceBroker is the central class that implements the logging and
@@ -86,10 +85,9 @@
  * trace listeners. It sets up the application independent logging. It provides
  * the API to send log and trace messages and forwards them to the appropriate
  * listeners.
- * 
+ *
  */
 public class LogAndTraceBroker {
-
 	private static final String TRACE_LOGGER = "org.metricshub.wbem.sblim.cimclient.trace";
 
 	private static final String FILE_LOGGER = "org.metricshub.wbem.sblim.cimclient.file";
@@ -100,7 +98,7 @@ public class LogAndTraceBroker {
 
 	/**
 	 * Returns the singleton instance of the broker
-	 * 
+	 *
 	 * @return The broker instance
 	 */
 	public static LogAndTraceBroker getBroker() {
@@ -113,7 +111,7 @@ public static LogAndTraceBroker getBroker() {
 	 * logging is already up. The WBEMConfiguration is initialized
 	 * before the logging, so methods in this class cannot assume the logging to
 	 * be up and running.
-	 * 
+	 *
 	 * @return true if the logging is up, false
 	 *         otherwise
 	 */
@@ -179,8 +177,11 @@ private LogAndTraceBroker() {
 	@Override
 	protected void finalize() throws Throwable {
 		try {
-			if (this.iXmlTraceFile != null && (!this.iXmlTraceFile.equals(System.out))
-					&& (!this.iXmlTraceFile.equals(System.err))) this.iXmlTraceFile.close();
+			if (
+				this.iXmlTraceFile != null &&
+				(!this.iXmlTraceFile.equals(System.out)) &&
+				(!this.iXmlTraceFile.equals(System.err))
+			) this.iXmlTraceFile.close();
 		} catch (IOException e) {
 			// bad luck
 		} finally {
@@ -206,15 +207,15 @@ public void registerInternalListeners() {
 				logger.setUseParentHandlers(false);
 				this.iInternalLevelConsole = level.intValue();
 				if (this.iInternalListenerLogConsole != null) removeLogListener(this.iInternalListenerLogConsole);
-				this.iInternalListenerLogConsole = new LogListener() {
+				this.iInternalListenerLogConsole =
+					new LogListener() {
 
-					public void log(Level pLevel, String pMessageKey, String pMessage,
-							Object[] pParameters) {
-						LogRecord record = new LogRecord(pLevel, pMessageKey + " " + pMessage);
-						record.setParameters(pParameters);
-						logger.log(record);
-					}
-				};
+						public void log(Level pLevel, String pMessageKey, String pMessage, Object[] pParameters) {
+							LogRecord record = new LogRecord(pLevel, pMessageKey + " " + pMessage);
+							record.setParameters(pParameters);
+							logger.log(record);
+						}
+					};
 				addLogListener(this.iInternalListenerLogConsole);
 			}
 		} catch (Exception e) {
@@ -235,15 +236,15 @@ public void log(Level pLevel, String pMessageKey, String pMessage,
 				logger.setUseParentHandlers(false);
 				this.iInternalLevelLogFile = level.intValue();
 				if (this.iInternalListenerLogFile != null) removeLogListener(this.iInternalListenerLogFile);
-				this.iInternalListenerLogFile = new LogListener() {
+				this.iInternalListenerLogFile =
+					new LogListener() {
 
-					public void log(Level pLevel, String pMessageKey, String pMessage,
-							Object[] pParameters) {
-						LogRecord record = new LogRecord(pLevel, pMessageKey + " " + pMessage);
-						record.setParameters(pParameters);
-						logger.log(record);
-					}
-				};
+						public void log(Level pLevel, String pMessageKey, String pMessage, Object[] pParameters) {
+							LogRecord record = new LogRecord(pLevel, pMessageKey + " " + pMessage);
+							record.setParameters(pParameters);
+							logger.log(record);
+						}
+					};
 				addLogListener(this.iInternalListenerLogFile);
 			}
 		} catch (Exception e) {
@@ -262,22 +263,22 @@ public void log(Level pLevel, String pMessageKey, String pMessage,
 				logger.setUseParentHandlers(false);
 				this.iInternalLevelConsole = level.intValue();
 				if (this.iInternalListenerTraceConsole != null) removeTraceListener(this.iInternalListenerTraceConsole);
-				this.iInternalListenerTraceConsole = new TraceListener() {
+				this.iInternalListenerTraceConsole =
+					new TraceListener() {
 
-					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage) {
-						LogRecord record = new LogRecord(pLevel, pMessage);
-						record.setSourceMethodName(String.valueOf(pOrigin));
-						logger.log(record);
-					}
+						public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage) {
+							LogRecord record = new LogRecord(pLevel, pMessage);
+							record.setSourceMethodName(String.valueOf(pOrigin));
+							logger.log(record);
+						}
 
-					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage,
-							Throwable pThrown) {
-						LogRecord record = new LogRecord(pLevel, pMessage);
-						record.setSourceMethodName(String.valueOf(pOrigin));
-						record.setThrown(pThrown);
-						logger.log(record);
-					}
-				};
+						public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage, Throwable pThrown) {
+							LogRecord record = new LogRecord(pLevel, pMessage);
+							record.setSourceMethodName(String.valueOf(pOrigin));
+							record.setThrown(pThrown);
+							logger.log(record);
+						}
+					};
 				addTraceListener(this.iInternalListenerTraceConsole);
 			}
 		} catch (Exception e) {
@@ -298,22 +299,22 @@ public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage,
 				logger.setUseParentHandlers(false);
 				this.iInternalLevelTraceFile = level.intValue();
 				if (this.iInternalListenerTraceFile != null) removeTraceListener(this.iInternalListenerTraceFile);
-				this.iInternalListenerTraceFile = new TraceListener() {
+				this.iInternalListenerTraceFile =
+					new TraceListener() {
 
-					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage) {
-						LogRecord record = new LogRecord(pLevel, pMessage);
-						record.setSourceMethodName(String.valueOf(pOrigin));
-						logger.log(record);
-					}
+						public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage) {
+							LogRecord record = new LogRecord(pLevel, pMessage);
+							record.setSourceMethodName(String.valueOf(pOrigin));
+							logger.log(record);
+						}
 
-					public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage,
-							Throwable pThrown) {
-						LogRecord record = new LogRecord(pLevel, pMessage);
-						record.setSourceMethodName(String.valueOf(pOrigin));
-						record.setThrown(pThrown);
-						logger.log(record);
-					}
-				};
+						public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage, Throwable pThrown) {
+							LogRecord record = new LogRecord(pLevel, pMessage);
+							record.setSourceMethodName(String.valueOf(pOrigin));
+							record.setThrown(pThrown);
+							logger.log(record);
+						}
+					};
 				addTraceListener(this.iInternalListenerTraceFile);
 			}
 		} catch (Exception e) {
@@ -324,7 +325,7 @@ public void trace(Level pLevel, StackTraceElement pOrigin, String pMessage,
 	/**
 	 * Adds a listener for log messages. The listener will be notified of any
 	 * log event. Uses copy on write to ensure concurrent read access.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -335,10 +336,10 @@ public synchronized void addLogListener(LogListener pListener) {
 		newListeners.add(pListener);
 		this.iLogListeners = newListeners;
 
-		if ((this.iInternalListenerLogFile != null && this.iInternalListenerLogFile
-				.equals(pListener))
-				|| (this.iInternalListenerLogConsole != null && this.iInternalListenerLogConsole
-						.equals(pListener))) {
+		if (
+			(this.iInternalListenerLogFile != null && this.iInternalListenerLogFile.equals(pListener)) ||
+			(this.iInternalListenerLogConsole != null && this.iInternalListenerLogConsole.equals(pListener))
+		) {
 			this.iNumInternalLogListeners++;
 		} else {
 			this.iNumExternalLogListeners++;
@@ -370,72 +371,131 @@ private void loadVersionTxt() {
 	}
 
 	private void sendGreetings(LogListener pListener) {
-
-		pListener.log(MessageLoader.getLevel(Messages.GREETING), Messages.GREETING, MessageLoader
-				.getLocalizedMessage(Messages.GREETING), new Object[] { this.iProductName,
-				this.iCopyright });
-		pListener.log(MessageLoader.getLevel(Messages.RELEASE), Messages.RELEASE, MessageLoader
-				.getLocalizedMessage(Messages.RELEASE), new Object[] { this.iVersion,
-				this.iBuildDate, this.iBuildTime });
-		pListener.log(MessageLoader.getLevel(Messages.OS), Messages.OS, MessageLoader
-				.getLocalizedMessage(Messages.OS), new Object[] { System.getProperty("os.name"),
-				System.getProperty("os.version"), System.getProperty("os.arch") });
-		pListener.log(MessageLoader.getLevel(Messages.JRE), Messages.JRE, MessageLoader
-				.getLocalizedMessage(Messages.JRE), new Object[] {
-				System.getProperty("java.version"), System.getProperty("java.vendor") });
-		pListener.log(MessageLoader.getLevel(Messages.JVM), Messages.JVM, MessageLoader
-				.getLocalizedMessage(Messages.JVM), new Object[] {
-				System.getProperty("java.vm.name"), System.getProperty("java.vm.version"),
-				System.getProperty("java.vm.vendor") });
-		pListener.log(MessageLoader.getLevel(Messages.CONFIGURATION_URL),
-				Messages.CONFIGURATION_URL, MessageLoader
-						.getLocalizedMessage(Messages.CONFIGURATION_URL),
-				new Object[] { WBEMConfiguration.getActiveConfigFullURL() });
+		pListener.log(
+			MessageLoader.getLevel(Messages.GREETING),
+			Messages.GREETING,
+			MessageLoader.getLocalizedMessage(Messages.GREETING),
+			new Object[] { this.iProductName, this.iCopyright }
+		);
+		pListener.log(
+			MessageLoader.getLevel(Messages.RELEASE),
+			Messages.RELEASE,
+			MessageLoader.getLocalizedMessage(Messages.RELEASE),
+			new Object[] { this.iVersion, this.iBuildDate, this.iBuildTime }
+		);
+		pListener.log(
+			MessageLoader.getLevel(Messages.OS),
+			Messages.OS,
+			MessageLoader.getLocalizedMessage(Messages.OS),
+			new Object[] { System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch") }
+		);
+		pListener.log(
+			MessageLoader.getLevel(Messages.JRE),
+			Messages.JRE,
+			MessageLoader.getLocalizedMessage(Messages.JRE),
+			new Object[] { System.getProperty("java.version"), System.getProperty("java.vendor") }
+		);
+		pListener.log(
+			MessageLoader.getLevel(Messages.JVM),
+			Messages.JVM,
+			MessageLoader.getLocalizedMessage(Messages.JVM),
+			new Object[] {
+				System.getProperty("java.vm.name"),
+				System.getProperty("java.vm.version"),
+				System.getProperty("java.vm.vendor")
+			}
+		);
+		pListener.log(
+			MessageLoader.getLevel(Messages.CONFIGURATION_URL),
+			Messages.CONFIGURATION_URL,
+			MessageLoader.getLocalizedMessage(Messages.CONFIGURATION_URL),
+			new Object[] { WBEMConfiguration.getActiveConfigFullURL() }
+		);
 		if (!WBEMConfiguration.isConfigurationLoadSuccessful()) {
-			pListener.log(MessageLoader.getLevel(Messages.CONFIGURATION_LOAD_FAILED),
-					Messages.CONFIGURATION_LOAD_FAILED, MessageLoader
-							.getLocalizedMessage(Messages.CONFIGURATION_LOAD_FAILED),
-					(Object[]) null);
+			pListener.log(
+				MessageLoader.getLevel(Messages.CONFIGURATION_LOAD_FAILED),
+				Messages.CONFIGURATION_LOAD_FAILED,
+				MessageLoader.getLocalizedMessage(Messages.CONFIGURATION_LOAD_FAILED),
+				(Object[]) null
+			);
 			if (WBEMConfiguration.getConfigurationLoadException() != null) {
-				pListener.log(MessageLoader.getLevel(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
-						Messages.EXCEPTION_DURING_CONFIGURATION_LOAD, MessageLoader
-								.getLocalizedMessage(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
-						new Object[] { WBEMConfiguration.getConfigurationLoadException()
-								.getMessage() });
+				pListener.log(
+					MessageLoader.getLevel(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
+					Messages.EXCEPTION_DURING_CONFIGURATION_LOAD,
+					MessageLoader.getLocalizedMessage(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
+					new Object[] { WBEMConfiguration.getConfigurationLoadException().getMessage() }
+				);
 			}
 		}
 	}
 
 	private void sendGreetings(TraceListener pListener) {
 		StackTraceElement origin = new Throwable().getStackTrace()[0];
-		pListener.trace(MessageLoader.getLevel(Messages.GREETING), origin, MessageFormat.format(
-				MessageLoader.getMessage(Messages.GREETING), new Object[] { this.iProductName,
-						this.iCopyright }));
-		pListener.trace(MessageLoader.getLevel(Messages.RELEASE), origin, MessageFormat.format(
-				MessageLoader.getMessage(Messages.RELEASE), new Object[] { this.iVersion,
-						this.iBuildDate, this.iBuildTime }));
-		pListener.trace(MessageLoader.getLevel(Messages.OS), origin, MessageFormat.format(
-				MessageLoader.getMessage(Messages.OS), new Object[] {
-						System.getProperty("os.name"), System.getProperty("os.version"),
-						System.getProperty("os.arch") }));
-		pListener.trace(MessageLoader.getLevel(Messages.JRE), origin, MessageFormat.format(
-				MessageLoader.getMessage(Messages.JRE), new Object[] {
-						System.getProperty("java.version"), System.getProperty("java.vendor") }));
-		pListener.trace(MessageLoader.getLevel(Messages.JVM), origin, MessageFormat.format(
-				MessageLoader.getMessage(Messages.JVM), new Object[] {
-						System.getProperty("java.vm.name"), System.getProperty("java.vm.version"),
-						System.getProperty("java.vm.vendor") }));
-		pListener.trace(MessageLoader.getLevel(Messages.CONFIGURATION_URL), origin, MessageFormat
-				.format(MessageLoader.getMessage(Messages.CONFIGURATION_URL),
-						new Object[] { WBEMConfiguration.getActiveConfigURL() }));
+		pListener.trace(
+			MessageLoader.getLevel(Messages.GREETING),
+			origin,
+			MessageFormat.format(
+				MessageLoader.getMessage(Messages.GREETING),
+				new Object[] { this.iProductName, this.iCopyright }
+			)
+		);
+		pListener.trace(
+			MessageLoader.getLevel(Messages.RELEASE),
+			origin,
+			MessageFormat.format(
+				MessageLoader.getMessage(Messages.RELEASE),
+				new Object[] { this.iVersion, this.iBuildDate, this.iBuildTime }
+			)
+		);
+		pListener.trace(
+			MessageLoader.getLevel(Messages.OS),
+			origin,
+			MessageFormat.format(
+				MessageLoader.getMessage(Messages.OS),
+				new Object[] { System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch") }
+			)
+		);
+		pListener.trace(
+			MessageLoader.getLevel(Messages.JRE),
+			origin,
+			MessageFormat.format(
+				MessageLoader.getMessage(Messages.JRE),
+				new Object[] { System.getProperty("java.version"), System.getProperty("java.vendor") }
+			)
+		);
+		pListener.trace(
+			MessageLoader.getLevel(Messages.JVM),
+			origin,
+			MessageFormat.format(
+				MessageLoader.getMessage(Messages.JVM),
+				new Object[] {
+					System.getProperty("java.vm.name"),
+					System.getProperty("java.vm.version"),
+					System.getProperty("java.vm.vendor")
+				}
+			)
+		);
+		pListener.trace(
+			MessageLoader.getLevel(Messages.CONFIGURATION_URL),
+			origin,
+			MessageFormat.format(
+				MessageLoader.getMessage(Messages.CONFIGURATION_URL),
+				new Object[] { WBEMConfiguration.getActiveConfigURL() }
+			)
+		);
 		if (!WBEMConfiguration.isConfigurationLoadSuccessful()) {
-			pListener.trace(MessageLoader.getLevel(Messages.CONFIGURATION_LOAD_FAILED), origin,
-					MessageLoader.getMessage(Messages.CONFIGURATION_LOAD_FAILED));
+			pListener.trace(
+				MessageLoader.getLevel(Messages.CONFIGURATION_LOAD_FAILED),
+				origin,
+				MessageLoader.getMessage(Messages.CONFIGURATION_LOAD_FAILED)
+			);
 			if (WBEMConfiguration.getConfigurationLoadException() != null) {
-				pListener.trace(MessageLoader
-						.getLevel(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD), origin,
-						MessageLoader.getMessage(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
-						WBEMConfiguration.getConfigurationLoadException());
+				pListener.trace(
+					MessageLoader.getLevel(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
+					origin,
+					MessageLoader.getMessage(Messages.EXCEPTION_DURING_CONFIGURATION_LOAD),
+					WBEMConfiguration.getConfigurationLoadException()
+				);
 			}
 		}
 	}
@@ -443,7 +503,7 @@ private void sendGreetings(TraceListener pListener) {
 	/**
 	 * Remove a listener. This listener will not be notified of log events
 	 * anymore.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -452,13 +512,11 @@ public synchronized void removeLogListener(LogListener pListener) {
 		if (!newListeners.remove(pListener)) return;
 		this.iLogListeners = newListeners;
 
-		if (this.iInternalListenerLogFile != null
-				&& this.iInternalListenerLogFile.equals(pListener)) {
+		if (this.iInternalListenerLogFile != null && this.iInternalListenerLogFile.equals(pListener)) {
 			// Removing internal log listener for file
 			this.iInternalListenerLogFile = null;
 			this.iNumInternalLogListeners--;
-		} else if (this.iInternalListenerLogConsole != null
-				&& this.iInternalListenerLogConsole.equals(pListener)) {
+		} else if (this.iInternalListenerLogConsole != null && this.iInternalListenerLogConsole.equals(pListener)) {
 			// Removing internal log listener for console
 			this.iInternalListenerLogConsole = null;
 			this.iNumInternalLogListeners--;
@@ -486,7 +544,7 @@ public synchronized void clearLogListeners() {
 	/**
 	 * Gets the registered log listeners including the internal console and file
 	 * loggers.
-	 * 
+	 *
 	 * @return The list of listeners
 	 */
 	public List getLogListeners() {
@@ -496,7 +554,7 @@ public List getLogListeners() {
 	/**
 	 * Adds a listener for log messages. The listener will be notified of any
 	 * trace event.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -507,10 +565,10 @@ public synchronized void addTraceListener(TraceListener pListener) {
 		newListeners.add(pListener);
 		this.iTraceListeners = newListeners;
 
-		if ((this.iInternalListenerTraceFile != null && this.iInternalListenerTraceFile
-				.equals(pListener))
-				|| (this.iInternalListenerTraceConsole != null && this.iInternalListenerTraceConsole
-						.equals(pListener))) {
+		if (
+			(this.iInternalListenerTraceFile != null && this.iInternalListenerTraceFile.equals(pListener)) ||
+			(this.iInternalListenerTraceConsole != null && this.iInternalListenerTraceConsole.equals(pListener))
+		) {
 			this.iNumInternalTraceListeners++;
 		} else {
 			this.iNumExternalTraceListeners++;
@@ -520,7 +578,7 @@ public synchronized void addTraceListener(TraceListener pListener) {
 	/**
 	 * Removes a listener. This listener will not be notified of trace events
 	 * anymore.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
@@ -529,13 +587,11 @@ public synchronized void removeTraceListener(TraceListener pListener) {
 		if (!newListeners.remove(pListener)) return;
 		this.iTraceListeners = newListeners;
 
-		if (this.iInternalListenerTraceFile != null
-				&& this.iInternalListenerTraceFile.equals(pListener)) {
+		if (this.iInternalListenerTraceFile != null && this.iInternalListenerTraceFile.equals(pListener)) {
 			// Removing internal tracelistener for file
 			this.iInternalListenerTraceFile = null;
 			this.iNumInternalTraceListeners--;
-		} else if (this.iInternalListenerTraceConsole != null
-				&& this.iInternalListenerTraceConsole.equals(pListener)) {
+		} else if (this.iInternalListenerTraceConsole != null && this.iInternalListenerTraceConsole.equals(pListener)) {
 			// Removing internal trace listener for console
 			this.iInternalListenerTraceConsole = null;
 			this.iNumInternalTraceListeners--;
@@ -562,7 +618,7 @@ public synchronized void clearTraceListeners() {
 	/**
 	 * Gets the registered trace listeners including the internal console and
 	 * file loggers.
-	 * 
+	 *
 	 * @return A list of listeners
 	 */
 	public List getTraceListeners() {
@@ -572,14 +628,13 @@ public List getTraceListeners() {
 	/**
 	 * Adds a listener for CIM-XML trace messages. The listener will be notified
 	 * of any CIM-XML trace event.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
 	public synchronized void addCIMXMLTraceListener(CIMXMLTraceListener pListener) {
 		if (pListener == null) return;
-		ArrayList newListeners = new ArrayList(
-				this.iCIMXMLTraceListeners);
+		ArrayList newListeners = new ArrayList(this.iCIMXMLTraceListeners);
 		newListeners.add(pListener);
 		this.iCIMXMLTraceListeners = newListeners;
 	}
@@ -587,13 +642,12 @@ public synchronized void addCIMXMLTraceListener(CIMXMLTraceListener pListener) {
 	/**
 	 * Removes a CIM-XML trace listener. This listener will not be notified of
 	 * CIM-XML trace events anymore.
-	 * 
+	 *
 	 * @param pListener
 	 *            The listener
 	 */
 	public synchronized void removeCIMXMLTraceListener(CIMXMLTraceListener pListener) {
-		ArrayList newListeners = new ArrayList(
-				this.iCIMXMLTraceListeners);
+		ArrayList newListeners = new ArrayList(this.iCIMXMLTraceListeners);
 		if (!newListeners.remove(pListener)) return;
 		this.iCIMXMLTraceListeners = newListeners;
 	}
@@ -607,7 +661,7 @@ public synchronized void clearCIMXMLTraceListeners() {
 
 	/**
 	 * Gets the registered CIM-XML trace listeners.
-	 * 
+	 *
 	 * @return A list of listeners
 	 */
 	public List getCIMXMLTraceListeners() {
@@ -616,7 +670,7 @@ public List getCIMXMLTraceListeners() {
 
 	/**
 	 * Forwards a log/trace message to the registered log&trace listeners.
-	 * 
+	 *
 	 * @param pKey
 	 *            The message identifier.
 	 */
@@ -626,7 +680,7 @@ public void message(String pKey) {
 
 	/**
 	 * Forwards a log/trace message to the registered log&trace listeners.
-	 * 
+	 *
 	 * @param pKey
 	 *            The message identifier.
 	 * @param pParameter
@@ -638,7 +692,7 @@ public void message(String pKey, Object pParameter) {
 
 	/**
 	 * Forwards a log/trace message to the registered log&trace listeners.
-	 * 
+	 *
 	 * @param pKey
 	 *            The message identifier.
 	 * @param pParameters
@@ -653,8 +707,7 @@ public void message(String pKey, Object[] pParameters) {
 				final List traceListeners = getTraceListeners();
 				StackTraceElement caller = getCaller();
 				for (int i = 0; i < traceListeners.size(); ++i) {
-					traceListeners.get(i).trace(level, caller,
-							pKey + " " + MessageFormat.format(message, pParameters));
+					traceListeners.get(i).trace(level, caller, pKey + " " + MessageFormat.format(message, pParameters));
 				}
 			}
 			final List logListeners = getLogListeners();
@@ -668,7 +721,7 @@ public void message(String pKey, Object[] pParameters) {
 
 	/**
 	 * Forwards a trace message to the registered trace listeners.
-	 * 
+	 *
 	 * @param pLevel
 	 *            One of the three message level identifiers FINE, FINER and
 	 *            FINEST
@@ -691,7 +744,7 @@ public void trace(Level pLevel, String pMessage) {
 
 	/**
 	 * Forwards a trace message to the registered trace listeners.
-	 * 
+	 *
 	 * @param pLevel
 	 *            One of the three message level identifiers FINE, FINER and
 	 *            FINEST
@@ -717,7 +770,7 @@ public void trace(Level pLevel, String pMessage, Throwable pThrown) {
 	/**
 	 * Forwards a CIM-XML trace message to the registered CIM-XML trace
 	 * listeners.
-	 * 
+	 *
 	 * @param pLevel
 	 *            One of the message level identifiers, e.g. FINE
 	 * @param pMessage
@@ -757,7 +810,7 @@ public void exit() {
 	/**
 	 * Returns the output stream to which all CIM-XML traffic (outgoing &
 	 * incoming) will be copied for debugging purposes.
-	 * 
+	 *
 	 * @return The output stream. A null value means that CIM-XML
 	 *         debugging is disabled
 	 */
@@ -768,7 +821,7 @@ public OutputStream getXmlTraceStream() {
 	/**
 	 * Sets an output stream to which all CIM-XML traffic (outgoing &
 	 * incoming) will be copied for debugging purposes.
-	 * 
+	 *
 	 * @param pStream
 	 *            The output stream. A null value means that
 	 *            CIM-XML debugging is disabled.
@@ -787,8 +840,7 @@ private void initXmlTraceFile() {
 		try {
 			if (WBEMConfiguration.getGlobalConfiguration().isCimXmlTracingEnabled()) {
 				String filename = WBEMConfiguration.getGlobalConfiguration().getCimXmlTraceStream();
-				if (filename != null && filename.length() > 0 && this.iXmlTraceFile == null
-						&& getXmlTraceStream() == null) {
+				if (filename != null && filename.length() > 0 && this.iXmlTraceFile == null && getXmlTraceStream() == null) {
 					if (filename.equalsIgnoreCase("System.out")) {
 						this.iXmlTraceFile = System.out;
 					} else if (filename.equalsIgnoreCase("System.err")) {
@@ -797,9 +849,11 @@ && getXmlTraceStream() == null) {
 						try {
 							this.iXmlTraceFile = new FileOutputStream(filename);
 						} catch (IOException e) {
-							trace(Level.FINE, "Unable to open "
-									+ WBEMConfigurationProperties.CIMXML_TRACE_STREAM + "="
-									+ filename, e);
+							trace(
+								Level.FINE,
+								"Unable to open " + WBEMConfigurationProperties.CIMXML_TRACE_STREAM + "=" + filename,
+								e
+							);
 						}
 					}
 					setXmlTraceStream(this.iXmlTraceFile);
@@ -813,7 +867,7 @@ && getXmlTraceStream() == null) {
 	/**
 	 * Analyzes the stack trace and determines from where the
 	 * LogAndTraceBroker was called.
-	 * 
+	 *
 	 * @return First StackTraceElement outside the
 	 *         LogAndTraceBroker
 	 */
@@ -822,14 +876,16 @@ private StackTraceElement getCaller() {
 		for (int i = 0; i < stack.length; ++i) {
 			StackTraceElement frame = stack[i];
 			String cname = frame.getClassName();
-			if (!this.iTHIS_CLASS.equals(cname) && !this.iTHROWABLE.equals(cname)) { return frame; }
+			if (!this.iTHIS_CLASS.equals(cname) && !this.iTHROWABLE.equals(cname)) {
+				return frame;
+			}
 		}
 		return null;
 	}
 
 	/**
 	 * Removes all handlers from a logger
-	 * 
+	 *
 	 * @param pLogger
 	 *            The logger
 	 */
@@ -846,13 +902,13 @@ private void removeHandlers(Logger pLogger) {
 	 * message with the specified level. Use this method to determine if a
 	 * trace() method call could result in logging before preparing the
 	 * information to be logged. For example:
-	 * 
+	 *
 	 * 
       	 *     if (logger.isLoggableTrace(Level.WARNING) {
 	 *         // Prepare info for logging
 	 *         logger.trace(Level.WARNING, ...
 	 * 
      
-	 * 
+	 *
 	 * @param pLevel
 	 *            The Level of the trace message.
 	 * @return true if trace message could be logged,
@@ -888,13 +944,13 @@ public boolean isLoggableTrace(Level pLevel) {
 	 * with the specified level. Use this method to determine if a message()
 	 * method call could result in logging before preparing the information to
 	 * be logged. For example:
-	 * 
+	 *
 	 * 
       	 *     if (logger.isLoggableMessage(Level.WARNING) {
 	 *         // Prepare info for logging
 	 *         logger.message(Level.WARNING, ...
 	 * 
      
-	 * 
+	 *
 	 * @param pLevel
 	 *            The Level of the message.
 	 * @return true if message could be logged, false
@@ -933,13 +989,13 @@ public boolean isLoggableMessage(Level pLevel) {
 	 * a CIM-XML trace message. Use this method to determine if a trace() method
 	 * call could result in logging before preparing the information to be
 	 * logged. For example:
-	 * 
+	 *
 	 * 
       	 *     if (logger.isLoggableCIMXMLTrace(Level.FINEST) {
 	 *         // Prepare info for logging
 	 *         logger.traceCIMXML(Level.FINEST, ...
 	 * 
      
-	 * 
+	 *
 	 * @param pLevel
 	 *            The Level of the trace message.
 	 * @return true if CIM-XML trace message could be logged,
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogFormatter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogFormatter.java
index b088ed4..2ff6d23 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogFormatter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/LogFormatter.java
@@ -47,10 +47,9 @@
 
 /**
  * Class LogFormatter implements the formatting algorithm for our console log.
- * 
+ *
  */
 public class LogFormatter extends Formatter {
-
 	private final String iLineSeparator = System.getProperty("line.separator");
 
 	/**
@@ -62,7 +61,7 @@ public LogFormatter() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.util.logging.Formatter#format(java.util.logging.LogRecord)
 	 */
 	@Override
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/MessageLoader.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/MessageLoader.java
index 51eb83a..8f80a92 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/MessageLoader.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/MessageLoader.java
@@ -48,17 +48,14 @@
 /**
  * Class MessageLoader encapsulates the access to the resource file containing
  * log messages.
- * 
+ *
  */
 public final class MessageLoader {
-
 	private static final String BUNDLE_NAME = "org.sblim.cimclient.internal.logging.messages"; //$NON-NLS-1$
 
-	private static final ResourceBundle RESOURCE_BUNDLE_LOCAL
-	/* = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault()) */;
+	private static final ResourceBundle RESOURCE_BUNDLE_LOCAL/* = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault()) */;
 
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME,
-			Locale.ENGLISH);
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME, Locale.ENGLISH);
 
 	/*
 	 * Use English if default locale not supported (doing it here handles
@@ -75,12 +72,12 @@ public final class MessageLoader {
 	}
 
 	private MessageLoader() {
-	// prevent instantiation
+		// prevent instantiation
 	}
 
 	/**
 	 * Returns the English message for a given key.
-	 * 
+	 *
 	 * @param pKey
 	 *            The key
 	 * @return The message
@@ -95,7 +92,7 @@ public static String getMessage(String pKey) {
 
 	/**
 	 * Returns the localized message for a given key.
-	 * 
+	 *
 	 * @param pKey
 	 *            The key
 	 * @return The message
@@ -115,7 +112,7 @@ public static String getLocalizedMessage(String pKey) {
 	 * CIM1234S. Valid level tokens are S, W, I and
 	 * C for SEVERE, WARNING, INFO and
 	 * CONFIG respectively.
-	 * 
+	 *
 	 * @param pKey
 	 *            The message id
 	 * @return The level
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/Messages.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/Messages.java
index 203e35f..2a2d746 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/Messages.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/Messages.java
@@ -44,10 +44,9 @@
 
 /**
  * Interface Messages holds the constants for the message keys.
- * 
+ *
  */
 public interface Messages {
-
 	/**
 	 * GREETING
 	 */
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TimeStamp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TimeStamp.java
index 1ff1b6e..86a4ef8 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TimeStamp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TimeStamp.java
@@ -46,7 +46,7 @@
 /**
  * Class TimeStamp is responsible for building uniform date/time strings for
  * logging and tracing.
- * 
+ *
  */
 public class TimeStamp {
 
@@ -56,17 +56,15 @@ private static String pad(int pDigits, int pNum) {
 		char[] cA = new char[len];
 		int paddingDigits = pDigits - str.length();
 		int dIdx = 0;
-		while (dIdx < paddingDigits)
-			cA[dIdx++] = '0';
+		while (dIdx < paddingDigits) cA[dIdx++] = '0';
 		int sIdx = 0;
-		while (dIdx < len)
-			cA[dIdx++] = str.charAt(sIdx++);
+		while (dIdx < len) cA[dIdx++] = str.charAt(sIdx++);
 		return new String(cA);
 	}
 
 	/**
 	 * formatWorker
-	 * 
+	 *
 	 * @param pMillis
 	 *            - total milliseconds
 	 * @param pIncludeMillis
@@ -96,7 +94,7 @@ private static String formatWorker(long pMillis, boolean pIncludeMillis) {
 
 	/**
 	 * format
-	 * 
+	 *
 	 * @param pMillis
 	 *            - total milliseconds
 	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS )
@@ -107,7 +105,7 @@ public static String format(long pMillis) {
 
 	/**
 	 * formatWithMillis
-	 * 
+	 *
 	 * @param pMillis
 	 *            - total milliseconds
 	 * @return formatted date/time String. ( YYYY.MM.DD HH:mm:SS.sss )
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TraceFormatter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TraceFormatter.java
index 04ca2fa..3fb3265 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TraceFormatter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/logging/TraceFormatter.java
@@ -48,10 +48,9 @@
 
 /**
  * Class TraceFormatter implements the formatting algorithm for our console log.
- * 
+ *
  */
 public class TraceFormatter extends Formatter {
-
 	private final String iLineSeparator = System.getProperty("line.separator");
 
 	/**
@@ -63,7 +62,7 @@ public TraceFormatter() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.util.logging.Formatter#format(java.util.logging.LogRecord)
 	 */
 	@Override
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java
index c1a810c..e9b0a16 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParser.java
@@ -63,14 +63,13 @@
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.XMLDefaultHandlerImpl;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.xml.sax.Attributes;
 
 /**
  * Class XMLPullParser is responsible for XML parsing.
- * 
+ *
  */
 public class XMLPullParser {
 
@@ -175,7 +174,6 @@ public String getValue(String uri, String localName) {
 	}
 
 	class XMLAttributeValue {
-
 		int iCurrentPos;
 
 		int iBegin, iLen;
@@ -186,7 +184,7 @@ class XMLAttributeValue {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param begin
 		 * @param len
 		 * @param translate
@@ -199,7 +197,7 @@ public XMLAttributeValue(int begin, int len, boolean translate) {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param begin
 		 * @param len
 		 */
@@ -211,7 +209,7 @@ public XMLAttributeValue(int begin, int len) {
 
 		/**
 		 * getText
-		 * 
+		 *
 		 * @return String
 		 */
 		public String getText() {
@@ -229,10 +227,8 @@ public String getText() {
 						// cnt++;
 						// }
 					} catch (Exception e) {
-						LogAndTraceBroker.getBroker().trace(Level.WARNING,
-								"exception while decoding CHARACTERS XML", e);
-						this.iText = new String(XMLPullParser.this.iBufferChar, this.iBegin,
-								this.iLen);
+						LogAndTraceBroker.getBroker().trace(Level.WARNING, "exception while decoding CHARACTERS XML", e);
+						this.iText = new String(XMLPullParser.this.iBufferChar, this.iBegin, this.iLen);
 					}
 				} else {
 					// Integer hashKey = new Integer(hash);
@@ -256,7 +252,7 @@ public String getText() {
 
 		/**
 		 * init
-		 * 
+		 *
 		 * @param begin
 		 * @param len
 		 */
@@ -268,7 +264,7 @@ public void init(int begin, int len) {
 
 		/**
 		 * setTranslate
-		 * 
+		 *
 		 * @param translate
 		 */
 		public void setTranslate(boolean translate) {
@@ -321,12 +317,13 @@ protected int parseReference() throws XMLPullParserException {
 					int value = 0;
 					do {
 						ch1 = XMLPullParser.this.iBufferChar[this.iCurrentPos++];
-						if (ch1 >= '0' && ch1 <= '9') value = value * 16 + (ch1 - '0');
-						else if (ch1 >= 'A' && ch1 <= 'F' || ch1 >= 'a' && ch1 <= 'f') value = value
-								* 16 + (Character.toUpperCase(ch1) - 'A' + 10);
-						else if (ch1 == ';') break;
-						else throw new XMLPullParserException(
-								"invalid character while parsing hex encoded number " + escape(ch1));
+						if (ch1 >= '0' && ch1 <= '9') value = value * 16 + (ch1 - '0'); else if (
+							ch1 >= 'A' && ch1 <= 'F' || ch1 >= 'a' && ch1 <= 'f'
+						) value = value * 16 + (Character.toUpperCase(ch1) - 'A' + 10); else if (
+							ch1 == ';'
+						) break; else throw new XMLPullParserException(
+							"invalid character while parsing hex encoded number " + escape(ch1)
+						);
 					} while (true);
 					this.iCurrentPos--; // 18274
 					return (char) value;
@@ -337,10 +334,9 @@ else throw new XMLPullParserException(
 						if (ch1 >= '0' && ch1 <= '9') {
 							value = value * 10 + (ch1 - '0');
 							ch1 = XMLPullParser.this.iBufferChar[this.iCurrentPos++];
-						} else if (ch1 == ';') break;
-						else throw new XMLPullParserException(
-								"invalid character while parsing decimal encoded number: "
-										+ escape(ch1));
+						} else if (ch1 == ';') break; else throw new XMLPullParserException(
+							"invalid character while parsing decimal encoded number: " + escape(ch1)
+						);
 					} while (true);
 					this.iCurrentPos--; // 18274
 					return (char) value;
@@ -353,11 +349,11 @@ else throw new XMLPullParserException(
 					ch1 = XMLPullParser.this.iBufferChar[this.iCurrentPos++];
 					if (ch1 == ';') break;
 					if (!isValidElementNameChar(ch1)) throw new XMLPullParserException(
-							"invalid reference character " + escape(ch1));
+						"invalid reference character " + escape(ch1)
+					);
 				} while (true);
 			} else {
-				throw new XMLPullParserException(
-						"expected valid name start character for value reference");
+				throw new XMLPullParserException("expected valid name start character for value reference");
 			}
 			this.iCurrentPos--;
 			ch1 = XMLPullParser.this.iBufferChar[startPos];
@@ -370,7 +366,9 @@ else throw new XMLPullParserException(
 				return '>';
 			} else {
 				char ch4 = XMLPullParser.this.iBufferChar[startPos + 3];
-				if (ch1 == 'a' && ch2 == 'm' && ch3 == 'p' && ch4 == ';') { return '&'; }
+				if (ch1 == 'a' && ch2 == 'm' && ch3 == 'p' && ch4 == ';') {
+					return '&';
+				}
 				char ch5 = XMLPullParser.this.iBufferChar[startPos + 4];
 				if (ch1 == 'a' && ch2 == 'p' && ch3 == 'o' && ch4 == 's' && ch5 == ';') {
 					return '\'';
@@ -466,31 +464,29 @@ else throw new XMLPullParserException(
 
 	/**
 	 * main
-	 * 
+	 *
 	 * @param args
 	 */
 	public static void main(String[] args) {
-	// this did testing
+		// this did testing
 	}
 
 	// TODO: ebak: this function seems to be wrong, because "synchronizes" to
 	// IRETURNVALUE
 	/**
 	 * next
-	 * 
+	 *
 	 * @param reader
 	 * @param parserHdlr
 	 * @return boolean
 	 * @throws Exception
 	 */
-	public static boolean next(XMLPullParser reader, XMLDefaultHandlerImpl parserHdlr)
-			throws Exception {
+	public static boolean next(XMLPullParser reader, XMLDefaultHandlerImpl parserHdlr) throws Exception {
 		while (reader.hasNext()) {
 			int event = reader.next();
 			switch (event) {
 				case START_ELEMENT:
-					parserHdlr.startElement(EMPTY, EMPTY, reader.getElementName(), reader
-							.getAttributes());
+					parserHdlr.startElement(EMPTY, EMPTY, reader.getElementName(), reader.getAttributes());
 					break;
 				case END_ELEMENT:
 					parserHdlr.endElement(EMPTY, EMPTY, reader.getElementName());
@@ -501,7 +497,9 @@ public static boolean next(XMLPullParser reader, XMLDefaultHandlerImpl parserHdl
 						lastElementName = elementNames.get(elementNames.size() - 1);
 					}
 
-					if (lastElementName != null && lastElementName.equalsIgnoreCase("IRETURNVALUE")) { return true; }
+					if (lastElementName != null && lastElementName.equalsIgnoreCase("IRETURNVALUE")) {
+						return true;
+					}
 					break;
 				case CHARACTERS:
 					char[] buf = reader.getText().toCharArray();
@@ -559,7 +557,7 @@ public static boolean next(XMLPullParser reader, XMLDefaultHandlerImpl parserHdl
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param in
 	 */
 	public XMLPullParser(Reader in) {
@@ -569,7 +567,7 @@ public XMLPullParser(Reader in) {
 
 	/**
 	 * close
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	public void close() throws IOException {
@@ -580,7 +578,7 @@ public void close() throws IOException {
 
 	/**
 	 * getAttributes
-	 * 
+	 *
 	 * @return Attributes
 	 */
 	public Attributes getAttributes() {
@@ -594,7 +592,7 @@ public Attributes getAttributes() {
 
 	/**
 	 * getElementName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getElementName() {
@@ -603,7 +601,7 @@ public String getElementName() {
 
 	/**
 	 * getElementNames
-	 * 
+	 *
 	 * @return Vector
 	 */
 	public ArrayList getElementNames() {
@@ -612,7 +610,7 @@ public ArrayList getElementNames() {
 
 	/**
 	 * getLevel
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getLevel() {
@@ -621,19 +619,20 @@ public int getLevel() {
 
 	/**
 	 * getText
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getText() {
 		String result = null;
-		if (this.iCurrentState == CHARACTERS && this.iCharacters != null) { return this.iCharacters
-				.getText(); }
+		if (this.iCurrentState == CHARACTERS && this.iCharacters != null) {
+			return this.iCharacters.getText();
+		}
 		return result;
 	}
 
 	/**
 	 * hasNext
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean hasNext() {
@@ -642,7 +641,7 @@ public boolean hasNext() {
 
 	/**
 	 * next
-	 * 
+	 *
 	 * @return int
 	 * @throws IOException
 	 */
@@ -661,14 +660,16 @@ public int next() throws IOException {
 			if (ch == '<') {
 				ch = (char) getNextChar();
 				if (ch == '?') {
-					if (this.iSeenProlog) { throw new XMLPullParserException(
-							"The processing instruction target matching \"[xX][mM][lL]\" is not allowed."); }
+					if (this.iSeenProlog) {
+						throw new XMLPullParserException(
+							"The processing instruction target matching \"[xX][mM][lL]\" is not allowed."
+						);
+					}
 					this.iSeenProlog = true;
 					parsePI();
 					ch = (char) getNextChar();
 					ch = skipOptionalSpaces(ch);
-					if (ch != '<') throw new XMLPullParserException(this,
-							"Content is not allowed in prolog.");
+					if (ch != '<') throw new XMLPullParserException(this, "Content is not allowed in prolog.");
 					goBack();
 
 					this.iCurrentState = START_DOCUMENT;
@@ -716,17 +717,19 @@ public int next() throws IOException {
 
 					ch = (char) getNextCharCheckingEOF();
 					if (ch == (char) -1) {
-						if (this.iElementNames.size() != 0) throw new XMLPullParserException(this,
-								"unexpected EOF ");
+						if (this.iElementNames.size() != 0) throw new XMLPullParserException(this, "unexpected EOF ");
 
 						this.iCurrentState = END_DOCUMENT;
 						return this.iCurrentState;
-					} else if (ch == '\r' || ch == '\n') { /* :) */} else {
+					} else if (ch == '\r' || ch == '\n') {
+						/* :) */
+					} else {
 						if (!isSpace(ch) && ch != '<' && this.iElementNames.size() == 0) {
-							if (!this.iSeenProlog) throw new XMLPullParserException(this,
-									"Content is not allowed in trailing section.");
-							throw new XMLPullParserException(this,
-									"Content is not allowed in trailing section.");
+							if (!this.iSeenProlog) throw new XMLPullParserException(
+								this,
+								"Content is not allowed in trailing section."
+							);
+							throw new XMLPullParserException(this, "Content is not allowed in trailing section.");
 						}
 					}
 					amp = false;
@@ -739,11 +742,9 @@ public int next() throws IOException {
 				this.iEndCharacters = this.iCurrentPosition;
 				goBack();
 				if (this.iElementNames.size() > 0) {
-					if (this.iCharacters == null) this.iCharacters = new XMLAttributeValue(
-							this.iStartCharacters, this.iEndCharacters - this.iStartCharacters - 1);
-					else {
-						this.iCharacters.init(this.iStartCharacters, this.iEndCharacters
-								- this.iStartCharacters - 1);
+					if (this.iCharacters == null) this.iCharacters =
+						new XMLAttributeValue(this.iStartCharacters, this.iEndCharacters - this.iStartCharacters - 1); else {
+						this.iCharacters.init(this.iStartCharacters, this.iEndCharacters - this.iStartCharacters - 1);
 						this.iCharacters.setTranslate(true);
 					}
 
@@ -781,30 +782,30 @@ public void reset() {
 	public String toString() {
 		switch (this.iCurrentState) {
 			case START_ELEMENT: {
-				StringBuilder sb = new StringBuilder("START ELEM: <");
-				sb.append(this.iElementName);
-				if (this.iAttributeNames.size() > 0) {
-					sb.append(" ");
-					for (int i = 0; i < this.iAttributeNames.size(); i++) {
-						sb.append(this.iAttributeNames.get(i));
-						sb.append("=\"");
-						sb.append(this.iAttributeValues.get(i));
-						sb.append("\" ");
+					StringBuilder sb = new StringBuilder("START ELEM: <");
+					sb.append(this.iElementName);
+					if (this.iAttributeNames.size() > 0) {
+						sb.append(" ");
+						for (int i = 0; i < this.iAttributeNames.size(); i++) {
+							sb.append(this.iAttributeNames.get(i));
+							sb.append("=\"");
+							sb.append(this.iAttributeValues.get(i));
+							sb.append("\" ");
+						}
 					}
+					sb.append(">");
+					return sb.toString();
 				}
-				sb.append(">");
-				return sb.toString();
-			}
 			case END_ELEMENT: {
-				String s = "END ELEM: ";
-				return s;
-			}
+					String s = "END ELEM: ";
+					return s;
+				}
 			case CHARACTERS: {
-				return "CHARACTERS: \"" + getText(); // .replaceAll("\n",
-				// "\\\\n").replaceAll("\r",
-				// "\\\\r").replaceAll("\t",
-				// "\\\\t")+"\"";
-			}
+					return "CHARACTERS: \"" + getText(); // .replaceAll("\n",
+					// "\\\\n").replaceAll("\r",
+					// "\\\\r").replaceAll("\t",
+					// "\\\\t")+"\"";
+				}
 		}
 		return "UNKOWN";
 	}
@@ -835,8 +836,13 @@ protected void ensureCapacity() {
 		if (this.iBufferChar == null) this.iBufferChar = new char[1024];
 
 		if (this.iCurrentPosition >= (8 * this.iBufferChar.length) / 10) {
-			System.arraycopy(this.iBufferChar, this.iCurrentPosition, this.iBufferChar, 0,
-					this.iFinishChar - this.iCurrentPosition);
+			System.arraycopy(
+				this.iBufferChar,
+				this.iCurrentPosition,
+				this.iBufferChar,
+				0,
+				this.iFinishChar - this.iCurrentPosition
+			);
 			this.iFinishChar -= this.iCurrentPosition;
 			this.iCurrentPosition = 0;
 		}
@@ -848,8 +854,7 @@ protected String escape(char ch) {
 		if (ch == '\r') result = "\'\\r\'";
 		if (ch == '\t') result = "\'\\t\'";
 		if (ch == '\'') result = "\'\\'\'";
-		if (ch > '\177' || ch < ' ') result = "\'\\u" + Integer.toHexString(ch) + "\'";
-		else result = "\'" + ch + "\'";
+		if (ch > '\177' || ch < ' ') result = "\'\\u" + Integer.toHexString(ch) + "\'"; else result = "\'" + ch + "\'";
 		return result;
 	}
 
@@ -863,10 +868,11 @@ protected int getChar() throws IOException {
 				System.arraycopy(tmp, 0, this.iBufferChar, 0, tmp.length);
 			}
 
-			int total = this.iInstream.read(this.iBufferChar, this.iFinishChar,
-					this.iBufferChar.length - this.iFinishChar);
+			int total = this.iInstream.read(this.iBufferChar, this.iFinishChar, this.iBufferChar.length - this.iFinishChar);
 
-			if (total <= 0) { return -1; }
+			if (total <= 0) {
+				return -1;
+			}
 			this.iFinishChar += total;
 		}
 		return this.iBufferChar[this.iCurrentPosition++];
@@ -915,17 +921,36 @@ protected boolean isSpace(char ch) {
 	}
 
 	protected boolean isValidElementNameChar(char ch) {
-		return (ch < 256 && (ch >= 'A' && ch <= 'Z' || ch >= 'a' && ch <= 'z' || ch == '_'
-				|| ch == ':' || ch == '-' || ch == '.' || ch >= '0' && ch <= '9' || ch == '\267'))
-				|| ch >= '\300'
-				&& ch <= '\u02FF'
-				|| ch >= '\u0370'
-				&& ch <= '\u037D'
-				|| ch >= '\u0300'
-				&& ch <= '\u036F'
-				|| ch >= '\u037F'
-				&& ch <= '\u2027'
-				|| ch >= '\u202A' && ch <= '\u218F' || ch >= '\u2800' && ch <= '\uFFEF';
+		return (
+			(
+				ch < 256 &&
+				(
+					ch >= 'A' &&
+					ch <= 'Z' ||
+					ch >= 'a' &&
+					ch <= 'z' ||
+					ch == '_' ||
+					ch == ':' ||
+					ch == '-' ||
+					ch == '.' ||
+					ch >= '0' &&
+					ch <= '9' ||
+					ch == '\267'
+				)
+			) ||
+			ch >= '\300' &&
+			ch <= '\u02FF' ||
+			ch >= '\u0370' &&
+			ch <= '\u037D' ||
+			ch >= '\u0300' &&
+			ch <= '\u036F' ||
+			ch >= '\u037F' &&
+			ch <= '\u2027' ||
+			ch >= '\u202A' &&
+			ch <= '\u218F' ||
+			ch >= '\u2800' &&
+			ch <= '\uFFEF'
+		);
 		// return isValidStartElementNameChar(ch)
 		// || (ch < 256 && (ch == '-'
 		// || ch == '.'
@@ -938,10 +963,23 @@ protected boolean isValidElementNameChar(char ch) {
 	}
 
 	protected boolean isValidStartElementNameChar(char ch) {
-		return (ch < 256 && (ch >= 'A' && ch <= 'Z' || ch >= 'a' && ch <= 'z' || ch == '_' || ch == ':'))
-				|| (ch >= '\300' && ch <= '\u02FF' || ch >= '\u0370' && ch <= '\u037D'
-						|| ch >= '\u037F' && ch <= '\u0400' || ch >= '\u0400' && ch <= '\u2027'
-						|| ch >= '\u202A' && ch <= '\u218F' || ch >= '\u2800' && ch <= '\uFFEF');
+		return (
+			(ch < 256 && (ch >= 'A' && ch <= 'Z' || ch >= 'a' && ch <= 'z' || ch == '_' || ch == ':')) ||
+			(
+				ch >= '\300' &&
+				ch <= '\u02FF' ||
+				ch >= '\u0370' &&
+				ch <= '\u037D' ||
+				ch >= '\u037F' &&
+				ch <= '\u0400' ||
+				ch >= '\u0400' &&
+				ch <= '\u2027' ||
+				ch >= '\u202A' &&
+				ch <= '\u218F' ||
+				ch >= '\u2800' &&
+				ch <= '\uFFEF'
+			)
+		);
 	}
 
 	protected void parseAttribute(char ch) throws IOException {
@@ -962,15 +1000,19 @@ protected void parseAttribute(char ch) throws IOException {
 
 		ch = skipOptionalSpaces(ch);
 
-		if (ch != '=') throw new XMLPullParserException(this, "missing character \'=\'instead "
-				+ escape(ch) + " was found ");
+		if (ch != '=') throw new XMLPullParserException(
+			this,
+			"missing character \'=\'instead " + escape(ch) + " was found "
+		);
 
 		ch = (char) getNextChar();
 		ch = skipOptionalSpaces(ch);
 
 		char delimiter;
-		if (ch != '\"' && ch != '\'') throw new XMLPullParserException(this,
-				"missing character \'\"\' or \'\'\' instead " + escape(ch) + " was found ");
+		if (ch != '\"' && ch != '\'') throw new XMLPullParserException(
+			this,
+			"missing character \'\"\' or \'\'\' instead " + escape(ch) + " was found "
+		);
 		delimiter = ch;
 
 		// StringBuffer attributeValue = new StringBuffer();
@@ -983,15 +1025,14 @@ protected void parseAttribute(char ch) throws IOException {
 			// hashvalue = hashvalue *primes[n] +ch;
 
 			ch = (char) getNextChar();
-			if (ch == delimiter) break;
-			else if (ch == '<' || ch == '>') throw new XMLPullParserException(this,
-					"illegal character " + escape(ch));
-			else if (ch == '&') {
+			if (ch == delimiter) break; else if (ch == '<' || ch == '>') throw new XMLPullParserException(
+				this,
+				"illegal character " + escape(ch)
+			); else if (ch == '&') {
 				int ref = parseReference();
 				ch = (char) (ref & 0xffff);
 				// attributeValue.append((char)ref);
 			} else if (ch == '\t' || ch == '\r' || ch == '\n') {
-
 				if (ch != '\n' || prevCh != '\r') {
 					// attributeValue.append(' ');
 				}
@@ -1002,8 +1043,12 @@ else if (ch == '&') {
 		} while (true);
 		int endAttributeValue = this.iCurrentPosition;
 		// attributeValues.add(attributeValue.toString());
-		addAttribute(startAttributeName, endAttributeName - startAttributeName - 1,
-				startAttributeValue, endAttributeValue - startAttributeValue - 1);
+		addAttribute(
+			startAttributeName,
+			endAttributeName - startAttributeName - 1,
+			startAttributeValue,
+			endAttributeValue - startAttributeValue - 1
+		);
 
 		return;
 	}
@@ -1011,10 +1056,14 @@ else if (ch == '&') {
 	protected int parseCDATA() throws IOException {
 		char ch;
 
-		if ((char) getNextChar() != 'C' || (char) getNextChar() != 'D'
-				|| (char) getNextChar() != 'A' || (char) getNextChar() != 'T'
-				|| (char) getNextChar() != 'A' || (char) getNextChar() != '[') throw new XMLPullParserException(
-				"CDATA must start with \"') throw new XMLPullParserException(this, "\'=\' was expected, but \'"
-				+ escape(ch) + "\' was found instead");
+		if (ch != '>') throw new XMLPullParserException(
+			this,
+			"\'=\' was expected, but \'" + escape(ch) + "\' was found instead"
+		);
 
 		if (this.iElementNames.size() == 0) this.iSeenEpilog = true;
 	}
@@ -1112,7 +1167,8 @@ protected int parsePI() throws IOException {
 				dashFound = false;
 			}
 			if (ch == (char) -1) throw new XMLPullParserException(
-					"XML document structures must start and end within the same entity.");
+				"XML document structures must start and end within the same entity."
+			);
 		} while (true);
 
 		return -1;
@@ -1126,12 +1182,14 @@ protected int parseReference() throws IOException {
 				int value = 0;
 				do {
 					ch1 = (char) getNextChar();
-					if (ch1 >= '0' && ch1 <= '9') value = value * 16 + (ch1 - '0');
-					else if (ch1 >= 'A' && ch1 <= 'F' || ch1 >= 'a' && ch1 <= 'f') value = value
-							* 16 + (Character.toUpperCase(ch1) - 'A' + 10);
-					else if (ch1 == ';') break;
-					else throw new XMLPullParserException(this,
-							"invalid character while parsing hex encoded number " + escape(ch1));
+					if (ch1 >= '0' && ch1 <= '9') value = value * 16 + (ch1 - '0'); else if (
+						ch1 >= 'A' && ch1 <= 'F' || ch1 >= 'a' && ch1 <= 'f'
+					) value = value * 16 + (Character.toUpperCase(ch1) - 'A' + 10); else if (
+						ch1 == ';'
+					) break; else throw new XMLPullParserException(
+						this,
+						"invalid character while parsing hex encoded number " + escape(ch1)
+					);
 				} while (true);
 				return (char) value;
 			}
@@ -1141,10 +1199,10 @@ else throw new XMLPullParserException(this,
 					if (ch1 >= '0' && ch1 <= '9') {
 						value = value * 10 + (ch1 - '0');
 						ch1 = (char) getNextChar();
-					} else if (ch1 == ';') break;
-					else throw new XMLPullParserException(this,
-							"invalid character while parsing decimal encoded number: "
-									+ escape(ch1));
+					} else if (ch1 == ';') break; else throw new XMLPullParserException(
+						this,
+						"invalid character while parsing decimal encoded number: " + escape(ch1)
+					);
 				} while (true);
 				return (char) value;
 			}
@@ -1156,11 +1214,11 @@ else throw new XMLPullParserException(this,
 				ch1 = (char) getNextChar();
 				if (ch1 == ';') break;
 				if (!isValidElementNameChar(ch1)) throw new XMLPullParserException(
-						"invalid reference character " + escape(ch1));
+					"invalid reference character " + escape(ch1)
+				);
 			} while (true);
 		} else {
-			throw new XMLPullParserException(this,
-					"expected valid name start character for value reference");
+			throw new XMLPullParserException(this, "expected valid name start character for value reference");
 		}
 		goBack();
 		ch1 = this.iBufferChar[startPos];
@@ -1173,7 +1231,9 @@ else throw new XMLPullParserException(this,
 			return '>';
 		} else {
 			char ch4 = this.iBufferChar[startPos + 3];
-			if (ch1 == 'a' && ch2 == 'm' && ch3 == 'p' && ch4 == ';') { return '&'; }
+			if (ch1 == 'a' && ch2 == 'm' && ch3 == 'p' && ch4 == ';') {
+				return '&';
+			}
 			char ch5 = this.iBufferChar[startPos + 4];
 			if (ch1 == 'a' && ch2 == 'p' && ch3 == 'o' && ch4 == 's' && ch5 == ';') {
 				return '\'';
@@ -1206,8 +1266,7 @@ protected int parseStartElement(char ch) throws IOException {
 		// elementName = (String)stringTable.get(hashKey);
 		// elementName = null;
 		// if (elementName == null) {
-		this.iElementName = new String(this.iBufferChar, startElementName, endElementName
-				- startElementName - 1);
+		this.iElementName = new String(this.iBufferChar, startElementName, endElementName - startElementName - 1);
 		// stringTable.put(hashKey, elementName);
 		// } else {
 		// // System.out.println("Found: "+elementName);
@@ -1221,15 +1280,17 @@ protected int parseStartElement(char ch) throws IOException {
 				break;
 			} else if (ch == '/') {
 				ch = (char) getNextChar();
-				if (ch != '>') { throw new XMLPullParserException(this,
-						"\'=\' was expected, but \'" + escape(ch) + "\' was found instead"); }
+				if (ch != '>') {
+					throw new XMLPullParserException(this, "\'=\' was expected, but \'" + escape(ch) + "\' was found instead");
+				}
 				this.iClosingElementNamePending = true;
 			} else if (isValidStartElementNameChar(ch)) {
 				parseAttribute(ch);
 				ch = (char) getNextChar();
-			} else throw new XMLPullParserException(this,
-					"Element type \"CIM\" must be followed by either attribute specifications, \">\" or \"/>\".");
-
+			} else throw new XMLPullParserException(
+				this,
+				"Element type \"CIM\" must be followed by either attribute specifications, \">\" or \"/>\"."
+			);
 		} while (true);
 		return -1;
 	}
@@ -1238,8 +1299,7 @@ protected void parseUnknown() throws IOException {
 		char ch;
 		do {
 			ch = (char) getNextChar();
-			if (ch == '<') throw new XMLPullParserException(
-					"\'>\' was expected, but \'<\' was found instead.");
+			if (ch == '<') throw new XMLPullParserException("\'>\' was expected, but \'<\' was found instead.");
 		} while (ch != '>');
 	}
 
@@ -1266,5 +1326,4 @@ protected char skipRequiredSpaces(char ch) throws IOException {
 		} while (isSpace(ch));
 		return ch;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParserException.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParserException.java
index e4a1cc8..1652231 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParserException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/pullparser/XMLPullParserException.java
@@ -48,15 +48,14 @@
 
 /**
  * Class XMLPullParserException is thrown by the PULL parser.
- * 
+ *
  */
 public class XMLPullParserException extends IOException {
-
 	private static final long serialVersionUID = 8136106792375541159L;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param str
 	 */
 	public XMLPullParserException(String str) {
@@ -65,7 +64,7 @@ public XMLPullParserException(String str) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param parser
 	 * @param str
 	 */
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Authority.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Authority.java
index 06ad879..f836517 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Authority.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Authority.java
@@ -59,7 +59,7 @@
  * IPvFuture  = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
      
  * IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet
      
  * reg-name    = *( unreserved / pct-encoded / sub-delims )

      
- * 
+ *
  * IPv6address =   (                           6( h16 ":" ) ls32
      
  *                /                       "::" 5( h16 ":" ) ls32
      
  *                / [               h16 ] "::" 4( h16 ":" ) ls32
      
@@ -69,24 +69,22 @@
  *                / [ *4( h16 ":" ) h16 ] "::"              ls32
      
  *                / [ *5( h16 ":" ) h16 ] "::"              h16
      
  *                / [ *6( h16 ":" ) h16 ] "::" ) Zone-index

      
- * 
+ *
  *    ls32        = ( h16 ":" h16 ) / IPv4address
      
  *                ; least-significant 32 bits of address

      
- * 
+ *
  *    h16         = 1*4HEXDIG
      
  *                ; 16 bits of address represented in hexadecimal
      
  * 
  */
 public class Authority {
-
 	private static final String PCTENCODED = "%[0-9A-Fa-f]{2}";
 
 	private static final String UNRESERVED = "A-Za-z0-9\\-\\._~";
 
 	private static final String SUBDELIMS = "!\\$&'\\(\\)\\*\\+,;=";
 
-	private static final String REGNAMEREG = "([" + UNRESERVED + SUBDELIMS + "]|" + PCTENCODED
-			+ ")+";
+	private static final String REGNAMEREG = "([" + UNRESERVED + SUBDELIMS + "]|" + PCTENCODED + ")+";
 
 	private static final String ZONEINDEX = "(%[" + UNRESERVED + "]+)?";
 
@@ -97,41 +95,97 @@ public class Authority {
 	private static final String LS32 = "((" + H16 + ":" + H16 + ")" + "|(" + IPV4 + "))";
 
 	private static final String IPV6 =
-	// 6( h16 ":" ) ls32
-	"(((" + H16 + ":){6}" + LS32 + ")|" +
-	// "::" 5( h16 ":" )
-			"(::(" + H16 + ":){5}" + LS32 + ")|" +
-			// [ h16 ] "::" 4( h16 ":" ) ls32
-			"((" + H16 + ")?::" + "(" + H16 + ":){4}" + LS32 + ")|" +
-			// [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
-			"(((" + H16 + ":){0,1}" + H16 + ")?::(" + H16 + ":){3}" + LS32 + ")|" +
-			// [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
-			"(((" + H16 + ":){0,2}" + H16 + ")?::(" + H16 + ":){2}" + LS32 + ")|" +
-			// [ *3( h16 ":" ) h16 ] "::" h16 ":" ls32
-			"(((" + H16 + ":){0,3}" + H16 + ")?::" + H16 + ":" + LS32 + ")|" +
-			// [ *4( h16 ":" ) h16 ] "::" ls32
-			"(((" + H16 + ":){0,4}" + H16 + ")?::" + LS32 + ")|" +
-			// [ *5( h16 ":" ) h16 ] "::" h16
-			"(((" + H16 + ":){0,5}" + H16 + ")?::" + H16 + ")|" +
-			// [ *6( h16 ":" ) h16 ] "::"
-			"(((" + H16 + ":){0,6}" + H16 + ")?::))" + ZONEINDEX;
+		// 6( h16 ":" ) ls32
+		"(((" +
+		H16 +
+		":){6}" +
+		LS32 +
+		")|" +
+		// "::" 5( h16 ":" )
+		"(::(" +
+		H16 +
+		":){5}" +
+		LS32 +
+		")|" +
+		// [ h16 ] "::" 4( h16 ":" ) ls32
+		"((" +
+		H16 +
+		")?::" +
+		"(" +
+		H16 +
+		":){4}" +
+		LS32 +
+		")|" +
+		// [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
+		"(((" +
+		H16 +
+		":){0,1}" +
+		H16 +
+		")?::(" +
+		H16 +
+		":){3}" +
+		LS32 +
+		")|" +
+		// [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
+		"(((" +
+		H16 +
+		":){0,2}" +
+		H16 +
+		")?::(" +
+		H16 +
+		":){2}" +
+		LS32 +
+		")|" +
+		// [ *3( h16 ":" ) h16 ] "::" h16 ":" ls32
+		"(((" +
+		H16 +
+		":){0,3}" +
+		H16 +
+		")?::" +
+		H16 +
+		":" +
+		LS32 +
+		")|" +
+		// [ *4( h16 ":" ) h16 ] "::" ls32
+		"(((" +
+		H16 +
+		":){0,4}" +
+		H16 +
+		")?::" +
+		LS32 +
+		")|" +
+		// [ *5( h16 ":" ) h16 ] "::" h16
+		"(((" +
+		H16 +
+		":){0,5}" +
+		H16 +
+		")?::" +
+		H16 +
+		")|" +
+		// [ *6( h16 ":" ) h16 ] "::"
+		"(((" +
+		H16 +
+		":){0,6}" +
+		H16 +
+		")?::))" +
+		ZONEINDEX;
 
 	// IPvFuture = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
 	private static final String IPVFUTURE = "v[0-9A-Fa-f]+\\.([" + UNRESERVED + SUBDELIMS + "]|:)+";
 
 	private static final String IPLITERAL = "\\[(" + IPV6 + "|" + IPVFUTURE + ")\\]";
 
-	private static Pattern USERINFOPAT = Pattern.compile("^((([" + UNRESERVED + SUBDELIMS + ":]|("
-			+ PCTENCODED + "))*)@).*");
+	private static Pattern USERINFOPAT = Pattern.compile(
+		"^((([" + UNRESERVED + SUBDELIMS + ":]|(" + PCTENCODED + "))*)@).*"
+	);
 
-	private static Pattern HOSTPAT = Pattern.compile("^((" + IPV4 + ")|(" + REGNAMEREG + ")|("
-			+ IPLITERAL + ")).*");
+	private static Pattern HOSTPAT = Pattern.compile("^((" + IPV4 + ")|(" + REGNAMEREG + ")|(" + IPLITERAL + ")).*");
 
 	private static Pattern PORTPAT = Pattern.compile("^([0-9]+).*");
 
 	/**
 	 * Parses userInfo, host and port
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return the parsed Authority
 	 */
@@ -144,7 +198,9 @@ public static Authority parse(URIString pUriStr) {
 		} else {
 			userInfo = null;
 		}
-		if (!uriStr.matchAndCut(HOSTPAT, 1)) { return null; }
+		if (!uriStr.matchAndCut(HOSTPAT, 1)) {
+			return null;
+		}
 		String host = uriStr.group(1);
 		String port = null;
 		if (uriStr.cutStarting(':')) {
@@ -173,18 +229,19 @@ private Authority(String pUserInfo, String pHost, String pPort) {
 
 	/**
 	 * str
-	 * 
+	 *
 	 * @return a String
 	 */
 	@Override
 	public String toString() {
-		return (this.iUserInfo == null ? "" : this.iUserInfo + "@") + this.iHost
-				+ (this.iPort == null ? "" : ":" + this.iPort);
+		return (
+			(this.iUserInfo == null ? "" : this.iUserInfo + "@") + this.iHost + (this.iPort == null ? "" : ":" + this.iPort)
+		);
 	}
 
 	/**
 	 * getUserInfo
-	 * 
+	 *
 	 * @return the userInfo String
 	 */
 	public String getUserInfo() {
@@ -193,7 +250,7 @@ public String getUserInfo() {
 
 	/**
 	 * getHost
-	 * 
+	 *
 	 * @return the host String
 	 */
 	public String getHost() {
@@ -202,11 +259,10 @@ public String getHost() {
 
 	/**
 	 * getPort
-	 * 
+	 *
 	 * @return the port String
 	 */
 	public String getPort() {
 		return this.iPort;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/BooleanValue.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/BooleanValue.java
index a175b0a..4fbc446 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/BooleanValue.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/BooleanValue.java
@@ -46,12 +46,11 @@
  * Class BooleanValue parses and encapsulates a boolean value.
  */
 public class BooleanValue extends Value {
-
 	private boolean iValue;
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pUriStr
 	 * @param pThrow
 	 * @return Value or null if pThrow is
@@ -63,9 +62,8 @@ public class BooleanValue extends Value {
 	public static Value parse(URIString pUriStr, boolean pThrow) throws IllegalArgumentException {
 		URIString uriStr = pUriStr.deepCopy();
 		boolean value;
-		if (uriStr.cutStarting("true", true)) value = true;
-		else if (uriStr.cutStarting("false", true)) value = false;
-		else {
+		if (uriStr.cutStarting("true", true)) value = true; else if (uriStr.cutStarting("false", true)) value =
+			false; else {
 			if (pThrow) {
 				String msg = "Boolean value not found!\n" + uriStr.markPosition();
 				throw new IllegalArgumentException(msg);
@@ -80,7 +78,7 @@ public static Value parse(URIString pUriStr, boolean pThrow) throws IllegalArgum
 
 	/**
 	 * Parses an untyped boolean value.
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return Value
 	 */
@@ -94,7 +92,7 @@ private BooleanValue(boolean pValue) {
 
 	/**
 	 * getValue
-	 * 
+	 *
 	 * @return the boolean value.
 	 */
 	public boolean getValue() {
@@ -103,7 +101,7 @@ public boolean getValue() {
 
 	/**
 	 * getBoolean
-	 * 
+	 *
 	 * @return Boolean
 	 */
 	public Boolean getBoolean() {
@@ -125,5 +123,4 @@ public String toString() {
 	public String getTypeInfo() {
 		return MOF.DT_BOOL;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/CharValue.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/CharValue.java
index 19fa51f..9cfb0ed 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/CharValue.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/CharValue.java
@@ -43,21 +43,19 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
 
 /**
  * Class CharValue parses character value.
  */
 public class CharValue extends Value implements QuotedValue {
-
 	private char iChar;
 
 	private static final Pattern pat = Pattern.compile("\\\\x([0-9a-fA-F]+)");
 
 	/**
 	 * charValue = // example: 'a' '\x32'
-	 * 
+	 *
 	 * @param pUriStr
 	 * @param pThrow
 	 * @return Value or null if parsing is failed and
@@ -120,7 +118,7 @@ public static Value parse(URIString pUriStr, boolean pThrow) throws IllegalArgum
 
 	/**
 	 * Parses a char16 value.
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return Value or null if parsing failed.
 	 */
@@ -134,7 +132,7 @@ private CharValue(char pChar) {
 
 	/**
 	 * getChar
-	 * 
+	 *
 	 * @return char
 	 */
 	public char get() {
@@ -143,7 +141,7 @@ public char get() {
 
 	/**
 	 * getCharacter
-	 * 
+	 *
 	 * @return Character
 	 */
 	public Character getCharacter() {
@@ -155,7 +153,9 @@ public Character getCharacter() {
 	 */
 	@Override
 	public String toString() {
-		if (this.iChar < 32) { return "\\x" + (int) this.iChar; }
+		if (this.iChar < 32) {
+			return "\\x" + (int) this.iChar;
+		}
 		return Character.toString(this.iChar);
 	}
 
@@ -173,5 +173,4 @@ public String toQuotedString() {
 	public String getTypeInfo() {
 		return MOF.DT_CHAR16;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/DateTimeValue.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/DateTimeValue.java
index 0ebb0f2..0788910 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/DateTimeValue.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/DateTimeValue.java
@@ -19,10 +19,6 @@
 
 package org.metricshub.wbem.sblim.cimclient.internal.uri;
 
-import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
-import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
-import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
-
 /*-
  * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
  * WBEM Java Client
@@ -44,18 +40,20 @@
  */
 
 import org.metricshub.wbem.javax.cim.CIMDateTime;
+import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
+import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
+import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
 
 /**
  * Class DateTimeValue is parses and encapsulates a datetime.
- * 
+ *
  */
 public class DateTimeValue extends Value implements QuotedValue {
-
 	private CIMDateTime iDateTime;
 
 	/**
 	 * datetimeValue = // quoted datetime string
-	 * 
+	 *
 	 * @param pStrVal
 	 *            - the dateTime string in an unquoted form
 	 * @param pThrow
@@ -73,9 +71,13 @@ public static Value parse(String pStrVal, boolean pThrow) throws IllegalArgument
 				dateTime = new CIMDateTimeInterval(pStrVal);
 			} catch (IllegalArgumentException e1) {
 				if (pThrow) {
-					String msg = "Value=" + pStrVal + "\nFailed to parse as DateTimeAbsolute!:\n"
-							+ e0.getMessage() + "\nFailed to parse as DateTimeInterval!:\n"
-							+ e1.getMessage();
+					String msg =
+						"Value=" +
+						pStrVal +
+						"\nFailed to parse as DateTimeAbsolute!:\n" +
+						e0.getMessage() +
+						"\nFailed to parse as DateTimeInterval!:\n" +
+						e1.getMessage();
 					throw new IllegalArgumentException(msg);
 				}
 				return null;
@@ -99,7 +101,7 @@ private DateTimeValue(CIMDateTime pDateTime) {
 
 	/**
 	 * getDateTime
-	 * 
+	 *
 	 * @return CIMDateTime
 	 */
 	public CIMDateTime getDateTime() {
@@ -128,5 +130,4 @@ public String toQuotedString() {
 	public String getTypeInfo() {
 		return MOF.DT_DATETIME;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/IntegerValue.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/IntegerValue.java
index 9ba86ed..dccc4a0 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/IntegerValue.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/IntegerValue.java
@@ -47,10 +47,9 @@
 
 /**
  * Class IntegerValue parses and encapsulates an integer value.
- * 
+ *
  */
 public class IntegerValue extends Value {
-
 	private BigInteger iBigValue;
 
 	private boolean iTyped;
@@ -67,7 +66,7 @@ public class IntegerValue extends Value {
 	 *      decimalValue		=	[ "+" | "-" ] ( positiveDecimalDigit *decimalDigit | "0" )
 	 *      hexValue			=	[ "+" | "-" ] ( "0x" | "0X" ) 1*hexDigit
 	 * 
-	 * 
+	 *
 	 * @param pUriStr
 	 * @param pTyped
 	 *            - if true pSigned and pBitWidth will be
@@ -80,8 +79,8 @@ public class IntegerValue extends Value {
 	 * @throws IllegalArgumentException
 	 *             if parsing is failed and pThrow is true
 	 */
-	private static Value parse(URIString pUriStr, boolean pTyped, boolean pSigned, int pBitWidth,
-			boolean pThrow) throws IllegalArgumentException {
+	private static Value parse(URIString pUriStr, boolean pTyped, boolean pSigned, int pBitWidth, boolean pThrow)
+		throws IllegalArgumentException {
 		URIString savedUriStr = pUriStr.deepCopy();
 		// get the substring till the next ',' or end of uriStr
 		String valStr = pUriStr.removeTill(',');
@@ -157,7 +156,7 @@ private static Value parse(URIString pUriStr, boolean pTyped, boolean pSigned, i
 
 	/**
 	 * Parses an untyped integer value.
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return a Value
 	 */
@@ -167,36 +166,33 @@ public static Value parse(URIString pUriStr) {
 
 	/**
 	 * parseUnsigned
-	 * 
+	 *
 	 * @param pUriStr
 	 * @param pBitWidth
 	 * @return Value
 	 * @throws IllegalArgumentException
 	 *             if parsing failed.
 	 */
-	public static Value parseUnsigned(URIString pUriStr, int pBitWidth)
-			throws IllegalArgumentException {
+	public static Value parseUnsigned(URIString pUriStr, int pBitWidth) throws IllegalArgumentException {
 		return parse(pUriStr, true, false, pBitWidth, true);
 	}
 
 	/**
 	 * parseSigned
-	 * 
+	 *
 	 * @param pUriStr
 	 * @param pBitWidth
 	 * @return Value
 	 * @throws IllegalArgumentException
 	 *             if parsing failed.
 	 */
-	public static Value parseSigned(URIString pUriStr, int pBitWidth)
-			throws IllegalArgumentException {
+	public static Value parseSigned(URIString pUriStr, int pBitWidth) throws IllegalArgumentException {
 		return parse(pUriStr, true, true, pBitWidth, true);
 	}
 
-	private static final Pattern BIN_PAT = Pattern.compile("^((?:\\+|-)?[01]+)[bB]$"),
-			OCT_PAT = Pattern.compile("^(?:\\+|-)?0[0-7]+$"), DEC_PAT = Pattern
-					.compile("^(?:\\+|-)?[1-9][0-9]*$"), HEX_PAT = Pattern
-					.compile("^(\\+|-)?0[xX]([0-9a-fA-F]+)$");
+	private static final Pattern BIN_PAT = Pattern.compile("^((?:\\+|-)?[01]+)[bB]$"), OCT_PAT = Pattern.compile(
+		"^(?:\\+|-)?0[0-7]+$"
+	), DEC_PAT = Pattern.compile("^(?:\\+|-)?[1-9][0-9]*$"), HEX_PAT = Pattern.compile("^(\\+|-)?0[xX]([0-9a-fA-F]+)$");
 
 	private IntegerValue(String pStrVal, int pRadix, boolean pTyped, boolean pSigned, int pBitWidth) {
 		this.iBigValue = new BigInteger(pStrVal, pRadix);
@@ -205,8 +201,7 @@ private IntegerValue(String pStrVal, int pRadix, boolean pTyped, boolean pSigned
 		this.iBitWidth = pBitWidth;
 	}
 
-	private static IntegerValue make(String pStrVal, int pRadix, boolean pTyped, boolean pSigned,
-			int pBitWidth) {
+	private static IntegerValue make(String pStrVal, int pRadix, boolean pTyped, boolean pSigned, int pBitWidth) {
 		IntegerValue val = new IntegerValue(pStrVal, pRadix, pTyped, pSigned, pBitWidth);
 		if (pTyped) {
 			if (!pSigned && val.isNegative()) {
@@ -226,7 +221,7 @@ private static IntegerValue make(String pStrVal, int pRadix, boolean pTyped, boo
 
 	/**
 	 * byteValue
-	 * 
+	 *
 	 * @return byte
 	 */
 	public byte byteValue() {
@@ -235,7 +230,7 @@ public byte byteValue() {
 
 	/**
 	 * shortValue
-	 * 
+	 *
 	 * @return short
 	 */
 	public short shortValue() {
@@ -244,7 +239,7 @@ public short shortValue() {
 
 	/**
 	 * intValue
-	 * 
+	 *
 	 * @return int
 	 */
 	public int intValue() {
@@ -253,7 +248,7 @@ public int intValue() {
 
 	/**
 	 * longValue
-	 * 
+	 *
 	 * @return long
 	 */
 	public long longValue() {
@@ -262,7 +257,7 @@ public long longValue() {
 
 	/**
 	 * bigIntValue
-	 * 
+	 *
 	 * @return BigInteger
 	 */
 	public BigInteger bigIntValue() {
@@ -271,7 +266,7 @@ public BigInteger bigIntValue() {
 
 	/**
 	 * isNegative
-	 * 
+	 *
 	 * @return true if the number is negative
 	 */
 	public boolean isNegative() {
@@ -280,7 +275,7 @@ public boolean isNegative() {
 
 	/**
 	 * isSigned
-	 * 
+	 *
 	 * @return true if the number is signed integer
 	 */
 	public boolean isSigned() {
@@ -290,7 +285,7 @@ public boolean isSigned() {
 
 	/**
 	 * bitLength
-	 * 
+	 *
 	 * @return the number of bits which is required for storing this integer
 	 *         value.
 	 */
@@ -302,7 +297,7 @@ public int bitLength() {
 
 	/**
 	 * getBitWidth
-	 * 
+	 *
 	 * @return 8, 16, 32 or 64
 	 */
 	public int getBitWidth() {
@@ -329,5 +324,4 @@ public String toString() {
 	public String getTypeInfo() {
 		return isSigned() ? "sint" : "uint" + getBitWidth();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/KeyValuePair.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/KeyValuePair.java
index bfbd819..05c760d 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/KeyValuePair.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/KeyValuePair.java
@@ -45,20 +45,18 @@
  * key_name "=" key_value
  */
 public class KeyValuePair {
-
 	private static final Pattern KEYNAMEPAT = Pattern.compile("^([A-Za-z][0-9A-Za-z_]*).*");
 
 	/**
 	 * Tries to get an KeyValuePair from the passed
 	 * pUriStr.
-	 * 
+	 *
 	 * @param pTyped
 	 * @param pUriStr
 	 * @return an KeyValuePair or null if failed.
 	 * @throws IllegalArgumentException
 	 */
-	public static KeyValuePair parse(boolean pTyped, URIString pUriStr)
-			throws IllegalArgumentException {
+	public static KeyValuePair parse(boolean pTyped, URIString pUriStr) throws IllegalArgumentException {
 		// TODO: tracing TRC.log(uriStr.toString());
 		URIString uriStr = pUriStr.deepCopy();
 		if (!uriStr.matchAndCut(KEYNAMEPAT, 1)) {
@@ -98,14 +96,15 @@ private KeyValuePair(String pKey, Value pValue, boolean pTyped) {
 	public String toString() {
 		StringBuffer buf = new StringBuffer(this.iKey + '=');
 		if (this.iTyped) buf.append('(' + this.iValue.getTypeInfo() + ')');
-		buf.append((this.iValue instanceof QuotedValue) ? ((QuotedValue) this.iValue)
-				.toQuotedString() : this.iValue.toString());
+		buf.append(
+			(this.iValue instanceof QuotedValue) ? ((QuotedValue) this.iValue).toQuotedString() : this.iValue.toString()
+		);
 		return buf.toString();
 	}
 
 	/**
 	 * getKey
-	 * 
+	 *
 	 * @return the key String
 	 */
 	public String getKey() {
@@ -114,11 +113,10 @@ public String getKey() {
 
 	/**
 	 * getValue
-	 * 
+	 *
 	 * @return the value String
 	 */
 	public Value getValue() {
 		return this.iValue;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/KeyValuePairs.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/KeyValuePairs.java
index 4dbf70a..40b9867 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/KeyValuePairs.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/KeyValuePairs.java
@@ -46,7 +46,6 @@
  * key_value_pair *("," key_value_pair)
  */
 public class KeyValuePairs extends Vector {
-
 	/**
 	 * serialVersionUID
 	 */
@@ -54,15 +53,14 @@ public class KeyValuePairs extends Vector {
 
 	/**
 	 * Tries to parse the key-value pairs from the passed pUriStr.
-	 * 
+	 *
 	 * @param pTyped
 	 * @param pUriStr
 	 * @return instance of UntypedKeyValuePairs or
 	 *         null if failed.
 	 * @throws IllegalArgumentException
 	 */
-	public static KeyValuePairs parse(boolean pTyped, URIString pUriStr)
-			throws IllegalArgumentException {
+	public static KeyValuePairs parse(boolean pTyped, URIString pUriStr) throws IllegalArgumentException {
 		// TODO: tracing TRC.log(uriStr.toString());
 		URIString uriStr = pUriStr.deepCopy();
 		KeyValuePairs pairs = new KeyValuePairs();
@@ -93,10 +91,8 @@ public String toString() {
 		StringBuffer dstBuf = new StringBuffer();
 		for (int i = 0; i < size(); i++) {
 			KeyValuePair pair = (KeyValuePair) elementAt(i);
-			if (sep != null) dstBuf.append(sep);
-			else sep = ",";
+			if (sep != null) dstBuf.append(sep); else sep = ",";
 			dstBuf.append(pair.toString());
-
 		}
 		return dstBuf.toString();
 	}
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/NamespaceHandle.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/NamespaceHandle.java
index 28f54b0..138bb14 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/NamespaceHandle.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/NamespaceHandle.java
@@ -52,7 +52,7 @@ public class NamespaceHandle {
 	/**
 	 * Factory method which tries to build a NamespaceHandle from
 	 * the passed pUriStr
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return a NamespaceHandle or null in case of
 	 *         failure
@@ -67,7 +67,9 @@ public static NamespaceHandle parse(URIString pUriStr) {
 		} else {
 			auth = null;
 		}
-		if (!uriStr.cutStarting('/')) { return null; }
+		if (!uriStr.cutStarting('/')) {
+			return null;
+		}
 		String nsName = parseNamespaceName(uriStr);
 		// namespaceName is optimal
 		pUriStr.set(uriStr);
@@ -85,7 +87,7 @@ private NamespaceHandle(Authority pAuth, String pNsName) {
 
 	/**
 	 * Constructs a NamespaceHandle with namespace name only.
-	 * 
+	 *
 	 * @param pNamespaceName
 	 */
 	public NamespaceHandle(String pNamespaceName) {
@@ -98,13 +100,12 @@ public NamespaceHandle(String pNamespaceName) {
 	 */
 	@Override
 	public String toString() {
-		return (this.iAuth == null ? "" : "//" + this.iAuth.toString()) + "/"
-				+ (this.iNsName == null ? "" : this.iNsName);
+		return (this.iAuth == null ? "" : "//" + this.iAuth.toString()) + "/" + (this.iNsName == null ? "" : this.iNsName);
 	}
 
 	/**
 	 * getName
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getName() {
@@ -113,7 +114,7 @@ public String getName() {
 
 	/**
 	 * getUserInfo
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getUserInfo() {
@@ -122,7 +123,7 @@ public String getUserInfo() {
 
 	/**
 	 * getHost
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getHost() {
@@ -131,7 +132,7 @@ public String getHost() {
 
 	/**
 	 * getPort
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getPort() {
@@ -140,12 +141,11 @@ public String getPort() {
 
 	private static final String IDENTIFIER = "[A-Za-z][0-9A-Za-z\\._-]*";
 
-	private static final Pattern NAMESPACENAME_PAT = Pattern.compile("^(" + IDENTIFIER + "(/"
-			+ IDENTIFIER + ")*).*");
+	private static final Pattern NAMESPACENAME_PAT = Pattern.compile("^(" + IDENTIFIER + "(/" + IDENTIFIER + ")*).*");
 
 	/**
 	 * IDENTIFIER *("/"IDENTIFIER)
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return String containing the namespace name or
 	 *         null if failed.
@@ -154,5 +154,4 @@ public static String parseNamespaceName(URIString pUriStr) {
 		if (!pUriStr.matchAndCut(NAMESPACENAME_PAT, 1)) return null;
 		return pUriStr.group(1);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/NamespacePath.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/NamespacePath.java
index 35618c5..d524db2 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/NamespacePath.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/NamespacePath.java
@@ -49,7 +49,6 @@
  * 
  */
 public class NamespacePath {
-
 	private String iNamespaceType;
 
 	private NamespaceHandle iNamespaceHandle;
@@ -61,7 +60,7 @@ protected NamespacePath(String pNamespaceType, NamespaceHandle pNamespaceHandle)
 
 	/**
 	 * Constructs a NamespacePath with namespace name only.
-	 * 
+	 *
 	 * @param pNamespaceName
 	 */
 	public NamespacePath(String pNamespaceName) {
@@ -70,7 +69,7 @@ public NamespacePath(String pNamespaceName) {
 
 	/**
 	 * Tries to parse a namespace path from the passed uriStr.
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return NamespacePath instance or null if
 	 *         failed.
@@ -85,7 +84,9 @@ public static NamespacePath parse(URIString pUriStr) {
 			if (!uriStr.cutStarting(':')) return null;
 		}
 		NamespaceHandle namespaceHandle = NamespaceHandle.parse(uriStr);
-		if (namespaceHandle == null) { return null; }
+		if (namespaceHandle == null) {
+			return null;
+		}
 		pUriStr.set(uriStr);
 		return new NamespacePath(namespaceType, namespaceHandle);
 	}
@@ -103,7 +104,7 @@ public String toString() {
 
 	/**
 	 * getNamespaceType
-	 * 
+	 *
 	 * @return the namespace type String
 	 */
 	public String getNamespaceType() {
@@ -112,7 +113,7 @@ public String getNamespaceType() {
 
 	/**
 	 * getNamespaceName
-	 * 
+	 *
 	 * @return the namespace name String
 	 */
 	public String getNamespaceName() {
@@ -121,7 +122,7 @@ public String getNamespaceName() {
 
 	/**
 	 * getUserInfo
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getUserInfo() {
@@ -130,7 +131,7 @@ public String getUserInfo() {
 
 	/**
 	 * getHost
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getHost() {
@@ -139,7 +140,7 @@ public String getHost() {
 
 	/**
 	 * getPort
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getPort() {
@@ -150,7 +151,7 @@ public String getPort() {
 
 	/**
 	 * namespaceType = ("http" ["s"]) / ("cimxml.wbem" ["s"])
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return the String containing the namespace type or null if
 	 *         failed.
@@ -159,5 +160,4 @@ private static String parseNamespaceType(URIString pUriStr) {
 		if (!pUriStr.matchAndCut(TYPE_PAT, 1)) return null;
 		return pUriStr.group(1);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/QuotedValue.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/QuotedValue.java
index 9308d2d..eb1c26a 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/QuotedValue.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/QuotedValue.java
@@ -44,12 +44,10 @@
  * printed in a quoted form.
  */
 public interface QuotedValue {
-
 	/**
 	 * Prints the String representation in a quoted form.
-	 * 
+	 *
 	 * @return String
 	 */
 	public String toQuotedString();
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/RealValue.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/RealValue.java
index 4223a8f..c3b3edd 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/RealValue.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/RealValue.java
@@ -42,7 +42,6 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
 import org.metricshub.wbem.sblim.cimclient.internal.util.Util;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
@@ -51,7 +50,6 @@
  * Class RealValue parses and encapsulates real values.
  */
 public class RealValue extends Value {
-
 	private double iValue;
 
 	private boolean iDoublePrec;
@@ -61,13 +59,12 @@ public class RealValue extends Value {
 	/**
 	 * realValue = [ "+" | "-" ] *decimalDigit "." 1*decimalDigit [ ( "e" | "E"
 	 * ) [ "+" | "-" ] 1*decimalDigit ] parse
-	 * 
+	 *
 	 * @param pUriStr
 	 * @param pDoublePrec
 	 * @return Value
 	 */
-	private static Value parse(URIString pUriStr, boolean pDoublePrec, boolean pThrow)
-			throws IllegalArgumentException {
+	private static Value parse(URIString pUriStr, boolean pDoublePrec, boolean pThrow) throws IllegalArgumentException {
 		URIString uriStr = pUriStr.deepCopy();
 		// get the substring till the next ',' or end of pUriStr
 		String strVal = uriStr.removeTill(',');
@@ -90,15 +87,15 @@ private static Value parse(URIString pUriStr, boolean pDoublePrec, boolean pThro
 		try {
 			if (WBEMConfiguration.getGlobalConfiguration().verifyJavaLangDoubleStrings()) {
 				if (Util.isBadDoubleString(strVal)) throw new IllegalArgumentException(
-						"Double value string hangs older JVMs!\n" + pUriStr.markPosition());
+					"Double value string hangs older JVMs!\n" + pUriStr.markPosition()
+				);
 			}
 			double val = Double.parseDouble(strVal);
 			pUriStr.set(uriStr);
 			return new RealValue(val, pDoublePrec);
 		} catch (NumberFormatException e) {
 			if (pThrow) {
-				String msg = "Illegal number format!\n" + pUriStr.markPosition()
-						+ "Nested message:\n" + e.getMessage();
+				String msg = "Illegal number format!\n" + pUriStr.markPosition() + "Nested message:\n" + e.getMessage();
 				throw new IllegalArgumentException(msg);
 			}
 			return null;
@@ -107,7 +104,7 @@ private static Value parse(URIString pUriStr, boolean pDoublePrec, boolean pThro
 
 	/**
 	 * Parses a RealValue as a double precision value.
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return Value
 	 */
@@ -117,7 +114,7 @@ public static Value parse(URIString pUriStr) {
 
 	/**
 	 * parseFloat
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return Value
 	 * @throws IllegalArgumentException
@@ -129,7 +126,7 @@ public static Value parseFloat(URIString pUriStr) throws IllegalArgumentExceptio
 
 	/**
 	 * parseDouble
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return Value
 	 * @throws IllegalArgumentException
@@ -146,7 +143,7 @@ private RealValue(double pValue, boolean pDoublePrec) {
 
 	/**
 	 * isDouble
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isDouble() {
@@ -155,7 +152,7 @@ public boolean isDouble() {
 
 	/**
 	 * floatValue
-	 * 
+	 *
 	 * @return float
 	 */
 	public float floatValue() {
@@ -164,7 +161,7 @@ public float floatValue() {
 
 	/**
 	 * doubleValue
-	 * 
+	 *
 	 * @return double
 	 */
 	public double doubleValue() {
@@ -187,5 +184,4 @@ public String getTypeInfo() {
 		if (this.iDoublePrec) return MOF.DT_REAL64;
 		return MOF.DT_REAL32;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/ReferenceValue.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/ReferenceValue.java
index c2039d4..7a110a9 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/ReferenceValue.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/ReferenceValue.java
@@ -46,12 +46,11 @@
  * Class UntypedReferenceValue encapsulates an untyped reference value.
  */
 public class ReferenceValue extends Value implements QuotedValue {
-
 	private URI iRef;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pRef
 	 */
 	public ReferenceValue(URI pRef) {
@@ -75,7 +74,7 @@ public String toQuotedString() {
 
 	/**
 	 * getRef
-	 * 
+	 *
 	 * @return URI
 	 */
 	public URI getRef() {
@@ -89,5 +88,4 @@ public URI getRef() {
 	public String getTypeInfo() {
 		return MOF.REFERENCE;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/StringValue.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/StringValue.java
index 50dcd6d..dd678fe 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/StringValue.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/StringValue.java
@@ -46,7 +46,6 @@
  * Class UntypedStringValue parses an untyped string value.
  */
 public class StringValue extends Value implements QuotedValue {
-
 	private static final int NORMAL = 0;
 
 	private static final int ESCAPED = 1;
@@ -55,7 +54,7 @@ public class StringValue extends Value implements QuotedValue {
 
 	/**
 	 * Factory method for parsing quoted strings.
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return Value instance
 	 * @throws IllegalArgumentException
@@ -128,5 +127,4 @@ public String toQuotedString() {
 	public String getTypeInfo() {
 		return MOF.DT_STR;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Test.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Test.java
index 063e240..add067d 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Test.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Test.java
@@ -46,92 +46,92 @@
  * Class Test is responsible for testing the WBEM-URI String parsing.
  */
 public class Test {
-
 	private static String cUriArray[] = {
-
-			"//www.acme.com/root/cimv2",
-
-			"//www.acme.com/root/cimv2:CIM_RegisteredProfile",
-
-			"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile",
-
-			"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile."
-					+ "Cool=\"Hey! It's a string\"",
-
-			"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile.ThisShouldBeAnInt=0",
-
-			"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile."
-					+ "Cool=\"Hey! It's a string\","
-					+ "Yeah=\"Gee! \\\"It's an embedded string\\\"\"",
-
-			"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile."
-			// +
-					// "SelfRef=\"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile\"",
-					+ "InstRef=\"CIM_RegisteredProfile.IntKey=10\"",
-			"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile."
-					+ "Yeah="
-					+ Util.quote("Gee! " + Util.quote("It's an embedded string"))
-					+ ",Ref="
-					+ Util.quote(// "https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile."
-							"root/cimv2:CIM_RegisteredProfile." + "Yeah="
-									+ Util.quote("Gee! " + Util.quote("It's an embedded string"))),
-
-			"https://jdd:test@64.202.189.170:5959/cimv2:CIM_RegisteredProfile."
-					+ "Yeah="
-					+ Util.quote("Gee! " + Util.quote("It's an embedded string"))
-					+ ",Ref="
-					+ Util.quote(// "https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile."
-							"CIM_RegisteredProfile." + "Yeah="
-									+ Util.quote("Gee! " + Util.quote("It's an embedded string"))),
-
-			"https://64.202.189.170:5959/cimv2:CIM_RegisteredProfile."
-					+ "Yeah="
-					+ Util.quote("Gee! " + Util.quote("It's an embedded string"))
-					+ ",Ref="
-					+ Util.quote(// "https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile."
-							"CIM_RegisteredProfile." + "Yeah="
-									+ Util.quote("Gee! " + Util.quote("It's an embedded string"))),
-
-			"https://64.202.189.170:5959/cimv2:CIM_RegisteredProfile."
-					+ "Yeah="
-					+ Util.quote("Gee! " + Util.quote("It's an embedded string"))
-					+ ",Ref="
-					+ Util.quote("CIM_RegisteredProfile." + "Yeah="
-							+ Util.quote("Gee! " + Util.quote("It's an embedded string")))
-					+ ",CharKey0='a'" + ",CharKey1='\\x32'" + ",boolKeyT=True" + ",boolKeyF=False"
-					+ ",binValP=01011010b" + ",binValN=-01011010b" + ",octValP=0644"
-					+ ",octValN=-0644" + ",decValP=1848" + ",decValN=-1848" + ",hexValP=0x55aa"
-					+ ",hexValN=-0x55aa" + ",realValP=+23.566e-23" + ",realValN=-23.566e+23"
-					+ ",dtAbs=" + Util.quote("20061027112135.600123+001") + ",dtInv="
-					+ Util.quote("00000042123625.600123:000"),
-
-			/*
-			 * Typed URI strings
-			 */
-			"https://64.202.189.170:5959/cimv2/(instance)CIM_RegisteredProfile."
-					+ "Yeah=(string)"
-					+ Util.quote("Gee! " + Util.quote("It's an embedded string"))
-					+ ",uInt32=(uint32)100000"
-					+ ",Real32=(real32)3.14"
-					+ ",dtAbs=(datetime)"
-					+ Util.quote("20061027112135.600123+001")
-					+ ",dtInv=(datetime)"
-					+ Util.quote("00000042123625.600123:000")
-					+ ",Bool=(boolean)true"
-					+ ",Char=(char16)'x'"
-					+ ",Ref=(reference)"
-					+ Util.quote("/(instance)CIM_RegisteredProfile." + "Yeah=(string)"
-							+ Util.quote("Gee! " + Util.quote("It's an embedded string"))
-							+ ",ClassRef=(reference)"
-							+ Util.quote("/(instance)CIM_Gyurcsany.Key=(uint8)10"))
-					+ ",RefWithNS=(reference)"
-					+ Util.quote("root/cimv2/(instance)CIM_Orban.Key=(uint8)42")
-
+		"//www.acme.com/root/cimv2",
+		"//www.acme.com/root/cimv2:CIM_RegisteredProfile",
+		"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile",
+		"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile." + "Cool=\"Hey! It's a string\"",
+		"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile.ThisShouldBeAnInt=0",
+		"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile." +
+		"Cool=\"Hey! It's a string\"," +
+		"Yeah=\"Gee! \\\"It's an embedded string\\\"\"",
+		"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile." +
+		// +
+		// "SelfRef=\"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile\"",
+		"InstRef=\"CIM_RegisteredProfile.IntKey=10\"",
+		"https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile." +
+		"Yeah=" +
+		Util.quote("Gee! " + Util.quote("It's an embedded string")) +
+		",Ref=" +
+		Util.quote( // "https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile."
+			"root/cimv2:CIM_RegisteredProfile." + "Yeah=" + Util.quote("Gee! " + Util.quote("It's an embedded string"))
+		),
+		"https://jdd:test@64.202.189.170:5959/cimv2:CIM_RegisteredProfile." +
+		"Yeah=" +
+		Util.quote("Gee! " + Util.quote("It's an embedded string")) +
+		",Ref=" +
+		Util.quote( // "https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile."
+			"CIM_RegisteredProfile." + "Yeah=" + Util.quote("Gee! " + Util.quote("It's an embedded string"))
+		),
+		"https://64.202.189.170:5959/cimv2:CIM_RegisteredProfile." +
+		"Yeah=" +
+		Util.quote("Gee! " + Util.quote("It's an embedded string")) +
+		",Ref=" +
+		Util.quote( // "https://jdd:test@acme.com:5959/cimv2:CIM_RegisteredProfile."
+			"CIM_RegisteredProfile." + "Yeah=" + Util.quote("Gee! " + Util.quote("It's an embedded string"))
+		),
+		"https://64.202.189.170:5959/cimv2:CIM_RegisteredProfile." +
+		"Yeah=" +
+		Util.quote("Gee! " + Util.quote("It's an embedded string")) +
+		",Ref=" +
+		Util.quote("CIM_RegisteredProfile." + "Yeah=" + Util.quote("Gee! " + Util.quote("It's an embedded string"))) +
+		",CharKey0='a'" +
+		",CharKey1='\\x32'" +
+		",boolKeyT=True" +
+		",boolKeyF=False" +
+		",binValP=01011010b" +
+		",binValN=-01011010b" +
+		",octValP=0644" +
+		",octValN=-0644" +
+		",decValP=1848" +
+		",decValN=-1848" +
+		",hexValP=0x55aa" +
+		",hexValN=-0x55aa" +
+		",realValP=+23.566e-23" +
+		",realValN=-23.566e+23" +
+		",dtAbs=" +
+		Util.quote("20061027112135.600123+001") +
+		",dtInv=" +
+		Util.quote("00000042123625.600123:000"),
+		/*
+		 * Typed URI strings
+		 */
+		"https://64.202.189.170:5959/cimv2/(instance)CIM_RegisteredProfile." +
+		"Yeah=(string)" +
+		Util.quote("Gee! " + Util.quote("It's an embedded string")) +
+		",uInt32=(uint32)100000" +
+		",Real32=(real32)3.14" +
+		",dtAbs=(datetime)" +
+		Util.quote("20061027112135.600123+001") +
+		",dtInv=(datetime)" +
+		Util.quote("00000042123625.600123:000") +
+		",Bool=(boolean)true" +
+		",Char=(char16)'x'" +
+		",Ref=(reference)" +
+		Util.quote(
+			"/(instance)CIM_RegisteredProfile." +
+			"Yeah=(string)" +
+			Util.quote("Gee! " + Util.quote("It's an embedded string")) +
+			",ClassRef=(reference)" +
+			Util.quote("/(instance)CIM_Gyurcsany.Key=(uint8)10")
+		) +
+		",RefWithNS=(reference)" +
+		Util.quote("root/cimv2/(instance)CIM_Orban.Key=(uint8)42")
 	};
 
 	/**
 	 * main
-	 * 
+	 *
 	 * @param args
 	 */
 	public static void main(String args[]) {
@@ -156,20 +156,28 @@ public static void main(String args[]) {
 			for (int j = 0; j < pairs.size(); j++) {
 				KeyValuePair pair = (KeyValuePair) pairs.elementAt(j);
 				Value value = pair.getValue();
-				System.out.println("key : " + pair.getKey() + "\n  " + getTypeStr(value) + " : "
-						+ pair.getValue().toString() + " " + getIntProps(value));
+				System.out.println(
+					"key : " +
+					pair.getKey() +
+					"\n  " +
+					getTypeStr(value) +
+					" : " +
+					pair.getValue().toString() +
+					" " +
+					getIntProps(value)
+				);
 			}
 		}
 	}
 
 	private static String getTypeStr(Value pVal) {
-		if (pVal instanceof ReferenceValue) return "refValue";
-		else if (pVal instanceof StringValue) return "strValue";
-		else if (pVal instanceof CharValue) return "chrValue";
-		else if (pVal instanceof BooleanValue) return "boolValue";
-		else if (pVal instanceof DateTimeValue) return "dateTimeVal";
-		else if (pVal instanceof IntegerValue) return "intValue";
-		else if (pVal instanceof RealValue) return "realValue";
+		if (pVal instanceof ReferenceValue) return "refValue"; else if (
+			pVal instanceof StringValue
+		) return "strValue"; else if (pVal instanceof CharValue) return "chrValue"; else if (
+			pVal instanceof BooleanValue
+		) return "boolValue"; else if (pVal instanceof DateTimeValue) return "dateTimeVal"; else if (
+			pVal instanceof IntegerValue
+		) return "intValue"; else if (pVal instanceof RealValue) return "realValue";
 		return pVal.getClass().getName();
 	}
 
@@ -178,5 +186,4 @@ private static String getIntProps(Value pVal) {
 		IntegerValue intVal = (IntegerValue) pVal;
 		return "sigend=" + intVal.isSigned() + ", bitWidth=" + intVal.getBitWidth();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URI.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URI.java
index 7836d18..54a8c08 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URI.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URI.java
@@ -43,21 +43,20 @@
  */
 
 import java.util.regex.Pattern;
-
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
 
 /**
  * 
        *    untypedNamespacePath	=	namespacePath
- *   
+ *
  *    untypedClassPath		=	namespacePath ":" className
- *    
+ *
  *    untypedInstancePath	=	namespacePath ":" className "." key_value_pairs
- *    
+ *
  *    typedNamespacePath	=	namespacePath "/(namespace)"
- *   
+ *
  *    typedClassPath		=	namespacePath "/(class)" className
- *   
+ *
  *    typedInstancePath	= 	namespacePath "/(instance)" className "." typed_key_value_pairs
  * 
      
  */
@@ -65,7 +64,7 @@ public class URI {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pUri
 	 * @return URI
 	 * @throws IllegalArgumentException
@@ -82,8 +81,7 @@ public static URI parse(String pUri) throws IllegalArgumentException {
 		boolean typed = uriType != null;
 		if (uriStr.length() == 0) {
 			if (typed && uriType != NAMESPACE) {
-				String msg = uriType + " excepted but " + NAMESPACE + " found!\n"
-						+ uriStr.markPosition();
+				String msg = uriType + " excepted but " + NAMESPACE + " found!\n" + uriStr.markPosition();
 				throw new IllegalArgumentException(msg);
 			}
 			return new URI(nsPath, uriType, null, null);
@@ -95,8 +93,7 @@ public static URI parse(String pUri) throws IllegalArgumentException {
 		String className = parseClassName(uriStr, typed);
 		if (uriStr.length() == 0) {
 			if (typed && uriType != CLASS) {
-				String msg = uriType + " expected but " + CLASS + " found!\n"
-						+ uriStr.markPosition();
+				String msg = uriType + " expected but " + CLASS + " found!\n" + uriStr.markPosition();
 				throw new IllegalArgumentException(msg);
 			}
 			return new URI(nsPath, uriType, className, null);
@@ -107,16 +104,16 @@ public static URI parse(String pUri) throws IllegalArgumentException {
 
 	/**
 	 * 
      -	 *  referenceValue			=	[ namespaceName ":" ] className "." 
+	 *  referenceValue			=	[ namespaceName ":" ] className "."
 	 * 								untyped_key_value_pairs
-	 * 
+	 *
 	 *  typed_reference_value		=	"(reference)" "\"" typedReferenceValue "\""
-	 *  
+	 *
 	 *  // according to Alexander we have to support instance references only
 	 *  typedReferenceValue	=	[ namespaceName ] "/(instance)" className "."
 	 *  							typed_key_value_pairs
 	 * 
      
-	 * 
+	 *
 	 * @param pUriStr
 	 * @param pTyped
 	 * @return URI
@@ -143,14 +140,12 @@ public static URI parseRef(URIString pUriStr, boolean pTyped) throws IllegalArgu
 		if (uriStr.length() == 0) {
 			if (pTyped) return new URI(null, className, null, pTyped);
 			// untyped reference can be instance reference only
-			String msg = "Untyped reference can be instance reference only!\n"
-					+ uriStr.markPosition();
+			String msg = "Untyped reference can be instance reference only!\n" + uriStr.markPosition();
 			throw new IllegalArgumentException(msg);
 		}
 		KeyValuePairs keyValuePairs = parseKeyValuePairs(uriStr, pTyped);
 		if (keyValuePairs == null) {
-			String msg = "Property reference must contain key-value pairs!\n"
-					+ uriStr.markPosition();
+			String msg = "Property reference must contain key-value pairs!\n" + uriStr.markPosition();
 			throw new IllegalArgumentException(msg);
 		}
 		pUriStr.set(uriStr);
@@ -159,7 +154,7 @@ public static URI parseRef(URIString pUriStr, boolean pTyped) throws IllegalArgu
 
 	/**
 	 * getNamespaceType
-	 * 
+	 *
 	 * @return String or null if not set
 	 */
 	public String getNamespaceType() {
@@ -168,7 +163,7 @@ public String getNamespaceType() {
 
 	/**
 	 * getNamespaceName
-	 * 
+	 *
 	 * @return String or null if not set
 	 */
 	public String getNamespaceName() {
@@ -177,7 +172,7 @@ public String getNamespaceName() {
 
 	/**
 	 * getUserInfo
-	 * 
+	 *
 	 * @return String or null if not set
 	 */
 	public String getUserInfo() {
@@ -186,7 +181,7 @@ public String getUserInfo() {
 
 	/**
 	 * getHost Userinfo is attached if exists.
-	 * 
+	 *
 	 * @return String or null if not set
 	 */
 	public String getHost() {
@@ -198,7 +193,7 @@ public String getHost() {
 
 	/**
 	 * getPort
-	 * 
+	 *
 	 * @return String or null if not set
 	 */
 	public String getPort() {
@@ -207,7 +202,7 @@ public String getPort() {
 
 	/**
 	 * getClassName
-	 * 
+	 *
 	 * @return String or null if not set
 	 */
 	public String getClassName() {
@@ -216,7 +211,7 @@ public String getClassName() {
 
 	/**
 	 * getKeyValuePairs
-	 * 
+	 *
 	 * @return KeyValuePairs or null if not set
 	 */
 	public KeyValuePairs getKeyValuePairs() {
@@ -230,8 +225,7 @@ public KeyValuePairs getKeyValuePairs() {
 	public String toString() {
 		StringBuffer buf = new StringBuffer();
 		if (this.iNamespacePath != null) {
-			if (this.iIsRef) buf.append(getNamespaceName());
-			else buf.append(this.iNamespacePath.toString());
+			if (this.iIsRef) buf.append(getNamespaceName()); else buf.append(this.iNamespacePath.toString());
 		}
 		if (this.iUriType != null) buf.append("/(" + this.iUriType + ")");
 		if (this.iClassName != null) {
@@ -250,14 +244,13 @@ public String toString() {
 
 	/**
 	 * Constructor for URI paths.
-	 * 
+	 *
 	 * @param pNamespacePath
 	 * @param pUriType
 	 * @param pClassName
 	 * @param pKeyValuePairs
 	 */
-	private URI(NamespacePath pNamespacePath, String pUriType, String pClassName,
-			KeyValuePairs pKeyValuePairs) {
+	private URI(NamespacePath pNamespacePath, String pUriType, String pClassName, KeyValuePairs pKeyValuePairs) {
 		this.iNamespacePath = pNamespacePath;
 		this.iUriType = pUriType;
 		this.iClassName = pClassName;
@@ -267,14 +260,13 @@ private URI(NamespacePath pNamespacePath, String pUriType, String pClassName,
 
 	/**
 	 * Constructor for reference property values.
-	 * 
+	 *
 	 * @param pNamespaceName
 	 * @param pClassName
 	 * @param pKeyValuePairs
 	 * @param pTyped
 	 */
-	private URI(String pNamespaceName, String pClassName, KeyValuePairs pKeyValuePairs,
-			boolean pTyped) {
+	private URI(String pNamespaceName, String pClassName, KeyValuePairs pKeyValuePairs, boolean pTyped) {
 		if (pNamespaceName == null && pClassName == null) {
 			String msg = "pNamespaceName or pClassName must be set!";
 			throw new IllegalArgumentException(msg);
@@ -285,9 +277,8 @@ private URI(String pNamespaceName, String pClassName, KeyValuePairs pKeyValuePai
 		}
 		this.iNamespacePath = pNamespaceName == null ? null : new NamespacePath(pNamespaceName);
 		if (pTyped) {
-			if (pKeyValuePairs != null) this.iUriType = INSTANCE;
-			else if (pClassName != null) this.iUriType = CLASS;
-			else this.iUriType = NAMESPACE;
+			if (pKeyValuePairs != null) this.iUriType = INSTANCE; else if (pClassName != null) this.iUriType =
+				CLASS; else this.iUriType = NAMESPACE;
 		} else this.iUriType = null;
 		this.iClassName = pClassName;
 		this.iKeyValuePairs = pKeyValuePairs;
@@ -307,12 +298,11 @@ private URI(String pNamespaceName, String pClassName, KeyValuePairs pKeyValuePai
 
 	private boolean iIsRef;
 
-	private static final String NAMESPACE = MOF.NAMESPACE, CLASS = MOF.CLASS,
-			INSTANCE = MOF.INSTANCE;
+	private static final String NAMESPACE = MOF.NAMESPACE, CLASS = MOF.CLASS, INSTANCE = MOF.INSTANCE;
 
 	/**
 	 * uriType = "/(" ( "namespace" / "class" / "instance" ) ")"
-	 * 
+	 *
 	 * @param pUriStr
 	 * @return NAMESPACE | CLASS | INSTANCE
 	 */
@@ -321,10 +311,8 @@ private static String parseUriType(URIString pUriStr) {
 		if (!uriStr.cutStarting("/(")) return null;
 		String typeStr = uriStr.removeTill(')', true, true);
 		if (typeStr == null) return null;
-		if (typeStr.equalsIgnoreCase(NAMESPACE)) typeStr = NAMESPACE;
-		else if (typeStr.equalsIgnoreCase(CLASS)) typeStr = CLASS;
-		else if (typeStr.equalsIgnoreCase(INSTANCE)) typeStr = INSTANCE;
-		else return null;
+		if (typeStr.equalsIgnoreCase(NAMESPACE)) typeStr = NAMESPACE; else if (typeStr.equalsIgnoreCase(CLASS)) typeStr =
+			CLASS; else if (typeStr.equalsIgnoreCase(INSTANCE)) typeStr = INSTANCE; else return null;
 		pUriStr.set(uriStr);
 		return typeStr;
 	}
@@ -342,8 +330,7 @@ private static String parseUriType(URIString pUriStr) {
 	/**
 	 * @param pTyped
 	 */
-	private static String parseClassName(URIString pUriStr, boolean pTyped)
-			throws IllegalArgumentException {
+	private static String parseClassName(URIString pUriStr, boolean pTyped) throws IllegalArgumentException {
 		if (!pUriStr.matchAndCut(PAT, 1)) {
 			String msg = "className expected!\n" + pUriStr.markPosition();
 			throw new IllegalArgumentException(msg);
@@ -352,8 +339,7 @@ private static String parseClassName(URIString pUriStr, boolean pTyped)
 		return className;
 	}
 
-	private static KeyValuePairs parseKeyValuePairs(URIString pUriStr, boolean pTyped)
-			throws IllegalArgumentException {
+	private static KeyValuePairs parseKeyValuePairs(URIString pUriStr, boolean pTyped) throws IllegalArgumentException {
 		if (!pUriStr.cutStarting('.')) {
 			String msg = "'.' expected!\n" + pUriStr.markPosition();
 			throw new IllegalArgumentException(msg);
@@ -365,5 +351,4 @@ private static KeyValuePairs parseKeyValuePairs(URIString pUriStr, boolean pType
 		}
 		return keyValuePairs;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URIString.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URIString.java
index c18231b..4e81ed4 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URIString.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URIString.java
@@ -51,16 +51,26 @@ public class URIString extends Object implements CharSequence {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pCharArray
 	 * @param pStart
 	 * @param pEnd
 	 */
 	public URIString(char[] pCharArray, int pStart, int pEnd) {
 		if (pEnd < pStart) throw new IndexOutOfBoundsException("end:" + pEnd + " < start:" + pStart);
-		if (pEnd > pCharArray.length) throw new IndexOutOfBoundsException("charArray.length:"
-				+ pCharArray.length + ", start:" + pStart + ", end:" + pEnd + "\n" + "end:" + pEnd
-				+ " > charArray.length:" + pCharArray.length);
+		if (pEnd > pCharArray.length) throw new IndexOutOfBoundsException(
+			"charArray.length:" +
+			pCharArray.length +
+			", start:" +
+			pStart +
+			", end:" +
+			pEnd +
+			"\n" +
+			"end:" +
+			pEnd +
+			" > charArray.length:" +
+			pCharArray.length
+		);
 		this.iCA = pCharArray;
 		this.iInitStart = this.iStart = pStart;
 		this.iEnd = pEnd;
@@ -68,7 +78,7 @@ public URIString(char[] pCharArray, int pStart, int pEnd) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pCharArray
 	 */
 	public URIString(char[] pCharArray) {
@@ -77,7 +87,7 @@ public URIString(char[] pCharArray) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStr
 	 */
 	public URIString(String pStr) {
@@ -86,7 +96,7 @@ public URIString(String pStr) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pUriStr
 	 */
 	public URIString(URIString pUriStr) {
@@ -95,7 +105,7 @@ public URIString(URIString pUriStr) {
 
 	/**
 	 * set
-	 * 
+	 *
 	 * @param pUriStr
 	 */
 	public void set(URIString pUriStr) {
@@ -106,7 +116,7 @@ public void set(URIString pUriStr) {
 
 	/**
 	 * deepCopy
-	 * 
+	 *
 	 * @return URIString instance
 	 */
 	public URIString deepCopy() {
@@ -115,13 +125,12 @@ public URIString deepCopy() {
 
 	/**
 	 * find
-	 * 
+	 *
 	 * @param pChar
 	 * @return Position of pChar or -1 if not found.
 	 */
 	public int find(char pChar) {
-		for (int i = 0; i < length(); i++)
-			if (charAt(i) == pChar) return i;
+		for (int i = 0; i < length(); i++) if (charAt(i) == pChar) return i;
 		return -1;
 	}
 
@@ -156,7 +165,7 @@ public String toString() {
 
 	/**
 	 * toInitString
-	 * 
+	 *
 	 * @return The String which was used for initializing this instance.
 	 */
 	public String toInitString() {
@@ -165,7 +174,7 @@ public String toInitString() {
 
 	/**
 	 * getPos
-	 * 
+	 *
 	 * @return The position of parsing.
 	 */
 	public int getPos() {
@@ -174,7 +183,7 @@ public int getPos() {
 
 	/**
 	 * markPosition
-	 * 
+	 *
 	 * @return a String which marks the position of parsing.
 	 */
 	public String markPosition() {
@@ -183,15 +192,14 @@ public String markPosition() {
 
 	/**
 	 * markPosition
-	 * 
+	 *
 	 * @param pPos
 	 * @return a String which marks position pPos.
 	 */
 	public String markPosition(int pPos) {
 		StringBuffer buf = new StringBuffer();
 		buf.append(toInitString() + '\n');
-		for (int i = 0; i < pPos; i++)
-			buf.append(' ');
+		for (int i = 0; i < pPos; i++) buf.append(' ');
 		buf.append("^\n");
 		return buf.toString();
 	}
@@ -200,7 +208,7 @@ public String markPosition(int pPos) {
 	 * Returns a new string that is a substring of this string. The substring
 	 * begins at the specified pBeginIdx and extends to the character at index
 	 * pEndIdx - 1. Thus the length of the substring is pEndIdx-pBeginIdx.
-	 * 
+	 *
 	 * @param pBeginIdx
 	 * @param pEndIdx
 	 * @return String
@@ -211,7 +219,7 @@ public String substring(int pBeginIdx, int pEndIdx) {
 
 	/**
 	 * startsWith
-	 * 
+	 *
 	 * @param pC
 	 * @return true if the first character is pC.
 	 */
@@ -229,7 +237,7 @@ public void cutStarting() {
 
 	/**
 	 * Cuts out the first character if it is pC.
-	 * 
+	 *
 	 * @param pC
 	 * @return true if cut is done.
 	 */
@@ -243,21 +251,20 @@ public boolean cutStarting(char pC) {
 
 	/**
 	 * Cuts out pSeq from the beginning if it is there.
-	 * 
+	 *
 	 * @param pSeq
 	 * @return true if cut is done.
 	 */
 	public boolean cutStarting(CharSequence pSeq) {
 		if (pSeq.length() > length()) return false;
-		for (int i = 0; i < pSeq.length(); i++)
-			if (charAt(i) != pSeq.charAt(i)) return false;
+		for (int i = 0; i < pSeq.length(); i++) if (charAt(i) != pSeq.charAt(i)) return false;
 		this.iStart += pSeq.length();
 		return true;
 	}
 
 	/**
 	 * Cuts out pStr from the beginning if it is there.
-	 * 
+	 *
 	 * @param pStr
 	 * @param pIgnoreCase
 	 * @return true if cut is done.
@@ -274,12 +281,11 @@ public boolean cutStarting(String pStr, boolean pIgnoreCase) {
 
 	/**
 	 * Cuts out pChars pieces of characters from the beginning.
-	 * 
+	 *
 	 * @param pChars
 	 */
 	public void cutStarting(int pChars) {
-		if (pChars > length()) throw new IndexOutOfBoundsException("chars:" + pChars
-				+ " > length()" + length());
+		if (pChars > length()) throw new IndexOutOfBoundsException("chars:" + pChars + " > length()" + length());
 		this.iStart += pChars;
 	}
 
@@ -287,7 +293,7 @@ public void cutStarting(int pChars) {
 	 * Removes the beginning of the string till the first occurrence of pChar or
 	 * removes the whole string if it doesn't contain pChar and pMustFound is
 	 * false.
-	 * 
+	 *
 	 * @param pChar
 	 * @param pRemoveChar
 	 *            if true pChar will be removed too
@@ -309,7 +315,7 @@ public String removeTill(char pChar, boolean pRemoveChar, boolean pMustFound) {
 
 	/**
 	 * removeTill(pChar, pRemoveChar, false);
-	 * 
+	 *
 	 * @param pChar
 	 * @param pRemoveChar
 	 * @return String
@@ -321,7 +327,7 @@ public String removeTill(char pChar, boolean pRemoveChar) {
 
 	/**
 	 * removeTill(pChar, false, false);
-	 * 
+	 *
 	 * @param pChar
 	 * @return String
 	 * @see #removeTill(char, boolean, boolean)
@@ -333,7 +339,7 @@ public String removeTill(char pChar) {
 	/**
 	 * Matches pattern pPat and cuts out the beginning till the end
 	 * of matcher group pGroup.
-	 * 
+	 *
 	 * @param pPat
 	 * @param pGroup
 	 * @return true if pattern is matched and cut was done.
@@ -360,5 +366,4 @@ public String group(int pI) {
 	private int iInitStart, iStart, iEnd;
 
 	private Matcher iM;
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Value.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Value.java
index 8632245..edd5bac 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Value.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/Value.java
@@ -48,7 +48,7 @@ public abstract class Value {
 
 	/**
 	 * Factory method which tries to parse an untyped value.
-	 * 
+	 *
 	 * @param pTyped
 	 * @param pUriStr
 	 * @return Value instance
@@ -78,10 +78,12 @@ public static Value parse(boolean pTyped, URIString pUriStr) throws IllegalArgum
 			return value;
 		} catch (IllegalArgumentException e) {
 			// non string like value
-			if ((value = IntegerValue.parse(uriStr)) != null
-					|| (value = RealValue.parse(uriStr)) != null
-					|| (value = BooleanValue.parse(uriStr)) != null
-					|| (value = CharValue.parse(uriStr)) != null) {
+			if (
+				(value = IntegerValue.parse(uriStr)) != null ||
+				(value = RealValue.parse(uriStr)) != null ||
+				(value = BooleanValue.parse(uriStr)) != null ||
+				(value = CharValue.parse(uriStr)) != null
+			) {
 				pUriStr.set(uriStr);
 				return value;
 			}
@@ -92,7 +94,7 @@ public static Value parse(boolean pTyped, URIString pUriStr) throws IllegalArgum
 
 	/**
 	 * getTypeInfo
-	 * 
+	 *
 	 * @return the type description string of the Value.
 	 */
 	public abstract String getTypeInfo();
@@ -142,8 +144,13 @@ private static Value parseTypedValue(URIString pUriStr) throws IllegalArgumentEx
 				val = null;
 			}
 		} catch (IllegalArgumentException e) {
-			String msg = "Failed to parse " + typeInfo + " value!\n"
-					+ uriStr.markPosition(valuePos) + "Nested message:\n" + e.getMessage();
+			String msg =
+				"Failed to parse " +
+				typeInfo +
+				" value!\n" +
+				uriStr.markPosition(valuePos) +
+				"Nested message:\n" +
+				e.getMessage();
 			throw new IllegalArgumentException(msg);
 		}
 		if (val == null) {
@@ -160,8 +167,11 @@ private static Value parseTypedReference(URIString pUriStr) throws IllegalArgume
 		try {
 			strVal = StringValue.parse(pUriStr);
 		} catch (IllegalArgumentException e) {
-			String msg = "Failed to retrieve typed reference string!\n" + pUriStr.markPosition()
-					+ "Nested message is:\n" + e.getMessage();
+			String msg =
+				"Failed to retrieve typed reference string!\n" +
+				pUriStr.markPosition() +
+				"Nested message is:\n" +
+				e.getMessage();
 			throw new IllegalArgumentException(msg);
 		}
 		URIString refUriStr = new URIString(strVal.toString());
@@ -169,8 +179,11 @@ private static Value parseTypedReference(URIString pUriStr) throws IllegalArgume
 			URI ref = URI.parseRef(refUriStr, true);
 			return new ReferenceValue(ref);
 		} catch (IllegalArgumentException e) {
-			String msg = "Failed to parse typed reference value!\n" + pUriStr.markPosition(pos)
-					+ "Nested message is:\n" + e.getMessage();
+			String msg =
+				"Failed to parse typed reference value!\n" +
+				pUriStr.markPosition(pos) +
+				"Nested message is:\n" +
+				e.getMessage();
 			throw new IllegalArgumentException(msg);
 		}
 	}
@@ -180,8 +193,11 @@ private static Value parseTypedDateTime(URIString pUriStr) throws IllegalArgumen
 		try {
 			strVal = StringValue.parse(pUriStr);
 		} catch (IllegalArgumentException e) {
-			String msg = "Failed to retrieve typed datetime string!\n" + pUriStr.markPosition()
-					+ "Nested message is:\n" + e.getMessage();
+			String msg =
+				"Failed to retrieve typed datetime string!\n" +
+				pUriStr.markPosition() +
+				"Nested message is:\n" +
+				e.getMessage();
 			throw new IllegalArgumentException(msg);
 		}
 		return DateTimeValue.parse(strVal.toString(), true);
@@ -195,5 +211,4 @@ private static String parseTypeInfo(URIString pUriStr) {
 		pUriStr.set(uriStr);
 		return typeInfo;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/MOF.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/MOF.java
index c4a76d5..f0a0f60 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/MOF.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/MOF.java
@@ -52,29 +52,27 @@
 
 import java.util.Comparator;
 import java.util.TreeMap;
-
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMDateTime;
+import org.metricshub.wbem.javax.cim.CIMElement;
+import org.metricshub.wbem.javax.cim.CIMFlavor;
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMMethod;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.cim.CIMParameter;
+import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface;
 import org.metricshub.wbem.javax.cim.CIMQualifier;
 import org.metricshub.wbem.javax.cim.CIMQualifierType;
+import org.metricshub.wbem.javax.cim.CIMScope;
 import org.metricshub.wbem.javax.cim.CIMTypedElement;
 import org.metricshub.wbem.javax.cim.CIMValuedElement;
-import org.metricshub.wbem.javax.cim.CIMDateTime;
-import org.metricshub.wbem.javax.cim.CIMElement;
-import org.metricshub.wbem.javax.cim.CIMFlavor;
-import org.metricshub.wbem.javax.cim.CIMProperty;
-import org.metricshub.wbem.javax.cim.CIMQualifiedElementInterface;
-import org.metricshub.wbem.javax.cim.CIMScope;
 
 /**
  * Class MOF is responsible for helping MOF String generation.
  */
 public class MOF {
-
 	/**
 	 * CLASS
 	 */
@@ -277,10 +275,10 @@ public class MOF {
 	 *        classDeclaration		=	[ qualifierList ] CLASS className [ superClass ]
 	 *       					"{" *classFeature "}" ";"
 	 *        classFeature			=	propertyDeclaration | methodDeclaration
-	 *        
+	 *
 	 *        superClass				=	":" className
 	 * 
-	 * 
+	 *
 	 * @param pCl
 	 * @param pInd
 	 * @return the MOF string
@@ -294,10 +292,8 @@ public static String classDeclaration(CIMClass pCl, String pInd) {
 		if (supCl != null) buf.append(':' + supCl + ' ');
 		buf.append("{\n");
 		// *classFeature
-		for (int i = 0; i < pCl.getPropertyCount(); i++)
-			buf.append(propertyDeclaration(pCl.getProperty(i), pInd + INDENT));
-		for (int i = 0; i < pCl.getMethodCount(); i++)
-			buf.append(methodDeclaration(pCl.getMethod(i), pInd + INDENT));
+		for (int i = 0; i < pCl.getPropertyCount(); i++) buf.append(propertyDeclaration(pCl.getProperty(i), pInd + INDENT));
+		for (int i = 0; i < pCl.getMethodCount(); i++) buf.append(methodDeclaration(pCl.getMethod(i), pInd + INDENT));
 		buf.append("};");
 		return buf.toString();
 	}
@@ -305,7 +301,7 @@ public static String classDeclaration(CIMClass pCl, String pInd) {
 	/**
 	 * instanceDeclaration = [ qualifierList ] INSTANCE OF className [ alias ]
 	 * "{" 1*valueInitializer "}" ";"
-	 * 
+	 *
 	 * @param pInst
 	 * @param pInd
 	 * @return the MOF string
@@ -317,8 +313,9 @@ public static String instanceDeclaration(CIMInstance pInst, String pInd) {
 		StringBuffer buf = new StringBuffer();
 		buf.append(pInd + INSTOF + pInst.getClassName() + " {\n");
 		// Add all properties in prop array
-		for (int i = 0; i < pInst.getPropertyCount(); i++)
-			buf.append(valueInitializer(pInst.getProperty(i), pInd + INDENT));
+		for (int i = 0; i < pInst.getPropertyCount(); i++) buf.append(
+			valueInitializer(pInst.getProperty(i), pInd + INDENT)
+		);
 		// Add keys that are NOT also in prop array
 		CIMProperty[] keys = pInst.getKeys();
 		for (int i = 0; i < keys.length; i++) {
@@ -335,7 +332,7 @@ public static String instanceDeclaration(CIMInstance pInst, String pInd) {
 	 *        methodDeclaration		=	[ qualifierList ] dataType methodName
 	 *       							"(" [ parameterList ] ")" ";"
 	 * 
-	 * 
+	 *
 	 * @param pMethod
 	 * @param pInd
 	 * @return the MOF string
@@ -354,7 +351,7 @@ public static String methodDeclaration(CIMMethod pMethod, String pInd) {
 
 	/**
 	 * parameter
-	 * 
+	 *
 	 * @param pParam
 	 *            - CIMParameter
 	 * @param pInd
@@ -365,17 +362,23 @@ public static String parameter(CIMParameter pParam, String pInd) {
 	}
 
 	/**
-	 * 
+	 *
 	 * typedElement = [ qualifierList ] (dataType|objectRef) parameterName [
 	 * array ]
-	 * 
+	 *
 	 * @param pTypedElement
 	 * @param pInd
 	 * @return the MOF string
 	 */
 	public static String typedElement(CIMTypedElement pTypedElement, String pInd) {
-		return qualifierList(pTypedElement, pInd) + pInd + dataType(pTypedElement) + ' '
-				+ pTypedElement.getName() + array(pTypedElement);
+		return (
+			qualifierList(pTypedElement, pInd) +
+			pInd +
+			dataType(pTypedElement) +
+			' ' +
+			pTypedElement.getName() +
+			array(pTypedElement)
+		);
 	}
 
 	/**
@@ -383,7 +386,7 @@ public static String typedElement(CIMTypedElement pTypedElement, String pInd) {
 	 *        valuedElement 		=	typedElement [ defaultValue ] ";"
 	 *        defaultValue			=	"=" initializer
 	 * 
-	 * 
+	 *
 	 * @param pValuedElement
 	 * @param pInd
 	 * @return the MOF string
@@ -399,7 +402,7 @@ public static String valuedElement(CIMValuedElement pValuedElement, String pI
 	 * 
       	 *        qualifierList			=	"[" qualifier *( "," qualifier ) "]"
 	 * 
      
-	 * 
+	 *
 	 * @param pElement
 	 * @param pInd
 	 * @return the MOF string +newLine if qualifiers present or empty string
@@ -419,16 +422,26 @@ public static String qualifierList(CIMElement pElement, String pInd) {
 
 	/**
 	 * 
      -	 *        qualifierDeclaration	=	QUALIFIER qualifierName qualifierType scope 
+	 *        qualifierDeclaration	=	QUALIFIER qualifierName qualifierType scope
 	 *        							[ defaultFlavor ] ";"
 	 * 
      
-	 * 
+	 *
 	 * @param pQType
 	 * @return the MOF string
 	 */
 	public static String qualifierDeclaration(CIMQualifierType pQType) {
-		return QUALIFIER + ' ' + pQType.getName() + ' ' + dataType(pQType) + ' '
-				+ scope(pQType.getScope()) + ' ' + flavor(pQType.getFlavor()) + ';';
+		return (
+			QUALIFIER +
+			' ' +
+			pQType.getName() +
+			' ' +
+			dataType(pQType) +
+			' ' +
+			scope(pQType.getScope()) +
+			' ' +
+			flavor(pQType.getFlavor()) +
+			';'
+		);
 	}
 
 	/**
@@ -437,7 +450,7 @@ public static String qualifierDeclaration(CIMQualifierType pQType) {
 	 *        metaElement	=	CLASS | ASSOCIATION | INDICATION | QUALIFIER
 	 *       					PROPERTY | REFERENCE | METHOD | PARAMETER | ANY
 	 * 
-	 * 
+	 *
 	 * @param pScopes
 	 * @return the MOF string
 	 */
@@ -470,7 +483,7 @@ public static String scope(int pScopes) {
 	 * 
       	 * flavor = ENABLEOVERRIDE | DISABLEOVERRIDE | RESTRICTED | TOSUBCLASS | TRANSLATABLE
 	 * 
      
-	 * 
+	 *
 	 * @param flavor
 	 * @return the MOF string
 	 */
@@ -490,7 +503,7 @@ public static String flavor(int flavor) {
 	 * 
       	 *        qualifier				=	qualifierName [ qualifierParameter ] [ ":" 1*flavor ]
 	 * 
      
-	 * 
+	 *
 	 * @param pQuali
 	 * @return the MOF string
 	 */
@@ -498,8 +511,7 @@ public static String qualifier(CIMQualifier pQuali) {
 		StringBuffer buf = new StringBuffer();
 		buf.append(pQuali.getName());
 		// TODO: review. Why qualifierParameter is optional?
-		if (pQuali.getDataType() != null && pQuali.getValue() != null) buf
-				.append(qualifierParameter(pQuali));
+		if (pQuali.getDataType() != null && pQuali.getValue() != null) buf.append(qualifierParameter(pQuali));
 		// FIXME: why flavors are optional
 		// if (pQuali.getFlavor() != 0)
 		buf.append(':' + flavor(pQuali.getFlavor()));
@@ -511,7 +523,7 @@ public static String qualifier(CIMQualifier pQuali) {
 	 *        propertyDeclaration	=	typedElement [ defaultValue ] ";"
 	 *        defaultValue			=	"=" initializer
 	 * 
-	 * 
+	 *
 	 * @param pProp
 	 * @param pInd
 	 * @return the MOF string
@@ -525,15 +537,16 @@ public static String propertyDeclaration(CIMProperty pProp, String pInd) {
 	 *        valueInitializer		= [ qualifierList ] ( propertyName | referenceName ) "="
 	 * 									initializer ";"
 	 * 
-	 * 
+	 *
 	 * @param pProp
 	 * @param pInd
 	 * @return the MOF string
 	 */
 	public static String valueInitializer(CIMProperty pProp, String pInd) {
 		Object value = pProp.getValue();
-		if (value != null) { return qualifierList(pProp, pInd) + pInd + pProp.getName() + " = "
-				+ initializer(value, pInd) + ";\n"; }
+		if (value != null) {
+			return qualifierList(pProp, pInd) + pInd + pProp.getName() + " = " + initializer(value, pInd) + ";\n";
+		}
 		return "";
 	}
 
@@ -542,14 +555,14 @@ public static String valueInitializer(CIMProperty pProp, String pInd) {
 	 * dataType = DT_UINT8 | DT_SINT8 | DT_UINT16 | DT_SINT16 | DT_UINT32 | DT_SINT32 | DT_UINT64
 	 * 		| DT_SINT64 | DT_REAL32 | DT_REAL64 | DT_CHAR16 | DT_STR | DT_BOOL | DT_DATETIME
 	 * 
-	 * 
+	 *
 	 * Additionally it handles reference types too.
-	 * 
+	 *
 	 * 
       	 *        objectType	=	objectRef
 	 *        objectRef		=	className REF
 	 * 
      
-	 * 
+	 *
 	 * @param pType
 	 * @return the MOF string
 	 */
@@ -575,7 +588,7 @@ public static String dataType(CIMTypedElement pTypedElement) {
 
 	/**
 	 * objectHandle
-	 * 
+	 *
 	 * @param pPath
 	 * @return the Untyped MOF String
 	 */
@@ -585,7 +598,7 @@ public static String objectHandle(CIMObjectPath pPath) {
 
 	/**
 	 * objectHandle
-	 * 
+	 *
 	 * @param pPath
 	 *            The path
 	 * @param pTyped
@@ -605,8 +618,7 @@ public static String objectHandle(CIMObjectPath pPath, boolean pTyped, boolean p
 			if (!pLocal) buf.append('/');
 			buf.append(pPath.getNamespace());
 		}
-		if (pTyped) buf.append(pathType(pPath));
-		else if (pPath.getObjectName() != null && buf.length() > 0) {
+		if (pTyped) buf.append(pathType(pPath)); else if (pPath.getObjectName() != null && buf.length() > 0) {
 			buf.append(':');
 		}
 		if (pPath.getObjectName() != null) {
@@ -617,7 +629,7 @@ else if (pPath.getObjectName() != null && buf.length() > 0) {
 
 	/**
 	 * objectHandleAsRef
-	 * 
+	 *
 	 * @param pPath
 	 * @return the Untyped MOF String
 	 */
@@ -627,7 +639,7 @@ public static String objectHandleAsRef(CIMObjectPath pPath) {
 
 	/**
 	 * objectHandleAsRef
-	 * 
+	 *
 	 * @param pPath
 	 * @param pTyped
 	 * @return the MOF String
@@ -649,7 +661,7 @@ public static String objectHandleAsRef(CIMObjectPath pPath, boolean pTyped) {
 	 * constantValue = integerValue | realValue | charValue | stringValue | booleanValue | nullValue
 	 * // | dateTimeValue | objectHandle
 	 * 
-	 * 
+	 *
 	 * @param pValuedElement
 	 * @param pInd
 	 * @return the MOF string
@@ -660,7 +672,7 @@ public static String constantValue(CIMValuedElement pValuedElement, String pI
 
 	/**
 	 * constantValue
-	 * 
+	 *
 	 * @param pObj
 	 * @param pTyped
 	 * @param pInd
@@ -703,7 +715,7 @@ public static String constantValue(Object pObj, boolean pTyped, String pInd) {
 
 	/**
 	 * constantValue
-	 * 
+	 *
 	 * @param pObj
 	 * @param pInd
 	 * @return the untyped MOF String
@@ -742,7 +754,7 @@ private static String keyValuePairs(CIMProperty[] pKeys, boolean pTyped, Stri
 	 *        parameterList		=	parameter *( "," parameter )
 	 *        parameter			=	[ qualifierList ] (dataType|objectRef) parameterName [ array ]
 	 * 
-	 * 
+	 *
 	 * @param pMethod
 	 * @return the MOF string
 	 */
@@ -757,7 +769,6 @@ private static String parameterList(CIMMethod pMethod, String pInd) {
 	}
 
 	private static class ScopeBuffer {
-
 		private StringBuffer buf = new StringBuffer();
 
 		private int iScopes;
@@ -766,7 +777,7 @@ private static class ScopeBuffer {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pScopes
 		 */
 		public ScopeBuffer(int pScopes) {
@@ -775,7 +786,7 @@ public ScopeBuffer(int pScopes) {
 
 		/**
 		 * append
-		 * 
+		 *
 		 * @param pStr
 		 */
 		public void append(String pStr) {
@@ -784,7 +795,7 @@ public void append(String pStr) {
 
 		/**
 		 * append
-		 * 
+		 *
 		 * @param pChar
 		 */
 		public void append(char pChar) {
@@ -793,7 +804,7 @@ public void append(char pChar) {
 
 		/**
 		 * append
-		 * 
+		 *
 		 * @param pMask
 		 * @param pName
 		 */
@@ -817,18 +828,19 @@ public String toString() {
 	 * 
       	 *        qualifierParameter		=	"(" constantValue ")" | arrayInitializer
 	 * 
      
-	 * 
+	 *
 	 * @param pQuali
 	 * @return the MOF string
 	 */
 	private static String qualifierParameter(CIMQualifier pQuali) {
-		return pQuali.getDataType().isArray() ? arrayInitializer(pQuali, EMPTY)
-				: '(' + constantValue(pQuali, EMPTY) + ')';
+		return pQuali.getDataType().isArray() ? arrayInitializer(pQuali, EMPTY) : '(' + constantValue(pQuali, EMPTY) + ')';
 	}
 
 	private static String charValue(Character pChar) {
 		char ch = pChar.charValue();
-		if (ch < 32) { return "'\\x" + Integer.toString(ch, 16) + '\''; }
+		if (ch < 32) {
+			return "'\\x" + Integer.toString(ch, 16) + '\'';
+		}
 		return "'" + ch + '\'';
 	}
 
@@ -836,7 +848,7 @@ private static String charValue(Character pChar) {
 	 * 
       	 *        arrayInitializer		=	"{" constantValue*( "," constantValue)"}"
 	 * 
      
-	 * 
+	 *
 	 * @param pValue
 	 * @param pInd
 	 * @return the MOF string or empty string if the array has no elements or
@@ -867,7 +879,7 @@ private static String arrayInitializer(CIMValuedElement pValuedElement, Strin
 
 	/**
 	 * array = "[" [positiveDecimalValue] "]"
-	 * 
+	 *
 	 * @param pType
 	 * @return the MOF string or empty string if not array type
 	 */
@@ -887,14 +899,15 @@ private static String array(CIMTypedElement pTypedElement) {
 	}
 
 	private static final TreeMap DATATYPE_MAP = new TreeMap(
-			new Comparator() {
+		new Comparator() {
 
-				public int compare(Object pO1, Object pO2) {
-					CIMDataType t1 = (CIMDataType) pO1;
-					CIMDataType t2 = (CIMDataType) pO2;
-					return t1.getType() - t2.getType();
-				}
-			});
+			public int compare(Object pO1, Object pO2) {
+				CIMDataType t1 = (CIMDataType) pO1;
+				CIMDataType t2 = (CIMDataType) pO2;
+				return t1.getType() - t2.getType();
+			}
+		}
+	);
 
 	static {
 		DATATYPE_MAP.put(CIMDataType.UINT8_T, DT_UINT8);
@@ -921,7 +934,7 @@ public int compare(Object pO1, Object pO2) {
 
 	/**
 	 * defaultValue = "=" initializer
-	 * 
+	 *
 	 * @param pValuedElement
 	 * @param pInd
 	 * @return the MOF string or empty string if the value is null
@@ -937,7 +950,7 @@ private static String defaultValue(CIMValuedElement pValuedElement, String pI
 	 * initializer = constantValue | arrayInitializer | referenceInitializer
 	 * // referenceInitializer is handled by constantValue
 	 * 
-	 * 
+	 *
 	 * @param pValue
 	 * @param pInd
 	 * @return the MOF string
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/StringSorter.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/StringSorter.java
index 113abf5..b1dca4d 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/StringSorter.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/StringSorter.java
@@ -48,13 +48,12 @@
  * searching of String arrays.
  */
 public class StringSorter implements Comparator {
-
 	private static final Comparator COMPARATOR = new StringSorter();
 
 	/**
 	 * Sorts non case sensitively the passed String array, the passed array is
 	 * not copied.
-	 * 
+	 *
 	 * @param pArray
 	 *            the array which will be sorted if it's not null
 	 * @return pArray
@@ -70,7 +69,7 @@ public static String[] sort(String[] pArray) {
 	/**
 	 * Finds pName, in pArray which must be a non case sensitive sorted array of
 	 * Strings.
-	 * 
+	 *
 	 * @param pArray
 	 * @param pName
 	 * @return true if found, otherwise false
@@ -91,5 +90,4 @@ public int compare(Object pO1, Object pO2) {
 		String str2 = (String) pO2;
 		return str1.compareToIgnoreCase(str2);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/ThreadPool.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/ThreadPool.java
index 22cc12b..ca966ee 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/ThreadPool.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/ThreadPool.java
@@ -54,22 +54,20 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 
 /**
  * Class ThreadPool implements a pool that manages threads and executes
  * submitted tasks using this threads.
- * 
+ *
  */
 public class ThreadPool {
 
 	/**
 	 * Class Worker implements a worker thread used by the thread pool
-	 * 
+	 *
 	 */
 	private static class Worker extends Thread {
-
 		private volatile boolean iAlive;
 
 		private final ThreadPool iPool;
@@ -80,7 +78,7 @@ private static class Worker extends Thread {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pool
 		 *            The owning pool
 		 * @param name
@@ -110,7 +108,7 @@ public void kill() {
 
 		/**
 		 * Waits for a new task execute
-		 * 
+		 *
 		 * @return The task or null
 		 * @throws InterruptedException
 		 */
@@ -138,8 +136,7 @@ public void run() {
 						try {
 							tsk.run();
 						} catch (Throwable t) {
-							LogAndTraceBroker.getBroker().trace(Level.FINE,
-									"Exception while executing task from thread pool", t);
+							LogAndTraceBroker.getBroker().trace(Level.FINE, "Exception while executing task from thread pool", t);
 						}
 						this.iPool.taskCompleted();
 					}
@@ -176,7 +173,7 @@ public void run() {
 
 	/**
 	 * Ctor
-	 * 
+	 *
 	 * @param pMinPoolSize
 	 *            The minimal pool size. The pool will always keep at least this
 	 *            number of worker threads alive even in no load situations.
@@ -194,8 +191,14 @@ public void run() {
 	 * @param pWorkerName
 	 *            The name to use for worker threads
 	 */
-	public ThreadPool(int pMinPoolSize, int pMaxPoolSize, int pToleratedBacklog,
-			long pToleratedIdle, ThreadGroup pGroup, String pWorkerName) {
+	public ThreadPool(
+		int pMinPoolSize,
+		int pMaxPoolSize,
+		int pToleratedBacklog,
+		long pToleratedIdle,
+		ThreadGroup pGroup,
+		String pWorkerName
+	) {
 		this.iGroup = pGroup != null ? pGroup : new ThreadGroup("TreadPool Group");
 		this.iMinPoolSize = pMinPoolSize;
 		this.iMaxPoolSize = pMaxPoolSize;
@@ -206,7 +209,7 @@ public ThreadPool(int pMinPoolSize, int pMaxPoolSize, int pToleratedBacklog,
 
 	/**
 	 * Submits a task for execution
-	 * 
+	 *
 	 * @param task
 	 *            The task
 	 * @return true if the task was executed or enqueued,
@@ -223,15 +226,15 @@ public synchronized boolean execute(Runnable task) {
 
 		boolean added = this.iQueue.offer(task);
 
-		if (totalIdle > 0) { return added; }
+		if (totalIdle > 0) {
+			return added;
+		}
 
 		// is maximal pool size reached ?
-		boolean mayCreateWorker = (this.iMaxPoolSize == -1)
-				|| (this.iThreadPool.size() < this.iMaxPoolSize);
+		boolean mayCreateWorker = (this.iMaxPoolSize == -1) || (this.iThreadPool.size() < this.iMaxPoolSize);
 		// create a new worker when backlog exceeds toleration level or we
 		// have no workers at all
-		if (mayCreateWorker
-				&& ((this.iQueue.size() > this.iToleratedBacklog) || this.iThreadPool.size() == 0)) {
+		if (mayCreateWorker && ((this.iQueue.size() > this.iToleratedBacklog) || this.iThreadPool.size() == 0)) {
 			createWorker();
 		}
 		return added;
@@ -239,7 +242,7 @@ public synchronized boolean execute(Runnable task) {
 
 	/**
 	 * Creates a new worker thread
-	 * 
+	 *
 	 */
 	private synchronized void createWorker() {
 		Worker worker = new Worker(this, this.iWorkerName + getID());
@@ -250,7 +253,7 @@ private synchronized void createWorker() {
 
 	/**
 	 * Removes a worker from the pool.
-	 * 
+	 *
 	 * @param worker
 	 *            The worker
 	 */
@@ -270,7 +273,7 @@ protected synchronized void removeWorker(Worker worker) {
 
 	/**
 	 * Gets the associated thread group
-	 * 
+	 *
 	 * @return The thread group
 	 */
 	protected ThreadGroup getGroup() {
@@ -281,7 +284,7 @@ protected ThreadGroup getGroup() {
 	 * Get a new task. If no task was available during the timeout period the
 	 * calling worker might be killed if more than the minimum number of workers
 	 * exist
-	 * 
+	 *
 	 * @param worker
 	 *            The worker asking for a new task
 	 * @return The next available task from the queue. If no task is available
@@ -334,12 +337,11 @@ public synchronized void shutdown() {
 
 	/**
 	 * Generates an "unique" id for a worker thread
-	 * 
+	 *
 	 * @return The id
 	 */
 	private String getID() {
 		if (++this.iCntr >= 10000) this.iCntr = 1;
 		return String.valueOf(this.iCntr);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/Util.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/Util.java
index 8e67957..1fae609 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/Util.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/Util.java
@@ -52,7 +52,7 @@ public class Util {
 
 	/**
 	 * Quotes the passed string.
-	 * 
+	 *
 	 * @param pStr
 	 * @return the quoted string
 	 */
@@ -75,15 +75,13 @@ public static String quote(String pStr) {
 	 * loop. The range is defined as (lowBadDouble,
 	 * hiBadDouble).
 	 */
-	private static final BigDecimal lowBadDouble = new BigDecimal(
-			"2.225073858507201136057409796709131975934E-308");
+	private static final BigDecimal lowBadDouble = new BigDecimal("2.225073858507201136057409796709131975934E-308");
 
-	private static final BigDecimal hiBadDouble = new BigDecimal(
-			"2.225073858507201259573821257020768020078E-308");
+	private static final BigDecimal hiBadDouble = new BigDecimal("2.225073858507201259573821257020768020078E-308");
 
 	/**
 	 * isBadDoubleString checks if passed string could hang JVM.
-	 * 
+	 *
 	 * @param s
 	 *            A string to be converted to a Double.
 	 * @return true if double is in range of bad values,
@@ -104,7 +102,7 @@ public static boolean isBadDoubleString(String s) {
 	 * pArray = {"A", "B", "C", "D", "E", "F", "G"} and
 	 * pIgnoreElements = "D,E,B" then this method returns
 	 * {"A", "C", "F", "G"}.
-	 * 
+	 *
 	 * @param pArray
 	 *            Original string array.
 	 * @param pIgnoreElements
@@ -114,8 +112,7 @@ public static boolean isBadDoubleString(String s) {
 	public static String[] getFilteredStringArray(String[] pArray, String pIgnoreElements) {
 		int i, j;
 
-		if (pArray == null || pArray.length == 0 || pIgnoreElements == null
-				|| pIgnoreElements.length() == 0) return pArray;
+		if (pArray == null || pArray.length == 0 || pIgnoreElements == null || pIgnoreElements.length() == 0) return pArray;
 
 		Vector vecIgnore = new Vector();
 		StringTokenizer strtok = new StringTokenizer(pIgnoreElements, ",");
@@ -128,8 +125,7 @@ public static String[] getFilteredStringArray(String[] pArray, String pIgnoreEle
 
 		Vector vecNew = new Vector();
 		for (i = 0; i < pArray.length; i++) {
-			for (j = 0; j < vecIgnore.size(); j++)
-				if (pArray[i].equalsIgnoreCase(vecIgnore.elementAt(j))) break;
+			for (j = 0; j < vecIgnore.size(); j++) if (pArray[i].equalsIgnoreCase(vecIgnore.elementAt(j))) break;
 			if (j >= vecIgnore.size()) vecNew.add(pArray[i]);
 		}
 
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConfiguration.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConfiguration.java
index c6dff49..dac3106 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConfiguration.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConfiguration.java
@@ -86,22 +86,19 @@
 import java.security.Security;
 import java.util.Arrays;
 import java.util.Iterator;
-import java.util.Properties;
 import java.util.Map.Entry;
+import java.util.Properties;
 import java.util.logging.Level;
-
 import javax.net.SocketFactory;
-
 import org.metricshub.wbem.sblim.cimclient.WBEMConfigurationProperties;
 
 /**
  * Class WBEMConfigurationFile is responsible for initializing the the
  * configuration properties from the configuration file.
- * 
+ *
  * This class was designed as thread-safe
  */
 public class WBEMConfiguration {
-
 	private static WBEMConfiguration cConfiguration;
 
 	private static String cConfigURL = null;
@@ -122,7 +119,6 @@ public class WBEMConfiguration {
 	 * Loads the global configuration from the configuration file
 	 */
 	public static void loadGlobalConfiguration() {
-
 		Properties wbemProperties = new Properties(new Properties());
 		try {
 			cConfigURL = null;
@@ -134,12 +130,10 @@ public static void loadGlobalConfiguration() {
 				wbemProperties.load(inputstream);
 				cLoadSuccessful = true;
 			}
-			for (Iterator> iterator = wbemProperties.entrySet().iterator(); iterator
-					.hasNext();) {
+			for (Iterator> iterator = wbemProperties.entrySet().iterator(); iterator.hasNext();) {
 				Entry entry = iterator.next();
 				String key = String.valueOf(entry.getKey());
-				if (key.startsWith("sblim.wbem.") || key.startsWith("javax.net.ssl.")
-						|| key.startsWith("net.slp.")) {
+				if (key.startsWith("sblim.wbem.") || key.startsWith("javax.net.ssl.") || key.startsWith("net.slp.")) {
 					String value = String.valueOf(entry.getValue());
 					System.setProperty(key, value);
 				} else if (key.startsWith("ssl.")) {
@@ -160,7 +154,7 @@ public static void loadGlobalConfiguration() {
 	/**
 	 * Returns the URL of the active configuration file. This is the file used
 	 * to initialize the global configuration.
-	 * 
+	 *
 	 * @return The URL of the active configuration file.
 	 */
 	public static String getActiveConfigURL() {
@@ -170,7 +164,7 @@ public static String getActiveConfigURL() {
 	/**
 	 * Returns the full URL of the active configuration file. This is the file
 	 * used to initialize the global configuration.
-	 * 
+	 *
 	 * @return The full URL of the active configuration file.
 	 */
 	public static String getActiveConfigFullURL() {
@@ -180,7 +174,7 @@ public static String getActiveConfigFullURL() {
 	/**
 	 * Returns if the configuration was successfully loaded from the
 	 * configuration file
-	 * 
+	 *
 	 * @return true if the configuration was successfully loaded
 	 *         from the configuration file, false otherwise
 	 */
@@ -192,12 +186,11 @@ public static boolean isConfigurationLoadSuccessful() {
 	 * Returns an input stream for the configuration file. The method looks if a
 	 * configuration file URL is set in the system properties and tries the
 	 * default location if not.
-	 * 
+	 *
 	 * @return The InputStream of the configuration file or
 	 *         null if none could be opened.
 	 */
 	private static InputStream getConfigURLStream() {
-
 		String configURL = System.getProperty(WBEMConfigurationProperties.CONFIG_URL);
 
 		if (configURL != null) {
@@ -236,7 +229,7 @@ private static InputStream getConfigURLStream() {
 	 * Returns the full URL of the parameter. Only "file:" URLs will be
 	 * processed, and the full URL will be the FQDN of the file with relative
 	 * paths ("." and "..") removed.
-	 * 
+	 *
 	 * @param url
 	 *            The URL
 	 * @return The full URL
@@ -277,7 +270,7 @@ private static String getFullURL(URL url) {
 
 	/**
 	 * Returns the global configuration
-	 * 
+	 *
 	 * @return The global configuration
 	 */
 	public static WBEMConfiguration getGlobalConfiguration() {
@@ -286,7 +279,7 @@ public static WBEMConfiguration getGlobalConfiguration() {
 
 	/**
 	 * Returns the exception caught during configuration load, load failed.
-	 * 
+	 *
 	 * @return The exception or null if none was caught.
 	 */
 	public static Exception getConfigurationLoadException() {
@@ -297,10 +290,11 @@ public static Exception getConfigurationLoadException() {
 
 		@Override
 		protected Object childValue(Object parentValue) {
-			if (parentValue instanceof Properties) { return ((Properties) parentValue).clone(); }
+			if (parentValue instanceof Properties) {
+				return ((Properties) parentValue).clone();
+			}
 			return super.childValue(parentValue);
 		}
-
 	};
 
 	/**
@@ -324,7 +318,7 @@ private WBEMConfiguration() {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pDomainProperties
 	 *            The domain specific properties of this configuration. Domain
 	 *            specific properties are treated as an overlay on the global
@@ -333,14 +327,15 @@ private WBEMConfiguration() {
 	 *             If pDomainProperties is null
 	 */
 	public WBEMConfiguration(Properties pDomainProperties) {
-		if (pDomainProperties == null) { throw new NullPointerException(
-				"Domain properties shall not be null"); }
+		if (pDomainProperties == null) {
+			throw new NullPointerException("Domain properties shall not be null");
+		}
 		this.iDomainProperties = pDomainProperties;
 	}
 
 	/**
 	 * Returns whether this configuration is the global one
-	 * 
+	 *
 	 * @return true if this is the global configuration
 	 */
 	public boolean isGlobal() {
@@ -349,7 +344,7 @@ public boolean isGlobal() {
 
 	/**
 	 * Returns the domain properties
-	 * 
+	 *
 	 * @return The domain properties.
 	 */
 	public synchronized Properties getDomainProperties() {
@@ -358,19 +353,18 @@ public synchronized Properties getDomainProperties() {
 
 	/**
 	 * Sets the domain properties
-	 * 
+	 *
 	 * @param pDomainProperties
 	 *            The new value
 	 */
 	public synchronized void setDomainProperties(Properties pDomainProperties) {
-		if (isGlobal()) throw new IllegalStateException(
-				"Global configuration cannot be modified by setDomainProperties()");
+		if (isGlobal()) throw new IllegalStateException("Global configuration cannot be modified by setDomainProperties()");
 		this.iDomainProperties = pDomainProperties;
 	}
 
 	/**
 	 * Returns a value from the domain properties for a given name
-	 * 
+	 *
 	 * @param pKey
 	 *            The name of the property
 	 * @return The value
@@ -381,21 +375,20 @@ public synchronized String getDomainProperty(String pKey) {
 
 	/**
 	 * Sets a property value of the domain properties
-	 * 
+	 *
 	 * @param pKey
 	 *            The name of property
 	 * @param pValue
 	 *            The new value
 	 */
 	public synchronized void setDomainProperty(String pKey, String pValue) {
-		if (isGlobal()) throw new IllegalStateException(
-				"Global configuration cannot be modified by setDomainProperty()");
+		if (isGlobal()) throw new IllegalStateException("Global configuration cannot be modified by setDomainProperty()");
 		this.iDomainProperties.setProperty(pKey, pValue);
 	}
 
 	/**
 	 * Returns the properties local to the current thread
-	 * 
+	 *
 	 * @return The local properties.
 	 */
 	public Properties getLocalProperties() {
@@ -404,19 +397,18 @@ public Properties getLocalProperties() {
 
 	/**
 	 * Sets the properties local to the current thread
-	 * 
+	 *
 	 * @param pLocalProperties
 	 *            The new value
 	 */
 	public void setLocalProperties(Properties pLocalProperties) {
-		if (isGlobal()) throw new IllegalStateException(
-				"Global configuration cannot be modified by setLocalProperties()");
+		if (isGlobal()) throw new IllegalStateException("Global configuration cannot be modified by setLocalProperties()");
 		this.iLocalProperties.set(pLocalProperties);
 	}
 
 	/**
 	 * Returns a value from the local properties for a given name
-	 * 
+	 *
 	 * @param pKey
 	 *            The name of the property
 	 * @return The value
@@ -428,15 +420,14 @@ public String getLocalProperty(String pKey) {
 
 	/**
 	 * Sets a property value of the local properties
-	 * 
+	 *
 	 * @param pKey
 	 *            The name of property
 	 * @param pValue
 	 *            The new value
 	 */
 	public void setLocalProperty(String pKey, String pValue) {
-		if (isGlobal()) throw new IllegalStateException(
-				"Global configuration cannot be modified by setLocalProperty()");
+		if (isGlobal()) throw new IllegalStateException("Global configuration cannot be modified by setLocalProperty()");
 		Properties localProperties = (Properties) this.iLocalProperties.get();
 		if (localProperties == null) {
 			localProperties = new Properties();
@@ -449,21 +440,23 @@ private String getProperty(String pProperty, String pDefault) {
 		String globalProperty = System.getProperty(pProperty, pDefault);
 		String domainProperty = getDomainProperty(pProperty);
 		String localProperty = getLocalProperty(pProperty);
-		return (localProperty != null) ? localProperty : (domainProperty != null) ? domainProperty
-				: (globalProperty != null) ? globalProperty : pDefault;
+		return (localProperty != null)
+			? localProperty
+			: (domainProperty != null) ? domainProperty : (globalProperty != null) ? globalProperty : pDefault;
 	}
 
 	private String getSecurityProperty(String pProperty, String pDefault) {
 		String globalProperty = Security.getProperty(pProperty);
 		String domainProperty = getDomainProperty(pProperty);
 		String localProperty = getLocalProperty(pProperty);
-		return (localProperty != null) ? localProperty : (domainProperty != null) ? domainProperty
-				: (globalProperty != null) ? globalProperty : pDefault;
+		return (localProperty != null)
+			? localProperty
+			: (domainProperty != null) ? domainProperty : (globalProperty != null) ? globalProperty : pDefault;
 	}
 
 	/**
 	 * Sets a custom socket factory.
-	 * 
+	 *
 	 * @param pFactory
 	 *            The factory
 	 */
@@ -473,7 +466,7 @@ public synchronized void setCustomSocketFactory(SocketFactory pFactory) {
 
 	/**
 	 * Returns the custom socket factory
-	 * 
+	 *
 	 * @return The factory if set, null otherwise
 	 */
 	public synchronized SocketFactory getCustomSocketFactory() {
@@ -482,138 +475,145 @@ public synchronized SocketFactory getCustomSocketFactory() {
 
 	/**
 	 * Returns the console log level
-	 * 
+	 *
 	 * @return The console log level
 	 */
 	public Level getLogConsoleLevel() {
-		return Level.parse(getProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL,
-				WBEMConfigurationDefaults.LOG_CONSOLE_LEVEL));
+		return Level.parse(
+			getProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL, WBEMConfigurationDefaults.LOG_CONSOLE_LEVEL)
+		);
 	}
 
 	/**
 	 * Returns the console log type
-	 * 
+	 *
 	 * @return The console log type
 	 */
 	public String getLogConsoleType() {
-		return getProperty(WBEMConfigurationProperties.LOG_CONSOLE_TYPE,
-				WBEMConfigurationDefaults.LOG_CONSOLE_TYPE);
+		return getProperty(WBEMConfigurationProperties.LOG_CONSOLE_TYPE, WBEMConfigurationDefaults.LOG_CONSOLE_TYPE);
 	}
 
 	/**
 	 * Returns the log file level
-	 * 
+	 *
 	 * @return The log file level
 	 */
 	public Level getLogFileLevel() {
-		return Level.parse(getProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL,
-				WBEMConfigurationDefaults.LOG_FILE_LEVEL));
+		return Level.parse(
+			getProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL, WBEMConfigurationDefaults.LOG_FILE_LEVEL)
+		);
 	}
 
 	/**
 	 * Returns the log file location
-	 * 
+	 *
 	 * @return The log file location
 	 */
 	public String getLogFileLocation() {
-		return getProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION,
-				WBEMConfigurationDefaults.LOG_FILE_LOCATION);
+		return getProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION, WBEMConfigurationDefaults.LOG_FILE_LOCATION);
 	}
 
 	/**
 	 * Returns the log file count
-	 * 
+	 *
 	 * @return The log file count
 	 */
 	public int getLogFileCount() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.LOG_FILE_COUNT,
-				WBEMConfigurationDefaults.LOG_FILE_COUNT));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.LOG_FILE_COUNT, WBEMConfigurationDefaults.LOG_FILE_COUNT)
+		);
 	}
 
 	/**
 	 * Returns the log file size limit
-	 * 
+	 *
 	 * @return The log file size limit
 	 */
 	public int getLogFileSizeLimit() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT,
-				WBEMConfigurationDefaults.LOG_FILE_SIZE_LIMIT));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT, WBEMConfigurationDefaults.LOG_FILE_SIZE_LIMIT)
+		);
 	}
 
 	/**
 	 * Returns the trace file level
-	 * 
+	 *
 	 * @return The trace file level
 	 */
 	public Level getTraceFileLevel() {
-		return Level.parse(getProperty(WBEMConfigurationProperties.TRACE_FILE_LEVEL,
-				WBEMConfigurationDefaults.TRACE_FILE_LEVEL));
-
+		return Level.parse(
+			getProperty(WBEMConfigurationProperties.TRACE_FILE_LEVEL, WBEMConfigurationDefaults.TRACE_FILE_LEVEL)
+		);
 	}
 
 	/**
 	 * Returns the trace file location
-	 * 
+	 *
 	 * @return The trace file location
 	 */
 	public String getTraceFileLocation() {
-		return getProperty(WBEMConfigurationProperties.TRACE_FILE_LOCATION,
-				WBEMConfigurationDefaults.TRACE_FILE_LOCATION);
+		return getProperty(WBEMConfigurationProperties.TRACE_FILE_LOCATION, WBEMConfigurationDefaults.TRACE_FILE_LOCATION);
 	}
 
 	/**
 	 * Returns the trace file count
-	 * 
+	 *
 	 * @return The trace file count
 	 */
 	public int getTraceFileCount() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.TRACE_FILE_COUNT,
-				WBEMConfigurationDefaults.TRACE_FILE_COUNT));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.TRACE_FILE_COUNT, WBEMConfigurationDefaults.TRACE_FILE_COUNT)
+		);
 	}
 
 	/**
 	 * Returns the trace file count
-	 * 
+	 *
 	 * @return The trace file count
 	 */
 	public int getTraceFileSizeLimit() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.TRACE_FILE_SIZE_LIMIT,
-				WBEMConfigurationDefaults.TRACE_FILE_SIZE_LIMIT));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.TRACE_FILE_SIZE_LIMIT, WBEMConfigurationDefaults.TRACE_FILE_SIZE_LIMIT)
+		);
 	}
 
 	/**
 	 * Returns the http timeout
-	 * 
+	 *
 	 * @return The http timeout
 	 */
 	public int getHttpTimeout() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.HTTP_TIMEOUT,
-				WBEMConfigurationDefaults.HTTP_TIMEOUT));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.HTTP_TIMEOUT, WBEMConfigurationDefaults.HTTP_TIMEOUT)
+		);
 	}
 
 	/**
 	 * Returns the http pool size
-	 * 
+	 *
 	 * @return The http pool size
 	 */
 	public int getHttpPoolSize() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.HTTP_POOL_SIZE,
-				WBEMConfigurationDefaults.HTTP_POOL_SIZE));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.HTTP_POOL_SIZE, WBEMConfigurationDefaults.HTTP_POOL_SIZE)
+		);
 	}
 
 	/**
 	 * Returns the Java class name of http authentication module to use
-	 * 
+	 *
 	 * @return The http authentication module's class name
 	 */
 	public String getHttpAuthenticationModule() {
-		return getProperty(WBEMConfigurationProperties.HTTP_AUTHENTICATION_MODULE,
-				WBEMConfigurationDefaults.HTTP_AUTHENTICATION_MODULE);
+		return getProperty(
+			WBEMConfigurationProperties.HTTP_AUTHENTICATION_MODULE,
+			WBEMConfigurationDefaults.HTTP_AUTHENTICATION_MODULE
+		);
 	}
 
 	/**
 	 * Returns the WWW-Authenticate info to use on first request
-	 * 
+	 *
 	 * @return The WWW-Authenticate info
 	 */
 	public String getHttpWwwAuthenticateInfo() {
@@ -622,41 +622,40 @@ public String getHttpWwwAuthenticateInfo() {
 
 	/**
 	 * Returns the state of MPOST enablement
-	 * 
+	 *
 	 * @return true if MPOST is enabled, false
 	 *         otherwise
 	 */
 	public boolean isHttpMPost() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.HTTP_USE_MPOST,
-						WBEMConfigurationDefaults.HTTP_USE_MPOST)).booleanValue();
+		return Boolean
+			.valueOf(getProperty(WBEMConfigurationProperties.HTTP_USE_MPOST, WBEMConfigurationDefaults.HTTP_USE_MPOST))
+			.booleanValue();
 	}
 
 	/**
 	 * Returns the state of chunking enablement
-	 * 
+	 *
 	 * @return true if chunking is enabled, false
 	 *         otherwise
 	 */
 	public boolean isHttpChunked() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.HTTP_USE_CHUNKING,
-						WBEMConfigurationDefaults.HTTP_USE_CHUNKING)).booleanValue();
+		return Boolean
+			.valueOf(getProperty(WBEMConfigurationProperties.HTTP_USE_CHUNKING, WBEMConfigurationDefaults.HTTP_USE_CHUNKING))
+			.booleanValue();
 	}
 
 	/**
 	 * Returns the http version to use
-	 * 
+	 *
 	 * @return The http version
 	 */
 	public String getHttpVersion() {
-		return getProperty(WBEMConfigurationProperties.HTTP_VERSION,
-				WBEMConfigurationDefaults.HTTP_VERSION);
+		return getProperty(WBEMConfigurationProperties.HTTP_VERSION, WBEMConfigurationDefaults.HTTP_VERSION);
 	}
 
 	/**
 	 * Returns the file path of the keystore.
-	 * 
+	 *
 	 * @return The keystore file path.
 	 */
 	public String getSslKeyStorePath() {
@@ -665,17 +664,16 @@ public String getSslKeyStorePath() {
 
 	/**
 	 * Returns the type of the keystore.
-	 * 
+	 *
 	 * @return The keystore type.
 	 */
 	public String getSslKeyStoreType() {
-		return getProperty(WBEMConfigurationProperties.KEYSTORE_TYPE,
-				WBEMConfigurationDefaults.KEYSTORE_TYPE);
+		return getProperty(WBEMConfigurationProperties.KEYSTORE_TYPE, WBEMConfigurationDefaults.KEYSTORE_TYPE);
 	}
 
 	/**
 	 * Returns the password of the keystore.
-	 * 
+	 *
 	 * @return The keystore password.
 	 */
 	public String getSslKeyStorePassword() {
@@ -684,7 +682,7 @@ public String getSslKeyStorePassword() {
 
 	/**
 	 * Returns the file path of the truststore.
-	 * 
+	 *
 	 * @return The truststore file path.
 	 */
 	public String getSslTrustStorePath() {
@@ -693,17 +691,16 @@ public String getSslTrustStorePath() {
 
 	/**
 	 * Returns the type of the truststore.
-	 * 
+	 *
 	 * @return The truststore type.
 	 */
 	public String getSslTrustStoreType() {
-		return getProperty(WBEMConfigurationProperties.TRUSTSTORE_TYPE,
-				WBEMConfigurationDefaults.TRUSTSTORE_TYPE);
+		return getProperty(WBEMConfigurationProperties.TRUSTSTORE_TYPE, WBEMConfigurationDefaults.TRUSTSTORE_TYPE);
 	}
 
 	/**
 	 * Returns the password of the truststore.
-	 * 
+	 *
 	 * @return The truststore password.
 	 */
 	public String getSslTrustStorePassword() {
@@ -712,40 +709,42 @@ public String getSslTrustStorePassword() {
 
 	/**
 	 * Returns the JSSE provider to use for creating ssl client sockets
-	 * 
+	 *
 	 * @return The JSSE provider for client sockets
 	 */
 	public String getSslSocketProvider() {
 		Provider[] providers = Security.getProviders("SSLContext.SSL");
-		return getProperty(WBEMConfigurationProperties.SSL_SOCKET_PROVIDER, providers != null
-				&& providers.length > 0 ? providers[0].getClass().getName() : null);
+		return getProperty(
+			WBEMConfigurationProperties.SSL_SOCKET_PROVIDER,
+			providers != null && providers.length > 0 ? providers[0].getClass().getName() : null
+		);
 	}
 
 	/**
 	 * Returns the JSSE provider to use for creating ssl server sockets
-	 * 
+	 *
 	 * @return The JSSE provider for server sockets
 	 */
 	public String getSslServerSocketProvider() {
 		Provider[] providers = Security.getProviders("SSLContext.SSL");
-		return getProperty(WBEMConfigurationProperties.SSL_SERVER_SOCKET_PROVIDER,
-				providers != null && providers.length > 0 ? providers[0].getClass().getName()
-						: null);
+		return getProperty(
+			WBEMConfigurationProperties.SSL_SERVER_SOCKET_PROVIDER,
+			providers != null && providers.length > 0 ? providers[0].getClass().getName() : null
+		);
 	}
 
 	/**
 	 * getSslProtocol
-	 * 
+	 *
 	 * @return The SSL protocol for SSLContext.getInstance()
 	 */
 	public String getSslProtocol() {
-		return getSecurityProperty(WBEMConfigurationProperties.SSL_PROTOCOL,
-				WBEMConfigurationDefaults.SSL_DEF_PROTOCOL);
+		return getSecurityProperty(WBEMConfigurationProperties.SSL_PROTOCOL, WBEMConfigurationDefaults.SSL_DEF_PROTOCOL);
 	}
 
 	/**
 	 * getSslClientProtocol
-	 * 
+	 *
 	 * @return The SSL protocol for SSLContext.getInstance() for client
 	 */
 	public String getSslClientProtocol() {
@@ -754,7 +753,7 @@ public String getSslClientProtocol() {
 
 	/**
 	 * getSslListenerProtocol
-	 * 
+	 *
 	 * @return The SSL protocol for SSLContext.getInstance() for listener
 	 */
 	public String getSslListenerProtocol() {
@@ -763,7 +762,7 @@ public String getSslListenerProtocol() {
 
 	/**
 	 * Returns the certificate algorithm the key manager will use
-	 * 
+	 *
 	 * @return The key mangers algorithm
 	 */
 	public String getSslKeyManagerAlgorithm() {
@@ -772,7 +771,7 @@ public String getSslKeyManagerAlgorithm() {
 
 	/**
 	 * Returns the certificate algorithm the trust manager will use
-	 * 
+	 *
 	 * @return The trust mangers algorithm
 	 */
 	public String getSslTrustManagerAlgorithm() {
@@ -781,32 +780,39 @@ public String getSslTrustManagerAlgorithm() {
 
 	/**
 	 * Returns whether the client will attempt to authenticate the CIMOM
-	 * 
+	 *
 	 * @return true if the client will attempt to authenticate the
 	 *         CIMOM by verifying the server certificate false
 	 *         otherwise
 	 */
 	public boolean getSslClientPeerVerification() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.SSL_CLIENT_PEER_VERIFICATION,
-						WBEMConfigurationDefaults.SSL_CLIENT_PEER_VERIFICATION)).booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.SSL_CLIENT_PEER_VERIFICATION,
+					WBEMConfigurationDefaults.SSL_CLIENT_PEER_VERIFICATION
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * Returns how the listener will handle to authentication of the indication
 	 * sender endpoint.
-	 * 
+	 *
 	 * @return The listener peer verification mode
 	 */
 	public String getSslListenerPeerVerification() {
-		return getProperty(WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION,
-				WBEMConfigurationDefaults.SSL_LISTENER_PEER_VERIFICATION);
+		return getProperty(
+			WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION,
+			WBEMConfigurationDefaults.SSL_LISTENER_PEER_VERIFICATION
+		);
 	}
 
 	/**
 	 * Returns the comma-separated list of cipher suites to be disabled by
 	 * client.
-	 * 
+	 *
 	 * @return The list of cipher suites
 	 */
 	public String getSslClientCipherSuitesToDisable() {
@@ -816,7 +822,7 @@ public String getSslClientCipherSuitesToDisable() {
 	/**
 	 * Returns the comma-separated list of cipher suites to be disabled by
 	 * listener.
-	 * 
+	 *
 	 * @return The list of cipher suites
 	 */
 	public String getSslListenerCipherSuitesToDisable() {
@@ -826,181 +832,225 @@ public String getSslListenerCipherSuitesToDisable() {
 	/**
 	 * Returns the number of retries the client will attempt when the connection
 	 * was refused.
-	 * 
+	 *
 	 * @return The number of retries
 	 */
 	public int getHttpConnectRetriesCount() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.HTTP_CONNECTION_RETRIES,
-				WBEMConfigurationDefaults.HTTP_CONNECTION_RETRIES));
+		return Integer.parseInt(
+			getProperty(
+				WBEMConfigurationProperties.HTTP_CONNECTION_RETRIES,
+				WBEMConfigurationDefaults.HTTP_CONNECTION_RETRIES
+			)
+		);
 	}
 
 	/**
 	 * Returns if the content length retry feature is enabled
-	 * 
+	 *
 	 * @return true if content length retry is enabled,
 	 *         false otherwise
 	 */
 	public boolean isHttpContentLengthRetryEnabled() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.HTTP_ENABLE_CONTENT_LENGTH_RETRY,
-						WBEMConfigurationDefaults.HTTP_ENABLE_CONTENT_LENGTH_RETRY)).booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.HTTP_ENABLE_CONTENT_LENGTH_RETRY,
+					WBEMConfigurationDefaults.HTTP_ENABLE_CONTENT_LENGTH_RETRY
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * Returns the threshold for the content length retry algorithm
-	 * 
+	 *
 	 * @return The threshold
 	 */
 	public int getHttpContentLengthThreshold() {
-		return Integer.parseInt(getProperty(
+		return Integer.parseInt(
+			getProperty(
 				WBEMConfigurationProperties.HTTP_CONTENT_LENGTH_THRESHOLD,
-				WBEMConfigurationDefaults.HTTP_CONTENT_LENGTH_THRESHOLD));
+				WBEMConfigurationDefaults.HTTP_CONTENT_LENGTH_THRESHOLD
+			)
+		);
 	}
 
 	/**
 	 * Return the XML parser to use for processing operation responses
-	 * 
+	 *
 	 * @return The XML parser
 	 */
 	public String getCimXmlParser() {
-		return getProperty(WBEMConfigurationProperties.CIMXML_PARSER,
-				WBEMConfigurationDefaults.CIMXML_PARSER);
+		return getProperty(WBEMConfigurationProperties.CIMXML_PARSER, WBEMConfigurationDefaults.CIMXML_PARSER);
 	}
 
 	/**
 	 * getCimXmlEmbObjBuilder
-	 * 
+	 *
 	 * @return configuration property for the embedded object builder
 	 */
 	public String getCimXmlEmbObjBuilder() {
-		return getProperty(WBEMConfigurationProperties.CIMXML_EMBOBJBUILDER,
-				WBEMConfigurationDefaults.CIMXML_EMBOBJBUILDER);
+		return getProperty(
+			WBEMConfigurationProperties.CIMXML_EMBOBJBUILDER,
+			WBEMConfigurationDefaults.CIMXML_EMBOBJBUILDER
+		);
 	}
 
 	/**
 	 * strictEmbObjTypes
-	 * 
+	 *
 	 * @return true if EmbeddedObject exactly means Embedded Class
 	 */
 	public boolean strictEmbObjTypes() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.CIMXML_PARSER_STRICT_EMBOBJ_TYPES,
-						WBEMConfigurationDefaults.CIMXML_PARSER_STRICT_EMBOBJ_TYPES))
-				.booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.CIMXML_PARSER_STRICT_EMBOBJ_TYPES,
+					WBEMConfigurationDefaults.CIMXML_PARSER_STRICT_EMBOBJ_TYPES
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * upperCaseEmbObjEntities
-	 * 
+	 *
 	 * @return true if "EMBEDDEDOBJECT" entity, false if "EmbeddedObject"
 	 */
 	public boolean upperCaseEmbObjEntities() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.CIMXML_BUILDER_UPPERCASE_EMBOBJ_ENTITIES,
-						WBEMConfigurationDefaults.CIMXML_BUILDER_UPPERCASE_EMBOBJ_ENTITIES))
-				.booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.CIMXML_BUILDER_UPPERCASE_EMBOBJ_ENTITIES,
+					WBEMConfigurationDefaults.CIMXML_BUILDER_UPPERCASE_EMBOBJ_ENTITIES
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * performSslHandshake
-	 * 
+	 *
 	 * @return true if SSL handshakes should take place
 	 */
 	public boolean performSslHandshake() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.PERFORM_SSL_HANDSHAKE,
-						WBEMConfigurationDefaults.PERFORM_SSL_HANDSHAKE)).booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(WBEMConfigurationProperties.PERFORM_SSL_HANDSHAKE, WBEMConfigurationDefaults.PERFORM_SSL_HANDSHAKE)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * synchronizedSslHandshake
-	 * 
+	 *
 	 * @return true if SSL handshakes should be synchronized
 	 */
 	public boolean synchronizedSslHandshake() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.SYNCHRONIZED_SSL_HANDSHAKE,
-						WBEMConfigurationDefaults.SYNCHRONIZED_SSL_HANDSHAKE)).booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.SYNCHRONIZED_SSL_HANDSHAKE,
+					WBEMConfigurationDefaults.SYNCHRONIZED_SSL_HANDSHAKE
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * socketConnectWithTimeout
-	 * 
+	 *
 	 * @return true if socket connections should be attempted with a timeout
 	 */
 	public boolean socketConnectWithTimeout() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.SOCKET_CONNECT_WITH_TIMEOUT,
-						WBEMConfigurationDefaults.SOCKET_CONNECT_WITH_TIMEOUT)).booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.SOCKET_CONNECT_WITH_TIMEOUT,
+					WBEMConfigurationDefaults.SOCKET_CONNECT_WITH_TIMEOUT
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * Returns the socket connect timeout
-	 * 
+	 *
 	 * @return The socket connect timeout
 	 */
 	public int getSocketConnectTimeout() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.SOCKET_CONNECT_TIMEOUT,
-				WBEMConfigurationDefaults.SOCKET_CONNECT_TIMEOUT));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.SOCKET_CONNECT_TIMEOUT, WBEMConfigurationDefaults.SOCKET_CONNECT_TIMEOUT)
+		);
 	}
 
 	/**
 	 * Returns the socket idle timeout
-	 * 
+	 *
 	 * @return The socket idle timeout
 	 */
 	public int getSocketIdleTimeout() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.SOCKET_IDLE_TIMEOUT,
-				WBEMConfigurationDefaults.SOCKET_IDLE_TIMEOUT));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.SOCKET_IDLE_TIMEOUT, WBEMConfigurationDefaults.SOCKET_IDLE_TIMEOUT)
+		);
 	}
 
 	/**
 	 * isDefaultAuthorizationEnabled
-	 * 
+	 *
 	 * @return true if default authorization is enabled
 	 */
 	public boolean isDefaultAuthorizationEnabled() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.KEY_CREDENTIALS_DEFAULT_ENABLED,
-						WBEMConfigurationDefaults.KEY_CREDENTIALS_DEFAULT_ENABLED)).booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.KEY_CREDENTIALS_DEFAULT_ENABLED,
+					WBEMConfigurationDefaults.KEY_CREDENTIALS_DEFAULT_ENABLED
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * getDefaultPrincipal
-	 * 
+	 *
 	 * @return default value of Principal
 	 */
 	public String getDefaultPrincipal() {
-		return getProperty(WBEMConfigurationProperties.KEY_DEFAULT_PRINCIPAL,
-				WBEMConfigurationDefaults.KEY_DEFAULT_PRINCIPAL);
+		return getProperty(
+			WBEMConfigurationProperties.KEY_DEFAULT_PRINCIPAL,
+			WBEMConfigurationDefaults.KEY_DEFAULT_PRINCIPAL
+		);
 	}
 
 	/**
 	 * getDefaultCredentials
-	 * 
+	 *
 	 * @return default value of Credentials
 	 */
 	public String getDefaultCredentials() {
-		return getProperty(WBEMConfigurationProperties.KEY_DEFAULT_CREDENTIAL,
-				WBEMConfigurationDefaults.KEY_DEFAULT_CREDENTIAL);
+		return getProperty(
+			WBEMConfigurationProperties.KEY_DEFAULT_CREDENTIAL,
+			WBEMConfigurationDefaults.KEY_DEFAULT_CREDENTIAL
+		);
 	}
 
 	/**
 	 * Returns the state of CIM-XML tracing
-	 * 
+	 *
 	 * @return true if tracing is enabled, false
 	 *         otherwise
 	 */
 	public boolean isCimXmlTracingEnabled() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.CIMXML_TRACING,
-						WBEMConfigurationDefaults.CIMXML_TRACING)).booleanValue();
+		return Boolean
+			.valueOf(getProperty(WBEMConfigurationProperties.CIMXML_TRACING, WBEMConfigurationDefaults.CIMXML_TRACING))
+			.booleanValue();
 	}
 
 	/**
 	 * Returns the CIM-XML trace stream to be used if application does not set
 	 * one of its own
-	 * 
+	 *
 	 * @return The trace stream
 	 */
 	public String getCimXmlTraceStream() {
@@ -1010,149 +1060,184 @@ public String getCimXmlTraceStream() {
 	/**
 	 * Returns the backlog that is tolerated before the thread pool creates an
 	 * additional handler
-	 * 
+	 *
 	 * @return The backlog
 	 */
 	public int getListenerBacklog() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.LISTENER_BACKLOG,
-				WBEMConfigurationDefaults.LISTENER_BACKLOG));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.LISTENER_BACKLOG, WBEMConfigurationDefaults.LISTENER_BACKLOG)
+		);
 	}
 
 	/**
 	 * Returns the http timeout for indication connection handlers
-	 * 
+	 *
 	 * @return The timeout
 	 */
 	public int getListenerHttpTimeout() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.LISTENER_HTTP_TIMEOUT,
-				WBEMConfigurationDefaults.LISTENER_HTTP_TIMEOUT));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.LISTENER_HTTP_TIMEOUT, WBEMConfigurationDefaults.LISTENER_HTTP_TIMEOUT)
+		);
 	}
 
 	/**
 	 * Returns the http header timeout for indication connection handlers
-	 * 
+	 *
 	 * @return The timeout
 	 */
 	public int getListenerHttpHeaderTimeout() {
-		return Integer.parseInt(getProperty(
+		return Integer.parseInt(
+			getProperty(
 				WBEMConfigurationProperties.LISTENER_HTTP_HEADER_TIMEOUT,
-				WBEMConfigurationDefaults.LISTENER_HTTP_HEADER_TIMEOUT));
+				WBEMConfigurationDefaults.LISTENER_HTTP_HEADER_TIMEOUT
+			)
+		);
 	}
 
 	/**
 	 * Returns the maximum allowed http timeouts before IP is blocked
-	 * 
+	 *
 	 * @return The maximum allowed timeouts
 	 */
 	public int getListenerMaxAllowedTimeouts() {
-		return Integer.parseInt(getProperty(
+		return Integer.parseInt(
+			getProperty(
 				WBEMConfigurationProperties.LISTENER_HTTP_MAX_ALLOWED_TIMEOUTS,
-				WBEMConfigurationDefaults.LISTENER_HTTP_MAX_ALLOWED_TIMEOUTS));
+				WBEMConfigurationDefaults.LISTENER_HTTP_MAX_ALLOWED_TIMEOUTS
+			)
+		);
 	}
 
 	/**
 	 * Returns the maximal pool size for indication connection handlers
-	 * 
+	 *
 	 * @return The maximal pool size
 	 */
 	public int getListenerMaxPoolSize() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.LISTENER_MAX_POOL_SIZE,
-				WBEMConfigurationDefaults.LISTENER_MAX_POOL_SIZE));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.LISTENER_MAX_POOL_SIZE, WBEMConfigurationDefaults.LISTENER_MAX_POOL_SIZE)
+		);
 	}
 
 	/**
 	 * Returns the minimal pool size for indication connection handlers
-	 * 
+	 *
 	 * @return The minimal pool size
 	 */
 	public int getListenerMinPoolSize() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.LISTENER_MIN_POOL_SIZE,
-				WBEMConfigurationDefaults.LISTENER_MIN_POOL_SIZE));
+		return Integer.parseInt(
+			getProperty(WBEMConfigurationProperties.LISTENER_MIN_POOL_SIZE, WBEMConfigurationDefaults.LISTENER_MIN_POOL_SIZE)
+		);
 	}
 
 	/**
 	 * Returns the maximal queue size for pending indication connections
-	 * 
+	 *
 	 * @return The maximal queue size
 	 */
 	public int getListenerMaxQueueSize() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.LISTENER_MAX_QUEUE_SIZE,
-				WBEMConfigurationDefaults.LISTENER_MAX_QUEUE_SIZE));
+		return Integer.parseInt(
+			getProperty(
+				WBEMConfigurationProperties.LISTENER_MAX_QUEUE_SIZE,
+				WBEMConfigurationDefaults.LISTENER_MAX_QUEUE_SIZE
+			)
+		);
 	}
 
 	/**
 	 * Returns the maximal idle time that is tolerated for a connection handler
-	 * 
+	 *
 	 * @return The maximal idle time
 	 */
 	public long getListenerMaxIdle() {
-		return Long.parseLong(getProperty(WBEMConfigurationProperties.LISTENER_HANDLER_MAX_IDLE,
-				WBEMConfigurationDefaults.LISTENER_HANDLER_MAX_IDLE));
+		return Long.parseLong(
+			getProperty(
+				WBEMConfigurationProperties.LISTENER_HANDLER_MAX_IDLE,
+				WBEMConfigurationDefaults.LISTENER_HANDLER_MAX_IDLE
+			)
+		);
 	}
 
 	/**
 	 * Returns the maximal queue size for indications awaiting delivery
-	 * 
+	 *
 	 * @return The maximal queue size
 	 */
 	public int getListenerMaxQueuedEvents() {
-		return Integer.parseInt(getProperty(WBEMConfigurationProperties.LISTENER_MAX_QUEUED_EVENTS,
-				WBEMConfigurationDefaults.LISTENER_MAX_QUEUED_EVENTS));
+		return Integer.parseInt(
+			getProperty(
+				WBEMConfigurationProperties.LISTENER_MAX_QUEUED_EVENTS,
+				WBEMConfigurationDefaults.LISTENER_MAX_QUEUED_EVENTS
+			)
+		);
 	}
 
 	/**
 	 * Returns the state of reliable indication support
-	 * 
+	 *
 	 * @return true if reliable indication support is enabled,
 	 *         false otherwise
 	 */
 	public boolean isReliableIndicationEnabled() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.LISTENER_ENABLE_RELIABLE_INDICATIONS,
-						WBEMConfigurationDefaults.LISTENER_ENABLE_RELIABLE_INDICATIONS))
-				.booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.LISTENER_ENABLE_RELIABLE_INDICATIONS,
+					WBEMConfigurationDefaults.LISTENER_ENABLE_RELIABLE_INDICATIONS
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * Returns the default value to use for CIM_IndicationService
 	 * DeliveryRetryAttempts
-	 * 
+	 *
 	 * @return The default value
 	 */
 	public long getListenerDeliveryRetryAttempts() {
-		return Long.parseLong(getProperty(
+		return Long.parseLong(
+			getProperty(
 				WBEMConfigurationProperties.LISTENER_DELIVERY_RETRY_ATTEMPTS,
-				WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_ATTEMPTS));
+				WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_ATTEMPTS
+			)
+		);
 	}
 
 	/**
 	 * Returns the default value to use for CIM_IndicationService
 	 * DeliveryRetryInterval
-	 * 
+	 *
 	 * @return The default value
 	 */
 	public long getListenerDeliveryRetryInterval() {
-		return Long.parseLong(getProperty(
+		return Long.parseLong(
+			getProperty(
 				WBEMConfigurationProperties.LISTENER_DELIVERY_RETRY_INTERVAL,
-				WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_INTERVAL));
+				WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_INTERVAL
+			)
+		);
 	}
 
 	/**
 	 * Returns the initial capacity of the hash table used to handle reliable
 	 * indications
-	 * 
+	 *
 	 * @return The default value
 	 */
 	public int getReliableIndicationHashtableCapacity() {
-		return Integer.parseInt(getProperty(
+		return Integer.parseInt(
+			getProperty(
 				WBEMConfigurationProperties.LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY,
-				WBEMConfigurationDefaults.LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY));
+				WBEMConfigurationDefaults.LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY
+			)
+		);
 	}
 
 	/**
 	 * Returns the filter to use for tracing of incoming indications at the FINE
 	 * level
-	 * 
+	 *
 	 * @return The indication trace filter
 	 */
 	public String getListenerIndicationTraceFilter() {
@@ -1161,28 +1246,38 @@ public String getListenerIndicationTraceFilter() {
 
 	/**
 	 * Returns whether sender IP property should be added to indications
-	 * 
+	 *
 	 * @return true if sender IP property should be added to
 	 *         indications, false otherwise
 	 */
 	public boolean getListenerAddSenderIPAddress() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.LISTENER_ADD_SENDER_IP_ADDRESS,
-						WBEMConfigurationDefaults.LISTENER_ADD_SENDER_IP_ADDRESS)).booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.LISTENER_ADD_SENDER_IP_ADDRESS,
+					WBEMConfigurationDefaults.LISTENER_ADD_SENDER_IP_ADDRESS
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * Returns whether the client will attempt to verify strings passed into the
 	 * java.lang.Double constructor or its parseDouble
 	 * method won't hang the JVM in an infinite loop.
-	 * 
+	 *
 	 * @return true if the client will attempt to verify strings
 	 *         passed to Double, false otherwise
 	 */
 	public boolean verifyJavaLangDoubleStrings() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.VERIFY_JAVA_LANG_DOUBLE_STRINGS,
-						WBEMConfigurationDefaults.VERIFY_JAVA_LANG_DOUBLE_STRINGS)).booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.VERIFY_JAVA_LANG_DOUBLE_STRINGS,
+					WBEMConfigurationDefaults.VERIFY_JAVA_LANG_DOUBLE_STRINGS
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
@@ -1190,49 +1285,61 @@ public boolean verifyJavaLangDoubleStrings() {
 	 * keys in a CIMInstance's CIMObjectPath match
 	 * those of the corresponding keys within the CIMInstance's
 	 * CIMProperty[].
-	 * 
+	 *
 	 * @return true if the client will synchronize
 	 *         CIMInstance numeric key data types,
 	 *         false otherwise
 	 */
 	public boolean synchronizeNumericKeyDataTypes() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES,
-						WBEMConfigurationDefaults.SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES))
-				.booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(
+					WBEMConfigurationProperties.SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES,
+					WBEMConfigurationDefaults.SYNCHRONIZE_NUMERIC_KEY_DATA_TYPES
+				)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * Returns the state of gzip encoding enablement.
-	 * 
+	 *
 	 * @return true if gzip encoding is enabled, false
 	 *         otherwise
 	 */
 	public boolean isGzipEncodingEnabled() {
-		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.ENABLE_GZIP_ENCODING,
-						WBEMConfigurationDefaults.ENABLE_GZIP_ENCODING)).booleanValue();
+		return Boolean
+			.valueOf(
+				getProperty(WBEMConfigurationProperties.ENABLE_GZIP_ENCODING, WBEMConfigurationDefaults.ENABLE_GZIP_ENCODING)
+			)
+			.booleanValue();
 	}
 
 	/**
 	 * Returns whether the client will allow empty
 	 * LOCALNAMESPACEPATH elements in incoming CIM-XML responses.
-	 * 
+	 *
 	 * @return true if CIM-XML parser should allow empty
 	 *         LOCALNAMESPACEPATH elements in incoming responses,
 	 *         false otherwise
 	 */
 	public boolean allowEmptyLocalNameSpacePath() {
-		return Boolean.valueOf(
+		return Boolean
+			.valueOf(
 				getProperty(
-						WBEMConfigurationProperties.CIMXML_PARSER_ALLOW_EMPTY_LOCALNAMESPACEPATH,
-						WBEMConfigurationDefaults.CIMXML_PARSER_ALLOW_EMPTY_LOCALNAMESPACEPATH))
-				.booleanValue();
+					WBEMConfigurationProperties.CIMXML_PARSER_ALLOW_EMPTY_LOCALNAMESPACEPATH,
+					WBEMConfigurationDefaults.CIMXML_PARSER_ALLOW_EMPTY_LOCALNAMESPACEPATH
+				)
+			)
+			.booleanValue();
 	}
 
 	public boolean useKeepAliveStrictMode() {
 		return Boolean.valueOf(
-				getProperty(WBEMConfigurationProperties.HTTP_KEEP_ALIVE_STRICT_MODE,
-				            WBEMConfigurationDefaults.HTTP_KEEP_ALIVE_STRICT_MODE));
+			getProperty(
+				WBEMConfigurationProperties.HTTP_KEEP_ALIVE_STRICT_MODE,
+				WBEMConfigurationDefaults.HTTP_KEEP_ALIVE_STRICT_MODE
+			)
+		);
 	}
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConfigurationDefaults.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConfigurationDefaults.java
index 816b20d..71256db 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConfigurationDefaults.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConfigurationDefaults.java
@@ -72,16 +72,17 @@
 /**
  * Interface WBEMConfigurationDefaults holds the default values for the
  * configuration properties.
- * 
+ *
  */
 public interface WBEMConfigurationDefaults {
-
 	/**
 	 * CONFIG_URL
 	 */
-	public static final String[] CONFIG_URL = new String[] { "file:sblim-cim-client2.properties",
-			"file:" + System.getProperty("user.home") + "/sblim-cim-client2.properties",
-			"file:/etc/java/sblim-cim-client2.properties" };
+	public static final String[] CONFIG_URL = new String[] {
+		"file:sblim-cim-client2.properties",
+		"file:" + System.getProperty("user.home") + "/sblim-cim-client2.properties",
+		"file:/etc/java/sblim-cim-client2.properties"
+	};
 
 	/**
 	 * LOG_FILE_LEVEL
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConstants.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConstants.java
index 411dd23..59ee47a 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConstants.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/WBEMConstants.java
@@ -56,7 +56,6 @@
  * Class WBEMConstants contains global constants of the CIM client.
  */
 public interface WBEMConstants {
-
 	/**
 	 * The HTTP protocol
 	 */
@@ -189,5 +188,6 @@ public interface WBEMConstants {
 	/**
 	 * Exception message for indication sender potential DoS
 	 */
-	public static final String INDICATION_DOS_EXCEPTION_MESSAGE = "Indication sender taking too long, possible DoS underway?";
+	public static final String INDICATION_DOS_EXCEPTION_MESSAGE =
+		"Indication sender taking too long, possible DoS underway?";
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/XMLHostStr.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/XMLHostStr.java
index 336ec11..2decbf5 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/XMLHostStr.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/util/XMLHostStr.java
@@ -49,23 +49,24 @@
  * protocol, host and port strings.
  */
 public class XMLHostStr {
-
 	private String iHostStr, iProtocol, iHost, iPort;
 
 	/*
 	 * [ protocol "://"] host [ ":" port ]
-	 * 
+	 *
 	 * hosts: bela@anything.org 172.20.8.1 [ffe8::e391:13a3]
 	 */
 
 	/**
 	 * Ctor.
 	 */
-	public XMLHostStr() { /* default constructor */}
+	public XMLHostStr() {
+		/* default constructor */
+	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pXMLHostStr
 	 *            - like https://anything.org:5989
 	 */
@@ -75,7 +76,7 @@ public XMLHostStr(String pXMLHostStr) {
 
 	/**
 	 * set
-	 * 
+	 *
 	 * @param pXMLHostStr
 	 *            - like https://anything.org:5989
 	 */
@@ -93,7 +94,7 @@ public void set(String pXMLHostStr) {
 
 	/**
 	 * getProtocol
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getProtocol() {
@@ -102,7 +103,7 @@ public String getProtocol() {
 
 	/**
 	 * getHost
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getHost() {
@@ -111,7 +112,7 @@ public String getHost() {
 
 	/**
 	 * getPort
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getPort() {
@@ -158,7 +159,7 @@ private static boolean isIPv6Literal(String pStr) {
 
 	/*
 	 * [ protocol "://"] host [ ":" port ]
-	 * 
+	 *
 	 * hosts: bela@anything.org 172.20.8.1 [ffe8::e391:13a3]
 	 */
 
@@ -180,5 +181,4 @@ private String parsePort() {
 		this.iHostStr = m.group(1);
 		return m.group(2);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CIMError.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CIMError.java
index 1cf4a46..19da1d5 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CIMError.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CIMError.java
@@ -49,10 +49,9 @@
 
 /**
  * Class CIMError is required for IndicationHandling and CIM-XML parsing.
- * 
+ *
  */
 public class CIMError {
-
 	private int iStatusCode;
 
 	private String iDescription;
@@ -68,7 +67,7 @@ public CIMError() {
 
 	/**
 	 * Construct a CIMError object from the given WBEMException.
-	 * 
+	 *
 	 * @param pEx
 	 */
 	public CIMError(WBEMException pEx) {
@@ -77,7 +76,7 @@ public CIMError(WBEMException pEx) {
 
 	/**
 	 * Construct a CIMError object with the specified status code.
-	 * 
+	 *
 	 * @param pStatus
 	 *            The status code
 	 */
@@ -87,7 +86,7 @@ public CIMError(int pStatus) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStatus
 	 * @param pMsg
 	 */
@@ -97,7 +96,7 @@ public CIMError(int pStatus, String pMsg) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStatus
 	 * @param pMsg
 	 * @param pInstances
@@ -110,7 +109,7 @@ public CIMError(int pStatus, String pMsg, CIMInstance[] pInstances) {
 
 	/**
 	 * Gets the status code.
-	 * 
+	 *
 	 * @return The status code
 	 */
 	public int getCode() {
@@ -119,7 +118,7 @@ public int getCode() {
 
 	/**
 	 * Gets the description associated with this status.
-	 * 
+	 *
 	 * @return The description
 	 */
 	public String getDescription() {
@@ -128,7 +127,7 @@ public String getDescription() {
 
 	/**
 	 * getCIMInstances
-	 * 
+	 *
 	 * @return CIMInstance[]
 	 */
 	public CIMInstance[] getCIMInstances() {
@@ -137,19 +136,19 @@ public CIMInstance[] getCIMInstances() {
 
 	/**
 	 * Specifies the status code.
-	 * 
+	 *
 	 * @param pStatus
 	 */
 	public void setCode(int pStatus) {
-		if (pStatus > WBEMException.CIM_ERR_SERVER_IS_SHUTTING_DOWN
-				|| pStatus < WBEMException.CIM_ERR_FAILED) throw new IllegalArgumentException(
-				"invalid error code");
+		if (
+			pStatus > WBEMException.CIM_ERR_SERVER_IS_SHUTTING_DOWN || pStatus < WBEMException.CIM_ERR_FAILED
+		) throw new IllegalArgumentException("invalid error code");
 		this.iStatusCode = pStatus;
 	}
 
 	/**
 	 * Specifies the description associated to this status.
-	 * 
+	 *
 	 * @param pDescription
 	 */
 	public void setDescription(String pDescription) {
@@ -158,7 +157,7 @@ public void setDescription(String pDescription) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
@@ -168,7 +167,7 @@ public String toString() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	@Override
@@ -177,15 +176,16 @@ public boolean equals(Object o) {
 
 		CIMError that = (CIMError) o;
 
-		if (this.iStatusCode == that.iStatusCode
-				&& (this.iDescription == null ? that.iDescription == null : this.iDescription
-						.equals(that.iDescription))) return true;
+		if (
+			this.iStatusCode == that.iStatusCode &&
+			(this.iDescription == null ? that.iDescription == null : this.iDescription.equals(that.iDescription))
+		) return true;
 		return false;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#hashCode()
 	 */
 	@Override
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorDOM.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorDOM.java
index 447d37c..f838edf 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorDOM.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorDOM.java
@@ -51,29 +51,26 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
 import org.metricshub.wbem.javax.wbem.WBEMException;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMMessage;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMResponse;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLParseException;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLParserImpl;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.TrailerException;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMMessage;
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLParseException;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 
 /**
  * Class CloseableIteratorDOM is a CloseableIterator implementation for the
  * CIM-XML DOM parser.
- * 
+ *
  */
 public class CloseableIteratorDOM implements CloseableIterator {
-
 	private Iterator iItr;
 
 	private CIMResponse iRsp;
@@ -92,14 +89,13 @@ private void trace(Level pLevel, String pMsg) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 * @param pPath
 	 * @throws WBEMException
 	 * @throws IOException
 	 */
-	public CloseableIteratorDOM(InputStreamReader pStream, CIMObjectPath pPath)
-			throws WBEMException, IOException {
+	public CloseableIteratorDOM(InputStreamReader pStream, CIMObjectPath pPath) throws WBEMException, IOException {
 		try {
 			parse(new InputSource(pStream), pPath);
 		} finally {
@@ -109,7 +105,7 @@ public CloseableIteratorDOM(InputStreamReader pStream, CIMObjectPath pPath)
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pIs
 	 * @param pLocalPath
 	 * @throws WBEMException
@@ -152,7 +148,7 @@ public WBEMException getWBEMException() {
 	/**
 	 * getParamValues : returns the list of CIMArgument parsed parameters and
 	 * their values : String name, CIMDataType type, Object value
-	 * 
+	 *
 	 * @return List of CIMArgument
 	 */
 	public List getParamValues() {
@@ -195,5 +191,4 @@ private void parse(InputSource pIs, CIMObjectPath pLocalPath) throws WBEMExcepti
 		this.iItr = retValVec == null ? null : retValVec.iterator();
 		this.outParamValues = this.iRsp.getParamValues();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorGeneric.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorGeneric.java
index cf283f1..1a97ed3 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorGeneric.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorGeneric.java
@@ -38,26 +38,24 @@
  */
 
 import java.util.Iterator;
-
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
 import org.metricshub.wbem.javax.wbem.WBEMException;
 
 /**
  * Class CloseableIteratorGeneric creates new CloseableIterator from an Iterator
  * and WBEMException.
- * 
+ *
  * @param 
  *            : Type
  */
 public class CloseableIteratorGeneric implements CloseableIterator {
-
 	private Iterator iterator;
 
 	private WBEMException iWBEMException;
 
 	/**
 	 * Ctor. : creates new CloseableIterator from an Iterator and WBEMException.
-	 * 
+	 *
 	 * @param pIterator
 	 *            : Iterator to be used in closeableIterator
 	 * @param pException
@@ -70,7 +68,7 @@ public CloseableIteratorGeneric(Iterator pIterator, WBEMException pException)
 
 	/**
 	 * Ctor. : creates new CloseableIterator from an Iterator.
-	 * 
+	 *
 	 * @param pIterator
 	 *            : Iterator to be used in closeableIterator
 	 */
@@ -85,9 +83,9 @@ public void close() {
 
 	/**
 	 * Returns WBEMException
-	 * 
+	 *
 	 * @return WBEMException : This can be null
-	 * 
+	 *
 	 */
 	public WBEMException getWBEMException() {
 		return this.iWBEMException;
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorPULL.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorPULL.java
index 0169c6f..e28a9ca 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorPULL.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorPULL.java
@@ -48,26 +48,24 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
 import org.metricshub.wbem.javax.wbem.WBEMException;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.XMLDefaultHandlerImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractMessageNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractSimpleRspNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.CIMNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.MessageNode;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.TrailerException;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.pullparser.XMLPullParser;
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractMessageNode;
 import org.xml.sax.SAXException;
 
 /**
  * CloseableIterator implementation for PULL parser.
  */
 public class CloseableIteratorPULL implements CloseableIterator {
-
 	private XMLPullParser iParser;
 
 	private XMLDefaultHandlerImpl iHandler;
@@ -88,19 +86,18 @@ public class CloseableIteratorPULL implements CloseableIterator {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 * @param pPath
 	 * @throws RuntimeException
 	 */
-	public CloseableIteratorPULL(InputStreamReader pStream, CIMObjectPath pPath)
-			throws RuntimeException {
+	public CloseableIteratorPULL(InputStreamReader pStream, CIMObjectPath pPath) throws RuntimeException {
 		this(new XMLPullParser(pStream), new XMLDefaultHandlerImpl(pPath));
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pParser
 	 * @param pHandler
 	 */
@@ -127,8 +124,7 @@ public boolean hasNext() {
 			this.iWBEMException = e.getWBEMException();
 			throw new RuntimeException(this.iWBEMException);
 		} catch (Exception e) {
-			LogAndTraceBroker.getBroker().trace(Level.SEVERE,
-					"Exception occurred during XML parsing!", e);
+			LogAndTraceBroker.getBroker().trace(Level.SEVERE, "Exception occurred during XML parsing!", e);
 			throw new RuntimeException(e);
 		}
 	}
@@ -153,8 +149,7 @@ private boolean hasNextImpl() throws Exception {
 			int event = this.iParser.next();
 			switch (event) {
 				case XMLPullParser.START_ELEMENT:
-					this.iHandler.startElement(EMPTY, EMPTY, this.iParser.getElementName(),
-							this.iParser.getAttributes());
+					this.iHandler.startElement(EMPTY, EMPTY, this.iParser.getElementName(), this.iParser.getAttributes());
 					break;
 				case XMLPullParser.CHARACTERS:
 					char[] buf = this.iParser.getText().toCharArray();
@@ -174,8 +169,11 @@ private boolean hasNextImpl() throws Exception {
 							this.iCIMArgAL = absSimpRspNode.getCIMArguments();
 
 							CIMError cimErr = absSimpRspNode.getCIMError();
-							if (cimErr != null) throw new WBEMException(cimErr.getCode(), cimErr
-									.getDescription(), cimErr.getCIMInstances());
+							if (cimErr != null) throw new WBEMException(
+								cimErr.getCode(),
+								cimErr.getDescription(),
+								cimErr.getCIMInstances()
+							);
 							return false;
 						}
 					}
@@ -201,7 +199,8 @@ private AbstractSimpleRspNode getAbstractSimpleRspNode() throws Exception {
 		AbstractMessageNode absMsgNode = this.iMsgNode.getAbstractMessageNode();
 		if (absMsgNode == null) return null;
 		if (!(absMsgNode instanceof AbstractSimpleRspNode)) throw new SAXException(
-				"Simple response child node expected for MESSAGE node!");
+			"Simple response child node expected for MESSAGE node!"
+		);
 		this.iAbsSimpRspNode = (AbstractSimpleRspNode) absMsgNode;
 		this.iMsgNode = null;
 		this.iCIMNode = null; // needed no more
@@ -209,10 +208,10 @@ private AbstractSimpleRspNode getAbstractSimpleRspNode() throws Exception {
 	}
 
 	/**
-	 * 
+	 *
 	 * getCIMArguments : returns the array of parsed parameters and their values
 	 * : String name, CIMDataType type, Object value
-	 * 
+	 *
 	 * @return CIMArgument<?>[]
 	 */
 
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorSAX.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorSAX.java
index 59ef76a..de72100 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorSAX.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/CloseableIteratorSAX.java
@@ -47,21 +47,19 @@
 
 import java.io.IOException;
 import java.io.InputStreamReader;
-
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
 import org.metricshub.wbem.javax.wbem.WBEMException;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.XMLDefaultHandlerImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractMessageNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractSimpleRspNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.CIMNode;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.MessageNode;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.TrailerException;
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.node.AbstractMessageNode;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -69,7 +67,6 @@
  * CloseableIterator implementation for SAX parser.
  */
 public class CloseableIteratorSAX implements CloseableIterator {
-
 	private AbstractSimpleRspNode iAbsSimpleRspNode;
 
 	private CIMError iErr;
@@ -82,7 +79,7 @@ public class CloseableIteratorSAX implements CloseableIterator {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 * @param pPath
 	 * @throws IOException
@@ -90,8 +87,8 @@ public class CloseableIteratorSAX implements CloseableIterator {
 	 * @throws ParserConfigurationException
 	 * @throws WBEMException
 	 */
-	public CloseableIteratorSAX(InputStreamReader pStream, CIMObjectPath pPath) throws IOException,
-			SAXException, ParserConfigurationException, WBEMException {
+	public CloseableIteratorSAX(InputStreamReader pStream, CIMObjectPath pPath)
+		throws IOException, SAXException, ParserConfigurationException, WBEMException {
 		XMLDefaultHandlerImpl handler = new XMLDefaultHandlerImpl(pPath);
 		SAXParser saxParser = iFactory.newSAXParser();
 		try {
@@ -107,7 +104,7 @@ public CloseableIteratorSAX(InputStreamReader pStream, CIMObjectPath pPath) thro
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pCIMNode
 	 * @throws WBEMException
 	 */
@@ -117,11 +114,11 @@ public CloseableIteratorSAX(CIMNode pCIMNode) throws WBEMException {
 
 	private void init(CIMNode pCIMNode) throws WBEMException {
 		MessageNode msgNode = pCIMNode.getMessageNode();
-		if (msgNode == null) throw new WBEMException(
-				"CIMNode parameter must contain a message node!");
+		if (msgNode == null) throw new WBEMException("CIMNode parameter must contain a message node!");
 		AbstractMessageNode absMsgNode = msgNode.getAbstractMessageNode();
 		if (!(absMsgNode instanceof AbstractSimpleRspNode)) throw new WBEMException(
-				"Currently only AbstractSimpleRspNodes are handled!");
+			"Currently only AbstractSimpleRspNodes are handled!"
+		);
 		this.iAbsSimpleRspNode = (AbstractSimpleRspNode) absMsgNode;
 		this.iErr = this.iAbsSimpleRspNode.getCIMError();
 		this.iCIMArgAL = this.iAbsSimpleRspNode.getCIMArguments();
@@ -136,14 +133,15 @@ public void close() {
 	}
 
 	public boolean hasNext() {
-		if (this.iWBEMException != null) { throw new RuntimeException(this.iWBEMException); }
+		if (this.iWBEMException != null) {
+			throw new RuntimeException(this.iWBEMException);
+		}
 		if (this.iErr != null) {
-			this.iWBEMException = new WBEMException(this.iErr.getCode(),
-					this.iErr.getDescription(), this.iErr.getCIMInstances());
+			this.iWBEMException =
+				new WBEMException(this.iErr.getCode(), this.iErr.getDescription(), this.iErr.getCIMInstances());
 			throw new RuntimeException(this.iWBEMException);
 		}
-		return this.iAbsSimpleRspNode == null ? false : this.iAbsSimpleRspNode
-				.getReturnValueCount() > 0;
+		return this.iAbsSimpleRspNode == null ? false : this.iAbsSimpleRspNode.getReturnValueCount() > 0;
 	}
 
 	public Object next() {
@@ -159,10 +157,10 @@ public WBEMException getWBEMException() {
 	}
 
 	/**
-	 * 
+	 *
 	 * getCIMArguments : returns the array of parsed parameters and their values
 	 * : String name, CIMDataType type, Object value
-	 * 
+	 *
 	 * @return CIMArgument<?>[]
 	 */
 
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponseDOM.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponseDOM.java
index e429344..08e58ef 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponseDOM.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponseDOM.java
@@ -42,9 +42,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.List;
-
 import javax.xml.parsers.ParserConfigurationException;
-
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
@@ -55,17 +53,16 @@
 /**
  * Class EnumerateResponseDOM is responsible for all helper functions of DOM
  * parser related with EnumerateResponse.
- * 
+ *
  * @param 
  *            : Type Variable
  */
 public class EnumerateResponseDOM {
-
 	private EnumerateResponse enumResponse;
 
 	/**
 	 * EnumerateResponsePULL
-	 * 
+	 *
 	 * @param pStream
 	 * @param pPath
 	 * @throws IOException
@@ -74,9 +71,8 @@ public class EnumerateResponseDOM {
 	 * @throws WBEMException
 	 */
 	@SuppressWarnings("unchecked")
-	public EnumerateResponseDOM(InputStreamReader pStream, CIMObjectPath pPath) throws IOException,
-			SAXException, ParserConfigurationException, WBEMException {
-
+	public EnumerateResponseDOM(InputStreamReader pStream, CIMObjectPath pPath)
+		throws IOException, SAXException, ParserConfigurationException, WBEMException {
 		String enumContext = null;
 
 		Boolean endOfSequence = null;
@@ -88,8 +84,9 @@ public EnumerateResponseDOM(InputStreamReader pStream, CIMObjectPath pPath) thro
 			iter.hasNext();
 		} catch (RuntimeException e) {
 			iter.close();
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) { throw (WBEMException) e
-					.getCause(); }
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				throw (WBEMException) e.getCause();
+			}
 			throw e;
 		}
 
@@ -97,39 +94,41 @@ public EnumerateResponseDOM(InputStreamReader pStream, CIMObjectPath pPath) thro
 		List pOutArgA = ((CloseableIteratorDOM) iter).getParamValues();
 
 		// pOutArgA can never be null
-		if (pOutArgA == null) { throw new IllegalArgumentException(
-				"Output auguments not found during CIM-XML DOM parser"); }
+		if (pOutArgA == null) {
+			throw new IllegalArgumentException("Output auguments not found during CIM-XML DOM parser");
+		}
 
 		for (int i = 0; i < pOutArgA.size(); i++) {
-
 			CIMArgument cimArg = (CIMArgument) pOutArgA.get(i);
 
-			if (cimArg.getName().equals("EnumerationContext")) enumContext = (String) cimArg
-					.getValue();
-			else if (cimArg.getName().equals("EndOfSequence")) endOfSequence = (Boolean) cimArg
-					.getValue();
-			else throw new IllegalArgumentException(
-					"Invalid argument : only EnumerationContext and EndOfSequence are allowed");
+			if (cimArg.getName().equals("EnumerationContext")) enumContext = (String) cimArg.getValue(); else if (
+				cimArg.getName().equals("EndOfSequence")
+			) endOfSequence = (Boolean) cimArg.getValue(); else throw new IllegalArgumentException(
+				"Invalid argument : only EnumerationContext and EndOfSequence are allowed"
+			);
 		}
 		// EndOfSequence can never be null
-		if (endOfSequence == null) { throw new IllegalArgumentException(
-				"Invalid argument : EndOfSequence can never be null"); }
+		if (endOfSequence == null) {
+			throw new IllegalArgumentException("Invalid argument : EndOfSequence can never be null");
+		}
 
 		// EnumerationContext can't be null if there is more data available
-		if ((endOfSequence.booleanValue() == false) && (enumContext == null)) { throw new IllegalArgumentException(
-				"Invalid argument : EnumerationContext cannot be null if there is more data available"); }
+		if ((endOfSequence.booleanValue() == false) && (enumContext == null)) {
+			throw new IllegalArgumentException(
+				"Invalid argument : EnumerationContext cannot be null if there is more data available"
+			);
+		}
 
-		this.enumResponse = new EnumerateResponse(enumContext, (CloseableIterator) iter,
-				endOfSequence.booleanValue());
+		this.enumResponse =
+			new EnumerateResponse(enumContext, (CloseableIterator) iter, endOfSequence.booleanValue());
 	}
 
 	/**
 	 * Returns enumResponse
-	 * 
+	 *
 	 * @return The value of enumResponse.
 	 */
 	public EnumerateResponse getEnumResponse() {
 		return this.enumResponse;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponsePULL.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponsePULL.java
index 4127f66..336c7e4 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponsePULL.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponsePULL.java
@@ -41,9 +41,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-
 import javax.xml.parsers.ParserConfigurationException;
-
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
@@ -54,16 +52,15 @@
 /**
  * Class EnumerateResponsePULL is responsible for all helper functions of PULL
  * parser related with EnumerateResponse.
- * 
+ *
  * @param 
  */
 public class EnumerateResponsePULL {
-
 	private EnumerateResponse enumResponse;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            Input stream to be parsed
 	 * @param pPath
@@ -75,8 +72,7 @@ public class EnumerateResponsePULL {
 	 */
 	@SuppressWarnings("unchecked")
 	public EnumerateResponsePULL(InputStreamReader pStream, CIMObjectPath pPath)
-			throws IOException, SAXException, ParserConfigurationException, WBEMException {
-
+		throws IOException, SAXException, ParserConfigurationException, WBEMException {
 		String enumContext = null;
 		Boolean endOfSequence = null;
 		ArrayList list = new ArrayList();
@@ -85,51 +81,55 @@ public EnumerateResponsePULL(InputStreamReader pStream, CIMObjectPath pPath)
 
 		// iterate through 'iter' for getCIMArguments to populate
 		try {
-			while (iter.hasNext())
-				list.add((T) iter.next());
+			while (iter.hasNext()) list.add((T) iter.next());
 		} catch (RuntimeException e) {
 			iter.close();
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) { throw (WBEMException) e
-					.getCause(); }
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				throw (WBEMException) e.getCause();
+			}
 			throw e;
 		}
 
 		// pOutArgA can never be null
 		CIMArgument[] pOutArgA = ((CloseableIteratorPULL) iter).getCIMArguments();
-		if (pOutArgA == null) { throw new IllegalArgumentException(
-				"Output auguments not found during CIM-XML PULL parser"); }
+		if (pOutArgA == null) {
+			throw new IllegalArgumentException("Output auguments not found during CIM-XML PULL parser");
+		}
 
 		for (int i = 0; i < pOutArgA.length; i++) {
-			if (pOutArgA[i].getName().equals("EnumerationContext")) enumContext = (String) pOutArgA[i]
-					.getValue();
-			else if (pOutArgA[i].getName().equals("EndOfSequence")) endOfSequence = (Boolean) pOutArgA[i]
-					.getValue();
-			else throw new IllegalArgumentException(
-					"Invalid argument : only EnumerationContext and EndOfSequence are allowed");
+			if (pOutArgA[i].getName().equals("EnumerationContext")) enumContext = (String) pOutArgA[i].getValue(); else if (
+				pOutArgA[i].getName().equals("EndOfSequence")
+			) endOfSequence = (Boolean) pOutArgA[i].getValue(); else throw new IllegalArgumentException(
+				"Invalid argument : only EnumerationContext and EndOfSequence are allowed"
+			);
 		}
 		// EndOfSequence can never be null
-		if (endOfSequence == null) { throw new IllegalArgumentException(
-				"Invalid argument : EndOfSequence can never be null"); }
+		if (endOfSequence == null) {
+			throw new IllegalArgumentException("Invalid argument : EndOfSequence can never be null");
+		}
 
 		// EnumerationContext can't be null if there is more data available
-		if ((endOfSequence.booleanValue() == false) && (enumContext == null)) { throw new IllegalArgumentException(
-				"Invalid argument : EnumerationContext cannot be null if there is more data available"); }
+		if ((endOfSequence.booleanValue() == false) && (enumContext == null)) {
+			throw new IllegalArgumentException(
+				"Invalid argument : EnumerationContext cannot be null if there is more data available"
+			);
+		}
 
 		// create new closeableIterator as we cannot reuse 'iter'
-		CloseableIterator iterPull = (CloseableIterator) new CloseableIteratorGeneric(list
-				.iterator(), iter.getWBEMException());
+		CloseableIterator iterPull = (CloseableIterator) new CloseableIteratorGeneric(
+			list.iterator(),
+			iter.getWBEMException()
+		);
 
-		this.enumResponse = new EnumerateResponse(enumContext, iterPull, endOfSequence
-				.booleanValue());
+		this.enumResponse = new EnumerateResponse(enumContext, iterPull, endOfSequence.booleanValue());
 	}
 
 	/**
 	 * Returns enumResponse
-	 * 
+	 *
 	 * @return The value of enumResponse.
 	 */
 	public EnumerateResponse getEnumResponse() {
 		return this.enumResponse;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponseSAX.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponseSAX.java
index d56ecb8..edb6879 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponseSAX.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/EnumerateResponseSAX.java
@@ -42,9 +42,7 @@
 
 import java.io.IOException;
 import java.io.InputStreamReader;
-
 import javax.xml.parsers.ParserConfigurationException;
-
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
@@ -55,16 +53,15 @@
 /**
  * Class EnumerateResponseSAX is responsible for all helper functions of SAX
  * parser related with EnumerateResponse.
- * 
+ *
  * @param 
  */
 public class EnumerateResponseSAX {
-
 	private EnumerateResponse enumResponse;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStream
 	 *            Input stream to be parsed
 	 * @param pPath
@@ -75,9 +72,8 @@ public class EnumerateResponseSAX {
 	 * @throws WBEMException
 	 */
 	@SuppressWarnings("unchecked")
-	public EnumerateResponseSAX(InputStreamReader pStream, CIMObjectPath pPath) throws IOException,
-			SAXException, ParserConfigurationException, WBEMException {
-
+	public EnumerateResponseSAX(InputStreamReader pStream, CIMObjectPath pPath)
+		throws IOException, SAXException, ParserConfigurationException, WBEMException {
 		String enumContext = null;
 
 		Boolean endOfSequence = null;
@@ -89,8 +85,9 @@ public EnumerateResponseSAX(InputStreamReader pStream, CIMObjectPath pPath) thro
 			iter.hasNext();
 		} catch (RuntimeException e) {
 			iter.close();
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) { throw (WBEMException) e
-					.getCause(); }
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				throw (WBEMException) e.getCause();
+			}
 			throw e;
 		}
 
@@ -98,8 +95,9 @@ public EnumerateResponseSAX(InputStreamReader pStream, CIMObjectPath pPath) thro
 		CIMArgument[] pOutArgA = ((CloseableIteratorSAX) iter).getCIMArguments();
 
 		// pOutArgA can never be null
-		if (pOutArgA == null) { throw new IllegalArgumentException(
-				"Output auguments not found during CIM-XML SAX parser"); }
+		if (pOutArgA == null) {
+			throw new IllegalArgumentException("Output auguments not found during CIM-XML SAX parser");
+		}
 
 		// we can use this too but we need not sort array just for 2 elements
 		// enumContext = ((CIMArgument) CIMElementSorter.find(pOutArgA,
@@ -108,32 +106,34 @@ public EnumerateResponseSAX(InputStreamReader pStream, CIMObjectPath pPath) thro
 		// CIMElementSorter.find(pOutArgA, "EndOfSequence")).getValue();
 
 		for (int i = 0; i < pOutArgA.length; i++) {
-			if (pOutArgA[i].getName().equals("EnumerationContext")) enumContext = (String) pOutArgA[i]
-					.getValue();
-			else if (pOutArgA[i].getName().equals("EndOfSequence")) endOfSequence = (Boolean) pOutArgA[i]
-					.getValue();
-			else throw new IllegalArgumentException(
-					"Invalid argument : only EnumerationContext and EndOfSequence are allowed");
+			if (pOutArgA[i].getName().equals("EnumerationContext")) enumContext = (String) pOutArgA[i].getValue(); else if (
+				pOutArgA[i].getName().equals("EndOfSequence")
+			) endOfSequence = (Boolean) pOutArgA[i].getValue(); else throw new IllegalArgumentException(
+				"Invalid argument : only EnumerationContext and EndOfSequence are allowed"
+			);
 		}
 		// EndOfSequence can never be null
-		if (endOfSequence == null) { throw new IllegalArgumentException(
-				"Invalid argument : EndOfSequence can never be null"); }
+		if (endOfSequence == null) {
+			throw new IllegalArgumentException("Invalid argument : EndOfSequence can never be null");
+		}
 
 		// EnumerationContext can't be null if there is more data available
-		if ((endOfSequence.booleanValue() == false) && (enumContext == null)) { throw new IllegalArgumentException(
-				"Invalid argument : EnumerationContext cannot be null if there is more data available"); }
+		if ((endOfSequence.booleanValue() == false) && (enumContext == null)) {
+			throw new IllegalArgumentException(
+				"Invalid argument : EnumerationContext cannot be null if there is more data available"
+			);
+		}
 
-		this.enumResponse = new EnumerateResponse(enumContext, (CloseableIterator) iter,
-				endOfSequence.booleanValue());
+		this.enumResponse =
+			new EnumerateResponse(enumContext, (CloseableIterator) iter, endOfSequence.booleanValue());
 	}
 
 	/**
 	 * Returns enumResponse
-	 * 
+	 *
 	 * @return The value of enumResponse.
 	 */
 	public EnumerateResponse getEnumResponse() {
 		return this.enumResponse;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java
index f0e2c58..91a75a1 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java
@@ -119,34 +119,45 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-import java.util.Properties;
 import java.util.Map.Entry;
+import java.util.Properties;
 import java.util.logging.Level;
-
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLHandshakeException;
+import javax.security.auth.Subject;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import org.metricshub.wbem.javax.cim.CIMArgument;
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.cim.CIMQualifierType;
+import org.metricshub.wbem.javax.cim.UnsignedInteger32;
+import org.metricshub.wbem.javax.cim.UnsignedInteger64;
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
 import org.metricshub.wbem.javax.wbem.WBEMException;
 import org.metricshub.wbem.javax.wbem.client.EnumerateResponse;
 import org.metricshub.wbem.javax.wbem.client.PasswordCredential;
 import org.metricshub.wbem.javax.wbem.client.RoleCredential;
 import org.metricshub.wbem.javax.wbem.client.WBEMClient;
+import org.metricshub.wbem.javax.wbem.client.WBEMClientConstants;
 import org.metricshub.wbem.sblim.cimclient.WBEMClientSBLIM;
 import org.metricshub.wbem.sblim.cimclient.WBEMConfigurationProperties;
 import org.metricshub.wbem.sblim.cimclient.internal.cim.CIMHelper;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMClientXML_HelperImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMMessage;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMResponse;
+import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLParseException;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLParserImpl;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.sax.SAXHelper;
+import org.metricshub.wbem.sblim.cimclient.internal.http.AuthorizationHandler;
 import org.metricshub.wbem.sblim.cimclient.internal.http.AuthorizationInfo;
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpClientPool;
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader.HeaderEntry;
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeaderParser;
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpUrlConnection;
-import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader.HeaderEntry;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.DebugInputStream;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.TrailerException;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
@@ -155,20 +166,6 @@
 import org.metricshub.wbem.sblim.cimclient.internal.util.MOF;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfigurationDefaults;
-import org.metricshub.wbem.javax.cim.UnsignedInteger32;
-import org.metricshub.wbem.javax.cim.UnsignedInteger64;
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLHandshakeException;
-import javax.security.auth.Subject;
-
-import org.metricshub.wbem.javax.wbem.client.WBEMClientConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMMessage;
-import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLParseException;
-import org.metricshub.wbem.sblim.cimclient.internal.http.AuthorizationHandler;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConstants;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
@@ -179,12 +176,11 @@
  * javax.wbem.client.WBEMClient interface for the CIM-XML protocol
  * including the extensions of the
  * org.metricshub.wbem.sblim.cimclient.WBEMClientSBLIM interface.
- * 
+ *
  * @see WBEMClient
  * @see WBEMClientSBLIM
  */
 public class WBEMClientCIMXML implements WBEMClientSBLIM {
-
 	private final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties());
 
 	private Locale[] iLocales; // final
@@ -221,8 +217,7 @@ public WBEMClientCIMXML() {
 	}
 
 	private synchronized void initializeClient(URI pUri, Subject pSubject, Locale[] pLocales)
-			throws IllegalArgumentException {
-
+		throws IllegalArgumentException {
 		if (this.iInitialized) throw new IllegalStateException("WBEMClient is already initialized");
 
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
@@ -230,34 +225,44 @@ private synchronized void initializeClient(URI pUri, Subject pSubject, Locale[]
 
 		try {
 			this.iHttpClientPool = new HttpClientPool(this.iConfiguration);
-			this.iLocales = (pLocales != null && pLocales.length > 0) ? pLocales
-					: WBEMConstants.DEFAULT_LOCALES;
+			this.iLocales = (pLocales != null && pLocales.length > 0) ? pLocales : WBEMConstants.DEFAULT_LOCALES;
 			this.iUri = pUri;
 
 			AuthorizationInfo authInfo = AuthorizationInfo.createAuthorizationInfo(
-					this.iConfiguration.getHttpAuthenticationModule(), Boolean.FALSE, this.iUri
-							.getHost(), this.iUri.getPort(), null, null, null);
-
-			Principal principal = (pSubject != null && pSubject.getPrincipals() != null && !pSubject
-					.getPrincipals().isEmpty()) ? (Principal) pSubject.getPrincipals().iterator()
-					.next() : null;
-			Object credential = (pSubject != null && pSubject.getPrivateCredentials() != null
-					&& !pSubject.getPrivateCredentials().isEmpty() ? pSubject
-					.getPrivateCredentials().iterator().next() : null);
-
-			boolean defaultAuthEnabled = WBEMConfiguration.getGlobalConfiguration()
-					.isDefaultAuthorizationEnabled();
+				this.iConfiguration.getHttpAuthenticationModule(),
+				Boolean.FALSE,
+				this.iUri.getHost(),
+				this.iUri.getPort(),
+				null,
+				null,
+				null
+			);
+
+			Principal principal = (
+					pSubject != null && pSubject.getPrincipals() != null && !pSubject.getPrincipals().isEmpty()
+				)
+				? (Principal) pSubject.getPrincipals().iterator().next()
+				: null;
+			Object credential =
+				(
+					pSubject != null && pSubject.getPrivateCredentials() != null && !pSubject.getPrivateCredentials().isEmpty()
+						? pSubject.getPrivateCredentials().iterator().next()
+						: null
+				);
+
+			boolean defaultAuthEnabled = WBEMConfiguration.getGlobalConfiguration().isDefaultAuthorizationEnabled();
 
 			String user = (principal != null) ? principal.getName() : "";
-			String password = (credential != null && credential instanceof PasswordCredential) ? new String(
-					((PasswordCredential) credential).getUserPassword())
-					: ((credential != null && credential instanceof RoleCredential) ? new String(
-							((RoleCredential) credential).getCredential()) : "");
+			String password = (credential != null && credential instanceof PasswordCredential)
+				? new String(((PasswordCredential) credential).getUserPassword())
+				: (
+					(credential != null && credential instanceof RoleCredential)
+						? new String(((RoleCredential) credential).getCredential())
+						: ""
+				);
 
-			if (defaultAuthEnabled && (user == null || user.length() == 0)
-					&& password.length() == 0) {
-				logger.trace(Level.FINER,
-						"Principal and Credential not set - using default authorization!");
+			if (defaultAuthEnabled && (user == null || user.length() == 0) && password.length() == 0) {
+				logger.trace(Level.FINER, "Principal and Credential not set - using default authorization!");
 
 				user = WBEMConfiguration.getGlobalConfiguration().getDefaultPrincipal();
 				password = WBEMConfiguration.getGlobalConfiguration().getDefaultCredentials();
@@ -270,36 +275,37 @@ private synchronized void initializeClient(URI pUri, Subject pSubject, Locale[]
 			try {
 				this.iXmlHelper = new CIMClientXML_HelperImpl();
 			} catch (ParserConfigurationException e) {
-				logger
-						.trace(Level.FINE, "Exception while instantiating CIMClientXML_HelperImpl",
-								e);
+				logger.trace(Level.FINE, "Exception while instantiating CIMClientXML_HelperImpl", e);
 				logger.message(Messages.CIM_XMLHELPER_FAILED);
 				throw new RuntimeException(e);
 			}
 
 			this.iInitialized = true;
-
 		} finally {
 			logger.exit();
 		}
 	}
 
 	public void initialize(CIMObjectPath pName, Subject pSubject, Locale[] pLocales)
-			throws IllegalArgumentException, WBEMException {
-
+		throws IllegalArgumentException, WBEMException {
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
 
 		try {
 			final URI uri;
 
-			if (pName == null || pName.getHost() == null || pName.getHost().length() == 0) { throw new IllegalArgumentException(
-					"Empty host path"); }
-			if (pName.getScheme() == null || pName.getScheme().length() == 0) { throw new IllegalArgumentException(
-					"Empty scheme"); }
-			if (!pName.getScheme().equalsIgnoreCase(WBEMConstants.HTTP)
-					&& !pName.getScheme().equalsIgnoreCase(WBEMConstants.HTTPS)) { throw new IllegalArgumentException(
-					"Protocol not supported"); }
+			if (pName == null || pName.getHost() == null || pName.getHost().length() == 0) {
+				throw new IllegalArgumentException("Empty host path");
+			}
+			if (pName.getScheme() == null || pName.getScheme().length() == 0) {
+				throw new IllegalArgumentException("Empty scheme");
+			}
+			if (
+				!pName.getScheme().equalsIgnoreCase(WBEMConstants.HTTP) &&
+				!pName.getScheme().equalsIgnoreCase(WBEMConstants.HTTPS)
+			) {
+				throw new IllegalArgumentException("Protocol not supported");
+			}
 
 			try {
 				uri = CIMHelper.createCimomUri(pName);
@@ -313,22 +319,25 @@ public void initialize(CIMObjectPath pName, Subject pSubject, Locale[] pLocales)
 		}
 	}
 
-	public void initialize(URI pUri, Subject pSubject, Locale[] pLocales)
-			throws IllegalArgumentException, WBEMException {
-
+	public void initialize(URI pUri, Subject pSubject, Locale[] pLocales) throws IllegalArgumentException, WBEMException {
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
 
 		try {
 			final URI uri;
 
-			if (pUri == null || pUri.getHost() == null || pUri.getHost().length() == 0) { throw new IllegalArgumentException(
-					"Empty host path"); }
-			if (pUri.getScheme() == null || pUri.getScheme().length() == 0) { throw new IllegalArgumentException(
-					"Empty scheme"); }
-			if (!pUri.getScheme().equalsIgnoreCase(WBEMConstants.HTTP)
-					&& !pUri.getScheme().equalsIgnoreCase(WBEMConstants.HTTPS)) { throw new IllegalArgumentException(
-					"Protocol not supported"); }
+			if (pUri == null || pUri.getHost() == null || pUri.getHost().length() == 0) {
+				throw new IllegalArgumentException("Empty host path");
+			}
+			if (pUri.getScheme() == null || pUri.getScheme().length() == 0) {
+				throw new IllegalArgumentException("Empty scheme");
+			}
+			if (
+				!pUri.getScheme().equalsIgnoreCase(WBEMConstants.HTTP) &&
+				!pUri.getScheme().equalsIgnoreCase(WBEMConstants.HTTPS)
+			) {
+				throw new IllegalArgumentException("Protocol not supported");
+			}
 
 			try {
 				uri = CIMHelper.createCimomUri(pUri);
@@ -399,7 +408,6 @@ public String getProperty(String pKey) {
 			}
 		}
 		return this.iConfiguration.getDomainProperty(pKey);
-
 	}
 
 	public void setProperties(Properties pProperties) {
@@ -410,23 +418,18 @@ public void setProperty(String pKey, String pValue) {
 		if (pKey.startsWith("javax.wbem.")) {
 			// Process JSR48 properties
 			if (pKey.equals(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING)) {
-				this.iConfiguration.setDomainProperty(
-						WBEMConfigurationProperties.LOG_CONSOLE_LEVEL, pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL, pValue);
 			} else if (pKey.equals(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING)) {
-				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL,
-						pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL, pValue);
 			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_BYTE_LIMIT)) {
-				this.iConfiguration.setDomainProperty(
-						WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT, pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT, pValue);
 			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_DIR)) {
 				StringBuffer NewSblimLog = new StringBuffer(pValue != null ? pValue : "");
-				if (NewSblimLog.length() > 0
-						&& NewSblimLog.charAt(NewSblimLog.length() - 1) != File.separatorChar) {
+				if (NewSblimLog.length() > 0 && NewSblimLog.charAt(NewSblimLog.length() - 1) != File.separatorChar) {
 					NewSblimLog.append(File.separator);
 				}
 
-				String CurSblimLog = this.iConfiguration
-						.getDomainProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION);
+				String CurSblimLog = this.iConfiguration.getDomainProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION);
 				if (CurSblimLog == null) {
 					CurSblimLog = WBEMConfigurationDefaults.LOG_FILE_LOCATION;
 				}
@@ -438,13 +441,11 @@ public void setProperty(String pKey, String pValue) {
 					NewSblimLog.append(CurSblimLog.substring(i + 1));
 				}
 
-				this.iConfiguration.setDomainProperty(
-						WBEMConfigurationProperties.LOG_FILE_LOCATION, NewSblimLog.toString());
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION, NewSblimLog.toString());
 			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_FILENAME)) {
 				StringBuffer NewSblimLog = new StringBuffer(pValue != null ? pValue : "");
 
-				String CurSblimLog = this.iConfiguration
-						.getDomainProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION);
+				String CurSblimLog = this.iConfiguration.getDomainProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION);
 				if (CurSblimLog != null) {
 					int i = getLastSeparator(CurSblimLog);
 					if (i != -1) {
@@ -452,27 +453,22 @@ public void setProperty(String pKey, String pValue) {
 					}
 				}
 
-				this.iConfiguration.setDomainProperty(
-						WBEMConfigurationProperties.LOG_FILE_LOCATION, NewSblimLog.toString());
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION, NewSblimLog.toString());
 			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_NUM_FILES)) {
-				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_FILE_COUNT,
-						pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_FILE_COUNT, pValue);
 			} else if (pKey.equals(WBEMClientConstants.PROP_TIMEOUT)) {
-				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.HTTP_TIMEOUT,
-						pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.HTTP_TIMEOUT, pValue);
 			} else if (pKey.equals(WBEMClientConstants.PROPERTY_WBEM_CHUNKING)) {
 				this.iConfiguration.setDomainProperty(
-						WBEMConfigurationProperties.HTTP_USE_CHUNKING, pValue.equals("0") ? "false"
-								: "true");
+						WBEMConfigurationProperties.HTTP_USE_CHUNKING,
+						pValue.equals("0") ? "false" : "true"
+					);
 			} else if (pKey.equals(WBEMClientConstants.PROP_CLIENT_KEYSTORE)) {
-				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
-						pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.KEYSTORE_PATH, pValue);
 			} else if (pKey.equals(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD)) {
-				this.iConfiguration.setDomainProperty(
-						WBEMConfigurationProperties.KEYSTORE_PASSWORD, pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD, pValue);
 			} else if (pKey.equals(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE)) {
-				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
-						pValue);
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, pValue);
 			} else {
 				throw new IllegalArgumentException(pKey);
 			}
@@ -481,10 +477,14 @@ public void setProperty(String pKey, String pValue) {
 		}
 	}
 
-	public CloseableIterator associatorNames(CIMObjectPath pObjectName,
-			String pAssociationClass, String pResultClass, String pRole, String pResultRole)
-			throws WBEMException {
-
+	public CloseableIterator associatorNames(
+		CIMObjectPath pObjectName,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole
+	)
+		throws WBEMException {
 		final String operation = "AssociatorNames";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -492,33 +492,30 @@ public CloseableIterator associatorNames(CIMObjectPath pObjectNam
 		checkState();
 
 		try {
-
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.associatorNames_request(doc,
-					pObjectName, pAssociationClass, pResultClass, pRole, pResultRole));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.associatorNames_request(doc, pObjectName, pAssociationClass, pResultClass, pRole, pResultRole)
+				);
 
 			InputStreamReader is = transmitRequest("AssociatorNames", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pObjectName);
 			return iter;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -528,10 +525,17 @@ public CloseableIterator associatorNames(CIMObjectPath pObjectNam
 		}
 	}
 
-	public CloseableIterator associatorClasses(CIMObjectPath pObjectName,
-			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
+	public CloseableIterator associatorClasses(
+		CIMObjectPath pObjectName,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		final String operation = "AssociatorClasses";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -539,34 +543,40 @@ public CloseableIterator associatorClasses(CIMObjectPath pObjectName,
 		checkState();
 
 		try {
-
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.associatorClasses_request(doc,
-					pObjectName, pAssociationClass, pResultClass, pRole, pResultRole,
-					pIncludeQualifiers, pIncludeClassOrigin, pPropertyList));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.associatorClasses_request(
+							doc,
+							pObjectName,
+							pAssociationClass,
+							pResultClass,
+							pRole,
+							pResultRole,
+							pIncludeQualifiers,
+							pIncludeClassOrigin,
+							pPropertyList
+						)
+				);
 
 			InputStreamReader is = transmitRequest("Associators", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pObjectName);
 
 			return iter;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -576,9 +586,16 @@ public CloseableIterator associatorClasses(CIMObjectPath pObjectName,
 		}
 	}
 
-	public CloseableIterator associatorInstances(CIMObjectPath pObjectName,
-			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
+	public CloseableIterator associatorInstances(
+		CIMObjectPath pObjectName,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		final String operation = "AssociatorInstances";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -586,33 +603,38 @@ public CloseableIterator associatorInstances(CIMObjectPath pObjectN
 		checkState();
 
 		try {
-
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.associatorInstances_request(doc,
-					pObjectName, pAssociationClass, pResultClass, pRole, pResultRole,
-					pIncludeClassOrigin, pPropertyList));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.associatorInstances_request(
+							doc,
+							pObjectName,
+							pAssociationClass,
+							pResultClass,
+							pRole,
+							pResultRole,
+							pIncludeClassOrigin,
+							pPropertyList
+						)
+				);
 
 			InputStreamReader is = transmitRequest("Associators", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pObjectName);
 			return iter;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -637,7 +659,6 @@ public synchronized void close() {
 	}
 
 	public void createClass(CIMClass pClass) throws WBEMException {
-
 		final String operation = "CreateClass";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -645,18 +666,15 @@ public void createClass(CIMClass pClass) throws WBEMException {
 		checkState();
 
 		try {
-
-			if (pClass == null || pClass.getObjectPath() == null
-					|| pClass.getObjectPath().getNamespace() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pClass == null || pClass.getObjectPath() == null || pClass.getObjectPath().getNamespace() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pClass.getObjectPath().getNamespace(),
-					"UTF-8", "US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pClass.getObjectPath().getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.createClass_request(doc, pClass
-					.getObjectPath(), pClass));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.createClass_request(doc, pClass.getObjectPath(), pClass));
 
 			InputStreamReader is = transmitRequest("CreateClass", hh, doc);
 
@@ -666,15 +684,12 @@ public void createClass(CIMClass pClass) throws WBEMException {
 			} finally {
 				iter.close();
 			}
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -685,7 +700,6 @@ public void createClass(CIMClass pClass) throws WBEMException {
 	}
 
 	public CIMObjectPath createInstance(CIMInstance pInstance) throws WBEMException {
-
 		final String operation = "CreateInstance";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -693,37 +707,37 @@ public CIMObjectPath createInstance(CIMInstance pInstance) throws WBEMException
 		checkState();
 
 		try {
-			if (pInstance == null || pInstance.getObjectPath() == null
-					|| pInstance.getObjectPath().getNamespace() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pInstance == null || pInstance.getObjectPath() == null || pInstance.getObjectPath().getNamespace() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pInstance.getObjectPath().getNamespace(),
-					"UTF-8", "US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pInstance.getObjectPath().getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.createInstance_request(doc,
-					pInstance.getObjectPath(), pInstance));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.createInstance_request(doc, pInstance.getObjectPath(), pInstance)
+				);
 
 			InputStreamReader is = transmitRequest("CreateInstance", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pInstance.getObjectPath());
 			try {
-				if (iter.hasNext()) { return (CIMObjectPath) iter.next(); }
+				if (iter.hasNext()) {
+					return (CIMObjectPath) iter.next();
+				}
 			} finally {
 				iter.close();
 			}
 
 			return null;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -734,7 +748,6 @@ public CIMObjectPath createInstance(CIMInstance pInstance) throws WBEMException
 	}
 
 	public void deleteClass(CIMObjectPath pPath) throws WBEMException {
-
 		final String operation = "DeleteClass";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -742,8 +755,9 @@ public void deleteClass(CIMObjectPath pPath) throws WBEMException {
 		checkState();
 
 		try {
-			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
@@ -761,15 +775,12 @@ public void deleteClass(CIMObjectPath pPath) throws WBEMException {
 			}
 
 			return;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -780,7 +791,6 @@ public void deleteClass(CIMObjectPath pPath) throws WBEMException {
 	}
 
 	public void deleteInstance(CIMObjectPath pPath) throws WBEMException {
-
 		final String operation = "DeleteInstance";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -788,16 +798,16 @@ public void deleteInstance(CIMObjectPath pPath) throws WBEMException {
 		checkState();
 
 		try {
-			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
-					.deleteInstance_request(doc, pPath));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.deleteInstance_request(doc, pPath));
 
 			InputStreamReader is = transmitRequest("DeleteInstance", hh, doc);
 
@@ -809,15 +819,12 @@ public void deleteInstance(CIMObjectPath pPath) throws WBEMException {
 			}
 
 			return;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -828,7 +835,6 @@ public void deleteInstance(CIMObjectPath pPath) throws WBEMException {
 	}
 
 	public void deleteQualifierType(CIMObjectPath pPath) throws WBEMException {
-
 		final String operation = "DeleteQualifierType";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -836,15 +842,15 @@ public void deleteQualifierType(CIMObjectPath pPath) throws WBEMException {
 		checkState();
 
 		try {
-			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.deleteQualifierType_request(doc,
-					pPath));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.deleteQualifierType_request(doc, pPath));
 
 			InputStreamReader is = transmitRequest("DeleteQualifierType", hh, doc);
 
@@ -856,15 +862,12 @@ public void deleteQualifierType(CIMObjectPath pPath) throws WBEMException {
 			}
 
 			return;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -874,9 +877,7 @@ public void deleteQualifierType(CIMObjectPath pPath) throws WBEMException {
 		}
 	}
 
-	public CloseableIterator enumerateClassNames(CIMObjectPath pPath, boolean pDeep)
-			throws WBEMException {
-
+	public CloseableIterator enumerateClassNames(CIMObjectPath pPath, boolean pDeep) throws WBEMException {
 		final String operation = "EnumerateClassNames";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -884,29 +885,26 @@ public CloseableIterator enumerateClassNames(CIMObjectPath pPath,
 		checkState();
 
 		try {
-			if (pPath == null || pPath.getNamespace() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pPath == null || pPath.getNamespace() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumerateClassNames_request(doc,
-					pPath, pDeep));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumerateClassNames_request(doc, pPath, pDeep));
 
 			InputStreamReader is = transmitRequest("EnumerateClassNames", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pPath);
 			return iter;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -916,10 +914,14 @@ public CloseableIterator enumerateClassNames(CIMObjectPath pPath,
 		}
 	}
 
-	public CloseableIterator enumerateClasses(CIMObjectPath pPath, boolean pDeep,
-			boolean pPropagated, boolean pIncludeQualifiers, boolean pIncludeClassOrigin)
-			throws WBEMException {
-
+	public CloseableIterator enumerateClasses(
+		CIMObjectPath pPath,
+		boolean pDeep,
+		boolean pPropagated,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin
+	)
+		throws WBEMException {
 		final String operation = "EnumerateClasses";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -927,29 +929,36 @@ public CloseableIterator enumerateClasses(CIMObjectPath pPath, boolean
 		checkState();
 
 		try {
-			if (pPath == null || pPath.getNamespace() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pPath == null || pPath.getNamespace() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumerateClasses_request(doc,
-					pPath, pDeep, pPropagated, pIncludeQualifiers, pIncludeClassOrigin));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.enumerateClasses_request(
+							doc,
+							pPath,
+							pDeep,
+							pPropagated,
+							pIncludeQualifiers,
+							pIncludeClassOrigin
+						)
+				);
 
 			InputStreamReader is = transmitRequest("EnumerateClasses", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pPath);
 			return iter;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -959,9 +968,7 @@ public CloseableIterator enumerateClasses(CIMObjectPath pPath, boolean
 		}
 	}
 
-	public CloseableIterator enumerateInstanceNames(CIMObjectPath pPath)
-			throws WBEMException {
-
+	public CloseableIterator enumerateInstanceNames(CIMObjectPath pPath) throws WBEMException {
 		final String operation = "EnumerateInstanceNames";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -969,29 +976,26 @@ public CloseableIterator enumerateInstanceNames(CIMObjectPath pPa
 		checkState();
 
 		try {
-			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumerateInstanceNames_request(
-					doc, pPath));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumerateInstanceNames_request(doc, pPath));
 
 			InputStreamReader is = transmitRequest("EnumerateInstanceNames", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pPath);
 			return iter;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1001,10 +1005,14 @@ public CloseableIterator enumerateInstanceNames(CIMObjectPath pPa
 		}
 	}
 
-	public CloseableIterator enumerateInstances(CIMObjectPath pPath, boolean pDeep,
-			boolean pPropagated, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-
+	public CloseableIterator enumerateInstances(
+		CIMObjectPath pPath,
+		boolean pDeep,
+		boolean pPropagated,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		final String operation = "EnumerateInstances";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1012,29 +1020,37 @@ public CloseableIterator enumerateInstances(CIMObjectPath pPath, bo
 		checkState();
 
 		try {
-			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pPath == null || pPath.getNamespace() == null || pPath.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumerateInstances_request(doc,
-					pPath, pDeep, pPropagated, false, pIncludeClassOrigin, pPropertyList));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.enumerateInstances_request(
+							doc,
+							pPath,
+							pDeep,
+							pPropagated,
+							false,
+							pIncludeClassOrigin,
+							pPropertyList
+						)
+				);
 
 			InputStreamReader is = transmitRequest("EnumerateInstances", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pPath);
 			return iter;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1048,14 +1064,14 @@ public CloseableIterator enumerateInstances(CIMObjectPath pPath, bo
 	// the name of this Interop Namespace shall be either "interop" (preferred)
 	// or "root/interop" while OpenPegasus 2.11 and earlier implemented
 	// "root/PG_InterOp" prior to adopting DSP1033.
-	private static final String[] InteropNamespaces = { "interop", "root/interop",
-			"root/PG_InterOp" };
+	private static final String[] InteropNamespaces = { "interop", "root/interop", "root/PG_InterOp" };
 
 	private CloseableIterator enumerateNamespace(String pNamespace) {
 		if (pNamespace != null && pNamespace.trim().length() > 0) {
 			try {
-				CloseableIterator result = enumerateInstanceNames(new CIMObjectPath(
-						null, null, null, pNamespace, "CIM_Namespace", null));
+				CloseableIterator result = enumerateInstanceNames(
+					new CIMObjectPath(null, null, null, pNamespace, "CIM_Namespace", null)
+				);
 				if (result != null) return result;
 			} catch (Exception e) {
 				// namespace may not exist
@@ -1064,8 +1080,7 @@ private CloseableIterator enumerateNamespace(String pNamespace) {
 		return null;
 	}
 
-	public CloseableIterator enumerateNamespaces(String pNamespace)
-			throws WBEMException {
+	public CloseableIterator enumerateNamespaces(String pNamespace) throws WBEMException {
 		CloseableIterator result;
 
 		// First, try the user's specified namespace (if any)
@@ -1090,13 +1105,13 @@ public CloseableIterator enumerateNamespaces(String pNamespace)
 			}
 		}
 
-		throw new WBEMException(WBEMException.CIM_ERR_FAILED,
-				"Interop namespaces do not exist, CIMOM may not support DSP1033");
+		throw new WBEMException(
+			WBEMException.CIM_ERR_FAILED,
+			"Interop namespaces do not exist, CIMOM may not support DSP1033"
+		);
 	}
 
-	public CloseableIterator> enumerateQualifierTypes(CIMObjectPath pPath)
-			throws WBEMException {
-
+	public CloseableIterator> enumerateQualifierTypes(CIMObjectPath pPath) throws WBEMException {
 		final String operation = "EnumerateQualifiers";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1106,29 +1121,26 @@ public CloseableIterator> enumerateQualifierTypes(CIMObjectP
 		try {
 			// enumerateQualifierTypes does not need class name, as it lists all
 			// qualifiers in namespace
-			if (pPath == null || pPath.getNamespace() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pPath == null || pPath.getNamespace() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumQualifierTypes_request(doc,
-					pPath));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.enumQualifierTypes_request(doc, pPath));
 
 			InputStreamReader is = transmitRequest("EnumerateQualifiers", hh, doc);
 
 			CloseableIterator> iter = getIterator(is, pPath);
 			return iter;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1138,9 +1150,8 @@ public CloseableIterator> enumerateQualifierTypes(CIMObjectP
 		}
 	}
 
-	public CloseableIterator execQuery(CIMObjectPath pPath, String pQuery,
-			String pQueryLanguage) throws WBEMException {
-
+	public CloseableIterator execQuery(CIMObjectPath pPath, String pQuery, String pQueryLanguage)
+		throws WBEMException {
 		final String operation = "ExecQuery";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1148,29 +1159,26 @@ public CloseableIterator execQuery(CIMObjectPath pPath, String pQue
 		checkState();
 
 		try {
-			if (pPath == null || pPath.getNamespace() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pPath == null || pPath.getNamespace() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pPath.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.execQuery_request(doc, pPath,
-					pQuery, pQueryLanguage));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.execQuery_request(doc, pPath, pQuery, pQueryLanguage));
 
 			InputStreamReader is = transmitRequest("ExecQuery", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pPath);
 			return iter;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1180,9 +1188,14 @@ public CloseableIterator execQuery(CIMObjectPath pPath, String pQue
 		}
 	}
 
-	public CIMClass getClass(CIMObjectPath pName, boolean pPropagated, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
-
+	public CIMClass getClass(
+		CIMObjectPath pName,
+		boolean pPropagated,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		final String operation = "GetClass";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1190,35 +1203,44 @@ public CIMClass getClass(CIMObjectPath pName, boolean pPropagated, boolean pIncl
 		checkState();
 
 		try {
-			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.getClass_request(doc, pName,
-					pPropagated, pIncludeQualifiers, pIncludeClassOrigin, pPropertyList));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.getClass_request(
+							doc,
+							pName,
+							pPropagated,
+							pIncludeQualifiers,
+							pIncludeClassOrigin,
+							pPropertyList
+						)
+				);
 
 			InputStreamReader is = transmitRequest("GetClass", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pName);
 			try {
-				if (iter.hasNext()) { return (CIMClass) iter.next(); }
+				if (iter.hasNext()) {
+					return (CIMClass) iter.next();
+				}
 			} finally {
 				iter.close();
 			}
 
 			return null;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1228,9 +1250,13 @@ public CIMClass getClass(CIMObjectPath pName, boolean pPropagated, boolean pIncl
 		}
 	}
 
-	public CIMInstance getInstance(CIMObjectPath pName, boolean pPropagated,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
-
+	public CIMInstance getInstance(
+		CIMObjectPath pName,
+		boolean pPropagated,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		final String operation = "GetInstance";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1238,15 +1264,18 @@ public CIMInstance getInstance(CIMObjectPath pName, boolean pPropagated,
 		checkState();
 
 		try {
-			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.getInstance_request(doc, pName,
-					pPropagated, false, pIncludeClassOrigin, pPropertyList));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.getInstance_request(doc, pName, pPropagated, false, pIncludeClassOrigin, pPropertyList)
+				);
 
 			InputStreamReader is = transmitRequest("GetInstance", hh, doc);
 
@@ -1261,15 +1290,12 @@ public CIMInstance getInstance(CIMObjectPath pName, boolean pPropagated,
 			}
 
 			return null;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1280,7 +1306,6 @@ public CIMInstance getInstance(CIMObjectPath pName, boolean pPropagated,
 	}
 
 	public CIMQualifierType getQualifierType(CIMObjectPath pName) throws WBEMException {
-
 		final String operation = "GetQualifier";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1288,35 +1313,34 @@ public CIMQualifierType getQualifierType(CIMObjectPath pName) throws WBEMExce
 		checkState();
 
 		try {
-			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(pName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.getQualifier_request(doc, pName,
-					pName.getObjectName()));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.getQualifier_request(doc, pName, pName.getObjectName()));
 
 			InputStreamReader is = transmitRequest("GetQualifier", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pName);
 			try {
-				if (iter.hasNext()) { return (CIMQualifierType) iter.next(); }
+				if (iter.hasNext()) {
+					return (CIMQualifierType) iter.next();
+				}
 			} finally {
 				iter.close();
 			}
 
 			return null;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1326,10 +1350,13 @@ public CIMQualifierType getQualifierType(CIMObjectPath pName) throws WBEMExce
 		}
 	}
 
-	public Object invokeMethod(CIMObjectPath pName, String pMethodName,
-			CIMArgument[] pInputArguments, CIMArgument[] pOutputArguments)
-			throws WBEMException {
-
+	public Object invokeMethod(
+		CIMObjectPath pName,
+		String pMethodName,
+		CIMArgument[] pInputArguments,
+		CIMArgument[] pOutputArguments
+	)
+		throws WBEMException {
 		final String operation = "InvokeMethod";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1337,28 +1364,33 @@ public Object invokeMethod(CIMObjectPath pName, String pMethodName,
 		checkState();
 
 		try {
-			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pName == null || pName.getNamespace() == null || pName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(MOF.objectHandle(pName, false, true),
-					"UTF-8", "US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(MOF.objectHandle(pName, false, true), "UTF-8", "US-ASCII"));
 
 			// sfcb needs pragma set for UpdateExpiredPassword call
-			if (pMethodName != null && pMethodName.equalsIgnoreCase("UpdateExpiredPassword")) hh
-					.addField("Pragma", "UpdateExpiredPassword");
+			if (pMethodName != null && pMethodName.equalsIgnoreCase("UpdateExpiredPassword")) hh.addField(
+				"Pragma",
+				"UpdateExpiredPassword"
+			);
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.invokeMethod_request(doc, pName,
-					pMethodName, pInputArguments));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.invokeMethod_request(doc, pName, pMethodName, pInputArguments)
+				);
 
 			InputStreamReader is = transmitRequest(pMethodName, hh, doc);
 
 			CIMResponse response = null;
 			String parser = this.iConfiguration.getCimXmlParser();
 			// TODO: set the local namespace for parsers
-			if (WBEMConstants.SAX.equals(parser) || WBEMConstants.PULL.equals(parser)) { return SAXHelper
-					.parseInvokeMethodResponse(is, pOutputArguments, null); }
+			if (WBEMConstants.SAX.equals(parser) || WBEMConstants.PULL.equals(parser)) {
+				return SAXHelper.parseInvokeMethodResponse(is, pOutputArguments, null);
+			}
 			// DOM parser
 			response = getSingleResponse(is, null);
 			response.checkError();
@@ -1369,12 +1401,11 @@ public Object invokeMethod(CIMObjectPath pName, String pMethodName,
 			List outParamValues = response.getParamValues();
 			if (pOutputArguments != null && outParamValues != null) {
 				Iterator itr = outParamValues.iterator();
-				for (int i = 0; i < pOutputArguments.length; i++)
-					if (itr.hasNext()) {
-						pOutputArguments[i] = (CIMArgument) itr.next();
-					} else {
-						break;
-					}
+				for (int i = 0; i < pOutputArguments.length; i++) if (itr.hasNext()) {
+					pOutputArguments[i] = (CIMArgument) itr.next();
+				} else {
+					break;
+				}
 			}
 			return rc;
 		} catch (WBEMException e) {
@@ -1382,9 +1413,7 @@ public Object invokeMethod(CIMObjectPath pName, String pMethodName,
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1399,7 +1428,6 @@ public boolean isActive() {
 	}
 
 	public void modifyClass(CIMClass pClass) throws WBEMException {
-
 		final String operation = "ModifyClass";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1407,18 +1435,20 @@ public void modifyClass(CIMClass pClass) throws WBEMException {
 		checkState();
 
 		try {
-			if (pClass == null || pClass.getObjectPath() == null
-					|| pClass.getObjectPath().getNamespace() == null
-					|| pClass.getObjectPath().getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (
+				pClass == null ||
+				pClass.getObjectPath() == null ||
+				pClass.getObjectPath().getNamespace() == null ||
+				pClass.getObjectPath().getObjectName() == null
+			) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pClass.getObjectPath().getNamespace(),
-					"UTF-8", "US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pClass.getObjectPath().getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.setClass_request(doc, pClass
-					.getObjectPath(), pClass));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.setClass_request(doc, pClass.getObjectPath(), pClass));
 
 			InputStreamReader is = transmitRequest("ModifyClass", hh, doc);
 
@@ -1430,15 +1460,12 @@ public void modifyClass(CIMClass pClass) throws WBEMException {
 			}
 
 			return;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1453,18 +1480,21 @@ public void modifyInstance(CIMInstance pInst, String[] pPropertyList) throws WBE
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
 		checkState();
-		if (pInst == null || pInst.getObjectPath() == null
-				|| pInst.getObjectPath().getNamespace() == null
-				|| pInst.getObjectPath().getObjectName() == null) { throw new WBEMException(
-				WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+		if (
+			pInst == null ||
+			pInst.getObjectPath() == null ||
+			pInst.getObjectPath().getNamespace() == null ||
+			pInst.getObjectPath().getObjectName() == null
+		) {
+			throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+		}
 		final CIMObjectPath path = pInst.getObjectPath();
 		try {
 			HttpHeader hh = new HttpHeader();
 			hh.addField("CIMObject", HttpHeader.encode(path.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.setInstance_request(doc, path,
-					pInst, true, pPropertyList));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.setInstance_request(doc, path, pInst, true, pPropertyList));
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 
 			CloseableIterator iter = getIterator(is, path);
@@ -1479,9 +1509,7 @@ public void modifyInstance(CIMInstance pInst, String[] pPropertyList) throws WBE
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1491,10 +1519,15 @@ public void modifyInstance(CIMInstance pInst, String[] pPropertyList) throws WBE
 		}
 	}
 
-	public CloseableIterator referenceClasses(CIMObjectPath pObjectName,
-			String pResultClass, String pRole, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException {
-
+	public CloseableIterator referenceClasses(
+		CIMObjectPath pObjectName,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		final String operation = "ReferenceClasses";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1502,31 +1535,36 @@ public CloseableIterator referenceClasses(CIMObjectPath pObjectName,
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.referenceClasses_request(doc,
-					pObjectName, pResultClass, pRole, pIncludeQualifiers, pIncludeClassOrigin,
-					pPropertyList));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.referenceClasses_request(
+							doc,
+							pObjectName,
+							pResultClass,
+							pRole,
+							pIncludeQualifiers,
+							pIncludeClassOrigin,
+							pPropertyList
+						)
+				);
 
 			InputStreamReader is = transmitRequest("References", hh, doc);
 
 			return getIterator(is, pObjectName);
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1536,10 +1574,14 @@ public CloseableIterator referenceClasses(CIMObjectPath pObjectName,
 		}
 	}
 
-	public CloseableIterator referenceInstances(CIMObjectPath pObjectName,
-			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList)
-			throws WBEMException {
-
+	public CloseableIterator referenceInstances(
+		CIMObjectPath pObjectName,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	)
+		throws WBEMException {
 		final String operation = "ReferenceInstances";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1547,30 +1589,35 @@ public CloseableIterator referenceInstances(CIMObjectPath pObjectNa
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.referenceInstances_request(doc,
-					pObjectName, pResultClass, pRole, pIncludeClassOrigin, pPropertyList));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.referenceInstances_request(
+							doc,
+							pObjectName,
+							pResultClass,
+							pRole,
+							pIncludeClassOrigin,
+							pPropertyList
+						)
+				);
 
 			InputStreamReader is = transmitRequest("References", hh, doc);
 
 			return getIterator(is, pObjectName);
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1580,9 +1627,8 @@ public CloseableIterator referenceInstances(CIMObjectPath pObjectNa
 		}
 	}
 
-	public CloseableIterator referenceNames(CIMObjectPath pObjectName,
-			String pResultClass, String pRole) throws WBEMException {
-
+	public CloseableIterator referenceNames(CIMObjectPath pObjectName, String pResultClass, String pRole)
+		throws WBEMException {
 		final String operation = "ReferenceNames";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1590,31 +1636,29 @@ public CloseableIterator referenceNames(CIMObjectPath pObjectName
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.referenceNames_request(doc,
-					pObjectName, pResultClass, pRole));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.referenceNames_request(doc, pObjectName, pResultClass, pRole)
+				);
 
 			InputStreamReader is = transmitRequest("ReferenceNames", hh, doc);
 
 			CloseableIterator iter = getIterator(is, pObjectName);
 			return iter;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1625,12 +1669,10 @@ public CloseableIterator referenceNames(CIMObjectPath pObjectName
 	}
 
 	public void setLocales(Locale[] pLocales) {
-		this.iLocales = (pLocales != null && pLocales.length > 0) ? pLocales
-				: WBEMConstants.DEFAULT_LOCALES;
+		this.iLocales = (pLocales != null && pLocales.length > 0) ? pLocales : WBEMConstants.DEFAULT_LOCALES;
 	}
 
 	public void setQualifierType(CIMQualifierType pQualifierType) throws WBEMException {
-
 		final String operation = "SetQualifierType";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -1638,18 +1680,23 @@ public void setQualifierType(CIMQualifierType pQualifierType) throws WBEMExce
 		checkState();
 
 		try {
-			if (pQualifierType == null || pQualifierType.getObjectPath() == null
-					|| pQualifierType.getObjectPath().getNamespace() == null
-					|| pQualifierType.getObjectPath().getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (
+				pQualifierType == null ||
+				pQualifierType.getObjectPath() == null ||
+				pQualifierType.getObjectPath().getNamespace() == null ||
+				pQualifierType.getObjectPath().getObjectName() == null
+			) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pQualifierType.getObjectPath()
-					.getNamespace(), "UTF-8", "US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pQualifierType.getObjectPath().getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.setQualifierType_request(doc,
-					pQualifierType.getObjectPath(), pQualifierType));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.setQualifierType_request(doc, pQualifierType.getObjectPath(), pQualifierType)
+				);
 
 			InputStreamReader is = transmitRequest("SetQualifierType", hh, doc);
 
@@ -1661,15 +1708,12 @@ public void setQualifierType(CIMQualifierType pQualifierType) throws WBEMExce
 			}
 
 			return;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -1703,20 +1747,24 @@ private String getHttpErrorString(int pStatusCode) {
 		return null;
 	}
 
-	private InputStreamReader transmitRequest(String pCimMethod, HttpHeader pHeader,
-			Document pDocument) throws IOException, ProtocolException, WBEMException {
-		return transmitRequestWorker(false, this.iUri, this.iHttpClientPool, pCimMethod, pHeader,
-				pDocument);
+	private InputStreamReader transmitRequest(String pCimMethod, HttpHeader pHeader, Document pDocument)
+		throws IOException, ProtocolException, WBEMException {
+		return transmitRequestWorker(false, this.iUri, this.iHttpClientPool, pCimMethod, pHeader, pDocument);
 	}
 
 	/*
 	 * Worker for both transmitRequest() (pIsIndication == false) and
 	 * transmitIndicationRequest() (pIsIndication == true).
 	 */
-	private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pRecipient,
-			HttpClientPool pClientPool, String pCimMethod, HttpHeader pHeader, Document pDocument)
-			throws IOException, ProtocolException, WBEMException {
-
+	private InputStreamReader transmitRequestWorker(
+		boolean pIsIndication,
+		URI pRecipient,
+		HttpClientPool pClientPool,
+		String pCimMethod,
+		HttpHeader pHeader,
+		Document pDocument
+	)
+		throws IOException, ProtocolException, WBEMException {
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
 
@@ -1728,8 +1776,7 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 			this.iCurrentTime = System.currentTimeMillis();
 			if ((this.iCurrentTime - this.iMPostFailTime) > 24 * 60 * 60 * 1000) this.iMPostFailed = false;
 		}
-		boolean useMPost = this.iMPostFailed || pIsIndication ? false : this.iConfiguration
-				.isHttpMPost();
+		boolean useMPost = this.iMPostFailed || pIsIndication ? false : this.iConfiguration.isHttpMPost();
 		int retries = this.iConfiguration.getHttpConnectRetriesCount();
 		do {
 			logger.trace(Level.FINE, "Attempting to connect.. number of attempts left:" + retries);
@@ -1738,8 +1785,7 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 			if (connection != null) {
 				connection.disconnect();
 			}
-			connection = newConnection(pIsIndication, pRecipient, pClientPool, pCimMethod, pHeader,
-					useMPost);
+			connection = newConnection(pIsIndication, pRecipient, pClientPool, pCimMethod, pHeader, useMPost);
 			try {
 				logger.trace(Level.FINE, "Connecting...");
 				connection.connect();
@@ -1748,22 +1794,26 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 			} catch (SocketException e) {
 				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Unable to connect", null, e);
 			} catch (SSLHandshakeException e) {
-				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "SSL handshake exception",
-						null, e);
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "SSL handshake exception", null, e);
 			}
 
 			OutputStream os = connection.getOutputStream();
 
-			if (this.iConfiguration.isCimXmlTracingEnabled()
-					|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
+			if (
+				this.iConfiguration.isCimXmlTracingEnabled() ||
+				LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)
+			) {
 				OutputStream pos = new ByteArrayOutputStream();
-				CIMClientXML_HelperImpl.dumpDocument(pos, pDocument,
-						pIsIndication ? "indication request" : "request");
+				CIMClientXML_HelperImpl.dumpDocument(pos, pDocument, pIsIndication ? "indication request" : "request");
 				OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
-				if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream
-						.write(pos.toString().getBytes());
-				if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger
-						.traceCIMXML(Level.FINEST, pos.toString(), true);
+				if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream.write(
+					pos.toString().getBytes()
+				);
+				if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger.traceCIMXML(
+					Level.FINEST,
+					pos.toString(),
+					true
+				);
 			}
 			CIMClientXML_HelperImpl.serialize(os, pDocument);
 			os.flush();
@@ -1777,12 +1827,10 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Unable to connect", null, e);
 			} catch (SocketTimeoutException e) {
 				connection.disconnect();
-				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Connection timed out", null,
-						e);
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Connection timed out", null, e);
 			} catch (SSLHandshakeException e) {
 				connection.disconnect();
-				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "SSL handshake exception",
-						null, e);
+				throw new WBEMException(WBEMException.CIM_ERR_FAILED, "SSL handshake exception", null, e);
 			}
 
 			HttpHeader headers = parseHeaders(connection);
@@ -1795,7 +1843,6 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 
 			switch (resultCode) {
 				case HttpURLConnection.HTTP_OK: // 200
-
 					if (this.iConfiguration.isHttpContentLengthRetryEnabled()) {
 						String contentLengthField = headers.getField("Content-length");
 						if (contentLengthField != null && contentLengthField.trim().length() > 0) {
@@ -1803,8 +1850,7 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 							int lengthToCheck = this.iConfiguration.getHttpContentLengthThreshold();
 
 							if (contentLength < lengthToCheck) {
-								logger.trace(Level.FINE, "Content Length below " + lengthToCheck
-										+ ", retrying");
+								logger.trace(Level.FINE, "Content Length below " + lengthToCheck + ", retrying");
 								break;
 							}
 						}
@@ -1814,14 +1860,14 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 
 					InputStream is = connection.getInputStream();
 					OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
-					if ((this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null)
-							|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
-						is = new DebugInputStream(is, debugStream,
-								pIsIndication ? "indication response" : "response");
+					if (
+						(this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) ||
+						LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)
+					) {
+						is = new DebugInputStream(is, debugStream, pIsIndication ? "indication response" : "response");
 					}
 
 					return new InputStreamReader(is, charset);
-
 				case HttpURLConnection.HTTP_NOT_IMPLEMENTED: // 501
 					// TODO if there is an error with the default xml
 					// encoder/decoder, load the correct version
@@ -1829,11 +1875,8 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 					// version, CIM version or Protocol Version
 					// that is expecting
 					String cimProtocolVersion = headers.getField("CIMProtocolVersion");
-					if (cimProtocolVersion == null && headers.getField("CIMError") == null
-							&& useMPost) {
-						logger
-								.trace(Level.FINER,
-										"Received HTTP Error 501 - NOT IMPLEMENTED with M-POST, falling back to POST");
+					if (cimProtocolVersion == null && headers.getField("CIMError") == null && useMPost) {
+						logger.trace(Level.FINER, "Received HTTP Error 501 - NOT IMPLEMENTED with M-POST, falling back to POST");
 						this.iMPostFailTime = System.currentTimeMillis();
 						useMPost = false;
 						this.iMPostFailed = true;
@@ -1841,38 +1884,30 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 						break;
 					}
 
-					logger.trace(Level.FINER,
-							"Received HTTP Error 501 - NOT IMPLEMENTED, skipping retries");
+					logger.trace(Level.FINER, "Received HTTP Error 501 - NOT IMPLEMENTED, skipping retries");
 					retries = 0;
 					break;
-
 				case HttpURLConnection.HTTP_BAD_REQUEST: // 400
 				case HttpURLConnection.HTTP_FORBIDDEN: // 403
 				case HttpURLConnection.HTTP_BAD_METHOD: // 405
-					logger.trace(Level.FINER, "Received HTTP Error "
-							+ getHttpErrorString(resultCode) + ", skipping retries");
+					logger.trace(Level.FINER, "Received HTTP Error " + getHttpErrorString(resultCode) + ", skipping retries");
 					retries = 0;
 					break;
-
 				case HttpURLConnection.HTTP_UNAUTHORIZED: // 401
 				case HttpURLConnection.HTTP_PROXY_AUTH: // 407
-					logger.trace(Level.FINER, "Received HTTP Error "
-							+ getHttpErrorString(resultCode) + ", skipping retries");
+					logger.trace(Level.FINER, "Received HTTP Error " + getHttpErrorString(resultCode) + ", skipping retries");
 					exceptionNum = WBEMException.CIM_ERR_ACCESS_DENIED;
 					retries = 0;
 					break;
-
 				default:
 					if (useMPost) {
-						logger.trace(Level.FINER, "Received HTTP Error " + resultCode
-								+ " with M-POST, falling back to POST");
+						logger.trace(Level.FINER, "Received HTTP Error " + resultCode + " with M-POST, falling back to POST");
 						this.iMPostFailTime = System.currentTimeMillis();
 						useMPost = false;
 						this.iMPostFailed = true;
 						++retries;
 					} else {
-						logger.trace(Level.FINER, "Received HTTP Error " + resultCode
-								+ ", retrying");
+						logger.trace(Level.FINER, "Received HTTP Error " + resultCode + ", retrying");
 					}
 			}
 
@@ -1882,8 +1917,10 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 			// sending multiple requests without any response)
 			if (retries > 0) {
 				OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
-				if ((this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null)
-						|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
+				if (
+					(this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) ||
+					LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)
+				) {
 					StringBuilder resultStr = new StringBuilder("<--- error response begin ");
 					resultStr.append(TimeStamp.formatWithMillis(System.currentTimeMillis()));
 					resultStr.append(" ----\nHTTP ");
@@ -1891,10 +1928,14 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 					resultStr.append(' ');
 					resultStr.append(connection.getResponseMessage());
 					resultStr.append(" (retrying request)\n---- error response end ----->\n");
-					if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream
-							.write(resultStr.toString().getBytes());
-					if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger
-							.traceCIMXML(Level.FINEST, resultStr.toString(), false);
+					if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream.write(
+						resultStr.toString().getBytes()
+					);
+					if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger.traceCIMXML(
+						Level.FINEST,
+						resultStr.toString(),
+						false
+					);
 				}
 			}
 		} while (retries-- > 0);
@@ -1914,8 +1955,7 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 				} catch (Exception e) {
 					errorDescriptionCIM = null;
 				}
-				logger.trace(Level.FINER, "Found CIMErrorDescription field with value \""
-						+ errorDescriptionCIM + "\"");
+				logger.trace(Level.FINER, "Found CIMErrorDescription field with value \"" + errorDescriptionCIM + "\"");
 			}
 		}
 
@@ -1940,8 +1980,7 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 			} catch (Exception e) {
 				errorSFCB = null;
 			}
-			logger.trace(Level.FINER, "Found SFCBErrorDetail field with value \"" + errorSFCB
-					+ "\"");
+			logger.trace(Level.FINER, "Found SFCBErrorDetail field with value \"" + errorSFCB + "\"");
 		}
 
 		// If CIMErrorDescription present, format of WBEMException is:
@@ -1953,7 +1992,7 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 		//
 		// HTTP StatusCode - ReasonPhrase (CIMError: "ErrorString", OpenPegasus
 		// Error: "ErrorString", SFCB Error: "ErrorString")
-		// 
+		//
 		// For example:
 		// HTTP 503 - Service Unavailable (SFCB Error:
 		// "Max Session Limit Exceeded")
@@ -1994,22 +2033,26 @@ private InputStreamReader transmitRequestWorker(boolean pIsIndication, URI pReci
 		throw new WBEMException(exceptionNum, errorMsg.toString());
 	}
 
-	private HttpUrlConnection newConnection(boolean pIsIndication, URI pRecipient,
-			HttpClientPool pClientPool, String pCimMethod, HttpHeader pHeader, boolean pUseMPost) {
-
+	private HttpUrlConnection newConnection(
+		boolean pIsIndication,
+		URI pRecipient,
+		HttpClientPool pClientPool,
+		String pCimMethod,
+		HttpHeader pHeader,
+		boolean pUseMPost
+	) {
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
 
-		HttpUrlConnection connection = new HttpUrlConnection(pRecipient, pClientPool,
-				this.iAuthorizationHandler);
+		HttpUrlConnection connection = new HttpUrlConnection(pRecipient, pClientPool, this.iAuthorizationHandler);
 		if (pUseMPost) {
 			connection.setRequestMethod(WBEMConstants.HTTP_MPOST);
 		} else connection.setRequestMethod(WBEMConstants.HTTP_POST);
 		connection.useHttp11("1.1".equals(this.iConfiguration.getHttpVersion()));
 
 		String firstLocaleStr = this.iLocales[0].getLanguage();
-		if (this.iLocales[0].getCountry().length() > 0) firstLocaleStr = firstLocaleStr + '-'
-				+ this.iLocales[0].getCountry();
+		if (this.iLocales[0].getCountry().length() > 0) firstLocaleStr =
+			firstLocaleStr + '-' + this.iLocales[0].getCountry();
 		StringBuilder restLocaleStrBld = new StringBuilder("");
 		for (int i = 1; i < this.iLocales.length; i++) {
 			if (this.iLocales[i] != null && this.iLocales[i].getLanguage().length() > 0) {
@@ -2028,26 +2071,21 @@ private HttpUrlConnection newConnection(boolean pIsIndication, URI pRecipient,
 		connection.setRequestProperty("Accept", "text/html, text/xml, application/xml");
 		connection.setRequestProperty("Cache-Control", "no-cache");
 		connection.setRequestProperty("Content-Language", firstLocaleStr);
-		connection.setRequestProperty("Accept-Language", firstLocaleStr
-				+ restLocaleStrBld.toString() + ", *");
-		if (this.iAuthorization != null) connection.setRequestProperty("Authorization",
-				this.iAuthorization);
+		connection.setRequestProperty("Accept-Language", firstLocaleStr + restLocaleStrBld.toString() + ", *");
+		if (this.iAuthorization != null) connection.setRequestProperty("Authorization", this.iAuthorization);
 
 		String prefix = "";
 		if (connection.getRequestMethod().equalsIgnoreCase(WBEMConstants.HTTP_MPOST)) {
 			String ns = getNextNs();
-			connection.setRequestProperty("Man", "http://www.dmtf.org/cim/mapping/http/v1.0;ns="
-					+ ns);
+			connection.setRequestProperty("Man", "http://www.dmtf.org/cim/mapping/http/v1.0;ns=" + ns);
 			prefix = ns + "-";
 		}
 		connection.setRequestProperty(prefix + "CIMProtocolVersion", "1.0");
 
 		if (pIsIndication) {
 			try {
-				connection.setRequestProperty("CIMExport", HttpHeader.encode("MethodRequest",
-						"UTF-8", "US-ASCII"));
-				connection.setRequestProperty("CIMExportMethod", HttpHeader.encode(
-						"ExportIndication", "UTF-8", "US-ASCII"));
+				connection.setRequestProperty("CIMExport", HttpHeader.encode("MethodRequest", "UTF-8", "US-ASCII"));
+				connection.setRequestProperty("CIMExportMethod", HttpHeader.encode("ExportIndication", "UTF-8", "US-ASCII"));
 			} catch (UnsupportedEncodingException e) {
 				logger.trace(Level.FINE, "Exception while encoding http header", e);
 				connection.setRequestProperty("CIMExport", "MethodRequest");
@@ -2056,8 +2094,7 @@ private HttpUrlConnection newConnection(boolean pIsIndication, URI pRecipient,
 		} else {
 			connection.setRequestProperty(prefix + "CIMOperation", "MethodCall");
 			try {
-				connection.setRequestProperty(prefix + "CIMMethod", HttpHeader.encode(pCimMethod,
-						"UTF-8", "US-ASCII"));
+				connection.setRequestProperty(prefix + "CIMMethod", HttpHeader.encode(pCimMethod, "UTF-8", "US-ASCII"));
 			} catch (UnsupportedEncodingException e) {
 				logger.trace(Level.FINE, "Exception while encoding http header", e);
 				connection.setRequestProperty(prefix + "CIMMethod", pCimMethod);
@@ -2066,8 +2103,7 @@ private HttpUrlConnection newConnection(boolean pIsIndication, URI pRecipient,
 		Iterator> iter = pHeader.iterator();
 		while (iter.hasNext()) {
 			Entry entry = iter.next();
-			connection.setRequestProperty(prefix + entry.getKey().toString(), entry.getValue()
-					.toString());
+			connection.setRequestProperty(prefix + entry.getKey().toString(), entry.getValue().toString());
 		}
 
 		logger.exit();
@@ -2087,17 +2123,19 @@ private HttpHeader parseHeaders(URLConnection pConnection) {
 		String ns = null;
 
 		HttpHeaderParser manOptHeader = null;
-		if (man != null && man.length() > 0) manOptHeader = new HttpHeaderParser(man);
-		else if (opt != null && opt.length() > 0) manOptHeader = new HttpHeaderParser(opt);
+		if (man != null && man.length() > 0) manOptHeader = new HttpHeaderParser(man); else if (
+			opt != null && opt.length() > 0
+		) manOptHeader = new HttpHeaderParser(opt);
 		if (manOptHeader != null) ns = manOptHeader.getValue("ns");
 
 		if (ns != null) {
 			i = 0;
 			String key;
 			while ((key = pConnection.getHeaderFieldKey(++i)) != null) {
-				if (key.startsWith(ns + "-")) headers.addParsedField(key.substring(3), pConnection
-						.getHeaderField(i));
-				else headers.addParsedField(key, pConnection.getHeaderField(i));
+				if (key.startsWith(ns + "-")) headers.addParsedField(
+					key.substring(3),
+					pConnection.getHeaderField(i)
+				); else headers.addParsedField(key, pConnection.getHeaderField(i));
 			}
 		} else {
 			i = 0;
@@ -2122,7 +2160,7 @@ private String getCharacterSet(HttpHeader pHeader) {
 
 	/**
 	 * getIterator : get generic CloseableIterator
-	 * 
+	 *
 	 * @param 
 	 *            : Type Parameter
 	 * @param pStream
@@ -2139,8 +2177,7 @@ private String getCharacterSet(HttpHeader pHeader) {
 	// :TODO : try to find solution of "unchecked" warning
 	@SuppressWarnings("unchecked")
 	private  CloseableIterator getIterator(InputStreamReader pStream, CIMObjectPath pPath)
-			throws IOException, SAXException, ParserConfigurationException, WBEMException {
-
+		throws IOException, SAXException, ParserConfigurationException, WBEMException {
 		String parser = this.iConfiguration.getCimXmlParser();
 
 		CloseableIterator iter = null;
@@ -2152,8 +2189,7 @@ private  CloseableIterator getIterator(InputStreamReader pStream, CIMObjec
 		} else if (WBEMConstants.DOM.equals(parser)) {
 			iter = new CloseableIteratorDOM(pStream, pPath);
 		} else {
-			throw new IllegalArgumentException("Invalid CIM-XML parser configured (\"" + parser
-					+ "\") ");
+			throw new IllegalArgumentException("Invalid CIM-XML parser configured (\"" + parser + "\") ");
 		}
 		try {
 			// check for CIMExceptions
@@ -2161,31 +2197,26 @@ private  CloseableIterator getIterator(InputStreamReader pStream, CIMObjec
 			return (CloseableIterator) iter;
 		} catch (RuntimeException e) {
 			iter.close();
-			if (e.getCause() != null && e.getCause() instanceof WBEMException) { throw (WBEMException) e
-					.getCause(); }
+			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
+				throw (WBEMException) e.getCause();
+			}
 			throw e;
 		}
 	}
 
-	private  EnumerateResponse getEnumerateResponse(InputStreamReader pStream,
-			CIMObjectPath pPath) throws IOException, SAXException, ParserConfigurationException,
-			WBEMException {
-
+	private  EnumerateResponse getEnumerateResponse(InputStreamReader pStream, CIMObjectPath pPath)
+		throws IOException, SAXException, ParserConfigurationException, WBEMException {
 		String parser = this.iConfiguration.getCimXmlParser();
 
 		if (WBEMConstants.SAX.equals(parser)) return new EnumerateResponseSAX(pStream, pPath)
-				.getEnumResponse();
-		else if (WBEMConstants.PULL.equals(parser)) return new EnumerateResponsePULL(pStream,
-				pPath).getEnumResponse();
-		else if (WBEMConstants.DOM.equals(parser)) return new EnumerateResponseDOM(pStream,
-				pPath).getEnumResponse();
+		.getEnumResponse(); else if (WBEMConstants.PULL.equals(parser)) return new EnumerateResponsePULL(pStream, pPath)
+		.getEnumResponse(); else if (WBEMConstants.DOM.equals(parser)) return new EnumerateResponseDOM(pStream, pPath)
+		.getEnumResponse();
 
-		throw new IllegalArgumentException("Invalid CIM-XML parser configured (\"" + parser
-				+ "\") ");
+		throw new IllegalArgumentException("Invalid CIM-XML parser configured (\"" + parser + "\") ");
 	}
 
-	private CIMResponse getSingleResponse(InputStreamReader pStream, CIMObjectPath pLocalPath)
-			throws WBEMException {
+	private CIMResponse getSingleResponse(InputStreamReader pStream, CIMObjectPath pLocalPath) throws WBEMException {
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 		Document dom;
@@ -2237,11 +2268,19 @@ private synchronized void checkState() throws IllegalStateException {
 		throw new IllegalStateException("WBEMClient is " + state);
 	}
 
-	public EnumerateResponse associatorPaths(CIMObjectPath pObjectName,
-			String pAssociationClass, String pResultClass, String pRole, String pResultRole,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
+	public EnumerateResponse associatorPaths(
+		CIMObjectPath pObjectName,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException {
 		final String operation = "OpenAssociatorInstancePaths";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2249,34 +2288,42 @@ public EnumerateResponse associatorPaths(CIMObjectPath pObjectNam
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
-					.OpenAssociatorInstancePaths_request(doc, pObjectName, pAssociationClass,
-							pResultClass, pRole, pResultRole, pFilterQueryLanguage, pFilterQuery,
-							pTimeout, pContinueOnError, pMaxObjects));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.OpenAssociatorInstancePaths_request(
+							doc,
+							pObjectName,
+							pAssociationClass,
+							pResultClass,
+							pRole,
+							pResultRole,
+							pFilterQueryLanguage,
+							pFilterQuery,
+							pTimeout,
+							pContinueOnError,
+							pMaxObjects
+						)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 
 			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
 			return enumResp;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2286,12 +2333,21 @@ public EnumerateResponse associatorPaths(CIMObjectPath pObjectNam
 		}
 	}
 
-	public EnumerateResponse associators(CIMObjectPath pObjectName,
-			String pAssocClass, String pResultClass, String pRole, String pResultRole,
-			boolean pIncludeClassOrigin, String[] pPropertyList, String pFilterQueryLanguage,
-			String pFilterQuery, UnsignedInteger32 pTimeout, boolean pContinueOnError,
-			UnsignedInteger32 pMaxObjects) throws WBEMException {
-
+	public EnumerateResponse associators(
+		CIMObjectPath pObjectName,
+		String pAssocClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException {
 		final String operation = "OpenAssociatorInstances";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2299,34 +2355,44 @@ public EnumerateResponse associators(CIMObjectPath pObjectName,
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenAssociatorInstances_request(
-					doc, pObjectName, pAssocClass, pResultClass, pRole, pResultRole,
-					pIncludeClassOrigin, pPropertyList, pFilterQueryLanguage, pFilterQuery,
-					pTimeout, pContinueOnError, pMaxObjects));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.OpenAssociatorInstances_request(
+							doc,
+							pObjectName,
+							pAssocClass,
+							pResultClass,
+							pRole,
+							pResultRole,
+							pIncludeClassOrigin,
+							pPropertyList,
+							pFilterQueryLanguage,
+							pFilterQuery,
+							pTimeout,
+							pContinueOnError,
+							pMaxObjects
+						)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 
 			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
 			return enumResp;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2336,9 +2402,7 @@ public EnumerateResponse associators(CIMObjectPath pObjectName,
 		}
 	}
 
-	public void closeEnumeration(CIMObjectPath pObjectName, String pEnumerationContext)
-			throws WBEMException {
-
+	public void closeEnumeration(CIMObjectPath pObjectName, String pEnumerationContext) throws WBEMException {
 		final String operation = "CloseEnumeration";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2346,18 +2410,19 @@ public void closeEnumeration(CIMObjectPath pObjectName, String pEnumerationConte
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.CloseEnumeration_request(doc,
-					pObjectName, pEnumerationContext));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.CloseEnumeration_request(doc, pObjectName, pEnumerationContext)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 
@@ -2374,9 +2439,7 @@ public void closeEnumeration(CIMObjectPath pObjectName, String pEnumerationConte
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2384,13 +2447,17 @@ public void closeEnumeration(CIMObjectPath pObjectName, String pEnumerationConte
 		} finally {
 			logger.exit();
 		}
-
 	}
 
-	public EnumerateResponse enumerateInstancePaths(CIMObjectPath pObjectName,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
+	public EnumerateResponse enumerateInstancePaths(
+		CIMObjectPath pObjectName,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException {
 		final String operation = "OpenEnumerateInstancePaths";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2398,33 +2465,38 @@ public EnumerateResponse enumerateInstancePaths(CIMObjectPath pOb
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
-					.OpenEnumerateInstancePaths_request(doc, pObjectName, pFilterQueryLanguage,
-							pFilterQuery, pTimeout, pContinueOnError, pMaxObjects));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.OpenEnumerateInstancePaths_request(
+							doc,
+							pObjectName,
+							pFilterQueryLanguage,
+							pFilterQuery,
+							pTimeout,
+							pContinueOnError,
+							pMaxObjects
+						)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 
 			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
 			return enumResp;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2434,11 +2506,18 @@ public EnumerateResponse enumerateInstancePaths(CIMObjectPath pOb
 		}
 	}
 
-	public EnumerateResponse enumerateInstances(CIMObjectPath pObjectName,
-			boolean pDeepInheritance, boolean pIncludeClassOrigin, String[] pPropertyList,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
+	public EnumerateResponse enumerateInstances(
+		CIMObjectPath pObjectName,
+		boolean pDeepInheritance,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException {
 		final String operation = "OpenEnumerateInstances";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2446,32 +2525,40 @@ public EnumerateResponse enumerateInstances(CIMObjectPath pObjectNa
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenEnumerateInstances_request(
-					doc, pObjectName, pDeepInheritance, pIncludeClassOrigin, pPropertyList,
-					pFilterQueryLanguage, pFilterQuery, pTimeout, pContinueOnError, pMaxObjects));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.OpenEnumerateInstances_request(
+							doc,
+							pObjectName,
+							pDeepInheritance,
+							pIncludeClassOrigin,
+							pPropertyList,
+							pFilterQueryLanguage,
+							pFilterQuery,
+							pTimeout,
+							pContinueOnError,
+							pMaxObjects
+						)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
 			return enumResp;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2483,7 +2570,7 @@ public EnumerateResponse enumerateInstances(CIMObjectPath pObjectNa
 
 	// not supported yet
 	public UnsignedInteger64 enumerationCount(CIMObjectPath pObjectName, String pEnumerationContext)
-			throws WBEMException {
+		throws WBEMException {
 		final String operation = "EnumerationCount";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2491,18 +2578,19 @@ public UnsignedInteger64 enumerationCount(CIMObjectPath pObjectName, String pEnu
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.EnumerationCount_request(doc,
-					pObjectName, pEnumerationContext));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.EnumerationCount_request(doc, pObjectName, pEnumerationContext)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 			// Currently this is not supported by server. Server returns
@@ -2517,15 +2605,12 @@ public UnsignedInteger64 enumerationCount(CIMObjectPath pObjectName, String pEnu
 			// this exception will be thrown only if server starts to support
 			// enumerationCount
 			throw new WBEMException(operation + " is currently not supported by client");
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2535,11 +2620,17 @@ public UnsignedInteger64 enumerationCount(CIMObjectPath pObjectName, String pEnu
 		}
 	}
 
-	public EnumerateResponse execQueryInstances(CIMObjectPath pObjectName,
-			String pFilterQuery, String pFilterQueryLanguage, boolean pReturnQueryResultClass,
-			UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects,
-			CIMClass pQueryResultClass) throws WBEMException {
-
+	public EnumerateResponse execQueryInstances(
+		CIMObjectPath pObjectName,
+		String pFilterQuery,
+		String pFilterQueryLanguage,
+		boolean pReturnQueryResultClass,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects,
+		CIMClass pQueryResultClass
+	)
+		throws WBEMException {
 		final String operation = "OpenQueryInstances";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2547,32 +2638,39 @@ public EnumerateResponse execQueryInstances(CIMObjectPath pObjectNa
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenQueryInstances_request(doc,
-					pObjectName, pFilterQuery, pFilterQueryLanguage, pReturnQueryResultClass,
-					pTimeout, pContinueOnError, pMaxObjects, pQueryResultClass));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.OpenQueryInstances_request(
+							doc,
+							pObjectName,
+							pFilterQuery,
+							pFilterQueryLanguage,
+							pReturnQueryResultClass,
+							pTimeout,
+							pContinueOnError,
+							pMaxObjects,
+							pQueryResultClass
+						)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
 			return enumResp;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2582,9 +2680,12 @@ public EnumerateResponse execQueryInstances(CIMObjectPath pObjectNa
 		}
 	}
 
-	public EnumerateResponse getInstancePaths(CIMObjectPath pObjectName,
-			String pContext, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
+	public EnumerateResponse getInstancePaths(
+		CIMObjectPath pObjectName,
+		String pContext,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException {
 		final String operation = "PullInstancePaths";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2592,31 +2693,29 @@ public EnumerateResponse getInstancePaths(CIMObjectPath pObjectNa
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.PullInstancePaths_request(doc,
-					pObjectName, pContext, pMaxObjects));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.PullInstancePaths_request(doc, pObjectName, pContext, pMaxObjects)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
 			return enumResp;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2626,9 +2725,12 @@ public EnumerateResponse getInstancePaths(CIMObjectPath pObjectNa
 		}
 	}
 
-	public EnumerateResponse getInstances(CIMObjectPath pObjectName, String pContext,
-			UnsignedInteger32 pMaxObjects) throws WBEMException {
-
+	public EnumerateResponse getInstances(
+		CIMObjectPath pObjectName,
+		String pContext,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException {
 		final String operation = "PullInstances";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2636,31 +2738,29 @@ public EnumerateResponse getInstances(CIMObjectPath pObjectName, St
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.PullInstances_request(doc,
-					pObjectName, pContext, pMaxObjects));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.PullInstances_request(doc, pObjectName, pContext, pMaxObjects)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
 			return enumResp;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2670,9 +2770,12 @@ public EnumerateResponse getInstances(CIMObjectPath pObjectName, St
 		}
 	}
 
-	public EnumerateResponse getInstancesWithPath(CIMObjectPath pObjectName,
-			String pContext, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
+	public EnumerateResponse getInstancesWithPath(
+		CIMObjectPath pObjectName,
+		String pContext,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException {
 		final String operation = "PullInstancesWithPath";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2680,31 +2783,29 @@ public EnumerateResponse getInstancesWithPath(CIMObjectPath pObject
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.PullInstancesWithPath_request(
-					doc, pObjectName, pContext, pMaxObjects));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.PullInstancesWithPath_request(doc, pObjectName, pContext, pMaxObjects)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
 			return enumResp;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2714,11 +2815,17 @@ public EnumerateResponse getInstancesWithPath(CIMObjectPath pObject
 		}
 	}
 
-	public EnumerateResponse referencePaths(CIMObjectPath pObjectName,
-			String pResultClass, String pRole, String pFilterQueryLanguage, String pFilterQuery,
-			UnsignedInteger32 pTimeout, boolean pContinueOnError, UnsignedInteger32 pMaxObjects)
-			throws WBEMException {
-
+	public EnumerateResponse referencePaths(
+		CIMObjectPath pObjectName,
+		String pResultClass,
+		String pRole,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException {
 		final String operation = "OpenReferenceInstancePaths";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2726,33 +2833,39 @@ public EnumerateResponse referencePaths(CIMObjectPath pObjectName
 		checkState();
 
 		try {
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper
-					.OpenReferenceInstancePaths_request(doc, pObjectName, pResultClass, pRole,
-							pFilterQueryLanguage, pFilterQuery, pTimeout, pContinueOnError,
-							pMaxObjects));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.OpenReferenceInstancePaths_request(
+							doc,
+							pObjectName,
+							pResultClass,
+							pRole,
+							pFilterQueryLanguage,
+							pFilterQuery,
+							pTimeout,
+							pContinueOnError,
+							pMaxObjects
+						)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
 			return enumResp;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2762,11 +2875,19 @@ public EnumerateResponse referencePaths(CIMObjectPath pObjectName
 		}
 	}
 
-	public EnumerateResponse references(CIMObjectPath pObjectName,
-			String pResultClass, String pRole, boolean pIncludeClassOrigin, String[] pPropertyList,
-			String pFilterQueryLanguage, String pFilterQuery, UnsignedInteger32 pTimeout,
-			boolean pContinueOnError, UnsignedInteger32 pMaxObjects) throws WBEMException {
-
+	public EnumerateResponse references(
+		CIMObjectPath pObjectName,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList,
+		String pFilterQueryLanguage,
+		String pFilterQuery,
+		UnsignedInteger32 pTimeout,
+		boolean pContinueOnError,
+		UnsignedInteger32 pMaxObjects
+	)
+		throws WBEMException {
 		final String operation = "OpenReferenceInstances";
 		final LogAndTraceBroker logger = LogAndTraceBroker.getBroker();
 		logger.entry();
@@ -2774,33 +2895,41 @@ public EnumerateResponse references(CIMObjectPath pObjectName,
 		checkState();
 
 		try {
-
-			if (pObjectName == null || pObjectName.getNamespace() == null
-					|| pObjectName.getObjectName() == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); }
+			if (pObjectName == null || pObjectName.getNamespace() == null || pObjectName.getObjectName() == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path");
+			}
 
 			HttpHeader hh = new HttpHeader();
-			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8",
-					"US-ASCII"));
+			hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", "US-ASCII"));
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.OpenReferenceInstances_request(
-					doc, pObjectName, pResultClass, pRole, pIncludeClassOrigin, pPropertyList,
-					pFilterQueryLanguage, pFilterQuery, pTimeout, pContinueOnError, pMaxObjects));
+			this.iXmlHelper.createCIMMessage(
+					doc,
+					this.iXmlHelper.OpenReferenceInstances_request(
+							doc,
+							pObjectName,
+							pResultClass,
+							pRole,
+							pIncludeClassOrigin,
+							pPropertyList,
+							pFilterQueryLanguage,
+							pFilterQuery,
+							pTimeout,
+							pContinueOnError,
+							pMaxObjects
+						)
+				);
 
 			InputStreamReader is = transmitRequest(operation, hh, doc);
 			EnumerateResponse enumResp = getEnumerateResponse(is, pObjectName);
 			return enumResp;
-
 		} catch (WBEMException e) {
 			logger.trace(Level.FINE, operation + " request resulted in CIM Error", e);
 			throw e;
 		} catch (Exception e) {
 			if (e.getCause() != null && e.getCause() instanceof WBEMException) {
-				logger
-						.trace(Level.FINE, operation + " request resulted in CIM Error", e
-								.getCause());
+				logger.trace(Level.FINE, operation + " request resulted in CIM Error", e.getCause());
 				throw (WBEMException) e.getCause();
 			}
 			logger.trace(Level.FINE, operation + " request failed", e);
@@ -2810,9 +2939,13 @@ public EnumerateResponse references(CIMObjectPath pObjectName,
 		}
 	}
 
-	private InputStreamReader transmitIndicationRequest(URI pRecipient, HttpClientPool pClientPool,
-			HttpHeader pHeader, Document pDocument) throws IOException, ProtocolException,
-			WBEMException {
+	private InputStreamReader transmitIndicationRequest(
+		URI pRecipient,
+		HttpClientPool pClientPool,
+		HttpHeader pHeader,
+		Document pDocument
+	)
+		throws IOException, ProtocolException, WBEMException {
 		return transmitRequestWorker(true, pRecipient, pClientPool, null, pHeader, pDocument);
 	}
 
@@ -2823,28 +2956,40 @@ public boolean sendIndication(URI pRecipient, CIMInstance pIndication) throws WB
 		checkState();
 
 		try {
-			if (pRecipient == null || pRecipient.getScheme() == null
-					|| pRecipient.getHost() == null || pRecipient.getPort() <= 0) { throw new WBEMException(
+			if (
+				pRecipient == null ||
+				pRecipient.getScheme() == null ||
+				pRecipient.getHost() == null ||
+				pRecipient.getPort() <= 0
+			) {
+				throw new WBEMException(
 					WBEMException.CIM_ERR_INVALID_PARAMETER,
-					"Invalid recipient URI, must contain valid scheme://host:port"); }
+					"Invalid recipient URI, must contain valid scheme://host:port"
+				);
+			}
 
-			if (!pRecipient.getScheme().equalsIgnoreCase(WBEMConstants.HTTP)
-					&& !pRecipient.getScheme().equalsIgnoreCase(WBEMConstants.HTTPS)) throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid scheme "
-							+ pRecipient.getScheme() + ", must be http or https");
+			if (
+				!pRecipient.getScheme().equalsIgnoreCase(WBEMConstants.HTTP) &&
+				!pRecipient.getScheme().equalsIgnoreCase(WBEMConstants.HTTPS)
+			) throw new WBEMException(
+				WBEMException.CIM_ERR_INVALID_PARAMETER,
+				"Invalid scheme " + pRecipient.getScheme() + ", must be http or https"
+			);
 
-			if (pIndication == null) { throw new WBEMException(
-					WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid indication, must not be null"); }
+			if (pIndication == null) {
+				throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid indication, must not be null");
+			}
 
-			logger.trace(Level.FINER, "Attempting to send following indication to "
-					+ pRecipient.toString() + ":\n" + pIndication.toString());
+			logger.trace(
+				Level.FINER,
+				"Attempting to send following indication to " + pRecipient.toString() + ":\n" + pIndication.toString()
+			);
 
 			HttpHeader hh = new HttpHeader();
 
 			Document doc = this.iXmlHelper.newDocument();
 
-			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.sendIndication_request(doc,
-					pIndication));
+			this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.sendIndication_request(doc, pIndication));
 
 			HttpClientPool indPool = new HttpClientPool(this.iConfiguration);
 
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java
index 4b3845a..dd4f17a 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEvent.java
@@ -48,15 +48,13 @@
  */
 
 import java.net.InetAddress;
-
 import org.metricshub.wbem.javax.cim.CIMInstance;
 
 /**
  * Class CIMEvent is required for indication handling.
- * 
+ *
  */
 public class CIMEvent {
-
 	protected CIMInstance iIndication;
 
 	protected String iID;
@@ -65,7 +63,7 @@ public class CIMEvent {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pIndication
 	 */
 	public CIMEvent(CIMInstance pIndication) {
@@ -74,7 +72,7 @@ public CIMEvent(CIMInstance pIndication) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pIndication
 	 * @param id
 	 */
@@ -86,7 +84,7 @@ public CIMEvent(CIMInstance pIndication, String id) {
 	/**
 	 * Constructor that takes the CIMInstance of the indication, the id as well
 	 * as the InetAddress of the remote machine.
-	 * 
+	 *
 	 * @param pIndication
 	 *            The indication instance
 	 * @param pId
@@ -104,7 +102,7 @@ public CIMEvent(CIMInstance pIndication, String pId, InetAddress pInetAddress) {
 	 * This method returns the InetAddress of the machine that hosts the CIM
 	 * Agent that sent the indication. Be aware the remote machine could have
 	 * multiple network adapters - thus the result can be ambiguous.
-	 * 
+	 *
 	 * @return The InetAddress of the remote machine
 	 */
 	public InetAddress getInetAddress() {
@@ -113,7 +111,7 @@ public InetAddress getInetAddress() {
 
 	/**
 	 * getIndication
-	 * 
+	 *
 	 * @return CIMInstance
 	 */
 	public CIMInstance getIndication() {
@@ -122,7 +120,7 @@ public CIMInstance getIndication() {
 
 	/**
 	 * getID
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getID() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java
index c6ff246..0f14f63 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java
@@ -51,17 +51,15 @@
 import java.util.EventListener;
 import java.util.LinkedList;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.javax.wbem.listener.IndicationListener;
 import org.metricshub.wbem.sblim.cimclient.IndicationListenerSBLIM;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 
 /**
  * Class CIMEventDispatcher is required for indication handling.
- * 
+ *
  */
 public class CIMEventDispatcher extends Thread {
-
 	protected LinkedList iEventQueue = new LinkedList();
 
 	protected EventListener iListener = null;
@@ -76,7 +74,7 @@ public class CIMEventDispatcher extends Thread {
 	 * Construct a CIMEventDispatcher object which distributes CIMEvents to the
 	 * appropriate CIMListener. The EventListener must be an instance of
 	 * IndicationListener or IndicationListenerSBLIM.
-	 * 
+	 *
 	 * @param pListener
 	 *            The CIMListener (IndicationListener or
 	 *            IndicationListenerSBLIM) which receives the CIMEvents to be
@@ -90,7 +88,7 @@ public CIMEventDispatcher(EventListener pListener) {
 	 * Construct a CIMEventDispatcher object which distributes CIMEvents to the
 	 * appropriate CIMListener. The EventListener must be an instance of
 	 * IndicationListener or IndicationListenerSBLIM.
-	 * 
+	 *
 	 * @param pListener
 	 *            The CIMListener (IndicationListener or
 	 *            IndicationListenerSBLIM) which receives the CIMEvents to be
@@ -99,9 +97,9 @@ public CIMEventDispatcher(EventListener pListener) {
 	 *            The maximum number of CIMEvents waiting to be dispatched.
 	 */
 	public CIMEventDispatcher(EventListener pListener, int pMaxEvents) {
-		if (!(pListener instanceof IndicationListener)
-				&& !(pListener instanceof IndicationListenerSBLIM)) throw new IllegalArgumentException(
-				"Listener must be instance of IndicationListener or IndicationListenerSBLIM");
+		if (
+			!(pListener instanceof IndicationListener) && !(pListener instanceof IndicationListenerSBLIM)
+		) throw new IllegalArgumentException("Listener must be instance of IndicationListener or IndicationListenerSBLIM");
 		this.iListener = pListener;
 		this.iMaxEvents = pMaxEvents;
 		setDaemon(true);
@@ -111,27 +109,33 @@ public CIMEventDispatcher(EventListener pListener, int pMaxEvents) {
 
 	/**
 	 * Propagates the CIMEvent to the event consumers.
-	 * 
+	 *
 	 * @param pEvent
 	 *            The CIMEvent to be dispatched.
 	 */
 	public synchronized void dispatchEvent(CIMEvent pEvent) {
-
 		if (pEvent != null) {
 			if (this.iMaxEvents > 0) {
 				int size = this.iEventQueue.size();
 				if (size >= this.iMaxEvents) {
 					for (int i = size - this.iMaxEvents + 1; i > 0; i--) {
 						CIMEvent event = this.iEventQueue.remove(0);
-						this.iLogger.trace(Level.FINE, "Deleted CIMEvent (id=" + event.getID()
-								+ ") from the queue (maximum size of " + this.iMaxEvents
-								+ " reached)");
+						this.iLogger.trace(
+								Level.FINE,
+								"Deleted CIMEvent (id=" +
+								event.getID() +
+								") from the queue (maximum size of " +
+								this.iMaxEvents +
+								" reached)"
+							);
 					}
 				}
 			}
 			this.iEventQueue.add(pEvent);
-			this.iLogger.trace(Level.FINE, "Added CIMEvent (id=" + pEvent.getID()
-					+ ") to the queue (" + this.iEventQueue.size() + " elements total)");
+			this.iLogger.trace(
+					Level.FINE,
+					"Added CIMEvent (id=" + pEvent.getID() + ") to the queue (" + this.iEventQueue.size() + " elements total)"
+				);
 			notify();
 		} else {
 			this.iLogger.trace(Level.WARNING, "CIMEvent to dispatch was null");
@@ -140,7 +144,7 @@ public synchronized void dispatchEvent(CIMEvent pEvent) {
 
 	/**
 	 * Starts the dispatching engine of the CIMEventDispatcher.
-	 * 
+	 *
 	 */
 	public synchronized void startup() {
 		this.iAlive = true;
@@ -167,12 +171,16 @@ private synchronized CIMEvent getEvent() {
 		while (event == null) {
 			try {
 				if (this.iEventQueue.size() == 0) wait();
-			} catch (InterruptedException e) { /**/}
+			} catch (InterruptedException e) {
+				/**/
+			}
 			if (!this.iAlive) break;
 			if (this.iEventQueue.size() > 0) {
 				event = this.iEventQueue.remove(0);
-				this.iLogger.trace(Level.FINER, "Removed CIMEvent (id=" + event.getID()
-						+ ") from the queue (" + this.iEventQueue.size() + " elements left)");
+				this.iLogger.trace(
+						Level.FINER,
+						"Removed CIMEvent (id=" + event.getID() + ") from the queue (" + this.iEventQueue.size() + " elements left)"
+					);
 			}
 		}
 		return event;
@@ -184,18 +192,22 @@ public void run() {
 			try {
 				CIMEvent event = getEvent();
 				if (event != null) {
-					this.iLogger.trace(Level.FINER, "Processing CIMEvent (id=" + event.getID()
-							+ ")");
+					this.iLogger.trace(Level.FINER, "Processing CIMEvent (id=" + event.getID() + ")");
 					try {
-						if (this.iListener instanceof IndicationListener) ((IndicationListener) this.iListener)
-								.indicationOccured(event.getID(), event.getIndication());
-						else // if instanceof IndicationListenerSBLIM)
-						((IndicationListenerSBLIM) this.iListener).indicationOccured(event.getID(),
-								event.getIndication(), event.getInetAddress());
+						if (this.iListener instanceof IndicationListener) ((IndicationListener) this.iListener).indicationOccured(
+								event.getID(),
+								event.getIndication()
+							); else ((IndicationListenerSBLIM) this.iListener).indicationOccured( // if instanceof IndicationListenerSBLIM)
+								event.getID(),
+								event.getIndication(),
+								event.getInetAddress()
+							);
 					} catch (Throwable t) {
-						this.iLogger.trace(Level.FINE, "Exception caught in listener ("
-								+ this.iListener.getClass().getName()
-								+ ") while processing CIMEvent", t);
+						this.iLogger.trace(
+								Level.FINE,
+								"Exception caught in listener (" + this.iListener.getClass().getName() + ") while processing CIMEvent",
+								t
+							);
 					}
 				}
 			} catch (Throwable t) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java
index f8a507f..d22c534 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java
@@ -79,35 +79,32 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Vector;
-import java.util.Map.Entry;
 import java.util.logging.Level;
-
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
 import org.metricshub.wbem.javax.cim.CIMDataType;
 import org.metricshub.wbem.javax.cim.CIMInstance;
+import org.metricshub.wbem.javax.cim.CIMProperty;
 import org.metricshub.wbem.javax.wbem.WBEMException;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMClientXML_HelperImpl;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMRequest;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLBuilderImpl;
 import org.metricshub.wbem.sblim.cimclient.internal.cimxml.CIMXMLParserImpl;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpContentHandler;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpException;
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader;
+import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader.HeaderEntry;
 import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeaderParser;
 import org.metricshub.wbem.sblim.cimclient.internal.http.MessageReader;
 import org.metricshub.wbem.sblim.cimclient.internal.http.MessageWriter;
-import org.metricshub.wbem.sblim.cimclient.internal.http.HttpHeader.HeaderEntry;
 import org.metricshub.wbem.sblim.cimclient.internal.http.io.DebugInputStream;
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfiguration;
 import org.metricshub.wbem.sblim.cimclient.internal.util.WBEMConfigurationDefaults;
 import org.metricshub.wbem.sblim.cimclient.internal.wbem.CIMError;
-import org.metricshub.wbem.javax.cim.CIMProperty;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.metricshub.wbem.sblim.cimclient.internal.http.HttpContentHandler;
-import org.metricshub.wbem.sblim.cimclient.internal.http.HttpException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
@@ -123,7 +120,6 @@ public class CIMIndicationHandler extends HttpContentHandler {
 	 * reliable indication queue and cache.
 	 */
 	private class DataManager extends Thread {
-
 		private boolean iAlive = true;
 
 		private LinkedList iLinkedList;
@@ -165,8 +161,7 @@ public void run() {
 						Map.Entry entry;
 						Iterator> iterator;
 
-						Set> set = this.iHashTable
-								.entrySet();
+						Set> set = this.iHashTable.entrySet();
 						if (set != null) {
 							iterator = set.iterator();
 							while (iterator.hasNext()) {
@@ -200,7 +195,7 @@ public void stopRun() {
 	 * serverIP/destinationURL pair along with its own
 	 * ReliableIndicationHandler. This is done to handle multiple
 	 * contexts from the same server.
-	 * 
+	 *
 	 * NOTE: Multiple contexts from the same server will not be handled
 	 * correctly if the user creates multiple
 	 * CIM_ListenerDestination instances with the same
@@ -212,13 +207,12 @@ public void stopRun() {
 	 * DSP1054 1.2.
 	 */
 	private class IndicationServer {
-
 		private boolean iRIInitialized = false;
 
 		private ReliableIndicationHandler iRIHandler;
 
 		public IndicationServer() {
-		// initialize() does the work
+			// initialize() does the work
 		}
 
 		public void initialize(ReliableIndicationHandler pRIHandler) {
@@ -242,7 +236,6 @@ public ReliableIndicationHandler getRIHandler() {
 	 * looking for the corresponding server IP and destination URL.
 	 */
 	private class ServerListEntry {
-
 		private InetAddress iInetAddress;
 
 		private String iDestinationUrl;
@@ -275,7 +268,6 @@ public IndicationServer getIndicationServer() {
 	 * and destination URL.
 	 */
 	private class ServerTableEntry {
-
 		private InetAddress iInetAddress;
 
 		private String iDestinationUrl;
@@ -297,8 +289,10 @@ public String getDestinationUrl() {
 		public boolean equals(Object pObj) {
 			if (!(pObj instanceof ServerTableEntry)) return false;
 			ServerTableEntry that = (ServerTableEntry) pObj;
-			if (this.iInetAddress.equals(that.getInetAddress())
-					&& this.iDestinationUrl.equalsIgnoreCase(that.getDestinationUrl())) return true;
+			if (
+				this.iInetAddress.equals(that.getInetAddress()) &&
+				this.iDestinationUrl.equalsIgnoreCase(that.getDestinationUrl())
+			) return true;
 			return false;
 		}
 
@@ -334,7 +328,7 @@ public int hashCode() {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pDispatcher
 	 */
 	public CIMIndicationHandler(CIMEventDispatcher pDispatcher) {
@@ -343,37 +337,35 @@ public CIMIndicationHandler(CIMEventDispatcher pDispatcher) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pDispatcher
 	 * @param pProperties
 	 */
 	public CIMIndicationHandler(CIMEventDispatcher pDispatcher, WBEMConfiguration pProperties) {
 		this.iDispatcher = pDispatcher;
-		this.iSessionProperties = (pProperties != null) ? pProperties : WBEMConfiguration
-				.getGlobalConfiguration();
+		this.iSessionProperties = (pProperties != null) ? pProperties : WBEMConfiguration.getGlobalConfiguration();
 		this.iReliableIndicationsDisabled = !this.iSessionProperties.isReliableIndicationEnabled();
 
 		// Initialize reliable indication support
 		if (!this.iReliableIndicationsDisabled) {
-			this.iHashtableCapacity = this.iSessionProperties
-					.getReliableIndicationHashtableCapacity();
+			this.iHashtableCapacity = this.iSessionProperties.getReliableIndicationHashtableCapacity();
 
 			// Validate ReliableIndicationHashtableCapacity property
 			if (this.iHashtableCapacity < 0 || this.iHashtableCapacity > 25000) {
-				this.iLogger.trace(Level.FINE, "ReliableIndicationHashtableCapacity of "
-						+ this.iHashtableCapacity + " outside range, using default value");
+				this.iLogger.trace(
+						Level.FINE,
+						"ReliableIndicationHashtableCapacity of " + this.iHashtableCapacity + " outside range, using default value"
+					);
 
-				this.iHashtableCapacity = Integer.valueOf(
-						WBEMConfigurationDefaults.LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY)
-						.intValue();
+				this.iHashtableCapacity =
+					Integer.valueOf(WBEMConfigurationDefaults.LISTENER_RELIABLE_INDICATION_HASHTABLE_CAPACITY).intValue();
 			}
 
 			if (this.iHashtableCapacity == 0) {
 				this.iServerList = new LinkedList();
 				this.iDataManagerThread = new DataManager(this.iServerList);
 			} else {
-				this.iServerTable = new Hashtable(
-						this.iHashtableCapacity);
+				this.iServerTable = new Hashtable(this.iHashtableCapacity);
 				this.iDataManagerThread = new DataManager(this.iServerTable);
 			}
 
@@ -410,8 +402,7 @@ public CIMIndicationHandler(CIMEventDispatcher pDispatcher, WBEMConfiguration pP
 					this.iIndicationTraceProperties = a.toArray(new String[0]);
 
 					if (this.iLogger.isLoggableTrace(Level.INFO)) {
-						StringBuilder msg = new StringBuilder(
-								"Indication trace enabled: class filter=");
+						StringBuilder msg = new StringBuilder("Indication trace enabled: class filter=");
 
 						if (this.iIndicationTraceClass != null) {
 							msg.append("\"");
@@ -461,7 +452,7 @@ public void close() {
 
 	/**
 	 * getMsgID
-	 * 
+	 *
 	 * @return int
 	 */
 	public synchronized int getMsgID() {
@@ -470,9 +461,7 @@ public synchronized int getMsgID() {
 		return this.iMessageId;
 	}
 
-	private static HttpHeader processHeader(HttpHeader pHeader, MessageWriter pWriter)
-			throws HttpException {
-
+	private static HttpHeader processHeader(HttpHeader pHeader, MessageWriter pWriter) throws HttpException {
 		HttpHeader header = processHttpExtensions(pHeader);
 		String cimExport = header.getField("CIMExport");
 		String cimOperation = header.getField("CIMOperation");
@@ -481,8 +470,11 @@ private static HttpHeader processHeader(HttpHeader pHeader, MessageWriter pWrite
 			pWriter.getHeader().addField("CIMError", "unsupported-operation");
 			throw new HttpException(400, "Bad Request");
 		}
-		if (cimExport != null && !"METHODREQUEST".equalsIgnoreCase(cimExport)
-				&& !"EXPORTMETHODCALL".equalsIgnoreCase(cimExport)) {
+		if (
+			cimExport != null &&
+			!"METHODREQUEST".equalsIgnoreCase(cimExport) &&
+			!"EXPORTMETHODCALL".equalsIgnoreCase(cimExport)
+		) {
 			pWriter.getHeader().addField("CIMError", "unsupported-operation");
 			throw new HttpException(400, "Bad Request");
 		}
@@ -497,16 +489,19 @@ private static HttpHeader processHeader(HttpHeader pHeader, MessageWriter pWrite
 	}
 
 	@Override
-	public void handleContent(MessageReader pReader, MessageWriter pWriter,
-			InetAddress pInetAddress, String pLocalAddress) throws HttpException, IOException {
-
+	public void handleContent(
+		MessageReader pReader,
+		MessageWriter pWriter,
+		InetAddress pInetAddress,
+		String pLocalAddress
+	)
+		throws HttpException, IOException {
 		CIMError error = null;
 
 		// TODO validate CIMHeaders!
 		HttpHeader inputHeader = pReader.getHeader();
 		inputHeader = processHeader(inputHeader, pWriter);
-		LogAndTraceBroker.getBroker().trace(Level.FINER,
-				"Indication Request HTTP Headers= " + inputHeader.toString());
+		LogAndTraceBroker.getBroker().trace(Level.FINER, "Indication Request HTTP Headers= " + inputHeader.toString());
 		String cimMethod = inputHeader.getField("CIMMethod");
 		String cimExport = inputHeader.getField("CIMExport");
 
@@ -522,11 +517,16 @@ public void handleContent(MessageReader pReader, MessageWriter pWriter,
 		}
 
 		InputStream inputstream = null;
-		if ((this.iSessionProperties.isCimXmlTracingEnabled() && LogAndTraceBroker.getBroker()
-				.getXmlTraceStream() != null)
-				|| LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
-			inputstream = new DebugInputStream(pReader.getInputStream(), LogAndTraceBroker
-					.getBroker().getXmlTraceStream(), "indication request");
+		if (
+			(this.iSessionProperties.isCimXmlTracingEnabled() && LogAndTraceBroker.getBroker().getXmlTraceStream() != null) ||
+			LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)
+		) {
+			inputstream =
+				new DebugInputStream(
+					pReader.getInputStream(),
+					LogAndTraceBroker.getBroker().getXmlTraceStream(),
+					"indication request"
+				);
 		} else {
 			inputstream = pReader.getInputStream();
 		}
@@ -535,24 +535,22 @@ public void handleContent(MessageReader pReader, MessageWriter pWriter,
 
 		if (request == null) throw new HttpException(400, "Bad Request");
 
-		if ((cimExport == null && !cimMethod.equalsIgnoreCase("Indication"))
-				|| !request.isCIMExport()) { throw new HttpException(400, "Bad Request"); }
+		if ((cimExport == null && !cimMethod.equalsIgnoreCase("Indication")) || !request.isCIMExport()) {
+			throw new HttpException(400, "Bad Request");
+		}
 
 		error = dispatchIndications(pReader, pInetAddress, pLocalAddress, request);
 
 		buildResponse(xmlHelper, pWriter, request, error);
 	}
 
-	private CIMRequest parseDocument(CIMClientXML_HelperImpl xmlHelper, MessageReader pReader,
-			InputStream inputstream) throws HttpException {
-
+	private CIMRequest parseDocument(CIMClientXML_HelperImpl xmlHelper, MessageReader pReader, InputStream inputstream)
+		throws HttpException {
 		// TODO: integrate SAX parser and DOM parser
 
 		Document doc = null;
 		try {
-
-			doc = xmlHelper.parse(new InputSource(new InputStreamReader(inputstream, pReader
-					.getCharacterEncoding())));
+			doc = xmlHelper.parse(new InputSource(new InputStreamReader(inputstream, pReader.getCharacterEncoding())));
 			Element rootE = doc.getDocumentElement();
 			return (CIMRequest) CIMXMLParserImpl.parseCIM(rootE);
 		} catch (Exception e) {
@@ -565,28 +563,32 @@ private CIMRequest parseDocument(CIMClientXML_HelperImpl xmlHelper, MessageReade
 	 * Returns the corresponding indication server if the server is already
 	 * present in the linked list, otherwise appends the server to the linked
 	 * list and returns the new entry.
-	 * 
+	 *
 	 * @param pInetAddress
 	 *            Address of indication server.
 	 * @param pDestinationUrl
 	 *            Destination URL of indication.
 	 * @return IndicationServer with given address.
 	 */
-	private IndicationServer getIndicationServerFromList(InetAddress pInetAddress,
-			String pDestinationUrl) {
+	private IndicationServer getIndicationServerFromList(InetAddress pInetAddress, String pDestinationUrl) {
 		ServerListEntry entry;
 		Iterator iterator = this.iServerList.iterator();
 		while (iterator.hasNext()) {
 			entry = iterator.next();
-			if (entry.getInetAddress().equals(pInetAddress)
-					&& entry.getDestinationUrl().equalsIgnoreCase(pDestinationUrl)) return entry
-					.getIndicationServer();
+			if (
+				entry.getInetAddress().equals(pInetAddress) && entry.getDestinationUrl().equalsIgnoreCase(pDestinationUrl)
+			) return entry.getIndicationServer();
 		}
 		entry = new ServerListEntry(pInetAddress, pDestinationUrl);
 		this.iServerList.add(entry);
-		this.iLogger.trace(Level.FINE, "Creating reliable indication handler for server IP "
-				+ entry.getInetAddress().toString() + ", destination URL "
-				+ entry.getDestinationUrl() + " in linked list");
+		this.iLogger.trace(
+				Level.FINE,
+				"Creating reliable indication handler for server IP " +
+				entry.getInetAddress().toString() +
+				", destination URL " +
+				entry.getDestinationUrl() +
+				" in linked list"
+			);
 
 		return entry.getIndicationServer();
 	}
@@ -595,15 +597,14 @@ private IndicationServer getIndicationServerFromList(InetAddress pInetAddress,
 	 * Returns the corresponding indication server if the server is already
 	 * present in the hash table, otherwise adds the server to the hash table
 	 * and returns the new entry.
-	 * 
+	 *
 	 * @param pInetAddress
 	 *            Address of indication server.
 	 * @param pDestinationUrl
 	 *            Destination URL of indication.
 	 * @return IndicationServer with given address.
 	 */
-	private IndicationServer getIndicationServerFromTable(InetAddress pInetAddress,
-			String pDestinationUrl) {
+	private IndicationServer getIndicationServerFromTable(InetAddress pInetAddress, String pDestinationUrl) {
 		ServerTableEntry key;
 		IndicationServer server;
 
@@ -612,9 +613,14 @@ private IndicationServer getIndicationServerFromTable(InetAddress pInetAddress,
 		if (server == null) {
 			server = new IndicationServer();
 			this.iServerTable.put(key, server);
-			this.iLogger.trace(Level.FINE, "Creating reliable indication handler for server IP "
-					+ key.getInetAddress().toString() + ", destination URL "
-					+ key.getDestinationUrl() + " in hash table");
+			this.iLogger.trace(
+					Level.FINE,
+					"Creating reliable indication handler for server IP " +
+					key.getInetAddress().toString() +
+					", destination URL " +
+					key.getDestinationUrl() +
+					" in hash table"
+				);
 		}
 		return server;
 	}
@@ -622,7 +628,7 @@ private IndicationServer getIndicationServerFromTable(InetAddress pInetAddress,
 	/**
 	 * deliverIndication handles reliable indications and returns a boolean
 	 * indicating whether the indication should be delivered or not
-	 * 
+	 *
 	 * @param pIndication
 	 *            Indication.
 	 * @param pId
@@ -633,8 +639,7 @@ private IndicationServer getIndicationServerFromTable(InetAddress pInetAddress,
 	 *         false if ReliableIndicationHandler will
 	 *         deliver indication
 	 */
-	private synchronized boolean deliverIndication(CIMInstance pIndication, String pId,
-			InetAddress pInetAddress) {
+	private synchronized boolean deliverIndication(CIMInstance pIndication, String pId, InetAddress pInetAddress) {
 		IndicationServer server;
 
 		// Each serverIP/destinationURL pair needs its own
@@ -650,33 +655,34 @@ private synchronized boolean deliverIndication(CIMInstance pIndication, String p
 			// Validate DeliveryRetryAttempts property
 			long attempts = this.iSessionProperties.getListenerDeliveryRetryAttempts();
 			if (attempts <= 0 || attempts > 1000) {
-				this.iLogger.trace(Level.FINE, "DeliveryRetryAttempts of " + attempts
-						+ " outside range, using default value");
+				this.iLogger.trace(Level.FINE, "DeliveryRetryAttempts of " + attempts + " outside range, using default value");
 
-				attempts = Long.valueOf(WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_ATTEMPTS)
-						.longValue();
+				attempts = Long.valueOf(WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_ATTEMPTS).longValue();
 			}
 
 			// Validate DeliveryRetryInterval property
 			long interval = this.iSessionProperties.getListenerDeliveryRetryInterval();
 			if (interval <= 0 || interval > 86400) {
-				this.iLogger.trace(Level.FINE, "DeliveryRetryInterval of " + interval
-						+ " outside range, using default value");
+				this.iLogger.trace(Level.FINE, "DeliveryRetryInterval of " + interval + " outside range, using default value");
 
-				interval = Long.valueOf(WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_INTERVAL)
-						.longValue();
+				interval = Long.valueOf(WBEMConfigurationDefaults.LISTENER_DELIVERY_RETRY_INTERVAL).longValue();
 			}
 
 			// Create new ReliableIndicationHandler for this
 			// CIMIndicationHandler
-			server.initialize(new ReliableIndicationHandler(this.iDispatcher, attempts * interval
-					* 10 * 1000));
+			server.initialize(new ReliableIndicationHandler(this.iDispatcher, attempts * interval * 10 * 1000));
 
-			this.iLogger
-					.trace(Level.FINE, "Reliable indication support enabled for IP "
-							+ pInetAddress.getHostAddress() + " and URL " + pId
-							+ ", DeliveryRetryAttempts=" + attempts + ", DeliveryRetryInterval="
-							+ interval);
+			this.iLogger.trace(
+					Level.FINE,
+					"Reliable indication support enabled for IP " +
+					pInetAddress.getHostAddress() +
+					" and URL " +
+					pId +
+					", DeliveryRetryAttempts=" +
+					attempts +
+					", DeliveryRetryInterval=" +
+					interval
+				);
 		}
 
 		// Let ReliableIndicationHandler deliver it
@@ -684,8 +690,12 @@ private synchronized boolean deliverIndication(CIMInstance pIndication, String p
 		return false;
 	}
 
-	private CIMError dispatchIndications(MessageReader pReader, InetAddress pInetAddress,
-			String pLocalAddress, CIMRequest request) {
+	private CIMError dispatchIndications(
+		MessageReader pReader,
+		InetAddress pInetAddress,
+		String pLocalAddress,
+		CIMRequest request
+	) {
 		try {
 			Vector paramValue = request.getParamValue();
 			Iterator iter = paramValue.iterator();
@@ -715,18 +725,21 @@ private CIMError dispatchIndications(MessageReader pReader, InetAddress pInetAdd
 					if (this.iAddSenderIPAddress) {
 						int size = indicationInst.getPropertyCount();
 						CIMProperty props[] = new CIMProperty[size + 1];
-						for (int i = 0; i < size; i++)
-							props[i] = indicationInst.getProperty(i);
-						props[size] = new CIMProperty("SBLIMJCC_SenderIPAddress",
-								CIMDataType.STRING_T, pInetAddress.getHostAddress());
+						for (int i = 0; i < size; i++) props[i] = indicationInst.getProperty(i);
+						props[size] =
+							new CIMProperty("SBLIMJCC_SenderIPAddress", CIMDataType.STRING_T, pInetAddress.getHostAddress());
 						indicationInst = new CIMInstance(indicationInst.getObjectPath(), props);
 					}
 
 					// Do any user-requested indication tracing here
-					if (this.iIndicationTraceProperties != null
-							&& this.iLogger.isLoggableTrace(Level.FINE)
-							&& (this.iIndicationTraceClass == null || indicationInst.getClassName()
-									.toLowerCase().indexOf(this.iIndicationTraceClass) != -1)) {
+					if (
+						this.iIndicationTraceProperties != null &&
+						this.iLogger.isLoggableTrace(Level.FINE) &&
+						(
+							this.iIndicationTraceClass == null ||
+							indicationInst.getClassName().toLowerCase().indexOf(this.iIndicationTraceClass) != -1
+						)
+					) {
 						StringBuilder msg = new StringBuilder("Received indication ");
 						msg.append(indicationInst.getClassName());
 						msg.append(" from IP=");
@@ -737,8 +750,7 @@ private CIMError dispatchIndications(MessageReader pReader, InetAddress pInetAdd
 						msg.append(" with properties:");
 						for (int i = 0; i < this.iIndicationTraceProperties.length; i++) {
 							msg.append(" ");
-							CIMProperty prop = indicationInst
-									.getProperty(this.iIndicationTraceProperties[i]);
+							CIMProperty prop = indicationInst.getProperty(this.iIndicationTraceProperties[i]);
 							if (prop == null) {
 								msg.append(this.iIndicationTraceProperties[i]);
 								msg.append(" not a property;");
@@ -755,41 +767,45 @@ private CIMError dispatchIndications(MessageReader pReader, InetAddress pInetAdd
 						this.iLogger.trace(Level.FINE, msg.toString());
 					}
 
-					if (this.iReliableIndicationsDisabled
-							|| deliverIndication(indicationInst, id, pInetAddress)) {
-						this.iDispatcher.dispatchEvent(new CIMEvent(indicationInst, id,
-								pInetAddress));
+					if (this.iReliableIndicationsDisabled || deliverIndication(indicationInst, id, pInetAddress)) {
+						this.iDispatcher.dispatchEvent(new CIMEvent(indicationInst, id, pInetAddress));
 					}
 				}
 			}
 			return null;
 		} catch (Exception e) {
-			return new CIMError(new WBEMException(WBEMException.CIM_ERR_FAILED, "CIM_ERR_FAILED",
-					null, e));
+			return new CIMError(new WBEMException(WBEMException.CIM_ERR_FAILED, "CIM_ERR_FAILED", null, e));
 		}
 	}
 
-	private void buildResponse(CIMClientXML_HelperImpl xmlHelper, MessageWriter pWriter,
-			CIMRequest request, CIMError error) throws HttpException, IOException {
+	private void buildResponse(
+		CIMClientXML_HelperImpl xmlHelper,
+		MessageWriter pWriter,
+		CIMRequest request,
+		CIMError error
+	)
+		throws HttpException, IOException {
 		Document responseDoc = null;
 		try {
 			DocumentBuilder docBuilder = xmlHelper.getDocumentBuilder();
 			responseDoc = docBuilder.newDocument();
 			CIMXMLBuilderImpl.createIndication_response(responseDoc, request.getId(), error);
-
 		} catch (Exception e) {
 			// TODO: check this error code, may not be appropriate
 			throw new HttpException(400, "Bad Request");
 		}
-		if (this.iSessionProperties.isCimXmlTracingEnabled()
-				|| this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) {
+		if (this.iSessionProperties.isCimXmlTracingEnabled() || this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) {
 			OutputStream pos = new ByteArrayOutputStream();
 			CIMClientXML_HelperImpl.dumpDocument(pos, responseDoc, "indication response");
 			OutputStream debugStream = this.iLogger.getXmlTraceStream();
-			if (this.iSessionProperties.isCimXmlTracingEnabled() && debugStream != null) debugStream
-					.write(pos.toString().getBytes());
+			if (this.iSessionProperties.isCimXmlTracingEnabled() && debugStream != null) debugStream.write(
+				pos.toString().getBytes()
+			);
 			if (this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) this.iLogger.traceCIMXML(
-					Level.FINEST, pos.toString(), true);
+					Level.FINEST,
+					pos.toString(),
+					true
+				);
 		}
 		CIMClientXML_HelperImpl.serialize(pWriter.getOutputStream(), responseDoc);
 		pWriter.getHeader().addField("CIMExport", "MethodResponse");
@@ -802,21 +818,22 @@ private static HttpHeader processHttpExtensions(HttpHeader pOriginalHeader) {
 		String ns = null;
 
 		HttpHeaderParser manOptHeader = null;
-		if (man != null && man.length() > 0) manOptHeader = new HttpHeaderParser(man);
-		else if (opt != null && opt.length() > 0) manOptHeader = new HttpHeaderParser(opt);
+		if (man != null && man.length() > 0) manOptHeader = new HttpHeaderParser(man); else if (
+			opt != null && opt.length() > 0
+		) manOptHeader = new HttpHeaderParser(opt);
 		if (manOptHeader != null) ns = manOptHeader.getValue("ns");
 
 		if (ns != null) {
-
 			Iterator> iter = pOriginalHeader.iterator();
 			String key;
 			while (iter.hasNext()) {
 				Entry entry = iter.next();
 				if (entry != null) {
 					key = entry.getKey().toString();
-					if (key.startsWith(ns + "-")) headers.addParsedField(key.substring(3), entry
-							.getValue().toString());
-					else headers.addParsedField(key, entry.getValue().toString());
+					if (key.startsWith(ns + "-")) headers.addParsedField(
+						key.substring(3),
+						entry.getValue().toString()
+					); else headers.addParsedField(key, entry.getValue().toString());
 				}
 			}
 		} else {
@@ -825,5 +842,4 @@ private static HttpHeader processHttpExtensions(HttpHeader pOriginalHeader) {
 
 		return headers;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java
index 25522eb..5b0f86f 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/indications/ReliableIndicationHandler.java
@@ -46,10 +46,9 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.javax.cim.CIMInstance;
-import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 import org.metricshub.wbem.javax.cim.CIMProperty;
+import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 
 /**
  * ReliableIndicationHandler is responsible for determining when to
@@ -57,7 +56,7 @@
  * caching all indications for the duration of their sequence identifier
  * lifetime, and logging missing, duplicate and out-of-order indications. This
  * functionality is based on the changes first introduced by DSP1054 v1.1.
- * 
+ *
  * The handleIndication, areAllEmpty and
  * processAll methods need to be synchronized because they are the
  * entry points into ReliableIndicationHandler - the first is the
@@ -65,7 +64,7 @@
  * indication, the other two are only called by the DataManager thread and hence
  * protected. All of the private methods are only called from one of the three
  * synchronized methods.
- * 
+ *
  * NOTE: ReliableIndicationHandler does NOT contain any logic for
  * handling sequence number wrapping. It was deemed unnecessary because of the
  * performance impact to each and every indication for a VERY rare occurrence:
@@ -84,7 +83,6 @@ public class ReliableIndicationHandler {
 	 * one sequence context can be in the queue at any one time.
 	 */
 	private class ReliableIndication {
-
 		private long iDiscardTime;
 
 		private String iId;
@@ -95,8 +93,13 @@ private class ReliableIndication {
 
 		private long iSequenceNumber;
 
-		public ReliableIndication(CIMInstance pIndication, long pSequenceNumber, long pDiscardTime,
-				String pId, InetAddress pInetAddress) {
+		public ReliableIndication(
+			CIMInstance pIndication,
+			long pSequenceNumber,
+			long pDiscardTime,
+			String pId,
+			InetAddress pInetAddress
+		) {
 			this.iIndication = pIndication;
 			this.iSequenceNumber = pSequenceNumber;
 			this.iDiscardTime = pDiscardTime;
@@ -133,7 +136,6 @@ public long getSequenceNumber() {
 	 * increasing discard time.
 	 */
 	private class CacheEntry {
-
 		private String iSeqContext;
 
 		private long iSeqNumber;
@@ -183,7 +185,7 @@ public long getSequenceNumber() {
 	 * Constructs a ReliableIndicationHandler instance that uses
 	 * the specified event dispatcher and sequence identifier lifetime to handle
 	 * reliable indications.
-	 * 
+	 *
 	 * @param pDispatcher
 	 *            CIMEventDispatcher that does the actual
 	 *            indication dispatching.
@@ -197,15 +199,14 @@ public ReliableIndicationHandler(CIMEventDispatcher pDispatcher, long pIdentifer
 
 	/**
 	 * Adds a reliable indication to the indication delivery queue.
-	 * 
+	 *
 	 * @param pIndication
 	 *            Reliable indication to be queued for delivery.
 	 */
 	private void addToQueue(ReliableIndication pIndication) {
 		int size = this.iQueue.size();
 
-		if ((size == 0)
-				|| (this.iQueue.getLast().getSequenceNumber()) < pIndication.getSequenceNumber()) {
+		if ((size == 0) || (this.iQueue.getLast().getSequenceNumber()) < pIndication.getSequenceNumber()) {
 			this.iQueue.addLast(pIndication);
 		} else {
 			int i;
@@ -235,8 +236,9 @@ private void flushQueue() {
 			ReliableIndication indication = this.iQueue.removeFirst();
 			logMissingQueueEntries(indication.getSequenceNumber());
 
-			this.iDispatcher.dispatchEvent(new CIMEvent(indication.getIndication(), indication
-					.getId(), indication.getInetAddress()));
+			this.iDispatcher.dispatchEvent(
+					new CIMEvent(indication.getIndication(), indication.getId(), indication.getInetAddress())
+				);
 
 			this.iExpectedSequenceNumber = indication.getSequenceNumber() + 1;
 		}
@@ -244,7 +246,7 @@ private void flushQueue() {
 
 	/**
 	 * Determines if the indication delivery queue is empty.
-	 * 
+	 *
 	 * @return true if indication delivery queue is empty,
 	 *         false otherwise.
 	 */
@@ -255,7 +257,7 @@ private boolean isQueueEmpty() {
 	/**
 	 * Logs any missing reliable indications at the front of the indication
 	 * delivery queue.
-	 * 
+	 *
 	 * @param pSequenceNumber
 	 *            Sequence number of first indication present in delivery queue.
 	 */
@@ -297,8 +299,9 @@ private void processQueue() {
 			indication = this.iQueue.removeFirst();
 			logMissingQueueEntries(indication.getSequenceNumber());
 
-			this.iDispatcher.dispatchEvent(new CIMEvent(indication.getIndication(), indication
-					.getId(), indication.getInetAddress()));
+			this.iDispatcher.dispatchEvent(
+					new CIMEvent(indication.getIndication(), indication.getId(), indication.getInetAddress())
+				);
 
 			this.iExpectedSequenceNumber = indication.getSequenceNumber() + 1;
 
@@ -310,8 +313,9 @@ private void processQueue() {
 		while (indication.getSequenceNumber() == this.iExpectedSequenceNumber) {
 			indication = this.iQueue.removeFirst();
 
-			this.iDispatcher.dispatchEvent(new CIMEvent(indication.getIndication(), indication
-					.getId(), indication.getInetAddress()));
+			this.iDispatcher.dispatchEvent(
+					new CIMEvent(indication.getIndication(), indication.getId(), indication.getInetAddress())
+				);
 
 			this.iExpectedSequenceNumber++;
 
@@ -322,7 +326,7 @@ private void processQueue() {
 
 	/**
 	 * Adds a reliable indication to the sequence identifier cache.
-	 * 
+	 *
 	 * @param pSequenceContext
 	 *            Sequence context of reliable indication to be cached.
 	 * @param pSequenceNumber
@@ -348,7 +352,6 @@ private void addToCache(String pSequenceContext, long pSequenceNumber, long pDis
 			}
 			this.iCache.addFirst(newEntry);
 		}
-
 		// printCache();
 	}
 
@@ -362,7 +365,7 @@ private void addToCache(String pSequenceContext, long pSequenceNumber, long pDis
 
 	/**
 	 * Determines if the sequence identifier cache is empty.
-	 * 
+	 *
 	 * @return true if sequence identifier cache is empty,
 	 *         false otherwise.
 	 */
@@ -372,7 +375,7 @@ private boolean isCacheEmpty() {
 
 	/**
 	 * Determines if the sequence context is in the sequence identifier cache.
-	 * 
+	 *
 	 * @param pSequenceContext
 	 *            Sequence context to look for.
 	 * @return true if sequence context is in sequence identifier
@@ -390,7 +393,7 @@ private boolean isInCache(String pSequenceContext) {
 	/**
 	 * Determines if the sequence identifier (context and number) is in the
 	 * sequence identifier cache.
-	 * 
+	 *
 	 * @param pSequenceContext
 	 *            Sequence context to look for.
 	 * @param pSequenceNumber
@@ -403,8 +406,9 @@ private boolean isInCache(String pSequenceContext, long pSequenceNumber) {
 		Iterator iterator = this.iCache.iterator();
 		while (iterator.hasNext()) {
 			CacheEntry entry = iterator.next();
-			if ((entry.getSequenceContext().compareTo(pSequenceContext) == 0)
-					&& (entry.getSequenceNumber() == pSequenceNumber)) return true;
+			if (
+				(entry.getSequenceContext().compareTo(pSequenceContext) == 0) && (entry.getSequenceNumber() == pSequenceNumber)
+			) return true;
 		}
 		return false;
 	}
@@ -439,7 +443,7 @@ private void processCache() {
 	/**
 	 * Determines if both the indication delivery queue and sequence identifier
 	 * cache are empty.
-	 * 
+	 *
 	 * @return true if both the indication delivery queue and
 	 *         sequence identifier cache are empty, false
 	 *         otherwise.
@@ -471,7 +475,7 @@ protected synchronized void processAll() {
 	 * indication is either sent directly to the CIMEventDispatcher
 	 * or placed in the indication delivery queue to be dispatched later. All
 	 * reliable indications are placed in the sequence identifier cache.
-	 * 
+	 *
 	 * @param pIndication
 	 *            Indication.
 	 * @param pId
@@ -479,8 +483,7 @@ protected synchronized void processAll() {
 	 * @param pInetAddress
 	 *            Indication server IP.
 	 */
-	public synchronized void handleIndication(CIMInstance pIndication, String pId,
-			InetAddress pInetAddress) {
+	public synchronized void handleIndication(CIMInstance pIndication, String pId, InetAddress pInetAddress) {
 		// Get current time
 		long arrivalTime = System.currentTimeMillis();
 
@@ -491,8 +494,7 @@ public synchronized void handleIndication(CIMInstance pIndication, String pId,
 		// At this point indication is reliable or not reliable
 
 		// Indication is not reliable, handle appropriately and deliver
-		if (seqCtxProp == null || seqNumProp == null || seqCtxProp.getValue() == null
-				|| seqNumProp.getValue() == null) {
+		if (seqCtxProp == null || seqNumProp == null || seqCtxProp.getValue() == null || seqNumProp.getValue() == null) {
 			// Handle switch from reliable to not reliable
 			if (this.iLastSequenceContext != null) {
 				// Deliver all enqueued indications from previous context
@@ -520,8 +522,11 @@ public synchronized void handleIndication(CIMInstance pIndication, String pId,
 			// this.iLastArrivalTime = arrivalTime;
 
 			// Cache sequence identifier
-			addToCache(this.iLastSequenceContext, this.iLastSequenceNumber.longValue(), arrivalTime
-					+ this.iIndentifierLifetime);
+			addToCache(
+				this.iLastSequenceContext,
+				this.iLastSequenceNumber.longValue(),
+				arrivalTime + this.iIndentifierLifetime
+			);
 
 			// Deliver indication
 			this.iDispatcher.dispatchEvent(new CIMEvent(pIndication, pId, pInetAddress));
@@ -568,15 +573,18 @@ public synchronized void handleIndication(CIMInstance pIndication, String pId,
 			// Cached sequence context indicates this indication arrived
 			// out-of-order from previous context, log and ignore
 			if (isInCache(seqCtx)) {
-				this.iLogger.trace(Level.FINE, "Out-of-order indication #" + seqNumVal
-						+ " received from previous context; indication ignored, logged: "
-						+ pIndication.toString());
+				this.iLogger.trace(
+						Level.FINE,
+						"Out-of-order indication #" +
+						seqNumVal +
+						" received from previous context; indication ignored, logged: " +
+						pIndication.toString()
+					);
 
 				return;
 			}
 
-			this.iLogger.trace(Level.FINE,
-					"Discarding knowledge of previous sequence identifier because context changed");
+			this.iLogger.trace(Level.FINE, "Discarding knowledge of previous sequence identifier because context changed");
 
 			// Deliver all enqueued indications from previous context
 			flushQueue();
@@ -600,8 +608,9 @@ public synchronized void handleIndication(CIMInstance pIndication, String pId,
 			// Unexpected (non-zero) sequence number, enqueue
 			this.iLastSequenceNumber = Long.valueOf(-1);
 			this.iExpectedSequenceNumber = 0;
-			addToQueue(new ReliableIndication(pIndication, seqNumVal, arrivalTime
-					+ this.iIndentifierLifetime, pId, pInetAddress));
+			addToQueue(
+				new ReliableIndication(pIndication, seqNumVal, arrivalTime + this.iIndentifierLifetime, pId, pInetAddress)
+			);
 
 			return;
 		}
@@ -625,8 +634,7 @@ public synchronized void handleIndication(CIMInstance pIndication, String pId,
 
 		// Duplicate indication arrived, log and ignore
 		if (isInCache(seqCtx, seqNumVal)) {
-			this.iLogger.trace(Level.FINE, "Duplicate indication #" + seqNumVal
-					+ " received; indication ignored");
+			this.iLogger.trace(Level.FINE, "Duplicate indication #" + seqNumVal + " received; indication ignored");
 
 			// Cache sequence identifier (duplicate entries okay and much easier
 			// than deleting/adding or moving)
@@ -637,9 +645,15 @@ public synchronized void handleIndication(CIMInstance pIndication, String pId,
 
 		// Out-of-order indication arrived, log and ignore
 		if (seqNumVal < this.iExpectedSequenceNumber) {
-			this.iLogger.trace(Level.FINE, "Out-of-order indication #" + seqNumVal + " received (#"
-					+ this.iExpectedSequenceNumber + " expected); indication ignored, logged: "
-					+ pIndication.toString());
+			this.iLogger.trace(
+					Level.FINE,
+					"Out-of-order indication #" +
+					seqNumVal +
+					" received (#" +
+					this.iExpectedSequenceNumber +
+					" expected); indication ignored, logged: " +
+					pIndication.toString()
+				);
 
 			// Cache sequence identifier
 			addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
@@ -650,8 +664,9 @@ public synchronized void handleIndication(CIMInstance pIndication, String pId,
 		// Indication with higher sequence number than expected received, cache
 		// and enqueue it
 		addToCache(seqCtx, seqNumVal, arrivalTime + this.iIndentifierLifetime);
-		addToQueue(new ReliableIndication(pIndication, seqNumVal, arrivalTime
-				+ this.iIndentifierLifetime, pId, pInetAddress));
+		addToQueue(
+			new ReliableIndication(pIndication, seqNumVal, arrivalTime + this.iIndentifierLifetime, pId, pInetAddress)
+		);
 
 		return;
 	}
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java
index 9ce5a38..059ce11 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorNamesOp.java
@@ -48,12 +48,11 @@
 
 /**
  * @author Roberto
- * 
+ *
  *         To change the template for this generated type comment go to
  *         Window>Preferences>Java>Code Generation>Code and Comments
  */
 public class CIMAssociatorNamesOp extends CIMOperation {
-
 	protected String iAssociationClass;
 
 	protected String iResultClass;
@@ -64,16 +63,20 @@ public class CIMAssociatorNamesOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pAssociationClass
 	 * @param pResultClass
 	 * @param pRole
 	 * @param pResultRole
 	 */
-	public CIMAssociatorNamesOp(CIMObjectPath pObjectName, String pAssociationClass,
-			String pResultClass, String pRole, String pResultRole) {
-
+	public CIMAssociatorNamesOp(
+		CIMObjectPath pObjectName,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole
+	) {
 		this.iMethodCall = "AssociatorNames";
 		this.iObjectName = pObjectName;
 		this.iAssociationClass = pAssociationClass;
@@ -83,7 +86,7 @@ public CIMAssociatorNamesOp(CIMObjectPath pObjectName, String pAssociationClass,
 
 	/**
 	 * Returns the association class name
-	 * 
+	 *
 	 * @return The association class name
 	 */
 	public String getAssocClass() {
@@ -92,7 +95,7 @@ public String getAssocClass() {
 
 	/**
 	 * Returns the result class name
-	 * 
+	 *
 	 * @return The result class name
 	 */
 	public String getResultClass() {
@@ -101,7 +104,7 @@ public String getResultClass() {
 
 	/**
 	 * Returns the result role
-	 * 
+	 *
 	 * @return The result role
 	 */
 	public String getResultRole() {
@@ -110,11 +113,10 @@ public String getResultRole() {
 
 	/**
 	 * Returns the role
-	 * 
+	 *
 	 * @return The role
 	 */
 	public String getRole() {
 		return this.iRole;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java
index 7620e9d..8448f68 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMAssociatorsOp.java
@@ -48,10 +48,9 @@
 
 /**
  * Class CIMAssociatorsOp
- * 
+ *
  */
 public class CIMAssociatorsOp extends CIMOperation {
-
 	protected String iAssociationClass;
 
 	protected String iResultClass;
@@ -68,7 +67,7 @@ public class CIMAssociatorsOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pAssociationClass
 	 * @param pResultClass
@@ -78,10 +77,16 @@ public class CIMAssociatorsOp extends CIMOperation {
 	 * @param pIncludeClassOrigin
 	 * @param pPropertyList
 	 */
-	public CIMAssociatorsOp(CIMObjectPath pObjectName, String pAssociationClass,
-			String pResultClass, String pRole, String pResultRole, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) {
-
+	public CIMAssociatorsOp(
+		CIMObjectPath pObjectName,
+		String pAssociationClass,
+		String pResultClass,
+		String pRole,
+		String pResultRole,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	) {
 		this.iMethodCall = "Associators";
 		this.iObjectName = pObjectName;
 		this.iAssociationClass = pAssociationClass;
@@ -94,7 +99,7 @@ public CIMAssociatorsOp(CIMObjectPath pObjectName, String pAssociationClass,
 
 	/**
 	 * Returns the association class
-	 * 
+	 *
 	 * @return The association class
 	 */
 	public String getAssocClass() {
@@ -103,7 +108,7 @@ public String getAssocClass() {
 
 	/**
 	 * Returns if includeQualifiers is set
-	 * 
+	 *
 	 * @return The value of includeClassOrigin
 	 */
 	public boolean isIncludeClassOrigin() {
@@ -112,7 +117,7 @@ public boolean isIncludeClassOrigin() {
 
 	/**
 	 * Returns if includeQualifiers is set
-	 * 
+	 *
 	 * @return The value of includeClassOrigin
 	 */
 	public boolean isIncludeQualifiers() {
@@ -121,7 +126,7 @@ public boolean isIncludeQualifiers() {
 
 	/**
 	 * Returns the property list
-	 * 
+	 *
 	 * @return The property list
 	 */
 	public String[] getPropertyList() {
@@ -130,7 +135,7 @@ public String[] getPropertyList() {
 
 	/**
 	 * Returns the result class
-	 * 
+	 *
 	 * @return The result class
 	 */
 	public String getResultClass() {
@@ -139,7 +144,7 @@ public String getResultClass() {
 
 	/**
 	 * Returns the result role
-	 * 
+	 *
 	 * @return The result role
 	 */
 	public String getResultRole() {
@@ -148,11 +153,10 @@ public String getResultRole() {
 
 	/**
 	 * Returns the role
-	 * 
+	 *
 	 * @return The role
 	 */
 	public String getRole() {
 		return this.iRole;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java
index 626b73e..dfa1766 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateClassOp.java
@@ -49,15 +49,14 @@
 
 /**
  * CIMCreateClassOp
- * 
+ *
  */
 public class CIMCreateClassOp extends CIMOperation {
-
 	protected CIMClass iCimClass;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pCimClass
 	 */
@@ -69,7 +68,7 @@ public CIMCreateClassOp(CIMObjectPath pObjectName, CIMClass pCimClass) {
 
 	/**
 	 * Returns the CIM class
-	 * 
+	 *
 	 * @return The CIM class
 	 */
 	public CIMClass getCimClass() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java
index d58ac30..a8ad3a6 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateInstanceOp.java
@@ -49,15 +49,14 @@
 
 /**
  * CIMCreateInstanceOp
- * 
+ *
  */
 public class CIMCreateInstanceOp extends CIMOperation {
-
 	protected CIMInstance iInstance;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pInstance
 	 */
@@ -69,11 +68,10 @@ public CIMCreateInstanceOp(CIMObjectPath pObjectName, CIMInstance pInstance) {
 
 	/**
 	 * Returns the instance
-	 * 
+	 *
 	 * @return The instance
 	 */
 	public CIMInstance getInstance() {
 		return this.iInstance;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java
index 11c5c41..f9a2184 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateNameSpaceOp.java
@@ -47,13 +47,13 @@
 
 /**
  * CIMCreateNameSpaceOp
- * 
+ *
  */
 public class CIMCreateNameSpaceOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNamespace
 	 */
 	public CIMCreateNameSpaceOp(String pNamespace) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java
index dd501a1..f07d55f 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMCreateQualifierTypeOp.java
@@ -50,15 +50,14 @@
 
 /**
  * CIMCreateQualifierTypeOp
- * 
+ *
  */
 public class CIMCreateQualifierTypeOp extends CIMOperation {
-
 	protected CIMQualifierType iQualifierType;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pQualifierType
 	 */
@@ -70,11 +69,10 @@ public CIMCreateQualifierTypeOp(CIMObjectPath pObjectName, CIMQualifierType p
 
 	/**
 	 * Returns the qualifier type
-	 * 
+	 *
 	 * @return The qualifier type
 	 */
 	public CIMQualifierType getQualifierType() {
 		return this.iQualifierType;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java
index 3a8ce82..f6f039a 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteClassOp.java
@@ -48,13 +48,13 @@
 
 /**
  * CIMDeleteClassOp
- * 
+ *
  */
 public class CIMDeleteClassOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 */
 	public CIMDeleteClassOp(CIMObjectPath pObjectName) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java
index f6fb378..6ed4219 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteInstanceOp.java
@@ -48,13 +48,13 @@
 
 /**
  * CIMDeleteInstanceOp
- * 
+ *
  */
 public class CIMDeleteInstanceOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 */
 	public CIMDeleteInstanceOp(CIMObjectPath pObjectName) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java
index 083f619..4cab903 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteNameSpaceOp.java
@@ -48,17 +48,16 @@
 
 /**
  * CIMDeleteNameSpaceOp
- * 
+ *
  */
 public class CIMDeleteNameSpaceOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNamespace
 	 */
 	public CIMDeleteNameSpaceOp(String pNamespace) {
 		this.iNameSpace = pNamespace;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java
index 936bd83..87851d0 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMDeleteQualifierTypeOp.java
@@ -48,13 +48,13 @@
 
 /**
  * CIMDeleteQualifierTypeOp
- * 
+ *
  */
 public class CIMDeleteQualifierTypeOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 */
 	public CIMDeleteQualifierTypeOp(CIMObjectPath pObjectName) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java
index bd666a9..59ee6d9 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassNamesOp.java
@@ -48,15 +48,14 @@
 
 /**
  * CIMEnumClassNamesOp
- * 
+ *
  */
 public class CIMEnumClassNamesOp extends CIMOperation {
-
 	protected boolean iDeep;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param objectName
 	 * @param deep
 	 */
@@ -68,11 +67,10 @@ public CIMEnumClassNamesOp(CIMObjectPath objectName, boolean deep) {
 
 	/**
 	 * Returns deep
-	 * 
+	 *
 	 * @return The value of deep
 	 */
 	public boolean isDeep() {
 		return this.iDeep;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java
index 1f4a83f..e5ff842 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumClassesOp.java
@@ -48,10 +48,9 @@
 
 /**
  * CIMEnumClassesOp
- * 
+ *
  */
 public class CIMEnumClassesOp extends CIMOperation {
-
 	protected boolean iDeep;
 
 	protected boolean iLocalOnly;
@@ -62,15 +61,20 @@ public class CIMEnumClassesOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pDeep
 	 * @param pLocalOnly
 	 * @param pIncludeQualifiers
 	 * @param pIncludeClassOrigin
 	 */
-	public CIMEnumClassesOp(CIMObjectPath pObjectName, boolean pDeep, boolean pLocalOnly,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin) {
+	public CIMEnumClassesOp(
+		CIMObjectPath pObjectName,
+		boolean pDeep,
+		boolean pLocalOnly,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin
+	) {
 		this.iMethodCall = "EnumerateClasses";
 		this.iObjectName = pObjectName;
 		this.iDeep = pDeep;
@@ -81,7 +85,7 @@ public CIMEnumClassesOp(CIMObjectPath pObjectName, boolean pDeep, boolean pLocal
 
 	/**
 	 * Returns if deep is set
-	 * 
+	 *
 	 * @return The value of deep
 	 */
 	public boolean isDeep() {
@@ -90,7 +94,7 @@ public boolean isDeep() {
 
 	/**
 	 * Returns if includeClassOrigin is set
-	 * 
+	 *
 	 * @return The value of includeClassOrigin
 	 */
 	public boolean isIncludeClassOrigin() {
@@ -99,7 +103,7 @@ public boolean isIncludeClassOrigin() {
 
 	/**
 	 * Returns if includeQualifiers is set
-	 * 
+	 *
 	 * @return The value of includeQualifiers
 	 */
 	public boolean isIncludeQualifiers() {
@@ -108,11 +112,10 @@ public boolean isIncludeQualifiers() {
 
 	/**
 	 * Returns if localOnly is set
-	 * 
+	 *
 	 * @return The value of localOnly
 	 */
 	public boolean isLocalOnly() {
 		return this.iLocalOnly;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java
index 272ca83..6cb4c32 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstanceNamesOp.java
@@ -48,13 +48,13 @@
 
 /**
  * CIMEnumInstanceNamesOp
- * 
+ *
  */
 public class CIMEnumInstanceNamesOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param objectName
 	 */
 	public CIMEnumInstanceNamesOp(CIMObjectPath objectName) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java
index 883015a..69a8e51 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumInstancesOp.java
@@ -48,10 +48,9 @@
 
 /**
  * CIMEnumInstancesOp
- * 
+ *
  */
 public class CIMEnumInstancesOp extends CIMOperation {
-
 	protected boolean iDeep;
 
 	protected boolean iLocalOnly;
@@ -64,7 +63,7 @@ public class CIMEnumInstancesOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param objectName
 	 * @param deep
 	 * @param localOnly
@@ -72,8 +71,14 @@ public class CIMEnumInstancesOp extends CIMOperation {
 	 * @param includeClassOrigin
 	 * @param propertyList
 	 */
-	public CIMEnumInstancesOp(CIMObjectPath objectName, boolean deep, boolean localOnly,
-			boolean includeQualifiers, boolean includeClassOrigin, String[] propertyList) {
+	public CIMEnumInstancesOp(
+		CIMObjectPath objectName,
+		boolean deep,
+		boolean localOnly,
+		boolean includeQualifiers,
+		boolean includeClassOrigin,
+		String[] propertyList
+	) {
 		this.iMethodCall = "EnumerateInstances";
 		this.iObjectName = objectName;
 		this.iDeep = deep;
@@ -85,7 +90,7 @@ public CIMEnumInstancesOp(CIMObjectPath objectName, boolean deep, boolean localO
 
 	/**
 	 * Returns deep
-	 * 
+	 *
 	 * @return The value of deep.
 	 */
 	public boolean isDeep() {
@@ -94,7 +99,7 @@ public boolean isDeep() {
 
 	/**
 	 * Returns includeClassOrigin
-	 * 
+	 *
 	 * @return The value of includeClassOrigin.
 	 */
 	public boolean isIncludeClassOrigin() {
@@ -103,7 +108,7 @@ public boolean isIncludeClassOrigin() {
 
 	/**
 	 * Returns includeQualifiers
-	 * 
+	 *
 	 * @return The value of includeQualifiers.
 	 */
 	public boolean isIncludeQualifiers() {
@@ -112,7 +117,7 @@ public boolean isIncludeQualifiers() {
 
 	/**
 	 * Returns localOnly
-	 * 
+	 *
 	 * @return The value of localOnly.
 	 */
 	public boolean isLocalOnly() {
@@ -121,11 +126,10 @@ public boolean isLocalOnly() {
 
 	/**
 	 * Returns propertyList
-	 * 
+	 *
 	 * @return The value of propertyList.
 	 */
 	public String[] getPropertyList() {
 		return this.iPropertyList;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java
index aec5631..8796148 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumNameSpaceOp.java
@@ -47,13 +47,13 @@
 
 /**
  * CIMEnumNameSpaceOp
- * 
+ *
  */
 public class CIMEnumNameSpaceOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pNamespace
 	 */
 	public CIMEnumNameSpaceOp(String pNamespace) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java
index adadda4..5f16d6b 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMEnumQualifierTypesOp.java
@@ -48,13 +48,13 @@
 
 /**
  * CIMEnumQualifierTypesOp
- * 
+ *
  */
 public class CIMEnumQualifierTypesOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 */
 	public CIMEnumQualifierTypesOp(CIMObjectPath pObjectName) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java
index 126446d..470de49 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMExecQueryOp.java
@@ -48,17 +48,16 @@
 
 /**
  * CIMExecQueryOp
- * 
+ *
  */
 public class CIMExecQueryOp extends CIMOperation {
-
 	protected String iQuery;
 
 	protected String iQueryLanguage;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param objectName
 	 * @param query
 	 * @param queryLanguage
@@ -72,7 +71,7 @@ public CIMExecQueryOp(CIMObjectPath objectName, String query, String queryLangua
 
 	/**
 	 * Returns query
-	 * 
+	 *
 	 * @return The value of query.
 	 */
 	public String getQuery() {
@@ -81,11 +80,10 @@ public String getQuery() {
 
 	/**
 	 * Returns queryLanguage
-	 * 
+	 *
 	 * @return The value of queryLanguage.
 	 */
 	public String getQueryLanguage() {
 		return this.iQueryLanguage;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java
index bcd3dcf..b742f80 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java
@@ -49,10 +49,9 @@
 
 /**
  * CIMGetClassOp
- * 
+ *
  */
 public class CIMGetClassOp extends CIMSingleResultOperation {
-
 	protected boolean iLocalOnly;
 
 	protected boolean iIncludeQualifiers;
@@ -63,16 +62,20 @@ public class CIMGetClassOp extends CIMSingleResultOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pLocalOnly
 	 * @param pIncludeQualifiers
 	 * @param pIncludeClassOrigin
 	 * @param pPropertyList
 	 */
-	public CIMGetClassOp(CIMObjectPath pObjectName, boolean pLocalOnly, boolean pIncludeQualifiers,
-			boolean pIncludeClassOrigin, String[] pPropertyList) {
-
+	public CIMGetClassOp(
+		CIMObjectPath pObjectName,
+		boolean pLocalOnly,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	) {
 		this.iMethodCall = "GetClass";
 		this.iObjectName = pObjectName;
 		this.iLocalOnly = pLocalOnly;
@@ -82,7 +85,7 @@ public CIMGetClassOp(CIMObjectPath pObjectName, boolean pLocalOnly, boolean pInc
 
 	/**
 	 * Returns includeClassOrigin
-	 * 
+	 *
 	 * @return The value of includeClassOrigin.
 	 */
 	public boolean isIncludeClassOrigin() {
@@ -91,7 +94,7 @@ public boolean isIncludeClassOrigin() {
 
 	/**
 	 * Returns includeQualifiers
-	 * 
+	 *
 	 * @return The value of includeQualifiers.
 	 */
 	public boolean isIncludeQualifiers() {
@@ -100,7 +103,7 @@ public boolean isIncludeQualifiers() {
 
 	/**
 	 * Returns localOnly
-	 * 
+	 *
 	 * @return The value of localOnly.
 	 */
 	public boolean isLocalOnly() {
@@ -109,11 +112,10 @@ public boolean isLocalOnly() {
 
 	/**
 	 * Returns propertyList
-	 * 
+	 *
 	 * @return The value of propertyList.
 	 */
 	public String[] getPropertyList() {
 		return this.iPropertyList;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java
index f65275f..6477215 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetInstanceOp.java
@@ -48,10 +48,9 @@
 
 /**
  * CIMGetInstanceOp
- * 
+ *
  */
 public class CIMGetInstanceOp extends CIMSingleResultOperation {
-
 	protected boolean iLocalOnly;
 
 	protected boolean iIncludeQualifiers;
@@ -62,16 +61,20 @@ public class CIMGetInstanceOp extends CIMSingleResultOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pLocalOnly
 	 * @param pIncludeQualifiers
 	 * @param pIncludeClassOrigin
 	 * @param pPropertyList
 	 */
-	public CIMGetInstanceOp(CIMObjectPath pObjectName, boolean pLocalOnly,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList) {
-
+	public CIMGetInstanceOp(
+		CIMObjectPath pObjectName,
+		boolean pLocalOnly,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	) {
 		this.iMethodCall = "GetInstance";
 		this.iObjectName = pObjectName;
 		this.iLocalOnly = pLocalOnly;
@@ -82,7 +85,7 @@ public CIMGetInstanceOp(CIMObjectPath pObjectName, boolean pLocalOnly,
 
 	/**
 	 * Returns includeClassOrigin
-	 * 
+	 *
 	 * @return The value of includeClassOrigin.
 	 */
 	public boolean isIncludeClassOrigin() {
@@ -91,7 +94,7 @@ public boolean isIncludeClassOrigin() {
 
 	/**
 	 * Returns includeQualifiers
-	 * 
+	 *
 	 * @return The value of includeQualifiers.
 	 */
 	public boolean isIncludeQualifiers() {
@@ -100,7 +103,7 @@ public boolean isIncludeQualifiers() {
 
 	/**
 	 * Returns localOnly
-	 * 
+	 *
 	 * @return The value of localOnly.
 	 */
 	public boolean isLocalOnly() {
@@ -109,7 +112,7 @@ public boolean isLocalOnly() {
 
 	/**
 	 * Returns propertyList
-	 * 
+	 *
 	 * @return The value of propertyList.
 	 */
 	public String[] getPropertyList() {
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java
index 929594f..5c61f4a 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetPropertyOp.java
@@ -48,15 +48,14 @@
 
 /**
  * CIMGetPropertyOp
- * 
+ *
  */
 public class CIMGetPropertyOp extends CIMSingleResultOperation {
-
 	protected String iPropertyName;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pPropertyName
 	 */
@@ -68,11 +67,10 @@ public CIMGetPropertyOp(CIMObjectPath pObjectName, String pPropertyName) {
 
 	/**
 	 * Returns propertyName
-	 * 
+	 *
 	 * @return The value of propertyName.
 	 */
 	public String getPropertyName() {
 		return this.iPropertyName;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java
index b4176d9..e4709e1 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMGetQualifierTypeOp.java
@@ -48,15 +48,14 @@
 
 /**
  * CIMGetQualifierTypeOp
- * 
+ *
  */
 public class CIMGetQualifierTypeOp extends CIMSingleResultOperation {
-
 	protected String iQualifierType;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pQualifierType
 	 */
@@ -68,11 +67,10 @@ public CIMGetQualifierTypeOp(CIMObjectPath pObjectName, String pQualifierType) {
 
 	/**
 	 * Returns qualifierType
-	 * 
+	 *
 	 * @return The value of qualifierType.
 	 */
 	public String getQualifierType() {
 		return this.iQualifierType;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java
index ac5f8d0..305d754 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMInvokeMethodOp.java
@@ -50,10 +50,9 @@
 
 /**
  * CIMInvokeMethodOp
- * 
+ *
  */
 public class CIMInvokeMethodOp extends CIMOperation {
-
 	protected String iMethodName;
 
 	protected CIMArgument[] iInParams;
@@ -62,14 +61,18 @@ public class CIMInvokeMethodOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pMethodName
 	 * @param pInParams
 	 * @param pOutParams
 	 */
-	public CIMInvokeMethodOp(CIMObjectPath pObjectName, String pMethodName,
-			CIMArgument[] pInParams, CIMArgument[] pOutParams) {
+	public CIMInvokeMethodOp(
+		CIMObjectPath pObjectName,
+		String pMethodName,
+		CIMArgument[] pInParams,
+		CIMArgument[] pOutParams
+	) {
 		this.iMethodCall = "InvokeMethod";
 		this.iObjectName = pObjectName;
 		this.iMethodName = pMethodName;
@@ -79,7 +82,7 @@ public CIMInvokeMethodOp(CIMObjectPath pObjectName, String pMethodName,
 
 	/**
 	 * Returns inParameters
-	 * 
+	 *
 	 * @return The value of inParameters.
 	 */
 	public CIMArgument[] getInParams() {
@@ -88,7 +91,7 @@ public CIMArgument[] getInParams() {
 
 	/**
 	 * Returns methodName
-	 * 
+	 *
 	 * @return The value of methodName.
 	 */
 	public String getMethodName() {
@@ -97,11 +100,10 @@ public String getMethodName() {
 
 	/**
 	 * Returns outParameters
-	 * 
+	 *
 	 * @return The value of outParameters.
 	 */
 	public CIMArgument[] getOutParams() {
 		return this.iOutParams;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java
index b119a50..f868515 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMOperation.java
@@ -49,10 +49,9 @@
 
 /**
  * CIMOperation
- * 
+ *
  */
 public abstract class CIMOperation {
-
 	protected CIMObjectPath iObjectName;
 
 	protected String iNameSpace;
@@ -63,7 +62,7 @@ public abstract class CIMOperation {
 
 	/**
 	 * Returns the object name
-	 * 
+	 *
 	 * @return The object name
 	 */
 	public CIMObjectPath getObjectName() {
@@ -72,7 +71,7 @@ public CIMObjectPath getObjectName() {
 
 	/**
 	 * Returns the namespace
-	 * 
+	 *
 	 * @return The namespace
 	 */
 	public String getNameSpace() {
@@ -81,7 +80,7 @@ public String getNameSpace() {
 
 	/**
 	 * Sets the namespace
-	 * 
+	 *
 	 * @param pNamespace
 	 *            The namespace
 	 */
@@ -91,7 +90,7 @@ public void setNameSpace(String pNamespace) {
 
 	/**
 	 * Returns the method call
-	 * 
+	 *
 	 * @return The method call
 	 */
 	public String getMethodCall() {
@@ -100,7 +99,7 @@ public String getMethodCall() {
 
 	/**
 	 * Returns if an (uncaught) exception occurred
-	 * 
+	 *
 	 * @return true if an (uncaught) exception occurred,
 	 *         false otherwise
 	 */
@@ -110,7 +109,7 @@ public boolean isException() {
 
 	/**
 	 * Returns the result of the operation
-	 * 
+	 *
 	 * @return The result
 	 * @throws WBEMException
 	 */
@@ -121,7 +120,7 @@ public Object getResult() throws WBEMException {
 
 	/**
 	 * Sets the operation result
-	 * 
+	 *
 	 * @param pResult
 	 *            The result
 	 */
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java
index a00bda6..7db3498 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferenceNamesOp.java
@@ -48,17 +48,16 @@
 
 /**
  * CIMReferenceNamesOp
- * 
+ *
  */
 public class CIMReferenceNamesOp extends CIMOperation {
-
 	protected String iResultClass;
 
 	protected String iResultRole;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pResultClass
 	 * @param pRole
@@ -72,7 +71,7 @@ public CIMReferenceNamesOp(CIMObjectPath pObjectName, String pResultClass, Strin
 
 	/**
 	 * Returns resultClass
-	 * 
+	 *
 	 * @return The value of resultClass.
 	 */
 	public String getResultClass() {
@@ -81,11 +80,10 @@ public String getResultClass() {
 
 	/**
 	 * Returns resultRole
-	 * 
+	 *
 	 * @return The value of resultRole.
 	 */
 	public String getResultRole() {
 		return this.iResultRole;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java
index 89f4fd5..90af1f9 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMReferencesOp.java
@@ -48,10 +48,9 @@
 
 /**
  * CIMReferencesOp
- * 
+ *
  */
 public class CIMReferencesOp extends CIMOperation {
-
 	protected String iResultClass;
 
 	protected String iRole;
@@ -64,7 +63,7 @@ public class CIMReferencesOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pObjectName
 	 * @param pResultClass
 	 * @param pRole
@@ -72,8 +71,14 @@ public class CIMReferencesOp extends CIMOperation {
 	 * @param pIncludeClassOrigin
 	 * @param pPropertyList
 	 */
-	public CIMReferencesOp(CIMObjectPath pObjectName, String pResultClass, String pRole,
-			boolean pIncludeQualifiers, boolean pIncludeClassOrigin, String[] pPropertyList) {
+	public CIMReferencesOp(
+		CIMObjectPath pObjectName,
+		String pResultClass,
+		String pRole,
+		boolean pIncludeQualifiers,
+		boolean pIncludeClassOrigin,
+		String[] pPropertyList
+	) {
 		this.iMethodCall = "References";
 		this.iObjectName = pObjectName;
 		this.iResultClass = pResultClass;
@@ -84,7 +89,7 @@ public CIMReferencesOp(CIMObjectPath pObjectName, String pResultClass, String pR
 
 	/**
 	 * Returns includeClassOrigin
-	 * 
+	 *
 	 * @return The value of includeClassOrigin.
 	 */
 	public boolean isIncludeClassOrigin() {
@@ -93,7 +98,7 @@ public boolean isIncludeClassOrigin() {
 
 	/**
 	 * Returns includeQualifiers
-	 * 
+	 *
 	 * @return The value of includeQualifiers.
 	 */
 	public boolean isIncludeQualifiers() {
@@ -102,7 +107,7 @@ public boolean isIncludeQualifiers() {
 
 	/**
 	 * Returns propertyList
-	 * 
+	 *
 	 * @return The value of propertyList.
 	 */
 	public String[] getPropertyList() {
@@ -111,7 +116,7 @@ public String[] getPropertyList() {
 
 	/**
 	 * Returns resultClass
-	 * 
+	 *
 	 * @return The value of resultClass.
 	 */
 	public String getResultClass() {
@@ -120,11 +125,10 @@ public String getResultClass() {
 
 	/**
 	 * Returns role
-	 * 
+	 *
 	 * @return The value of role.
 	 */
 	public String getRole() {
 		return this.iRole;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java
index 2f00ca6..ecc16a1 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetClassOp.java
@@ -49,15 +49,14 @@
 
 /**
  * CIMSetClassOp
- * 
+ *
  */
 public class CIMSetClassOp extends CIMOperation {
-
 	protected CIMClass iCimClass;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param objectName
 	 * @param cimClass
 	 */
@@ -69,11 +68,10 @@ public CIMSetClassOp(CIMObjectPath objectName, CIMClass cimClass) {
 
 	/**
 	 * Returns cimClass
-	 * 
+	 *
 	 * @return The value of cimClass.
 	 */
 	public CIMClass getCimClass() {
 		return this.iCimClass;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java
index 8e6adf5..160f299 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetInstanceOp.java
@@ -49,10 +49,9 @@
 
 /**
  * CIMSetInstanceOp
- * 
+ *
  */
 public class CIMSetInstanceOp extends CIMOperation {
-
 	protected CIMInstance iInstance;
 
 	protected boolean iIncludeQualifiers;
@@ -61,14 +60,18 @@ public class CIMSetInstanceOp extends CIMOperation {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param objectName
 	 * @param instance
 	 * @param includeQualifiers
 	 * @param propertyList
 	 */
-	public CIMSetInstanceOp(CIMObjectPath objectName, CIMInstance instance,
-			boolean includeQualifiers, String[] propertyList) {
+	public CIMSetInstanceOp(
+		CIMObjectPath objectName,
+		CIMInstance instance,
+		boolean includeQualifiers,
+		String[] propertyList
+	) {
 		this.iMethodCall = "SetInstance";
 		this.iObjectName = objectName;
 		this.iInstance = instance;
@@ -78,7 +81,7 @@ public CIMSetInstanceOp(CIMObjectPath objectName, CIMInstance instance,
 
 	/**
 	 * Returns includeQualifiers
-	 * 
+	 *
 	 * @return The value of includeQualifiers.
 	 */
 	public boolean isIncludeQualifiers() {
@@ -87,7 +90,7 @@ public boolean isIncludeQualifiers() {
 
 	/**
 	 * Returns instance
-	 * 
+	 *
 	 * @return The value of instance.
 	 */
 	public CIMInstance getInstance() {
@@ -96,11 +99,10 @@ public CIMInstance getInstance() {
 
 	/**
 	 * Returns propertyList
-	 * 
+	 *
 	 * @return The value of propertyList.
 	 */
 	public String[] getPropertyList() {
 		return this.iPropertyList;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java
index 0d329dd..eebfeb4 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetPropertyOp.java
@@ -48,17 +48,16 @@
 
 /**
  * CIMSetPropertyOp
- * 
+ *
  */
 public class CIMSetPropertyOp extends CIMOperation {
-
 	protected String iPropertyName;
 
 	protected Object iCimValue;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param objectName
 	 * @param propertyName
 	 * @param cimValue
@@ -72,7 +71,7 @@ public CIMSetPropertyOp(CIMObjectPath objectName, String propertyName, Object ci
 
 	/**
 	 * Returns cimValue
-	 * 
+	 *
 	 * @return The value of cimValue.
 	 */
 	public Object getCimValue() {
@@ -81,11 +80,10 @@ public Object getCimValue() {
 
 	/**
 	 * Returns propertyName
-	 * 
+	 *
 	 * @return The value of propertyName.
 	 */
 	public String getPropertyName() {
 		return this.iPropertyName;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java
index 9bbb945..2e8a77f 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSetQualifierTypeOp.java
@@ -50,15 +50,14 @@
 
 /**
  * CIMSetQualifierTypeOp
- * 
+ *
  */
 public class CIMSetQualifierTypeOp extends CIMOperation {
-
 	protected CIMQualifierType iQualifierType;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param objectName
 	 * @param qualifierType
 	 */
@@ -70,11 +69,10 @@ public CIMSetQualifierTypeOp(CIMObjectPath objectName, CIMQualifierType quali
 
 	/**
 	 * Returns qualifierType
-	 * 
+	 *
 	 * @return The value of qualifierType.
 	 */
 	public CIMQualifierType getQualifierType() {
 		return this.iQualifierType;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java
index eae45e8..7721d52 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/wbem/operations/CIMSingleResultOperation.java
@@ -46,25 +46,25 @@
  */
 
 import java.util.Vector;
-
 import org.metricshub.wbem.javax.wbem.WBEMException;
 
 /**
  * CIMSingleResultOperation
- * 
+ *
  */
-abstract public class CIMSingleResultOperation extends CIMOperation {
+public abstract class CIMSingleResultOperation extends CIMOperation {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.sblim.wbem.client.operations.CIMOperation#getResult()
 	 */
 	@Override
 	public Object getResult() throws WBEMException {
 		if (this.iResult instanceof Exception) throw (WBEMException) this.iResult;
-		if (this.iResult instanceof Vector && ((Vector) this.iResult).size() > 0) return ((Vector) this.iResult)
-				.elementAt(0);
+		if (this.iResult instanceof Vector && ((Vector) this.iResult).size() > 0) return (
+			(Vector) this.iResult
+		).elementAt(0);
 		return null;
 	}
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/Advertiser.java b/src/main/java/org/metricshub/wbem/sblim/slp/Advertiser.java
index 2ed1dd1..1c2cd11 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/Advertiser.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/Advertiser.java
@@ -56,10 +56,9 @@
  * created, deregistrations of service instances are made for all locales.
  */
 public interface Advertiser {
-
 	/**
 	 * Return the language locale with which this object was created.
-	 * 
+	 *
 	 * @return The locale
 	 */
 	public abstract Locale getLocale();
@@ -68,7 +67,7 @@ public interface Advertiser {
 	 * Register a new service with SLP having the given attributes. The API
 	 * library is required to perform the operation in all scopes obtained
 	 * through configuration.
-	 * 
+	 *
 	 * @param pURL
 	 *            The URL for the service.
 	 * @param pAttributes
@@ -77,14 +76,14 @@ public interface Advertiser {
 	 * @throws ServiceLocationException
 	 */
 	public abstract void register(ServiceURL pURL, Vector pAttributes)
-			throws ServiceLocationException;
+		throws ServiceLocationException;
 
 	/**
 	 * Deregister a service from the SLP framework. This has the effect of
 	 * deregistering the service from every language locale. The API library is
 	 * required to perform the operation in all scopes obtained through
 	 * configuration.
-	 * 
+	 *
 	 * @param pURL
 	 *            The URL for the service.
 	 * @throws ServiceLocationException
@@ -95,7 +94,7 @@ public abstract void register(ServiceURL pURL, Vector
 	 * Update the registration by adding the given attributes. The API library
 	 * is required to perform the operation in all scopes obtained through
 	 * configuration.
-	 * 
+	 *
 	 * @param pURL
 	 *            The URL for the service.
 	 * @param pAttributes
@@ -105,13 +104,13 @@ public abstract void register(ServiceURL pURL, Vector
 	 * @throws ServiceLocationException
 	 */
 	public abstract void addAttributes(ServiceURL pURL, Vector pAttributes)
-			throws ServiceLocationException;
+		throws ServiceLocationException;
 
 	/**
 	 * Delete the attributes from a URL for the locale with which the Advertiser
 	 * was created. The API library is required to perform the operation in all
 	 * scopes obtained through configuration.
-	 * 
+	 *
 	 * @param pURL
 	 *            The URL for the service.
 	 * @param pAttributeIds
@@ -123,6 +122,5 @@ public abstract void addAttributes(ServiceURL pURL, Vector pAttributeIds)
-			throws ServiceLocationException;
+	public abstract void deleteAttributes(ServiceURL pURL, Vector pAttributeIds) throws ServiceLocationException;
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/Locator.java b/src/main/java/org/metricshub/wbem/sblim/slp/Locator.java
index 3babc9a..8d8652d 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/Locator.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/Locator.java
@@ -57,10 +57,9 @@
  * for service types are independent of locale.
  */
 public interface Locator {
-
 	/**
 	 * Return the language locale with which this object was created.
-	 * 
+	 *
 	 * @return The locale
 	 */
 	public abstract Locale getLocale();
@@ -69,7 +68,7 @@ public interface Locator {
 	 * Returns an enumeration of ServiceType objects giving known service types
 	 * for the given scopes and given naming authority. If no service types are
 	 * found, an empty enumeration is returned.
-	 * 
+	 *
 	 * @param pNamingAuthority
 	 *            The naming authority. Use "" for the default naming authority
 	 *            and "*" for all naming authorities.
@@ -80,8 +79,8 @@ public interface Locator {
 	 * @return The enumeration
 	 * @throws ServiceLocationException
 	 */
-	public abstract ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
-			Vector pScopes) throws ServiceLocationException;
+	public abstract ServiceLocationEnumeration findServiceTypes(String pNamingAuthority, Vector pScopes)
+		throws ServiceLocationException;
 
 	/**
 	 * Returns an enumeration of ServiceType objects giving known service types
@@ -89,7 +88,7 @@ public abstract ServiceLocationEnumeration findServiceTypes(String pNamingAuthor
 	 * found, an empty enumeration is returned. 
      
 	 * 
      
 	 * This method is not part of the RFC 2614 interface definition.
-	 * 
+	 *
 	 * @param pNamingAuthority
 	 *            The naming authority. Use "" for the default naming authority
 	 *            and "*" for all naming authorities.
@@ -100,19 +99,22 @@ public abstract ServiceLocationEnumeration findServiceTypes(String pNamingAuthor
 	 * @param pDirectoryAgent
 	 *            A vector of InetAddress that specify the directory agents to
 	 *            look for.
-	 * 
+	 *
 	 * @return The enumeration
 	 * @throws ServiceLocationException
 	 */
-	public abstract ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
-			Vector pScopes, Vector pDirectoryAgent)
-			throws ServiceLocationException;
+	public abstract ServiceLocationEnumeration findServiceTypes(
+		String pNamingAuthority,
+		Vector pScopes,
+		Vector pDirectoryAgent
+	)
+		throws ServiceLocationException;
 
 	/**
 	 * Returns a vector of ServiceURL objects for services matching the query,
 	 * and having a matching type in the given scopes. If no services are found,
 	 * an empty enumeration is returned.
-	 * 
+	 *
 	 * @param pType
 	 *            The SLP service type of the service.
 	 * @param pScopes
@@ -125,12 +127,16 @@ public abstract ServiceLocationEnumeration findServiceTypes(String pNamingAuthor
 	 *            scopes are returned. SLP reserved characters must be escaped
 	 *            in the query. Use ServiceLocationAttribute.escapeId() and
 	 *            ServiceLocationAttribute.escapeValue() to construct the query.
-	 * 
+	 *
 	 * @return The enumeration
 	 * @throws ServiceLocationException
 	 */
-	public abstract ServiceLocationEnumeration findServices(ServiceType pType,
-			Vector pScopes, String pSearchFilter) throws ServiceLocationException;
+	public abstract ServiceLocationEnumeration findServices(
+		ServiceType pType,
+		Vector pScopes,
+		String pSearchFilter
+	)
+		throws ServiceLocationException;
 
 	/**
 	 * Returns a vector of ServiceURL objects for services matching the query,
@@ -138,7 +144,7 @@ public abstract ServiceLocationEnumeration findServices(ServiceType pType,
 	 * an empty enumeration is returned. 
      
 	 * 
      
 	 * This method is not part of the RFC 2614 interface definition.
-	 * 
+	 *
 	 * @param pType
 	 *            The SLP service type of the service.
 	 * @param pScopes
@@ -154,20 +160,24 @@ public abstract ServiceLocationEnumeration findServices(ServiceType pType,
 	 * @param pDirectoryAgents
 	 *            A vector of InetAddress that specify the directory agents to
 	 *            look for.
-	 * 
+	 *
 	 * @return The enumeration
 	 * @throws ServiceLocationException
 	 */
-	public abstract ServiceLocationEnumeration findServices(ServiceType pType,
-			Vector pScopes, String pSearchFilter, Vector pDirectoryAgents)
-			throws ServiceLocationException;
+	public abstract ServiceLocationEnumeration findServices(
+		ServiceType pType,
+		Vector pScopes,
+		String pSearchFilter,
+		Vector pDirectoryAgents
+	)
+		throws ServiceLocationException;
 
 	/**
 	 * For the URL and scope, return a Vector of ServiceLocationAttribute
 	 * objects whose ids match the String patterns in the attributeIds Vector.
 	 * The request is made in the language locale of the Locator. If no
 	 * attributes match, an empty enumeration is returned.
-	 * 
+	 *
 	 * @param URL
 	 *            The URL for which the attributes are desired.
 	 * @param scopes
@@ -183,8 +193,12 @@ public abstract ServiceLocationEnumeration findServices(ServiceType pType,
 	 * @return The enumeration
 	 * @throws ServiceLocationException
 	 */
-	public abstract ServiceLocationEnumeration findAttributes(ServiceURL URL,
-			Vector scopes, Vector attributeIds) throws ServiceLocationException;
+	public abstract ServiceLocationEnumeration findAttributes(
+		ServiceURL URL,
+		Vector scopes,
+		Vector attributeIds
+	)
+		throws ServiceLocationException;
 
 	/**
 	 * For the URL and scope, return a Vector of ServiceLocationAttribute
@@ -193,7 +207,7 @@ public abstract ServiceLocationEnumeration findAttributes(ServiceURL URL,
 	 * attributes match, an empty enumeration is returned. 
      
 	 * 
      
 	 * This method is not part of the RFC 2614 interface definition.
-	 * 
+	 *
 	 * @param pURL
 	 *            The URL for which the attributes are desired.
 	 * @param pScopes
@@ -211,18 +225,22 @@ public abstract ServiceLocationEnumeration findAttributes(ServiceURL URL,
 	 *            look for.
 	 * @return The enumeration
 	 * @throws ServiceLocationException
-	 * 
+	 *
 	 */
-	public abstract ServiceLocationEnumeration findAttributes(ServiceURL pURL,
-			Vector pScopes, Vector pAttributeIds,
-			Vector pDirectoryAgents) throws ServiceLocationException;
+	public abstract ServiceLocationEnumeration findAttributes(
+		ServiceURL pURL,
+		Vector pScopes,
+		Vector pAttributeIds,
+		Vector pDirectoryAgents
+	)
+		throws ServiceLocationException;
 
 	/**
 	 * For the type and scope, return a Vector of all ServiceLocationAttribute
 	 * objects whose ids match the String patterns in the attributeIds Vector
 	 * regardless of the Locator's locale. The request is made independent of
 	 * language locale. If no attributes are found, an empty vector is returned.
-	 * 
+	 *
 	 * @param pType
 	 *            The service type.
 	 * @param pScopes
@@ -239,8 +257,12 @@ public abstract ServiceLocationEnumeration findAttributes(ServiceURL pURL,
 	 * @return The enumeration
 	 * @throws ServiceLocationException
 	 */
-	public abstract ServiceLocationEnumeration findAttributes(ServiceType pType,
-			Vector pScopes, Vector pAttributeIds) throws ServiceLocationException;
+	public abstract ServiceLocationEnumeration findAttributes(
+		ServiceType pType,
+		Vector pScopes,
+		Vector pAttributeIds
+	)
+		throws ServiceLocationException;
 
 	/**
 	 * For the type and scope, return a Vector of all ServiceLocationAttribute
@@ -249,7 +271,7 @@ public abstract ServiceLocationEnumeration findAttributes(ServiceType pType,
 	 * language locale. If no attributes are found, an empty vector is returned. 
      
 	 * 
      
 	 * This method is not part of the RFC 2614 interface definition.
-	 * 
+	 *
 	 * @param pType
 	 *            The service type.
 	 * @param pScopes
@@ -269,8 +291,11 @@ public abstract ServiceLocationEnumeration findAttributes(ServiceType pType,
 	 * @return The enumeration
 	 * @throws ServiceLocationException
 	 */
-	public abstract ServiceLocationEnumeration findAttributes(ServiceType pType,
-			Vector pScopes, Vector pAttributeIds,
-			Vector pDirectoryAgents) throws ServiceLocationException;
-
+	public abstract ServiceLocationEnumeration findAttributes(
+		ServiceType pType,
+		Vector pScopes,
+		Vector pAttributeIds,
+		Vector pDirectoryAgents
+	)
+		throws ServiceLocationException;
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/SLPConfigProperties.java b/src/main/java/org/metricshub/wbem/sblim/slp/SLPConfigProperties.java
index ef7c238..7f2f57f 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/SLPConfigProperties.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/SLPConfigProperties.java
@@ -50,10 +50,9 @@
  * configuration properties of the SLP package. To set a property call
  * System.setProperty(name, value). Note that these properties have
  * global VM scope.
- * 
+ *
  */
 public interface SLPConfigProperties {
-
 	/**
 	 * A URL string giving the location of the SLP config file. 
      
 	 * 
      
@@ -358,7 +357,7 @@ public interface SLPConfigProperties {
 	 * Default is 10.
      
 	 * 
      
 	 * SBLIM specific extension to RFC 2614
-	 * 
+	 *
 	 */
 	public static final String NET_SLP_SERVER_SOCKET_QUEUE_LENGTH = "net.slp.serverSocketQueueLength";
 
@@ -368,7 +367,7 @@ public interface SLPConfigProperties {
 	 * The default is 20000 ms. 
      
 	 * 
      
 	 * SBLIM specific extension to RFC 2614
-	 * 
+	 *
 	 */
 	public static final String NET_SLP_TCPTIMEOUT = "net.slp.TCPTimeout";
 
@@ -423,7 +422,7 @@ public interface SLPConfigProperties {
 	 * 
      
 	 * (|(service-type=service:imap)(service-type=service:pop3))
      
 	 * 
      
-	 * 
+	 *
 	 * The API library can also use unicast to contact the discovered SAs for
 	 * subsequent requests for these service types, to optimize network access.
      
 	 * 
      
@@ -455,5 +454,4 @@ public interface SLPConfigProperties {
 	 * Not evaluated by SBLIM SLP client
 	 */
 	public static final String NET_SLP_TRC_LEVEL = "net.slp.trc.level";
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttribute.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttribute.java
index 4fcb435..1b531d2 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttribute.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttribute.java
@@ -58,18 +58,15 @@
 import java.util.Arrays;
 import java.util.StringTokenizer;
 import java.util.Vector;
-
 import org.metricshub.wbem.sblim.cimclient.GenericExts;
 import org.metricshub.wbem.sblim.slp.internal.AttributeHandler;
 import org.metricshub.wbem.sblim.slp.internal.Convert;
 import org.metricshub.wbem.sblim.slp.internal.SLPString;
 
-
 /**
  * Service location attribute
  */
 public class ServiceLocationAttribute implements Serializable {
-
 	private static final long serialVersionUID = -6753246108754657715L;
 
 	private Vector iValues;
@@ -79,7 +76,7 @@ public class ServiceLocationAttribute implements Serializable {
 	/**
 	 * Construct a service location attribute. Errors in the id or values vector
 	 * result in an IllegalArgumentException.
-	 * 
+	 *
 	 * @param pId
 	 *            The attribute name. The String can consist of any Unicode
 	 *            character.
@@ -99,7 +96,7 @@ public ServiceLocationAttribute(String pId, Vector pValues) {
 
 	/**
 	 * Construct a service location attribute from a String.
-	 * 
+	 *
 	 * @param pString
 	 *            The string to parse
 	 * @throws ServiceLocationException
@@ -107,25 +104,28 @@ public ServiceLocationAttribute(String pId, Vector pValues) {
 	 */
 	public ServiceLocationAttribute(String pString) throws ServiceLocationException {
 		if (pString == null || pString.length() == 0) throw new ServiceLocationException(
-				ServiceLocationException.PARSE_ERROR,
-				"Empty or null String is not good for this constructor!");
+			ServiceLocationException.PARSE_ERROR,
+			"Empty or null String is not good for this constructor!"
+		);
 
 		if (pString.startsWith("(") && pString.endsWith(")")) {
 			int equalPos = pString.indexOf('=');
 			if (equalPos < 0) throw new ServiceLocationException(
-					ServiceLocationException.PARSE_ERROR, "Missing '=' from attribute string: "
-							+ pString);
+				ServiceLocationException.PARSE_ERROR,
+				"Missing '=' from attribute string: " + pString
+			);
 			this.iId = Convert.unescape(pString.substring(1, equalPos));
 			if (this.iId.length() == 0) throw new ServiceLocationException(
-					ServiceLocationException.PARSE_ERROR,
-					"Empty attribute ID in attribute string: " + pString);
+				ServiceLocationException.PARSE_ERROR,
+				"Empty attribute ID in attribute string: " + pString
+			);
 			String valueString = pString.substring(equalPos + 1, pString.length() - 1);
 
 			parseValueString(valueString);
-
 		} else {
 			if (pString.indexOf('(') >= 0 || pString.indexOf(')') >= 0) throw new ServiceLocationException(
-					ServiceLocationException.PARSE_ERROR);
+				ServiceLocationException.PARSE_ERROR
+			);
 			this.iId = Convert.unescape(pString);
 			this.iValues = null;
 		}
@@ -136,7 +136,7 @@ public ServiceLocationAttribute(String pString) throws ServiceLocationException
 	 * a query. Any reserved characters as specified in [7] are escaped using
 	 * UTF-8 encoding. If any characters in the tag are illegal, throws
 	 * IllegalArgumentException.
-	 * 
+	 *
 	 * @param pId
 	 *            The attribute id to escape. ServiceLocationException is thrown
 	 *            if any characters are illegal for an attribute tag.
@@ -156,7 +156,7 @@ public static String escapeId(String pId) {
 	 * is a Boolean or Integer, then the returned string contains the object
 	 * converted into a string. If the value is any type other than String,
 	 * Integer, Boolean or byte[], an IllegalArgumentException is thrown.
-	 * 
+	 *
 	 * @param pValue
 	 *            The attribute value to be converted into a string and escaped.
 	 * @return The escaped value
@@ -169,9 +169,9 @@ public static String escapeValue(Object pValue) {
 	 * Returns a cloned vector of attribute values, or null if the attribute is
 	 * a keyword attribute. If the attribute is single-valued, then the vector
 	 * contains only one object.
-	 * 
+	 *
 	 * @return The value vector
-	 * 
+	 *
 	 */
 	public Vector getValues() {
 		if (this.iValues != null) return GenericExts.cloneVector(this.iValues);
@@ -180,7 +180,7 @@ public Vector getValues() {
 
 	/**
 	 * Returns the attribute's name.
-	 * 
+	 *
 	 * @return The name (id)
 	 */
 	public String getId() {
@@ -189,9 +189,9 @@ public String getId() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#equals(java.lang.Object)
-	 * 
+	 *
 	 * Overrides Object.equals(). Two attributes are equal if their identifiers
 	 * are equal and their value vectors contain the same number of equal values
 	 * as determined by the Object equals() method. Values having byte[] type
@@ -220,9 +220,9 @@ public boolean equals(Object obj) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
-	 * 
+	 *
 	 * Overrides Object.toString(). The string returned contains a formatted
 	 * representation of the attribute, giving the attribute's id, values, and
 	 * the Java type of the values. The returned string is suitable for
@@ -243,7 +243,6 @@ public String toString() {
 				if (obj instanceof byte[]) obj = AttributeHandler.mkOpaqueStr((byte[]) obj);
 				stringbuffer.append(obj.toString());
 			}
-
 		}
 		stringbuffer.append(")");
 		return stringbuffer.toString();
@@ -258,9 +257,9 @@ private void incHashCode(int pHashCode) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#hashCode()
-	 * 
+	 *
 	 * Overrides Object.hashCode(). Hashes on the attribute's identifier.
 	 */
 	@Override
@@ -269,8 +268,7 @@ public int hashCode() {
 			this.iHashCode = this.iId.hashCode();
 			if (this.iValues != null) {
 				ValueEntry[] valueEntries = getSortedValueEntries();
-				for (int i = 0; i < valueEntries.length; i++)
-					incHashCode(valueEntries[i].hashCode());
+				for (int i = 0; i < valueEntries.length; i++) incHashCode(valueEntries[i].hashCode());
 			}
 		}
 		return this.iHashCode;
@@ -302,35 +300,37 @@ private void parseValueString(String pStr) throws ServiceLocationException {
 
 	private static byte[] parseOpaqueStr(String pStr) throws ServiceLocationException {
 		if (pStr.length() == 3) throw new ServiceLocationException(
-				ServiceLocationException.PARSE_ERROR,
-				"There must be at least three characters after \\FF in opaque string!" + " pStr="
-						+ pStr);
+			ServiceLocationException.PARSE_ERROR,
+			"There must be at least three characters after \\FF in opaque string!" + " pStr=" + pStr
+		);
 
 		ByteArrayOutputStream oStr = new ByteArrayOutputStream();
 		int pos = 3; // skip "\\FF"
 		int left;
 		while ((left = pStr.length() - pos) > 0) {
-			if (left < 3) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-					"Number of characters must be multiple of three after \\FF in opaque string!"
-							+ " pStr=" + pStr);
+			if (left < 3) throw new ServiceLocationException(
+				ServiceLocationException.PARSE_ERROR,
+				"Number of characters must be multiple of three after \\FF in opaque string!" + " pStr=" + pStr
+			);
 			if (pStr.charAt(pos) != '\\') throw new ServiceLocationException(
-					ServiceLocationException.PARSE_ERROR,
-					"Hex value must be preceded by \\ in opaque string!" + " pStr=" + pStr);
+				ServiceLocationException.PARSE_ERROR,
+				"Hex value must be preceded by \\ in opaque string!" + " pStr=" + pStr
+			);
 			String hexStr = pStr.substring(pos + 1, pos + 3);
 			pos += 3;
 			try {
 				oStr.write(Integer.parseInt(hexStr, 16));
 			} catch (NumberFormatException e) {
-				throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-						"Failed to parse hex value: " + hexStr + " in opaque string: " + pStr
-								+ " !");
+				throw new ServiceLocationException(
+					ServiceLocationException.PARSE_ERROR,
+					"Failed to parse hex value: " + hexStr + " in opaque string: " + pStr + " !"
+				);
 			}
 		}
 		return oStr.toByteArray();
 	}
 
 	static class ValueEntry implements Comparable {
-
 		/**
 		 * iStr
 		 */
@@ -354,8 +354,7 @@ public boolean equals(Object pObj) {
 			if (this.iValue == null) return that.iValue == null;
 			if (that.iValue == null) return false;
 			if (!this.iValue.getClass().equals(that.iValue.getClass())) return false;
-			if (this.iValue instanceof byte[]) return Arrays.equals((byte[]) this.iValue,
-					(byte[]) that.iValue);
+			if (this.iValue instanceof byte[]) return Arrays.equals((byte[]) this.iValue, (byte[]) that.iValue);
 			if (this.iValue instanceof String) return this.iStr.equals(that.iStr);
 			return this.iValue.equals(that.iValue);
 		}
@@ -364,14 +363,13 @@ public boolean equals(Object pObj) {
 		public int hashCode() {
 			return this.iStr == null ? 1 : this.iStr.hashCode();
 		}
-
 	}
 
 	private transient ValueEntry[] iSortedValueEntries;
 
 	/**
 	 * Used for equals check and hashCode calculation.
-	 * 
+	 *
 	 * @param pAttrib
 	 * @return attribute values in unified order, which is : values are sorted
 	 *         by theirs toString().
@@ -400,5 +398,4 @@ private ValueEntry[] getSortedValueEntries() {
 		Arrays.sort(this.iSortedValueEntries);
 		return this.iSortedValueEntries;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java
index b5b0029..9749da0 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeDescriptor.java
@@ -53,13 +53,12 @@
  * particular service location attribute definition from the service template.
  * This information is primarily for GUI tools. Programmatic attribute
  * verification should be done through the ServiceLocationAttributeVerifier.
- * 
+ *
  */
 public interface ServiceLocationAttributeDescriptor {
-
 	/**
 	 * Return a String containing the attribute's id.
-	 * 
+	 *
 	 * @return The id
 	 */
 	public abstract String getId();
@@ -94,14 +93,14 @@ public interface ServiceLocationAttributeDescriptor {
 	 * "" (empty string)
 	 * 
 	 * 
-	 * 
+	 *
 	 * @return The Java type
 	 */
 	public abstract String getValueType();
 
 	/**
 	 * Return a String containing the attribute's help text.
-	 * 
+	 *
 	 * @return The description
 	 */
 	public abstract String getDescription();
@@ -110,7 +109,7 @@ public interface ServiceLocationAttributeDescriptor {
 	 * Return an Enumeration of allowed values for the attribute type. For
 	 * keyword attributes returns null. For no allowed values (i.e.
 	 * unrestricted) returns an empty Enumeration.
-	 * 
+	 *
 	 * @return The allowed values
 	 */
 	public abstract Enumeration getAllowedValues();
@@ -119,7 +118,7 @@ public interface ServiceLocationAttributeDescriptor {
 	 * Return an Enumeration of default values for the attribute type. For
 	 * keyword attributes returns null. For no allowed values (i.e.
 	 * unrestricted) returns an empty Enumeration.
-	 * 
+	 *
 	 * @return The default values
 	 */
 	public abstract Enumeration getDefaultValues();
@@ -127,38 +126,37 @@ public interface ServiceLocationAttributeDescriptor {
 	/**
 	 * Returns true if the "X" flag is set, indicating that the attribute should
 	 * be included in an any Locator.findServices() request search filter.
-	 * 
+	 *
 	 * @return true if "X" is set, false otherwise
 	 */
 	public abstract boolean getRequiresExplicitMatch();
 
 	/**
 	 * Returns true if the "M" flag is set.
-	 * 
+	 *
 	 * @return true if "M" is set, false otherwise
 	 */
 	public abstract boolean getIsMultivalued();
 
 	/**
 	 * Returns true if the "O"" flag is set.
-	 * 
+	 *
 	 * @return true if "O" is set, false otherwise
 	 */
 	public abstract boolean getIsOptional();
 
 	/**
 	 * Returns true if the "L" flag is set.
-	 * 
+	 *
 	 * @return true if "L" is set, false otherwise
 	 */
 	public abstract boolean getIsLiteral();
 
 	/**
 	 * Returns true if the attribute is a keyword attribute.
-	 * 
+	 *
 	 * @return true if the attribute is a keyword,
 	 *         false otherwise
 	 */
 	public abstract boolean getIsKeyword();
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeVerifier.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeVerifier.java
index c9431b0..0223420 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeVerifier.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationAttributeVerifier.java
@@ -55,42 +55,41 @@
  * ServiceLocationAttribute object matches a template for a particular service
  * type. Clients obtain ServiceLocationAttributeVerifier objects for specific
  * SLP service types through the TemplateRegistry.
- * 
- * 
+ *
+ *
  */
 public interface ServiceLocationAttributeVerifier {
-
 	/**
 	 * Returns the SLP service type for which this is the verifier.
-	 * 
+	 *
 	 * @return The service type
 	 */
 	public abstract ServiceType getServiceType();
 
 	/**
 	 * Return the language locale of the template.
-	 * 
+	 *
 	 * @return The locale
 	 */
 	public abstract Locale getLocale();
 
 	/**
 	 * Return the template version number identifier.
-	 * 
+	 *
 	 * @return The version
 	 */
 	public abstract String getVersion();
 
 	/**
 	 * Return the URL syntax expression for the service: URL.
-	 * 
+	 *
 	 * @return The url syntax
 	 */
 	public abstract String getURLSyntax();
 
 	/**
 	 * Return the descriptive help text for the template.
-	 * 
+	 *
 	 * @return The description
 	 */
 	public abstract String getDescription();
@@ -101,7 +100,7 @@ public interface ServiceLocationAttributeVerifier {
 	 * This method is primarily for GUI tools to display attribute information.
 	 * Programmatic verification of attributes should use the verifyAttribute()
 	 * method.
-	 * 
+	 *
 	 * @param pAttributeId
 	 *            The attribute id
 	 * @return The descriptor
@@ -115,7 +114,7 @@ public interface ServiceLocationAttributeVerifier {
 	 * method is primarily for GUI tools to display attribute information.
 	 * Programmatic verification of attributes should use the verifyAttribute()
 	 * method.
-	 * 
+	 *
 	 * @return Enumeration of attribute descriptors
 	 */
 	public abstract Enumeration getAttributeDescriptors();
@@ -124,15 +123,14 @@ public interface ServiceLocationAttributeVerifier {
 	 * Verify that the attribute matches the template definition. If the
 	 * attribute doesn't match, ServiceLocationException is thrown with the
 	 * error code as ServiceLocationException.PARSE_ERROR.
-	 * 
+	 *
 	 * @param pAttribute
 	 *            The ServiceLocationAttribute object to be verified.
 	 * @throws ServiceLocationException
 	 *             if validation failed
-	 * 
+	 *
 	 */
-	public abstract void verifyAttribute(ServiceLocationAttribute pAttribute)
-			throws ServiceLocationException;
+	public abstract void verifyAttribute(ServiceLocationAttribute pAttribute) throws ServiceLocationException;
 
 	/**
 	 * Verify that the Vector of ServiceLocationAttribute objects matches the
@@ -140,14 +138,12 @@ public abstract void verifyAttribute(ServiceLocationAttribute pAttribute)
 	 * attributes, and all attributes must match their template definitions. If
 	 * the attributes don't match, ServiceLocationException is thrown with the
 	 * error code as ServiceLocationException.PARSE_ERROR
-	 * 
+	 *
 	 * @param pAttributeVector
 	 *            A Vector of ServiceLocationAttribute objects for the
 	 *            registration.
 	 * @throws ServiceLocationException
 	 *             if attributes don't match
 	 */
-	public abstract void verifyRegistration(Vector pAttributeVector)
-			throws ServiceLocationException;
-
+	public abstract void verifyRegistration(Vector pAttributeVector) throws ServiceLocationException;
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationEnumeration.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationEnumeration.java
index 8045954..590b761 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationEnumeration.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationEnumeration.java
@@ -57,10 +57,9 @@
  * unconcerned with SLP exceptions (this method will never ever throw one).
  */
 public interface ServiceLocationEnumeration extends Enumeration {
-
 	/**
 	 * Return the next value or block until it becomes available.
-	 * 
+	 *
 	 * @return The next value
 	 * @throws ServiceLocationException
 	 *             Thrown if the SLP operation encounters an error.
@@ -72,11 +71,11 @@ public interface ServiceLocationEnumeration extends Enumeration {
 	/**
 	 * @return next Object in Exception table
 	 * @throws NoSuchElementException
-	 * 
+	 *
 	 *             This in internal implementation to get list of all exceptions
 	 *             thrown/caught by parser This can throw RuntimeExceptions.
 	 *             They can be ignored or used for analysis.
-	 * 
+	 *
 	 *             use hasNextException to check whether there exists another
 	 *             element in Exception table
 	 */
@@ -84,7 +83,7 @@ public interface ServiceLocationEnumeration extends Enumeration {
 
 	/**
 	 * @return true if there exists another element in Exception table
-	 * 
+	 *
 	 */
 	public abstract boolean hasMoreExceptions();
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationException.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationException.java
index 30c126d..5f97d96 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationException.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationException.java
@@ -50,7 +50,6 @@
  * information.
  */
 public class ServiceLocationException extends Exception {
-
 	private static final long serialVersionUID = 6414188770647750627L;
 
 	/**
@@ -175,19 +174,37 @@ public class ServiceLocationException extends Exception {
 	 */
 	public static final short PREVIOUS_RESPONDER_OVERFLOW = 100;
 
-	private static final String[] ERROR_MESSAGES = { "OK", "LANGUAGE_NOT_SUPPORTED", "PARSE_ERROR",
-			"INVALID_REGISTRATION", "SCOPE_NOT_SUPPORTED", "AUTHENTICATION_UNKNOWN",
-			"AUTHENTICATION_ABSENT", "AUTHENTICATION_FAILED", "", "VERSION_NOT_SUPPORTED",
-			"INTERNAL_ERROR", "DA_BUSY", "OPTION_NOT_SUPPORTED", "INVALID_UPDATE",
-			"REQUEST_NOT_SUPPORTED", "REFRESH_REJECTED", "NOT_IMPLEMENTED", "NETWORK_INIT_FAILED",
-			"NETWORK_TIMED_OUT", "NETWORK_ERROR", "INTERNAL_SYSTEM_ERROR", "TYPE_ERROR",
-			"BUFFER_OVERFLOW" };
+	private static final String[] ERROR_MESSAGES = {
+		"OK",
+		"LANGUAGE_NOT_SUPPORTED",
+		"PARSE_ERROR",
+		"INVALID_REGISTRATION",
+		"SCOPE_NOT_SUPPORTED",
+		"AUTHENTICATION_UNKNOWN",
+		"AUTHENTICATION_ABSENT",
+		"AUTHENTICATION_FAILED",
+		"",
+		"VERSION_NOT_SUPPORTED",
+		"INTERNAL_ERROR",
+		"DA_BUSY",
+		"OPTION_NOT_SUPPORTED",
+		"INVALID_UPDATE",
+		"REQUEST_NOT_SUPPORTED",
+		"REFRESH_REJECTED",
+		"NOT_IMPLEMENTED",
+		"NETWORK_INIT_FAILED",
+		"NETWORK_TIMED_OUT",
+		"NETWORK_ERROR",
+		"INTERNAL_SYSTEM_ERROR",
+		"TYPE_ERROR",
+		"BUFFER_OVERFLOW"
+	};
 
 	private short iErrorCode;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pErrorCode
 	 *            One of the ec constants in this class
 	 */
@@ -198,7 +215,7 @@ public ServiceLocationException(short pErrorCode) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pErrorCode
 	 *            One of the ec constants in this class
 	 * @param pCause
@@ -211,13 +228,13 @@ public ServiceLocationException(short pErrorCode, Throwable pCause) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pErrorCode
 	 *            One of the ec constants in this class
 	 * @param pMessage
 	 *            A more specific message
 	 * @param pCause
-	 * 
+	 *
 	 */
 	public ServiceLocationException(short pErrorCode, String pMessage, Throwable pCause) {
 		super(ERROR_MESSAGES[pErrorCode] + "(" + pMessage + ")", pCause);
@@ -226,7 +243,7 @@ public ServiceLocationException(short pErrorCode, String pMessage, Throwable pCa
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pErrorCode
 	 *            One of the error code constants in this class
 	 * @param pMessage
@@ -239,7 +256,7 @@ public ServiceLocationException(short pErrorCode, String pMessage) {
 	/**
 	 * Return the error code. The error code takes on one of the static field
 	 * values.
-	 * 
+	 *
 	 * @return The error code
 	 */
 	public short getErrorCode() {
@@ -248,13 +265,14 @@ public short getErrorCode() {
 
 	/**
 	 * Gets the message associated to this exception.
-	 * 
+	 *
 	 * @return The message
 	 */
 	@Override
 	public String getMessage() {
-		if (getCause() == null) { return super.getMessage(); }
+		if (getCause() == null) {
+			return super.getMessage();
+		}
 		return super.getMessage() + "; nested exception is: \n\t" + getCause().toString();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationManager.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationManager.java
index 5964a43..bfbfa85 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationManager.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceLocationManager.java
@@ -48,7 +48,6 @@
 
 import java.util.Locale;
 import java.util.Vector;
-
 import org.metricshub.wbem.sblim.slp.internal.AdvertiserImpl;
 import org.metricshub.wbem.sblim.slp.internal.ua.LocatorImpl;
 
@@ -56,7 +55,7 @@
  * The ServiceLocationManager manages access to the service location framework.
  * Clients obtain the Locator and Advertiser objects for UA and SA, and a Vector
  * of known scope names from the ServiceLocationManager.
- * 
+ *
  */
 public class ServiceLocationManager {
 
@@ -66,9 +65,9 @@ public class ServiceLocationManager {
 	 * and, if used by the SA, assures that no refresh registration will be
 	 * rejected. If no DA advertises a min-refresh-interval attribute, a value
 	 * of 0 is returned.
-	 * 
+	 *
 	 * Not yet implemented
-	 * 
+	 *
 	 * @return The minimum refresh interval
 	 * @throws ServiceLocationException
 	 */
@@ -81,9 +80,9 @@ public static int getRefreshInterval() throws ServiceLocationException {
 	 * scopes comes from a variety of sources, see Section 2.1 for the scope
 	 * discovery algorithm. There is always at least one string in the Vector,
 	 * the default scope, "DEFAULT".
-	 * 
+	 *
 	 * Not yet implemented
-	 * 
+	 *
 	 * @return A Vector containing the scopes
 	 * @throws ServiceLocationException
 	 */
@@ -94,7 +93,7 @@ public static Vector findScopes() throws ServiceLocationException {
 	/**
 	 * Return a Locator object for the given language locale. If the
 	 * implementation does not support UA functionality, returns null.
-	 * 
+	 *
 	 * @param pLocale
 	 *            The language locale of the Locator. The default SLP locale is
 	 *            used if null.
@@ -107,7 +106,7 @@ public static Locator getLocator(Locale pLocale) {
 	/**
 	 * Return an Advertiser object for the given language locale. If the
 	 * implementation does not support SA functionality, returns null.
-	 * 
+	 *
 	 * @param pLocale
 	 *            The language locale of the Advertiser. The default SLP locale
 	 *            is used if null.
@@ -116,5 +115,4 @@ public static Locator getLocator(Locale pLocale) {
 	public static Advertiser getAdvertiser(Locale pLocale) {
 		return new AdvertiserImpl(pLocale);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceType.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceType.java
index 1844899..30b7436 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceType.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceType.java
@@ -55,7 +55,6 @@
  * abstract service types are all handled.
  */
 public class ServiceType implements Serializable {
-
 	private static final long serialVersionUID = -4850546870881037017L;
 
 	private boolean iIsServiceURL = true;
@@ -67,10 +66,10 @@ public class ServiceType implements Serializable {
 	private String iNamingAuthority = "";
 
 	/**
-	 * 
+	 *
 	 * Constructs a service type object from the service type specifier. Throws
 	 * IllegalArgumentException if the type name is syntactically incorrect.
-	 * 
+	 *
 	 * @param pType
 	 *            The service type name as a String. If the service type is from
 	 *            a service: URL, the "service:" prefix must be intact.
@@ -81,7 +80,7 @@ public ServiceType(String pType) {
 
 	/**
 	 * Returns true if the type name contains the "service:" prefix.
-	 * 
+	 *
 	 * @return true if the type name contains the "service:" prefix
 	 */
 	public boolean isServiceURL() {
@@ -90,7 +89,7 @@ public boolean isServiceURL() {
 
 	/**
 	 * Returns true if the type name is for an abstract type.
-	 * 
+	 *
 	 * @return true if the type name is for an abstract type
 	 */
 	public boolean isAbstractType() {
@@ -100,7 +99,7 @@ public boolean isAbstractType() {
 	/**
 	 * Returns true if the naming authority is the default, i.e. is the empty
 	 * string.
-	 * 
+	 *
 	 * @return true if the naming authority is the default, i.e. is
 	 *         the empty string
 	 */
@@ -113,7 +112,7 @@ public boolean isNADefault() {
 	 * if the service type is not abstract. For example, if the type name is
 	 * "service:printing:ipp", the method returns "ipp". If the type name is
 	 * "service:ftp", the method returns "".
-	 * 
+	 *
 	 * @return true if the service type is not abstract
 	 */
 	public String getConcreteTypeName() {
@@ -125,7 +124,7 @@ public String getConcreteTypeName() {
 	 * a protocol type, or the URL scheme for a generic URL. For example, in the
 	 * abstract type name "service:printing:ipp", the method returns "printing".
 	 * In the protocol type name "service:ftp", the method returns "ftp".
-	 * 
+	 *
 	 * @return The principle type name
 	 */
 	public String getPrincipleTypeName() {
@@ -138,19 +137,20 @@ public String getPrincipleTypeName() {
 	 * concrete type name or intervening colon. If not an abstract type, returns
 	 * the empty string. For example, in the abstract type name
 	 * "service:printing:ipp", the method returns "service:printing".
-	 * 
+	 *
 	 * @return The abstract type name
 	 */
 	public String getAbstractTypeName() {
-		if (isAbstractType()) return "service:" + this.iPrincipleType
-				+ (this.iNamingAuthority.length() <= 0 ? "" : "." + this.iNamingAuthority);
+		if (isAbstractType()) return (
+			"service:" + this.iPrincipleType + (this.iNamingAuthority.length() <= 0 ? "" : "." + this.iNamingAuthority)
+		);
 		return "";
 	}
 
 	/**
 	 * Return the naming authority name, or the empty string if the naming
 	 * authority is the default.
-	 * 
+	 *
 	 * @return The naming authority
 	 */
 	public String getNamingAuthority() {
@@ -159,9 +159,9 @@ public String getNamingAuthority() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#equals(java.lang.Object)
-	 * 
+	 *
 	 * Overrides Object.equals(). The two objects are equal if they are both
 	 * ServiceType objects and the components of both are equal.
 	 */
@@ -171,35 +171,40 @@ public boolean equals(Object obj) {
 		if (!(obj instanceof ServiceType)) return false;
 
 		ServiceType servicetype = (ServiceType) obj;
-		return this.iIsServiceURL == servicetype.iIsServiceURL
-				&& this.iPrincipleType.equals(servicetype.iPrincipleType)
-				&& this.iAbstractType.equals(servicetype.iAbstractType)
-				&& this.iNamingAuthority.equals(servicetype.iNamingAuthority);
+		return (
+			this.iIsServiceURL == servicetype.iIsServiceURL &&
+			this.iPrincipleType.equals(servicetype.iPrincipleType) &&
+			this.iAbstractType.equals(servicetype.iAbstractType) &&
+			this.iNamingAuthority.equals(servicetype.iNamingAuthority)
+		);
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
-	 * 
+	 *
 	 * Returns the fully formatted type name, including the "service:" if the
 	 * type was originally from a service: URL.
 	 */
 	@Override
 	public String toString() {
 		// TODO: clean up this
-		return (this.iIsServiceURL ? "service:" : "") + this.iPrincipleType
-				+ (this.iNamingAuthority.length() <= 0 ? "" : "." + this.iNamingAuthority)
-				+ (this.iAbstractType.length() <= 0 ? "" : ":" + this.iAbstractType);
+		return (
+			(this.iIsServiceURL ? "service:" : "") +
+			this.iPrincipleType +
+			(this.iNamingAuthority.length() <= 0 ? "" : "." + this.iNamingAuthority) +
+			(this.iAbstractType.length() <= 0 ? "" : ":" + this.iAbstractType)
+		);
 	}
 
 	private int iHashCode = 0;
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#hashCode()
-	 * 
+	 *
 	 * Overrides Object.hashCode(). Hashes on the string value of the "service"
 	 * prefix, naming authority, if any, abstract and concrete type names for
 	 * abstract types, protocol type name for protocol types, and URL scheme for
@@ -215,7 +220,6 @@ private void parse(String pString) {
 		StringTokenizer st = new StringTokenizer(pString, ":.", true);
 		while (true) {
 			try {
-
 				String token = st.nextToken();
 				if (token.equals(":") || token.equals(".")) continue;
 
@@ -263,7 +267,9 @@ private static void validateTypeComponent(String str) {
 
 		for (int pos = 0; pos < length; pos++) {
 			char ch = str.charAt(pos);
-			if (!Character.isLetterOrDigit(ch) && ch != '+' && ch != '-') { throw new IllegalArgumentException(); }
+			if (!Character.isLetterOrDigit(ch) && ch != '+' && ch != '-') {
+				throw new IllegalArgumentException();
+			}
 		}
 	}
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceURL.java b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceURL.java
index 1a12cde..e6cfeec 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/ServiceURL.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/ServiceURL.java
@@ -54,7 +54,6 @@
  * subclass of java.net.URL but can't since that class is final.
  */
 public class ServiceURL implements Serializable {
-
 	private static final long serialVersionUID = 8998115518853094365L;
 
 	/**
@@ -102,7 +101,7 @@ public class ServiceURL implements Serializable {
 
 	/**
 	 * Construct a service URL object having the specified lifetime.
-	 * 
+	 *
 	 * @param pServiceURL
 	 *            The URL as a string. Must be either a service: URL or a valid
 	 *            generic URL according to RFC 2396 [2].
@@ -112,14 +111,15 @@ public class ServiceURL implements Serializable {
 	 *            LIFETIME_PERMANENT.
 	 */
 	public ServiceURL(String pServiceURL, int pLifetime) {
-
 		if (pLifetime > LIFETIME_MAXIMUM || pLifetime < LIFETIME_PERMANENT) throw new IllegalArgumentException(
-				"lifetime:" + pLifetime);
+			"lifetime:" + pLifetime
+		);
 
 		for (int i = 0; i < pServiceURL.length(); i++) {
 			char c = pServiceURL.charAt(i);
-			if ("/:-.%_\'*()$!,+\\;@?&=[]".indexOf(c) == -1 && !Character.isLetterOrDigit(c)) { throw new IllegalArgumentException(
-					"invalid character: '" + c + "' on string \"" + pServiceURL + "\""); }
+			if ("/:-.%_\'*()$!,+\\;@?&=[]".indexOf(c) == -1 && !Character.isLetterOrDigit(c)) {
+				throw new IllegalArgumentException("invalid character: '" + c + "' on string \"" + pServiceURL + "\"");
+			}
 		}
 
 		parseURL(pServiceURL);
@@ -130,7 +130,7 @@ public ServiceURL(String pServiceURL, int pLifetime) {
 	/**
 	 * Returns the service type object representing the service type name of the
 	 * URL.
-	 * 
+	 *
 	 * @return The service type
 	 */
 	public ServiceType getServiceType() {
@@ -140,7 +140,7 @@ public ServiceType getServiceType() {
 	/**
 	 * Set the service type name to the object. Ignored if the URL is a service:
 	 * URL.
-	 * 
+	 *
 	 * @param pServicetype
 	 *            The service type object.
 	 */
@@ -151,7 +151,7 @@ public void setServiceType(ServiceType pServicetype) {
 	/**
 	 * Get the network layer transport identifier. If the transport is IP, an
 	 * empty string, "", is returned.
-	 * 
+	 *
 	 * @return The NLT identifier
 	 */
 	public String getTransport() {
@@ -162,7 +162,7 @@ public String getTransport() {
 	/**
 	 * Returns the host identifier. For IP, this will be the machine name or IP
 	 * address.
-	 * 
+	 *
 	 * @return The host
 	 */
 	public String getHost() {
@@ -172,7 +172,7 @@ public String getHost() {
 	/**
 	 * Returns the port number, if any. For non-IP transports, always returns
 	 * NO_PORT.
-	 * 
+	 *
 	 * @return The port
 	 */
 	public int getPort() {
@@ -181,7 +181,7 @@ public int getPort() {
 
 	/**
 	 * Returns the URL path description, if any.
-	 * 
+	 *
 	 * @return The URL path
 	 */
 	public String getURLPath() {
@@ -191,7 +191,7 @@ public String getURLPath() {
 	/**
 	 * Returns the service advertisement lifetime. This will be a positive int
 	 * between LIFETIME_NONE and LIFETIME_MAXIMUM.
-	 * 
+	 *
 	 * @return The lifetime
 	 */
 	public int getLifetime() {
@@ -200,9 +200,9 @@ public int getLifetime() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#equals(java.lang.Object)
-	 * 
+	 *
 	 * Compares the object to the ServiceURL and returns true if the two are the
 	 * same. Two ServiceURL objects are equal if their current service types
 	 * match and they have the same host, port, transport, and URL path.
@@ -214,16 +214,19 @@ public boolean equals(Object obj) {
 
 		ServiceURL that = (ServiceURL) obj;
 
-		return equalObjs(this.iServiceType, that.iServiceType)
-				&& equalStrs(this.iTransport, that.iTransport) && equalStrs(this.iHost, that.iHost)
-				&& this.iPort == that.iPort;
+		return (
+			equalObjs(this.iServiceType, that.iServiceType) &&
+			equalStrs(this.iTransport, that.iTransport) &&
+			equalStrs(this.iHost, that.iHost) &&
+			this.iPort == that.iPort
+		);
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
-	 * 
+	 *
 	 * Returns a formatted string with the URL. Overrides Object.toString(). The
 	 * returned URL has the original service type or URL scheme, not the current
 	 * service type.
@@ -243,9 +246,9 @@ public String toString() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#hashCode()
-	 * 
+	 *
 	 * Overrides Object.hashCode(). Hashes on the current service type,
 	 * transport, host, port, and URL part. !! in this case toString() must not
 	 * contain the lifeTime
@@ -263,13 +266,13 @@ public int hashCode() {
 	/**
 	 * 
       	 * service: URL or URL
-	 * 
+	 *
 	 * "service:" srvtype "://" addrspec
 	 * "service:" abstract-type ":" concrete-type> "://" addrspecc
-	 * 
+	 *
 	 * addrspesc  = ( hostName / IPv4Address / IPv6Address ) [ ":" port ]
 	 * 
      
-	 * 
+	 *
 	 * @param pUrlString
 	 * @throws IllegalArgumentException
 	 */
@@ -303,7 +306,8 @@ private void parseIPv6Address(String pAddrStr) throws IllegalArgumentException {
 		this.iHost = pAddrStr.substring(0, colonIdx);
 		if (colonIdx < pAddrStr.length()) {
 			if (pAddrStr.charAt(colonIdx) != ':') throw new IllegalArgumentException(
-					"':' expected in \"" + pAddrStr + "\" at position " + colonIdx + " !");
+				"':' expected in \"" + pAddrStr + "\" at position " + colonIdx + " !"
+			);
 			parsePort(pAddrStr.substring(colonIdx + 1), pAddrStr);
 		}
 	}
@@ -322,8 +326,7 @@ private void parsePort(String pPortStr, String pAddrStr) throws IllegalArgumentE
 		try {
 			this.iPort = Integer.parseInt(pPortStr);
 		} catch (NumberFormatException e) {
-			throw new IllegalArgumentException("Port field : " + pPortStr + " in " + pAddrStr
-					+ " is invalid!");
+			throw new IllegalArgumentException("Port field : " + pPortStr + " in " + pAddrStr + " is invalid!");
 		}
 	}
 
@@ -332,8 +335,6 @@ private static boolean equalObjs(Object pThis, Object pThat) {
 	}
 
 	private static boolean equalStrs(String pThis, String pThat) {
-		return (pThis == null || pThis.length() == 0) ? (pThat == null || pThat.length() == 0)
-				: pThis.equals(pThat);
+		return (pThis == null || pThis.length() == 0) ? (pThat == null || pThat.length() == 0) : pThis.equals(pThat);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/TemplateRegistry.java b/src/main/java/org/metricshub/wbem/sblim/slp/TemplateRegistry.java
index f31836a..c2c9f70 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/TemplateRegistry.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/TemplateRegistry.java
@@ -55,7 +55,7 @@
  * that clients of the Advertiser are not required to verify attributes before
  * registering (though they may get a TYPE_ERROR if the implementation supports
  * type checking and there is a mismatch with the template).
- * 
+ *
  */
 public abstract class TemplateRegistry {
 
@@ -63,9 +63,9 @@ public abstract class TemplateRegistry {
 	 * Returns the distinguished TemplateRegistry object for performing
 	 * operations on and with service templates. Returns null if the
 	 * implementation doesn't support TemplateRegistry functionality.
-	 * 
+	 *
 	 * Not yet implemented
-	 * 
+	 *
 	 * @return The template registry
 	 */
 	public static TemplateRegistry getTemplateRegistry() {
@@ -74,7 +74,7 @@ public static TemplateRegistry getTemplateRegistry() {
 
 	/**
 	 * Register the service template with the template registry.
-	 * 
+	 *
 	 * @param pType
 	 *            The service type.
 	 * @param pDocumentURL
@@ -87,12 +87,12 @@ public static TemplateRegistry getTemplateRegistry() {
 	 *            The version number identifier of template document.
 	 * @throws ServiceLocationException
 	 */
-	public abstract void registerServiceTemplate(ServiceType pType, String pDocumentURL,
-			Locale pLocale, String pVersion) throws ServiceLocationException;
+	public abstract void registerServiceTemplate(ServiceType pType, String pDocumentURL, Locale pLocale, String pVersion)
+		throws ServiceLocationException;
 
 	/**
 	 * Deregister the template for the service type.
-	 * 
+	 *
 	 * @param pType
 	 *            The service type.
 	 * @param pLocale
@@ -103,12 +103,12 @@ public abstract void registerServiceTemplate(ServiceType pType, String pDocument
 	 *            the latest version.
 	 * @throws ServiceLocationException
 	 */
-	public abstract void deregisterServiceTemplate(ServiceType pType, Locale pLocale,
-			String pVersion) throws ServiceLocationException;
+	public abstract void deregisterServiceTemplate(ServiceType pType, Locale pLocale, String pVersion)
+		throws ServiceLocationException;
 
 	/**
 	 * Returns the URL for the template document.
-	 * 
+	 *
 	 * @param pType
 	 *            The service type.
 	 * @param pLocale
@@ -121,14 +121,14 @@ public abstract void deregisterServiceTemplate(ServiceType pType, Locale pLocale
 	 * @throws ServiceLocationException
 	 */
 	public abstract String findTemplateURL(ServiceType pType, Locale pLocale, String pVersion)
-			throws ServiceLocationException;
+		throws ServiceLocationException;
 
 	/**
 	 * Reads the template document URL and returns an attribute verifier for the
 	 * service type. The attribute verifier can be used for verifying that
 	 * registration attributes match the template, and for introspection on the
 	 * template definition.
-	 * 
+	 *
 	 * @param pDocumentURL
 	 *            A String containing the template document's URL. May not be
 	 *            the empty string.
@@ -136,6 +136,5 @@ public abstract String findTemplateURL(ServiceType pType, Locale pLocale, String
 	 * @throws ServiceLocationException
 	 */
 	public abstract ServiceLocationAttributeVerifier attributeVerifier(String pDocumentURL)
-			throws ServiceLocationException;
-
+		throws ServiceLocationException;
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/AdvertiserImpl.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/AdvertiserImpl.java
index b015014..e9ed890 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/AdvertiserImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/AdvertiserImpl.java
@@ -23,15 +23,15 @@
 
 package org.metricshub.wbem.sblim.slp.internal;
 
-import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
-import org.metricshub.wbem.sblim.slp.ServiceURL;
-import org.metricshub.wbem.sblim.slp.internal.msg.MsgFactory;
-import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
-import org.metricshub.wbem.sblim.slp.internal.msg.ServiceAcknowledgment;
-import org.metricshub.wbem.sblim.slp.internal.msg.ServiceDeregistration;
-import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRegistration;
-import org.metricshub.wbem.sblim.slp.internal.msg.Util;
-
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.SocketTimeoutException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Vector;
 /*-
  * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
  * WBEM Java Client
@@ -53,26 +53,21 @@
  */
 
 import org.metricshub.wbem.sblim.slp.Advertiser;
+import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.SocketTimeoutException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Vector;
-
-
+import org.metricshub.wbem.sblim.slp.ServiceURL;
+import org.metricshub.wbem.sblim.slp.internal.msg.MsgFactory;
+import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceAcknowledgment;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceDeregistration;
+import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRegistration;
+import org.metricshub.wbem.sblim.slp.internal.msg.Util;
 
 /**
  * AdvertiserImpl
- * 
+ *
  */
 public class AdvertiserImpl implements Advertiser {
-
 	private Locale iLocale;
 
 	private String iLangTag;
@@ -89,7 +84,7 @@ public class AdvertiserImpl implements Advertiser {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLocale
 	 */
 	public AdvertiserImpl(Locale pLocale) {
@@ -105,7 +100,7 @@ public AdvertiserImpl(Locale pLocale) {
 	 * @throws ServiceLocationException
 	 */
 	public void addAttributes(ServiceURL pURL, Vector pAttributes)
-	throws ServiceLocationException {
+		throws ServiceLocationException {
 		throw new ServiceLocationException(ServiceLocationException.NOT_IMPLEMENTED);
 	}
 
@@ -114,8 +109,7 @@ public void addAttributes(ServiceURL pURL, Vector pAtt
 	 * @param pAttributeIds
 	 * @throws ServiceLocationException
 	 */
-	public void deleteAttributes(ServiceURL pURL, Vector pAttributeIds)
-			throws ServiceLocationException {
+	public void deleteAttributes(ServiceURL pURL, Vector pAttributeIds) throws ServiceLocationException {
 		throw new ServiceLocationException(ServiceLocationException.NOT_IMPLEMENTED);
 	}
 
@@ -127,11 +121,8 @@ public Locale getLocale() {
 		return this.iLocale;
 	}
 
-	public void register(ServiceURL pURL, Vector pAttributes)
-			throws ServiceLocationException {
-		sendMessage(new ServiceRegistration(this.iLangTag, pURL, this.iDefScopeList, pAttributes,
-		                                    null));
-
+	public void register(ServiceURL pURL, Vector pAttributes) throws ServiceLocationException {
+		sendMessage(new ServiceRegistration(this.iLangTag, pURL, this.iDefScopeList, pAttributes, null));
 	}
 
 	private void sendMessage(SLPMessage pMsg) throws ServiceLocationException {
@@ -148,12 +139,15 @@ private int unicast(SLPMessage pMsg) throws ServiceLocationException, IOExceptio
 		DatagramSocket dgSocket = new DatagramSocket();
 		try {
 			byte[] reqBytes = pMsg.serialize(false, true, false);
-			InetAddress loopback = this.iUseV6 ? SLPConfig.getLoopbackV6() : SLPConfig
-					.getLoopbackV4();
+			InetAddress loopback = this.iUseV6 ? SLPConfig.getLoopbackV6() : SLPConfig.getLoopbackV4();
 			TRC.debug("loopback:" + loopback);
 
-			DatagramPacket outPacket = new DatagramPacket(reqBytes, reqBytes.length, loopback,
-					SLPConfig.getGlobalCfg().getPort());
+			DatagramPacket outPacket = new DatagramPacket(
+				reqBytes,
+				reqBytes.length,
+				loopback,
+				SLPConfig.getGlobalCfg().getPort()
+			);
 			DatagramPacket inPacket = new DatagramPacket(this.iInBuf, this.iInBuf.length);
 
 			int timeOutIdx = 0;
@@ -181,5 +175,4 @@ private int unicast(SLPMessage pMsg) throws ServiceLocationException, IOExceptio
 		TRC.warning("registration failed");
 		return ServiceLocationException.INVALID_REGISTRATION;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/AttributeHandler.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/AttributeHandler.java
index 36ff919..71f7f28 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/AttributeHandler.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/AttributeHandler.java
@@ -44,12 +44,11 @@
 
 import java.util.Iterator;
 import java.util.Vector;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
 
 /**
  * AttributeHandler
- * 
+ *
  */
 public class AttributeHandler {
 
@@ -77,8 +76,7 @@ public static String buildString(ServiceLocationAttribute pAttr) {
 			Iterator itr = valVec.iterator();
 			boolean first = true;
 			while (itr.hasNext()) {
-				if (first) first = false;
-				else buf.append(',');
+				if (first) first = false; else buf.append(',');
 				buf.append(AttributeHandler.escapeValue(itr.next()));
 			}
 			buf.append(')');
@@ -88,7 +86,7 @@ public static String buildString(ServiceLocationAttribute pAttr) {
 
 	/**
 	 * escapeValue
-	 * 
+	 *
 	 * @param pValue
 	 * @return String
 	 */
@@ -101,14 +99,15 @@ public static String escapeValue(Object pValue) {
 			return ((Boolean) pValue).toString();
 		} else if (pValue instanceof byte[]) {
 			return AttributeHandler.mkOpaqueStr((byte[]) pValue);
-		} else if (pValue == null) { return ""; }
-		throw new IllegalArgumentException("Type: " + pValue.getClass().getName()
-				+ " cannot be an attribute value!");
+		} else if (pValue == null) {
+			return "";
+		}
+		throw new IllegalArgumentException("Type: " + pValue.getClass().getName() + " cannot be an attribute value!");
 	}
 
 	/**
 	 * mkOpaqueStr
-	 * 
+	 *
 	 * @param pBytes
 	 * @return String
 	 */
@@ -123,5 +122,4 @@ public static String mkOpaqueStr(byte[] pBytes) {
 		}
 		return buf.toString();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/Convert.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/Convert.java
index 231b0f9..82638ee 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/Convert.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/Convert.java
@@ -42,15 +42,13 @@
  */
 
 import java.io.UnsupportedEncodingException;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 
 /**
  * Convert
- * 
+ *
  */
 public class Convert {
-
 	/**
 	 * ATTR_RESERVED
 	 */
@@ -70,7 +68,7 @@ public class Convert {
 
 	/**
 	 * getBytes
-	 * 
+	 *
 	 * @param pStr
 	 * @return byte[]
 	 */
@@ -85,7 +83,7 @@ public static byte[] getBytes(String pStr) {
 
 	/**
 	 * escape
-	 * 
+	 *
 	 * @param pStr
 	 * @return String
 	 */
@@ -95,7 +93,7 @@ public static String escape(String pStr) {
 
 	/**
 	 * escape
-	 * 
+	 *
 	 * @param pStr
 	 * @param pReservedChars
 	 * @return String
@@ -121,7 +119,7 @@ public static String escape(String pStr, String pReservedChars) {
 
 	/**
 	 * unescape
-	 * 
+	 *
 	 * @param pStr
 	 * @return String
 	 * @throws ServiceLocationException
@@ -136,15 +134,14 @@ public static String unescape(String pStr) throws ServiceLocationException {
 			resBuf.append(pStr.subSequence(lastPos, pos)).append(ch);
 			lastPos = pos + 3;
 		}
-		if (resBuf != null && lastPos < pStr.length()) resBuf.append(pStr.substring(lastPos, pStr
-				.length()));
+		if (resBuf != null && lastPos < pStr.length()) resBuf.append(pStr.substring(lastPos, pStr.length()));
 		return resBuf == null ? pStr : resBuf.toString();
 	}
 
 	/**
 	 * The escape character is a backslash (UTF-8 0x5c) followed by the two
 	 * hexadecimal digits of the escaped character. -> Character code is ASCII.
-	 * 
+	 *
 	 * @param ch
 	 * @return String
 	 */
@@ -156,16 +153,19 @@ private static String escapeChar(char ch) {
 
 	private static char unescapeChar(String pEscSeq) throws ServiceLocationException {
 		if (pEscSeq.length() < 3) throw new ServiceLocationException(
-				ServiceLocationException.PARSE_ERROR,
-				"Escaped character must contain 2 hex digits!\n" + "pEscSeq:" + pEscSeq);
+			ServiceLocationException.PARSE_ERROR,
+			"Escaped character must contain 2 hex digits!\n" + "pEscSeq:" + pEscSeq
+		);
 		String hexStr = pEscSeq.substring(1, 3);
 		try {
 			int code = Integer.parseInt(hexStr, 16);
 			return (char) code;
 		} catch (NumberFormatException e) {
-			throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-					"Failed to parse hex string: " + hexStr + ", pEscSeq=" + pEscSeq + " !", e);
+			throw new ServiceLocationException(
+				ServiceLocationException.PARSE_ERROR,
+				"Failed to parse hex string: " + hexStr + ", pEscSeq=" + pEscSeq + " !",
+				e
+			);
 		}
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java
index 5548585..f39b9fa 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/IPv6MulticastAddressFactory.java
@@ -42,7 +42,6 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-
 import org.metricshub.wbem.sblim.slp.ServiceType;
 import org.metricshub.wbem.sblim.slp.internal.msg.AttributeRequest;
 import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
@@ -55,30 +54,26 @@
  *  - SRVTYPERQST Service Type Request
  *  - ATTRRQST Attribute Request
  *  - UA sends too
- *  
+ *
  * SVRLOC-DA group-id : FF0X:0:0:0:0:0:0:123
  *  - SRVRQST for the "service:directory-agent" service type
  *  - UA sends too
- * 
+ *
  * 1000 - 13FF: SRVRQST : FF0X:0:0:0:0:0:1:....
  *  - the ID is the hashcode of the Service Type string used in the SrvRqst.
  *  - UA sends too
  * 
  */
 public class IPv6MulticastAddressFactory {
+	private static final byte[] SRVLOC = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, (byte) 0x16 };
 
-	private static final byte[] SRVLOC = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-			(byte) 0x16 };
+	private static final byte[] SRVLOC_DA = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, (byte) 0x23 };
 
-	private static final byte[] SRVLOC_DA = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			1, (byte) 0x23 };
-
-	private static final byte[] SRV_RQST = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-			0 };
+	private static final byte[] SRV_RQST = { (byte) 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 };
 
 	/**
 	 * getSrvLocAddress
-	 * 
+	 *
 	 * @param pScope
 	 * @return InetAddress
 	 * @throws UnknownHostException
@@ -90,25 +85,28 @@ public static InetAddress getSrvLocAddress(int pScope) throws UnknownHostExcepti
 
 	/**
 	 * get
-	 * 
+	 *
 	 * @param pScope
 	 * @param pMsg
 	 * @return InetAddress
 	 * @throws UnknownHostException
 	 */
 	public static InetAddress get(int pScope, SLPMessage pMsg) throws UnknownHostException {
-		if (pMsg instanceof ServiceTypeRequest || pMsg instanceof AttributeRequest) { return getSrvLocAddress(pScope); }
+		if (pMsg instanceof ServiceTypeRequest || pMsg instanceof AttributeRequest) {
+			return getSrvLocAddress(pScope);
+		}
 		if (pMsg instanceof ServiceRequest) {
 			ServiceRequest srvRqst = (ServiceRequest) pMsg;
 			return get(pScope, srvRqst.getServiceType());
 		}
-		throw new IllegalArgumentException("Cannot determine IPv6 multicast address for "
-				+ pMsg.getClass().getName() + " !");
+		throw new IllegalArgumentException(
+			"Cannot determine IPv6 multicast address for " + pMsg.getClass().getName() + " !"
+		);
 	}
 
 	/**
 	 * get
-	 * 
+	 *
 	 * @param pScope
 	 * @param pSrvType
 	 * @return InetAddress
@@ -124,7 +122,7 @@ public static InetAddress get(int pScope, ServiceType pSrvType) throws UnknownHo
 
 	/**
 	 * get
-	 * 
+	 *
 	 * @param pScope
 	 * @param pSrvHash
 	 * @return InetAddress
@@ -149,7 +147,7 @@ public static InetAddress get(int pScope, int pSrvHash) throws UnknownHostExcept
 	 *    return (0x3FF & h); // round to a range of 0-1023
 	 *   }
 	 * 
-	 * 
+	 *
 	 * @param pServiceType
 	 * @return int
 	 */
@@ -163,5 +161,4 @@ public static int getSrvTypeHash(ServiceType pServiceType) {
 		}
 		return (0x3ff & hash) + 0x1000;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/Net.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/Net.java
index 01f864f..76c3edf 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/Net.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/Net.java
@@ -50,15 +50,14 @@
 
 /**
  * Net
- * 
+ *
  */
 public class Net {
-
 	private static boolean cHasV6, cHasV4;
 
 	/**
 	 * hasIPv6
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public static boolean hasIPv6() {
@@ -68,7 +67,7 @@ public static boolean hasIPv6() {
 
 	/**
 	 * hasIPv4
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public static boolean hasIPv4() {
@@ -83,7 +82,7 @@ private static void scan() {
 		try {
 			cScanned = true;
 			Enumeration ifaceEnum = NetworkInterface.getNetworkInterfaces();
-			ifLoop: while (ifaceEnum.hasMoreElements()) {
+			ifLoop:while (ifaceEnum.hasMoreElements()) {
 				NetworkInterface iface = ifaceEnum.nextElement();
 				Enumeration addrEnum = iface.getInetAddresses();
 				while (addrEnum.hasMoreElements()) {
@@ -102,5 +101,4 @@ private static void scan() {
 			TRC.error(e);
 		}
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPConfig.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPConfig.java
index 68580f0..bb1cc16 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPConfig.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPConfig.java
@@ -59,19 +59,17 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.StringTokenizer;
-import java.util.Map.Entry;
 import java.util.logging.Level;
-
 import org.metricshub.wbem.sblim.slp.SLPConfigProperties;
 
 /**
  * SLPConfig
- * 
+ *
  */
 public final class SLPConfig {
-
 	private static InetAddress cBroadcastAddress;
 
 	private static SLPConfig cInstance = null;
@@ -113,7 +111,7 @@ private static InetAddress getByName(String pName) {
 
 	/**
 	 * getBroadcastAddress
-	 * 
+	 *
 	 * @return InetAddress
 	 */
 	public static InetAddress getBroadcastAddress() {
@@ -122,7 +120,7 @@ public static InetAddress getBroadcastAddress() {
 
 	/**
 	 * getGlobalCfg
-	 * 
+	 *
 	 * @return SLPConfig
 	 */
 	public static synchronized SLPConfig getGlobalCfg() {
@@ -134,7 +132,7 @@ public static synchronized SLPConfig getGlobalCfg() {
 
 	/**
 	 * getLoopbackV4
-	 * 
+	 *
 	 * @return InetAddress
 	 */
 	public static InetAddress getLoopbackV4() {
@@ -143,7 +141,7 @@ public static InetAddress getLoopbackV4() {
 
 	/**
 	 * getLoopbackV6
-	 * 
+	 *
 	 * @return InetAddress
 	 */
 	public static InetAddress getLoopbackV6() {
@@ -152,7 +150,7 @@ public static InetAddress getLoopbackV6() {
 
 	/**
 	 * getMulticastAddress
-	 * 
+	 *
 	 * @return InetAddress
 	 */
 	public static InetAddress getMulticastAddress() {
@@ -161,7 +159,7 @@ public static InetAddress getMulticastAddress() {
 
 	/**
 	 * getSRVLOC_MulticastAddress
-	 * 
+	 *
 	 * @return InetAddress
 	 */
 	public static InetAddress getSRVLOC_MulticastAddress() {
@@ -170,7 +168,7 @@ public static InetAddress getSRVLOC_MulticastAddress() {
 
 	/**
 	 * getSRVLOC_DA_MulticastAddress
-	 * 
+	 *
 	 * @return InetAddress
 	 */
 	public static InetAddress getSRVLOC_DA_MulticastAddress() {
@@ -183,7 +181,6 @@ private static int getIntProperty(String pName, int pDefaultValue, int pMinValue
 	}
 
 	private SLPConfig() {
-
 		try {
 			// try to load config class from CIM client. This will cause load of
 			// the CIM client's config file.
@@ -198,12 +195,9 @@ private SLPConfig() {
 			if (inputstream != null) {
 				slpProperties.load(inputstream);
 			}
-			for (Iterator> iterator = slpProperties.entrySet().iterator(); iterator
-					.hasNext();) {
+			for (Iterator> iterator = slpProperties.entrySet().iterator(); iterator.hasNext();) {
 				Entry entry = iterator.next();
-				System
-						.setProperty(String.valueOf(entry.getKey()), String.valueOf(entry
-								.getValue()));
+				System.setProperty(String.valueOf(entry.getKey()), String.valueOf(entry.getValue()));
 			}
 		} catch (IOException e) {
 			System.out.println("Error while parsing property file");
@@ -213,58 +207,62 @@ private SLPConfig() {
 
 	/**
 	 * getActiveDiscoveryGranularity
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getActiveDiscoveryGranularity() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_DA_ACTIVE_DISCOVERY_GRANULARITY,
-				SLPDefaults.ACTIVE_DISCOVERY_GRANULARITY, SLPLimits.MIN_DISCOVERY_GRANULARITY,
-				SLPLimits.MAX_DISCOVERY_GRANULARITY);
+		return getIntProperty(
+			SLPConfigProperties.NET_SLP_DA_ACTIVE_DISCOVERY_GRANULARITY,
+			SLPDefaults.ACTIVE_DISCOVERY_GRANULARITY,
+			SLPLimits.MIN_DISCOVERY_GRANULARITY,
+			SLPLimits.MAX_DISCOVERY_GRANULARITY
+		);
 	}
 
 	/**
 	 * getActiveDiscoveryInterval
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getActiveDiscoveryInterval() {
-		int interval = getIntProperty(SLPConfigProperties.NET_SLP_DA_ACTIVE_DISCOVERY_INTERVAL,
-				SLPDefaults.ACTIVE_DISCOVERY_INTERVAL, SLPLimits.MIN_DISCOVERY_INTERVAL,
-				SLPLimits.MAX_DISCOVERY_INTERVAL); // 3mins
-		if (interval > 0 && interval < 300) { return 300;
-		// prevent network flooding
+		int interval = getIntProperty(
+			SLPConfigProperties.NET_SLP_DA_ACTIVE_DISCOVERY_INTERVAL,
+			SLPDefaults.ACTIVE_DISCOVERY_INTERVAL,
+			SLPLimits.MIN_DISCOVERY_INTERVAL,
+			SLPLimits.MAX_DISCOVERY_INTERVAL
+		); // 3mins
+		if (interval > 0 && interval < 300) {
+			return 300;
+			// prevent network flooding
 		}
 		return interval;
 	}
 
 	/**
 	 * getDADiscoveryTimeouts
-	 * 
+	 *
 	 * @return int[]
 	 */
 	public int[] getDADiscoveryTimeouts() {
-		return parseTimeouts(SLPConfigProperties.NET_SLP_DA_DISCOVERY_TIMEOUTS,
-				SLPDefaults.DA_DISCOVERY_TIMEOUTS);
+		return parseTimeouts(SLPConfigProperties.NET_SLP_DA_DISCOVERY_TIMEOUTS, SLPDefaults.DA_DISCOVERY_TIMEOUTS);
 	}
 
 	/**
 	 * getDatagramTimeouts
-	 * 
+	 *
 	 * @return int[]
 	 */
 	public int[] getDatagramTimeouts() {
-		return parseTimeouts(SLPConfigProperties.NET_SLP_DATAGRAM_TIMEOUTS,
-				SLPDefaults.DATAGRAM_TIMEOUTS);
+		return parseTimeouts(SLPConfigProperties.NET_SLP_DATAGRAM_TIMEOUTS, SLPDefaults.DATAGRAM_TIMEOUTS);
 	}
 
 	/**
 	 * getInterfaces
-	 * 
+	 *
 	 * @return List
 	 */
 	@SuppressWarnings("null")
 	public List getInterfaces() {
-
 		String property = System.getProperty(SLPConfigProperties.NET_SLP_INTERFACES);
 
 		List addresses = parseList(property);
@@ -299,17 +297,16 @@ public List getInterfaces() {
 
 	/**
 	 * getPort
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getPort() {
-		return Integer.getInteger(SLPConfigProperties.NET_SLP_PORT, SLPDefaults.SLP_PORT)
-				.intValue();
+		return Integer.getInteger(SLPConfigProperties.NET_SLP_PORT, SLPDefaults.SLP_PORT).intValue();
 	}
 
 	/**
 	 * setPort
-	 * 
+	 *
 	 * @param pPort
 	 */
 	public void setPort(int pPort) {
@@ -318,7 +315,7 @@ public void setPort(int pPort) {
 
 	/**
 	 * getTraceLevel
-	 * 
+	 *
 	 * @return String
 	 */
 	public Level getTraceLevel() {
@@ -333,7 +330,7 @@ public Level getTraceLevel() {
 
 	/**
 	 * setTraceLevel
-	 * 
+	 *
 	 * @param pLevel
 	 */
 	public void setTraceLevel(String pLevel) {
@@ -342,7 +339,7 @@ public void setTraceLevel(String pLevel) {
 
 	/**
 	 * setUseIPv6
-	 * 
+	 *
 	 * @param pValue
 	 */
 	public void setUseIPv6(boolean pValue) {
@@ -351,7 +348,7 @@ public void setUseIPv6(boolean pValue) {
 
 	/**
 	 * useIPv6
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean useIPv6() {
@@ -360,7 +357,7 @@ public boolean useIPv6() {
 
 	/**
 	 * setUseIPv4
-	 * 
+	 *
 	 * @param pValue
 	 */
 	public void setUseIPv4(boolean pValue) {
@@ -369,7 +366,7 @@ public void setUseIPv4(boolean pValue) {
 
 	/**
 	 * useIPv4
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean useIPv4() {
@@ -378,7 +375,7 @@ public boolean useIPv4() {
 
 	/**
 	 * getLocalHost
-	 * 
+	 *
 	 * @return InetAddress
 	 */
 	public InetAddress getLocalHost() {
@@ -388,61 +385,63 @@ public InetAddress getLocalHost() {
 
 	/**
 	 * getMaximumResults
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getMaximumResults() {
-		int value = Integer.getInteger(SLPConfigProperties.NET_SLP_MAX_RESULTS,
-				SLPDefaults.MAXIMUM_RESULTS).intValue();
-		return (value >= 1 && value < SLPDefaults.MAXIMUM_RESULTS) ? value
-				: SLPDefaults.MAXIMUM_RESULTS;
+		int value = Integer.getInteger(SLPConfigProperties.NET_SLP_MAX_RESULTS, SLPDefaults.MAXIMUM_RESULTS).intValue();
+		return (value >= 1 && value < SLPDefaults.MAXIMUM_RESULTS) ? value : SLPDefaults.MAXIMUM_RESULTS;
 	}
 
 	/**
 	 * getMTU
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getMTU() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_MTU, SLPDefaults.MTU, SLPLimits.MIN_MTU,
-				SLPLimits.MAX_MTU);
+		return getIntProperty(SLPConfigProperties.NET_SLP_MTU, SLPDefaults.MTU, SLPLimits.MIN_MTU, SLPLimits.MAX_MTU);
 	}
 
 	/**
 	 * getMulticastMaximumWait
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getMulticastMaximumWait() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_MULTICAST_MAXIMUM_WAIT,
-				SLPDefaults.MULTICAST_MAXIMUM_WAIT, SLPLimits.MIN_MULTICAST_MAXIMUM_WAIT,
-				SLPLimits.MAX_MULTICAST_MAXIMUM_WAIT);
+		return getIntProperty(
+			SLPConfigProperties.NET_SLP_MULTICAST_MAXIMUM_WAIT,
+			SLPDefaults.MULTICAST_MAXIMUM_WAIT,
+			SLPLimits.MIN_MULTICAST_MAXIMUM_WAIT,
+			SLPLimits.MAX_MULTICAST_MAXIMUM_WAIT
+		);
 	}
 
 	/**
 	 * getMulticastRadius
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getMulticastRadius() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_MULTICAST_TTL,
-				SLPDefaults.MULTICAST_RADIUS, SLPLimits.MIN_MULTICAST_RADIUS,
-				SLPLimits.MAX_MULTICAST_RADIUS);
+		return getIntProperty(
+			SLPConfigProperties.NET_SLP_MULTICAST_TTL,
+			SLPDefaults.MULTICAST_RADIUS,
+			SLPLimits.MIN_MULTICAST_RADIUS,
+			SLPLimits.MAX_MULTICAST_RADIUS
+		);
 	}
 
 	/**
 	 * getMulticastTimeouts
-	 * 
+	 *
 	 * @return int[]
 	 */
 	public int[] getMulticastTimeouts() {
-		return parseTimeouts(SLPConfigProperties.NET_SLP_MULTICAST_TIMEOUTS,
-				SLPDefaults.MULTICAST_TIMEOUTS);
+		return parseTimeouts(SLPConfigProperties.NET_SLP_MULTICAST_TIMEOUTS, SLPDefaults.MULTICAST_TIMEOUTS);
 	}
 
 	/**
 	 * getPreconfiguredDAs
-	 * 
+	 *
 	 * @return List <InetAddress>
 	 */
 	public List getPreconfiguredDAs() {
@@ -462,7 +461,7 @@ public List getPreconfiguredDAs() {
 
 	/**
 	 * getConfiguredScopes
-	 * 
+	 *
 	 * @return List<String>
 	 */
 	public List getConfiguredScopes() {
@@ -474,7 +473,7 @@ public List getConfiguredScopes() {
 
 	/**
 	 * getSAOnlyScopes
-	 * 
+	 *
 	 * @return List<String>
 	 */
 	public List getSAOnlyScopes() {
@@ -483,28 +482,35 @@ public List getSAOnlyScopes() {
 
 	/**
 	 * getServerSocketQueueLength
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getServerSocketQueueLength() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_SERVER_SOCKET_QUEUE_LENGTH,
-				SLPDefaults.SERVER_SOCKET_QUEUE_LENGTH, SLPLimits.MIN_SERVER_SOCKET_QUEUE_LENGTH,
-				SLPLimits.MAX_SERVER_SOCKET_QUEUE_LENGTH);
+		return getIntProperty(
+			SLPConfigProperties.NET_SLP_SERVER_SOCKET_QUEUE_LENGTH,
+			SLPDefaults.SERVER_SOCKET_QUEUE_LENGTH,
+			SLPLimits.MIN_SERVER_SOCKET_QUEUE_LENGTH,
+			SLPLimits.MAX_SERVER_SOCKET_QUEUE_LENGTH
+		);
 	}
 
 	/**
 	 * getTCPTimeout
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getTCPTimeout() {
-		return getIntProperty(SLPConfigProperties.NET_SLP_TCPTIMEOUT, SLPDefaults.TCP_TIMEOUT,
-				SLPLimits.MIN_TCP_TIMEOUT, SLPLimits.MAX_TCP_TIMEOUT);
+		return getIntProperty(
+			SLPConfigProperties.NET_SLP_TCPTIMEOUT,
+			SLPDefaults.TCP_TIMEOUT,
+			SLPLimits.MIN_TCP_TIMEOUT,
+			SLPLimits.MAX_TCP_TIMEOUT
+		);
 	}
 
 	/**
 	 * getTraceMsg
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean getTraceMsg() {
@@ -513,7 +519,7 @@ public boolean getTraceMsg() {
 
 	/**
 	 * isBroadcastOnly
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isBroadcastOnly() {
@@ -522,7 +528,7 @@ public boolean isBroadcastOnly() {
 
 	/**
 	 * isDA
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isDA() {
@@ -531,7 +537,7 @@ public boolean isDA() {
 
 	/**
 	 * isSA
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean isSA() {
@@ -544,7 +550,6 @@ private static boolean getBoolean(String pPropName, boolean pDefaultValue) {
 	}
 
 	private InputStream getConfigURLStream() {
-
 		String configURL = System.getProperty(SLPConfigProperties.NET_SLP_CONFIG_URL);
 
 		if (configURL != null) {
@@ -576,7 +581,7 @@ private InputStream getConfigURLStream() {
 
 	/**
 	 * Parses comma separated list.
-	 * 
+	 *
 	 * @param pList
 	 * @return List of Strings
 	 */
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPDefaults.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPDefaults.java
index fced292..eb270f1 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPDefaults.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPDefaults.java
@@ -47,19 +47,17 @@
  */
 
 import java.util.Locale;
-
 import org.metricshub.wbem.sblim.slp.ServiceType;
 
 /**
  * SLPDefaults
- * 
+ *
  */
 /**
  * Class SLPDefaults is responsible for
- * 
+ *
  */
 public interface SLPDefaults {
-
 	/**
 	 * ALL_AUTHORITIES
 	 */
@@ -74,10 +72,11 @@ public interface SLPDefaults {
 	 * CONF_URLS
 	 */
 	public static final String[] CONF_URLS = {
-			"file:sblim-slp-client2.properties",
-			"file:" + System.getProperty("user.home") + System.getProperty("file.separator")
-					+ "sblim-slp-client2.properties",
-			"file:/etc/java/sblim-slp-client2.properties", "file:/etc/sblim-slp-client2.properties" };
+		"file:sblim-slp-client2.properties",
+		"file:" + System.getProperty("user.home") + System.getProperty("file.separator") + "sblim-slp-client2.properties",
+		"file:/etc/java/sblim-slp-client2.properties",
+		"file:/etc/sblim-slp-client2.properties"
+	};
 
 	/**
 	 * DA_DISCOVERY_TIMEOUTS
@@ -213,5 +212,4 @@ public interface SLPDefaults {
 	 * IPV6_MULTICAST_SCOPE
 	 */
 	public static final int IPV6_MULTICAST_SCOPE = 5;
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPLimits.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPLimits.java
index d0c2c58..25f803a 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPLimits.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPLimits.java
@@ -44,10 +44,9 @@
 
 /**
  * SLPLimits
- * 
+ *
  */
 public interface SLPLimits {
-
 	/**
 	 * MAX_DISCOVERY_GRANULARITY
 	 */
@@ -117,5 +116,4 @@ public interface SLPLimits {
 	 * MIN_TCP_TIMEOUT
 	 */
 	public static final int MIN_TCP_TIMEOUT = 100;
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPString.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPString.java
index 3ce766e..e592e5e 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPString.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/SLPString.java
@@ -43,19 +43,19 @@
 /**
  * 
        * This class provides functions for comparison of SLP message strings.
- * 
+ *
  * From RFC 2608:
- * 
+ *
  * String comparison for order and equality in SLP MUST be case
  * insensitive inside the 0x00-0x7F subrange of UTF-8 (which corresponds
  * to ASCII character encoding).  Case insensitivity SHOULD be supported
  * throughout the entire UTF-8 encoded Unicode [6] character set.
- * 
+ *
  * The case insensitivity rule applies to all string matching in SLPv2,
  * including Scope strings, SLP SPI strings, service types, attribute
  * tags and values in query handling, language tags, previous responder
  * lists.  Comparisons of URL strings, however, is case sensitive.
- * 
+ *
  * White space (SPACE, CR, LF, TAB) internal to a string value is folded
  * to a single SPACE character for the sake of string comparisons.
  * White space preceding or following a string value is ignored for the
@@ -68,7 +68,7 @@ public class SLPString {
 
 	/**
 	 * equals
-	 * 
+	 *
 	 * @param pStr0
 	 * @param pStr1
 	 * @return boolean
@@ -81,7 +81,7 @@ public static boolean equals(String pStr0, String pStr1) {
 
 	/**
 	 * compare
-	 * 
+	 *
 	 * @param pStr0
 	 * @param pStr1
 	 * @return int
@@ -92,7 +92,7 @@ public static int compare(String pStr0, String pStr1) {
 
 	/**
 	 * public for testing only.
-	 * 
+	 *
 	 * @param pStr
 	 * @return String
 	 */
@@ -115,5 +115,4 @@ public static String unify(String pStr) {
 		}
 		return resBuf.toString();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/TRC.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/TRC.java
index e8f959c..f8364a6 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/TRC.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/TRC.java
@@ -51,15 +51,13 @@
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.metricshub.wbem.sblim.cimclient.internal.logging.LogAndTraceBroker;
 
 /**
  * debug -> FINEST info -> INFO warning -> WARNING error -> SEVERE
- * 
+ *
  */
 public class TRC {
-
 	private static PrintStream cOut;
 
 	private static Level cLevel = SLPConfig.getGlobalCfg().getTraceLevel();
@@ -74,7 +72,7 @@ public class TRC {
 
 	/**
 	 * setLevel
-	 * 
+	 *
 	 * @param pLevel
 	 */
 	public static void setLevel(Level pLevel) {
@@ -83,7 +81,7 @@ public static void setLevel(Level pLevel) {
 
 	/**
 	 * setConsolLog
-	 * 
+	 *
 	 * @param pOutStr
 	 */
 	public static void setOutput(OutputStream pOutStr) {
@@ -92,7 +90,7 @@ public static void setOutput(OutputStream pOutStr) {
 
 	/**
 	 * setOutputStream
-	 * 
+	 *
 	 * @param pOutStr
 	 */
 	public static void setOutput(PrintStream pOutStr) {
@@ -101,7 +99,7 @@ public static void setOutput(PrintStream pOutStr) {
 
 	/**
 	 * setPatterns
-	 * 
+	 *
 	 * @param pDenyPatterns
 	 * @param pAllowPatterns
 	 */
@@ -121,7 +119,7 @@ private static Pattern[] compile(String[] pStrs) {
 
 	/**
 	 * debug
-	 * 
+	 *
 	 * @param pMsg
 	 */
 	public static void debug(String pMsg) {
@@ -130,7 +128,7 @@ public static void debug(String pMsg) {
 
 	/**
 	 * debug
-	 * 
+	 *
 	 * @param pMsg
 	 * @param pEx
 	 */
@@ -141,7 +139,7 @@ public static void debug(String pMsg, Exception pEx) {
 
 	/**
 	 * info
-	 * 
+	 *
 	 * @param pMsg
 	 */
 	public static void info(String pMsg) {
@@ -150,7 +148,7 @@ public static void info(String pMsg) {
 
 	/**
 	 * info
-	 * 
+	 *
 	 * @param pMsg
 	 * @param pEx
 	 */
@@ -161,7 +159,7 @@ public static void info(String pMsg, Exception pEx) {
 
 	/**
 	 * warning
-	 * 
+	 *
 	 * @param pMsg
 	 */
 	public static void warning(String pMsg) {
@@ -170,7 +168,7 @@ public static void warning(String pMsg) {
 
 	/**
 	 * warning
-	 * 
+	 *
 	 * @param pMsg
 	 * @param pEx
 	 */
@@ -181,7 +179,7 @@ public static void warning(String pMsg, Exception pEx) {
 
 	/**
 	 * error
-	 * 
+	 *
 	 * @param pMsg
 	 */
 	public static void error(String pMsg) {
@@ -190,7 +188,7 @@ public static void error(String pMsg) {
 
 	/**
 	 * error
-	 * 
+	 *
 	 * @param pEx
 	 */
 	public static void error(Exception pEx) {
@@ -199,7 +197,7 @@ public static void error(Exception pEx) {
 
 	/**
 	 * error
-	 * 
+	 *
 	 * @param pMsg
 	 * @param pEx
 	 */
@@ -230,9 +228,17 @@ private static void trace(Level pLevel, String pMsg, Exception pEx) {
 		StackTraceElement location = getLocation();
 		String fnStr = getFunctionStr(location);
 		if (deny(fnStr) && !allow(fnStr)) return;
-		StringBuffer buf = new StringBuffer('[' + pLevel.toString() + ' '
-				+ Thread.currentThread().getName() + ' ' + getDate() + ' '
-				+ getLocationStr(location) + "]\n");
+		StringBuffer buf = new StringBuffer(
+			'[' +
+			pLevel.toString() +
+			' ' +
+			Thread.currentThread().getName() +
+			' ' +
+			getDate() +
+			' ' +
+			getLocationStr(location) +
+			"]\n"
+		);
 		if (pMsg != null) buf.append(pMsg + '\n');
 		if (pEx != null) {
 			StringWriter writer = new StringWriter();
@@ -274,28 +280,35 @@ private static String pad(int pDigits, int pNum) {
 		char[] cA = new char[len];
 		int paddingDigits = pDigits - str.length();
 		int dIdx = 0;
-		while (dIdx < paddingDigits)
-			cA[dIdx++] = '0';
+		while (dIdx < paddingDigits) cA[dIdx++] = '0';
 		int sIdx = 0;
-		while (dIdx < len)
-			cA[dIdx++] = str.charAt(sIdx++);
+		while (dIdx < len) cA[dIdx++] = str.charAt(sIdx++);
 		return new String(cA);
 	}
 
 	/**
 	 * getDate
-	 * 
+	 *
 	 * @return String
 	 */
 	private static String getDate() {
 		long millis = new Date().getTime();
 		Calendar cal = Calendar.getInstance();
 		cal.setTimeInMillis(millis);
-		return Integer.toString(cal.get(Calendar.YEAR)) + '.' + pad(2, cal.get(Calendar.MONTH) + 1)
-				+ '.' + pad(2, cal.get(Calendar.DAY_OF_MONTH)) + ' '
-				+ pad(2, cal.get(Calendar.HOUR_OF_DAY)) + ':' + pad(2, cal.get(Calendar.MINUTE))
-				+ ':' + pad(2, cal.get(Calendar.SECOND)) + ' '
-				+ pad(3, cal.get(Calendar.MILLISECOND));
+		return (
+			Integer.toString(cal.get(Calendar.YEAR)) +
+			'.' +
+			pad(2, cal.get(Calendar.MONTH) + 1) +
+			'.' +
+			pad(2, cal.get(Calendar.DAY_OF_MONTH)) +
+			' ' +
+			pad(2, cal.get(Calendar.HOUR_OF_DAY)) +
+			':' +
+			pad(2, cal.get(Calendar.MINUTE)) +
+			':' +
+			pad(2, cal.get(Calendar.SECOND)) +
+			' ' +
+			pad(3, cal.get(Calendar.MILLISECOND))
+		);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeReply.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeReply.java
index 4f9fc21..45832f4 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeReply.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeReply.java
@@ -46,10 +46,9 @@
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
-import org.metricshub.wbem.sblim.slp.internal.TRC;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
 
 /*
  * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -62,28 +61,26 @@
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |# of
  * AttrAuths | Attribute Authentication Block (if present) \
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * 
+ *
  */
 
 /**
  * AttributeReply message
- * 
+ *
  */
 public class AttributeReply extends ReplyMessage {
-
 	private List iAttrList;
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
 		AttributeReply reply = new AttributeReply(pHdr, pInStr.read16(), pInStr.readAttributeList());
 		if (pInStr.readAuthBlockList() != null) TRC.warning("Non empty auth block!");
 		return reply;
@@ -91,7 +88,7 @@ public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pErrorCode
 	 * @param pAttrList
 	 *            - list of ServiceLocationAttributes
@@ -103,7 +100,7 @@ public AttributeReply(int pErrorCode, List pAttrList)
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLangTag
 	 * @param pErrorCode
 	 * @param pAttrList
@@ -116,14 +113,13 @@ public AttributeReply(String pLangTag, int pErrorCode, List pAttrList) {
+	public AttributeReply(MsgHeader pHeader, int pErrorCode, List pAttrList) {
 		super(pHeader, pErrorCode);
 		this.iAttrList = pAttrList;
 	}
@@ -138,8 +134,9 @@ public Iterator getResultIterator() {
 	 */
 	@Override
 	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write16(getErrorCode()) && pOutStr.writeAttributeList(this.iAttrList)
-				&& pOutStr.writeAuthBlockList(null);
+		return (
+			pOutStr.write16(getErrorCode()) && pOutStr.writeAttributeList(this.iAttrList) && pOutStr.writeAuthBlockList(null)
+		);
 	}
 
 	@Override
@@ -147,5 +144,4 @@ public Iterator getExceptionIterator() {
 		// this message doesn't have exception table
 		return null;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeRequest.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeRequest.java
index 2e890ac..35ee7bf 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeRequest.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/AttributeRequest.java
@@ -45,9 +45,8 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.SortedSet;
-
-import org.metricshub.wbem.sblim.slp.ServiceURL;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
 
 /*
  * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -67,10 +66,9 @@
 
 /**
  * AttributeRequest message
- * 
+ *
  */
 public class AttributeRequest extends RequestMessage {
-
 	private String iURLStr;
 
 	private List iTagList;
@@ -81,22 +79,27 @@ public class AttributeRequest extends RequestMessage {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new AttributeRequest(pHdr, pInStr.readStringSet(), pInStr.readString(), pInStr
-				.readStringList(), pInStr.readStringList(), pInStr.readStringList());
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+		return new AttributeRequest(
+			pHdr,
+			pInStr.readStringSet(),
+			pInStr.readString(),
+			pInStr.readStringList(),
+			pInStr.readStringList(),
+			pInStr.readStringList()
+		);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pPrevResponderSet
 	 *            - set of address strings
 	 * @param pURLStr
@@ -105,15 +108,20 @@ public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
 	 * @param pTagList
 	 * @param pSPIList
 	 */
-	public AttributeRequest(SortedSet pPrevResponderSet, String pURLStr,
-			List pScopeList, List pTagList, List pSPIList) {
+	public AttributeRequest(
+		SortedSet pPrevResponderSet,
+		String pURLStr,
+		List pScopeList,
+		List pTagList,
+		List pSPIList
+	) {
 		super(ATTR_RQST, pPrevResponderSet, pScopeList);
 		init(pURLStr, pTagList, pSPIList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLangTag
 	 * @param pPrevResponderSet
 	 *            - set of address strings
@@ -123,15 +131,21 @@ public AttributeRequest(SortedSet pPrevResponderSet, String pURLStr,
 	 * @param pTagList
 	 * @param pSPIList
 	 */
-	public AttributeRequest(String pLangTag, SortedSet pPrevResponderSet, String pURLStr,
-			List pScopeList, List pTagList, List pSPIList) {
+	public AttributeRequest(
+		String pLangTag,
+		SortedSet pPrevResponderSet,
+		String pURLStr,
+		List pScopeList,
+		List pTagList,
+		List pSPIList
+	) {
 		super(ATTR_RQST, pLangTag, pPrevResponderSet, pScopeList);
 		init(pURLStr, pTagList, pSPIList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pPrevResponderSet
 	 *            - set of address strings
@@ -141,15 +155,21 @@ public AttributeRequest(String pLangTag, SortedSet pPrevResponderSet, St
 	 * @param pTagList
 	 * @param pSPIList
 	 */
-	public AttributeRequest(MsgHeader pHeader, SortedSet pPrevResponderSet, String pURLStr,
-			List pScopeList, List pTagList, List pSPIList) {
+	public AttributeRequest(
+		MsgHeader pHeader,
+		SortedSet pPrevResponderSet,
+		String pURLStr,
+		List pScopeList,
+		List pTagList,
+		List pSPIList
+	) {
 		super(pHeader, pPrevResponderSet, pScopeList);
 		init(pURLStr, pTagList, pSPIList);
 	}
 
 	/**
 	 * getServiceURL
-	 * 
+	 *
 	 * @return ServiceURL
 	 */
 	public ServiceURL getServiceURL() {
@@ -158,8 +178,12 @@ public ServiceURL getServiceURL() {
 
 	@Override
 	protected boolean serializeRequestBody(SLPOutputStream pOutStr) {
-		return pOutStr.write(this.iURLStr) && pOutStr.writeStringList(getScopeList())
-				&& pOutStr.writeStringList(this.iTagList) && pOutStr.writeStringList(this.iSPIList);
+		return (
+			pOutStr.write(this.iURLStr) &&
+			pOutStr.writeStringList(getScopeList()) &&
+			pOutStr.writeStringList(this.iTagList) &&
+			pOutStr.writeStringList(this.iSPIList)
+		);
 	}
 
 	@Override
@@ -172,5 +196,4 @@ private void init(String pURLStr, List pTagList, List pSPIList)
 		this.iTagList = pTagList;
 		this.iSPIList = pSPIList;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DAAdvert.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DAAdvert.java
index 122977d..a55c4f7 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DAAdvert.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DAAdvert.java
@@ -48,7 +48,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.TreeSet;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 
@@ -75,10 +74,9 @@
 
 /**
  * DAAdvert message
- * 
+ *
  */
 public class DAAdvert extends ReplyMessage {
-
 	private long iStatelessBootTime;
 
 	private String iURLStr;
@@ -91,22 +89,28 @@ public class DAAdvert extends ReplyMessage {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new DAAdvert(pHdr, pInStr.read16(), pInStr.read32(), pInStr.readString(), pInStr
-				.readStringList(), pInStr.readAttributeList(), pInStr.readStringList());
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+		return new DAAdvert(
+			pHdr,
+			pInStr.read16(),
+			pInStr.read32(),
+			pInStr.readString(),
+			pInStr.readStringList(),
+			pInStr.readAttributeList(),
+			pInStr.readStringList()
+		);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pErrorCode
 	 * @param pStatelessBootTime
 	 * @param pURLStr
@@ -116,15 +120,21 @@ public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
 	 *            - list of ServiceLocationAttributes
 	 * @param pSPIList
 	 */
-	public DAAdvert(int pErrorCode, long pStatelessBootTime, String pURLStr,
-			List pScopeList, List pAttrList, List pSPIList) {
+	public DAAdvert(
+		int pErrorCode,
+		long pStatelessBootTime,
+		String pURLStr,
+		List pScopeList,
+		List pAttrList,
+		List pSPIList
+	) {
 		super(DA_ADVERT, pErrorCode);
 		init(pStatelessBootTime, pURLStr, pScopeList, pAttrList, pSPIList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLangTag
 	 * @param pErrorCode
 	 * @param pStatelessBootTime
@@ -135,15 +145,22 @@ public DAAdvert(int pErrorCode, long pStatelessBootTime, String pURLStr,
 	 *            - list of ServiceLocationAttributes
 	 * @param pSPIList
 	 */
-	public DAAdvert(String pLangTag, int pErrorCode, long pStatelessBootTime, String pURLStr,
-			List pScopeList, List pAttrList, List pSPIList) {
+	public DAAdvert(
+		String pLangTag,
+		int pErrorCode,
+		long pStatelessBootTime,
+		String pURLStr,
+		List pScopeList,
+		List pAttrList,
+		List pSPIList
+	) {
 		super(DA_ADVERT, pLangTag, pErrorCode);
 		init(pStatelessBootTime, pURLStr, pScopeList, pAttrList, pSPIList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pErrorCode
 	 * @param pStatelessBootTime
@@ -154,8 +171,15 @@ public DAAdvert(String pLangTag, int pErrorCode, long pStatelessBootTime, String
 	 *            - list of ServiceLocationAttributes
 	 * @param pSPIList
 	 */
-	public DAAdvert(MsgHeader pHeader, int pErrorCode, long pStatelessBootTime, String pURLStr,
-			List pScopeList, List pAttrList, List pSPIList) {
+	public DAAdvert(
+		MsgHeader pHeader,
+		int pErrorCode,
+		long pStatelessBootTime,
+		String pURLStr,
+		List pScopeList,
+		List pAttrList,
+		List pSPIList
+	) {
 		super(pHeader, pErrorCode);
 		init(pStatelessBootTime, pURLStr, pScopeList, pAttrList, pSPIList);
 	}
@@ -167,8 +191,7 @@ public DAAdvert(MsgHeader pHeader, int pErrorCode, long pStatelessBootTime, Stri
 	@Override
 	public Iterator getResultIterator() {
 		ArrayList list = new ArrayList(1);
-		list.add(new DADescriptor(this.iURLStr, new TreeSet(this.iScopeList),
-				this.iAttrList));
+		list.add(new DADescriptor(this.iURLStr, new TreeSet(this.iScopeList), this.iAttrList));
 		return list.iterator();
 	}
 
@@ -177,14 +200,23 @@ public Iterator getResultIterator() {
 	 */
 	@Override
 	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write16(getErrorCode()) && pOutStr.write32(this.iStatelessBootTime)
-				&& pOutStr.write(this.iURLStr) && pOutStr.writeStringList(this.iScopeList)
-				&& pOutStr.writeAttributeList(this.iAttrList)
-				&& pOutStr.writeStringList(this.iSPIList);
+		return (
+			pOutStr.write16(getErrorCode()) &&
+			pOutStr.write32(this.iStatelessBootTime) &&
+			pOutStr.write(this.iURLStr) &&
+			pOutStr.writeStringList(this.iScopeList) &&
+			pOutStr.writeAttributeList(this.iAttrList) &&
+			pOutStr.writeStringList(this.iSPIList)
+		);
 	}
 
-	private void init(long pStatelessBootTime, String pURLStr, List pScopeList,
-			List pAttrList, List pSPIList) {
+	private void init(
+		long pStatelessBootTime,
+		String pURLStr,
+		List pScopeList,
+		List pAttrList,
+		List pSPIList
+	) {
 		this.iStatelessBootTime = pStatelessBootTime;
 		this.iURLStr = pURLStr;
 		this.iScopeList = pScopeList;
@@ -197,5 +229,4 @@ public Iterator getExceptionIterator() {
 		// this message doesn't have exception table
 		return null;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DADescriptor.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DADescriptor.java
index 5587d71..3e1e834 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DADescriptor.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/DADescriptor.java
@@ -46,7 +46,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.TreeSet;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
 
 /**
@@ -58,7 +57,6 @@
  * 
      
  */
 public class DADescriptor implements Comparable {
-
 	private String iURL;
 
 	private TreeSet iScopeSet;
@@ -67,15 +65,14 @@ public class DADescriptor implements Comparable {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pURL
 	 * @param pScopeSet
 	 *            - set of scope Strings
 	 * @param pAttributes
 	 *            - set of ServiceLocationAttributes
 	 */
-	public DADescriptor(String pURL, TreeSet pScopeSet,
-			List pAttributes) {
+	public DADescriptor(String pURL, TreeSet pScopeSet, List pAttributes) {
 		this.iURL = pURL;
 		this.iScopeSet = pScopeSet;
 		this.iAttributes = pAttributes;
@@ -83,7 +80,7 @@ public DADescriptor(String pURL, TreeSet pScopeSet,
 
 	/**
 	 * getURL
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getURL() {
@@ -92,7 +89,7 @@ public String getURL() {
 
 	/**
 	 * hasScope
-	 * 
+	 *
 	 * @param pScope
 	 * @return boolean
 	 */
@@ -123,7 +120,7 @@ private void incHashCode(int pHashCode) {
 	/*
 	 * hashCode has to be independent of the order of scopes and attributes
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#hashCode()
 	 */
 	@Override
@@ -133,8 +130,7 @@ public int hashCode() {
 			Iterator itr;
 			if (this.iScopeSet != null) {
 				itr = this.iScopeSet.iterator();
-				while (itr.hasNext())
-					incHashCode(itr.next().hashCode());
+				while (itr.hasNext()) incHashCode(itr.next().hashCode());
 			}
 			if (this.iAttributes != null) {
 				itr = this.iAttributes.iterator();
@@ -142,8 +138,7 @@ public int hashCode() {
 				 * iHasCode is simply incremented, because attribute order
 				 * mustn't be considered.
 				 */
-				while (itr.hasNext())
-					this.iHashCode += itr.next().hashCode();
+				while (itr.hasNext()) this.iHashCode += itr.next().hashCode();
 			}
 		}
 		return this.iHashCode;
@@ -156,13 +151,11 @@ public String toString() {
 			Iterator itr = this.iScopeSet.iterator();
 			boolean more = false;
 			while (itr.hasNext()) {
-				if (more) strBuf.append(", ");
-				else more = true;
+				if (more) strBuf.append(", "); else more = true;
 				strBuf.append(itr.next());
 			}
 		}
 
 		return strBuf.toString();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/FunctionIDs.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/FunctionIDs.java
index b60609a..c118a2c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/FunctionIDs.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/FunctionIDs.java
@@ -44,7 +44,6 @@
  * FunctionIDs
  */
 public interface FunctionIDs {
-
 	/**
 	 * SRV_RQST
 	 */
@@ -109,5 +108,4 @@ public interface FunctionIDs {
 	 * LAST_ID
 	 */
 	public static final int LAST_ID = SA_ADVERT;
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgFactory.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgFactory.java
index b8c05df..ff1c65a 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgFactory.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgFactory.java
@@ -44,33 +44,30 @@
 import java.io.InputStream;
 import java.net.DatagramPacket;
 import java.net.Socket;
-
-import org.metricshub.wbem.sblim.slp.internal.msg.FunctionIDs;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.internal.msg.FunctionIDs;
 
 /**
  * MsgFactory
- * 
+ *
  */
 public class MsgFactory implements FunctionIDs {
 
 	/**
 	 * FactoryEntry
-	 * 
+	 *
 	 */
 	private interface FactoryEntry {
-
 		/**
 		 * parse
-		 * 
+		 *
 		 * @param pHdr
 		 * @param pInStr
 		 * @return SLPMessage
 		 * @throws ServiceLocationException
 		 * @throws IOException
 		 */
-		public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-				throws ServiceLocationException, IOException;
+		public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException;
 	}
 
 	private static FactoryEntry[] cFactoryArray;
@@ -82,86 +79,107 @@ private static void placeFactory(int pFnID, FactoryEntry pEntry) {
 	private static synchronized void createFactoryArray() {
 		if (cFactoryArray != null) return;
 		cFactoryArray = new FactoryEntry[LAST_ID - FIRST_ID + 1];
-		for (int i = 0; i < cFactoryArray.length; i++)
-			cFactoryArray[i] = null;
-		placeFactory(ATTR_RPLY, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return AttributeReply.parse(pHdr, pInStr);
+		for (int i = 0; i < cFactoryArray.length; i++) cFactoryArray[i] = null;
+		placeFactory(
+			ATTR_RPLY,
+			new FactoryEntry() {
+
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return AttributeReply.parse(pHdr, pInStr);
+				}
 			}
-		});
-		placeFactory(ATTR_RQST, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return AttributeRequest.parse(pHdr, pInStr);
+		);
+		placeFactory(
+			ATTR_RQST,
+			new FactoryEntry() {
+
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return AttributeRequest.parse(pHdr, pInStr);
+				}
 			}
-		});
-		placeFactory(DA_ADVERT, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return DAAdvert.parse(pHdr, pInStr);
+		);
+		placeFactory(
+			DA_ADVERT,
+			new FactoryEntry() {
+
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return DAAdvert.parse(pHdr, pInStr);
+				}
 			}
-		});
-		placeFactory(SA_ADVERT, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return SAAdvert.parse(pHdr, pInStr);
+		);
+		placeFactory(
+			SA_ADVERT,
+			new FactoryEntry() {
+
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return SAAdvert.parse(pHdr, pInStr);
+				}
 			}
-		});
-		placeFactory(SRV_ACK, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceAcknowledgment.parse(pHdr, pInStr);
+		);
+		placeFactory(
+			SRV_ACK,
+			new FactoryEntry() {
+
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return ServiceAcknowledgment.parse(pHdr, pInStr);
+				}
 			}
-		});
-		placeFactory(SRV_DEREG, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceDeregistration.parse(pHdr, pInStr);
+		);
+		placeFactory(
+			SRV_DEREG,
+			new FactoryEntry() {
+
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return ServiceDeregistration.parse(pHdr, pInStr);
+				}
 			}
-		});
-		placeFactory(SRV_REG, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceRegistration.parse(pHdr, pInStr);
+		);
+		placeFactory(
+			SRV_REG,
+			new FactoryEntry() {
+
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return ServiceRegistration.parse(pHdr, pInStr);
+				}
 			}
-		});
-		placeFactory(SRV_RPLY, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceReply.parse(pHdr, pInStr);
+		);
+		placeFactory(
+			SRV_RPLY,
+			new FactoryEntry() {
+
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return ServiceReply.parse(pHdr, pInStr);
+				}
 			}
-		});
-		placeFactory(SRV_RQST, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceRequest.parse(pHdr, pInStr);
+		);
+		placeFactory(
+			SRV_RQST,
+			new FactoryEntry() {
+
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return ServiceRequest.parse(pHdr, pInStr);
+				}
 			}
-		});
+		);
 		//
-		placeFactory(SRV_TYPE_RPLY, new FactoryEntry() {
+		placeFactory(
+			SRV_TYPE_RPLY,
+			new FactoryEntry() {
 
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceTypeReply.parse(pHdr, pInStr);
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return ServiceTypeReply.parse(pHdr, pInStr);
+				}
 			}
-		});
-		placeFactory(SRV_TYPE_RQST, new FactoryEntry() {
-
-			public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-					throws ServiceLocationException, IOException {
-				return ServiceTypeRequest.parse(pHdr, pInStr);
+		);
+		placeFactory(
+			SRV_TYPE_RQST,
+			new FactoryEntry() {
+
+				public SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+					return ServiceTypeRequest.parse(pHdr, pInStr);
+				}
 			}
-		});
+		);
 	}
 
 	private static FactoryEntry getFactory(int pFnID) {
@@ -171,7 +189,7 @@ private static FactoryEntry getFactory(int pFnID) {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pSock
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
@@ -183,7 +201,7 @@ public static SLPMessage parse(Socket pSock) throws ServiceLocationException, IO
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
@@ -195,33 +213,31 @@ public static SLPMessage parse(InputStream pInStr) throws ServiceLocationExcepti
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pPacket
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(DatagramPacket pPacket) throws ServiceLocationException,
-			IOException {
+	public static SLPMessage parse(DatagramPacket pPacket) throws ServiceLocationException, IOException {
 		return parse(new SLPInputStream(pPacket));
 	}
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(SLPInputStream pInStr) throws ServiceLocationException,
-			IOException {
+	public static SLPMessage parse(SLPInputStream pInStr) throws ServiceLocationException, IOException {
 		MsgHeader hdr = MsgHeader.parse(pInStr);
 		FactoryEntry factory = getFactory(hdr.getFunctionID());
 		if (factory == null) throw new ServiceLocationException(
-				ServiceLocationException.NOT_IMPLEMENTED, "FunctionID=" + hdr.getFunctionID()
-						+ " is not implemented!");
+			ServiceLocationException.NOT_IMPLEMENTED,
+			"FunctionID=" + hdr.getFunctionID() + " is not implemented!"
+		);
 		return factory.parse(hdr, pInStr);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgHeader.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgHeader.java
index f853487..1260edc 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgHeader.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/MsgHeader.java
@@ -43,9 +43,8 @@
 
 import java.io.IOException;
 import java.util.Random;
-
-import org.metricshub.wbem.sblim.slp.internal.Convert;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.internal.Convert;
 
 /*
  * SLP Header: 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8
@@ -58,35 +57,35 @@
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Language
  * Tag Length | Language Tag \
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * 
+ *
  * Message Type Abbreviation Function-ID
- * 
+ *
  * Service Request SrvRqst 1 Service Reply SrvRply 2 Service Registration SrvReg
  * 3 Service Deregister SrvDeReg 4 Service Acknowledge SrvAck 5 Attribute
  * Request AttrRqst 6 Attribute Reply AttrRply 7 DA Advertisement DAAdvert 8
  * Service Type Request SrvTypeRqst 9 Service Type Reply SrvTypeRply 10 SA
  * Advertisement SAAdvert 11
- * 
+ *
  * Length: @2 3 bytes length of the entire SLP message, header included.
- * 
+ *
  * Flags: @5 1 byte OVERFLOW (0x80): is set when a message's length exceeds what
  * can fit into a datagram. FRESH (0x40): is set on every new SrvReg. REQUEST
  * MCAST (0x20): is set when multicasting or broadcasting requests.
- * 
+ *
  * Reserved: @6 1 byte bits MUST be 0.
- * 
+ *
  * Next Extension Offset: @7 3 bytes is set to 0 unless extensions are used. The
  * first extension begins at 'offset' bytes, from the message's beginning. It is
  * placed after the SLP message data.
- * 
+ *
  * XID: @10 2 bytes is set to a unique value for each unique request. If the
  * request is retransmitted, the same XID is used. Replies set the XID to the
  * same value as the xid in the request. Only unsolicited DAAdverts are sent
  * with an XID of 0.
- * 
+ *
  * Language Tag Length: @12 2 bytes is the length in bytes of the Language Tag
  * field.
- * 
+ *
  * Language Tag: @14 The Language Tag in a reply MUST be the same as the
  * Language Tag in the request. This field must be encoded 1*8ALPHA *("-"
  * 1*8ALPHA).
@@ -94,10 +93,9 @@
 
 /**
  * MsgHeader
- * 
+ *
  */
 public class MsgHeader implements FunctionIDs {
-
 	/**
 	 * VERSION
 	 */
@@ -144,41 +142,40 @@ public class MsgHeader implements FunctionIDs {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pInStr
 	 * @return MsgHeader
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static MsgHeader parse(SLPInputStream pInStr) throws ServiceLocationException,
-			IOException {
+	public static MsgHeader parse(SLPInputStream pInStr) throws ServiceLocationException, IOException {
 		int version = pInStr.read8();
 		int fnID = pInStr.read8();
 		if (fnID < FIRST_ID || fnID > LAST_ID) throw new ServiceLocationException(
-				ServiceLocationException.PARSE_ERROR, "functionID:" + fnID + " is not supported!");
+			ServiceLocationException.PARSE_ERROR,
+			"functionID:" + fnID + " is not supported!"
+		);
 		// int len =
 		pInStr.read24(); // TODO: could be used for sanity checking
 		int flags = pInStr.read16();
 		pInStr.read24(); // skip extension
 		int XID = pInStr.read16();
 		String langTag = pInStr.readString();
-		return new MsgHeader(version, fnID, langTag, (flags & OVERFLOW) > 0, (flags & FRESH) > 0,
-				(flags & MCAST) > 0, XID);
+		return new MsgHeader(version, fnID, langTag, (flags & OVERFLOW) > 0, (flags & FRESH) > 0, (flags & MCAST) > 0, XID);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHdr
 	 */
 	public MsgHeader(MsgHeader pHdr) {
-		this(pHdr.iVersion, pHdr.iFunctionID, pHdr.iLangTag, pHdr.iOverflow, pHdr.iFresh,
-				pHdr.iMCast, pHdr.iXID);
+		this(pHdr.iVersion, pHdr.iFunctionID, pHdr.iLangTag, pHdr.iOverflow, pHdr.iFresh, pHdr.iMCast, pHdr.iXID);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pVersion
 	 * @param pFunctionID
 	 * @param pLangTag
@@ -187,8 +184,15 @@ public MsgHeader(MsgHeader pHdr) {
 	 * @param pMCast
 	 * @param pXID
 	 */
-	public MsgHeader(int pVersion, int pFunctionID, String pLangTag, boolean pOverflow,
-			boolean pFresh, boolean pMCast, int pXID) {
+	public MsgHeader(
+		int pVersion,
+		int pFunctionID,
+		String pLangTag,
+		boolean pOverflow,
+		boolean pFresh,
+		boolean pMCast,
+		int pXID
+	) {
 		this.iVersion = pVersion;
 		this.iFunctionID = pFunctionID;
 		this.iLangTag = pLangTag;
@@ -200,7 +204,7 @@ public MsgHeader(int pVersion, int pFunctionID, String pLangTag, boolean pOverfl
 
 	/**
 	 * getVersion
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getVersion() {
@@ -209,7 +213,7 @@ public int getVersion() {
 
 	/**
 	 * getFunctionID
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getFunctionID() {
@@ -218,7 +222,7 @@ public int getFunctionID() {
 
 	/**
 	 * getLangTag
-	 * 
+	 *
 	 * @return int
 	 */
 	public String getLangTag() {
@@ -227,7 +231,7 @@ public String getLangTag() {
 
 	/**
 	 * overflows
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean overflows() {
@@ -236,7 +240,7 @@ public boolean overflows() {
 
 	/**
 	 * fresh
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean fresh() {
@@ -245,7 +249,7 @@ public boolean fresh() {
 
 	/**
 	 * multicast
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean multicast() {
@@ -264,7 +268,7 @@ public int getXID() {
 	/**
 	 * The response have to contain the same XID of the request. So this setter
 	 * can be useful.
-	 * 
+	 *
 	 * @param pXID
 	 */
 	public void setXID(int pXID) {
@@ -273,7 +277,7 @@ public void setXID(int pXID) {
 
 	/**
 	 * getSize
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getSize() {
@@ -287,15 +291,14 @@ public int getSize() {
 	 */
 	/**
 	 * serialize
-	 * 
+	 *
 	 * @param pBodyLength
 	 * @param pOverflow
 	 * @param pSetMultiCastFlag
 	 * @param pKeepXID
 	 * @return byte[]
 	 */
-	public byte[] serialize(int pBodyLength, boolean pOverflow, boolean pSetMultiCastFlag,
-			boolean pKeepXID) {
+	public byte[] serialize(int pBodyLength, boolean pOverflow, boolean pSetMultiCastFlag, boolean pKeepXID) {
 		SLPOutputStream outStr = new SLPOutputStream();
 		outStr.writeNoChk8(VERSION);
 		outStr.writeNoChk8(this.iFunctionID);
@@ -335,5 +338,4 @@ private static int getNewXID() {
 		if (cXID == 0) ++cXID;
 		return ++cXID;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ReplyMessage.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ReplyMessage.java
index 79a662c..b544282 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ReplyMessage.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ReplyMessage.java
@@ -46,15 +46,14 @@
 
 /**
  * ReplyMessage
- * 
+ *
  */
 public abstract class ReplyMessage extends SLPMessage {
-
 	private int iErrorCode;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pFunctionID
 	 * @param pErrorCode
 	 */
@@ -65,7 +64,7 @@ public ReplyMessage(int pFunctionID, int pErrorCode) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pFunctionID
 	 * @param pLangTag
 	 * @param pErrorCode
@@ -77,7 +76,7 @@ public ReplyMessage(int pFunctionID, String pLangTag, int pErrorCode) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pErrorCode
 	 */
@@ -88,7 +87,7 @@ public ReplyMessage(MsgHeader pHeader, int pErrorCode) {
 
 	/**
 	 * getErrorCode
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getErrorCode() {
@@ -97,16 +96,15 @@ public int getErrorCode() {
 
 	/**
 	 * getResultIterator
-	 * 
+	 *
 	 * @return Iterator
 	 */
 	public abstract Iterator getResultIterator();
 
 	/**
 	 * getExceptionIterator
-	 * 
+	 *
 	 * @return Iterator
 	 */
 	public abstract Iterator getExceptionIterator();
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/RequestMessage.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/RequestMessage.java
index 669ddf0..4fd3209 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/RequestMessage.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/RequestMessage.java
@@ -47,38 +47,35 @@
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
-
-import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
 
 /**
  * RequestMessage
- * 
+ *
  */
 public abstract class RequestMessage extends SLPMessage {
-
 	private SortedSet iPrevResponderSet;
 
 	private List iScopeList;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pFunctionID
 	 * @param pPrevResponderSet
 	 *            - set of address strings
 	 * @param pScopeList
 	 *            - list of scope strings
 	 */
-	public RequestMessage(int pFunctionID, SortedSet pPrevResponderSet,
-			List pScopeList) {
+	public RequestMessage(int pFunctionID, SortedSet pPrevResponderSet, List pScopeList) {
 		super(pFunctionID);
 		init(pPrevResponderSet, pScopeList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pFunctionID
 	 * @param pLangTag
 	 * @param pPrevResponderSet
@@ -86,30 +83,33 @@ public RequestMessage(int pFunctionID, SortedSet pPrevResponderSet,
 	 * @param pScopeList
 	 *            - list of scope strings
 	 */
-	public RequestMessage(int pFunctionID, String pLangTag, SortedSet pPrevResponderSet,
-			List pScopeList) {
+	public RequestMessage(
+		int pFunctionID,
+		String pLangTag,
+		SortedSet pPrevResponderSet,
+		List pScopeList
+	) {
 		super(pFunctionID, pLangTag);
 		init(pPrevResponderSet, pScopeList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pPrevResponderSet
 	 *            - set of address strings
 	 * @param pScopeList
 	 *            - list of scope strings
 	 */
-	public RequestMessage(MsgHeader pHeader, SortedSet pPrevResponderSet,
-			List pScopeList) {
+	public RequestMessage(MsgHeader pHeader, SortedSet pPrevResponderSet, List pScopeList) {
 		super(pHeader);
 		init(pPrevResponderSet, pScopeList);
 	}
 
 	/**
 	 * getPrevResponderSet
-	 * 
+	 *
 	 * @return SortedSet
 	 */
 	public SortedSet getPrevResponderSet() {
@@ -118,7 +118,7 @@ public SortedSet getPrevResponderSet() {
 
 	/**
 	 * getPrevRespondersItr
-	 * 
+	 *
 	 * @return Iterator
 	 */
 	public Iterator getPrevRespondersItr() {
@@ -127,7 +127,7 @@ public Iterator getPrevRespondersItr() {
 
 	/**
 	 * updatePrevResponders
-	 * 
+	 *
 	 * @param pResponder
 	 * @return boolean
 	 */
@@ -138,7 +138,7 @@ public boolean updatePrevResponders(String pResponder) {
 
 	/**
 	 * getScopeList
-	 * 
+	 *
 	 * @return List of scope strings
 	 */
 	public List getScopeList() {
@@ -147,7 +147,7 @@ public List getScopeList() {
 
 	/**
 	 * isAllowedResponseType
-	 * 
+	 *
 	 * @param pRspMsg
 	 * @return boolean
 	 */
@@ -156,37 +156,37 @@ public boolean isAllowedResponseType(SLPMessage pRspMsg) {
 		int id = pRspMsg.getFunctionID();
 		int[] rspIDs = getAllowedResponseIDs();
 		if (rspIDs == null) return true;
-		for (int i = 0; i < rspIDs.length; i++)
-			if (id == rspIDs[i]) return true;
+		for (int i = 0; i < rspIDs.length; i++) if (id == rspIDs[i]) return true;
 		return false;
 	}
 
 	/**
 	 * serializeWithoutResponders
-	 * 
+	 *
 	 * @param pSetMulticastFlag
 	 * @param pDatagramLimited
 	 * @param pKeepXID
 	 * @return byte[]
 	 * @throws ServiceLocationException
 	 */
-	public byte[] serializeWithoutResponders(boolean pSetMulticastFlag, boolean pDatagramLimited,
-			boolean pKeepXID) throws ServiceLocationException {
-
+	public byte[] serializeWithoutResponders(boolean pSetMulticastFlag, boolean pDatagramLimited, boolean pKeepXID)
+		throws ServiceLocationException {
 		return serialize(pSetMulticastFlag, pDatagramLimited, pKeepXID, new SkipResponders());
 	}
 
 	@Override
 	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pSkipResponders)
-			throws ServiceLocationException {
-		if (!pOutStr.writeStringList(pSkipResponders == null ? getPrevRespondersItr() : null)) throw new ServiceLocationException(
-				ServiceLocationException.PREVIOUS_RESPONDER_OVERFLOW,
-				"Previous responder list has overflowed!");
+		throws ServiceLocationException {
+		if (
+			!pOutStr.writeStringList(pSkipResponders == null ? getPrevRespondersItr() : null)
+		) throw new ServiceLocationException(
+			ServiceLocationException.PREVIOUS_RESPONDER_OVERFLOW,
+			"Previous responder list has overflowed!"
+		);
 		return serializeRequestBody(pOutStr);
 	}
 
-	protected abstract boolean serializeRequestBody(SLPOutputStream pOutStr)
-			throws ServiceLocationException;
+	protected abstract boolean serializeRequestBody(SLPOutputStream pOutStr) throws ServiceLocationException;
 
 	protected abstract int[] getAllowedResponseIDs();
 
@@ -201,5 +201,4 @@ class SkipResponders extends SerializeOption {
 		 * serialization have to be skipped
 		 */
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SAAdvert.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SAAdvert.java
index b65911b..82b48be 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SAAdvert.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SAAdvert.java
@@ -47,7 +47,6 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 
@@ -63,15 +62,14 @@
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | # auth
  * blocks | authentication block (if any) \
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * 
+ *
  */
 
 /**
  * SAAdvert message
- * 
+ *
  */
 public class SAAdvert extends ReplyMessage {
-
 	private String iURLStr;
 
 	private List iScopeList;
@@ -80,37 +78,34 @@ public class SAAdvert extends ReplyMessage {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new SAAdvert(pHdr, pInStr.readString(), pInStr.readStringList(), pInStr
-				.readAttributeList());
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+		return new SAAdvert(pHdr, pInStr.readString(), pInStr.readStringList(), pInStr.readAttributeList());
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pURLStr
 	 * @param pScopeList
 	 *            - list of scope strings
 	 * @param pAttrList
 	 *            - list of ServiceLocationAttributes
 	 */
-	public SAAdvert(String pURLStr, List pScopeList,
-			List pAttrList) {
+	public SAAdvert(String pURLStr, List pScopeList, List pAttrList) {
 		super(SA_ADVERT, 0);
 		init(pURLStr, pScopeList, pAttrList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLangTag
 	 * @param pURLStr
 	 * @param pScopeList
@@ -118,15 +113,14 @@ public SAAdvert(String pURLStr, List pScopeList,
 	 * @param pAttrList
 	 *            - list of ServiceLocationAttributes
 	 */
-	public SAAdvert(String pLangTag, String pURLStr, List pScopeList,
-			List pAttrList) {
+	public SAAdvert(String pLangTag, String pURLStr, List pScopeList, List pAttrList) {
 		super(SA_ADVERT, pLangTag, 0);
 		init(pURLStr, pScopeList, pAttrList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pURLStr
 	 * @param pScopeList
@@ -134,8 +128,12 @@ public SAAdvert(String pLangTag, String pURLStr, List pScopeList,
 	 * @param pAttrList
 	 *            - list of ServiceLocationAttributes
 	 */
-	public SAAdvert(MsgHeader pHeader, String pURLStr, List pScopeList,
-			List pAttrList) {
+	public SAAdvert(
+		MsgHeader pHeader,
+		String pURLStr,
+		List pScopeList,
+		List pAttrList
+	) {
 		super(pHeader, 0);
 		init(pURLStr, pScopeList, pAttrList);
 	}
@@ -152,12 +150,14 @@ public Iterator getResultIterator() {
 	 */
 	@Override
 	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write(this.iURLStr) && pOutStr.writeStringList(this.iScopeList)
-				&& pOutStr.writeAttributeList(this.iAttrList);
+		return (
+			pOutStr.write(this.iURLStr) &&
+			pOutStr.writeStringList(this.iScopeList) &&
+			pOutStr.writeAttributeList(this.iAttrList)
+		);
 	}
 
-	private void init(String pURLStr, List pScopeList,
-			List pAttrList) {
+	private void init(String pURLStr, List pScopeList, List pAttrList) {
 		this.iURLStr = pURLStr;
 		this.iScopeList = pScopeList;
 		this.iAttrList = pAttrList;
@@ -168,5 +168,4 @@ public Iterator getExceptionIterator() {
 		// this message doesn't have exception table
 		return null;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPInputStream.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPInputStream.java
index 93a0d2e..b81fa4f 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPInputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPInputStream.java
@@ -58,28 +58,26 @@
 import java.util.SortedSet;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 import org.metricshub.wbem.sblim.slp.ServiceType;
 import org.metricshub.wbem.sblim.slp.ServiceURL;
 import org.metricshub.wbem.sblim.slp.internal.Convert;
 import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
 import org.metricshub.wbem.sblim.slp.internal.TRC;
-import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 
 /**
  * Helps the parsing of the bytes of SLP messages.
- * 
+ *
  */
 public class SLPInputStream {
-
 	private InputStream iInStr;
 
 	private final byte[] iBBuf = new byte[4];
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pBytes
 	 */
 	public SLPInputStream(byte[] pBytes) {
@@ -88,7 +86,7 @@ public SLPInputStream(byte[] pBytes) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pSock
 	 * @throws IOException
 	 */
@@ -98,7 +96,7 @@ public SLPInputStream(Socket pSock) throws IOException {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pInStr
 	 */
 	public SLPInputStream(InputStream pInStr) {
@@ -107,7 +105,7 @@ public SLPInputStream(InputStream pInStr) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pPacket
 	 */
 	public SLPInputStream(DatagramPacket pPacket) {
@@ -116,7 +114,7 @@ public SLPInputStream(DatagramPacket pPacket) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pBytes
 	 * @param pOffset
 	 * @param pLength
@@ -127,7 +125,7 @@ public SLPInputStream(byte[] pBytes, int pOffset, int pLength) {
 
 	/**
 	 * readString
-	 * 
+	 *
 	 * @return String
 	 * @throws ServiceLocationException
 	 * @throws IOException
@@ -138,7 +136,7 @@ public String readString() throws ServiceLocationException, IOException {
 
 	/**
 	 * readStringSet
-	 * 
+	 *
 	 * @return SortedSet of Strings
 	 * @throws ServiceLocationException
 	 * @throws IOException
@@ -151,7 +149,7 @@ public SortedSet readStringSet() throws ServiceLocationException, IOExce
 
 	/**
 	 * readStringList
-	 * 
+	 *
 	 * @return List of Strings
 	 * @throws ServiceLocationException
 	 * @throws IOException
@@ -164,7 +162,7 @@ public List readStringList() throws ServiceLocationException, IOExceptio
 
 	/**
 	 * readAttribute
-	 * 
+	 *
 	 * @return ServiceLocationAttribute
 	 * @throws ServiceLocationException
 	 * @throws IOException
@@ -176,20 +174,19 @@ public ServiceLocationAttribute readAttribute() throws ServiceLocationException,
 
 	/**
 	 * readAttributeList
-	 * 
+	 *
 	 * @return List of ServiceLocationAttributes
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public List readAttributeList() throws ServiceLocationException,
-			IOException {
+	public List readAttributeList() throws ServiceLocationException, IOException {
 		String str = readRawString();
 		return str == null ? null : new AttrListParser(str).getList();
 	}
 
 	/**
 	 * # of AttrAuths |(if present) Attribute Authentication Blocks...
-	 * 
+	 *
 	 * @return null
 	 * @throws ServiceLocationException
 	 * @throws IOException
@@ -199,8 +196,9 @@ public List readAuthBlockList() throws ServiceLocationException, IOException
 		if (blockCntInt == null) return null;
 		int blockCnt = blockCntInt.intValue();
 		if (blockCnt != 0) throw new ServiceLocationException(
-				ServiceLocationException.NOT_IMPLEMENTED,
-				"Handling of authentication blocks is not implemented! blockCount = " + blockCnt);
+			ServiceLocationException.NOT_IMPLEMENTED,
+			"Handling of authentication blocks is not implemented! blockCount = " + blockCnt
+		);
 		return null;
 	}
 
@@ -238,18 +236,17 @@ public ServiceURL readURL() throws ServiceLocationException, IOException {
 
 	/**
 	 * readUrlList
-	 * 
+	 *
 	 * @param pURLExceptions
 	 * @return List of valid ServiceURLs
 	 * @throws ServiceLocationException
 	 * @throws IOException
-	 * 
+	 *
 	 *             Add URL to list only if it is valid URL i.e. no exception is
 	 *             thrown by parser
-	 * 
+	 *
 	 */
-	public List readUrlList(List pURLExceptions)
-			throws ServiceLocationException, IOException {
+	public List readUrlList(List pURLExceptions) throws ServiceLocationException, IOException {
 		Integer cntInt = doRead16();
 		if (cntInt == null) return null;
 		int cnt = cntInt.intValue();
@@ -270,7 +267,7 @@ public List readUrlList(List pURLExceptions)
 
 	/**
 	 * readServiceType
-	 * 
+	 *
 	 * @return ServiceType
 	 * @throws ServiceLocationException
 	 * @throws IOException
@@ -282,7 +279,7 @@ public ServiceType readServiceType() throws ServiceLocationException, IOExceptio
 
 	/**
 	 * readServTypeList
-	 * 
+	 *
 	 * @return List of ServiceTypes
 	 * @throws ServiceLocationException
 	 * @throws IOException
@@ -298,57 +295,65 @@ public List readServTypeList() throws ServiceLocationException, IOE
 
 	/**
 	 * read8
-	 * 
+	 *
 	 * @return int
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
 	public int read8() throws ServiceLocationException, IOException {
 		Integer res = doRead8();
-		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-				"Failed to read byte field!");
+		if (res == null) throw new ServiceLocationException(
+			ServiceLocationException.PARSE_ERROR,
+			"Failed to read byte field!"
+		);
 		return res.intValue();
 	}
 
 	/**
 	 * read16
-	 * 
+	 *
 	 * @return int
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
 	public int read16() throws ServiceLocationException, IOException {
 		Integer res = doRead16();
-		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-				"Failed to read 2-byte-long field!");
+		if (res == null) throw new ServiceLocationException(
+			ServiceLocationException.PARSE_ERROR,
+			"Failed to read 2-byte-long field!"
+		);
 		return res.intValue();
 	}
 
 	/**
 	 * read24
-	 * 
+	 *
 	 * @return int
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
 	public int read24() throws ServiceLocationException, IOException {
 		Integer res = doRead24();
-		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-				"Failed to read 3-byte-long field!");
+		if (res == null) throw new ServiceLocationException(
+			ServiceLocationException.PARSE_ERROR,
+			"Failed to read 3-byte-long field!"
+		);
 		return res.intValue();
 	}
 
 	/**
 	 * read32
-	 * 
+	 *
 	 * @return long
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
 	public long read32() throws ServiceLocationException, IOException {
 		Long res = doRead32();
-		if (res == null) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR,
-				"Failed to read 4-byte-long field!");
+		if (res == null) throw new ServiceLocationException(
+			ServiceLocationException.PARSE_ERROR,
+			"Failed to read 4-byte-long field!"
+		);
 		return res.longValue();
 	}
 
@@ -366,8 +371,7 @@ private Integer doRead16() throws IOException {
 	private Integer doRead24() throws IOException {
 		int cnt = this.iInStr.read(this.iBBuf, 0, 3);
 		if (cnt != 3) return null;
-		return Integer.valueOf((this.iBBuf[0] & 0xff) << 16 | (this.iBBuf[1] & 0xff) << 8
-				| this.iBBuf[2] & 0xff);
+		return Integer.valueOf((this.iBBuf[0] & 0xff) << 16 | (this.iBBuf[1] & 0xff) << 8 | this.iBBuf[2] & 0xff);
 	}
 
 	private Long doRead32() throws IOException {
@@ -395,17 +399,14 @@ private String readRawString() throws ServiceLocationException, IOException {
 		}
 	}
 
-	private void readStringCollection(Collection pCol) throws ServiceLocationException,
-			IOException {
+	private void readStringCollection(Collection pCol) throws ServiceLocationException, IOException {
 		String rawListStr = readRawString();
 		if (rawListStr == null) return;
 		StringTokenizer tokenizer = new StringTokenizer(rawListStr, ",");
-		while (tokenizer.hasMoreElements())
-			pCol.add(Convert.unescape(tokenizer.nextToken()));
+		while (tokenizer.hasMoreElements()) pCol.add(Convert.unescape(tokenizer.nextToken()));
 	}
 
 	private static class AttrListParser {
-
 		private int iPos = 0;
 
 		private String iAttrListStr;
@@ -414,7 +415,7 @@ private static class AttrListParser {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pAttrListStr
 		 * @throws ServiceLocationException
 		 */
@@ -430,7 +431,7 @@ public AttrListParser(String pAttrListStr) throws ServiceLocationException {
 
 		/**
 		 * getList
-		 * 
+		 *
 		 * @return List of ServiceLocationAttributes
 		 */
 		public List getList() {
@@ -451,17 +452,17 @@ private String readEntry() throws ServiceLocationException {
 				char ch = this.iAttrListStr.charAt(this.iPos);
 				if (ch == '(') {
 					if (inBlock || this.iPos != startPos) throw new ServiceLocationException(
-							ServiceLocationException.PARSE_ERROR, invalidChar('('));
+						ServiceLocationException.PARSE_ERROR,
+						invalidChar('(')
+					);
 					inBlock = true;
 				} else if (ch == ')') {
-					if (!inBlock) throw new ServiceLocationException(
-							ServiceLocationException.PARSE_ERROR, invalidChar(')'));
+					if (!inBlock) throw new ServiceLocationException(ServiceLocationException.PARSE_ERROR, invalidChar(')'));
 					if (this.iPos == lastIdx) return this.iAttrListStr.substring(startPos);
 					inBlock = false;
 				} else {
 					if (inBlock) {
-						if (this.iPos == lastIdx)
-						/*
+						if (this.iPos == lastIdx) /*
 						 * throw new ServiceLocationException(
 						 * ServiceLocationException.PARSE_ERROR, "There is no
 						 * ')' for '(' !" );
@@ -472,12 +473,15 @@ private String readEntry() throws ServiceLocationException {
 							++this.iPos;
 							return this.iAttrListStr.substring(startPos, this.iPos - 1);
 						}
-						if (this.iPos == lastIdx) { return this.iAttrListStr.substring(startPos); }
+						if (this.iPos == lastIdx) {
+							return this.iAttrListStr.substring(startPos);
+						}
 					}
 				}
 				if (this.iPos == lastIdx) throw new ServiceLocationException(
-						ServiceLocationException.PARSE_ERROR, "Unexpected end of Attribute list:\n"
-								+ this.iAttrListStr);
+					ServiceLocationException.PARSE_ERROR,
+					"Unexpected end of Attribute list:\n" + this.iAttrListStr
+				);
 				++this.iPos;
 			}
 		}
@@ -486,17 +490,14 @@ private String readEntry() throws ServiceLocationException {
 		 * @param ch
 		 */
 		private String invalidChar(char ch) {
-			return "Invalid '(' character in Attribute list:\n" + this.iAttrListStr
-					+ "\nat position: " + this.iPos;
+			return "Invalid '(' character in Attribute list:\n" + this.iAttrListStr + "\nat position: " + this.iPos;
 		}
-
 	}
 
 	/**
 	 * @param pMsg
 	 */
 	static void debug(String pMsg) {
-	// System.out.println(pMsg);
+		// System.out.println(pMsg);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPMessage.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPMessage.java
index b09caa8..6a4f51c 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPMessage.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPMessage.java
@@ -22,9 +22,6 @@
 
 package org.metricshub.wbem.sblim.slp.internal.msg;
 
-import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
-import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
-
 /*-
  * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
  * WBEM Java Client
@@ -46,13 +43,14 @@
  */
 
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
+import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
 
 /**
  * SLPMessage
- * 
+ *
  */
 public abstract class SLPMessage implements FunctionIDs {
-
 	// cache it for instance lifetime, do not parse always
 	private final int iMaxDatagramSize = SLPConfig.getGlobalCfg().getMTU();
 
@@ -60,7 +58,7 @@ public abstract class SLPMessage implements FunctionIDs {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pFunctionID
 	 */
 	public SLPMessage(int pFunctionID) {
@@ -69,18 +67,17 @@ public SLPMessage(int pFunctionID) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pFunctionID
 	 * @param pLangTag
 	 */
 	public SLPMessage(int pFunctionID, String pLangTag) {
-		this(new MsgHeader(MsgHeader.VERSION, pFunctionID, pLangTag, false, pFunctionID == SRV_REG,
-				false, 0));
+		this(new MsgHeader(MsgHeader.VERSION, pFunctionID, pLangTag, false, pFunctionID == SRV_REG, false, 0));
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 */
 	public SLPMessage(MsgHeader pHeader) {
@@ -89,7 +86,7 @@ public SLPMessage(MsgHeader pHeader) {
 
 	/**
 	 * getHeader
-	 * 
+	 *
 	 * @return MsgHeader
 	 */
 	public MsgHeader getHeader() {
@@ -98,7 +95,7 @@ public MsgHeader getHeader() {
 
 	/**
 	 * getVersion
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getVersion() {
@@ -107,7 +104,7 @@ public int getVersion() {
 
 	/**
 	 * getFunctionID
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getFunctionID() {
@@ -116,7 +113,7 @@ public int getFunctionID() {
 
 	/**
 	 * getLangTag
-	 * 
+	 *
 	 * @return String
 	 */
 	public String getLangTag() {
@@ -125,7 +122,7 @@ public String getLangTag() {
 
 	/**
 	 * overflows
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean overflows() {
@@ -134,7 +131,7 @@ public boolean overflows() {
 
 	/**
 	 * fresh
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean fresh() {
@@ -143,7 +140,7 @@ public boolean fresh() {
 
 	/**
 	 * multicast
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public boolean multicast() {
@@ -152,7 +149,7 @@ public boolean multicast() {
 
 	/**
 	 * getXID
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getXID() {
@@ -169,7 +166,7 @@ public void setXID(int pXID) {
 
 	/**
 	 * serialize
-	 * 
+	 *
 	 * @param pSetMulticastFlag
 	 * @param pDatagramLimited
 	 * @param pKeepXID
@@ -177,13 +174,13 @@ public void setXID(int pXID) {
 	 * @throws ServiceLocationException
 	 */
 	public byte[] serialize(boolean pSetMulticastFlag, boolean pDatagramLimited, boolean pKeepXID)
-			throws ServiceLocationException {
+		throws ServiceLocationException {
 		return serialize(pSetMulticastFlag, pDatagramLimited, pKeepXID, null);
 	}
 
 	/**
 	 * serialize
-	 * 
+	 *
 	 * @param pSetMulticastFlag
 	 * @param pDatagramLimited
 	 * @param pKeepXID
@@ -193,14 +190,19 @@ public byte[] serialize(boolean pSetMulticastFlag, boolean pDatagramLimited, boo
 	 * @return byte[]
 	 * @throws ServiceLocationException
 	 */
-	public byte[] serialize(boolean pSetMulticastFlag, boolean pDatagramLimited, boolean pKeepXID,
-			SerializeOption pOption) throws ServiceLocationException {
-		SLPOutputStream bodyOutStr = new SLPOutputStream(pDatagramLimited ? this.iMaxDatagramSize
-				- this.iHeader.getSize() : -1);
+	public byte[] serialize(
+		boolean pSetMulticastFlag,
+		boolean pDatagramLimited,
+		boolean pKeepXID,
+		SerializeOption pOption
+	)
+		throws ServiceLocationException {
+		SLPOutputStream bodyOutStr = new SLPOutputStream(
+			pDatagramLimited ? this.iMaxDatagramSize - this.iHeader.getSize() : -1
+		);
 		boolean fit = serializeBody(bodyOutStr, pOption);
 		byte[] bodyBytes = bodyOutStr.toByteArray();
-		byte[] headerBytes = this.iHeader.serialize(bodyBytes.length, !fit, pSetMulticastFlag,
-				pKeepXID);
+		byte[] headerBytes = this.iHeader.serialize(bodyBytes.length, !fit, pSetMulticastFlag, pKeepXID);
 		byte[] bytes = new byte[headerBytes.length + bodyBytes.length];
 		System.arraycopy(headerBytes, 0, bytes, 0, headerBytes.length);
 		System.arraycopy(bodyBytes, 0, bytes, headerBytes.length, bodyBytes.length);
@@ -212,11 +214,10 @@ public byte[] serialize(boolean pSetMulticastFlag, boolean pDatagramLimited, boo
 	 *         limit)
 	 */
 	protected abstract boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption)
-			throws ServiceLocationException;
+		throws ServiceLocationException;
 
 	@Override
 	public String toString() {
 		return super.toString() + " " + getXID();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPOutputStream.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPOutputStream.java
index e4ba0f6..ef3ec73 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPOutputStream.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SLPOutputStream.java
@@ -47,7 +47,6 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
 import org.metricshub.wbem.sblim.slp.ServiceType;
 import org.metricshub.wbem.sblim.slp.ServiceURL;
@@ -57,10 +56,9 @@
 
 /**
  * SLPOutputStream helps the building of SLP message bytes
- * 
+ *
  */
 public class SLPOutputStream {
-
 	private static final int MAX_FIELD_SIZE = 65535;
 
 	private static final byte[] EMPTY_BYTES = new byte[0];
@@ -78,7 +76,7 @@ public SLPOutputStream() {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pStreamLimit
 	 */
 	public SLPOutputStream(int pStreamLimit) {
@@ -87,7 +85,7 @@ public SLPOutputStream(int pStreamLimit) {
 
 	/**
 	 * size
-	 * 
+	 *
 	 * @return int
 	 */
 	public int size() {
@@ -96,7 +94,7 @@ public int size() {
 
 	/**
 	 * freeSpace
-	 * 
+	 *
 	 * @return int
 	 */
 	public int freeSpace() {
@@ -105,7 +103,7 @@ public int freeSpace() {
 
 	/**
 	 * toByteArray
-	 * 
+	 *
 	 * @return byte[]
 	 */
 	public byte[] toByteArray() {
@@ -114,7 +112,7 @@ public byte[] toByteArray() {
 
 	/**
 	 * write
-	 * 
+	 *
 	 * @param pBytes
 	 * @return boolean
 	 */
@@ -126,7 +124,7 @@ public boolean write(byte[] pBytes) {
 
 	/**
 	 * write
-	 * 
+	 *
 	 * @param pServType
 	 * @return boolean
 	 */
@@ -169,7 +167,7 @@ public boolean write(ServiceURL pURL) {
 
 	/**
 	 * writeURLList
-	 * 
+	 *
 	 * @param pURLList
 	 * @return boolean
 	 */
@@ -190,7 +188,7 @@ public boolean writeURLList(List pURLList) {
 
 	/**
 	 * writeServTypeList
-	 * 
+	 *
 	 * @param pServTypeList
 	 * @return boolean
 	 */
@@ -200,21 +198,20 @@ public boolean writeServTypeList(List pServTypeList) {
 
 	/**
 	 * writeServTypeList
-	 * 
+	 *
 	 * @param pServTypeItr
 	 * @return boolean
 	 */
 	public boolean writeServTypeList(Iterator pServTypeItr) {
 		if (pServTypeItr == null) return writeStringList((Iterator) null);
 		ArrayList servTypeList = new ArrayList();
-		while (pServTypeItr.hasNext())
-			servTypeList.add(((ServiceType) pServTypeItr.next()).toString());
+		while (pServTypeItr.hasNext()) servTypeList.add(((ServiceType) pServTypeItr.next()).toString());
 		return writeStringList(servTypeList);
 	}
 
 	/**
 	 * writeAttributeList
-	 * 
+	 *
 	 * @param pAttrList
 	 * @return boolean
 	 */
@@ -224,35 +221,34 @@ public boolean writeAttributeList(List pAttrList) {
 
 	/**
 	 * writeAttributeList
-	 * 
+	 *
 	 * @param pAttrItr
 	 * @return boolean
 	 */
 	public boolean writeAttributeList(Iterator pAttrItr) {
 		if (pAttrItr == null) return writeStringList((Iterator) null);
 		ArrayList attrStrList = new ArrayList();
-		while (pAttrItr.hasNext())
-			attrStrList.add(AttributeHandler
-					.buildString((ServiceLocationAttribute) pAttrItr.next()));
+		while (pAttrItr.hasNext()) attrStrList.add(
+			AttributeHandler.buildString((ServiceLocationAttribute) pAttrItr.next())
+		);
 		return writeStringList(attrStrList, null);
 	}
 
 	/**
 	 * # of AttrAuths |(if present) Attribute Authentication Blocks...
-	 * 
+	 *
 	 * @param pAuthBlockList
 	 * @return boolean
 	 */
 	public boolean writeAuthBlockList(List pAuthBlockList) {
 		int cnt = pAuthBlockList == null ? 0 : pAuthBlockList.size();
-		if (cnt != 0) TRC
-				.error("Handling of non empty authentication block list is not implemented!");
+		if (cnt != 0) TRC.error("Handling of non empty authentication block list is not implemented!");
 		return write8(0);
 	}
 
 	/**
 	 * write
-	 * 
+	 *
 	 * @param pStr
 	 * @return boolean
 	 */
@@ -262,14 +258,13 @@ public boolean write(String pStr) {
 
 	/**
 	 * write
-	 * 
+	 *
 	 * @param pStr
 	 * @param pReservedChars
 	 * @return boolean
 	 */
 	public boolean write(String pStr, String pReservedChars) {
-		byte[] bytes = pStr == null ? EMPTY_BYTES : Convert.getBytes(Convert.escape(pStr,
-				pReservedChars));
+		byte[] bytes = pStr == null ? EMPTY_BYTES : Convert.getBytes(Convert.escape(pStr, pReservedChars));
 		if (bytes.length > MAX_FIELD_SIZE) return false;
 		if (freeSpace() < bytes.length + 2) return false;
 		writeNoChk16(bytes.length);
@@ -279,7 +274,7 @@ public boolean write(String pStr, String pReservedChars) {
 
 	/**
 	 * writeStringList
-	 * 
+	 *
 	 * @param pStrList
 	 * @return boolean
 	 */
@@ -289,7 +284,7 @@ public boolean writeStringList(List pStrList) {
 
 	/**
 	 * writeStringList
-	 * 
+	 *
 	 * @param pStrListItr
 	 * @return boolean
 	 */
@@ -299,7 +294,7 @@ public boolean writeStringList(Iterator pStrListItr) {
 
 	/**
 	 * writeStringList
-	 * 
+	 *
 	 * @param pStrList
 	 * @param pReservedChars
 	 * @return boolean
@@ -310,7 +305,7 @@ public boolean writeStringList(List pStrList, String pReservedChars) {
 
 	/**
 	 * writeStringList
-	 * 
+	 *
 	 * @param pStrListItr
 	 * @param pReservedChars
 	 * @return true if all list items are written to the stream, otherwise false
@@ -344,7 +339,7 @@ public boolean writeStringList(Iterator pStrListItr, String pReservedCha
 
 	/**
 	 * write8
-	 * 
+	 *
 	 * @param pValue
 	 * @return boolean
 	 */
@@ -356,7 +351,7 @@ public boolean write8(int pValue) {
 
 	/**
 	 * write16
-	 * 
+	 *
 	 * @param pValue
 	 * @return boolean
 	 */
@@ -368,7 +363,7 @@ public boolean write16(int pValue) {
 
 	/**
 	 * write24
-	 * 
+	 *
 	 * @param pValue
 	 * @return boolean
 	 */
@@ -380,7 +375,7 @@ public boolean write24(int pValue) {
 
 	/**
 	 * write32
-	 * 
+	 *
 	 * @param pValue
 	 * @return boolean
 	 */
@@ -392,7 +387,7 @@ public boolean write32(long pValue) {
 
 	/**
 	 * writeNoChk
-	 * 
+	 *
 	 * @param pBytes
 	 */
 	public void writeNoChk(byte[] pBytes) {
@@ -401,7 +396,7 @@ public void writeNoChk(byte[] pBytes) {
 
 	/**
 	 * writeNoChk8
-	 * 
+	 *
 	 * @param pValue
 	 */
 	public void writeNoChk8(int pValue) {
@@ -410,7 +405,7 @@ public void writeNoChk8(int pValue) {
 
 	/**
 	 * writeNoChk16
-	 * 
+	 *
 	 * @param pValue
 	 */
 	public void writeNoChk16(int pValue) {
@@ -420,7 +415,7 @@ public void writeNoChk16(int pValue) {
 
 	/**
 	 * writeNoChk24
-	 * 
+	 *
 	 * @param pValue
 	 */
 	public void writeNoChk24(int pValue) {
@@ -430,7 +425,7 @@ public void writeNoChk24(int pValue) {
 
 	/**
 	 * writeNoChk32
-	 * 
+	 *
 	 * @param pValue
 	 */
 	public void writeNoChk32(long pValue) {
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SerializeOption.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SerializeOption.java
index 40a1627..ed7e464 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SerializeOption.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/SerializeOption.java
@@ -43,10 +43,9 @@
 /**
  * Inherited classes of SerializeOption provide additional serialization
  * parameters for the inherited SLPMessage classes.
- * 
+ *
  */
 public abstract class SerializeOption {
-
 	/*
 	 * Inherited classes add the methods.
 	 */
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java
index 64b1769..279842f 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceAcknowledgment.java
@@ -45,32 +45,30 @@
 
 import java.io.IOException;
 import java.util.Iterator;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 
 /**
  * ServiceAcknowledgment message
- * 
+ *
  */
 public class ServiceAcknowledgment extends ReplyMessage {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
 		return new ServiceAcknowledgment(pHdr, pInStr.read16());
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pErrorCode
 	 */
 	public ServiceAcknowledgment(int pErrorCode) {
@@ -79,7 +77,7 @@ public ServiceAcknowledgment(int pErrorCode) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLangTag
 	 * @param pErrorCode
 	 */
@@ -89,7 +87,7 @@ public ServiceAcknowledgment(String pLangTag, int pErrorCode) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pErrorCode
 	 */
@@ -116,5 +114,4 @@ public Iterator getExceptionIterator() {
 		// this message doesn't have exception table
 		return null;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceDeregistration.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceDeregistration.java
index 0b2b58e..e88a4c3 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceDeregistration.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceDeregistration.java
@@ -45,9 +45,8 @@
 
 import java.io.IOException;
 import java.util.List;
-
-import org.metricshub.wbem.sblim.slp.ServiceURL;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
 
 /*
  * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -70,10 +69,9 @@
 
 /**
  * ServiceDeregistration message
- * 
+ *
  */
 public class ServiceDeregistration extends SLPMessage {
-
 	private List iScopeList;
 
 	private ServiceURL iURL;
@@ -82,22 +80,20 @@ public class ServiceDeregistration extends SLPMessage {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new ServiceDeregistration(pHdr, pInStr.readStringList(), pInStr.readURL(), pInStr
-				.readStringList());
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+		return new ServiceDeregistration(pHdr, pInStr.readStringList(), pInStr.readURL(), pInStr.readStringList());
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pScopeList
 	 *            - list of scope strings
 	 * @param pURL
@@ -110,37 +106,35 @@ public ServiceDeregistration(List pScopeList, ServiceURL pURL, List pScopeList, ServiceURL pURL,
-			List pTagList) {
+	public ServiceDeregistration(String pLangTag, List pScopeList, ServiceURL pURL, List pTagList) {
 		super(SRV_DEREG, pLangTag);
 		init(pScopeList, pURL, pTagList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pScopeList
 	 *            - list of scope strings
 	 * @param pURL
 	 * @param pTagList
 	 */
-	public ServiceDeregistration(MsgHeader pHeader, List pScopeList, ServiceURL pURL,
-			List pTagList) {
+	public ServiceDeregistration(MsgHeader pHeader, List pScopeList, ServiceURL pURL, List pTagList) {
 		super(pHeader);
 		init(pScopeList, pURL, pTagList);
 	}
 
 	/**
 	 * getServiceURL
-	 * 
+	 *
 	 * @return ServiceURL
 	 */
 	public ServiceURL getServiceURL() {
@@ -152,8 +146,9 @@ public ServiceURL getServiceURL() {
 	 */
 	@Override
 	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.writeStringList(this.iScopeList) && pOutStr.write(this.iURL)
-				&& pOutStr.writeStringList(this.iTagList);
+		return (
+			pOutStr.writeStringList(this.iScopeList) && pOutStr.write(this.iURL) && pOutStr.writeStringList(this.iTagList)
+		);
 	}
 
 	private void init(List pScopeList, ServiceURL pURL, List pTagList) {
@@ -161,5 +156,4 @@ private void init(List pScopeList, ServiceURL pURL, List pTagLis
 		this.iURL = pURL;
 		this.iTagList = pTagList;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRegistration.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRegistration.java
index db0e105..a396138 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRegistration.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRegistration.java
@@ -44,10 +44,9 @@
 
 import java.io.IOException;
 import java.util.List;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
-import org.metricshub.wbem.sblim.slp.ServiceURL;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
 
 /*
  * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -67,10 +66,9 @@
  */
 /**
  * ServiceRegistration message
- * 
+ *
  */
 public class ServiceRegistration extends SLPMessage {
-
 	private ServiceURL iServURL;
 
 	private List iScopeList;
@@ -81,24 +79,28 @@ public class ServiceRegistration extends SLPMessage {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
 		ServiceURL url = pInStr.readURL();
 		pInStr.readServiceType(); // FIXME reading dummy SrvType. Correct?
-		return new ServiceRegistration(pHdr, url, pInStr.readStringList(), pInStr
-				.readAttributeList(), pInStr.readAuthBlockList());
+		return new ServiceRegistration(
+			pHdr,
+			url,
+			pInStr.readStringList(),
+			pInStr.readAttributeList(),
+			pInStr.readAuthBlockList()
+		);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pServURL
 	 * @param pScopeList
 	 *            - list of scope strings
@@ -106,15 +108,19 @@ public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
 	 *            - list of ServiceLocationAttributes
 	 * @param pAuthBlockList
 	 */
-	public ServiceRegistration(ServiceURL pServURL, List pScopeList,
-			List pAttrList, List pAuthBlockList) {
+	public ServiceRegistration(
+		ServiceURL pServURL,
+		List pScopeList,
+		List pAttrList,
+		List pAuthBlockList
+	) {
 		super(SRV_REG);
 		init(pServURL, pScopeList, pAttrList, pAuthBlockList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLangTag
 	 * @param pServURL
 	 * @param pScopeList
@@ -123,15 +129,20 @@ public ServiceRegistration(ServiceURL pServURL, List pScopeList,
 	 *            - list of ServiceLocationAttributes
 	 * @param pAuthBlockList
 	 */
-	public ServiceRegistration(String pLangTag, ServiceURL pServURL, List pScopeList,
-			List pAttrList, List pAuthBlockList) {
+	public ServiceRegistration(
+		String pLangTag,
+		ServiceURL pServURL,
+		List pScopeList,
+		List pAttrList,
+		List pAuthBlockList
+	) {
 		super(SRV_REG, pLangTag);
 		init(pServURL, pScopeList, pAttrList, pAuthBlockList);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pServURL
 	 * @param pScopeList
@@ -140,15 +151,20 @@ public ServiceRegistration(String pLangTag, ServiceURL pServURL, List pS
 	 *            - list of ServiceLocationAttributes
 	 * @param pAuthBlockList
 	 */
-	public ServiceRegistration(MsgHeader pHeader, ServiceURL pServURL, List pScopeList,
-			List pAttrList, List pAuthBlockList) {
+	public ServiceRegistration(
+		MsgHeader pHeader,
+		ServiceURL pServURL,
+		List pScopeList,
+		List pAttrList,
+		List pAuthBlockList
+	) {
 		super(pHeader);
 		init(pServURL, pScopeList, pAttrList, pAuthBlockList);
 	}
 
 	/**
 	 * getServiceURL
-	 * 
+	 *
 	 * @return ServiceURL
 	 */
 	public ServiceURL getServiceURL() {
@@ -157,7 +173,7 @@ public ServiceURL getServiceURL() {
 
 	/**
 	 * getScopeList
-	 * 
+	 *
 	 * @return List
 	 */
 	public List getScopeList() {
@@ -166,7 +182,7 @@ public List getScopeList() {
 
 	/**
 	 * getAttributeList
-	 * 
+	 *
 	 * @return List
 	 */
 	public List getAttributeList() {
@@ -178,18 +194,24 @@ public List getAttributeList() {
 	 */
 	@Override
 	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
-		return pOutStr.write(this.iServURL) && pOutStr.write(this.iServURL.getServiceType())
-				&& pOutStr.writeStringList(this.iScopeList)
-				&& pOutStr.writeAttributeList(this.iAttrList)
-				&& pOutStr.writeAuthBlockList(this.iAuthBlockList);
+		return (
+			pOutStr.write(this.iServURL) &&
+			pOutStr.write(this.iServURL.getServiceType()) &&
+			pOutStr.writeStringList(this.iScopeList) &&
+			pOutStr.writeAttributeList(this.iAttrList) &&
+			pOutStr.writeAuthBlockList(this.iAuthBlockList)
+		);
 	}
 
-	private void init(ServiceURL pServURL, List pScopeList,
-			List pAttrList, List pAuthBlockList) {
+	private void init(
+		ServiceURL pServURL,
+		List pScopeList,
+		List pAttrList,
+		List pAuthBlockList
+	) {
 		this.iServURL = pServURL;
 		this.iScopeList = pScopeList;
 		this.iAttrList = pAttrList;
 		this.iAuthBlockList = pAuthBlockList;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceReply.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceReply.java
index 0f1fedb..4e886ff 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceReply.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceReply.java
@@ -47,9 +47,8 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
-import org.metricshub.wbem.sblim.slp.ServiceURL;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.ServiceURL;
 
 /*
  * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -63,25 +62,23 @@
  */
 /**
  * ServiceReply message
- * 
+ *
  */
 public class ServiceReply extends ReplyMessage {
-
 	private List iURLEntries;
 
 	private List iURLExceptions;
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
 		int errorCode = pInStr.read16();
 		ArrayList urlExceptions = new ArrayList();
 		List urlEntries = pInStr.readUrlList(urlExceptions);
@@ -90,7 +87,7 @@ public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pErrorCode
 	 * @param pURLEntries
 	 *            - list of ServiceURLs
@@ -102,7 +99,7 @@ public ServiceReply(int pErrorCode, List pURLEntries) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLangTag
 	 * @param pErrorCode
 	 * @param pURLEntries
@@ -110,8 +107,7 @@ public ServiceReply(int pErrorCode, List pURLEntries) {
 	 * @param pURLExceptions
 	 *            - list of URL Exceptions
 	 */
-	public ServiceReply(String pLangTag, int pErrorCode, List pURLEntries,
-			List pURLExceptions) {
+	public ServiceReply(String pLangTag, int pErrorCode, List pURLEntries, List pURLExceptions) {
 		super(SRV_RPLY, pLangTag, pErrorCode);
 		this.iURLEntries = pURLEntries;
 		this.iURLExceptions = pURLExceptions;
@@ -119,7 +115,7 @@ public ServiceReply(String pLangTag, int pErrorCode, List pURLEntrie
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pErrorCode
 	 * @param pURLEntries
@@ -127,8 +123,7 @@ public ServiceReply(String pLangTag, int pErrorCode, List pURLEntrie
 	 * @param pURLExceptions
 	 *            - list of URL Exceptions
 	 */
-	public ServiceReply(MsgHeader pHeader, int pErrorCode, List pURLEntries,
-			List pURLExceptions) {
+	public ServiceReply(MsgHeader pHeader, int pErrorCode, List pURLEntries, List pURLExceptions) {
 		super(pHeader, pErrorCode);
 		this.iURLEntries = pURLEntries;
 		this.iURLExceptions = pURLExceptions;
@@ -136,7 +131,7 @@ public ServiceReply(MsgHeader pHeader, int pErrorCode, List pURLEntr
 
 	/**
 	 * getResultIterator
-	 * 
+	 *
 	 * @return iterator of URL Exception list
 	 */
 	@Override
@@ -146,7 +141,7 @@ public Iterator getResultIterator() {
 
 	/**
 	 * getExceptionIterator
-	 * 
+	 *
 	 * @return iterator of URL Exception list
 	 */
 	@Override
@@ -156,7 +151,7 @@ public Iterator getExceptionIterator() {
 
 	/**
 	 * getURLEntries
-	 * 
+	 *
 	 * @return list of ServiceURLs
 	 */
 	public List getURLEntries() {
@@ -165,7 +160,7 @@ public List getURLEntries() {
 
 	/**
 	 * getURLExceptions
-	 * 
+	 *
 	 * @return list of URL Exceptions
 	 */
 	public List getURLExceptions() {
@@ -179,5 +174,4 @@ public List getURLExceptions() {
 	protected boolean serializeBody(SLPOutputStream pOutStr, SerializeOption pOption) {
 		return pOutStr.write16(getErrorCode()) && pOutStr.writeURLList(this.iURLEntries);
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRequest.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRequest.java
index ecae18e..e3ac6ad 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRequest.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceRequest.java
@@ -45,9 +45,8 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.SortedSet;
-
-import org.metricshub.wbem.sblim.slp.ServiceType;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.ServiceType;
 
 /*
  * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -77,10 +76,9 @@
 
 /**
  * ServiceRequest message
- * 
+ *
  */
 public class ServiceRequest extends RequestMessage {
-
 	private ServiceType iServiceType;
 
 	private String iPredicate, iSlpSpi;
@@ -89,26 +87,27 @@ public class ServiceRequest extends RequestMessage {
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new ServiceRequest(pHdr, pInStr.readStringSet(), // prevResponders
-				pInStr.readServiceType(), // serviceType
-				pInStr.readStringList(), // scopeList
-				pInStr.readString(), // predicate
-				pInStr.readString() // SlpSpi
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+		return new ServiceRequest(
+			pHdr,
+			pInStr.readStringSet(), // prevResponders
+			pInStr.readServiceType(), // serviceType
+			pInStr.readStringList(), // scopeList
+			pInStr.readString(), // predicate
+			pInStr.readString() // SlpSpi
 		);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLangTag
 	 * @param pPrevResponderSet
 	 *            - set of address strings
@@ -118,15 +117,21 @@ public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
 	 * @param pPredicate
 	 * @param pSlpSpi
 	 */
-	public ServiceRequest(String pLangTag, SortedSet pPrevResponderSet,
-			ServiceType pServiceType, List pScopeList, String pPredicate, String pSlpSpi) {
+	public ServiceRequest(
+		String pLangTag,
+		SortedSet pPrevResponderSet,
+		ServiceType pServiceType,
+		List pScopeList,
+		String pPredicate,
+		String pSlpSpi
+	) {
 		super(SRV_RQST, pLangTag, pPrevResponderSet, pScopeList);
 		init(pServiceType, pPredicate, pSlpSpi);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pPrevResponderSet
 	 *            - set of address strings
 	 * @param pServiceType
@@ -135,8 +140,13 @@ public ServiceRequest(String pLangTag, SortedSet pPrevResponderSet,
 	 * @param pPredicate
 	 * @param pSlpSpi
 	 */
-	public ServiceRequest(SortedSet pPrevResponderSet, ServiceType pServiceType,
-			List pScopeList, String pPredicate, String pSlpSpi) {
+	public ServiceRequest(
+		SortedSet pPrevResponderSet,
+		ServiceType pServiceType,
+		List pScopeList,
+		String pPredicate,
+		String pSlpSpi
+	) {
 		super(SRV_RQST, pPrevResponderSet, pScopeList);
 		init(pServiceType, pPredicate, pSlpSpi);
 	}
@@ -152,15 +162,21 @@ public ServiceRequest(SortedSet pPrevResponderSet, ServiceType pServiceT
 	 *            - LDAPv3 search filter
 	 * @param pSlpSpi
 	 */
-	public ServiceRequest(MsgHeader pHeader, SortedSet pPrevResponderSet,
-			ServiceType pServiceType, List pScopeList, String pPredicate, String pSlpSpi) {
+	public ServiceRequest(
+		MsgHeader pHeader,
+		SortedSet pPrevResponderSet,
+		ServiceType pServiceType,
+		List pScopeList,
+		String pPredicate,
+		String pSlpSpi
+	) {
 		super(pHeader, pPrevResponderSet, pScopeList);
 		init(pServiceType, pPredicate, pSlpSpi);
 	}
 
 	/**
 	 * getServiceType
-	 * 
+	 *
 	 * @return ServiceType
 	 */
 	public ServiceType getServiceType() {
@@ -169,8 +185,12 @@ public ServiceType getServiceType() {
 
 	@Override
 	protected boolean serializeRequestBody(SLPOutputStream pOutStr) {
-		return pOutStr.write(this.iServiceType) && pOutStr.writeStringList(getScopeList())
-				&& pOutStr.write(this.iPredicate) && pOutStr.write(this.iSlpSpi);
+		return (
+			pOutStr.write(this.iServiceType) &&
+			pOutStr.writeStringList(getScopeList()) &&
+			pOutStr.write(this.iPredicate) &&
+			pOutStr.write(this.iSlpSpi)
+		);
 	}
 
 	@Override
@@ -183,5 +203,4 @@ private void init(ServiceType pServiceType, String pPredicate, String pSlpSpi) {
 		this.iPredicate = pPredicate;
 		this.iSlpSpi = pSlpSpi;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeReply.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeReply.java
index 7e03758..1a5b2a5 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeReply.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeReply.java
@@ -46,9 +46,8 @@
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
-
-import org.metricshub.wbem.sblim.slp.ServiceType;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.ServiceType;
 
 /*
  * 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -62,29 +61,27 @@
  */
 /**
  * ServiceTypeReply message
- * 
+ *
  */
 public class ServiceTypeReply extends ReplyMessage {
-
 	private List iServTypeList;
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
 		return new ServiceTypeReply(pHdr, pInStr.read16(), pInStr.readServTypeList());
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pErrorCode
 	 * @param pServTypeList
 	 *            - list of ServiceTypes
@@ -96,7 +93,7 @@ public ServiceTypeReply(int pErrorCode, List pServTypeList) {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLangTag
 	 * @param pErrorCode
 	 * @param pServTypeList
@@ -109,7 +106,7 @@ public ServiceTypeReply(String pLangTag, int pErrorCode, List pServ
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pErrorCode
 	 * @param pServTypeList
@@ -138,5 +135,4 @@ public Iterator getExceptionIterator() {
 		// this message doesn't have exception table
 		return null;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java
index 24bafc0..bfe8e49 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/ServiceTypeRequest.java
@@ -45,7 +45,6 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.SortedSet;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 
 /*
@@ -62,49 +61,48 @@
  */
 /**
  * ServiceTypeRequest message
- * 
+ *
  */
 public class ServiceTypeRequest extends RequestMessage {
-
 	private String iNamingAuth;
 
 	private static final int[] ALLOWED_RSPS = { SRV_TYPE_RPLY };
 
 	/**
 	 * parse
-	 * 
+	 *
 	 * @param pHdr
 	 * @param pInStr
 	 * @return SLPMessage
 	 * @throws ServiceLocationException
 	 * @throws IOException
 	 */
-	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr)
-			throws ServiceLocationException, IOException {
-		return new ServiceTypeRequest(pHdr, pInStr.readStringSet(), // prevResponderSet
-				pInStr.readString(), // naming authority
-				pInStr.readStringList() // scope list
+	public static SLPMessage parse(MsgHeader pHdr, SLPInputStream pInStr) throws ServiceLocationException, IOException {
+		return new ServiceTypeRequest(
+			pHdr,
+			pInStr.readStringSet(), // prevResponderSet
+			pInStr.readString(), // naming authority
+			pInStr.readStringList() // scope list
 		);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pPrevResponderSet
 	 *            - set of address strings
 	 * @param pNamingAuth
 	 * @param pScopeList
 	 *            - set of scope strings
 	 */
-	public ServiceTypeRequest(SortedSet pPrevResponderSet, String pNamingAuth,
-			List pScopeList) {
+	public ServiceTypeRequest(SortedSet pPrevResponderSet, String pNamingAuth, List pScopeList) {
 		super(SRV_TYPE_RQST, pPrevResponderSet, pScopeList);
 		init(pNamingAuth);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLangTag
 	 * @param pPrevResponderSet
 	 *            - set of address strings
@@ -112,15 +110,19 @@ public ServiceTypeRequest(SortedSet pPrevResponderSet, String pNamingAut
 	 * @param pScopeList
 	 *            - set of scope strings
 	 */
-	public ServiceTypeRequest(String pLangTag, SortedSet pPrevResponderSet,
-			String pNamingAuth, List pScopeList) {
+	public ServiceTypeRequest(
+		String pLangTag,
+		SortedSet pPrevResponderSet,
+		String pNamingAuth,
+		List pScopeList
+	) {
 		super(SRV_TYPE_RQST, pLangTag, pPrevResponderSet, pScopeList);
 		init(pNamingAuth);
 	}
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pHeader
 	 * @param pPrevResponderSet
 	 *            - set of address strings
@@ -128,8 +130,12 @@ public ServiceTypeRequest(String pLangTag, SortedSet pPrevResponderSet,
 	 * @param pScopeList
 	 *            - set of scope strings
 	 */
-	public ServiceTypeRequest(MsgHeader pHeader, SortedSet pPrevResponderSet,
-			String pNamingAuth, List pScopeList) {
+	public ServiceTypeRequest(
+		MsgHeader pHeader,
+		SortedSet pPrevResponderSet,
+		String pNamingAuth,
+		List pScopeList
+	) {
 		super(pHeader, pPrevResponderSet, pScopeList);
 		init(pNamingAuth);
 	}
@@ -147,5 +153,4 @@ protected int[] getAllowedResponseIDs() {
 	private void init(String pNamingAuth) {
 		this.iNamingAuth = pNamingAuth;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/Util.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/Util.java
index b2e4dd8..dcc2280 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/Util.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/msg/Util.java
@@ -44,13 +44,13 @@
 
 /**
  * Common handful functions can be here.
- * 
+ *
  */
 public class Util {
 
 	/**
 	 * getLangTag
-	 * 
+	 *
 	 * @param pLocale
 	 * @return String
 	 */
@@ -60,5 +60,4 @@ public static String getLangTag(Locale pLocale) {
 		String lang = pLocale.getLanguage();
 		return (country != null && country.length() > 0) ? lang + "-" + country : lang;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/DatagramThread.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/DatagramThread.java
index 991a426..64ebf2b 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/DatagramThread.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/DatagramThread.java
@@ -46,24 +46,22 @@
 import java.net.InetAddress;
 import java.net.MulticastSocket;
 import java.net.SocketTimeoutException;
-
 import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
 import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
 import org.metricshub.wbem.sblim.slp.internal.TRC;
 
 /**
  * DatagramThread
- * 
+ *
  */
 public class DatagramThread extends RecieverThread {
-
 	private static MulticastSocket cMCastSocket;
 
 	private DatagramPacket iPacket = new DatagramPacket(new byte[SLPDefaults.MTU], SLPDefaults.MTU);
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pSrvAgent
 	 */
 	public DatagramThread(ServiceAgent pSrvAgent) {
@@ -72,7 +70,7 @@ public DatagramThread(ServiceAgent pSrvAgent) {
 
 	/**
 	 * joinGroup
-	 * 
+	 *
 	 * @param pGroup
 	 * @throws IOException
 	 */
@@ -83,7 +81,7 @@ public synchronized void joinGroup(InetAddress pGroup) throws IOException {
 
 	/**
 	 * leaveGroup
-	 * 
+	 *
 	 * @param pGroup
 	 * @throws IOException
 	 */
@@ -118,5 +116,4 @@ protected void close() {
 		cMCastSocket.close();
 		cMCastSocket = null;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/MessageTable.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/MessageTable.java
index 336e21a..12c06f1 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/MessageTable.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/MessageTable.java
@@ -51,37 +51,35 @@
 import java.util.Date;
 import java.util.SortedMap;
 import java.util.TreeMap;
-
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
 import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
-import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 
 /**
  * Keeps track of datagram messages. For requests with the same XID the same
  * responses should be returned.
- * 
+ *
  */
 public class MessageTable {
 
 	private static class RequestDescriptor implements Comparable {
-
 		private byte[] iSrcAddress;
 
 		private byte[] iRequest;
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pSource
 		 * @param pRequest
 		 * @throws ServiceLocationException
 		 */
-		public RequestDescriptor(InetAddress pSource, SLPMessage pRequest)
-				throws ServiceLocationException {
+		public RequestDescriptor(InetAddress pSource, SLPMessage pRequest) throws ServiceLocationException {
 			this.iSrcAddress = pSource.getAddress();
-			this.iRequest = (pRequest instanceof RequestMessage) ? ((RequestMessage) pRequest)
-					.serializeWithoutResponders(false, true, true) : pRequest.serialize(false,
-					true, true);
+			this.iRequest =
+				(pRequest instanceof RequestMessage)
+					? ((RequestMessage) pRequest).serializeWithoutResponders(false, true, true)
+					: pRequest.serialize(false, true, true);
 		}
 
 		public int compareTo(RequestDescriptor pObj) {
@@ -104,8 +102,7 @@ private static int compare(byte[] pBytes0, byte[] pBytes1) {
 		public boolean equals(Object pObj) {
 			if (!(pObj instanceof RequestDescriptor)) return false;
 			RequestDescriptor that = (RequestDescriptor) pObj;
-			return compare(this.iSrcAddress, that.iSrcAddress) == 0
-					&& compare(this.iRequest, that.iRequest) == 0;
+			return compare(this.iSrcAddress, that.iSrcAddress) == 0 && compare(this.iRequest, that.iRequest) == 0;
 		}
 
 		@Override
@@ -115,7 +112,6 @@ public int hashCode() {
 	}
 
 	private static class TableEntry {
-
 		private long iTime;
 
 		private RequestDescriptor iReqDesc;
@@ -124,7 +120,7 @@ private static class TableEntry {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pTime
 		 * @param pReqKey
 		 * @param pResponse
@@ -137,7 +133,7 @@ public TableEntry(long pTime, RequestDescriptor pReqKey, byte[] pResponse) {
 
 		/**
 		 * getTime
-		 * 
+		 *
 		 * @return long
 		 */
 		public long getTime() {
@@ -146,7 +142,7 @@ public long getTime() {
 
 		/**
 		 * setTime
-		 * 
+		 *
 		 * @param pTime
 		 */
 		public void setTime(long pTime) {
@@ -155,7 +151,7 @@ public void setTime(long pTime) {
 
 		/**
 		 * getRequestDescriptor
-		 * 
+		 *
 		 * @return RequestDescriptor
 		 */
 		public RequestDescriptor getRequestDescriptor() {
@@ -164,13 +160,12 @@ public RequestDescriptor getRequestDescriptor() {
 
 		/**
 		 * getResponse
-		 * 
+		 *
 		 * @return byte[]
 		 */
 		public byte[] getResponse() {
 			return this.iResponse;
 		}
-
 	}
 
 	/**
@@ -190,14 +185,13 @@ public byte[] getResponse() {
 
 	/**
 	 * getResponse
-	 * 
+	 *
 	 * @param pSource
 	 * @param pRequest
 	 * @return byte[]
 	 * @throws ServiceLocationException
 	 */
-	public synchronized byte[] getResponse(InetAddress pSource, SLPMessage pRequest)
-			throws ServiceLocationException {
+	public synchronized byte[] getResponse(InetAddress pSource, SLPMessage pRequest) throws ServiceLocationException {
 		long now = getSecs();
 		RequestDescriptor reqDesc = new RequestDescriptor(pSource, pRequest);
 		TableEntry entry = this.iReqMap.get(reqDesc);
@@ -209,14 +203,14 @@ public synchronized byte[] getResponse(InetAddress pSource, SLPMessage pRequest)
 
 	/**
 	 * addResponse
-	 * 
+	 *
 	 * @param pSource
 	 * @param pRequest
 	 * @param pRespond
 	 * @throws ServiceLocationException
 	 */
 	public synchronized void addResponse(InetAddress pSource, SLPMessage pRequest, byte[] pRespond)
-			throws ServiceLocationException {
+		throws ServiceLocationException {
 		insert(new TableEntry(getSecs(), new RequestDescriptor(pSource, pRequest), pRespond));
 		clean();
 	}
@@ -250,5 +244,4 @@ private void updateTime(TableEntry pEntry, long pTime) {
 	private static long getSecs() {
 		return new Date().getTime() / 1000;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/RecieverThread.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/RecieverThread.java
index 371c4f4..1e786bf 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/RecieverThread.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/RecieverThread.java
@@ -41,16 +41,14 @@
  */
 
 import java.io.IOException;
-
-import org.metricshub.wbem.sblim.slp.internal.TRC;
 import org.metricshub.wbem.sblim.slp.ServiceLocationException;
+import org.metricshub.wbem.sblim.slp.internal.TRC;
 
 /**
  * RecieverThread
- * 
+ *
  */
 public abstract class RecieverThread implements Runnable {
-
 	private Thread iThread;
 
 	private volatile boolean iStop;
@@ -63,7 +61,7 @@ public abstract class RecieverThread implements Runnable {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pName
 	 * @param pSrvAgent
 	 */
@@ -103,7 +101,7 @@ public void stop() {
 
 	/**
 	 * stop
-	 * 
+	 *
 	 * @param pWait
 	 */
 	public void stop(boolean pWait) {
@@ -171,5 +169,4 @@ private static void sleep(int pMillis) {
 			TRC.error(e);
 		}
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceAgent.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceAgent.java
index 068c4b3..4b61e1b 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceAgent.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceAgent.java
@@ -51,15 +51,18 @@
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.List;
-
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 import org.metricshub.wbem.sblim.slp.ServiceURL;
 import org.metricshub.wbem.sblim.slp.internal.IPv6MulticastAddressFactory;
+import org.metricshub.wbem.sblim.slp.internal.Net;
 import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
 import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
 import org.metricshub.wbem.sblim.slp.internal.TRC;
 import org.metricshub.wbem.sblim.slp.internal.msg.AttributeReply;
 import org.metricshub.wbem.sblim.slp.internal.msg.AttributeRequest;
+import org.metricshub.wbem.sblim.slp.internal.msg.FunctionIDs;
 import org.metricshub.wbem.sblim.slp.internal.msg.MsgFactory;
+import org.metricshub.wbem.sblim.slp.internal.msg.ReplyMessage;
 import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
 import org.metricshub.wbem.sblim.slp.internal.msg.SLPMessage;
 import org.metricshub.wbem.sblim.slp.internal.msg.ServiceAcknowledgment;
@@ -68,20 +71,14 @@
 import org.metricshub.wbem.sblim.slp.internal.msg.ServiceReply;
 import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRequest;
 import org.metricshub.wbem.sblim.slp.internal.msg.ServiceTypeReply;
-import org.metricshub.wbem.sblim.slp.ServiceLocationException;
-import org.metricshub.wbem.sblim.slp.internal.Net;
-import org.metricshub.wbem.sblim.slp.internal.msg.FunctionIDs;
-import org.metricshub.wbem.sblim.slp.internal.msg.ReplyMessage;
 
 /**
  * ServiceAgent
- * 
+ *
  */
 public class ServiceAgent implements FunctionIDs {
-
-	private boolean iUseV4 = Net.hasIPv4() && SLPConfig.getGlobalCfg().useIPv4(), iUseV6 = Net
-			.hasIPv6()
-			&& SLPConfig.getGlobalCfg().useIPv6();
+	private boolean iUseV4 = Net.hasIPv4() && SLPConfig.getGlobalCfg().useIPv4(), iUseV6 =
+		Net.hasIPv6() && SLPConfig.getGlobalCfg().useIPv6();
 
 	boolean iStarted;
 
@@ -97,7 +94,7 @@ public class ServiceAgent implements FunctionIDs {
 
 	/**
 	 * main
-	 * 
+	 *
 	 * @param pArgs
 	 * @throws IOException
 	 */
@@ -120,7 +117,7 @@ public static void main(String[] pArgs) throws IOException {
 
 	/**
 	 * setSkipFirstRequest
-	 * 
+	 *
 	 * @param pValue
 	 */
 	public void setSkipFirstRequest(boolean pValue) {
@@ -129,7 +126,7 @@ public void setSkipFirstRequest(boolean pValue) {
 
 	/**
 	 * start
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	public void start() throws IOException {
@@ -149,8 +146,7 @@ public void start() throws IOException {
 		// join multicast groups
 		if (this.iUseV4) this.iDGThread.joinGroup(SLPConfig.getMulticastAddress());
 		if (this.iUseV6) {
-			this.iDGThread.joinGroup(IPv6MulticastAddressFactory
-					.getSrvLocAddress(SLPDefaults.IPV6_MULTICAST_SCOPE));
+			this.iDGThread.joinGroup(IPv6MulticastAddressFactory.getSrvLocAddress(SLPDefaults.IPV6_MULTICAST_SCOPE));
 		}
 	}
 
@@ -164,12 +160,11 @@ public void stop() {
 			this.iDGThread.stop();
 		}
 		this.iStarted = false;
-
 	}
 
 	/**
 	 * processMessage
-	 * 
+	 *
 	 * @param pDGSock
 	 * @param pPacket
 	 */
@@ -209,8 +204,7 @@ public void processMessage(DatagramSocket pDGSock, DatagramPacket pPacket) {
 		if (reply != null) {
 			try {
 				TRC.debug("sending response");
-				pDGSock.send(new DatagramPacket(reply, reply.length, pPacket.getAddress(), pPacket
-						.getPort()));
+				pDGSock.send(new DatagramPacket(reply, reply.length, pPacket.getAddress(), pPacket.getPort()));
 			} catch (IOException e) {
 				TRC.error(e);
 			}
@@ -219,7 +213,7 @@ public void processMessage(DatagramSocket pDGSock, DatagramPacket pPacket) {
 
 	/**
 	 * processMessage
-	 * 
+	 *
 	 * @param pStreamSock
 	 */
 	public void processMessage(Socket pStreamSock) {
@@ -262,8 +256,9 @@ public void processMessage(Socket pStreamSock) {
 	 */
 	private SLPMessage makeReply(SLPMessage pRequest) throws ServiceLocationException {
 		try {
-			SLPMessage msg = pRequest instanceof RequestMessage ? makeReply4Request((RequestMessage) pRequest)
-					: makeReply4Others(pRequest);
+			SLPMessage msg = pRequest instanceof RequestMessage
+				? makeReply4Request((RequestMessage) pRequest)
+				: makeReply4Others(pRequest);
 			if (msg != null) msg.setXID(pRequest.getXID());
 			return msg;
 		} catch (UnknownHostException e) {
@@ -273,7 +268,6 @@ private SLPMessage makeReply(SLPMessage pRequest) throws ServiceLocationExceptio
 			TRC.error(e);
 			throw new ServiceLocationException(ServiceLocationException.NETWORK_ERROR);
 		}
-
 	}
 
 	private ReplyMessage makeReply4Request(RequestMessage pRequest) {
@@ -283,15 +277,13 @@ private ReplyMessage makeReply4Request(RequestMessage pRequest) {
 			case SRV_RQST:
 				ServiceRequest srvRqst = (ServiceRequest) pRequest;
 				if (SLPDefaults.DA_SERVICE_TYPE.equals(srvRqst.getServiceType())) return null;
-				List urlList = this.iSrvTable.getServiceURLs(srvRqst.getServiceType(),
-						scopes);
+				List urlList = this.iSrvTable.getServiceURLs(srvRqst.getServiceType(), scopes);
 				TRC.debug("srvReply : " + urlList);
 				replyMsg = new ServiceReply(0, urlList);
 				break;
 			case ATTR_RQST:
 				AttributeRequest attrRqst = (AttributeRequest) pRequest;
-				replyMsg = new AttributeReply(0, this.iSrvTable.getAttributes(attrRqst
-						.getServiceURL(), scopes));
+				replyMsg = new AttributeReply(0, this.iSrvTable.getAttributes(attrRqst.getServiceURL(), scopes));
 				break;
 			case SRV_TYPE_RQST:
 				// ServiceTypeRequest srvTypeRqst =
@@ -308,8 +300,7 @@ private SLPMessage makeReply4Others(SLPMessage pRequest) throws IOException {
 		switch (pRequest.getFunctionID()) {
 			case SRV_REG:
 				ServiceRegistration srvReg = (ServiceRegistration) pRequest;
-				this.iSrvTable.add(srvReg.getServiceURL(), srvReg.getAttributeList(), srvReg
-						.getScopeList());
+				this.iSrvTable.add(srvReg.getServiceURL(), srvReg.getAttributeList(), srvReg.getScopeList());
 				return new ServiceAcknowledgment(0);
 			case SRV_DEREG:
 				ServiceDeregistration srvDereg = (ServiceDeregistration) pRequest;
@@ -357,5 +348,4 @@ private static byte[] makeErrorReply(SLPMessage pRequest, int pErrorCode) {
 			return null;
 		}
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceTable.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceTable.java
index dd29f23..60f04ff 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceTable.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/ServiceTable.java
@@ -49,22 +49,20 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationAttribute;
 import org.metricshub.wbem.sblim.slp.ServiceType;
 import org.metricshub.wbem.sblim.slp.ServiceURL;
 import org.metricshub.wbem.sblim.slp.internal.IPv6MulticastAddressFactory;
+import org.metricshub.wbem.sblim.slp.internal.Net;
 import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
 import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
 import org.metricshub.wbem.sblim.slp.internal.TRC;
-import org.metricshub.wbem.sblim.slp.internal.Net;
 
 /**
  * ServiceTable
- * 
+ *
  */
 public class ServiceTable {
-
 	DatagramThread iDgramThread;
 
 	private boolean iUseV6 = Net.hasIPv6() && SLPConfig.getGlobalCfg().useIPv6();
@@ -72,7 +70,6 @@ public class ServiceTable {
 	class AddressHashTable {
 
 		class Counter {
-
 			/**
 			 * iValue
 			 */
@@ -86,7 +83,7 @@ class Counter {
 
 		/**
 		 * register
-		 * 
+		 *
 		 * @param pType
 		 * @throws UnknownHostException
 		 * @throws IOException
@@ -98,17 +95,17 @@ public void register(ServiceType pType) throws UnknownHostException, IOException
 			if (cntr == null) {
 				cntr = new Counter();
 				this.iMap.put(hash, cntr);
-				ServiceTable.this.iDgramThread.joinGroup(IPv6MulticastAddressFactory.get(
-						SLPDefaults.IPV6_MULTICAST_SCOPE, hash.intValue()));
+				ServiceTable.this.iDgramThread.joinGroup(
+						IPv6MulticastAddressFactory.get(SLPDefaults.IPV6_MULTICAST_SCOPE, hash.intValue())
+					);
 			} else {
 				++cntr.iValue;
 			}
-
 		}
 
 		/**
 		 * unregister
-		 * 
+		 *
 		 * @param pType
 		 * @throws UnknownHostException
 		 * @throws IOException
@@ -119,17 +116,16 @@ public void unregister(ServiceType pType) throws UnknownHostException, IOExcepti
 			if (cntr == null) return;
 			if (cntr.iValue <= 1) {
 				this.iMap.remove(hash);
-				ServiceTable.this.iDgramThread.leaveGroup(IPv6MulticastAddressFactory.get(
-						SLPDefaults.IPV6_MULTICAST_SCOPE, hash.intValue()));
+				ServiceTable.this.iDgramThread.leaveGroup(
+						IPv6MulticastAddressFactory.get(SLPDefaults.IPV6_MULTICAST_SCOPE, hash.intValue())
+					);
 			} else {
 				--cntr.iValue;
 			}
 		}
-
 	}
 
 	private static class ServiceEntry {
-
 		private ServiceURL iSrvURL;
 
 		private List iAttribs;
@@ -138,25 +134,23 @@ private static class ServiceEntry {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pSrvURL
 		 * @param pAttribs
 		 * @param pScopes
 		 */
-		public ServiceEntry(ServiceURL pSrvURL, List pAttribs,
-				List pScopes) {
+		public ServiceEntry(ServiceURL pSrvURL, List pAttribs, List pScopes) {
 			set(pSrvURL, pAttribs, pScopes);
 		}
 
 		/**
 		 * set
-		 * 
+		 *
 		 * @param pSrvURL
 		 * @param pAttribs
 		 * @param pScopes
 		 */
-		public void set(ServiceURL pSrvURL, List pAttribs,
-				List pScopes) {
+		public void set(ServiceURL pSrvURL, List pAttribs, List pScopes) {
 			this.iSrvURL = pSrvURL;
 			this.iAttribs = pAttribs;
 			this.iScopes = pScopes;
@@ -164,7 +158,7 @@ public void set(ServiceURL pSrvURL, List pAttribs,
 
 		/**
 		 * getServiceURL
-		 * 
+		 *
 		 * @return ServiceURL
 		 */
 		public ServiceURL getServiceURL() {
@@ -173,7 +167,7 @@ public ServiceURL getServiceURL() {
 
 		/**
 		 * getServiceType
-		 * 
+		 *
 		 * @return ServiceType
 		 */
 		public ServiceType getServiceType() {
@@ -182,7 +176,7 @@ public ServiceType getServiceType() {
 
 		/**
 		 * getAttributes
-		 * 
+		 *
 		 * @return List
 		 */
 		public List getAttributes() {
@@ -191,7 +185,7 @@ public List getAttributes() {
 
 		/**
 		 * getScopes
-		 * 
+		 *
 		 * @return List
 		 */
 		public List getScopes() {
@@ -200,37 +194,33 @@ public List getScopes() {
 
 		/**
 		 * hasMatchingScope
-		 * 
+		 *
 		 * @param pScopes
 		 * @return boolean
 		 */
 		public boolean hasMatchingScope(List pScopes) {
 			if (pScopes == null) return false;
 			Iterator itr = pScopes.iterator();
-			while (itr.hasNext())
-				if (hasScope(itr.next())) return true;
+			while (itr.hasNext()) if (hasScope(itr.next())) return true;
 			return false;
 		}
 
 		@Override
 		public String toString() {
-			return "url:" + this.iSrvURL + ", attribs:" + dumpList(this.iAttribs) + ", scopes:"
-					+ dumpList(this.iScopes);
+			return "url:" + this.iSrvURL + ", attribs:" + dumpList(this.iAttribs) + ", scopes:" + dumpList(this.iScopes);
 		}
 
 		private boolean hasScope(String pScope) {
 			return this.iScopes == null ? false : this.iScopes.contains(pScope);
 		}
-
 	}
 
 	static class ServiceEntryList extends ArrayList {
-
 		private static final long serialVersionUID = 1L;
 
 		/**
 		 * get
-		 * 
+		 *
 		 * @param pSrvURL
 		 * @return ServiceEntry
 		 */
@@ -244,7 +234,7 @@ public ServiceEntry get(ServiceURL pSrvURL) {
 
 		/**
 		 * remove
-		 * 
+		 *
 		 * @param pSrvURL
 		 */
 		public void remove(ServiceURL pSrvURL) {
@@ -259,7 +249,7 @@ public void remove(ServiceURL pSrvURL) {
 
 		/**
 		 * getServiceURLs
-		 * 
+		 *
 		 * @param pSrvType
 		 * @param pScopes
 		 * @return List
@@ -270,15 +260,13 @@ public List getServiceURLs(ServiceType pSrvType, List pScope
 			for (int i = 0; i < size(); i++) {
 				ServiceEntry entry = (ServiceEntry) get(i);
 				if (!entry.hasMatchingScope(pScopes)) continue;
-				if (pSrvType.getPrincipleTypeName().equals(
-						entry.getServiceType().getPrincipleTypeName())) {
+				if (pSrvType.getPrincipleTypeName().equals(entry.getServiceType().getPrincipleTypeName())) {
 					if (srvURLs == null) srvURLs = new ArrayList();
 					srvURLs.add(entry.getServiceURL());
 				}
 			}
 			return srvURLs;
 		}
-
 	}
 
 	private ServiceEntryList iSrvEntryTable = new ServiceEntryList();
@@ -287,7 +275,7 @@ public List getServiceURLs(ServiceType pSrvType, List pScope
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pDgramThread
 	 */
 	public ServiceTable(DatagramThread pDgramThread) {
@@ -296,15 +284,15 @@ public ServiceTable(DatagramThread pDgramThread) {
 
 	/**
 	 * add
-	 * 
+	 *
 	 * @param pSrvURL
 	 * @param pAttrList
 	 * @param pScopes
 	 * @throws UnknownHostException
 	 * @throws IOException
 	 */
-	public synchronized void add(ServiceURL pSrvURL, List pAttrList,
-			List pScopes) throws UnknownHostException, IOException {
+	public synchronized void add(ServiceURL pSrvURL, List pAttrList, List pScopes)
+		throws UnknownHostException, IOException {
 		if (pSrvURL == null) return;
 		TRC.debug("add URL:" + pSrvURL + ", scopes:" + dumpList(pScopes));
 		ServiceEntry srvEntry = this.iSrvEntryTable.get(pSrvURL);
@@ -320,7 +308,7 @@ public synchronized void add(ServiceURL pSrvURL, List
 
 	/**
 	 * remove
-	 * 
+	 *
 	 * @param pSrvURL
 	 * @throws UnknownHostException
 	 * @throws IOException
@@ -334,7 +322,7 @@ public synchronized void remove(ServiceURL pSrvURL) throws UnknownHostException,
 
 	/**
 	 * getServiceURLs
-	 * 
+	 *
 	 * @param pSrvType
 	 * @param pScopes
 	 * @return List ServiceURL
@@ -347,13 +335,12 @@ public synchronized List getServiceURLs(ServiceType pSrvType, List getAttributes(ServiceURL pSrvURL,
-			List pScopes) {
+	public synchronized List getAttributes(ServiceURL pSrvURL, List pScopes) {
 		if (pSrvURL == null) return null;
 		if (pSrvURL.getURLPath() == null) return getAttributes(pSrvURL.getServiceType(), pScopes);
 		ServiceEntry entry = this.iSrvEntryTable.get(pSrvURL);
@@ -362,13 +349,12 @@ public synchronized List getAttributes(ServiceURL pSrv
 
 	/**
 	 * getAttributes
-	 * 
+	 *
 	 * @param pSrvType
 	 * @param pScopes
 	 * @return List ServiceLocationAttribute
 	 */
-	public synchronized List getAttributes(ServiceType pSrvType,
-			List pScopes) {
+	public synchronized List getAttributes(ServiceType pSrvType, List pScopes) {
 		if (pSrvType == null) return null;
 		HashSet attribs = new HashSet();
 		for (int i = 0; i < this.iSrvEntryTable.size(); i++) {
@@ -381,7 +367,7 @@ public synchronized List getAttributes(ServiceType pSr
 
 	/**
 	 * getServiceTypes
-	 * 
+	 *
 	 * @param pScopes
 	 * @return List ServiceType
 	 */
@@ -415,5 +401,4 @@ private static String dumpList(List pList, String pSep) {
 		}
 		return buf.toString();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/TCPThread.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/TCPThread.java
index 64d7cc6..7ef60f6 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/TCPThread.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/sa/TCPThread.java
@@ -45,21 +45,19 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
-
 import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
 import org.metricshub.wbem.sblim.slp.internal.TRC;
 
 /**
  * TCPThread
- * 
+ *
  */
 public class TCPThread extends RecieverThread {
-
 	private ServerSocket iListenerSocket;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pSrvAgent
 	 */
 	public TCPThread(ServiceAgent pSrvAgent) {
@@ -83,12 +81,11 @@ protected void mainLoop() throws IOException {
 	}
 
 	private class ConnectionThread implements Runnable {
-
 		private Socket iSock;
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pSock
 		 */
 		public ConnectionThread(Socket pSock) {
@@ -99,7 +96,6 @@ public ConnectionThread(Socket pSock) {
 		public void run() {
 			TCPThread.this.iSrvAgent.processMessage(this.iSock);
 		}
-
 	}
 
 	@Override
@@ -111,5 +107,4 @@ protected void close() {
 			TRC.error(e);
 		}
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DACache.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DACache.java
index b0fc299..543a827 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DACache.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DACache.java
@@ -47,26 +47,24 @@
 import java.util.List;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
 import org.metricshub.wbem.sblim.slp.internal.msg.DADescriptor;
 
 /**
  * DACache caches the discovered DA list in order to eliminate frequent DA
  * discovery network traffic.
- * 
+ *
  */
 public class DACache {
 
 	private static class ScopeEntry {
-
 		private long iTimeOfDiscovery;
 
 		private TreeSet iDADescriptors;
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pDADescriptors
 		 */
 		public ScopeEntry(TreeSet pDADescriptors) {
@@ -76,7 +74,7 @@ public ScopeEntry(TreeSet pDADescriptors) {
 
 		/**
 		 * valid
-		 * 
+		 *
 		 * @return boolean
 		 */
 		public boolean valid() {
@@ -85,13 +83,12 @@ public boolean valid() {
 
 		/**
 		 * getDADescriptorItr
-		 * 
+		 *
 		 * @return Iterator
 		 */
 		public Iterator getDADescriptorItr() {
 			return this.iDADescriptors == null ? null : this.iDADescriptors.iterator();
 		}
-
 	}
 
 	/**
@@ -147,8 +144,7 @@ public static synchronized List getDAList(List pScopes) {
 	 * @param pDADescriptors
 	 *            - DADescriptors of the discovered DAs
 	 */
-	public static synchronized void setDAList(List pScopes,
-			List pDADescriptors) {
+	public static synchronized void setDAList(List pScopes, List pDADescriptors) {
 		if (pScopes == null || pDADescriptors == null) return;
 		Iterator scopeItr = pScopes.iterator();
 		while (scopeItr.hasNext()) {
@@ -169,5 +165,4 @@ public static synchronized void setDAList(List pScopes,
 	static long getSecs() {
 		return new Date().getTime() / 1000;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DatagramRequester.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DatagramRequester.java
index 9546500..9eefc37 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DatagramRequester.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/DatagramRequester.java
@@ -57,23 +57,21 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 import org.metricshub.wbem.sblim.slp.internal.IPv6MulticastAddressFactory;
+import org.metricshub.wbem.sblim.slp.internal.Net;
 import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
 import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
 import org.metricshub.wbem.sblim.slp.internal.TRC;
 import org.metricshub.wbem.sblim.slp.internal.msg.MsgFactory;
-import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
-import org.metricshub.wbem.sblim.slp.ServiceLocationException;
-import org.metricshub.wbem.sblim.slp.internal.Net;
 import org.metricshub.wbem.sblim.slp.internal.msg.ReplyMessage;
+import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
 
 /**
  * DatagramRequester
- * 
+ *
  */
 public class DatagramRequester implements Runnable {
-
 	RequestMessage iReqMsg;
 
 	private Thread iThread;
@@ -86,9 +84,8 @@ public class DatagramRequester implements Runnable {
 
 	private int iPort = SLPConfig.getGlobalCfg().getPort();
 
-	private boolean iUseV4 = Net.hasIPv4() && SLPConfig.getGlobalCfg().useIPv4(), iUseV6 = Net
-			.hasIPv6()
-			&& SLPConfig.getGlobalCfg().useIPv6();
+	private boolean iUseV4 = Net.hasIPv4() && SLPConfig.getGlobalCfg().useIPv4(), iUseV6 =
+		Net.hasIPv6() && SLPConfig.getGlobalCfg().useIPv6();
 
 	private List iTCPRequesters;
 
@@ -107,14 +104,13 @@ public class DatagramRequester implements Runnable {
 
 	/**
 	 * Constructor used for unicast requests
-	 * 
+	 *
 	 * @param pRqstMsg
 	 * @param pResTable
 	 * @param pDst
 	 * @throws IOException
 	 */
-	public DatagramRequester(RequestMessage pRqstMsg, ResultTable pResTable, InetAddress pDst)
-			throws IOException {
+	public DatagramRequester(RequestMessage pRqstMsg, ResultTable pResTable, InetAddress pDst) throws IOException {
 		this.iReqMsg = pRqstMsg;
 		this.iResTable = pResTable;
 		this.iDst0 = pDst;
@@ -124,7 +120,7 @@ public DatagramRequester(RequestMessage pRqstMsg, ResultTable pResTable, InetAdd
 
 	/**
 	 * Constructor used for multicast requests
-	 * 
+	 *
 	 * @param pRqstMsg
 	 * @param pResTable
 	 * @throws IOException
@@ -137,14 +133,12 @@ public DatagramRequester(RequestMessage pRqstMsg, ResultTable pResTable) throws
 		MulticastSocket mcastSocket = new MulticastSocket();
 		this.iDGramSocket = mcastSocket;
 		if (this.iUseV6) {
-			this.iDst0 = IPv6MulticastAddressFactory
-					.get(SLPDefaults.IPV6_MULTICAST_SCOPE, pRqstMsg);
+			this.iDst0 = IPv6MulticastAddressFactory.get(SLPDefaults.IPV6_MULTICAST_SCOPE, pRqstMsg);
 			try {
 				mcastSocket.joinGroup(this.iDst0);
 			} catch (IOException ioe) {
 				// some kernels can't handle IPv6 mcast
-				TRC.warning("IOException caught during join, disabling IPv6: " + ioe.getMessage(),
-						ioe);
+				TRC.warning("IOException caught during join, disabling IPv6: " + ioe.getMessage(), ioe);
 				this.iDst0 = null;
 			}
 		}
@@ -156,7 +150,7 @@ public DatagramRequester(RequestMessage pRqstMsg, ResultTable pResTable) throws
 
 	/**
 	 * start
-	 * 
+	 *
 	 * @param pAsThread
 	 */
 	public void start(boolean pAsThread) {
@@ -172,7 +166,7 @@ public void start(boolean pAsThread) {
 
 	/**
 	 * For diagnostic only.
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getPort() {
@@ -208,14 +202,13 @@ public void run() {
 	}
 
 	class MCastLoopController {
-
 		private long iStartTime = getMillis();
 
 		private int iTimeOutIdx = 0;
 
 		/**
 		 * getTimeOut
-		 * 
+		 *
 		 * @return int
 		 */
 		public int getTimeOut() {
@@ -235,28 +228,31 @@ public void nextTimeOut() {
 
 		/**
 		 * hasNext
-		 * 
+		 *
 		 * @return boolean
 		 */
 		public boolean hasNext() {
-			return DatagramRequester.this.iResTable.getTotalResponses() < DatagramRequester.this.iMaxResults
-					&& getMillis() - this.iStartTime < DatagramRequester.this.iTotalTimeOut
-					&& hasNextTimeOut();
+			return (
+				DatagramRequester.this.iResTable.getTotalResponses() < DatagramRequester.this.iMaxResults &&
+				getMillis() - this.iStartTime < DatagramRequester.this.iTotalTimeOut &&
+				hasNextTimeOut()
+			);
 		}
-
 	}
 
 	private void mcastNegotiate() throws Exception {
 		byte[] reqBytes = this.iReqMsg.serialize(true, true, false);
-		DatagramPacket outPacket0 = this.iDst0 == null ? null : new DatagramPacket(reqBytes,
-				reqBytes.length, this.iDst0, this.iPort);
-		DatagramPacket outPacket1 = this.iDst1 == null ? null : new DatagramPacket(reqBytes,
-				reqBytes.length, this.iDst1, this.iPort);
+		DatagramPacket outPacket0 = this.iDst0 == null
+			? null
+			: new DatagramPacket(reqBytes, reqBytes.length, this.iDst0, this.iPort);
+		DatagramPacket outPacket1 = this.iDst1 == null
+			? null
+			: new DatagramPacket(reqBytes, reqBytes.length, this.iDst1, this.iPort);
 		DatagramPacket inPacket = new DatagramPacket(this.iInBuf, this.iInBuf.length);
 		MCastLoopController ctrl = new MCastLoopController();
 		boolean respondersUpdated = false;
 		ResponseCache rspCache = new ResponseCache();
-		sendLoop: while (ctrl.hasNext()) {
+		sendLoop:while (ctrl.hasNext()) {
 			if (respondersUpdated) {
 				byte[] msg = this.iReqMsg.serialize(true, true, true);
 				if (outPacket0 != null) outPacket0.setData(msg);
@@ -270,8 +266,7 @@ private void mcastNegotiate() throws Exception {
 				if (outPacket0 != null) this.iDGramSocket.send(outPacket0);
 			} catch (IOException ioe) {
 				// some back level kernels can't handle sending IPv6 mcast
-				TRC.warning("IOException caught during send, disabling IPv6: " + ioe.getMessage(),
-						ioe);
+				TRC.warning("IOException caught during send, disabling IPv6: " + ioe.getMessage(), ioe);
 				outPacket0 = null;
 				this.iDst0 = null;
 			}
@@ -317,8 +312,7 @@ private void mcastNegotiate() throws Exception {
 
 	private void ucastNegotiate() throws Exception {
 		byte[] reqBytes = this.iReqMsg.serialize(false, true, false);
-		DatagramPacket outPacket = new DatagramPacket(reqBytes, reqBytes.length, this.iDst0,
-				this.iPort);
+		DatagramPacket outPacket = new DatagramPacket(reqBytes, reqBytes.length, this.iDst0, this.iPort);
 		DatagramPacket inPacket = new DatagramPacket(this.iInBuf, this.iInBuf.length);
 		int timeOutIdx = 0;
 		int timeOut = this.iTimeOuts[timeOutIdx];
@@ -346,8 +340,7 @@ private void ucastNegotiate() throws Exception {
 				continue;
 			}
 			if (replyMsg.overflows()) {
-				TCPRequester tcpRequester = new TCPRequester(this.iResTable, responderAddress,
-						this.iReqMsg, true);
+				TCPRequester tcpRequester = new TCPRequester(this.iResTable, responderAddress, this.iReqMsg, true);
 				tcpRequester.waitFor();
 			}
 			/*
@@ -361,10 +354,10 @@ private void ucastNegotiate() throws Exception {
 	 * Tries to parse the content of the packet as a ReplyMessage. If parsing is
 	 * successful ReplyMessage is placed into the ResultTable, otherwise the
 	 * Exception is placed there.
-	 * 
+	 *
 	 * @param pPacket
 	 * @return the ReplyMessage or null in case of
-	 * 
+	 *
 	 *         Add all invalid URL exceptions thrown by parser into exception
 	 *         table
 	 */
@@ -373,8 +366,7 @@ private ReplyMessage handleResponse(DatagramPacket pPacket) {
 		try {
 			replyMsg = (ReplyMessage) MsgFactory.parse(pPacket);
 			TRC.debug("expected: " + this.iReqMsg.getXID() + ", received: " + replyMsg);
-			if (this.iReqMsg.getXID() != replyMsg.getXID()
-					|| !this.iReqMsg.isAllowedResponseType(replyMsg)) {
+			if (this.iReqMsg.getXID() != replyMsg.getXID() || !this.iReqMsg.isAllowedResponseType(replyMsg)) {
 				TRC.debug("expected: " + this.iReqMsg.getXID() + ", ignoring: " + replyMsg);
 				return null;
 			}
@@ -409,9 +401,7 @@ private void addTCPRequester(InetAddress pDest) throws ServiceLocationException
 	private void waitForTCPRequesters() {
 		if (this.iTCPRequesters == null) return;
 		Iterator itr = this.iTCPRequesters.iterator();
-		while (itr.hasNext())
-			itr.next().waitFor();
+		while (itr.hasNext()) itr.next().waitFor();
 		this.iTCPRequesters.clear();
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/LocatorImpl.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/LocatorImpl.java
index 90851a6..2209d68 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/LocatorImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/LocatorImpl.java
@@ -45,7 +45,7 @@
 import java.util.Locale;
 import java.util.SortedSet;
 import java.util.Vector;
-
+import org.metricshub.wbem.sblim.slp.Locator;
 import org.metricshub.wbem.sblim.slp.ServiceLocationEnumeration;
 import org.metricshub.wbem.sblim.slp.ServiceType;
 import org.metricshub.wbem.sblim.slp.ServiceURL;
@@ -54,22 +54,20 @@
 import org.metricshub.wbem.sblim.slp.internal.msg.AttributeRequest;
 import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRequest;
 import org.metricshub.wbem.sblim.slp.internal.msg.ServiceTypeRequest;
-import org.metricshub.wbem.sblim.slp.Locator;
 import org.metricshub.wbem.sblim.slp.internal.msg.Util;
 
 /**
  * LocatorImpl
- * 
+ *
  */
 public class LocatorImpl implements Locator {
-
 	private Locale iLocale;
 
 	private String iLangTag;
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pLocale
 	 */
 	public LocatorImpl(Locale pLocale) {
@@ -78,48 +76,89 @@ public LocatorImpl(Locale pLocale) {
 		TRC.debug("created, langTag=" + this.iLangTag);
 	}
 
-	public ServiceLocationEnumeration findAttributes(ServiceURL pURL, Vector pScopes,
-			Vector pAttributeIds) {
+	public ServiceLocationEnumeration findAttributes(
+		ServiceURL pURL,
+		Vector pScopes,
+		Vector pAttributeIds
+	) {
 		return findAttributes(pURL, pScopes, pAttributeIds, null);
 	}
 
-	public ServiceLocationEnumeration findAttributes(ServiceURL pURL, Vector pScopes,
-			Vector pAttributeIds, Vector pDirectoryAgents) {
-		return new SLEnumerationImpl(new AttributeRequest(this.iLangTag, (SortedSet) null,
-				pURL.toString(), getScopes(pScopes), pAttributeIds, null), pDirectoryAgents);
+	public ServiceLocationEnumeration findAttributes(
+		ServiceURL pURL,
+		Vector pScopes,
+		Vector pAttributeIds,
+		Vector pDirectoryAgents
+	) {
+		return new SLEnumerationImpl(
+			new AttributeRequest(
+				this.iLangTag,
+				(SortedSet) null,
+				pURL.toString(),
+				getScopes(pScopes),
+				pAttributeIds,
+				null
+			),
+			pDirectoryAgents
+		);
 	}
 
-	public ServiceLocationEnumeration findAttributes(ServiceType pType, Vector pScopes,
-			Vector pAttributeIds) {
+	public ServiceLocationEnumeration findAttributes(
+		ServiceType pType,
+		Vector pScopes,
+		Vector pAttributeIds
+	) {
 		return findAttributes(pType, pScopes, pAttributeIds, null);
 	}
 
-	public ServiceLocationEnumeration findAttributes(ServiceType pType, Vector pScopes,
-			Vector pAttributeIds, Vector pDirectoryAgents) {
-		return new SLEnumerationImpl(new AttributeRequest(this.iLangTag, (SortedSet) null,
-				pType.toString(), getScopes(pScopes), pAttributeIds, null), pDirectoryAgents);
+	public ServiceLocationEnumeration findAttributes(
+		ServiceType pType,
+		Vector pScopes,
+		Vector pAttributeIds,
+		Vector pDirectoryAgents
+	) {
+		return new SLEnumerationImpl(
+			new AttributeRequest(
+				this.iLangTag,
+				(SortedSet) null,
+				pType.toString(),
+				getScopes(pScopes),
+				pAttributeIds,
+				null
+			),
+			pDirectoryAgents
+		);
 	}
 
-	public ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
-			Vector pScopes) {
+	public ServiceLocationEnumeration findServiceTypes(String pNamingAuthority, Vector pScopes) {
 		return findServiceTypes(pNamingAuthority, pScopes, null);
 	}
 
-	public ServiceLocationEnumeration findServiceTypes(String pNamingAuthority,
-			Vector pScopes, Vector pDirectoryAgent) {
-		return new SLEnumerationImpl(new ServiceTypeRequest(this.iLangTag, null, pNamingAuthority,
-				getScopes(pScopes)), pDirectoryAgent);
+	public ServiceLocationEnumeration findServiceTypes(
+		String pNamingAuthority,
+		Vector pScopes,
+		Vector pDirectoryAgent
+	) {
+		return new SLEnumerationImpl(
+			new ServiceTypeRequest(this.iLangTag, null, pNamingAuthority, getScopes(pScopes)),
+			pDirectoryAgent
+		);
 	}
 
-	public ServiceLocationEnumeration findServices(ServiceType pType, Vector pScopes,
-			String pSearchFilter) {
+	public ServiceLocationEnumeration findServices(ServiceType pType, Vector pScopes, String pSearchFilter) {
 		return findServices(pType, pScopes, pSearchFilter, null);
 	}
 
-	public ServiceLocationEnumeration findServices(ServiceType pType, Vector pScopes,
-			String pSearchFilter, Vector pDirectoryAgents) {
-		return new SLEnumerationImpl(new ServiceRequest(this.iLangTag, null, pType,
-				getScopes(pScopes), pSearchFilter, null), pDirectoryAgents);
+	public ServiceLocationEnumeration findServices(
+		ServiceType pType,
+		Vector pScopes,
+		String pSearchFilter,
+		Vector pDirectoryAgents
+	) {
+		return new SLEnumerationImpl(
+			new ServiceRequest(this.iLangTag, null, pType, getScopes(pScopes), pSearchFilter, null),
+			pDirectoryAgents
+		);
 	}
 
 	public Locale getLocale() {
@@ -136,5 +175,4 @@ private static Vector getScopes(Vector pScopes) {
 		if (pScopes.isEmpty()) pScopes.add(SLPDefaults.DEFAULT_SCOPE);
 		return pScopes;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResponseCache.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResponseCache.java
index 2b4dcdb..4d753ac 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResponseCache.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResponseCache.java
@@ -50,19 +50,18 @@
 /**
  * ResponseCache intends to eliminate the processing of SLP responses with the
  * same content.
- * 
+ *
  */
 public class ResponseCache {
 
 	private static class Entry {
-
 		private byte[] iData;
 
 		private int iHashCode;
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pData
 		 * @param pOffset
 		 * @param pLength
@@ -78,7 +77,7 @@ public Entry(byte[] pData, int pOffset, int pLength) {
 
 		/**
 		 * Ctor.
-		 * 
+		 *
 		 * @param pPacket
 		 */
 		public Entry(DatagramPacket pPacket) {
@@ -97,14 +96,13 @@ public boolean equals(Object pObj) {
 			Entry that = (Entry) pObj;
 			return this.iHashCode == that.iHashCode && Arrays.equals(this.iData, that.iData);
 		}
-
 	}
 
 	private HashSet iResponseSet = new HashSet();
 
 	/**
 	 * add
-	 * 
+	 *
 	 * @param pPacket
 	 */
 	public void add(DatagramPacket pPacket) {
@@ -113,12 +111,11 @@ public void add(DatagramPacket pPacket) {
 
 	/**
 	 * contains
-	 * 
+	 *
 	 * @param pPacket
 	 * @return boolean
 	 */
 	public boolean contains(DatagramPacket pPacket) {
 		return this.iResponseSet.contains(new Entry(pPacket));
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResultTable.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResultTable.java
index bee02dd..6d4e7da 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResultTable.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/ResultTable.java
@@ -48,16 +48,14 @@
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.NoSuchElementException;
-
 import org.metricshub.wbem.sblim.slp.internal.TRC;
 import org.metricshub.wbem.sblim.slp.internal.msg.ReplyMessage;
 
 /**
  * ResultTable
- * 
+ *
  */
 public class ResultTable implements Iterator {
-
 	private ArrayList iRequesters = new ArrayList();
 
 	private ArrayList iExceptions = new ArrayList();
@@ -73,20 +71,19 @@ public class ResultTable implements Iterator {
 	/**
 	 * ResultTable has to know which Requesters provide results. Requester have
 	 * to be registered before hasNext() is called.
-	 * 
+	 *
 	 * @see #unregisterRequester(DatagramRequester)
 	 * @param pReq
 	 */
 	public synchronized void registerRequester(DatagramRequester pReq) {
-		for (int i = 0; i < this.iRequesters.size(); i++)
-			if (pReq == this.iRequesters.get(i)) return;
+		for (int i = 0; i < this.iRequesters.size(); i++) if (pReq == this.iRequesters.get(i)) return;
 		this.iRequesters.add(pReq);
 	}
 
 	/**
 	 * If the Requester's sequence is completed, Requester has to be
 	 * unregistered otherwise hasNext() will block.
-	 * 
+	 *
 	 * @param pReq
 	 */
 	public synchronized void unregisterRequester(DatagramRequester pReq) {
@@ -101,7 +98,7 @@ public synchronized void unregisterRequester(DatagramRequester pReq) {
 
 	/**
 	 * addResults
-	 * 
+	 *
 	 * @param pReplyMsg
 	 */
 	public void addResults(ReplyMessage pReplyMsg) {
@@ -110,20 +107,19 @@ public void addResults(ReplyMessage pReplyMsg) {
 
 	/**
 	 * addResults
-	 * 
+	 *
 	 * @param pResItr
 	 */
 	public synchronized void addResults(Iterator pResItr) {
 		if (pResItr == null) return;
-		while (pResItr.hasNext())
-			addResult(pResItr.next());
+		while (pResItr.hasNext()) addResult(pResItr.next());
 		// waking up hasNext()
 		if (this.iInSet.size() > 0) wakeUp();
 	}
 
 	/**
 	 * addExceptions
-	 * 
+	 *
 	 * @param pReplyMsg
 	 */
 	public synchronized void addExceptions(ReplyMessage pReplyMsg) {
@@ -132,18 +128,17 @@ public synchronized void addExceptions(ReplyMessage pReplyMsg) {
 
 	/**
 	 * addExceptions
-	 * 
+	 *
 	 * @param pExceptionItr
 	 */
 	public synchronized void addExceptions(Iterator pExceptionItr) {
 		if (pExceptionItr == null) return;
-		while (pExceptionItr.hasNext())
-			addException((Exception) pExceptionItr.next());
+		while (pExceptionItr.hasNext()) addException((Exception) pExceptionItr.next());
 	}
 
 	/**
 	 * addException
-	 * 
+	 *
 	 * @param pE
 	 */
 	public synchronized void addException(Exception pE) {
@@ -153,7 +148,7 @@ public synchronized void addException(Exception pE) {
 
 	/**
 	 * getTotalResponses
-	 * 
+	 *
 	 * @return int
 	 */
 	public synchronized int getTotalResponses() {
@@ -229,5 +224,4 @@ private void wakeUp() {
 	private boolean hasData() {
 		return this.iInSet.size() > 0;
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java
index 83c214d..99d0e22 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/SLEnumerationImpl.java
@@ -52,22 +52,20 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
-
 import org.metricshub.wbem.sblim.slp.ServiceLocationEnumeration;
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 import org.metricshub.wbem.sblim.slp.ServiceURL;
 import org.metricshub.wbem.sblim.slp.internal.SLPDefaults;
 import org.metricshub.wbem.sblim.slp.internal.TRC;
 import org.metricshub.wbem.sblim.slp.internal.msg.DADescriptor;
 import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
 import org.metricshub.wbem.sblim.slp.internal.msg.ServiceRequest;
-import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 
 /**
  * SLEnumerationImpl
- * 
+ *
  */
 public class SLEnumerationImpl implements ServiceLocationEnumeration {
-
 	private RequestMessage iReqMsg;
 
 	private ResultTable iResultTable;
@@ -82,7 +80,7 @@ public class SLEnumerationImpl implements ServiceLocationEnumeration {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pReqMsg
 	 * @param pDAList
 	 */
@@ -96,7 +94,7 @@ public SLEnumerationImpl(RequestMessage pReqMsg, List pDAList) {
 	/**
 	 * This implementation can throw RuntimeExceptions. They can be ignored or
 	 * used for analysis.
-	 * 
+	 *
 	 * @see ServiceLocationEnumeration#next()
 	 */
 	public Object next() throws NoSuchElementException {
@@ -113,11 +111,11 @@ public Object next() throws NoSuchElementException {
 	/**
 	 * @return next Object in Exception table
 	 * @throws NoSuchElementException
-	 * 
+	 *
 	 *             This in internal implementation to get list of all exceptions
 	 *             thrown/caught by parser This can throw RuntimeExceptions.
 	 *             They can be ignored or used for analysis.
-	 * 
+	 *
 	 *             use hasNextException to check whether there exists another
 	 *             element in Exception table
 	 */
@@ -127,7 +125,7 @@ public Object nextException() throws NoSuchElementException {
 
 	/**
 	 * @return true if there exists another element in Exception table
-	 * 
+	 *
 	 */
 	public boolean hasMoreExceptions() {
 		return this.iResultTable.hasMoreExceptions();
@@ -148,8 +146,7 @@ public boolean hasMoreElements() {
 				try {
 					daList = getDAList(this.iReqMsg.getScopeList());
 				} catch (Exception e) {
-					throw new RuntimeException(new ServiceLocationException(
-							ServiceLocationException.INTERNAL_ERROR, e));
+					throw new RuntimeException(new ServiceLocationException(ServiceLocationException.INTERNAL_ERROR, e));
 				}
 			}
 			try {
@@ -172,7 +169,7 @@ public Object nextElement() throws NoSuchElementException {
 
 	/**
 	 * For diagnostic only!
-	 * 
+	 *
 	 * @return int
 	 */
 	public int getPort() {
@@ -190,16 +187,14 @@ private boolean isDASrvRequest() {
 	 * @return List of DA address InetAddresses
 	 * @throws UnknownHostException
 	 */
-	private List getDAList(List pScopes) throws UnknownHostException,
-			IOException {
+	private List getDAList(List pScopes) throws UnknownHostException, IOException {
 		if (this.iDAList != null && this.iDAList.size() > 0) return this.iDAList;
 
 		// return cached DA list from previous discovery
 		List scopes = DACache.getDiscoverableScopeList(pScopes);
 		if (scopes != null) {
 			ResultTable resultTable = new ResultTable();
-			ServiceRequest srvReq = new ServiceRequest(null, SLPDefaults.DA_SERVICE_TYPE, scopes,
-					null, null);
+			ServiceRequest srvReq = new ServiceRequest(null, SLPDefaults.DA_SERVICE_TYPE, scopes, null, null);
 			// multicast DA discovery
 			DatagramRequester requester = new DatagramRequester(srvReq, resultTable);
 			requester.start(false);
@@ -251,5 +246,4 @@ private void setupMulticasting() throws ServiceLocationException, IOException {
 			throw new ServiceLocationException(ServiceLocationException.NETWORK_ERROR, e);
 		}
 	}
-
 }
diff --git a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/TCPRequester.java b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/TCPRequester.java
index 8432361..b785097 100644
--- a/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/TCPRequester.java
+++ b/src/main/java/org/metricshub/wbem/sblim/slp/internal/ua/TCPRequester.java
@@ -45,20 +45,18 @@
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.Socket;
-
+import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 import org.metricshub.wbem.sblim.slp.internal.SLPConfig;
 import org.metricshub.wbem.sblim.slp.internal.TRC;
 import org.metricshub.wbem.sblim.slp.internal.msg.MsgFactory;
-import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
-import org.metricshub.wbem.sblim.slp.ServiceLocationException;
 import org.metricshub.wbem.sblim.slp.internal.msg.ReplyMessage;
+import org.metricshub.wbem.sblim.slp.internal.msg.RequestMessage;
 
 /**
  * TCPRequester
- * 
+ *
  */
 public class TCPRequester implements Runnable {
-
 	private InetAddress iDestination;
 
 	private Thread iThread;
@@ -75,15 +73,15 @@ public class TCPRequester implements Runnable {
 
 	/**
 	 * Ctor.
-	 * 
+	 *
 	 * @param pResTable
 	 * @param pDestination
 	 * @param pReqMsg
 	 * @param pAsThread
 	 * @throws ServiceLocationException
 	 */
-	public TCPRequester(ResultTable pResTable, InetAddress pDestination, RequestMessage pReqMsg,
-			boolean pAsThread) throws ServiceLocationException {
+	public TCPRequester(ResultTable pResTable, InetAddress pDestination, RequestMessage pReqMsg, boolean pAsThread)
+		throws ServiceLocationException {
 		this.iResTable = pResTable;
 		this.iDestination = pDestination;
 		this.iReqMsg = pReqMsg;
@@ -132,7 +130,6 @@ public void run() {
 				}
 			}
 		}
-
 	}
 
 	private void handleResponse(Socket pSocket) {
@@ -143,9 +140,8 @@ private void handleResponse(Socket pSocket) {
 			this.iResTable.addException(e);
 			return;
 		}
-		if (this.iReqMsg.getXID() == replyMsg.getXID()
-				&& this.iReqMsg.isAllowedResponseType(replyMsg)) this.iResTable
-				.addResults(replyMsg);
+		if (
+			this.iReqMsg.getXID() == replyMsg.getXID() && this.iReqMsg.isAllowedResponseType(replyMsg)
+		) this.iResTable.addResults(replyMsg);
 	}
-
 }
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 7cd52bd..94cac33 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -1,9 +1,10 @@
 # WBEM Java Client
 
 The Web-Based Entreprise Management (WBEM) Java Client is a library that enables to:
-* Connect to a WBEM Server
-* Execute WQL (WBEM Query Language) queries such as EnumerateInstances
-It uses HTTP/HTTPS protocol for that purpose.
+
+- Connect to a WBEM Server
+- Execute WQL (WBEM Query Language) queries such as EnumerateInstances
+  It uses HTTP/HTTPS protocol for that purpose.
 
 # How to run the WBEM Client inside Java
 
@@ -24,11 +25,10 @@ When you embed the WBEM Java Client into your Java application, it's important t
 
 ### Exporting Packages with `--add-exports`
 
-Use the  `--add-exports` flag to allow modules to access the internal parsers provided by the `com.sun.org.apache.xerces` package in the `java.xml` module:
+Use the `--add-exports` flag to allow modules to access the internal parsers provided by the `com.sun.org.apache.xerces` package in the `java.xml` module:
 
 - `java.xml/com.sun.org.apache.xerces.internal.parsers`
 
-
 ### Opening Packages with `--add-opens`
 
 Use the `--add-opens` flag to open the required packages in the `java.base` module:
@@ -38,7 +38,6 @@ Use the `--add-opens` flag to open the required packages in the `java.base` modu
 - `java.base/sun.net.www.protocol.http`
 - `java.base/sun.security.ssl`
 
-
 ### Example Usage
 
 When invoking the `jar` command, include the specified `--add-exports` and `--add-opens` options in the JVM arguments. For example:
@@ -48,6 +47,7 @@ java -jar --add-exports java.xml/com.sun.org.apache.xerces.internal.parsers --ad
 ```
 
 Use it as follows:
+
 ```Java
 package org.metricshub.wbem;
 
@@ -88,4 +88,4 @@ public class Main {
 	}
 }
 
-```
\ No newline at end of file
+```
diff --git a/src/site/resources/css/site.css b/src/site/resources/css/site.css
new file mode 100644
index 0000000..e85911b
--- /dev/null
+++ b/src/site/resources/css/site.css
@@ -0,0 +1,86 @@
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * Open MetricsHub Web Site
+ * ჻჻჻჻჻჻
+ * Copyright (C) 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+/* Poppins font */
+@font-face {
+	font-family: 'Poppins';
+	src: url('../fonts/Poppins-ExtraBold.woff2') format('woff2'),
+		url('../fonts/Poppins-ExtraBold.woff') format('woff'),
+		url('../fonts/Poppins-ExtraBold.ttf') format('truetype'),
+		local('Helvetica');
+	font-weight: 800;
+	font-style: normal;
+	font-display: swap;
+}
+
+@font-face {
+	font-family: 'Poppins';
+	src: url('../fonts/Poppins-Bold.woff2') format('woff2'),
+		url('../fonts/Poppins-Bold.woff') format('woff'),
+		url('../fonts/Poppins-Bold.ttf') format('truetype'),
+		local('Helvetica');
+	font-weight: 700;
+	font-style: normal;
+	font-display: swap;
+}
+
+@font-face {
+	font-family: 'Poppins';
+	src: url('../fonts/Poppins-Regular.woff2') format('woff2'),
+		url('../fonts/Poppins-Regular.woff') format('woff'),
+		url('../fonts/Poppins-Regular.ttf') format('truetype'),
+		local('Helvetica');
+	font-weight: 400;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* MetricsHub fonts */
+:root {
+	--title-font: "Poppins", sans-serif;
+	--heading-font: "Poppins", sans-serif;
+	--content-font: "Poppins", sans-serif;
+
+	--content-font-size: medium;
+	--banner-font-size: 40px;
+	--banner-font-weight: 800;
+
+}
+
+ /* MetricsHub colors */
+body {
+	--main-fgcolor: #212529;
+	--banner-bgcolor: #266fd0;
+	--link-color: #266fd0;
+	--alternate-bgcolor: #266fd0;
+	--alternate-fgcolor: #fff;
+}
+
+body.dark {
+	--link-color: #7cb6ff;
+	--main-bgcolor: #262626;
+	--main-fgcolor: #e9ecef;
+}
\ No newline at end of file
diff --git a/src/site/resources/favicon.ico b/src/site/resources/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..61a2a88b8a927081a256a2b15861a747590450f6
GIT binary patch
literal 15406
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

literal 0
HcmV?d00001

diff --git a/src/site/resources/fonts/Poppins-Bold.ttf b/src/site/resources/fonts/Poppins-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..00559eeb290fb8036f10633ff0640447d827b27c
GIT binary patch
literal 153944
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%0AC7VmlS@LZ-TEZV}oirP&oT11@@uCp8_l(
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
      yKzvvaZoz%Rdj?Aw`;r
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
      qOT*6`j|
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
F003DowblRt

literal 0
HcmV?d00001

diff --git a/src/site/resources/fonts/Poppins-ExtraBold.ttf b/src/site/resources/fonts/Poppins-ExtraBold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..df7093608a7eb6173529ce9eeeb4d46e3a8290e5
GIT binary patch
literal 152764
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

literal 0
HcmV?d00001

diff --git a/src/site/resources/fonts/Poppins-ExtraBold.woff b/src/site/resources/fonts/Poppins-ExtraBold.woff
new file mode 100644
index 0000000000000000000000000000000000000000..0d7982a42763a91211fde7f17312f6702171bc8e
GIT binary patch
literal 72388
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
      W~v`*o1*fe1Jb9MY>4oZ
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
Z9BeOSniG6Gel>8Cm?z_$@|ytw002lPOjG~>

literal 0
HcmV?d00001

diff --git a/src/site/resources/fonts/Poppins-Regular.ttf b/src/site/resources/fonts/Poppins-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9f0c71b70a49664ced448c63edc9c4ff2bf8cf4a
GIT binary patch
literal 158240
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
j$%
 		images/metricshub-logo.png
-		https://metricshub.com
+		https://metricshub.org
 	
 
 	
 
 		
 			
-			
 		
 
 		
      
diff --git a/src/test/java/org/metricshub/wbem/WbemCimDataHandlerTest.java b/src/test/java/org/metricshub/wbem/WbemCimDataHandlerTest.java
index 1ce5195..0067dac 100644
--- a/src/test/java/org/metricshub/wbem/WbemCimDataHandlerTest.java
+++ b/src/test/java/org/metricshub/wbem/WbemCimDataHandlerTest.java
@@ -1,157 +1,345 @@
 package org.metricshub.wbem;
 
 import java.math.BigInteger;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.metricshub.wbem.client.WbemCimDataHandler;
 import org.metricshub.wbem.javax.cim.CIMClass;
 import org.metricshub.wbem.javax.cim.CIMClassProperty;
 import org.metricshub.wbem.javax.cim.CIMDataType;
+import org.metricshub.wbem.javax.cim.CIMDateTime;
 import org.metricshub.wbem.javax.cim.CIMDateTimeAbsolute;
 import org.metricshub.wbem.javax.cim.CIMDateTimeInterval;
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
-import org.metricshub.wbem.javax.cim.CIMDateTime;
 import org.metricshub.wbem.javax.cim.CIMProperty;
 
 class WbemCimDataHandlerTest {
 
 	@Test
 	void testGetCimPropertyAsString() {
+		final CIMObjectPath objectPath = new CIMObjectPath(
+			"root/emc:Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\""
+		);
 
-		final CIMObjectPath objectPath = new CIMObjectPath("root/emc:Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"");
-
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString(null, new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "SYMMETRIX-+-000297800620")}), null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString("Name", null, null));
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() ->
+				WbemCimDataHandler.getCimPropertyAsString(
+					null,
+					new CIMInstance(
+						objectPath,
+						new CIMProperty[] { new CIMProperty("Name", CIMDataType.STRING_T, "SYMMETRIX-+-000297800620") }
+					),
+					null
+				)
+		);
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> WbemCimDataHandler.getCimPropertyAsString("Name", null, null)
+		);
 
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString("__Path", new CIMInstance(null, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "SYMMETRIX-+-000297800620")}), null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemCimDataHandler.getCimPropertyAsString("Ref", new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref", 1), "x")}), null));
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() ->
+				WbemCimDataHandler.getCimPropertyAsString(
+					"__Path",
+					new CIMInstance(
+						null,
+						new CIMProperty[] { new CIMProperty("Name", CIMDataType.STRING_T, "SYMMETRIX-+-000297800620") }
+					),
+					null
+				)
+		);
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() ->
+				WbemCimDataHandler.getCimPropertyAsString(
+					"Ref",
+					new CIMInstance(
+						objectPath,
+						new CIMProperty[] { new CIMProperty("Ref", new CIMDataType("Ref", 1), "x") }
+					),
+					null
+				)
+		);
 
 		Assertions.assertEquals(
-				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"",
-				WbemCimDataHandler.getCimPropertyAsString("__PATH", new CIMInstance(objectPath, null), null));
+			"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"",
+			WbemCimDataHandler.getCimPropertyAsString("__PATH", new CIMInstance(objectPath, null), null)
+		);
 
 		Assertions.assertEquals(
-				"",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"UnknownProperty",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\"")}), null));
+			"",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"UnknownProperty",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\"")
+					}
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"blablaVal",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"blabla",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\""), new CIMProperty("blabla", CIMDataType.STRING_T, "blablaVal", true, false, null)}), null));
+			"blablaVal",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"blabla",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\""),
+						new CIMProperty("blabla", CIMDataType.STRING_T, "blablaVal", true, false, null)
+					}
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"Name",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, null)}), null));
+			"",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"Name",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] { new CIMProperty("Name", CIMDataType.STRING_T, null) }
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"\"SYMMETRIX-+-000297800620;\"",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"Name",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\"")}), null));
+			"\"SYMMETRIX-+-000297800620;\"",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"Name",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty("Name", CIMDataType.STRING_T, "\"SYMMETRIX-+-000297800620;\"")
+					}
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"true",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"EMCAutoMetaEnabled",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("EMCAutoMetaEnabled", CIMDataType.BOOLEAN_T, Boolean.TRUE)}), null));
+			"true",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"EMCAutoMetaEnabled",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] { new CIMProperty("EMCAutoMetaEnabled", CIMDataType.BOOLEAN_T, Boolean.TRUE) }
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"true|false|",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"EMCAutoMetaEnabledArray",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("EMCAutoMetaEnabledArray", CIMDataType.BOOLEAN_ARRAY_T, new Boolean[] {Boolean.TRUE, Boolean.FALSE})}), null));
+			"true|false|",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"EMCAutoMetaEnabledArray",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty(
+							"EMCAutoMetaEnabledArray",
+							CIMDataType.BOOLEAN_ARRAY_T,
+							new Boolean[] { Boolean.TRUE, Boolean.FALSE }
+						)
+					}
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"10",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"PortType",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("PortType", CIMDataType.SINT32_T, Integer.valueOf(10))}), null));
+			"10",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"PortType",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] { new CIMProperty("PortType", CIMDataType.SINT32_T, Integer.valueOf(10)) }
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"2125000000",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"MaxSpeed",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("MaxSpeed", CIMDataType.UINT64_T, new BigInteger("2125000000"))}), null));
+			"2125000000",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"MaxSpeed",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty("MaxSpeed", CIMDataType.UINT64_T, new BigInteger("2125000000"))
+					}
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"1|2|",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"OperationalStatus",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("OperationalStatus", CIMDataType.SINT16_ARRAY_T, new Short[] {1,2})}), null));
+			"1|2|",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"OperationalStatus",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty("OperationalStatus", CIMDataType.SINT16_ARRAY_T, new Short[] { 1, 2 })
+					}
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"Ref",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref"), objectPath)}), null));
+			"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"Ref",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] { new CIMProperty("Ref", new CIMDataType("Ref"), objectPath) }
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
-				"|",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"Ref",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref", 1), new CIMObjectPath[] {objectPath})}), null));
+			"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" + "|",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"Ref",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty("Ref", new CIMDataType("Ref", 1), new CIMObjectPath[] { objectPath })
+					}
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
-				"||"+
-				"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
-				"|",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"Ref",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("Ref", new CIMDataType("Ref", 3), new CIMObjectPath[] {objectPath, null, objectPath})}), null));
+			"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
+			"||" +
+			"Symm_StorageSystem.CreationClassName=\"Symm_StorageSystem\",Name=\"SYMMETRIX-+-000297800620\"" +
+			"|",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"Ref",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty(
+							"Ref",
+							new CIMDataType("Ref", 3),
+							new CIMObjectPath[] { objectPath, null, objectPath }
+						)
+					}
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"1173882243000",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"timeAbsolute",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("timeAbsolute", CIMDataType.DATETIME_T, new CIMDateTimeAbsolute("20070314160503.566012+101"))}), null));
+			"1173882243000",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"timeAbsolute",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty(
+							"timeAbsolute",
+							CIMDataType.DATETIME_T,
+							new CIMDateTimeAbsolute("20070314160503.566012+101")
+						)
+					}
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"1173882243566",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"timeInterval",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("timeInterval", CIMDataType.DATETIME_T, new CIMDateTimeInterval(1173882243566L))}), null));
+			"1173882243566",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"timeInterval",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty(
+							"timeInterval",
+							CIMDataType.DATETIME_T,
+							new CIMDateTimeInterval(1173882243566L)
+						)
+					}
+				),
+				null
+			)
+		);
 
 		Assertions.assertEquals(
-				"1173882243000|1173882243566|",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"timeArray",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("timeArray", CIMDataType.DATETIME_ARRAY_T, new CIMDateTime[] {new CIMDateTimeAbsolute("20070314160503.566012+101"), new CIMDateTimeInterval(1173882243566L)})}), null));
+			"1173882243000|1173882243566|",
+			WbemCimDataHandler.getCimPropertyAsString(
+				"timeArray",
+				new CIMInstance(
+					objectPath,
+					new CIMProperty[] {
+						new CIMProperty(
+							"timeArray",
+							CIMDataType.DATETIME_ARRAY_T,
+							new CIMDateTime[] {
+								new CIMDateTimeAbsolute("20070314160503.566012+101"),
+								new CIMDateTimeInterval(1173882243566L)
+							}
+						)
+					}
+				),
+				null
+			)
+		);
 
-		final CIMClass cimClass =  new CIMClass(
-				"testClass",
-				null,
-				null,
-				new CIMClassProperty[] {new CIMClassProperty("KeyProp", CIMDataType.STRING_T, null, null, false, false, null)},
-				null);
+		final CIMClass cimClass = new CIMClass(
+			"testClass",
+			null,
+			null,
+			new CIMClassProperty[] {
+				new CIMClassProperty("KeyProp", CIMDataType.STRING_T, null, null, false, false, null)
+			},
+			null
+		);
 
 		Assertions.assertEquals(
-				"class testClass {" +
-				"  string KeyProp;" +
-				"};",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"propClass",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("propClass", CIMDataType.CLASS_T, cimClass)}), null).replaceAll("[\r\n]", ""));
-
-		Assertions.assertEquals(
-				"class testClass {" +
-				"  string KeyProp;" +
-				"};" +
-				"$$" +
-				"class testClass {" +
-				"  string KeyProp;" +
-				"};" +
-				"$",
-				WbemCimDataHandler.getCimPropertyAsString(
-						"propClass",
-						new CIMInstance(objectPath, new CIMProperty[] {new CIMProperty("propClass", CIMDataType.CLASS_ARRAY_T, new CIMClass[] {cimClass, null, cimClass})}), "$").replaceAll("[\r\n]", ""));
+			"class testClass {" + "  string KeyProp;" + "};",
+			WbemCimDataHandler
+				.getCimPropertyAsString(
+					"propClass",
+					new CIMInstance(
+						objectPath,
+						new CIMProperty[] { new CIMProperty("propClass", CIMDataType.CLASS_T, cimClass) }
+					),
+					null
+				)
+				.replaceAll("[\r\n]", "")
+		);
+
+		Assertions.assertEquals(
+			"class testClass {" + "  string KeyProp;" + "};" + "$$" + "class testClass {" + "  string KeyProp;" + "};" + "$",
+			WbemCimDataHandler
+				.getCimPropertyAsString(
+					"propClass",
+					new CIMInstance(
+						objectPath,
+						new CIMProperty[] {
+							new CIMProperty(
+								"propClass",
+								CIMDataType.CLASS_ARRAY_T,
+								new CIMClass[] { cimClass, null, cimClass }
+							)
+						}
+					),
+					"$"
+				)
+				.replaceAll("[\r\n]", "")
+		);
 	}
 }
diff --git a/src/test/java/org/metricshub/wbem/WbemClientTest.java b/src/test/java/org/metricshub/wbem/WbemClientTest.java
index a1a16bf..e59d1c2 100644
--- a/src/test/java/org/metricshub/wbem/WbemClientTest.java
+++ b/src/test/java/org/metricshub/wbem/WbemClientTest.java
@@ -2,24 +2,22 @@
 
 import java.net.URL;
 import java.util.Locale;
-
 import javax.security.auth.Subject;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.metricshub.wbem.client.WbemClient;
+import org.metricshub.wbem.client.WbemQueryResult;
 import org.metricshub.wbem.client.WqlQuery;
 import org.metricshub.wbem.javax.cim.CIMInstance;
 import org.metricshub.wbem.javax.cim.CIMObjectPath;
 import org.metricshub.wbem.javax.wbem.CloseableIterator;
 import org.metricshub.wbem.javax.wbem.client.EnumerateResponse;
 import org.metricshub.wbem.javax.wbem.client.WBEMClient;
+import org.metricshub.wbem.javax.wbem.client.WBEMClientConstants;
 import org.metricshub.wbem.javax.wbem.client.WBEMClientFactory;
 import org.mockito.ArgumentMatchers;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.metricshub.wbem.client.WbemQueryResult;
-import org.metricshub.wbem.javax.wbem.client.WBEMClientConstants;
 
 class WbemClientTest {
 
@@ -27,23 +25,38 @@ class WbemClientTest {
 	void testConnect() throws Exception {
 		final URL url = new URL("https://host:8080");
 		final String username = "user";
-		final char[] password = {'p', 'a', 's', 's'};
-		int timeout = 60*1000;
-
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().connect(null, username, password, timeout));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().connect(url, null, password, timeout));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().connect(url, username, null, timeout));
-
-		try (final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
-				final WbemClient wbemClient = new WbemClient()) {
+		final char[] password = { 'p', 'a', 's', 's' };
+		int timeout = 60 * 1000;
+
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> new WbemClient().connect(null, username, password, timeout)
+		);
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> new WbemClient().connect(url, null, password, timeout)
+		);
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> new WbemClient().connect(url, username, null, timeout)
+		);
+
+		try (
+			final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
+			final WbemClient wbemClient = new WbemClient()
+		) {
 			final WBEMClient client = Mockito.mock(WBEMClient.class);
 
 			mockedWBEMClientFactory.when(() -> WBEMClientFactory.getClient("CIM-XML")).thenReturn(client);
 			Mockito.doNothing().when(client).setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout));
-			Mockito.doNothing().when(client).initialize(
+			Mockito
+				.doNothing()
+				.when(client)
+				.initialize(
 					ArgumentMatchers.any(CIMObjectPath.class),
 					ArgumentMatchers.any(Subject.class),
-					ArgumentMatchers.eq(new Locale[] {Locale.ENGLISH}));
+					ArgumentMatchers.eq(new Locale[] { Locale.ENGLISH })
+				);
 
 			wbemClient.connect(url, username, password, timeout);
 		}
@@ -56,43 +69,63 @@ void testExecuteWql() throws Exception {
 		final WqlQuery queryHandler = WqlQuery.parseQuery("Select * from EMC_StorageSystem");
 
 		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().executeWql(null, namespace, null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().executeWql(queryHandler, null, null));
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> new WbemClient().executeWql(queryHandler, null, null)
+		);
 
-		Assertions.assertThrows(IllegalStateException.class, () -> new WbemClient().executeWql(queryHandler, namespace, null));
+		Assertions.assertThrows(
+			IllegalStateException.class,
+			() -> new WbemClient().executeWql(queryHandler, namespace, null)
+		);
 
 		final URL url = new URL("https://host:8080");
 		final String username = "user";
-		final char[] password = {'p', 'a', 's', 's'};
-		int timeout = 60*1000;
+		final char[] password = { 'p', 'a', 's', 's' };
+		int timeout = 60 * 1000;
 		final WBEMClient client = Mockito.mock(WBEMClient.class);
 		final CloseableIterator iterator = Mockito.mock(CloseableIterator.class);
 		final WbemQueryResult result = Mockito.mock(WbemQueryResult.class);
 
-		try (final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
-				final MockedStatic mockedMatsyaWbemClient = Mockito.mockStatic(WbemClient.class);
-				final WbemClient matsyaWbemClient =new WbemClient()) {
-
+		try (
+			final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
+			final MockedStatic mockedMatsyaWbemClient = Mockito.mockStatic(WbemClient.class);
+			final WbemClient matsyaWbemClient = new WbemClient()
+		) {
 			mockedWBEMClientFactory.when(() -> WBEMClientFactory.getClient("CIM-XML")).thenReturn(client);
 
 			Mockito.doNothing().when(client).setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout));
 
-			Mockito.doNothing().when(client).initialize(
+			Mockito
+				.doNothing()
+				.when(client)
+				.initialize(
 					ArgumentMatchers.any(CIMObjectPath.class),
 					ArgumentMatchers.any(Subject.class),
-					ArgumentMatchers.eq(new Locale[] {Locale.ENGLISH}));
+					ArgumentMatchers.eq(new Locale[] { Locale.ENGLISH })
+				);
 
-			Mockito.doReturn(iterator).when(client).enumerateInstances(
+			Mockito
+				.doReturn(iterator)
+				.when(client)
+				.enumerateInstances(
 					ArgumentMatchers.any(CIMObjectPath.class),
 					ArgumentMatchers.eq(true),
 					ArgumentMatchers.eq(false),
 					ArgumentMatchers.eq(true),
-					ArgumentMatchers.eq(queryHandler.getPropertiesArray()));
-
-			mockedMatsyaWbemClient.when(() -> WbemClient.enumerateInstances(
-					ArgumentMatchers.any(WqlQuery.class),
-					ArgumentMatchers.any(CloseableIterator.class),
-					ArgumentMatchers.isNull()))
-			.thenReturn(result);
+					ArgumentMatchers.eq(queryHandler.getPropertiesArray())
+				);
+
+			mockedMatsyaWbemClient
+				.when(
+					() ->
+						WbemClient.enumerateInstances(
+							ArgumentMatchers.any(WqlQuery.class),
+							ArgumentMatchers.any(CloseableIterator.class),
+							ArgumentMatchers.isNull()
+						)
+				)
+				.thenReturn(result);
 
 			matsyaWbemClient.connect(url, username, password, timeout);
 
@@ -105,8 +138,8 @@ void testExecuteWql() throws Exception {
 	void testGetAssociators() throws Exception {
 		final URL url = new URL("https://host:8080");
 		final String username = "user";
-		final char[] password = {'p', 'a', 's', 's'};
-		int timeout = 60*1000;
+		final char[] password = { 'p', 'a', 's', 's' };
+		int timeout = 60 * 1000;
 		final WBEMClient client = Mockito.mock(WBEMClient.class);
 		final WqlQuery queryHandler = WqlQuery.parseQuery("Select * from EMC_StorageSystem");
 		final EnumerateResponse response = Mockito.mock(EnumerateResponse.class);
@@ -114,25 +147,42 @@ void testGetAssociators() throws Exception {
 		final WbemQueryResult result = Mockito.mock(WbemQueryResult.class);
 
 		final String objectPathAssociators = "objectPathAssociators";
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().getAssociators(null, objectPathAssociators, null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> new WbemClient().getAssociators(queryHandler, null, null));
-
-		Assertions.assertThrows(IllegalStateException.class, () -> new WbemClient().getAssociators(queryHandler, objectPathAssociators, null));
-
-		try (final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
-				final MockedStatic mockedMatsyaWbemClient = Mockito.mockStatic(WbemClient.class);
-				final WbemClient matsyaWbemClient = new WbemClient()) {
-
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> new WbemClient().getAssociators(null, objectPathAssociators, null)
+		);
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> new WbemClient().getAssociators(queryHandler, null, null)
+		);
+
+		Assertions.assertThrows(
+			IllegalStateException.class,
+			() -> new WbemClient().getAssociators(queryHandler, objectPathAssociators, null)
+		);
+
+		try (
+			final MockedStatic mockedWBEMClientFactory = Mockito.mockStatic(WBEMClientFactory.class);
+			final MockedStatic mockedMatsyaWbemClient = Mockito.mockStatic(WbemClient.class);
+			final WbemClient matsyaWbemClient = new WbemClient()
+		) {
 			mockedWBEMClientFactory.when(() -> WBEMClientFactory.getClient("CIM-XML")).thenReturn(client);
 
 			Mockito.doNothing().when(client).setProperty(WBEMClientConstants.PROP_TIMEOUT, String.valueOf(timeout));
 
-			Mockito.doNothing().when(client).initialize(
+			Mockito
+				.doNothing()
+				.when(client)
+				.initialize(
 					ArgumentMatchers.any(CIMObjectPath.class),
 					ArgumentMatchers.any(Subject.class),
-					ArgumentMatchers.eq(new Locale[] {Locale.ENGLISH}));
+					ArgumentMatchers.eq(new Locale[] { Locale.ENGLISH })
+				);
 
-			Mockito.doReturn(response).when(client).associators(
+			Mockito
+				.doReturn(response)
+				.when(client)
+				.associators(
 					ArgumentMatchers.any(CIMObjectPath.class),
 					ArgumentMatchers.eq(queryHandler.getClassName()),
 					ArgumentMatchers.isNull(),
@@ -144,20 +194,25 @@ void testGetAssociators() throws Exception {
 					ArgumentMatchers.isNull(),
 					ArgumentMatchers.isNull(),
 					ArgumentMatchers.eq(false),
-					ArgumentMatchers.isNull());
+					ArgumentMatchers.isNull()
+				);
 
 			Mockito.doReturn(iterator).when(response).getResponses();
 
-			mockedMatsyaWbemClient.when(() -> WbemClient.enumerateInstances(
-					ArgumentMatchers.any(WqlQuery.class),
-					ArgumentMatchers.any(CloseableIterator.class),
-					ArgumentMatchers.isNull()))
-			.thenReturn(result);
+			mockedMatsyaWbemClient
+				.when(
+					() ->
+						WbemClient.enumerateInstances(
+							ArgumentMatchers.any(WqlQuery.class),
+							ArgumentMatchers.any(CloseableIterator.class),
+							ArgumentMatchers.isNull()
+						)
+				)
+				.thenReturn(result);
 
 			matsyaWbemClient.connect(url, username, password, timeout);
 
 			Assertions.assertEquals(result, matsyaWbemClient.getAssociators(queryHandler, objectPathAssociators, null));
 		}
 	}
-
 }
diff --git a/src/test/java/org/metricshub/wbem/WbemExecutorTest.java b/src/test/java/org/metricshub/wbem/WbemExecutorTest.java
index b94802b..0536132 100644
--- a/src/test/java/org/metricshub/wbem/WbemExecutorTest.java
+++ b/src/test/java/org/metricshub/wbem/WbemExecutorTest.java
@@ -8,15 +8,14 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.metricshub.wbem.client.WbemExecutor;
+import org.metricshub.wbem.client.WbemQueryResult;
 import org.metricshub.wbem.javax.wbem.WBEMException;
 import org.mockito.ArgumentMatchers;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.metricshub.wbem.client.WbemQueryResult;
 
 class WbemExecutorTest {
 
@@ -25,16 +24,31 @@ class WbemExecutorTest {
 	void testExecuteWql() throws Exception {
 		final URL url = new URL("https://host:8080");
 		final String username = "user";
-		final char[] password = {'p', 'a', 's', 's'};
-		int timeout = 60*1000;
+		final char[] password = { 'p', 'a', 's', 's' };
+		int timeout = 60 * 1000;
 		final String namespace = "root/emc";
 		final String query = "Select * from EMC_StorageSystem";
 
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(null, namespace, username, password, query, timeout, null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(url, namespace, null, password, query,  timeout, null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(url, namespace, username, null, query, timeout, null));
-		Assertions.assertThrows(IllegalArgumentException.class, () -> WbemExecutor.executeWql(url, namespace, username, password, null, timeout, null));
-		Assertions.assertThrows(TimeoutException.class, () -> WbemExecutor.executeWql(url, namespace, username, password, query, 0, null));
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> WbemExecutor.executeWql(null, namespace, username, password, query, timeout, null)
+		);
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> WbemExecutor.executeWql(url, namespace, null, password, query, timeout, null)
+		);
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> WbemExecutor.executeWql(url, namespace, username, null, query, timeout, null)
+		);
+		Assertions.assertThrows(
+			IllegalArgumentException.class,
+			() -> WbemExecutor.executeWql(url, namespace, username, password, null, timeout, null)
+		);
+		Assertions.assertThrows(
+			TimeoutException.class,
+			() -> WbemExecutor.executeWql(url, namespace, username, password, query, 0, null)
+		);
 
 		final WbemQueryResult result = Mockito.mock(WbemQueryResult.class);
 		final Future handler = Mockito.mock(Future.class);
@@ -50,8 +64,9 @@ void testExecuteWql() throws Exception {
 			Mockito.doThrow(executionException).when(handler).get(timeout, TimeUnit.MILLISECONDS);
 
 			Assertions.assertThrows(
-					WBEMException.class,
-					() -> WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null));
+				WBEMException.class,
+				() -> WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null)
+			);
 		}
 
 		try (final MockedStatic mockedExecutorService = Mockito.mockStatic(Executors.class)) {
@@ -64,8 +79,9 @@ void testExecuteWql() throws Exception {
 			Mockito.doThrow(executionException).when(handler).get(timeout, TimeUnit.MILLISECONDS);
 
 			Assertions.assertThrows(
-					RuntimeException.class,
-					() -> WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null));
+				RuntimeException.class,
+				() -> WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null)
+			);
 		}
 
 		try (final MockedStatic mockedExecutorService = Mockito.mockStatic(Executors.class)) {
@@ -75,8 +91,9 @@ void testExecuteWql() throws Exception {
 			Mockito.doReturn(result).when(handler).get(timeout, TimeUnit.MILLISECONDS);
 
 			Assertions.assertEquals(
-					result,
-					WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null));
+				result,
+				WbemExecutor.executeWql(url, namespace, username, password, query, timeout, null)
+			);
 		}
 	}
 }
diff --git a/src/test/java/org/metricshub/wbem/WqlQueryTest.java b/src/test/java/org/metricshub/wbem/WqlQueryTest.java
index beb278f..566e2c6 100644
--- a/src/test/java/org/metricshub/wbem/WqlQueryTest.java
+++ b/src/test/java/org/metricshub/wbem/WqlQueryTest.java
@@ -3,7 +3,6 @@
 import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.stream.Collectors;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.metricshub.wbem.client.WqlQuery;
@@ -58,8 +57,11 @@ void testSelect() throws Exception {
 			final WqlQuery wqlQuery = WqlQuery.parseQuery(" select    Antecedent,     Dependent    from IBMTSDS_SHWIDToSPC");
 
 			Assertions.assertEquals("IBMTSDS_SHWIDToSPC", wqlQuery.getClassName());
-			Assertions.assertArrayEquals(new String[] {"Antecedent", "Dependent"}, wqlQuery.getPropertiesArray());
-			Assertions.assertEquals(Arrays.asList("Antecedent", "Dependent").stream().collect(Collectors.toCollection(LinkedHashSet::new)), wqlQuery.getProperties());
+			Assertions.assertArrayEquals(new String[] { "Antecedent", "Dependent" }, wqlQuery.getPropertiesArray());
+			Assertions.assertEquals(
+				Arrays.asList("Antecedent", "Dependent").stream().collect(Collectors.toCollection(LinkedHashSet::new)),
+				wqlQuery.getProperties()
+			);
 			Assertions.assertEquals(Arrays.asList("Antecedent", "Dependent"), wqlQuery.getOriginalProperties());
 			Assertions.assertFalse(wqlQuery.hasDuplicateProperties());
 		}
@@ -67,8 +69,11 @@ void testSelect() throws Exception {
 			final WqlQuery wqlQuery = WqlQuery.parseQuery("   SELECT __Path, Name, __PATH   from   EMC_StorageSystem   ");
 
 			Assertions.assertEquals("EMC_StorageSystem", wqlQuery.getClassName());
-			Assertions.assertArrayEquals(new String[] {"Name"}, wqlQuery.getPropertiesArray());
-			Assertions.assertEquals(Arrays.asList("__Path", "Name").stream().collect(Collectors.toCollection(LinkedHashSet::new)), wqlQuery.getProperties());
+			Assertions.assertArrayEquals(new String[] { "Name" }, wqlQuery.getPropertiesArray());
+			Assertions.assertEquals(
+				Arrays.asList("__Path", "Name").stream().collect(Collectors.toCollection(LinkedHashSet::new)),
+				wqlQuery.getProperties()
+			);
 			Assertions.assertEquals(Arrays.asList("__Path", "Name", "__PATH"), wqlQuery.getOriginalProperties());
 			Assertions.assertTrue(wqlQuery.hasDuplicateProperties());
 		}

From 2de4f017a0f58755b233fd0eaed14c3aa9b010ef Mon Sep 17 00:00:00 2001
From: Elyes Cherfa 
Date: Mon, 31 Mar 2025 23:49:40 +0200
Subject: [PATCH 3/6] Issue #35: Rebrand Codebase from Sentry Software to
 MetricsHub

* Removed some useless code to reduce the number of spotbugs reports.
* Tested the build and the client.
---
 src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java  | 2 +-
 src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java  | 2 +-
 src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java   | 2 +-
 src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java    | 2 +-
 src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java  | 2 +-
 .../java/org/metricshub/wbem/javax/cim/CIMObjectPath.java     | 2 +-
 src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java     | 2 +-
 .../org/metricshub/wbem/javax/wbem/CloseableIterator.java     | 4 ++--
 .../metricshub/wbem/javax/wbem/client/PasswordCredential.java | 2 +-
 .../org/metricshub/wbem/javax/wbem/client/RoleCredential.java | 2 +-
 .../org/metricshub/wbem/javax/wbem/client/RolePrincipal.java  | 2 +-
 .../org/metricshub/wbem/javax/wbem/client/UserPrincipal.java  | 2 +-
 .../metricshub/wbem/javax/wbem/client/WBEMClientFactory.java  | 2 +-
 .../wbem/javax/wbem/listener/WBEMListenerFactory.java         | 2 +-
 .../sblim/cimclient/internal/discovery/slp/DiscovererSLP.java | 2 +-
 .../wbem/sblim/cimclient/internal/uri/URIString.java          | 2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java
index 1917b0b..cd68ad6 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMDataType.java
@@ -135,7 +135,7 @@
  * mapping of CIM data type to Java
  * 
  */
-public class CIMDataType extends Object implements Serializable {
+public class CIMDataType implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java
index 15bbaca..df20a22 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMDateTime.java
@@ -80,7 +80,7 @@
  * minutes, 12 seconds would be: 00000001132312.000000:000. A UTC offset of zero
  * is always used for interval properties.
  */
-public abstract class CIMDateTime extends Object implements Serializable, Comparable {
+public abstract class CIMDateTime implements Serializable, Comparable {
 	private static final long serialVersionUID = 3424668043014662166L;
 
 	/**
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java
index ba02dc0..c0e2b07 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMElement.java
@@ -57,7 +57,7 @@
  * href=http://www.dmtf.org/standards/published_documents/DSP0004V2.3_final.pdf
  * >DSP004).
  */
-public abstract class CIMElement extends Object implements Serializable, Comparable {
+public abstract class CIMElement implements Serializable, Comparable {
 	private static final long serialVersionUID = -3310480832682118922L;
 
 	private String iName;
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java
index 6f152ce..469732e 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMFlavor.java
@@ -53,7 +53,7 @@
  * >DSP004). CIM flavors specify overriding and inheritance rules. These
  * rules specify how qualifiers are transmitted from classes to derived classes.
  */
-public class CIMFlavor extends Object implements Serializable {
+public class CIMFlavor implements Serializable {
 	private static final long serialVersionUID = -4177389103635687939l;
 
 	/**
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java
index cd7c846..9bb0280 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMInstance.java
@@ -64,7 +64,7 @@
  * href=http://www.dmtf.org/standards/published_documents/DSP0004V2.3_final.pdf
  * >DSP004).
  */
-public class CIMInstance extends Object implements CIMNamedElementInterface, Serializable {
+public class CIMInstance implements CIMNamedElementInterface, Serializable {
 	private static final long serialVersionUID = -249160087013230559L;
 
 	private static final CIMProperty[] EMPTY_PROP_A = new CIMProperty[0];
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java
index f395b8f..be0192f 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMObjectPath.java
@@ -116,7 +116,7 @@
  * 
    • 
  * CreationClassName=My_ComputerSystem
      •  
  */
-public class CIMObjectPath extends Object implements Serializable {
+public class CIMObjectPath implements Serializable {
 	private static final long serialVersionUID = 4593259690658425064L;
 
 	private String iScheme, iHost, iPort, iNamespace, iObjectName, iXmlSchemaName;
diff --git a/src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java
index f898d54..319681c 100644
--- a/src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMScope.java
@@ -52,7 +52,7 @@
  * >DSP004). This class is used in a CIMQualifierType to define
  * what elements the qualifier can be applied to.
  */
-public class CIMScope extends Object implements Serializable {
+public class CIMScope implements Serializable {
 	private static final long serialVersionUID = -4563643521754840535l;
 
 	/**
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java b/src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java
index 59a3bbc..292a25d 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/CloseableIterator.java
@@ -65,7 +65,7 @@ public interface CloseableIterator extends Iterator {
 	 * implementation to do any cleanup and disconnect from any source that it
 	 * may be using.
 	 */
-	public void close();
+	void close();
 
 	/**
 	 * If next() or hasNext() throws a
@@ -74,5 +74,5 @@ public interface CloseableIterator extends Iterator {
 	 *
 	 * @return The WBEMException or null if one was not thrown.
 	 */
-	public WBEMException getWBEMException();
+	WBEMException getWBEMException();
 }
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java
index c37e1d0..be60024 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/PasswordCredential.java
@@ -54,7 +54,7 @@
  * password is used to authenticate the UserPrincipal.
  *
  */
-public class PasswordCredential extends Object {
+public class PasswordCredential {
 	private String iPw;
 
 	private String iHostname;
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java
index 2f38a39..8a4a64d 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/RoleCredential.java
@@ -54,7 +54,7 @@
  * This should only be used when a client is assuming a role on a WBEM Server
  * that requires a password.
  */
-public class RoleCredential extends Object {
+public class RoleCredential {
 	private String iCredential;
 
 	private String iHostname;
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java
index b547524..5523c43 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/RolePrincipal.java
@@ -51,7 +51,7 @@
  * RolePrincipal includes the role and optionally the host
  * information for which the role is used to authenticate.
  */
-public class RolePrincipal extends Object implements Principal {
+public class RolePrincipal implements Principal {
 	private String iRole;
 
 	private String iHost;
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java
index df2efad..ebc9e4c 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/UserPrincipal.java
@@ -52,7 +52,7 @@
  * UserPrincipal includes the username and optionally the host
  * information for which the username is used to authenticate.
  */
-public class UserPrincipal extends Object implements Principal {
+public class UserPrincipal implements Principal {
 	private String iUserName;
 
 	private String iHostName;
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java
index 2eb4817..08d00db 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/client/WBEMClientFactory.java
@@ -71,7 +71,7 @@
  * 
  */
 
-public class WBEMClientFactory extends Object {
+public class WBEMClientFactory {
 	private static final String[] cProtocols = { WBEMClientConstants.PROTOCOL_CIMXML };
 
 	/**
diff --git a/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java
index 26ae3d0..a479c34 100644
--- a/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java
+++ b/src/main/java/org/metricshub/wbem/javax/wbem/listener/WBEMListenerFactory.java
@@ -68,7 +68,7 @@
  * int port = api.addListener(MyListener, 1234, protocol);
  * 
  */
-public class WBEMListenerFactory extends Object {
+public class WBEMListenerFactory {
 	private static final String[] PROTOCOLS = { WBEMClientConstants.PROTOCOL_CIMXML };
 
 	/**
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
index 52a3a74..d4b9775 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/discovery/slp/DiscovererSLP.java
@@ -69,7 +69,7 @@
  *
  * @since 2.0.2
  */
-public class DiscovererSLP extends Object implements Discoverer {
+public class DiscovererSLP implements Discoverer {
 	private static final String SERVICE_WBEM = "service:wbem";
 
 	private static final ServiceType SERVICE_TYPE = new ServiceType(SERVICE_WBEM);
diff --git a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URIString.java b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URIString.java
index 4e81ed4..b2aaaeb 100644
--- a/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URIString.java
+++ b/src/main/java/org/metricshub/wbem/sblim/cimclient/internal/uri/URIString.java
@@ -47,7 +47,7 @@
  * Class URIString is responsible for wrapping the WBEM-URI string. It has
  * methods which help in parsing.
  */
-public class URIString extends Object implements CharSequence {
+public class URIString implements CharSequence {
 
 	/**
 	 * Ctor.

From 93de000e3e5b3c66588dc890c02a3904dfd56c18 Mon Sep 17 00:00:00 2001
From: Elyes Cherfa 
Date: Tue, 1 Apr 2025 10:55:29 +0200
Subject: [PATCH 4/6] Issue #35: Rebrand Codebase from Sentry Software to
 MetricsHub

* Fixed a wrong package name in pom.xml
* Tested the update.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b80fce4..0314bc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
 						${maven.compiler.target}
 						public
 						true
-						org.metricshub.wbem-java.javax.*:org.metricshub.wbem-java.sblim.*
+						org.metricshub.wbem.javax.*:org.metricshub.wbem.sblim.*
 					
 				
 

From ea1aaea30a8031d18307b5888e71617c0c69b895 Mon Sep 17 00:00:00 2001
From: Nassim Boutekedjiret 
Date: Tue, 1 Apr 2025 14:34:48 +0200
Subject: [PATCH 5/6] Issue #35: Update developer email addresses in `pom.xml`

- Changed Bertrand Martin's email
- Updated Nassim BOUTEKEDJIRET's email
- Modified `pom.xml` file
- Ensured consistency in developer contact info
- Maintainer roles remain unchanged
- No other changes made
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0314bc8..4806891 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,14 +44,14 @@
 	
 		
 			Bertrand Martin (@bertysentry)
-			bertrand@sentrysoftware.com
+			bertrand@metricshub.com
 			
 				maintainer
 			
 		
 		
 			Nassim BOUTEKEDJIRET (@NassimBtk)
-			nassim@sentrysoftware.com
+			nassim@metricshub.com
 			
 				maintainer
 			

From d6b9916af0e8255f05b1643752c9179669f2612a Mon Sep 17 00:00:00 2001
From: Nassim Boutekedjiret 
Date: Tue, 1 Apr 2025 14:42:27 +0200
Subject: [PATCH 6/6] Issue #35: Update URLs in `pom.xml` for organization and
 project links

- Change organization URL to metricshub.com
- Update project URL to wbem-java
- Ensure consistency in URL format
- Reflect new URL structure in project metadata
- Maintain project inception year as 2023
- No changes to other project metadata
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4806891..1867c0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,10 +16,10 @@
 
 	
 		MetricsHub
-		https://metricshub.org
+		https://metricshub.com
 	
 
-	https://metricshub.org/wbem
+	https://metricshub.org/wbem-java
 	2023