removed deprecated Base plugin

24 files changed, 48 insertions, 69 deletions

diff --git a/doc/appendix/files/ntp.txt b/doc/appendix/files/ntp.txt
index 97a0c611c..c999841da 100644
--- a/doc/appendix/files/ntp.txt
+++ b/doc/appendix/files/ntp.txt
@@ -88,8 +88,6 @@ Setup an ``etc/`` directory structure, and add it to the base::
      # cat Cfg/etc/ntp.conf/ntp.conf
      server ntp1.utexas.edu
 
-``Base/base.xml``:
-
 ``Bundler/ntp.xml``:
 
 .. code-block:: xml
diff --git a/doc/appendix/guides/centos.txt b/doc/appendix/guides/centos.txt
index f0c91e9aa..3a35627a8 100644
--- a/doc/appendix/guides/centos.txt
+++ b/doc/appendix/guides/centos.txt
@@ -236,7 +236,7 @@ arch group membership. For this, we will make use of the
 Probes to your plugins line in ``bcfg2.conf`` and create the Probe.::
 
     [root@centos ~]# grep plugins /etc/bcfg2.conf
-    plugins = Base,Bundler,Cfg,...,Probes
+    plugins = Bundler,Cfg,...,Probes
     [root@centos ~]# mkdir /var/lib/bcfg2/Probes
     [root@centos ~]# cat /var/lib/bcfg2/Probes/groups
     #!/bin/sh
diff --git a/doc/appendix/guides/converging_rhel5.txt b/doc/appendix/guides/converging_rhel5.txt
index 615d104b1..4ad5756b9 100644
--- a/doc/appendix/guides/converging_rhel5.txt
+++ b/doc/appendix/guides/converging_rhel5.txt
@@ -24,7 +24,8 @@ Unmanaged entries
 
         sudo yum remove PACKAGE
 
- #. Otherwise, add ``<Package name="PACKAGE" />`` to the Base or Bundler configuration.
+ #. Otherwise, add ``<Package name="PACKAGE" />`` to the Bundler
+  configuration.
 
 * Package (dependency)
 
@@ -38,7 +39,7 @@ Unmanaged entries
 
 * Service
 
- #. Add ``<Service name="SERVICE" />`` to the Base or Bundler configuration.
+ #. Add ``<Service name="SERVICE" />`` to the Bundler configuration.
  #. Add ``<Service name="SERVICE" status="on" type="chkconfig" />`` to
     ``/var/lib/bcfg2/Rules/services.xml``.
 
@@ -57,8 +58,8 @@ For a "Package"
   * For example, ``/etc/motd`` to ``/var/lib/bcfg2/Cfg/etc/motd/motd``.
     Yes, there is an extra directory level named after the file.
 
- #. Specify configuration files as ``<Path name='PATH' />`` in the Base
-    or Bundler configuration.
+ #. Specify configuration files as ``<Path name='PATH' />`` in the
+    Bundler configuration.
  #. Add directories to ``/var/lib/bcfg2/Rules/directories.xml``. For
     example:
 
@@ -73,7 +74,7 @@ For a "Package"
 
  * Option A: Explicitly list the instances
 
-  #. Drop the ``<Package />`` from the Base or Bundler configuration.
+  #. Drop the ``<Package />`` from the Bundler configuration.
   #. Add an explicit ``<BoundPackage>`` and ``<Instance />`` configuration
      to a new Bundle, like the following:
 
diff --git a/doc/appendix/guides/ubuntu.txt b/doc/appendix/guides/ubuntu.txt
index 8399daf07..21e035666 100644
--- a/doc/appendix/guides/ubuntu.txt
+++ b/doc/appendix/guides/ubuntu.txt
@@ -117,7 +117,7 @@ Replace Pkgmgr with Packages in the plugins line of ``bcfg2.conf``::
     root@lucid:~# cat /etc/bcfg2.conf
     [server]
     repository = /var/lib/bcfg2
-    plugins = SSHbase,Cfg,Packages,Rules,Metadata,Base,Bundler
+    plugins = SSHbase,Cfg,Packages,Rules,Metadata,Bundler
 
     [statistics]
     sendmailpath = /usr/lib/sendmail
@@ -224,7 +224,7 @@ Probes to your plugins line in ``bcfg2.conf`` and create the Probe.
 .. code-block:: sh
 
     root@lucid:~# grep plugins /etc/bcfg2.conf
-    plugins = Base,Bundler,Cfg,...,Probes
+    plugins = Bundler,Cfg,...,Probes
     root@lucid:~# mkdir /var/lib/bcfg2/Probes
     root@lucid:~# cat /var/lib/bcfg2/Probes/groups
     #!/bin/sh
diff --git a/doc/appendix/guides/vcs.txt b/doc/appendix/guides/vcs.txt
index 6c2879a65..fba61e722 100644
--- a/doc/appendix/guides/vcs.txt
+++ b/doc/appendix/guides/vcs.txt
@@ -30,7 +30,7 @@ While running ``bcfg2-info`` the following line will show up::
 
    Initialized git plugin with git directory = /var/lib/bcfg2/.git
 
-Mercurial 
+Mercurial
 =========
 
 The :ref:`server-plugins-version-hg` plugin also allows you to store
@@ -59,7 +59,7 @@ While running ``bcfg2-info`` the following line will show up::
 
    Initialized hg plugin with hg directory = /var/lib/bcfg2/.hg
 
-Darcs 
+Darcs
 =====
 
 The :ref:`server-plugins-version-darcs` plugin also allows you to store
@@ -70,8 +70,8 @@ be initialized::
 
     darcs initialize
 
-To commit to the darcs repository an author must be added to the 
-``_darcs/prefs/author`` file.  If the ``author`` file is missing, 
+To commit to the darcs repository an author must be added to the
+``_darcs/prefs/author`` file.  If the ``author`` file is missing,
 darcs will ask you to enter your e-mail address.
 
 .. code-block:: sh
@@ -99,7 +99,7 @@ Cvs
 The :ref:`server-plugins-version-cvs` plugin also allows you to store
 version information in the statistics database.
 
-    plugins = Base,Bundler,Cfg,...,Cvs
+    plugins = Bundler,Cfg,...,Cvs
 
 The CVS repository must be initialized::
 
diff --git a/doc/appendix/guides/web-reports-install.txt b/doc/appendix/guides/web-reports-install.txt
index f03bad289..06932efc9 100644
--- a/doc/appendix/guides/web-reports-install.txt
+++ b/doc/appendix/guides/web-reports-install.txt
@@ -28,7 +28,7 @@ Add Reporting to the plugins line of ``bcfg2.conf``. The resulting
 
     [server]
     repository = /var/lib/bcfg2
-    plugins = Base,Bundler,Cfg,...,Reporting
+    plugins = Bundler,Cfg,...,Reporting
 
     [reporting]
     transport = LocalFilesystem
@@ -53,7 +53,7 @@ then have something like this::
 
     [server]
     repository = /var/lib/bcfg2
-    plugins = Base,Bundler,Cfg,...,Reporting
+    plugins = Bundler,Cfg,...,Reporting
 
     [database]
     engine = sqlite3
diff --git a/doc/getting_started/index.txt b/doc/getting_started/index.txt
index 58a673b75..378c44a3a 100644
--- a/doc/getting_started/index.txt
+++ b/doc/getting_started/index.txt
@@ -107,7 +107,7 @@ After the above steps, you should have a toplevel repository structure
 that looks like::
 
     bcfg-server:~ # ls /var/lib/bcfg2
-    Base/  Bundler/  Cfg/  Metadata/  Pkgmgr/  Rules/  SSHbase/  etc/
+    Bundler/  Cfg/  Metadata/  Pkgmgr/  Rules/  SSHbase/  etc/
 
 The place to start is the Metadata directory, which contains two
 files: ``clients.xml`` and ``groups.xml``. Your current
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index d8f2bc3df..ffc202f7f 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -71,7 +71,6 @@ plugins
     available plugins are::
 
         Account
-	Base
 	Bundler
 	Bzr
 	Cfg
@@ -163,15 +162,6 @@ The account plugin manages authentication data, including the following.
 * ``/etc/sudoers``
 * ``/root/.ssh/authorized_keys``
 
-Base Plugin
-+++++++++++
-
-The Base plugin is a structure plugin that provides the ability
-to add lists of unrelated entries into client configuration entry
-inventories. Base works much like Bundler in its file format. This
-structure plugin is good for the pile of independent configs needed for
-most actual systems.
-
 Bundler Plugin
 ++++++++++++++
 
@@ -367,10 +357,10 @@ dynamic reporting system.
 Rules Plugin
 ++++++++++++
 
-The Rules plugin provides literal configuration entries that resolve the
-abstract configuration entries normally found in the Bundler and Base
-plugins. The literal entries in Rules are suitable for consumption by
-the appropriate client drivers.
+The Rules plugin provides literal configuration entries that resolve
+the abstract configuration entries normally found in Bundler. The
+literal entries in Rules are suitable for consumption by the
+appropriate client drivers.
 
 SEModules Plugin
 ++++++++++++++++
diff --git a/doc/server/admin/init.txt b/doc/server/admin/init.txt
index 0e8b3afd3..db42c8222 100644
--- a/doc/server/admin/init.txt
+++ b/doc/server/admin/init.txt
@@ -36,7 +36,6 @@ detected or a default value is provided. ::
 A toplevel repository structure was created under the provided path. ::
 
     /var/lib/bcfg2
-    |-- Base
     |-- Bundler
     |-- Cfg
     |-- etc
diff --git a/doc/server/plugins/generators/nagiosgen.txt b/doc/server/plugins/generators/nagiosgen.txt
index 4c49bdc54..137d6abde 100644
--- a/doc/server/plugins/generators/nagiosgen.txt
+++ b/doc/server/plugins/generators/nagiosgen.txt
@@ -12,7 +12,7 @@ This page describes the installation and use of the `NagiosGen`_ plugin.
 
 Update ``/etc/bcfg2.conf``, adding NagiosGen to plugins::
 
-    plugins = Base,Bundler,Cfg,...,NagiosGen
+    plugins = Bundler,Cfg,...,NagiosGen
 
 Create the NagiosGen directory::
 
diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt
index 77d25891f..f178e1563 100644
--- a/doc/server/plugins/generators/packages.txt
+++ b/doc/server/plugins/generators/packages.txt
@@ -138,9 +138,7 @@ processed. After this phase, but before entry binding, a list of packages
 and the client metadata instance is passed into Packages' resolver. This
 process determines a superset of packages that will fully satisfy
 dependencies of all package entries included in structures, and reports
-any prerequisites that cannot be satisfied. This facility should largely
-remove the need to use the :ref:`Base <server-plugins-structures-base>`
-plugin.
+any prerequisites that cannot be satisfied.
 
 Disabling dependency resolution
 -------------------------------
diff --git a/doc/server/plugins/generators/pkgmgr.txt b/doc/server/plugins/generators/pkgmgr.txt
index ace7c16ef..8d9979ba0 100644
--- a/doc/server/plugins/generators/pkgmgr.txt
+++ b/doc/server/plugins/generators/pkgmgr.txt
@@ -10,10 +10,10 @@ The Pkgmgr plugin resolves the Abstract Configuration Entity "Package"
 to a package specification that the client can use to detect, verify
 and install the specified package.
 
-For a package specification to be included in the Literal configuration
-the name attribute from an Abstract Package Tag (from Base or Bundler)
-must match the name attribute of a Package tag in Pkgmgr, along with
-the appropriate group associations of course.
+For a package specification to be included in the Literal
+configuration the name attribute from an abstract Package tag (from
+Bundler) must match the name attribute of a Package tag in Pkgmgr,
+along with the appropriate group associations of course.
 
 Each file in the Pkgmgr directory has a priority. This allows the
 same package to be served by multiple files. The priorities can be
diff --git a/doc/server/plugins/generators/rules.txt b/doc/server/plugins/generators/rules.txt
index f561b88a6..adcb55d3e 100644
--- a/doc/server/plugins/generators/rules.txt
+++ b/doc/server/plugins/generators/rules.txt
@@ -19,14 +19,14 @@ The Rules plugin resolves the following Abstract Configuration Entities:
 to literal configuration entries suitable for the client drivers to
 consume.
 
-For an entity specification to be included in the Literal configuration
-the name attribute from an Abstract Entity Tag (from Base or Bundler)
-must match the name attribute of an Entity tag in Rules, along with the
-appropriate group associations of course.
+For an entity specification to be included in the Literal
+configuration the name attribute from an abstract entity tag (from
+Bundler) must match the name attribute of an entity tag in Rules,
+along with the appropriate group associations of course.
 
 Each file in the Rules directory has a priority. This allows the same
 Entities to be served by multiple files. The priorities can be used to
-break ties in the case that multiple files serve data for the same Entity.
+break ties in the case that multiple files serve data for the same entity.
 
 Tag Attributes in Rules
 =======================
diff --git a/doc/server/plugins/statistics/reporting.txt b/doc/server/plugins/statistics/reporting.txt
index c3c51cd29..74ea61e62 100644
--- a/doc/server/plugins/statistics/reporting.txt
+++ b/doc/server/plugins/statistics/reporting.txt
@@ -9,7 +9,7 @@ Reporting
 Reporting can be enabled by adding Reporting to the plugins line in
 ``/etc/bcfg2.conf``:
 
-    plugins = Base,Bundler,Cfg,...,Reporting
+    plugins = Bundler,Cfg,...,Reporting
 
 For more information on how to use Reporting to setup reporting, see
 :ref:`reports-dynamic`.
diff --git a/doc/server/plugins/structures/altsrc.txt b/doc/server/plugins/structures/altsrc.txt
index cfc2fa326..f3911e33e 100644
--- a/doc/server/plugins/structures/altsrc.txt
+++ b/doc/server/plugins/structures/altsrc.txt
@@ -11,7 +11,7 @@ altsrc
 Altsrc is a generic, Bcfg2 server-side mechanism for performing
 configuration entry name remapping for the purpose of data binding.
 Altsrc can be used as a parameter for any entry type, and can be used
-in any structure, including Bundler and Base.
+in any structure.
 
 Use Cases
 =========
diff --git a/doc/server/plugins/version/bzr.txt b/doc/server/plugins/version/bzr.txt
index 0755bf80c..ae247985f 100644
--- a/doc/server/plugins/version/bzr.txt
+++ b/doc/server/plugins/version/bzr.txt
@@ -21,7 +21,7 @@ How to enable the Bazaar plugin
 Simply add "Bzr" to your plugins line in ``/etc/bcfg2.conf``::
 
     [server]
-    plugins = Base,Bundler,Cfg,...,Bzr
+    plugins = Bundler,Cfg,...,Bzr
 
 Usage notes
 ===========
diff --git a/doc/server/plugins/version/cvs.txt b/doc/server/plugins/version/cvs.txt
index a80b1edbc..f969302d0 100644
--- a/doc/server/plugins/version/cvs.txt
+++ b/doc/server/plugins/version/cvs.txt
@@ -21,4 +21,4 @@ How to enable the CVS plugin
 Simply add "Cvs" to your plugins line in ``/etc/bcfg2.conf``::
 
     [server]
-    plugins = Base,Bundler,Cfg,...,Cvs
+    plugins = Bundler,Cfg,...,Cvs
diff --git a/doc/server/plugins/version/darcs.txt b/doc/server/plugins/version/darcs.txt
index 30ac0176a..6fa384679 100644
--- a/doc/server/plugins/version/darcs.txt
+++ b/doc/server/plugins/version/darcs.txt
@@ -6,7 +6,7 @@
 Darcs
 =====
 
-This page describes the new Darcs plugin which is experimental. 
+This page describes the new Darcs plugin which is experimental.
 
 Why use the Darcs plugin
 ========================
@@ -25,4 +25,4 @@ You will need to install Darcs on the Bcfg2 server first. Once installed,
 simply add Darcs to your plugins line in ``/etc/bcfg2.conf``::
 
     [server]
-    plugins = Base,Bundler,Cfg,...,Darcs
+    plugins = Bundler,Cfg,...,Darcs
diff --git a/doc/server/plugins/version/fossil.txt b/doc/server/plugins/version/fossil.txt
index 7bf523a9e..a19c21760 100644
--- a/doc/server/plugins/version/fossil.txt
+++ b/doc/server/plugins/version/fossil.txt
@@ -21,4 +21,4 @@ How to enable the Fossil plugin
 Simply add "Fossil" to your plugins line in ``/etc/bcfg2.conf``::
 
     [server]
-    plugins = Base,Bundler,Cfg,...,Fossil
+    plugins = Bundler,Cfg,...,Fossil
diff --git a/doc/server/plugins/version/hg.txt b/doc/server/plugins/version/hg.txt
index 747699f0e..a11623836 100644
--- a/doc/server/plugins/version/hg.txt
+++ b/doc/server/plugins/version/hg.txt
@@ -22,4 +22,4 @@ You will need to install Mercurial on the Bcfg2 server first.
 Simply add Hg to your plugins line in ``/etc/bcfg2.conf``::
 
     [server]
-    plugins = Base,Bundler,Cfg,...,Hg
+    plugins = Bundler,Cfg,...,Hg
diff --git a/doc/unsorted/writing_specification.txt b/doc/unsorted/writing_specification.txt
index 49b11af7b..e7763cee1 100644
--- a/doc/unsorted/writing_specification.txt
+++ b/doc/unsorted/writing_specification.txt
@@ -30,8 +30,8 @@ that a client needs the Bcfg2 package with
 
 but this does not explicitly identify that an RPM package version
 0.9.2 should be loaded from http://rpm.repo.server/bcfg2-0.9.2-0.1.rpm.
-The abstract configuration is defined in the xml configuration files
-for the Base and Bundles plugins.
+The abstract configuration is defined in the XML configuration files
+for the Bundler plugin.
 
 A combination of a clients metadata (group memberships) and abstract
 configuration is then used to generate the clients literal configuration.
@@ -57,18 +57,13 @@ Abstract Configuration (Structures)
 ===================================
 
 A clients Abstract Configuration is the inventory of configuration
-entities that should be installed on a client. Two plugins provide the
-basis for the abstract configuration, the Bundler and Base.
+entities that should be installed on a client. The Bundler plugin
+usually provides the abstract configuration.
 
 The plugin Bundler builds descriptions of interrelated configuration
 entities. These are typically used for the representation of services,
 or other complex groups of entities.
 
-The Base provides a laundry list of configuration entities that need to
-be installed on hosts. These entities are independent from one another,
-and can be installed individually without worrying about the impact on
-other entities.
-
 Configuration Entity Types
 --------------------------
 
diff --git a/src/lib/Bcfg2/Server/Admin/Compare.py b/src/lib/Bcfg2/Server/Admin/Compare.py
index 8214f9e71..d0831362c 100644
--- a/src/lib/Bcfg2/Server/Admin/Compare.py
+++ b/src/lib/Bcfg2/Server/Admin/Compare.py
@@ -26,10 +26,10 @@ class Compare(Bcfg2.Server.Admin.Mode):
                           }
 
     def compareStructures(self, new, old):
-        if new.tag == 'Independent':
-            bundle = 'Base'
-        else:
+        if new.get("name"):
             bundle = new.get('name')
+        else:
+            bundle = 'Independent'
 
         identical = True
 
diff --git a/src/lib/Bcfg2/Server/Admin/Viz.py b/src/lib/Bcfg2/Server/Admin/Viz.py
index efbfff96e..b3d317604 100644
--- a/src/lib/Bcfg2/Server/Admin/Viz.py
+++ b/src/lib/Bcfg2/Server/Admin/Viz.py
@@ -31,8 +31,7 @@ class Viz(Bcfg2.Server.Admin.MetadataCore):
 
     __plugin_blacklist__ = ['DBStats', 'Cfg', 'Pkgmgr',
                             'Packages', 'Rules', 'Decisions',
-                            'Deps', 'Git', 'Svn', 'Fossil', 'Bzr', 'Bundler',
-                            'Base']
+                            'Deps', 'Git', 'Svn', 'Fossil', 'Bzr', 'Bundler']
 
     def __call__(self, args):
         # First get options to the 'viz' subcommand
diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py
index 37bc230d1..7a9d9f877 100644
--- a/src/lib/Bcfg2/Server/Lint/Validate.py
+++ b/src/lib/Bcfg2/Server/Lint/Validate.py
@@ -29,7 +29,6 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
              "Bundler/*.xml": "bundle.xsd",
              "Bundler/*.genshi": "bundle.xsd",
              "Pkgmgr/*.xml": "pkglist.xsd",
-             "Base/*.xml": "base.xsd",
              "Rules/*.xml": "rules.xsd",
              "Defaults/*.xml": "defaults.xsd",
              "etc/report-configuration.xml": "report-configuration.xsd",