Move Log Categories taxonomy to farm_fields module.

modules/farm/farm_fields/farm_fields.features.inc

@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * farm_taxonomy.features.inc
+ * farm_fields.features.inc
  */
 
 /**
  * Implements hook_ctools_plugin_api().
  */
-function farm_taxonomy_ctools_plugin_api($module = NULL, $api = NULL) {
+function farm_fields_ctools_plugin_api($module = NULL, $api = NULL) {
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }

modules/farm/farm_fields/farm_fields.features.taxonomy.inc

@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * farm_taxonomy.features.taxonomy.inc
+ * farm_fields.features.taxonomy.inc
  */
 
 /**
  * Implements hook_taxonomy_default_vocabularies().
  */
-function farm_taxonomy_taxonomy_default_vocabularies() {
+function farm_fields_taxonomy_default_vocabularies() {
   return array(
     'farm_log_categories' => array(
       'name' => 'Farm Log Categories',

modules/farm/farm_fields/farm_fields.info

@@ -2,17 +2,20 @@ name = Farm Fields
 description = Provides common base field definitions for farmOS entity types.
 core = 7.x
 package = farmOS
+dependencies[] = ctools
 dependencies[] = date
 dependencies[] = entityreference
 dependencies[] = farm_asset
-dependencies[] = farm_taxonomy
 dependencies[] = features
 dependencies[] = file
 dependencies[] = filter
 dependencies[] = image
 dependencies[] = log
+dependencies[] = pathauto
+dependencies[] = strongarm
 dependencies[] = taxonomy
 dependencies[] = text
+features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
 features[field_base][] = field_farm_asset
 features[field_base][] = field_farm_date
@@ -26,3 +29,5 @@ features[field_base][] = field_farm_lot_number
 features[field_base][] = field_farm_notes
 features[field_base][] = field_farm_people
 features[filter][] = farm_format
+features[taxonomy][] = farm_log_categories
+features[variable][] = pathauto_taxonomy_term_farm_log_categories_pattern

modules/farm/farm_fields/farm_fields.module

@@ -4,6 +4,8 @@
  * Farm fields module.
  */
 
+include_once 'farm_fields.features.inc';
+
 /**
  * Implements hook_farm_access_perms().
  */

modules/farm/farm_fields/farm_fields.strongarm.inc

@@ -1,13 +1,13 @@
 <?php
 /**
  * @file
- * farm_taxonomy.strongarm.inc
+ * farm_fields.strongarm.inc
  */
 
 /**
  * Implements hook_strongarm().
  */
-function farm_taxonomy_strongarm() {
+function farm_fields_strongarm() {
   $export = array();
 
   $strongarm = new stdClass();

modules/farm/farm_taxonomy/farm_taxonomy.info

@@ -1,13 +0,0 @@
-name = Farm Taxonomy
-description = Common farm taxonomies.
-core = 7.x
-package = farmOS
-dependencies[] = ctools
-dependencies[] = features
-dependencies[] = pathauto
-dependencies[] = strongarm
-dependencies[] = taxonomy
-features[ctools][] = strongarm:strongarm:1
-features[features_api][] = api:2
-features[taxonomy][] = farm_log_categories
-features[variable][] = pathauto_taxonomy_term_farm_log_categories_pattern

modules/farm/farm_taxonomy/farm_taxonomy.module

@@ -1,7 +0,0 @@
-<?php
-/**
- * @file
- * Code for the Farm Taxonomy feature.
- */
-
-include_once 'farm_taxonomy.features.inc';