summaryrefslogtreecommitdiffstats
path: root/Schemas
diff options
context:
space:
mode:
Diffstat (limited to 'Schemas')
-rw-r--r--Schemas/CIM217/CIM_Event.mof2
-rw-r--r--Schemas/CIM217/CIM_EventExperimental.mof42
-rw-r--r--Schemas/CIM217/DMTF/Event/CIM_IndicationService.mof (renamed from Schemas/CIM217/DMTF/EventExperimental/CIM_IndicationService.mof)21
-rw-r--r--Schemas/CIM217/DMTF/Event/CIM_IndicationServiceCapabilities.mof (renamed from Schemas/CIM217/DMTF/EventExperimental/CIM_IndicationServiceCapabilities.mof)11
-rw-r--r--Schemas/Pegasus/InterOp/Makefile20
5 files changed, 13 insertions, 83 deletions
diff --git a/Schemas/CIM217/CIM_Event.mof b/Schemas/CIM217/CIM_Event.mof
index 696392a..b66bd89 100644
--- a/Schemas/CIM217/CIM_Event.mof
+++ b/Schemas/CIM217/CIM_Event.mof
@@ -62,4 +62,6 @@
#pragma include ("DMTF/Event/CIM_ClassCreation.mof")
#pragma include ("DMTF/Event/CIM_ClassDeletion.mof")
#pragma include ("DMTF/Event/CIM_FormattedIndicationSubscription.mof")
+#pragma include ("DMTF/Event/CIM_IndicationService.mof")
+#pragma include ("DMTF/Event/CIM_IndicationServiceCapabilities.mof")
diff --git a/Schemas/CIM217/CIM_EventExperimental.mof b/Schemas/CIM217/CIM_EventExperimental.mof
deleted file mode 100644
index ea20496..0000000
--- a/Schemas/CIM217/CIM_EventExperimental.mof
+++ /dev/null
@@ -1,42 +0,0 @@
-//%LICENSE////////////////////////////////////////////////////////////////
-//
-// Licensed to The Open Group (TOG) under one or more contributor license
-// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with
-// this work for additional information regarding copyright ownership.
-// Each contributor licenses this file to you under the OpenPegasus Open
-// Source License; you may not use this file except in compliance with the
-// License.
-//
-// 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.
-//
-//////////////////////////////////////////////////////////////////////////
-// ====================================================
-// Title : CIM_Event Experimental MOF
-// Filename : CIM_EventExperimental.mof
-// Version :
-// Date : 05/05/2008
-// Description: This file was created to support DMTF Indications Profile
-// (DSP1054) and compatible with OpenPegasus build enviroment.
-// DMTF Indications Profile classes which are included below are
-// still experimental. These classes were taken from CIM217
-// Experimental schema.
-//=====================================================
-
-#pragma include ("DMTF/EventExperimental/CIM_IndicationService.mof")
-#pragma include ("DMTF/EventExperimental/CIM_IndicationServiceCapabilities.mof")
diff --git a/Schemas/CIM217/DMTF/EventExperimental/CIM_IndicationService.mof b/Schemas/CIM217/DMTF/Event/CIM_IndicationService.mof
index e8602a7..12555a4 100644
--- a/Schemas/CIM217/DMTF/EventExperimental/CIM_IndicationService.mof
+++ b/Schemas/CIM217/DMTF/Event/CIM_IndicationService.mof
@@ -1,12 +1,5 @@
-// Copyright (c) 2007 DMTF. All rights reserved.
-//<change cr="WIPCR00354.005" type="change">Update IndicationService
-// to align with SettingData and add Capabilities</change>
-//<change cr="WIPCR00320.003" type="change">Add CIM_IndicationService
-//</change>
-// ==================================================================
-// CIM_IndicationService
-// ==================================================================
- [Experimental, Version ( "2.14.0" ),
+// Copyright (c) 2008 DMTF. All rights reserved.
+ [Version ( "2.20.0" ),
UMLPackagePath ( "CIM::Event" ),
Description (
"An IndicationService is a Service of the CIM Object Manager "
@@ -32,7 +25,9 @@ class CIM_IndicationService : CIM_Service {
"only try to deliver the indication once. Note that "
"implementations may preset this setting and not allow "
"this value to be modified." ),
- MinValue ( 0 )]
+ MinValue ( 0 ),
+ ModelCorrespondence {
+ "CIM_IndicationService.DeliveryRetryInterval" }]
uint16 DeliveryRetryAttempts = 3;
[Description (
@@ -43,8 +38,10 @@ class CIM_IndicationService : CIM_Service {
"due to QoS or other processing. Note that "
"implementations may preset this setting and not allow "
"this value to be modified." ),
+ ModelCorrespondence {
+ "CIM_IndicationService.DeliveryRetryAttempts" },
PUnit ( "Seconds" )]
- uint64 DeliveryRetryInterval = 30;
+ uint32 DeliveryRetryInterval = 30;
[Description (
"Defines the removal action for subscriptions that have "
@@ -71,7 +68,7 @@ class CIM_IndicationService : CIM_Service {
ModelCorrespondence {
"CIM_IndicationService.SubscriptionRemovalAction" },
PUnit ( "Seconds" )]
- uint64 SubscriptionRemovalTimeInterval;
+ uint32 SubscriptionRemovalTimeInterval;
};
diff --git a/Schemas/CIM217/DMTF/EventExperimental/CIM_IndicationServiceCapabilities.mof b/Schemas/CIM217/DMTF/Event/CIM_IndicationServiceCapabilities.mof
index 618b734..aa083e9 100644
--- a/Schemas/CIM217/DMTF/EventExperimental/CIM_IndicationServiceCapabilities.mof
+++ b/Schemas/CIM217/DMTF/Event/CIM_IndicationServiceCapabilities.mof
@@ -1,12 +1,5 @@
-// Copyright (c) 2007 DMTF. All rights reserved.
-//<change cr="WIPCR00391.004" type="change">
-//Add CIM_IndicationServiceCapabilities.MaxListenerDestinations</change>
-//<change cr="WIPCR00396.002" type="change">Additional Advertisement
-// of Indication Subscription capabilities</change>
-// ==================================================================
-// CIM_IndicationServiceCapabilities
-// ==================================================================
- [Experimental, Version ( "2.16.0" ),
+// Copyright (c) 2008 DMTF. All rights reserved.
+ [Version ( "2.20.0" ),
UMLPackagePath ( "CIM::Core::Capabilities" ),
Description (
"IndicationServiceCapabilities describes whether properties on "
diff --git a/Schemas/Pegasus/InterOp/Makefile b/Schemas/Pegasus/InterOp/Makefile
index 9771165..d8f4583 100644
--- a/Schemas/Pegasus/InterOp/Makefile
+++ b/Schemas/Pegasus/InterOp/Makefile
@@ -71,16 +71,6 @@ ifdef PEGASUS_ENABLE_INTEROP_PROVIDER
endif
-#
-# PEP 323
-#
-ifdef PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT
- ifeq ($(PEGASUS_CIM_SCHEMA), CIM217)
- @$(ECHO) +++++ Loading CIM_EventExperimental into $(INTEROPNS) namespace ...
- @$(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(INTEROPNS)" "-aE" "$(CIM_SCHEMA_DIR)/CIM_EventExperimental.mof"
- endif
-endif
-
repositoryServer:
@$(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
@cimmof "-I$(CIM_SCHEMA_DIR)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof"
@@ -109,16 +99,6 @@ ifdef PEGASUS_ENABLE_INTEROP_PROVIDER
@cimmof "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_ServerProfile$(PG_INTEROP_SCHEMA_VER).mof"
endif
-#
-# PEP 323
-#
-ifdef PEGASUS_ENABLE_DMTF_INDICATION_PROFILE_SUPPORT
- ifeq ($(PEGASUS_CIM_SCHEMA), CIM217)
- @$(ECHO) +++++ Loading CIM_EventExperimental into $(INTEROPNS) namespace ...
- @cimmof "-I$(CIM_SCHEMA_DIR)" "-n$(INTEROPNS)" "-aE" "$(CIM_SCHEMA_DIR)/CIM_EventExperimental.mof"
- endif
-endif
-
clean: