[Omc-commit] SF.net SVN: omc: [447] schema/trunk/mof/base

[<ba...@us...>]

Revision: 447
          http://svn.sourceforge.net/omc/?rev=447&view=rev
Author:   bartw
Date:     2007-03-27 16:16:48 -0700 (Tue, 27 Mar 2007)

Log Message:
-----------
renamed file

Modified Paths:
--------------
    schema/trunk/mof/base/omc-base-providers.mof
    schema/trunk/mof/base/omc-core.mof

Added Paths:
-----------
    schema/trunk/mof/base/omc-logical-file.mof

Removed Paths:
-------------
    schema/trunk/mof/base/omc-posix-file-elements.mof

Modified: schema/trunk/mof/base/omc-base-providers.mof
===================================================================
--- schema/trunk/mof/base/omc-base-providers.mof	2007-03-09 03:57:56 UTC (rev 446)
+++ schema/trunk/mof/base/omc-base-providers.mof	2007-03-27 23:16:48 UTC (rev 447)
@@ -1,7 +1,7 @@
 #pragma include ("omc-core.mof")
 #pragma include ("omc-computer-system.mof")
 #pragma include ("omc-operating-system.mof")
-#pragma include ("omc-posix-file-elements.mof")
+#pragma include ("omc-logical-file.mof")
 #pragma include ("omc-file-system-elements.mof")
 #pragma include ("omc-processes.mof")
 #pragma include ("omc-time-service.mof")

Modified: schema/trunk/mof/base/omc-core.mof
===================================================================
--- schema/trunk/mof/base/omc-core.mof	2007-03-09 03:57:56 UTC (rev 446)
+++ schema/trunk/mof/base/omc-core.mof	2007-03-27 23:16:48 UTC (rev 447)
@@ -32,85 +32,4 @@
 };
 
 //////////////////////////////////////////////////////////////////////////////
-[ Abstract ]
-class OMC_DataFile : CIM_DataFile
-{
-	sint32 append([IN(true), OUT(false), REQUIRED(true)] string newtext); 
-	sint32 write([IN(true), OUT(false), REQUIRED(true)] string newtext); 
-	sint32 read([IN(false), OUT(true), REQUIRED(true)] string filetext); 
-}; 
 
-//////////////////////////////////////////////////////////////////////////////
-[ Abstract ]
-class OMC_UnixDeviceFile : CIM_UnixDeviceFile
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-[ Abstract ]
-class OMC_SymbolicLink : CIM_SymbolicLink
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-[ Abstract ]
-class OMC_UnixDirectory : CIM_UnixDirectory
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-[ Abstract ]
-class OMC_FIFOPipeFile : CIM_FIFOPipeFile
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-[ Abstract ]
-class OMC_UnixFile : CIM_UnixFile
-{
-	boolean UserReadable; 
-	boolean UserWritable; 
-	boolean UserExecutable; 
-	boolean GroupReadable; 
-	boolean GroupWritable; 
-	boolean GroupExecutable; 
-	boolean WorldReadable; 
-	boolean WorldWritable; 
-	boolean WorldExecutable; 
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-[ Association, Aggregation, Composition, Abstract,
-	Description("Specifies the hierarchical arrangement of LogicalFiles in a "
-	"Directory.")] 
-class OMC_DirectoryContainsFile : CIM_DirectoryContainsFile
-{
-	[Override ("GroupComponent"), Aggregate, Max(1), 
-		Description ("The Directory") ]
-	OMC_UnixDirectory REF GroupComponent; 
-
-	[Override ("PartComponent"), 
-		Description ("The LogicalFile 'contained within' the Directory.") ]
-	CIM_LogicalFile REF PartComponent; 
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-[ Association, Abstract, Description (
-		"CIM_FileIdentity indicates that a UnixFile describes Unix-"
-		"specific aspects of the various subclasses of LogicalFile. "
-		"The association exists since it forces UnixFile to be "
-		"weak to (scoped by) the LogicalFile. This is not true in "
-		"the association's superclass, LogicalIdentity.")]
-class OMC_FileIdentity : CIM_FileIdentity
-{
-	[Override ("SystemElement"), Min (1), Max (1),
-		Description ("The Logical File.") ]
-	CIM_LogicalFile ref SystemElement;
-
-	[Override ("SameElement"), Weak, Max (1), 
-		Description ("SameElement represents the additional aspects of the "
-			"Unix/Linux Logical file.") ]
-	OMC_UnixFile ref SameElement;
-
-}; 
-

Added: schema/trunk/mof/base/omc-logical-file.mof
===================================================================
--- schema/trunk/mof/base/omc-logical-file.mof	                        (rev 0)
+++ schema/trunk/mof/base/omc-logical-file.mof	2007-03-27 23:16:48 UTC (rev 447)
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * Novell_LinuxSSHService and associated classes
+ *
+ *
+ * Copyright (C) 2004 Novell, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  - Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ *  - Neither the name of Novell, Inc. nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ ******************************************************************************/
+#pragma locale ("en_US")
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_DataFile : CIM_DataFile
+{
+	sint32 append([IN(true), OUT(false), REQUIRED(true)] string newtext); 
+	sint32 write([IN(true), OUT(false), REQUIRED(true)] string newtext); 
+	sint32 read([IN(false), OUT(true), REQUIRED(true)] string filetext); 
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_UnixDeviceFile : CIM_UnixDeviceFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_SymbolicLink : CIM_SymbolicLink
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_UnixDirectory : CIM_UnixDirectory
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_FIFOPipeFile : CIM_FIFOPipeFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Abstract ]
+class OMC_UnixFile : CIM_UnixFile
+{
+	boolean UserReadable; 
+	boolean UserWritable; 
+	boolean UserExecutable; 
+	boolean GroupReadable; 
+	boolean GroupWritable; 
+	boolean GroupExecutable; 
+	boolean WorldReadable; 
+	boolean WorldWritable; 
+	boolean WorldExecutable; 
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Association, Aggregation, Composition, Abstract,
+	Description("Specifies the hierarchical arrangement of LogicalFiles in a "
+	"Directory.")] 
+class OMC_DirectoryContainsFile : CIM_DirectoryContainsFile
+{
+	[Override ("GroupComponent"), Aggregate, Max(1), 
+		Description ("The Directory") ]
+	OMC_UnixDirectory REF GroupComponent; 
+
+	[Override ("PartComponent"), 
+		Description ("The LogicalFile 'contained within' the Directory.") ]
+	CIM_LogicalFile REF PartComponent; 
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ Association, Abstract, Description (
+		"CIM_FileIdentity indicates that a UnixFile describes Unix-"
+		"specific aspects of the various subclasses of LogicalFile. "
+		"The association exists since it forces UnixFile to be "
+		"weak to (scoped by) the LogicalFile. This is not true in "
+		"the association's superclass, LogicalIdentity.")]
+class OMC_FileIdentity : CIM_FileIdentity
+{
+	[Override ("SystemElement"), Min (1), Max (1),
+		Description ("The Logical File.") ]
+	CIM_LogicalFile ref SystemElement;
+
+	[Override ("SameElement"), Weak, Max (1), 
+		Description ("SameElement represents the additional aspects of the "
+			"Unix/Linux Logical file.") ]
+	OMC_UnixFile ref SameElement;
+
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ provider("cmpi:CIM_LogicalFile_Provider")] 
+class OMC_LinuxDataFile : OMC_DataFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ provider("cmpi:CIM_LogicalFile_Provider")] 
+class OMC_LinuxDeviceFile : OMC_UnixDeviceFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ provider("cmpi:CIM_LogicalFile_Provider")] 
+class OMC_LinuxSymbolicLink : OMC_SymbolicLink
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ provider("cmpi:CIM_LogicalFile_Provider")] 
+class OMC_LinuxDirectory : OMC_UnixDirectory
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ provider("cmpi:CIM_LogicalFile_Provider")] 
+class OMC_LinuxFIFOPipeFile : OMC_FIFOPipeFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[ provider("cmpi:OMC_LinuxFile_Provider")] 
+class OMC_LinuxFile : OMC_UnixFile
+{
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[Association, Aggregation, Composition, 
+	Description("Specifies the hierarchical arrangement of LogicalFiles in a "
+	"Directory.")
+	,provider("cmpi:OMC_LinuxDirectoryContainsFile_Provider")
+]
+class OMC_LinuxDirectoryContainsFile : OMC_DirectoryContainsFile
+{
+	[Override ("GroupComponent"), Aggregate, Max(1), 
+		Description ("The Directory") ]
+	OMC_LinuxDirectory REF GroupComponent; 
+
+	[Override ("PartComponent"), 
+		Description ("The LogicalFile 'contained within' the Directory.") ]
+	CIM_LogicalFile REF PartComponent; 
+}; 
+
+//////////////////////////////////////////////////////////////////////////////
+[Association, Description (
+		"CIM_FileIdentity indicates that a UnixFile describes Unix-"
+		"specific aspects of the various subclasses of LogicalFile. "
+		"The association exists since it forces UnixFile to be "
+		"weak to (scoped by) the LogicalFile. This is not true in "
+		"the association's superclass, LogicalIdentity."),
+	provider("cmpi:OMC_LinuxFileIdentity_Provider") ]
+class OMC_LinuxFileIdentity : OMC_FileIdentity
+{
+	[Override ("SystemElement"), Min (1), Max (1),
+	Description ("The Logical File.") ]
+		CIM_LogicalFile ref SystemElement;
+
+	[Override ("SameElement"), Weak, Max (1), Description (
+			"SameElement represents the additional aspects of the "
+			"Unix/Linux Logical file.") ]
+		OMC_LinuxFile ref SameElement;
+
+}; 
+

Deleted: schema/trunk/mof/base/omc-posix-file-elements.mof
===================================================================
--- schema/trunk/mof/base/omc-posix-file-elements.mof	2007-03-09 03:57:56 UTC (rev 446)
+++ schema/trunk/mof/base/omc-posix-file-elements.mof	2007-03-27 23:16:48 UTC (rev 447)
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Novell_LinuxSSHService and associated classes
- *
- *
- * Copyright (C) 2004 Novell, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  - Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- *  - Neither the name of Novell, Inc. nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- ******************************************************************************/
-#pragma locale ("en_US")
-
-//////////////////////////////////////////////////////////////////////////////
-class OMC_LinuxDataFile : OMC_DataFile
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-class OMC_LinuxBlockDeviceFile : OMC_UnixDeviceFile
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-class OMC_LinuxCharacterDeviceFile : OMC_UnixDeviceFile
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-class OMC_LinuxSymbolicLink : OMC_SymbolicLink
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-class OMC_LinuxDirectory : OMC_UnixDirectory
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-class OMC_LinuxFIFOPipeFile : OMC_FIFOPipeFile
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-class OMC_LinuxFile : OMC_UnixFile
-{
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-[Association, Aggregation, Composition, 
-	Description("Specifies the hierarchical arrangement of LogicalFiles in a "
-	"Directory.")]
-class OMC_LinuxDirectoryContainsFile : OMC_DirectoryContainsFile
-{
-	[Override ("GroupComponent"), Aggregate, Max(1), 
-		Description ("The Directory") ]
-	OMC_LinuxDirectory REF GroupComponent; 
-
-	[Override ("PartComponent"), 
-		Description ("The LogicalFile 'contained within' the Directory.") ]
-	CIM_LogicalFile REF PartComponent; 
-}; 
-
-//////////////////////////////////////////////////////////////////////////////
-[Association, Description (
-		"CIM_FileIdentity indicates that a UnixFile describes Unix-"
-		"specific aspects of the various subclasses of LogicalFile. "
-		"The association exists since it forces UnixFile to be "
-		"weak to (scoped by) the LogicalFile. This is not true in "
-		"the association's superclass, LogicalIdentity.") ]
-class OMC_LinuxFileIdentity : OMC_FileIdentity
-{
-	[Override ("SystemElement"), Min (1), Max (1),
-	Description ("The Logical File.") ]
-		CIM_LogicalFile ref SystemElement;
-
-	[Override ("SameElement"), Weak, Max (1), Description (
-			"SameElement represents the additional aspects of the "
-			"Unix/Linux Logical file.") ]
-		OMC_LinuxFile ref SameElement;
-
-}; 
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.