Merge branch '0.24.x'

Conflicts:

	bin/puppetca
	lib/puppet/type/group.rb
	lib/puppet/type/tidy.rb
	lib/puppet/util/settings.rb

Also edited the following files so tests will pass:

       lib/puppet/type/component.rb
       spec/unit/ssl/certificate_request.rb
       spec/unit/type/computer.rb
       spec/unit/type/mcx.rb
       spec/unit/type/resources.rb
       spec/unit/util/settings.rb
       spec/unit/util/storage.rb
       test/ral/type/zone.rb

6 files changed, 378 insertions, 0 deletions

diff --git a/examples/mcx_dock_absent.pp b/examples/mcx_dock_absent.pp
new file mode 100644
index 000000000..ef51897e0
--- /dev/null
+++ b/examples/mcx_dock_absent.pp
@@ -0,0 +1,4 @@
+mcx { '/Groups/mcx_dock':
+    ensure => 'absent',
+    content => 'absent'
+}
diff --git a/examples/mcx_dock_default.pp b/examples/mcx_dock_default.pp
new file mode 100644
index 000000000..1f65a7316
--- /dev/null
+++ b/examples/mcx_dock_default.pp
@@ -0,0 +1,118 @@
+mcx { '/Groups/mcx_dock':
+    ensure => 'present',
+    content => '<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.dock</key>
+	<dict>
+		<key>AppItems-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>AppItems-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>static-apps</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array>
+				<dict>
+					<key>mcx_typehint</key>
+					<integer>1</integer>
+					<key>tile-data</key>
+					<dict>
+						<key>file-data</key>
+						<dict>
+							<key>_CFURLString</key>
+							<string>/Applications/Mail.app</string>
+							<key>_CFURLStringType</key>
+							<integer>0</integer>
+						</dict>
+						<key>file-label</key>
+						<string>Mail</string>
+					</dict>
+					<key>tile-type</key>
+					<string>file-tile</string>
+				</dict>
+				<dict>
+					<key>mcx_typehint</key>
+					<integer>1</integer>
+					<key>tile-data</key>
+					<dict>
+						<key>file-data</key>
+						<dict>
+							<key>_CFURLString</key>
+							<string>/Applications/Safari.app</string>
+							<key>_CFURLStringType</key>
+							<integer>0</integer>
+						</dict>
+						<key>file-label</key>
+						<string>Safari</string>
+					</dict>
+					<key>tile-type</key>
+					<string>file-tile</string>
+				</dict>
+			</array>
+		</dict>
+		<key>DocItems-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>DocItems-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>static-others</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array/>
+		</dict>
+		<key>MCXDockSpecialFolders-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>MCXDockSpecialFolders-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>MCXDockSpecialFolders</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array/>
+		</dict>
+		<key>contents-immutable</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>value</key>
+			<false/>
+		</dict>
+		<key>static-only</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>value</key>
+			<false/>
+		</dict>
+	</dict>
+</dict>
+</plist>
+'
+}
diff --git a/examples/mcx_dock_full.pp b/examples/mcx_dock_full.pp
new file mode 100644
index 000000000..60760332a
--- /dev/null
+++ b/examples/mcx_dock_full.pp
@@ -0,0 +1,125 @@
+# Mac MCX Test
+
+computer { "localhost": }
+
+mcx {
+  "mcx_dock":
+    ensure  => "present",
+    ds_type => "group",
+    ds_name => "mcx_dock",
+    content => '<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.dock</key>
+	<dict>
+		<key>AppItems-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>AppItems-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>static-apps</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array>
+				<dict>
+					<key>mcx_typehint</key>
+					<integer>1</integer>
+					<key>tile-data</key>
+					<dict>
+						<key>file-data</key>
+						<dict>
+							<key>_CFURLString</key>
+							<string>/Applications/Mail.app</string>
+							<key>_CFURLStringType</key>
+							<integer>0</integer>
+						</dict>
+						<key>file-label</key>
+						<string>Mail</string>
+					</dict>
+					<key>tile-type</key>
+					<string>file-tile</string>
+				</dict>
+				<dict>
+					<key>mcx_typehint</key>
+					<integer>1</integer>
+					<key>tile-data</key>
+					<dict>
+						<key>file-data</key>
+						<dict>
+							<key>_CFURLString</key>
+							<string>/Applications/Safari.app</string>
+							<key>_CFURLStringType</key>
+							<integer>0</integer>
+						</dict>
+						<key>file-label</key>
+						<string>Safari</string>
+					</dict>
+					<key>tile-type</key>
+					<string>file-tile</string>
+				</dict>
+			</array>
+		</dict>
+		<key>DocItems-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>DocItems-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>static-others</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array/>
+		</dict>
+		<key>MCXDockSpecialFolders-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>MCXDockSpecialFolders-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>MCXDockSpecialFolders</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array/>
+		</dict>
+		<key>contents-immutable</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>value</key>
+			<false/>
+		</dict>
+		<key>static-only</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>value</key>
+			<false/>
+		</dict>
+	</dict>
+</dict>
+</plist>
+'
+}
diff --git a/examples/mcx_dock_invalid.pp b/examples/mcx_dock_invalid.pp
new file mode 100644
index 000000000..35f908177
--- /dev/null
+++ b/examples/mcx_dock_invalid.pp
@@ -0,0 +1,9 @@
+# Mac MCX Test
+
+computer { "localhost": }
+
+mcx {
+  "/Groups/mcx_dock":
+    ensure  => "present",
+    content => 'invalid plist'
+}
diff --git a/examples/mcx_nogroup.pp b/examples/mcx_nogroup.pp
new file mode 100644
index 000000000..ea689f33c
--- /dev/null
+++ b/examples/mcx_nogroup.pp
@@ -0,0 +1,118 @@
+mcx { '/Groups/doesnotexist':
+    ensure => 'present',
+    content => '<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.dock</key>
+	<dict>
+		<key>AppItems-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>AppItems-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>static-apps</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array>
+				<dict>
+					<key>mcx_typehint</key>
+					<integer>1</integer>
+					<key>tile-data</key>
+					<dict>
+						<key>file-data</key>
+						<dict>
+							<key>_CFURLString</key>
+							<string>/Applications/Mail.app</string>
+							<key>_CFURLStringType</key>
+							<integer>0</integer>
+						</dict>
+						<key>file-label</key>
+						<string>Mail</string>
+					</dict>
+					<key>tile-type</key>
+					<string>file-tile</string>
+				</dict>
+				<dict>
+					<key>mcx_typehint</key>
+					<integer>1</integer>
+					<key>tile-data</key>
+					<dict>
+						<key>file-data</key>
+						<dict>
+							<key>_CFURLString</key>
+							<string>/Applications/Safari.app</string>
+							<key>_CFURLStringType</key>
+							<integer>0</integer>
+						</dict>
+						<key>file-label</key>
+						<string>Safari</string>
+					</dict>
+					<key>tile-type</key>
+					<string>file-tile</string>
+				</dict>
+			</array>
+		</dict>
+		<key>DocItems-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>DocItems-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>static-others</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array/>
+		</dict>
+		<key>MCXDockSpecialFolders-Raw</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>upk</key>
+			<dict>
+				<key>mcx_input_key_names</key>
+				<array>
+					<string>MCXDockSpecialFolders-Raw</string>
+				</array>
+				<key>mcx_output_key_name</key>
+				<string>MCXDockSpecialFolders</string>
+				<key>mcx_remove_duplicates</key>
+				<true/>
+			</dict>
+			<key>value</key>
+			<array/>
+		</dict>
+		<key>contents-immutable</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>value</key>
+			<false/>
+		</dict>
+		<key>static-only</key>
+		<dict>
+			<key>state</key>
+			<string>always</string>
+			<key>value</key>
+			<false/>
+		</dict>
+	</dict>
+</dict>
+</plist>
+'
+}
diff --git a/examples/mcx_notexists_absent.pp b/examples/mcx_notexists_absent.pp
new file mode 100644
index 000000000..ef44db10e
--- /dev/null
+++ b/examples/mcx_notexists_absent.pp
@@ -0,0 +1,4 @@
+mcx { '/Groups/foobar':
+    ensure => 'absent',
+    content => 'absent'
+}